/*
 *  The MIT License
 *
 *  Copyright 2010 Sony Ericsson Mobile Communications.
 *
 *  Permission is hereby granted, free of charge, to any person obtaining a copy
 *  of this software and associated documentation files (the "Software"), to deal
 *  in the Software without restriction, including without limitation the rights
 *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 *  copies of the Software, and to permit persons to whom the Software is
 *  furnished to do so, subject to the following conditions:
 *
 *  The above copyright notice and this permission notice shall be included in
 *  all copies or substantial portions of the Software.
 *
 *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 *  THE SOFTWARE.
 */
package com.sonyericsson.hudson.plugins.gerrit.gerritevents.dto.events;

import java.io.IOException;

import com.sonyericsson.hudson.plugins.gerrit.gerritevents.dto.GerritEventType;
import com.sonyericsson.hudson.plugins.gerrit.gerritevents.dto.GerritJsonEvent;
import com.sonyericsson.hudson.plugins.gerrit.gerritevents.dto.attr.Account;
import net.sf.json.JSONObject;

import static com.sonyericsson.hudson.plugins.gerrit.gerritevents.dto.GerritEventKeys.UPLOADER;

/**
 * A DTO representation of the patchset-created Gerrit Event.
 * @author Robert Sandell &lt;robert.sandell@sonyericsson.com&gt;
 */
public class PatchsetCreated extends GerritTriggeredEvent implements GerritJsonEvent {
	/* To allow old builds to deserialize without warnings. */
	private Account uploader;
	
	private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException {
		in.defaultReadObject();
		/* If we're loading an old build with only one of these parameters, set
		 * the other to it.
		 */
		if (uploader == null && account != null) {
			uploader = account;
		}
		if (account == null && uploader != null) {
			account = uploader;
		}
	}
	
    @Override
    public GerritEventType getEventType() {
        return GerritEventType.PATCHSET_CREATED;
    }

    @Override
    public boolean isScorable() {
        return true;
    }

    @Override
    public void fromJson(JSONObject json) {
        super.fromJson(json);
        if (json.containsKey(UPLOADER)) {
            this.account = new Account(json.getJSONObject(UPLOADER));
        }
    }

    @Override
    public boolean equals(Object obj) {
        if (obj instanceof PatchsetCreated) {
            return equals((PatchsetCreated)obj);
        } else {
            return false;
        }
    }

    @Override
    public String toString() {
        return "PatchsetCreated: " + change + " " + patchSet;
    }
}

@@ -2737,217 +2737,8 @@
  %7D%0A%0A
-    @Override%0A    public boolean equals(Object obj) %7B%0A        if (obj instanceof PatchsetCreated) %7B%0A            return equals((PatchsetCreated)obj);%0A        %7D else %7B%0A            return false;%0A        %7D%0A    %7D%0A%0A
     

Add findUploader back.