diff --git a/src/main/java/hudson/plugins/parameterizedtrigger/BinaryFileParameterFactory.java b/src/main/java/hudson/plugins/parameterizedtrigger/BinaryFileParameterFactory.java index b1ffcf7e..7a05a480 100644 --- a/src/main/java/hudson/plugins/parameterizedtrigger/BinaryFileParameterFactory.java +++ b/src/main/java/hudson/plugins/parameterizedtrigger/BinaryFileParameterFactory.java @@ -1,6 +1,5 @@ package hudson.plugins.parameterizedtrigger; -import com.google.common.collect.Lists; import hudson.Extension; import hudson.FilePath; import hudson.model.AbstractBuild; @@ -15,6 +14,7 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; @@ -53,7 +53,7 @@ public NoFilesFoundEnum getNoFilesFoundAction() { @Override public List getParameters(AbstractBuild build, TaskListener listener) throws IOException, InterruptedException, AbstractBuildParameters.DontTriggerException { - List result = Lists.newArrayList(); + List result = new ArrayList<>(); FilePath workspace = build.getWorkspace(); if (workspace == null) { throw new IOException("Failed to get workspace"); diff --git a/src/main/java/hudson/plugins/parameterizedtrigger/BlockableBuildTriggerConfig.java b/src/main/java/hudson/plugins/parameterizedtrigger/BlockableBuildTriggerConfig.java index d01edbe2..ee181da6 100644 --- a/src/main/java/hudson/plugins/parameterizedtrigger/BlockableBuildTriggerConfig.java +++ b/src/main/java/hudson/plugins/parameterizedtrigger/BlockableBuildTriggerConfig.java @@ -1,6 +1,5 @@ package hudson.plugins.parameterizedtrigger; -import com.google.common.collect.ImmutableList; import hudson.Extension; import hudson.Launcher; import hudson.model.AbstractBuild; @@ -18,6 +17,7 @@ import hudson.model.queue.QueueTaskFuture; import java.io.IOException; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -72,8 +72,9 @@ protected QueueTaskFuture schedule(AbstractBuild build, Job project, List< while (true) { // add DifferentiatingAction to make sure this doesn't get merged with something else, // which is most likely unintended. Might make sense to do it at BuildTriggerConfig for all. - list = ImmutableList.builder().addAll(list).add(new DifferentiatingAction()).build(); + list = CollectionUtils.immutableList(list, new DifferentiatingAction()); + // if we fail to add the item to the queue, wait and retry. // it also means we have to force quiet period = 0, or else it'll never leave the queue QueueTaskFuture f = schedule(build, project, 0, list, listener); diff --git a/src/main/java/hudson/plugins/parameterizedtrigger/BuildTrigger.java b/src/main/java/hudson/plugins/parameterizedtrigger/BuildTrigger.java index 250d5dfb..0bf7cc7b 100644 --- a/src/main/java/hudson/plugins/parameterizedtrigger/BuildTrigger.java +++ b/src/main/java/hudson/plugins/parameterizedtrigger/BuildTrigger.java @@ -1,6 +1,5 @@ package hudson.plugins.parameterizedtrigger; -import com.google.common.collect.ImmutableList; import hudson.EnvVars; import hudson.Extension; import hudson.Launcher; @@ -27,6 +26,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -62,7 +62,7 @@ public BuildStepMonitor getRequiredMonitorService() { @Override public Collection getProjectActions(AbstractProject project) { - return ImmutableList.of(new DynamicProjectAction(configs)); + return Collections.singletonList(new DynamicProjectAction(configs)); } @Override @SuppressWarnings("deprecation") diff --git a/src/main/java/hudson/plugins/parameterizedtrigger/BuildTriggerConfig.java b/src/main/java/hudson/plugins/parameterizedtrigger/BuildTriggerConfig.java index 0c615879..9a1904ac 100644 --- a/src/main/java/hudson/plugins/parameterizedtrigger/BuildTriggerConfig.java +++ b/src/main/java/hudson/plugins/parameterizedtrigger/BuildTriggerConfig.java @@ -1,7 +1,6 @@ package hudson.plugins.parameterizedtrigger; import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.ImmutableList; import com.google.common.collect.ListMultimap; import hudson.EnvVars; import hudson.Extension; @@ -394,8 +393,10 @@ public List> perform(AbstractBuild build, L List> futures = new ArrayList<>(); for (List addConfigs : getDynamicBuildParameters(build, listener)) { - List actions = getBaseActions( - ImmutableList.builder().addAll(configs).addAll(addConfigs).build(), + List buildParams = new ArrayList<>(configs); + buildParams.addAll(addConfigs); + buildParams = Collections.unmodifiableList(buildParams); + List actions = getBaseActions(buildParams, build, listener); for (Job project : getJobs(build.getRootBuild().getProject().getParent(), env)) { List list = getBuildActions(actions, project); @@ -459,7 +460,7 @@ public ListMultimap> perform3(AbstractBuild< ListMultimap> futures = ArrayListMultimap.create(); for (List addConfigs : getDynamicBuildParameters(build, listener)) { - List actions = getBaseActions(ImmutableList.builder().addAll(configs).addAll(addConfigs).build(), build, listener); + List actions = getBaseActions(CollectionUtils.immutableList(configs, addConfigs), build, listener); for (Job project : getJobs(build.getRootBuild().getProject().getParent(), env)) { List list = getBuildActions(actions, project); @@ -486,7 +487,7 @@ public ListMultimap> perform3(AbstractBuild< */ private List> getDynamicBuildParameters(AbstractBuild build, BuildListener listener) throws DontTriggerException, IOException, InterruptedException { if (configFactories == null || configFactories.isEmpty()) { - return ImmutableList.of(ImmutableList.of()); + return Collections.singletonList(Collections.emptyList()); } else { // this code is building the combinations of all AbstractBuildParameters reported from all factories List> dynamicBuildParameters = new ArrayList(); @@ -498,11 +499,7 @@ private List> getDynamicBuildParameters(AbstractBu if(factoryParameters.size() > 0) { for (AbstractBuildParameters config : factoryParameters) { for (List dynamicBuildParameter : dynamicBuildParameters) { - newDynParameters.add( - ImmutableList.builder() - .addAll(dynamicBuildParameter) - .add(config) - .build()); + newDynParameters.add(CollectionUtils.immutableList(dynamicBuildParameter, config)); } } dynamicBuildParameters = newDynParameters; diff --git a/src/main/java/hudson/plugins/parameterizedtrigger/CollectionUtils.java b/src/main/java/hudson/plugins/parameterizedtrigger/CollectionUtils.java new file mode 100644 index 00000000..aabb298d --- /dev/null +++ b/src/main/java/hudson/plugins/parameterizedtrigger/CollectionUtils.java @@ -0,0 +1,28 @@ +package hudson.plugins.parameterizedtrigger; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import org.kohsuke.accmod.Restricted; +import org.kohsuke.accmod.restrictions.NoExternalUse; + +/** + * Internal helpers that should be replaced by Java11 equivalents when the JDK baseline moves on. + * + */ +@Restricted(NoExternalUse.class) +final class CollectionUtils { + + static List immutableList(Collection collection1, Collection collection2) { + List list = new ArrayList<>(collection1.size() + collection2.size()); + list.addAll(collection1); + list.addAll(collection2); + return Collections.unmodifiableList(list); + } + + static List immutableList(Collection collection, @SuppressWarnings("unchecked") T... ts) { + return immutableList(collection, Arrays.asList(ts)); + } +} diff --git a/src/main/java/hudson/plugins/parameterizedtrigger/CounterBuildParameterFactory.java b/src/main/java/hudson/plugins/parameterizedtrigger/CounterBuildParameterFactory.java index 067b28af..b7f18125 100644 --- a/src/main/java/hudson/plugins/parameterizedtrigger/CounterBuildParameterFactory.java +++ b/src/main/java/hudson/plugins/parameterizedtrigger/CounterBuildParameterFactory.java @@ -1,6 +1,5 @@ package hudson.plugins.parameterizedtrigger; -import com.google.common.collect.ImmutableMap; import hudson.EnvVars; import hudson.Extension; import hudson.Util; @@ -14,6 +13,7 @@ import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** @@ -107,7 +107,7 @@ public List getParameters(AbstractBuild build, Ta } private PredefinedBuildParameters getParameterForCount(Long i) { - String stringWithCount = Util.replaceMacro(paramExpr, ImmutableMap.of("COUNT", i.toString())); + String stringWithCount = Util.replaceMacro(paramExpr, Collections.singletonMap("COUNT", i.toString())); return new PredefinedBuildParameters(stringWithCount); } diff --git a/src/main/java/hudson/plugins/parameterizedtrigger/FileBuildParameters.java b/src/main/java/hudson/plugins/parameterizedtrigger/FileBuildParameters.java index 8518fdf3..13fb9e38 100644 --- a/src/main/java/hudson/plugins/parameterizedtrigger/FileBuildParameters.java +++ b/src/main/java/hudson/plugins/parameterizedtrigger/FileBuildParameters.java @@ -1,8 +1,5 @@ package hudson.plugins.parameterizedtrigger; -import com.google.common.base.Predicate; -import com.google.common.collect.Collections2; - import hudson.EnvVars; import hudson.Extension; import hudson.FilePath; @@ -26,8 +23,6 @@ import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.QueryParameter; -import javax.annotation.Nullable; - import java.io.IOException; import java.nio.charset.Charset; import java.nio.charset.IllegalCharsetNameException; @@ -38,7 +33,8 @@ import java.util.List; import java.util.Map; import java.util.Properties; - +import java.util.stream.Collectors; +import java.util.stream.Stream; import jenkins.util.VirtualFile; public class FileBuildParameters extends AbstractBuildParameters { @@ -165,26 +161,23 @@ private List extractAllValues(AbstractBuild build, TaskList private Collection> getTargetBuilds(AbstractBuild build) { if ((build instanceof MatrixBuild) && isUseMatrixChild()) { - return Collections2.filter( - isOnlyExactRuns()?((MatrixBuild)build).getExactRuns():((MatrixBuild)build).getRuns(), - new Predicate() { - public boolean apply(@Nullable MatrixRun run) { - if (run == null) { - return false; - } - if (StringUtils.isBlank(getCombinationFilter())) { - // no combination filter stands for all children. - return true; - } - Combination c = run.getParent().getCombination(); - AxisList axes = run.getParent().getParent().getAxes(); - - return c.evalGroovyExpression(axes, getCombinationFilter()); - } + Stream buildsStream = isOnlyExactRuns() ? ((MatrixBuild) build).getExactRuns().stream() : ((MatrixBuild) build).getRuns().stream(); + return buildsStream.filter(run -> { + if (run == null) { + return false; } - ); + if (StringUtils.isBlank(getCombinationFilter())) { + // no combination filter stands for all children. + return true; + } + Combination c = run.getParent().getCombination(); + AxisList axes = run.getParent().getParent().getAxes(); + + return c.evalGroovyExpression(axes, getCombinationFilter()); + }).collect(Collectors.toList()); + } else { - return Arrays.>asList(build); + return Arrays.>asList(build); } } diff --git a/src/main/java/hudson/plugins/parameterizedtrigger/SubProjectsAction.java b/src/main/java/hudson/plugins/parameterizedtrigger/SubProjectsAction.java index bede9bc3..31c6bfed 100644 --- a/src/main/java/hudson/plugins/parameterizedtrigger/SubProjectsAction.java +++ b/src/main/java/hudson/plugins/parameterizedtrigger/SubProjectsAction.java @@ -1,9 +1,8 @@ package hudson.plugins.parameterizedtrigger; -import com.google.common.collect.ImmutableList; import hudson.model.AbstractProject; import hudson.model.Action; - +import java.util.Collections; import java.util.List; /** * Action added Projects to track what projects are @@ -47,7 +46,7 @@ public List getSubProjectActions() { if (isFirst()) { return project.getActions(SubProjectsAction.class); } - return ImmutableList.of(); + return Collections.emptyList(); } public AbstractProject getProject() { diff --git a/src/main/java/hudson/plugins/parameterizedtrigger/TriggerBuilder.java b/src/main/java/hudson/plugins/parameterizedtrigger/TriggerBuilder.java index 1bf845ad..750e7f8a 100644 --- a/src/main/java/hudson/plugins/parameterizedtrigger/TriggerBuilder.java +++ b/src/main/java/hudson/plugins/parameterizedtrigger/TriggerBuilder.java @@ -25,7 +25,6 @@ package hudson.plugins.parameterizedtrigger; -import com.google.common.collect.ImmutableList; import com.google.common.collect.ListMultimap; import hudson.*; import hudson.console.HyperlinkNote; @@ -199,7 +198,7 @@ public String getProjectListAsString(List projectList){ @Override public Collection getProjectActions(AbstractProject project) { - return ImmutableList.of(new SubProjectsAction(project, configs)); + return Collections.singletonList(new SubProjectsAction(project, configs)); } private boolean canDeclare(AbstractProject owner) { diff --git a/src/test/java/hudson/plugins/parameterizedtrigger/test/BuildInfoExporterTest.java b/src/test/java/hudson/plugins/parameterizedtrigger/test/BuildInfoExporterTest.java index 02990878..cbae374d 100644 --- a/src/test/java/hudson/plugins/parameterizedtrigger/test/BuildInfoExporterTest.java +++ b/src/test/java/hudson/plugins/parameterizedtrigger/test/BuildInfoExporterTest.java @@ -23,8 +23,6 @@ */ package hudson.plugins.parameterizedtrigger.test; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Sets; import hudson.EnvVars; import hudson.model.AbstractBuild; import hudson.model.Cause.UserIdCause; @@ -33,7 +31,6 @@ import hudson.model.Project; import hudson.model.Result; import hudson.model.Run; -import hudson.plugins.parameterizedtrigger.AbstractBuildParameterFactory; import hudson.plugins.parameterizedtrigger.AbstractBuildParameters; import hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig; import hudson.plugins.parameterizedtrigger.BlockingBehaviour; @@ -48,6 +45,8 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; +import java.util.Set; + import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.Matchers.*; import static org.hamcrest.collection.IsMapContaining.hasEntry; @@ -57,6 +56,7 @@ import org.junit.Rule; import org.junit.Test; +import org.jvnet.hudson.test.BuildWatcher; import org.jvnet.hudson.test.CaptureEnvironmentBuilder; import org.jvnet.hudson.test.recipes.LocalData; import org.jvnet.hudson.test.JenkinsRule; @@ -65,6 +65,8 @@ public class BuildInfoExporterTest { @Rule public JenkinsRule r = new JenkinsRule(); + + @Rule public BuildWatcher buildWatcher = new BuildWatcher(); @Test public void test() throws Exception { @@ -175,7 +177,7 @@ public void test_multipletriggers() throws Exception { new TriggerBuilder( new BlockableBuildTriggerConfig(testNameResult + "," + testNameResult2, new BlockingBehaviour(Result.FAILURE, Result.UNSTABLE, Result.FAILURE), - ImmutableList.of(new CounterBuildParameterFactory("0", Integer.toString(buildsToTest - 1), "1", "TEST=COUNT$COUNT")), + Collections.singletonList(new CounterBuildParameterFactory("0", Integer.toString(buildsToTest - 1), "1", "TEST=COUNT$COUNT")), Collections.emptyList()))); CaptureEnvironmentBuilder builder = new CaptureEnvironmentBuilder(); @@ -353,14 +355,12 @@ public void testMigrateFrom221() throws Exception // downstream1#2 // downstream2#1 - assertEquals( - Sets.newHashSet( - r.jenkins.getItemByFullName("downstream1", FreeStyleProject.class).getBuildByNumber(1), + Set> expected = new HashSet<>(); + expected.addAll(Arrays.asList(r.jenkins.getItemByFullName("downstream1", FreeStyleProject.class).getBuildByNumber(1), r.jenkins.getItemByFullName("downstream1", FreeStyleProject.class).getBuildByNumber(2), - r.jenkins.getItemByFullName("downstream2", FreeStyleProject.class).getBuildByNumber(1) - ), - new HashSet>(action.getTriggeredBuilds()) - ); + r.jenkins.getItemByFullName("downstream2", FreeStyleProject.class).getBuildByNumber(1))); + + assertEquals(expected, new HashSet<>(action.getTriggeredBuilds())); EnvVars env = new EnvVars(); action.buildEnvVars(b, env); @@ -383,13 +383,12 @@ public void testMigrateFrom221() throws Exception // downstream1#2 // downstream2#1 - assertEquals( - Sets.newHashSet( - r.jenkins.getItemByFullName("downstream1", FreeStyleProject.class).getBuildByNumber(1), + Set> expected = new HashSet<>(); + expected.addAll(Arrays.asList(r.jenkins.getItemByFullName("downstream1", FreeStyleProject.class).getBuildByNumber(1), r.jenkins.getItemByFullName("downstream1", FreeStyleProject.class).getBuildByNumber(2), - r.jenkins.getItemByFullName("downstream2", FreeStyleProject.class).getBuildByNumber(1) - ), - new HashSet>(action.getTriggeredBuilds()) + r.jenkins.getItemByFullName("downstream2", FreeStyleProject.class).getBuildByNumber(1))); + + assertEquals(expected, new HashSet<>(action.getTriggeredBuilds()) ); EnvVars env = new EnvVars(); diff --git a/src/test/java/hudson/plugins/parameterizedtrigger/test/BuildTriggerConfigTest.java b/src/test/java/hudson/plugins/parameterizedtrigger/test/BuildTriggerConfigTest.java index 396feb1d..8d320fe8 100644 --- a/src/test/java/hudson/plugins/parameterizedtrigger/test/BuildTriggerConfigTest.java +++ b/src/test/java/hudson/plugins/parameterizedtrigger/test/BuildTriggerConfigTest.java @@ -54,6 +54,7 @@ import org.jenkinsci.plugins.workflow.job.WorkflowRun; import org.junit.Rule; import org.junit.Test; +import org.jvnet.hudson.test.BuildWatcher; import org.jvnet.hudson.test.CaptureEnvironmentBuilder; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; @@ -80,6 +81,9 @@ public class BuildTriggerConfigTest { @Rule public JenkinsRule r = new JenkinsRule(); + + @Rule + public BuildWatcher buildWatcher = new BuildWatcher(); private BlockableBuildTriggerConfig createConfig(String projectToTrigger){ List buildParameters = new ArrayList(); diff --git a/src/test/java/hudson/plugins/parameterizedtrigger/test/BuildTriggerTest.java b/src/test/java/hudson/plugins/parameterizedtrigger/test/BuildTriggerTest.java index 820fa279..c2a31a03 100644 --- a/src/test/java/hudson/plugins/parameterizedtrigger/test/BuildTriggerTest.java +++ b/src/test/java/hudson/plugins/parameterizedtrigger/test/BuildTriggerTest.java @@ -1,6 +1,5 @@ package hudson.plugins.parameterizedtrigger.test; -import com.google.common.collect.Lists; import hudson.AbortException; import hudson.FilePath; import hudson.Launcher; @@ -110,7 +109,7 @@ public void testChildProjectsTrigger() throws Exception{ String project1 = downstreamBuild1.getCause(Cause.UpstreamCause.class).getUpstreamProject(); String project2 = downstreamBuild2.getCause(Cause.UpstreamCause.class).getUpstreamProject(); - ArrayList configurations = Lists.newArrayList(upstream.getItems()); + ArrayList configurations = new ArrayList<>(upstream.getItems()); Collections.sort(configurations, new MatrixConfigurationSorterTestImpl()); assertEquals("Build should be triggered by matrix project.", configurations.get(0).getFullName(), project1); assertEquals("Build should be triggered by matrix project.", configurations.get(1).getFullName(), project2); diff --git a/src/test/java/hudson/plugins/parameterizedtrigger/test/CaptureAllEnvironmentBuilder.java b/src/test/java/hudson/plugins/parameterizedtrigger/test/CaptureAllEnvironmentBuilder.java index 32f8ba24..81f48452 100644 --- a/src/test/java/hudson/plugins/parameterizedtrigger/test/CaptureAllEnvironmentBuilder.java +++ b/src/test/java/hudson/plugins/parameterizedtrigger/test/CaptureAllEnvironmentBuilder.java @@ -1,6 +1,5 @@ package hudson.plugins.parameterizedtrigger.test; -import com.google.common.collect.Maps; import hudson.EnvVars; import hudson.Extension; import hudson.Launcher; @@ -12,13 +11,14 @@ import org.kohsuke.stapler.StaplerRequest; import java.io.IOException; +import java.util.HashMap; import java.util.Map; /** * @author wolfs */ public class CaptureAllEnvironmentBuilder extends Builder { - private final Map envVars = Maps.newHashMap(); + private final Map envVars = new HashMap<>(); public Map getEnvVars() { return envVars; diff --git a/src/test/java/hudson/plugins/parameterizedtrigger/test/CounterBuildParameterFactoryTest.java b/src/test/java/hudson/plugins/parameterizedtrigger/test/CounterBuildParameterFactoryTest.java index b61eb84b..62462a44 100644 --- a/src/test/java/hudson/plugins/parameterizedtrigger/test/CounterBuildParameterFactoryTest.java +++ b/src/test/java/hudson/plugins/parameterizedtrigger/test/CounterBuildParameterFactoryTest.java @@ -1,8 +1,5 @@ package hudson.plugins.parameterizedtrigger.test; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; import hudson.EnvVars; import hudson.model.Cause.UserIdCause; import hudson.model.FreeStyleBuild; @@ -11,7 +8,6 @@ import hudson.model.Project; import hudson.model.StringParameterDefinition; import hudson.model.Result; -import hudson.plugins.parameterizedtrigger.AbstractBuildParameterFactory; import hudson.plugins.parameterizedtrigger.AbstractBuildParameters; import hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig; import hudson.plugins.parameterizedtrigger.BlockingBehaviour; @@ -23,7 +19,9 @@ import org.jvnet.hudson.test.JenkinsRule; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Set; @@ -43,7 +41,7 @@ public void testWithOneParameter() throws Exception { new TriggerBuilder( new BlockableBuildTriggerConfig(projectB.getName(), new BlockingBehaviour(Result.FAILURE, Result.UNSTABLE, Result.FAILURE), - ImmutableList.of(new CounterBuildParameterFactory("0","1","1", "TEST=COUNT$COUNT")), + Collections.singletonList(new CounterBuildParameterFactory("0","1","1", "TEST=COUNT$COUNT")), Collections.emptyList()))); CaptureAllEnvironmentBuilder builder = new CaptureAllEnvironmentBuilder(); @@ -59,13 +57,13 @@ public void testWithOneParameter() throws Exception { r.waitUntilNoActivity(); List builds = projectB.getBuilds(); assertEquals(2, builds.size()); - Set values = Sets.newHashSet(); + Set values = new HashSet<>(); for (FreeStyleBuild build : builds) { EnvVars buildEnvVar = builder.getEnvVars().get(build.getId()); assertTrue(buildEnvVar.containsKey("TEST")); values.add(buildEnvVar.get("TEST")); } - assertEquals(ImmutableSet.of("COUNT0","COUNT1"), values); + assertEquals(new HashSet<>(Arrays.asList("COUNT0","COUNT1")), values); } @Test @@ -76,7 +74,7 @@ public void testWithTwoParameters() throws Exception { new TriggerBuilder( new BlockableBuildTriggerConfig(projectB.getName(), new BlockingBehaviour(Result.FAILURE, Result.UNSTABLE, Result.FAILURE), - ImmutableList.of( + Arrays.asList( new CounterBuildParameterFactory("0","1","1", "TEST=COUNT$COUNT"), new CounterBuildParameterFactory("0","2","1", "NEWTEST=COUNT$COUNT") ), @@ -97,8 +95,8 @@ public void testWithTwoParameters() throws Exception { r.waitUntilNoActivity(); List builds = projectB.getBuilds(); assertEquals(6, builds.size()); - Set values = Sets.newHashSet(); - Set newValues = Sets.newHashSet(); + Set values = new HashSet<>(); + Set newValues = new HashSet<>(); for (FreeStyleBuild build : builds) { EnvVars buildEnvVar = builder.getEnvVars().get(build.getId()); assertTrue(buildEnvVar.containsKey("TEST")); @@ -106,8 +104,8 @@ public void testWithTwoParameters() throws Exception { values.add(buildEnvVar.get("TEST")); newValues.add(buildEnvVar.get("NEWTEST")); } - assertEquals(ImmutableSet.of("COUNT0","COUNT1"), values); - assertEquals(ImmutableSet.of("COUNT0", "COUNT1", "COUNT2"), newValues); + assertEquals(new HashSet<>(Arrays.asList("COUNT0","COUNT1")), values); + assertEquals(new HashSet<>(Arrays.asList("COUNT0", "COUNT1", "COUNT2")), newValues); } } diff --git a/src/test/java/hudson/plugins/parameterizedtrigger/test/FileBuildParameterFactoryTest.java b/src/test/java/hudson/plugins/parameterizedtrigger/test/FileBuildParameterFactoryTest.java index ec3c658a..637f433d 100644 --- a/src/test/java/hudson/plugins/parameterizedtrigger/test/FileBuildParameterFactoryTest.java +++ b/src/test/java/hudson/plugins/parameterizedtrigger/test/FileBuildParameterFactoryTest.java @@ -23,10 +23,6 @@ */ package hudson.plugins.parameterizedtrigger.test; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; - import hudson.EnvVars; import hudson.Launcher; import hudson.model.AbstractBuild; @@ -39,7 +35,6 @@ import hudson.model.Project; import hudson.model.StringParameterDefinition; import hudson.model.Result; -import hudson.plugins.parameterizedtrigger.AbstractBuildParameterFactory; import hudson.plugins.parameterizedtrigger.AbstractBuildParameters; import hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig; import hudson.plugins.parameterizedtrigger.BlockingBehaviour; @@ -55,7 +50,9 @@ import java.nio.charset.Charset; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Set; import java.io.IOException; @@ -78,8 +75,7 @@ private TriggerBuilder createTriggerBuilder(AbstractProject project, NoFilesFoun TriggerBuilder tBuilder = new TriggerBuilder( new BlockableBuildTriggerConfig(project.getName(), new BlockingBehaviour(Result.FAILURE, Result.UNSTABLE, Result.FAILURE), - ImmutableList.of( - new FileBuildParameterFactory("*.txt", encoding, action)), + Collections.singletonList(new FileBuildParameterFactory("*.txt", encoding, action)), Collections.emptyList())); return tBuilder; } @@ -116,13 +112,13 @@ public boolean perform(AbstractBuild build, Launcher launcher, List builds = projectB.getBuilds(); assertEquals(1, builds.size()); - Set values = Sets.newHashSet(); + Set values = new HashSet<>(); for (FreeStyleBuild build : builds) { EnvVars buildEnvVar = builder.getEnvVars().get(build.getId()); assertTrue(buildEnvVar.containsKey("TEST")); values.add(buildEnvVar.get("TEST")); } - assertEquals(ImmutableSet.of("hello_abc"), values); + assertEquals(Collections.singleton("hello_abc"), values); } @@ -159,13 +155,13 @@ public boolean perform(AbstractBuild build, Launcher launcher, List builds = projectB.getBuilds(); assertEquals(2, builds.size()); - Set values = Sets.newHashSet(); + Set values = new HashSet<>(); for (FreeStyleBuild build : builds) { EnvVars buildEnvVar = builder.getEnvVars().get(build.getId()); assertTrue(buildEnvVar.containsKey("TEST")); values.add(buildEnvVar.get("TEST")); } - assertEquals(ImmutableSet.of("hello_abc","hello_xyz"), values); + assertEquals(new HashSet<>(Arrays.asList("hello_abc","hello_xyz")), values); } diff --git a/src/test/java/hudson/plugins/parameterizedtrigger/test/TriggerBuilderTest.java b/src/test/java/hudson/plugins/parameterizedtrigger/test/TriggerBuilderTest.java index a0d0724a..ff774135 100644 --- a/src/test/java/hudson/plugins/parameterizedtrigger/test/TriggerBuilderTest.java +++ b/src/test/java/hudson/plugins/parameterizedtrigger/test/TriggerBuilderTest.java @@ -59,8 +59,6 @@ import java.util.regex.Matcher; import java.io.IOException; -import com.google.common.collect.ImmutableList; - import java.lang.System; import jenkins.model.Jenkins; @@ -235,7 +233,7 @@ public void testConsoleOutputWithCounterParameters() throws Exception{ Project triggerProject = r.createFreeStyleProject(); BlockingBehaviour blockingBehaviour = new BlockingBehaviour(Result.FAILURE, Result.UNSTABLE, Result.FAILURE); - ImmutableList buildParameter = ImmutableList.of(new CounterBuildParameterFactory("0", "2", "1", "TEST=COUNT$COUNT")); + List buildParameter = Collections.singletonList(new CounterBuildParameterFactory("0", "2", "1", "TEST=COUNT$COUNT")); List emptyList = Collections.emptyList(); BlockableBuildTriggerConfig bBTConfig = new BlockableBuildTriggerConfig("project1, project2, project3", blockingBehaviour, buildParameter, emptyList);