Skip to content

Commit

Permalink
Style fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeblair
jeblair committed Feb 27, 2012
1 parent 553f1e3 commit d9b7e37
Show file tree
Hide file tree
Showing 11 changed files with 135 additions and 131 deletions.
70 changes: 40 additions & 30 deletions ...src/main/java/com/sonyericsson/hudson/plugins/gerrit/gerritevents/dto/attr/RefUpdate.java
View file
@@ -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
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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();
}


}
4 changes: 2 additions & 2 deletions .../com/sonyericsson/hudson/plugins/gerrit/gerritevents/dto/events/GerritTriggeredEvent.java
View file
Expand Up @@ -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)) {
Expand Down Expand Up @@ -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;
Expand Down
8 changes: 1 addition & 7 deletions .../main/java/com/sonyericsson/hudson/plugins/gerrit/gerritevents/dto/events/RefUpdated.java
View file
Expand Up @@ -27,19 +27,14 @@
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;

/**
* A DTO representation of the ref-updated Gerrit Event.
* @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() {
Expand All @@ -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));
}
Expand Down
44 changes: 22 additions & 22 deletions ...in/java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/GerritNotifier.java
View file
Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand Down
14 changes: 7 additions & 7 deletions ...java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/ParameterExpander.java
View file
Expand Up @@ -180,12 +180,12 @@ private Map<String, String> createStandardParameters(AbstractBuild r, GerritTrig
//<GERRIT_NAME> <BRANCH> <CHANGE> <PATCHSET> <REFSPEC> <BUILDURL> VERIFIED CODE_REVIEW
Map<String, String> map = new HashMap<String, String>(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());
Expand Down Expand Up @@ -367,7 +367,7 @@ public String getBuildCompletedCommand(MemoryImprint memoryImprint, TaskListener
* @return the string.
*/
private String createBuildsStats(MemoryImprint memoryImprint, TaskListener listener,
Map<String, String> parameters) {
Map<String, String> parameters) {
StringBuilder str = new StringBuilder("");
final String rootUrl = hudson.getRootUrl();

Expand Down
10 changes: 5 additions & 5 deletions ...c/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/BadgeAction.java
View file
Expand Up @@ -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();
}
}
}
12 changes: 6 additions & 6 deletions ...c/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritCause.java
View file
Expand Up @@ -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
Expand Down
52 changes: 26 additions & 26 deletions ...main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTrigger.java
View file
Expand Up @@ -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,
Expand All @@ -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(), });
}
}

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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.
Expand All @@ -943,7 +943,7 @@ public void setTriggerOnCommentAddedEvent(boolean triggerOnCommentAddedEvent) {
public void setTriggerOnRefUpdatedEvent(boolean triggerOnRefUpdatedEvent) {
this.triggerOnRefUpdatedEvent = triggerOnRefUpdatedEvent;
}

/**
* Should we trigger on this event?
*
Expand All @@ -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;
}
}
}
}
Expand Down

0 comments on commit d9b7e37

Please sign in to comment.