diff --git a/gerrit-events/src/main/java/com/sonyericsson/hudson/plugins/gerrit/gerritevents/dto/attr/RefUpdate.java b/gerrit-events/src/main/java/com/sonyericsson/hudson/plugins/gerrit/gerritevents/dto/attr/RefUpdate.java index 1e4561db2..de5a06583 100644 --- a/gerrit-events/src/main/java/com/sonyericsson/hudson/plugins/gerrit/gerritevents/dto/attr/RefUpdate.java +++ b/gerrit-events/src/main/java/com/sonyericsson/hudson/plugins/gerrit/gerritevents/dto/attr/RefUpdate.java @@ -1,7 +1,7 @@ /* * The MIT License * - * Copyright 2012 Hewlett Packard + * Copyright 2012 Hewlett-Packard Development Company, L.P. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -34,7 +34,6 @@ /** * Represents a Gerrit JSON Reference Updated DTO. - * The Gerrit change the event is related to. * @author James E. Blair <jeblair@hp.com> */ public class RefUpdate implements GerritJsonDTO { @@ -139,48 +138,59 @@ public String getNewRev() { * Change new Revision. * @param newRev the rev. */ - public void setNewRew(String newRev) { + public void setNewRev(String newRev) { this.newRev = newRev; } + @Override + public int hashCode() { + //CS IGNORE MagicNumber FOR NEXT 7 LINES. REASON: Autogenerated Code. + //CS IGNORE AvoidInlineConditionals FOR NEXT 7 LINES. REASON: Autogenerated Code. + final int prime = 31; + int result = 1; + result = prime * result + ((newRev == null) ? 0 : newRev.hashCode()); + result = prime * result + ((oldRev == null) ? 0 : oldRev.hashCode()); + result = prime * result + ((project == null) ? 0 : project.hashCode()); + result = prime * result + ((refName == null) ? 0 : refName.hashCode()); + return result; + } + @Override public boolean equals(Object obj) { - //CS IGNORE MagicNumber FOR NEXT 14 LINES. REASON: Autogenerated Code. - //CS IGNORE AvoidInlineConditionals FOR NEXT 14 LINES. REASON: Autogenerated Code. - if (obj == null) { + //CS IGNORE NeedBraces FOR NEXT 28 LINES. REASON: Autogenerated Code. + //CS IGNORE NoWhitespaceAfter FOR NEXT 28 LINES. REASON: Autogenerated Code. + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) return false; - } - if (getClass() != obj.getClass()) { + RefUpdate other = (RefUpdate) obj; + if (newRev == null) { + if (other.newRev != null) + return false; + } else if (!newRev.equals(other.newRev)) return false; - } - final RefUpdate other = (RefUpdate)obj; - if ((this.project == null) ? (other.project != null) : !this.project.equals(other.project)) { + if (oldRev == null) { + if (other.oldRev != null) + return false; + } else if (!oldRev.equals(other.oldRev)) return false; - } - if ((this.refName == null) ? (other.refName != null) : !this.refName.equals(other.refName)) { + if (project == null) { + if (other.project != null) + return false; + } else if (!project.equals(other.project)) return false; - } - if ((this.newRev == null) ? (other.newRev != null) : !this.newRev.equals(other.newRev)) { + if (refName == null) { + if (other.refName != null) + return false; + } else if (!refName.equals(other.refName)) return false; - } return true; } - @Override - public int hashCode() { - //CS IGNORE MagicNumber FOR NEXT 5 LINES. REASON: Autogenerated Code. - //CS IGNORE AvoidInlineConditionals FOR NEXT 5 LINES. REASON: Autogenerated Code. - int hash = 7; - hash = 29 * hash + (this.project != null ? this.project.hashCode() : 0); - hash = 29 * hash + (this.refName != null ? this.refName.hashCode() : 0); - hash = 29 * hash + (this.newRev != null ? this.newRev.hashCode() : 0); - return hash; - } - @Override public String toString() { - return "Revision: " + getNewRev() + " " + getProject() + " " + getRefName(); + return "RefUpdate: " + getNewRev() + " " + getProject() + " " + getRefName(); } - - } diff --git a/gerrit-events/src/main/java/com/sonyericsson/hudson/plugins/gerrit/gerritevents/dto/events/GerritTriggeredEvent.java b/gerrit-events/src/main/java/com/sonyericsson/hudson/plugins/gerrit/gerritevents/dto/events/GerritTriggeredEvent.java index 2c407c787..1930d5986 100755 --- a/gerrit-events/src/main/java/com/sonyericsson/hudson/plugins/gerrit/gerritevents/dto/events/GerritTriggeredEvent.java +++ b/gerrit-events/src/main/java/com/sonyericsson/hudson/plugins/gerrit/gerritevents/dto/events/GerritTriggeredEvent.java @@ -67,7 +67,7 @@ public class GerritTriggeredEvent extends GerritEventLifecycle { * @param json the JSON Object. */ public void fromJson(JSONObject json) { - if (json.containsKey(CHANGE)) { + if (json.containsKey(CHANGE)) { change = new Change(json.getJSONObject(CHANGE)); } if (json.containsKey(REFUPDATE)) { @@ -122,7 +122,7 @@ public RefUpdate getRefUpdate() { /** * The ref update. - * @param change the refupdate. + * @param refUpdate the refupdate. */ public void setRefUpdate(RefUpdate refUpdate) { this.refUpdate = refUpdate; diff --git a/gerrit-events/src/main/java/com/sonyericsson/hudson/plugins/gerrit/gerritevents/dto/events/RefUpdated.java b/gerrit-events/src/main/java/com/sonyericsson/hudson/plugins/gerrit/gerritevents/dto/events/RefUpdated.java index 9328b28cf..c22b29aba 100644 --- a/gerrit-events/src/main/java/com/sonyericsson/hudson/plugins/gerrit/gerritevents/dto/events/RefUpdated.java +++ b/gerrit-events/src/main/java/com/sonyericsson/hudson/plugins/gerrit/gerritevents/dto/events/RefUpdated.java @@ -27,11 +27,7 @@ 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 net.sf.json.JSONArray; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import static com.sonyericsson.hudson.plugins.gerrit.gerritevents.dto.GerritEventKeys.REFUPDATE; import static com.sonyericsson.hudson.plugins.gerrit.gerritevents.dto.GerritEventKeys.SUBMITTER; /** @@ -39,7 +35,6 @@ * @author Robert Sandell <robert.sandell@sonyericsson.com> */ public class RefUpdated extends GerritTriggeredEvent implements GerritJsonEvent { - private static final Logger logger = LoggerFactory.getLogger(RefUpdated.class); @Override public GerritEventType getEventType() { @@ -50,11 +45,10 @@ public GerritEventType getEventType() { public boolean isScorable() { return false; } - + @Override public void fromJson(JSONObject json) { super.fromJson(json); - logger.debug("from json"); if (json.containsKey(SUBMITTER)) { this.account = new Account(json.getJSONObject(SUBMITTER)); } diff --git a/gerrithudsontrigger/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/GerritNotifier.java b/gerrithudsontrigger/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/GerritNotifier.java index 5b7e18ffe..ec9b9ff33 100644 --- a/gerrithudsontrigger/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/GerritNotifier.java +++ b/gerrithudsontrigger/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/GerritNotifier.java @@ -75,17 +75,17 @@ public GerritNotifier(IGerritHudsonTriggerConfig config, GerritCmdRunner cmdRunn public void buildStarted(AbstractBuild build, TaskListener taskListener, GerritTriggeredEvent event, BuildsStartedStats stats) { try { - /* Without a change, it doesn't make sense to notify gerrit */ - if (event.getChange() != null) { - String command = parameterExpander.getBuildStartedCommand(build, taskListener, event, stats); - if (command != null) { - logger.info("Notifying BuildStarted to gerrit: {}", command); - cmdRunner.sendCommand(command); - } else { - logger.error("Something wrong during parameter extraction. " - + "Gerrit will not be notified of BuildStarted"); - } - } + /* Without a change, it doesn't make sense to notify gerrit */ + if (event.getChange() != null) { + String command = parameterExpander.getBuildStartedCommand(build, taskListener, event, stats); + if (command != null) { + logger.info("Notifying BuildStarted to gerrit: {}", command); + cmdRunner.sendCommand(command); + } else { + logger.error("Something wrong during parameter extraction. " + + "Gerrit will not be notified of BuildStarted"); + } + } } catch (Exception ex) { logger.error("Could not complete BuildStarted notification!", ex); } @@ -99,18 +99,18 @@ public void buildStarted(AbstractBuild build, TaskListener taskListener, public void buildCompleted(MemoryImprint memoryImprint, TaskListener listener) { try { - /* Without a change, it doesn't make sense to notify gerrit */ - if (memoryImprint.getEvent().getChange() != null) { - String command = parameterExpander.getBuildCompletedCommand(memoryImprint, listener); + /* Without a change, it doesn't make sense to notify gerrit */ + if (memoryImprint.getEvent().getChange() != null) { + String command = parameterExpander.getBuildCompletedCommand(memoryImprint, listener); - if (command != null) { - logger.info("Notifying BuildCompleted to gerrit: {}", command); - cmdRunner.sendCommand(command); - } else { - logger.error("Something wrong during parameter extraction. " - + "Gerrit will not be notified of BuildCompleted"); - } - } + if (command != null) { + logger.info("Notifying BuildCompleted to gerrit: {}", command); + cmdRunner.sendCommand(command); + } else { + logger.error("Something wrong during parameter extraction. " + + "Gerrit will not be notified of BuildCompleted"); + } + } } catch (Exception ex) { logger.error("Could not complete BuildCompleted notification!", ex); } diff --git a/gerrithudsontrigger/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/ParameterExpander.java b/gerrithudsontrigger/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/ParameterExpander.java index 54265aec6..396c7d96f 100644 --- a/gerrithudsontrigger/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/ParameterExpander.java +++ b/gerrithudsontrigger/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/ParameterExpander.java @@ -180,12 +180,12 @@ private Map createStandardParameters(AbstractBuild r, GerritTrig // VERIFIED CODE_REVIEW Map map = new HashMap(DEFAULT_PARAMETERS_COUNT); if (event.getChange() != null) { - map.put("GERRIT_NAME", event.getChange().getProject()); - map.put("CHANGE_ID", event.getChange().getId()); - map.put("BRANCH", event.getChange().getProject()); - map.put("CHANGE", event.getChange().getNumber()); - map.put("PATCHSET", event.getPatchSet().getNumber()); - map.put("REFSPEC", StringUtil.makeRefSpec(event)); + map.put("GERRIT_NAME", event.getChange().getProject()); + map.put("CHANGE_ID", event.getChange().getId()); + map.put("BRANCH", event.getChange().getProject()); + map.put("CHANGE", event.getChange().getNumber()); + map.put("PATCHSET", event.getPatchSet().getNumber()); + map.put("REFSPEC", StringUtil.makeRefSpec(event)); } if (r != null) { map.put("BUILDURL", hudson.getRootUrl() + r.getUrl()); @@ -367,7 +367,7 @@ public String getBuildCompletedCommand(MemoryImprint memoryImprint, TaskListener * @return the string. */ private String createBuildsStats(MemoryImprint memoryImprint, TaskListener listener, - Map parameters) { + Map parameters) { StringBuilder str = new StringBuilder(""); final String rootUrl = hudson.getRootUrl(); diff --git a/gerrithudsontrigger/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/BadgeAction.java b/gerrithudsontrigger/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/BadgeAction.java index 93fbf447f..b031e0397 100644 --- a/gerrithudsontrigger/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/BadgeAction.java +++ b/gerrithudsontrigger/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/BadgeAction.java @@ -92,14 +92,14 @@ public void setEvent(GerritTriggeredEvent event) { public String getUrl() { if (event.getChange() != null) { if (event.getChange().getUrl() != null && event.getChange().getUrl().length() > 0) { - return event.getChange().getUrl(); + return event.getChange().getUrl(); } else { - return PluginImpl.getInstance().getConfig().getGerritFrontEndUrlFor( - event.getChange().getNumber(), - event.getPatchSet().getNumber()); + return PluginImpl.getInstance().getConfig().getGerritFrontEndUrlFor( + event.getChange().getNumber(), + event.getPatchSet().getNumber()); } } else { - return PluginImpl.getInstance().getConfig().getGerritFrontEndUrl(); + return PluginImpl.getInstance().getConfig().getGerritFrontEndUrl(); } } } diff --git a/gerrithudsontrigger/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritCause.java b/gerrithudsontrigger/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritCause.java index 029c7bf2d..eae8eafe4 100644 --- a/gerrithudsontrigger/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritCause.java +++ b/gerrithudsontrigger/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritCause.java @@ -160,12 +160,12 @@ public String getShortDescription() { * @return the URL. */ public String getUrl() { - if (event.getChange() != null) { - return PluginImpl.getInstance().getConfig().getGerritFrontEndUrlFor( - event.getChange().getNumber(), - event.getPatchSet().getNumber()); - } - return PluginImpl.getInstance().getConfig().getGerritFrontEndUrl(); + if (event.getChange() != null) { + return PluginImpl.getInstance().getConfig().getGerritFrontEndUrlFor( + event.getChange().getNumber(), + event.getPatchSet().getNumber()); + } + return PluginImpl.getInstance().getConfig().getGerritFrontEndUrl(); } @Override diff --git a/gerrithudsontrigger/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTrigger.java b/gerrithudsontrigger/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTrigger.java index 4cdc11429..9d737a941 100755 --- a/gerrithudsontrigger/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTrigger.java +++ b/gerrithudsontrigger/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTrigger.java @@ -288,12 +288,12 @@ protected void schedule(GerritCause cause, GerritTriggeredEvent event) { * @param project the project to build. */ protected void schedule(GerritCause cause, GerritTriggeredEvent event, AbstractProject project) { - BadgeAction badgeAction = null; - if (event.getChange() != null) { - badgeAction = new BadgeAction(event); - } - //during low traffic we still don't want to spam Gerrit, 3 is a nice number, isn't it? - Future build = project.scheduleBuild2( + BadgeAction badgeAction = null; + if (event.getChange() != null) { + badgeAction = new BadgeAction(event); + } + //during low traffic we still don't want to spam Gerrit, 3 is a nice number, isn't it? + Future build = project.scheduleBuild2( getBuildScheduleDelay(), cause, badgeAction, @@ -305,13 +305,13 @@ protected void schedule(GerritCause cause, GerritTriggeredEvent event, AbstractP getRunningJobs().scheduled(event.getChange(), build, project.getName()); } if (event.getChange() != null) { - logger.info("Project {} Build Scheduled: {} By event: {}", - new Object[]{project.getName(), (build != null), - event.getChange().getNumber() + "/" + event.getPatchSet().getNumber(), }); + logger.info("Project {} Build Scheduled: {} By event: {}", + new Object[]{project.getName(), (build != null), + event.getChange().getNumber() + "/" + event.getPatchSet().getNumber(), }); } else if (event.getRefUpdate() != null) { - logger.info("Project {} Build Scheduled: {} By event: {}", - new Object[]{project.getName(), (build != null), - event.getRefUpdate().getRefName() + " " + event.getRefUpdate().getNewRev(), }); + logger.info("Project {} Build Scheduled: {} By event: {}", + new Object[]{project.getName(), (build != null), + event.getRefUpdate().getRefName() + " " + event.getRefUpdate().getNewRev(), }); } } @@ -562,7 +562,7 @@ public void gerritEvent(RefUpdated event) { logger.trace("Disabled."); return; } - if (triggerOnRefUpdatedEvent && isInteresting(event)) { + if (triggerOnRefUpdatedEvent && isInteresting(event)) { logger.trace("The event is interesting."); if (!silentMode) { ToGerritRunListener.getInstance().onTriggered(myProject, event); @@ -933,7 +933,7 @@ public void setTriggerOnChangeMergedEvent(boolean triggerOnChangeMergedEvent) { public void setTriggerOnCommentAddedEvent(boolean triggerOnCommentAddedEvent) { this.triggerOnCommentAddedEvent = triggerOnCommentAddedEvent; } - + /** * Sets triggering on ref-updated events. * Default is false. @@ -943,7 +943,7 @@ public void setTriggerOnCommentAddedEvent(boolean triggerOnCommentAddedEvent) { public void setTriggerOnRefUpdatedEvent(boolean triggerOnRefUpdatedEvent) { this.triggerOnRefUpdatedEvent = triggerOnRefUpdatedEvent; } - + /** * Should we trigger on this event? * @@ -954,18 +954,18 @@ private boolean isInteresting(GerritTriggeredEvent event) { if (gerritProjects != null) { logger.trace("entering isInteresting projects configured: {} the event: {}", gerritProjects.size(), event); for (GerritProject p : gerritProjects) { - if (event.getChange() != null) { - if (p.isInteresting(event.getChange().getProject(), - event.getChange().getBranch())) { - logger.trace("According to {} the event is interesting.", p); - return true; - } + if (event.getChange() != null) { + if (p.isInteresting(event.getChange().getProject(), + event.getChange().getBranch())) { + logger.trace("According to {} the event is interesting.", p); + return true; + } } else if (event.getRefUpdate() != null) { - if (p.isInteresting(event.getRefUpdate().getProject(), - event.getRefUpdate().getRefName())) { - logger.trace("According to {} the event is interesting.", p); - return true; - } + if (p.isInteresting(event.getRefUpdate().getProject(), + event.getRefUpdate().getRefName())) { + logger.trace("According to {} the event is interesting.", p); + return true; + } } } } diff --git a/gerrithudsontrigger/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerParameters.java b/gerrithudsontrigger/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerParameters.java index 1e82598f1..edbdb81e3 100644 --- a/gerrithudsontrigger/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerParameters.java +++ b/gerrithudsontrigger/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerParameters.java @@ -97,7 +97,7 @@ public enum GerritTriggerParameters { /** * The email of the uploader of the patch-set. */ - GERRIT_PATCHSET_UPLOADER_EMAIL, + GERRIT_PATCHSET_UPLOADER_EMAIL, /** * The name and email of the person who triggered the event. */ @@ -113,23 +113,23 @@ public enum GerritTriggerParameters { /** * The refname in a ref-updated event. */ - GERRIT_REFNAME, + GERRIT_REFNAME, /** * The old revision in a ref-updated event. */ - GERRIT_OLDREV, + GERRIT_OLDREV, /** * The new revision in a ref-updated event. */ - GERRIT_NEWREV, + GERRIT_NEWREV, /** * The submitter in a ref-updated event. */ - GERRIT_SUBMITTER, + GERRIT_SUBMITTER, /** * The name of the submitter in a ref-updated event. */ - GERRIT_SUBMITTER_NAME, + GERRIT_SUBMITTER_NAME, /** * The email of the submitter in a ref-updated event. */ @@ -226,13 +226,13 @@ public static void setOrCreateParameters(GerritTriggeredEvent event, List 0) { return event.getPatchSet().getRef(); } diff --git a/gerrithudsontrigger/src/test/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerTest.java b/gerrithudsontrigger/src/test/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerTest.java index a8b40fe04..e5f267e41 100755 --- a/gerrithudsontrigger/src/test/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerTest.java +++ b/gerrithudsontrigger/src/test/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerTest.java @@ -362,7 +362,7 @@ public void testScheduleWithOwnerAndUploader() { Account uploader = new Account("Nisse", "nisse@acme.org"); GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, false, true, false, false, false, - "", "", "", "", "", "", null); + "", "", "", "", "", "", null); trigger.start(project, true); PatchsetCreated event = Setup.createPatchsetCreated(); event.getChange().setOwner(owner); @@ -414,7 +414,7 @@ public void testScheduleWithOwnerAndOneUploaderNull() { Account uploader = new Account("Nisse", "nisse@acme.org"); GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, false, true, false, false, false, - "", "", "", "", "", "", null); + "", "", "", "", "", "", null); trigger.start(project, true); PatchsetCreated event = Setup.createPatchsetCreated(); event.getChange().setOwner(owner); @@ -466,7 +466,7 @@ public void testScheduleWithOwnerAndOtherUploaderNull() { Account uploader = new Account("Nisse", "nisse@acme.org"); GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, false, true, false, false, false, - "", "", "", "", "", "", null); + "", "", "", "", "", "", null); trigger.start(project, true); PatchsetCreated event = Setup.createPatchsetCreated(); event.getChange().setOwner(owner); @@ -517,7 +517,7 @@ public void testScheduleWithOwnerAndBothUploadersNull() { Account owner = new Account("Bobby", "bobby@somewhere.com"); GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, true, false, true, false, false, false, - "", "", "", "", "", "", null); + "", "", "", "", "", "", null); trigger.start(project, true); PatchsetCreated event = Setup.createPatchsetCreated(); event.getChange().setOwner(owner); @@ -569,7 +569,7 @@ public void testScheduleWithOwnerAndPartOfUploadersNull() { Account uploader = new Account("Bobby", null); GerritTrigger trigger = new GerritTrigger(null, 0, 0, 0, 0, 0, 0, 0, 0, - true, false, true, false, false, false, "", "", "", "", "", "", null); + true, false, true, false, false, false, "", "", "", "", "", "", null); trigger.start(project, true); PatchsetCreated event = Setup.createPatchsetCreated(); event.getChange().setOwner(owner); @@ -626,7 +626,7 @@ public void testRetriggerThisBuild() { when(listener.isBuilding(project, event)).thenReturn(false); GerritTrigger trigger = new GerritTrigger(Collections.EMPTY_LIST, - 0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null); + 0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null); TriggerContext context = new TriggerContext(build, event, Collections.EMPTY_LIST); @@ -666,7 +666,7 @@ public void testRetriggerThisBuildSilent() { when(listener.isBuilding(project, event)).thenReturn(false); GerritTrigger trigger = new GerritTrigger(Collections.EMPTY_LIST, - 0, 0, 0, 0, 0, 0, 0, 0, true, true, true, false, false, false, "", "", "", "", "", "", null); + 0, 0, 0, 0, 0, 0, 0, 0, true, true, true, false, false, false, "", "", "", "", "", "", null); TriggerContext context = new TriggerContext(build, event, Collections.EMPTY_LIST); @@ -709,11 +709,11 @@ public void testRetriggerAllBuilds() { when(listener.isBuilding(event)).thenReturn(false); GerritTrigger thisTrigger = new GerritTrigger(Collections.EMPTY_LIST, - 0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null); + 0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null); doReturn(thisTrigger).when(thisProject).getTrigger(GerritTrigger.class); GerritTrigger otherTrigger = new GerritTrigger(Collections.EMPTY_LIST, - 0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null); + 0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null); AbstractProject otherProject = PowerMockito.mock(AbstractProject.class); when(otherProject.getFullDisplayName()).thenReturn("Other_MockedProject"); when(otherProject.isBuildable()).thenReturn(true); @@ -767,7 +767,7 @@ public void testGerritEvent() { doReturn(true).when(gP).isInteresting(any(String.class), any(String.class)); GerritTrigger trigger = new GerritTrigger(Collections.nCopies(1, gP), - 0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null); + 0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null); Whitebox.setInternalState(trigger, "myProject", project); PatchsetCreated event = Setup.createPatchsetCreated(); @@ -799,7 +799,7 @@ public void testGerritEventNotBuildable() { when(project.isBuildable()).thenReturn(false); GerritTrigger trigger = new GerritTrigger(Collections.EMPTY_LIST, - 0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null); + 0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null); Whitebox.setInternalState(trigger, "myProject", project); PatchsetCreated event = Setup.createPatchsetCreated(); @@ -828,7 +828,7 @@ public void testGerritEventNotInteresting() { doReturn(false).when(gP).isInteresting(any(String.class), any(String.class)); GerritTrigger trigger = new GerritTrigger(Collections.nCopies(1, gP), - 0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null); + 0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null); Whitebox.setInternalState(trigger, "myProject", project); PatchsetCreated event = Setup.createPatchsetCreated(); @@ -858,7 +858,7 @@ public void testGerritEventManualEvent() { doReturn(true).when(gP).isInteresting(any(String.class), any(String.class)); GerritTrigger trigger = new GerritTrigger(Collections.nCopies(1, gP), - 0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null); + 0, 0, 0, 0, 0, 0, 0, 0, false, false, true, false, false, false, "", "", "", "", "", "", null); Whitebox.setInternalState(trigger, "myProject", project); ManualPatchsetCreated event = Setup.createManualPatchsetCreated(); @@ -893,7 +893,7 @@ public void testGerritEventSilentMode() { doReturn(true).when(gP).isInteresting(any(String.class), any(String.class)); GerritTrigger trigger = new GerritTrigger(Collections.nCopies(1, gP), - 0, 0, 0, 0, 0, 0, 0, 0, true, true, true, false, false, false, "", "", "", "", "", "", null); + 0, 0, 0, 0, 0, 0, 0, 0, true, true, true, false, false, false, "", "", "", "", "", "", null); Whitebox.setInternalState(trigger, "myProject", project); PatchsetCreated event = Setup.createPatchsetCreated(); @@ -929,7 +929,7 @@ public void testGerritEventManualEventSilentMode() { doReturn(true).when(gP).isInteresting(any(String.class), any(String.class)); GerritTrigger trigger = new GerritTrigger(Collections.nCopies(1, gP), - 0, 0, 0, 0, 0, 0, 0, 0, true, true, true, false, false, false, "", "", "", "", "", "", null); + 0, 0, 0, 0, 0, 0, 0, 0, true, true, true, false, false, false, "", "", "", "", "", "", null); Whitebox.setInternalState(trigger, "myProject", project); ManualPatchsetCreated event = Setup.createManualPatchsetCreated();