From 18e2533cfb85f458736d24b20693f6ab211f23a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20Bostr=C3=B6m?= Date: Tue, 14 Jul 2015 21:58:03 +0200 Subject: [PATCH] Revert "Fixed deprecations" --- .../pipeline/DeliveryPipelineView.java | 33 +-------------- .../jenkins/pipeline/domain/Change.java | 1 - .../jenkins/pipeline/domain/Component.java | 3 +- .../jenkins/pipeline/domain/ManualStep.java | 1 - .../jenkins/pipeline/domain/Pipeline.java | 5 ++- .../diabol/jenkins/pipeline/domain/Stage.java | 2 +- .../diabol/jenkins/pipeline/domain/Task.java | 20 +++++----- .../jenkins/pipeline/domain/Trigger.java | 2 +- .../jenkins/pipeline/domain/UserInfo.java | 2 +- .../promotion/PromotionStatusProvider.java | 1 - .../trigger/BPPManualTriggerResolver.java | 4 +- .../jenkins/pipeline/util/BuildUtil.java | 11 ++++- .../jenkins/pipeline/util/ProjectUtil.java | 1 - .../pipeline/DeliveryPipelineViewTest.java | 36 +++++------------ .../jenkins/pipeline/domain/EdgeTest.java | 40 ------------------- .../jenkins/pipeline/domain/TriggerTest.java | 5 --- .../jenkins/pipeline/domain/UserInfoTest.java | 3 -- .../trigger/BPPManualTriggerTest.java | 17 -------- 18 files changed, 40 insertions(+), 147 deletions(-) delete mode 100644 src/test/java/se/diabol/jenkins/pipeline/domain/EdgeTest.java diff --git a/src/main/java/se/diabol/jenkins/pipeline/DeliveryPipelineView.java b/src/main/java/se/diabol/jenkins/pipeline/DeliveryPipelineView.java index 669782cc8..78901e5f4 100644 --- a/src/main/java/se/diabol/jenkins/pipeline/DeliveryPipelineView.java +++ b/src/main/java/se/diabol/jenkins/pipeline/DeliveryPipelineView.java @@ -33,7 +33,6 @@ import hudson.model.View; import hudson.model.ViewDescriptor; import hudson.model.ViewGroup; -import hudson.model.listeners.ItemListener; import hudson.util.FormValidation; import hudson.util.ListBoxModel; import jenkins.model.Jenkins; @@ -255,7 +254,8 @@ public void setEmbeddedCss(String embeddedCss) { } } - public void onProjectRenamed(Item item, String oldName, String newName) { + @Override + public void onJobRenamed(Item item, String oldName, String newName) { if (componentSpecs != null) { Iterator it = componentSpecs.iterator(); while (it.hasNext()) { @@ -352,7 +352,6 @@ public void triggerRebuild(String projectName, String buildId) { } AbstractBuild build = project.getBuildByNumber(Integer.parseInt(buildId)); - @SuppressWarnings("unchecked") List prevCauses = build.getCauses(); CauseAction causeAction = new CauseAction(); for (Cause cause : prevCauses) { @@ -608,32 +607,4 @@ public FormValidation doCheckName(@QueryParameter String value) { } } - - - @Extension - public static class ItemListenerImpl extends ItemListener { - - @Override - public void onRenamed(Item item, String oldName, String newName) { - notifyView(item, oldName, newName); - } - - @Override - public void onDeleted(Item item) { - notifyView(item, item.getFullName(), null); - } - - - private void notifyView(Item item, String oldName, String newName) { - Collection views = Jenkins.getInstance().getViews(); - for (View view : views) { - if (view instanceof DeliveryPipelineView) { - ((DeliveryPipelineView) view).onProjectRenamed(item, oldName, newName); - } - } - } - - - } - } diff --git a/src/main/java/se/diabol/jenkins/pipeline/domain/Change.java b/src/main/java/se/diabol/jenkins/pipeline/domain/Change.java index d96bba67a..ea6adbed1 100644 --- a/src/main/java/se/diabol/jenkins/pipeline/domain/Change.java +++ b/src/main/java/se/diabol/jenkins/pipeline/domain/Change.java @@ -75,7 +75,6 @@ public static List getChanges(AbstractBuild build) { String changeLink = null; if (repositoryBrowser != null) { try { - @SuppressWarnings("unchecked") URL link = repositoryBrowser.getChangeSetLink(entry); if (link != null) { changeLink = link.toExternalForm(); diff --git a/src/main/java/se/diabol/jenkins/pipeline/domain/Component.java b/src/main/java/se/diabol/jenkins/pipeline/domain/Component.java index dd64ac7b6..74fd7ffb7 100644 --- a/src/main/java/se/diabol/jenkins/pipeline/domain/Component.java +++ b/src/main/java/se/diabol/jenkins/pipeline/domain/Component.java @@ -23,7 +23,7 @@ import java.util.List; -import static com.google.common.base.MoreObjects.toStringHelper; +import static com.google.common.base.Objects.toStringHelper; @ExportedBean(defaultVisibility = AbstractItem.VISIBILITY) public class Component extends AbstractItem { @@ -49,7 +49,6 @@ public String getFirstJob() { } @Exported - @SuppressWarnings("unused") public String getFirstJobUrl() { return firstJobUrl; } diff --git a/src/main/java/se/diabol/jenkins/pipeline/domain/ManualStep.java b/src/main/java/se/diabol/jenkins/pipeline/domain/ManualStep.java index 8f2934d50..734d80a4b 100644 --- a/src/main/java/se/diabol/jenkins/pipeline/domain/ManualStep.java +++ b/src/main/java/se/diabol/jenkins/pipeline/domain/ManualStep.java @@ -85,7 +85,6 @@ public static ManualStep getManualStepLatest(AbstractProject project, AbstractBu List upstreams = getUpstreamManualTriggered(project); for (int i = 0; i < upstreams.size(); i++) { AbstractProject upstream = upstreams.get(i); - @SuppressWarnings("unchecked") AbstractBuild upstreamBuild = BuildUtil.match(upstream.getBuilds(), firstBuild); if (build == null) { if (upstreamBuild != null && !upstreamBuild.isBuilding() && !ProjectUtil.isQueued(project, firstBuild)) { diff --git a/src/main/java/se/diabol/jenkins/pipeline/domain/Pipeline.java b/src/main/java/se/diabol/jenkins/pipeline/domain/Pipeline.java index 2d5debaed..ab17432b8 100644 --- a/src/main/java/se/diabol/jenkins/pipeline/domain/Pipeline.java +++ b/src/main/java/se/diabol/jenkins/pipeline/domain/Pipeline.java @@ -32,7 +32,7 @@ import java.util.Map; import java.util.Set; -import static com.google.common.base.MoreObjects.toStringHelper; +import static com.google.common.base.Objects.toStringHelper; import static com.google.common.collect.Lists.newArrayList; @ExportedBean(defaultVisibility = AbstractItem.VISIBILITY) @@ -206,7 +206,10 @@ public List createPipelineLatest(int noOfPipelines, ItemGroup context) } Pipeline pipelineLatest = new Pipeline(getName(), firstProject, "#" + firstProject.getNextBuildNumber(), pipeLineTimestamp, Trigger.getTriggeredBy(firstProject, null), null, + // Trigger.getTriggeredBy(firstBuild), + // UserInfo.getContributors(firstBuild), pipelineStages, false); + //pipelineLatest.setChanges(pipelineChanges); result.add(pipelineLatest); no--; } diff --git a/src/main/java/se/diabol/jenkins/pipeline/domain/Stage.java b/src/main/java/se/diabol/jenkins/pipeline/domain/Stage.java index e8c54dc2a..d166c8598 100644 --- a/src/main/java/se/diabol/jenkins/pipeline/domain/Stage.java +++ b/src/main/java/se/diabol/jenkins/pipeline/domain/Stage.java @@ -43,7 +43,7 @@ import java.util.Map; import java.util.Set; -import static com.google.common.base.MoreObjects.toStringHelper; +import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Strings.isNullOrEmpty; import static com.google.common.collect.Iterables.concat; import static com.google.common.collect.Lists.newArrayList; diff --git a/src/main/java/se/diabol/jenkins/pipeline/domain/Task.java b/src/main/java/se/diabol/jenkins/pipeline/domain/Task.java index 3d6f6e9b5..70c9db840 100644 --- a/src/main/java/se/diabol/jenkins/pipeline/domain/Task.java +++ b/src/main/java/se/diabol/jenkins/pipeline/domain/Task.java @@ -37,8 +37,6 @@ import static com.google.common.base.Strings.isNullOrEmpty; import static se.diabol.jenkins.pipeline.domain.status.StatusFactory.disabled; import static se.diabol.jenkins.pipeline.domain.status.StatusFactory.idle; -import static com.google.common.base.MoreObjects.toStringHelper; - @ExportedBean(defaultVisibility = AbstractItem.VISIBILITY) public class Task extends AbstractItem { @@ -217,13 +215,15 @@ private AbstractProject getProject(Task task, ItemGroup context) { @Override public String toString() { - return toStringHelper(this) - .add("id", id) - .add("link", link) - .add("testResult", testResult) - .add("status", status) - .add("manueal", manual) - .add("buildId", buildId) - .add("downstreamTasks", downstreamTasks).toString(); + final StringBuilder sb = new StringBuilder("Task{"); + sb.append("id='").append(id).append('\''); + sb.append(", link='").append(link).append('\''); + sb.append(", testResult=").append(testResult); + sb.append(", status=").append(status); + sb.append(", manual=").append(manual); + sb.append(", buildId='").append(buildId).append('\''); + sb.append(", downstreamTasks=").append(downstreamTasks); + sb.append('}'); + return sb.toString(); } } diff --git a/src/main/java/se/diabol/jenkins/pipeline/domain/Trigger.java b/src/main/java/se/diabol/jenkins/pipeline/domain/Trigger.java index c9371c954..10b77ca80 100644 --- a/src/main/java/se/diabol/jenkins/pipeline/domain/Trigger.java +++ b/src/main/java/se/diabol/jenkins/pipeline/domain/Trigger.java @@ -106,7 +106,7 @@ public static List getTriggeredBy(AbstractProject project, AbstractBuil return new ArrayList(result); } - protected static String getDisplayName(String userName) { + private static String getDisplayName(String userName) { User user = Jenkins.getInstance().getUser(userName); if (user != null) { return user.getDisplayName(); diff --git a/src/main/java/se/diabol/jenkins/pipeline/domain/UserInfo.java b/src/main/java/se/diabol/jenkins/pipeline/domain/UserInfo.java index 8c8809fa7..8184e6225 100644 --- a/src/main/java/se/diabol/jenkins/pipeline/domain/UserInfo.java +++ b/src/main/java/se/diabol/jenkins/pipeline/domain/UserInfo.java @@ -62,7 +62,7 @@ public boolean equals(Object o) { UserInfo userInfo = (UserInfo) o; - return userInfo.getName().equals(getName()); + return userInfo.getName().equals(userInfo.getName()); } @Override diff --git a/src/main/java/se/diabol/jenkins/pipeline/domain/status/promotion/PromotionStatusProvider.java b/src/main/java/se/diabol/jenkins/pipeline/domain/status/promotion/PromotionStatusProvider.java index 63f118d04..2497a0cce 100644 --- a/src/main/java/se/diabol/jenkins/pipeline/domain/status/promotion/PromotionStatusProvider.java +++ b/src/main/java/se/diabol/jenkins/pipeline/domain/status/promotion/PromotionStatusProvider.java @@ -30,7 +30,6 @@ public class PromotionStatusProvider extends AbstractPromotionStatusProvider { // Force a classloading error plugin isn't available - @SuppressWarnings("UnusedDeclaration") static final public Class CLASS = PromotedBuildAction.class; static final String DEFAULT_ICON_SIZE = "16x16"; diff --git a/src/main/java/se/diabol/jenkins/pipeline/trigger/BPPManualTriggerResolver.java b/src/main/java/se/diabol/jenkins/pipeline/trigger/BPPManualTriggerResolver.java index 9a8044f12..079f9a7d2 100644 --- a/src/main/java/se/diabol/jenkins/pipeline/trigger/BPPManualTriggerResolver.java +++ b/src/main/java/se/diabol/jenkins/pipeline/trigger/BPPManualTriggerResolver.java @@ -32,8 +32,7 @@ public class BPPManualTriggerResolver extends ManualTriggerResolver { // Force a classloading error plugin isn't available - @SuppressWarnings("unused") - public static final Class CLASS = BuildPipelineTrigger.class; + public static final Class clazz = BuildPipelineTrigger.class; @Override @@ -71,7 +70,6 @@ public List getUpstreamManualTriggered(AbstractProject pr List result = new ArrayList(); List upstreamProjects = project.getUpstreamProjects(); for (AbstractProject upstream : upstreamProjects) { - @SuppressWarnings("unchecked") DescribableList> upstreamPublishersLists = upstream.getPublishersList(); for (Publisher upstreamPub : upstreamPublishersLists) { if (upstreamPub instanceof BuildPipelineTrigger) { diff --git a/src/main/java/se/diabol/jenkins/pipeline/util/BuildUtil.java b/src/main/java/se/diabol/jenkins/pipeline/util/BuildUtil.java index d34b9ba0d..95f6a59a8 100644 --- a/src/main/java/se/diabol/jenkins/pipeline/util/BuildUtil.java +++ b/src/main/java/se/diabol/jenkins/pipeline/util/BuildUtil.java @@ -92,8 +92,15 @@ public static AbstractBuild match(RunList runList, Abst public static boolean equals(AbstractBuild b1, AbstractBuild b2) { - return b1 != null && b2 != null && b1.getProject().getFullName().equals(b2.getProject().getFullName()) - && b1.getNumber() == b2.getNumber(); + if (b1 != null && b2 != null) { + if (b1.getProject().getFullName().equals(b2.getProject().getFullName()) && b1.getNumber() == b2.getNumber()) { + return true; + } else { + return false; + } + } else { + return false; + } } diff --git a/src/main/java/se/diabol/jenkins/pipeline/util/ProjectUtil.java b/src/main/java/se/diabol/jenkins/pipeline/util/ProjectUtil.java index 64608b94c..8ee7eb364 100644 --- a/src/main/java/se/diabol/jenkins/pipeline/util/ProjectUtil.java +++ b/src/main/java/se/diabol/jenkins/pipeline/util/ProjectUtil.java @@ -136,7 +136,6 @@ public static boolean isQueued(AbstractProject project, AbstractBuild firstBuild return true; } else { List causes = Util.filter(project.getQueueItem().getCauses(), Cause.UpstreamCause.class); - @SuppressWarnings("unchecked") List> upstreamProjects = project.getUpstreamProjects(); for (AbstractProject upstreamProject : upstreamProjects) { AbstractBuild upstreamBuild = BuildUtil.match(upstreamProject.getBuilds(), firstBuild); diff --git a/src/test/java/se/diabol/jenkins/pipeline/DeliveryPipelineViewTest.java b/src/test/java/se/diabol/jenkins/pipeline/DeliveryPipelineViewTest.java index 5af93d02b..52734084c 100644 --- a/src/test/java/se/diabol/jenkins/pipeline/DeliveryPipelineViewTest.java +++ b/src/test/java/se/diabol/jenkins/pipeline/DeliveryPipelineViewTest.java @@ -66,20 +66,15 @@ public class DeliveryPipelineViewTest { public JenkinsRule jenkins = new JenkinsRule(); @Test - public void testOnJobRenamed() throws Exception { - - FreeStyleProject p1 = jenkins.createFreeStyleProject("build1"); - + @WithoutJenkins + public void testOnJobRenamed() { List componentSpecs = new ArrayList(); componentSpecs.add(new DeliveryPipelineView.ComponentSpec("comp1", "build1")); componentSpecs.add(new DeliveryPipelineView.ComponentSpec("comp2", "build2")); DeliveryPipelineView view = new DeliveryPipelineView("Test"); view.setComponentSpecs(componentSpecs); - jenkins.getInstance().addView(view); - - p1.renameTo("newbuild"); - + view.onJobRenamed(null, "build1", "newbuild"); assertEquals("newbuild", view.getComponentSpecs().get(0).getFirstJob()); } @@ -89,32 +84,24 @@ public void testOnJobRenamed() throws Exception { public void testOnJobRenamedNoComponentSpecs() { DeliveryPipelineView view = new DeliveryPipelineView("Test"); //Rename - view.onProjectRenamed(null, "build1", "newbuild"); + view.onJobRenamed(null, "build1", "newbuild"); //Delete - view.onProjectRenamed(null, "build1", null); + view.onJobRenamed(null, "build1", null); } @Test - public void testOnJobRenamedDelete() throws Exception { - - FreeStyleProject p1 = jenkins.createFreeStyleProject("build1"); - + @WithoutJenkins + public void testOnJobRenamedDelete() { List componentSpecs = new ArrayList(); componentSpecs.add(new DeliveryPipelineView.ComponentSpec("comp1", "build1")); componentSpecs.add(new DeliveryPipelineView.ComponentSpec("comp2", "build2")); - - DeliveryPipelineView view = new DeliveryPipelineView("Test"); view.setComponentSpecs(componentSpecs); - - jenkins.getInstance().addView(view); - assertEquals(2, view.getComponentSpecs().size()); - - p1.delete(); + view.onJobRenamed(null, "build1", null); assertEquals(1, view.getComponentSpecs().size()); @@ -135,7 +122,6 @@ public void testSubmit() throws Exception { @Test @WithoutJenkins - @SuppressWarnings("all") public void testDoCheckUpdateInterval() { DeliveryPipelineView.DescriptorImpl d = new DeliveryPipelineView.DescriptorImpl(); assertEquals(FormValidation.Kind.ERROR, d.doCheckUpdateInterval("").kind); @@ -383,7 +369,6 @@ public void testGetPipelines() throws Exception { @Test @WithoutJenkins - @SuppressWarnings("all") public void testDoCheckName() { DeliveryPipelineView.ComponentSpec.DescriptorImpl d = new DeliveryPipelineView.ComponentSpec.DescriptorImpl(); assertEquals(FormValidation.Kind.ERROR, d.doCheckName(null).kind); @@ -396,7 +381,6 @@ public void testDoCheckName() { @Test @WithoutJenkins - @SuppressWarnings("all") public void testDoCheckRegexpFirstJob() { DeliveryPipelineView.RegExpSpec.DescriptorImpl d = new DeliveryPipelineView.RegExpSpec.DescriptorImpl(); assertEquals(FormValidation.Kind.OK, d.doCheckRegexp(null).kind); @@ -533,11 +517,11 @@ public void testDoCreateItem() throws Exception { testDoCreateItem("testDoCreateItem", ""); DeliveryPipelineView view = new DeliveryPipelineView("Delivery Pipeline"); - jenkins.getInstance().addView(view); + jenkins.hudson.addView(view); testDoCreateItem("testDoCreateItemAsTheDefaultViewFromTheViewUrl", "view/Delivery%20Pipeline/"); - jenkins.getInstance().setPrimaryView(view); + jenkins.hudson.setPrimaryView(view); testDoCreateItem("testDoCreateItemAsTheDefaultView", ""); } diff --git a/src/test/java/se/diabol/jenkins/pipeline/domain/EdgeTest.java b/src/test/java/se/diabol/jenkins/pipeline/domain/EdgeTest.java deleted file mode 100644 index 7ad1c2991..000000000 --- a/src/test/java/se/diabol/jenkins/pipeline/domain/EdgeTest.java +++ /dev/null @@ -1,40 +0,0 @@ -/* -This file is part of Delivery Pipeline Plugin. - -Delivery Pipeline Plugin is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -Delivery Pipeline Plugin is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with Delivery Pipeline Plugin. -If not, see . -*/ -package se.diabol.jenkins.pipeline.domain; - -import org.junit.Test; - -import java.util.Collections; - -import static org.junit.Assert.assertEquals; - -public class EdgeTest { - - - @Test - public void testGetSet() { - Stage stageA = new Stage("A", Collections.emptyList()); - Stage stageB = new Stage("B", Collections.emptyList()); - - Edge edge = new Edge(stageA, stageB); - - assertEquals(edge.getSource(), stageA); - assertEquals(edge.getTarget(), stageB); - } - -} diff --git a/src/test/java/se/diabol/jenkins/pipeline/domain/TriggerTest.java b/src/test/java/se/diabol/jenkins/pipeline/domain/TriggerTest.java index 8eebb4d3f..d01977203 100644 --- a/src/test/java/se/diabol/jenkins/pipeline/domain/TriggerTest.java +++ b/src/test/java/se/diabol/jenkins/pipeline/domain/TriggerTest.java @@ -266,9 +266,4 @@ public void testHashcodeEquals() { assertNotEquals(trigger1.hashCode(), trigger3.hashCode()); } - @Test - public void testNullUser() { - assertEquals("anonymous", Trigger.getDisplayName(null)); - } - } diff --git a/src/test/java/se/diabol/jenkins/pipeline/domain/UserInfoTest.java b/src/test/java/se/diabol/jenkins/pipeline/domain/UserInfoTest.java index 05dd67bff..118cd5d26 100644 --- a/src/test/java/se/diabol/jenkins/pipeline/domain/UserInfoTest.java +++ b/src/test/java/se/diabol/jenkins/pipeline/domain/UserInfoTest.java @@ -96,7 +96,6 @@ public void testGetTriggeredByWithCulprits() throws Exception { @Test @WithoutJenkins - @SuppressWarnings("all") public void testEqualsHashCode() { UserInfo userInfo1 = new UserInfo("name", null); assertTrue(userInfo1.equals(userInfo1)); @@ -106,11 +105,9 @@ public void testEqualsHashCode() { assertFalse(userInfo2.equals(null)); assertFalse(userInfo2.equals("name")); - UserInfo userInfo3 = new UserInfo("name1", "http://nowhere.com"); assertEquals(userInfo1.hashCode(), userInfo2.hashCode()); assertNotEquals(userInfo1.hashCode(), userInfo3.hashCode()); - assertNotEquals(userInfo1, userInfo3); } } diff --git a/src/test/java/se/diabol/jenkins/pipeline/trigger/BPPManualTriggerTest.java b/src/test/java/se/diabol/jenkins/pipeline/trigger/BPPManualTriggerTest.java index a29f82aab..65474f274 100644 --- a/src/test/java/se/diabol/jenkins/pipeline/trigger/BPPManualTriggerTest.java +++ b/src/test/java/se/diabol/jenkins/pipeline/trigger/BPPManualTriggerTest.java @@ -18,7 +18,6 @@ package se.diabol.jenkins.pipeline.trigger; import au.com.centrumsystems.hudson.plugin.buildpipeline.trigger.BuildPipelineTrigger; -import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; import jenkins.model.Jenkins; import org.junit.Rule; @@ -89,20 +88,4 @@ public void triggerManualWhenProjectNull() throws Exception { } - @Test - public void triggerInvalidBuild() throws Exception { - BPPManualTrigger trigger = new BPPManualTrigger(); - FreeStyleProject a = jenkins.createFreeStyleProject( "a"); - FreeStyleProject b = jenkins.createFreeStyleProject( "b"); - FreeStyleBuild build = jenkins.buildAndAssertSuccess(a); - - try { - trigger.triggerManual(b,a , build.getId(), Jenkins.getInstance()); - fail(); - } catch (TriggerException e) { - //Should throw exception - } - - } - }