Merge branch 'JENKINS-38670' of https://github.com/JamesForsee/build-…

…pipeline-plugin into JENKINS-38670
jenkinsci · Jun 16, 2017 · 7eab095 · 7eab095
2 parents 406b66c + e37f6fc
commit 7eab095
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.../java/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension.java b/.../java/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension.java
@@ -33,16 +33,16 @@
 import hudson.model.AbstractBuild;
 import hudson.model.AbstractDescribableImpl;
 import hudson.model.AbstractProject;
-import hudson.model.Action;
+import hudson.model.ParametersAction;
+import hudson.model.Run;
 import hudson.model.Cause;
+import hudson.model.Action;
 import hudson.model.CauseAction;
 import hudson.model.Descriptor;
 import hudson.model.Item;
 import hudson.model.ItemGroup;
 import hudson.model.Job;
 import hudson.model.ParameterValue;
-import hudson.model.ParametersAction;
-import hudson.model.Run;
 import hudson.plugins.parameterizedtrigger.AbstractBuildParameters;
 import hudson.plugins.parameterizedtrigger.BuildTriggerConfig;
 import hudson.tasks.Publisher;
@@ -53,13 +53,13 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.Set;
+import java.util.LinkedHashMap;
 
 /**
  * @author dalvizu
@@ -297,6 +297,7 @@ protected List<AbstractBuildParameters> retrieveUpstreamProjectTriggerConfig(fin
             LOGGER.fine("Found Manual Trigger (BuildPipelineTrigger) found in upstream project publisher list ");
             final Set<String> downstreamProjectsNames =
                     Sets.newHashSet(Splitter.on(",").trimResults().split(manualTrigger.getDownstreamProjectNames()));
+
             LOGGER.fine("Downstream project names: " + downstreamProjectsNames);
             // defect: requires full name in the trigger. But downstream is just fine!
 

diff --git a/...a/au/com/centrumsystems/hudson/plugin/buildpipeline/trigger/BuildPipelineTriggerTest.java b/...a/au/com/centrumsystems/hudson/plugin/buildpipeline/trigger/BuildPipelineTriggerTest.java
@@ -41,6 +41,7 @@
 
 import java.io.IOException;
 import java.util.Collections;
+import java.util.NoSuchElementException;
 
 
 import org.junit.Rule;