diff --git a/core/pom.xml b/core/pom.xml index 7e2c3ad217..4ee22e5f5a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -61,7 +61,7 @@ THE SOFTWARE. com.infradna.tool bridge-method-injector - 1.3 + 1.4 @@ -410,7 +410,7 @@ THE SOFTWARE. com.infradna.tool bridge-method-annotation - 1.2 + 1.4 diff --git a/core/src/main/java/hudson/matrix/MatrixProject.java b/core/src/main/java/hudson/matrix/MatrixProject.java index 847a44c0c2..689e1dbf56 100644 --- a/core/src/main/java/hudson/matrix/MatrixProject.java +++ b/core/src/main/java/hudson/matrix/MatrixProject.java @@ -151,7 +151,11 @@ public class MatrixProject extends AbstractProject im private String customWorkspace; public MatrixProject(String name) { - super(Hudson.getInstance(), name); + this(Hudson.getInstance(), name); + } + + public MatrixProject(ItemGroup parent, String name) { + super(parent, name); } public AxisList getAxes() { @@ -471,11 +475,6 @@ public class MatrixProject extends AbstractProject im return f; } - @Override - public Hudson getParent() { - return Hudson.getInstance(); - } - /** * @see #getJDKs() */ diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java index 04d0c3dc55..9117bcb6d6 100644 --- a/core/src/main/java/hudson/model/AbstractItem.java +++ b/core/src/main/java/hudson/model/AbstractItem.java @@ -24,6 +24,7 @@ */ package hudson.model; +import com.infradna.tool.bridge_method_injector.WithBridgeMethods; import hudson.XmlFile; import hudson.Util; import hudson.Functions; @@ -115,6 +116,10 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet return parent.getRootDirFor(this); } + /** + * This bridge method is to maintain binary compatibility with {@link TopLevelItem#getParent()}. + */ + @WithBridgeMethods(value=Hudson.class,castRequired=true) public ItemGroup getParent() { assert parent!=null; return parent; diff --git a/core/src/main/java/hudson/model/ExternalJob.java b/core/src/main/java/hudson/model/ExternalJob.java index 876b443c02..ee38f1c079 100644 --- a/core/src/main/java/hudson/model/ExternalJob.java +++ b/core/src/main/java/hudson/model/ExternalJob.java @@ -42,12 +42,11 @@ import java.io.IOException; */ public class ExternalJob extends ViewJob implements TopLevelItem { public ExternalJob(String name) { - super(Hudson.getInstance(),name); + this(Hudson.getInstance(),name); } - @Override - public Hudson getParent() { - return (Hudson)super.getParent(); + public ExternalJob(ItemGroup parent, String name) { + super(parent,name); } @Override diff --git a/core/src/main/java/hudson/model/FreeStyleProject.java b/core/src/main/java/hudson/model/FreeStyleProject.java index d61ab39c97..67ea1f3367 100644 --- a/core/src/main/java/hudson/model/FreeStyleProject.java +++ b/core/src/main/java/hudson/model/FreeStyleProject.java @@ -46,20 +46,22 @@ public class FreeStyleProject extends Project i */ private String customWorkspace; + /** + * @deprecated as of 1.390 + */ public FreeStyleProject(Hudson parent, String name) { super(parent, name); } + public FreeStyleProject(ItemGroup parent, String name) { + super(parent, name); + } + @Override protected Class getBuildClass() { return FreeStyleBuild.class; } - @Override - public Hudson getParent() { - return Hudson.getInstance(); - } - public String getCustomWorkspace() { return customWorkspace; } diff --git a/core/src/main/java/hudson/model/TopLevelItem.java b/core/src/main/java/hudson/model/TopLevelItem.java index 54c711f511..af0127dc99 100644 --- a/core/src/main/java/hudson/model/TopLevelItem.java +++ b/core/src/main/java/hudson/model/TopLevelItem.java @@ -23,8 +23,8 @@ */ package hudson.model; -import hudson.ExtensionPoint; import hudson.Extension; +import hudson.ExtensionPoint; /** * {@link Item} that can be directly displayed under {@link Hudson}. @@ -36,11 +36,6 @@ import hudson.Extension; * @author Kohsuke Kawaguchi */ public interface TopLevelItem extends Item, ExtensionPoint, Describable { - /** - * By definition the parent of the top-level item is always {@link Hudson}. - */ - Hudson getParent(); - /** * * @see Describable#getDescriptor() diff --git a/core/src/main/java/hudson/model/ViewJob.java b/core/src/main/java/hudson/model/ViewJob.java index 9e24190ee2..a3395d449a 100644 --- a/core/src/main/java/hudson/model/ViewJob.java +++ b/core/src/main/java/hudson/model/ViewJob.java @@ -76,10 +76,17 @@ public abstract class ViewJob, RunT extends Run< reloadThread.start(); } + /** + * @deprecated as of 1.390 + */ protected ViewJob(Hudson parent, String name) { super(parent,name); } + protected ViewJob(ItemGroup parent, String name) { + super(parent,name); + } + public boolean isBuildable() { return false; } diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java index 33591c8fb7..94d493e902 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java @@ -225,6 +225,10 @@ public final class MavenModuleSet extends AbstractMavenProject>(this); public MavenModuleSet(String name) { + this(Hudson.getInstance(),name); + } + + public MavenModuleSet(ItemGroup parent, String name) { super(Hudson.getInstance(),name); } @@ -233,10 +237,6 @@ public final class MavenModuleSet extends AbstractMavenProject getItems() { return modules.values(); }