diff --git a/core/src/main/java/hudson/FileSystemProvisionerDescriptor.java b/core/src/main/java/hudson/FileSystemProvisionerDescriptor.java index 04f71f32e3..4ee6f14426 100644 --- a/core/src/main/java/hudson/FileSystemProvisionerDescriptor.java +++ b/core/src/main/java/hudson/FileSystemProvisionerDescriptor.java @@ -12,10 +12,6 @@ import java.io.IOException; * @author Kohsuke Kawaguchi */ public abstract class FileSystemProvisionerDescriptor extends Descriptor implements ExtensionPoint { - protected FileSystemProvisionerDescriptor(Class clazz) { - super(clazz); - } - /** * Called to clean up a workspace that may potentially belong to this {@link FileSystemProvisioner}. * diff --git a/core/src/main/java/hudson/matrix/MatrixProject.java b/core/src/main/java/hudson/matrix/MatrixProject.java index f3b29e14b6..207cc191ef 100644 --- a/core/src/main/java/hudson/matrix/MatrixProject.java +++ b/core/src/main/java/hudson/matrix/MatrixProject.java @@ -476,10 +476,6 @@ public class MatrixProject extends AbstractProject im public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl(); public static final class DescriptorImpl extends TopLevelItemDescriptor { - private DescriptorImpl() { - super(MatrixProject.class); - } - public String getDisplayName() { return Messages.MatrixProject_DisplayName(); } diff --git a/core/src/main/java/hudson/maven/MavenModuleSet.java b/core/src/main/java/hudson/maven/MavenModuleSet.java index 73e38d3bfd..46f65ae878 100644 --- a/core/src/main/java/hudson/maven/MavenModuleSet.java +++ b/core/src/main/java/hudson/maven/MavenModuleSet.java @@ -589,10 +589,6 @@ public final class MavenModuleSet extends AbstractMavenProject { - private DescriptorImpl() { - super(MavenRedeployer.class); - } - public boolean isApplicable(Class jobType) { return AbstractMavenProject.class.isAssignableFrom(jobType); } diff --git a/core/src/main/java/hudson/maven/MavenReporterDescriptor.java b/core/src/main/java/hudson/maven/MavenReporterDescriptor.java index 622496759c..9d7abb851d 100644 --- a/core/src/main/java/hudson/maven/MavenReporterDescriptor.java +++ b/core/src/main/java/hudson/maven/MavenReporterDescriptor.java @@ -2,6 +2,7 @@ package hudson.maven; import hudson.maven.reporters.MavenArtifactArchiver; import hudson.model.Descriptor; +import hudson.model.Describable; import org.apache.commons.jelly.JellyException; import org.kohsuke.stapler.MetaClass; import org.kohsuke.stapler.StaplerRequest; @@ -18,6 +19,16 @@ public abstract class MavenReporterDescriptor extends Descriptor super(clazz); } + /** + * Infers the type of the corresponding {@link Describable} from the outer class. + * This version works when you follow the common convention, where a descriptor + * is written as the static nested class of the describable class. + * + * @since 1.278 + */ + protected MavenReporterDescriptor() { + } + /** * Returns an instance used for automatic {@link MavenReporter} activation. * diff --git a/core/src/main/java/hudson/maven/RedeployPublisher.java b/core/src/main/java/hudson/maven/RedeployPublisher.java index 21ba59b2bf..dcb9110246 100644 --- a/core/src/main/java/hudson/maven/RedeployPublisher.java +++ b/core/src/main/java/hudson/maven/RedeployPublisher.java @@ -99,8 +99,7 @@ public class RedeployPublisher extends Publisher { public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl(); public static class DescriptorImpl extends BuildStepDescriptor { - public DescriptorImpl() { - super(RedeployPublisher.class); + private DescriptorImpl() { } protected DescriptorImpl(Class clazz) { diff --git a/core/src/main/java/hudson/maven/reporters/BuildInfoRecorder.java b/core/src/main/java/hudson/maven/reporters/BuildInfoRecorder.java index 8615449d37..26b834974d 100644 --- a/core/src/main/java/hudson/maven/reporters/BuildInfoRecorder.java +++ b/core/src/main/java/hudson/maven/reporters/BuildInfoRecorder.java @@ -69,10 +69,6 @@ public class BuildInfoRecorder extends MavenReporter { public static final class DescriptorImpl extends MavenReporterDescriptor { public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl(); - private DescriptorImpl() { - super(BuildInfoRecorder.class); - } - public String getDisplayName() { return Messages.BuildInfoRecorder_DisplayName(); } diff --git a/core/src/main/java/hudson/maven/reporters/MavenArtifactArchiver.java b/core/src/main/java/hudson/maven/reporters/MavenArtifactArchiver.java index 7c8a0e1a36..34dd596494 100644 --- a/core/src/main/java/hudson/maven/reporters/MavenArtifactArchiver.java +++ b/core/src/main/java/hudson/maven/reporters/MavenArtifactArchiver.java @@ -136,10 +136,6 @@ public class MavenArtifactArchiver extends MavenReporter { public static final class DescriptorImpl extends MavenReporterDescriptor { public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl(); - private DescriptorImpl() { - super(MavenArtifactArchiver.class); - } - public String getDisplayName() { return Messages.MavenArtifactArchiver_DisplayName(); } diff --git a/core/src/main/java/hudson/maven/reporters/MavenFingerprinter.java b/core/src/main/java/hudson/maven/reporters/MavenFingerprinter.java index 9cf4b13852..490b1dc2da 100644 --- a/core/src/main/java/hudson/maven/reporters/MavenFingerprinter.java +++ b/core/src/main/java/hudson/maven/reporters/MavenFingerprinter.java @@ -128,10 +128,6 @@ public class MavenFingerprinter extends MavenReporter { public static final class DescriptorImpl extends MavenReporterDescriptor { public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl(); - private DescriptorImpl() { - super(MavenFingerprinter.class); - } - public String getDisplayName() { return Messages.MavenFingerprinter_DisplayName(); } diff --git a/core/src/main/java/hudson/maven/reporters/MavenJavadocArchiver.java b/core/src/main/java/hudson/maven/reporters/MavenJavadocArchiver.java index 603578f798..616922515c 100644 --- a/core/src/main/java/hudson/maven/reporters/MavenJavadocArchiver.java +++ b/core/src/main/java/hudson/maven/reporters/MavenJavadocArchiver.java @@ -98,10 +98,6 @@ public class MavenJavadocArchiver extends MavenReporter { public static final class DescriptorImpl extends MavenReporterDescriptor { public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl(); - private DescriptorImpl() { - super(MavenJavadocArchiver.class); - } - public String getDisplayName() { return Messages.MavenJavadocArchiver_DisplayName(); } diff --git a/core/src/main/java/hudson/maven/reporters/MavenMailer.java b/core/src/main/java/hudson/maven/reporters/MavenMailer.java index a3f0375ab8..11279be16a 100644 --- a/core/src/main/java/hudson/maven/reporters/MavenMailer.java +++ b/core/src/main/java/hudson/maven/reporters/MavenMailer.java @@ -38,10 +38,6 @@ public class MavenMailer extends MavenReporter { public static final class DescriptorImpl extends MavenReporterDescriptor { public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl(); - private DescriptorImpl() { - super(MavenMailer.class); - } - public String getDisplayName() { return Messages.MavenMailer_DisplayName(); } diff --git a/core/src/main/java/hudson/maven/reporters/MavenSiteArchiver.java b/core/src/main/java/hudson/maven/reporters/MavenSiteArchiver.java index bdde78cb2e..a04ec070f8 100644 --- a/core/src/main/java/hudson/maven/reporters/MavenSiteArchiver.java +++ b/core/src/main/java/hudson/maven/reporters/MavenSiteArchiver.java @@ -111,10 +111,6 @@ public class MavenSiteArchiver extends MavenReporter { public static final class DescriptorImpl extends MavenReporterDescriptor { public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl(); - private DescriptorImpl() { - super(MavenSiteArchiver.class); - } - public String getDisplayName() { return "Maven site"; } diff --git a/core/src/main/java/hudson/maven/reporters/ReportCollector.java b/core/src/main/java/hudson/maven/reporters/ReportCollector.java index 1c7e4eeb74..6357d10eb3 100644 --- a/core/src/main/java/hudson/maven/reporters/ReportCollector.java +++ b/core/src/main/java/hudson/maven/reporters/ReportCollector.java @@ -80,10 +80,6 @@ public class ReportCollector extends MavenReporter { public static final class DescriptorImpl extends MavenReporterDescriptor { public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl(); - private DescriptorImpl() { - super(ReportCollector.class); - } - public String getDisplayName() { return Messages.ReportCollector_DisplayName(); } diff --git a/core/src/main/java/hudson/maven/reporters/SurefireArchiver.java b/core/src/main/java/hudson/maven/reporters/SurefireArchiver.java index 18081c62ab..932df8699c 100644 --- a/core/src/main/java/hudson/maven/reporters/SurefireArchiver.java +++ b/core/src/main/java/hudson/maven/reporters/SurefireArchiver.java @@ -141,10 +141,6 @@ public class SurefireArchiver extends MavenReporter { public static final class DescriptorImpl extends MavenReporterDescriptor { public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl(); - private DescriptorImpl() { - super(SurefireArchiver.class); - } - public String getDisplayName() { return Messages.SurefireArchiver_DisplayName(); } diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java index 43399bf479..175c4cd053 100644 --- a/core/src/main/java/hudson/model/Descriptor.java +++ b/core/src/main/java/hudson/model/Descriptor.java @@ -172,6 +172,32 @@ public abstract class Descriptor> implements Saveable { // load(); } + /** + * Infers the type of the corresponding {@link Describable} from the outer class. + * This version works when you follow the common convention, where a descriptor + * is written as the static nested class of the describable class. + * + * @since 1.278 + */ + protected Descriptor() { + this.clazz = (Class)getClass().getEnclosingClass(); + if(clazz==null) + throw new AssertionError(getClass()+" doesn't have an outer class. Use the constructor that takes the Class object explicitly."); + + // detect an type error + Type bt = Types.getBaseClass(getClass(), Descriptor.class); + if (bt instanceof ParameterizedType) { + ParameterizedType pt = (ParameterizedType) bt; + // this 't' is the closest approximation of T of Descriptor. + Class t = Types.erasure(pt.getActualTypeArguments()[0]); + if(!t.isAssignableFrom(clazz)) + throw new AssertionError("Outer class "+clazz+" of "+getClass()+" is not assignable to "+t+". Perhaps wrong outer class?"); + } + + // same as the init code above + ALL.add(this); + } + /** * Human readable name of this kind of configurable object. */ diff --git a/core/src/main/java/hudson/model/ExternalJob.java b/core/src/main/java/hudson/model/ExternalJob.java index b1d3cbca0d..6db5a007b8 100644 --- a/core/src/main/java/hudson/model/ExternalJob.java +++ b/core/src/main/java/hudson/model/ExternalJob.java @@ -1,6 +1,5 @@ package hudson.model; -import hudson.model.AbstractProject; import hudson.model.RunMap.Constructor; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; @@ -81,10 +80,6 @@ public class ExternalJob extends ViewJob implements Top } public static final class DescriptorImpl extends TopLevelItemDescriptor { - private DescriptorImpl() { - super(ExternalJob.class); - } - public String getDisplayName() { return Messages.ExternalJob_DisplayName(); } diff --git a/core/src/main/java/hudson/model/FileParameterDefinition.java b/core/src/main/java/hudson/model/FileParameterDefinition.java index 65c646f978..9fcaec62de 100644 --- a/core/src/main/java/hudson/model/FileParameterDefinition.java +++ b/core/src/main/java/hudson/model/FileParameterDefinition.java @@ -31,11 +31,6 @@ public class FileParameterDefinition extends ParameterDefinition { public static final ParameterDescriptor DESCRIPTOR = new DescriptorImpl(); public static class DescriptorImpl extends ParameterDescriptor { - - protected DescriptorImpl() { - super(FileParameterDefinition.class); - } - @Override public String getDisplayName() { return Messages.FileParameterDefinition_DisplayName(); diff --git a/core/src/main/java/hudson/model/FreeStyleProject.java b/core/src/main/java/hudson/model/FreeStyleProject.java index c7f510d965..1efb3d3da9 100644 --- a/core/src/main/java/hudson/model/FreeStyleProject.java +++ b/core/src/main/java/hudson/model/FreeStyleProject.java @@ -75,10 +75,6 @@ public class FreeStyleProject extends Project i public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl(); public static final class DescriptorImpl extends TopLevelItemDescriptor { - private DescriptorImpl() { - super(FreeStyleProject.class); - } - public String getDisplayName() { return Messages.FreeStyleProject_DisplayName(); } diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index 8e3e77cc0b..1dcf45728c 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/core/src/main/java/hudson/model/Hudson.java @@ -1181,9 +1181,6 @@ public final class Hudson extends AbstractModelObject implements ItemGroup> { super(clazz); } + /** + * Infers the type of the corresponding {@link JobProperty} from the outer class. + * This version works when you follow the common convention, where a descriptor + * is written as the static nested class of the describable class. + * + * @since 1.278 + */ + protected JobPropertyDescriptor() { + } + /** * {@inheritDoc} * diff --git a/core/src/main/java/hudson/model/PageDecorator.java b/core/src/main/java/hudson/model/PageDecorator.java index aa9bea8f62..99aeebf4ea 100644 --- a/core/src/main/java/hudson/model/PageDecorator.java +++ b/core/src/main/java/hudson/model/PageDecorator.java @@ -51,6 +51,16 @@ public abstract class PageDecorator extends Descriptor implements super(yourClass); } + /** + * Infers the type of the corresponding {@link Describable} from the outer class. + * This version works when you follow the common convention, where a descriptor + * is written as the static nested class of the describable class. + * + * @since 1.278 + */ + protected PageDecorator() { + } + public final Descriptor getDescriptor() { return this; } diff --git a/core/src/main/java/hudson/model/ParameterDefinition.java b/core/src/main/java/hudson/model/ParameterDefinition.java index e2870e828d..7d744d8df3 100644 --- a/core/src/main/java/hudson/model/ParameterDefinition.java +++ b/core/src/main/java/hudson/model/ParameterDefinition.java @@ -118,6 +118,16 @@ public abstract class ParameterDefinition implements super(klazz); } + /** + * Infers the type of the corresponding {@link ParameterDescriptor} from the outer class. + * This version works when you follow the common convention, where a descriptor + * is written as the static nested class of the describable class. + * + * @since 1.278 + */ + protected ParameterDescriptor() { + } + public String getValuePage() { return getViewPage(clazz, "index.jelly"); } diff --git a/core/src/main/java/hudson/model/ParametersDefinitionProperty.java b/core/src/main/java/hudson/model/ParametersDefinitionProperty.java index de69327428..84440a7557 100644 --- a/core/src/main/java/hudson/model/ParametersDefinitionProperty.java +++ b/core/src/main/java/hudson/model/ParametersDefinitionProperty.java @@ -117,11 +117,6 @@ public class ParametersDefinitionProperty extends JobProperty jobType) { return AbstractProject.class.isAssignableFrom(jobType); @@ -146,7 +141,6 @@ public class ParametersDefinitionProperty extends JobProperty { super(clazz); } + /** + * Infers the type of the corresponding {@link TopLevelItem} from the outer class. + * This version works when you follow the common convention, where a descriptor + * is written as the static nested class of the describable class. + * + * @since 1.278 + */ + protected TopLevelItemDescriptor() { + } + /** * {@inheritDoc} * diff --git a/core/src/main/java/hudson/model/UserPropertyDescriptor.java b/core/src/main/java/hudson/model/UserPropertyDescriptor.java index 59a9fc0b30..c32f70d229 100644 --- a/core/src/main/java/hudson/model/UserPropertyDescriptor.java +++ b/core/src/main/java/hudson/model/UserPropertyDescriptor.java @@ -10,6 +10,16 @@ public abstract class UserPropertyDescriptor extends Descriptor { super(clazz); } + /** + * Infers the type of the corresponding {@link Describable} from the outer class. + * This version works when you follow the common convention, where a descriptor + * is written as the static nested class of the describable class. + * + * @since 1.278 + */ + protected UserPropertyDescriptor() { + } + /** * Creates a default instance of {@link UserProperty} to be associated * with {@link User} object that wasn't created from a persisted XML data. diff --git a/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java b/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java index 86ab0ce64e..1decac1381 100644 --- a/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java +++ b/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java @@ -24,6 +24,15 @@ import java.util.logging.Logger; * @author Kohsuke Kawaguchi */ public abstract class AbstractNodeMonitorDescriptor extends Descriptor { + protected AbstractNodeMonitorDescriptor() { + this(HOUR); + } + + protected AbstractNodeMonitorDescriptor(long interval) { + schedule(interval); + + } + protected AbstractNodeMonitorDescriptor(Class clazz) { this(clazz,HOUR); } @@ -31,7 +40,10 @@ public abstract class AbstractNodeMonitorDescriptor extends Descriptor clazz, long interval) { super(clazz); - // check every hour + schedule(interval); + } + + private void schedule(long interval) { Trigger.timer.scheduleAtFixedRate(new SafeTimerTask() { public void doRun() { triggerUpdate(); diff --git a/core/src/main/java/hudson/scm/CVSSCM.java b/core/src/main/java/hudson/scm/CVSSCM.java index abcf77e1d1..d6636cdf13 100644 --- a/core/src/main/java/hudson/scm/CVSSCM.java +++ b/core/src/main/java/hudson/scm/CVSSCM.java @@ -961,7 +961,7 @@ public class CVSSCM extends SCM implements Serializable { } DescriptorImpl() { - super(CVSSCM.class,CVSRepositoryBrowser.class); + super(CVSRepositoryBrowser.class); load(); } diff --git a/core/src/main/java/hudson/scm/NullSCM.java b/core/src/main/java/hudson/scm/NullSCM.java index eea27d5a1c..26755d6bb7 100644 --- a/core/src/main/java/hudson/scm/NullSCM.java +++ b/core/src/main/java/hudson/scm/NullSCM.java @@ -39,7 +39,7 @@ public class NullSCM extends SCM { public static class DescriptorImpl extends SCMDescriptor { public DescriptorImpl() { - super(NullSCM.class, null); + super(null); } public String getDisplayName() { diff --git a/core/src/main/java/hudson/scm/SCMDescriptor.java b/core/src/main/java/hudson/scm/SCMDescriptor.java index 6c0753a5f8..b7d432eae7 100644 --- a/core/src/main/java/hudson/scm/SCMDescriptor.java +++ b/core/src/main/java/hudson/scm/SCMDescriptor.java @@ -1,6 +1,7 @@ package hudson.scm; import hudson.model.Descriptor; +import hudson.model.Describable; import java.util.List; import java.util.Collections; @@ -33,6 +34,17 @@ public abstract class SCMDescriptor extends Descriptor { this.repositoryBrowser = repositoryBrowser; } + /** + * Infers the type of the corresponding {@link SCM} from the outer class. + * This version works when you follow the common convention, where a descriptor + * is written as the static nested class of the describable class. + * + * @since 1.278 + */ + protected SCMDescriptor(Class repositoryBrowser) { + this.repositoryBrowser = repositoryBrowser; + } + /** * Optional method used by the automatic SCM browser inference. * diff --git a/core/src/main/java/hudson/scm/SubversionSCM.java b/core/src/main/java/hudson/scm/SubversionSCM.java index 7761c62e5d..6220c6fab7 100644 --- a/core/src/main/java/hudson/scm/SubversionSCM.java +++ b/core/src/main/java/hudson/scm/SubversionSCM.java @@ -1098,7 +1098,7 @@ public class SubversionSCM extends SCM implements Serializable { } private DescriptorImpl() { - super(SubversionSCM.class,SubversionRepositoryBrowser.class); + super(SubversionRepositoryBrowser.class); load(); } diff --git a/core/src/main/java/hudson/scm/browsers/FishEyeCVS.java b/core/src/main/java/hudson/scm/browsers/FishEyeCVS.java index 491eb3f75b..a43ceabfa5 100644 --- a/core/src/main/java/hudson/scm/browsers/FishEyeCVS.java +++ b/core/src/main/java/hudson/scm/browsers/FishEyeCVS.java @@ -60,11 +60,6 @@ public final class FishEyeCVS extends CVSRepositoryBrowser { public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl(); public static class DescriptorImpl extends Descriptor> { - - public DescriptorImpl() { - super(FishEyeCVS.class); - } - @Override public String getDisplayName() { return "FishEye"; diff --git a/core/src/main/java/hudson/scm/browsers/FishEyeSVN.java b/core/src/main/java/hudson/scm/browsers/FishEyeSVN.java index 6ad87886a1..9bb1c8a7df 100644 --- a/core/src/main/java/hudson/scm/browsers/FishEyeSVN.java +++ b/core/src/main/java/hudson/scm/browsers/FishEyeSVN.java @@ -105,10 +105,6 @@ public class FishEyeSVN extends SubversionRepositoryBrowser { public static final Descriptor> DESCRIPTOR = new DescriptorImpl(); public static class DescriptorImpl extends Descriptor> { - public DescriptorImpl() { - super(FishEyeSVN.class); - } - public String getDisplayName() { return "FishEye"; } diff --git a/core/src/main/java/hudson/scm/browsers/Sventon.java b/core/src/main/java/hudson/scm/browsers/Sventon.java index 9dae0ed96e..f7952190f8 100644 --- a/core/src/main/java/hudson/scm/browsers/Sventon.java +++ b/core/src/main/java/hudson/scm/browsers/Sventon.java @@ -17,7 +17,6 @@ import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; import java.net.URLEncoder; -import java.util.regex.Pattern; /** * {@link RepositoryBrowser} for Sventon. @@ -106,10 +105,6 @@ public class Sventon extends SubversionRepositoryBrowser { public static final Descriptor> DESCRIPTOR = new DescriptorImpl(); public static class DescriptorImpl extends Descriptor> { - public DescriptorImpl() { - super(Sventon.class); - } - public String getDisplayName() { return "Sventon"; } diff --git a/core/src/main/java/hudson/scm/browsers/ViewSVN.java b/core/src/main/java/hudson/scm/browsers/ViewSVN.java index 65667e93cc..b84b381efe 100644 --- a/core/src/main/java/hudson/scm/browsers/ViewSVN.java +++ b/core/src/main/java/hudson/scm/browsers/ViewSVN.java @@ -66,10 +66,6 @@ public class ViewSVN extends SubversionRepositoryBrowser { public static final class DescriptorImpl extends Descriptor> { public static final DescriptorImpl INSTANCE = new DescriptorImpl(); - private DescriptorImpl() { - super(ViewSVN.class); - } - public String getDisplayName() { return "ViewSVN"; } diff --git a/core/src/main/java/hudson/security/AuthorizationMatrixProperty.java b/core/src/main/java/hudson/security/AuthorizationMatrixProperty.java index e8ee25d083..7058ca6884 100644 --- a/core/src/main/java/hudson/security/AuthorizationMatrixProperty.java +++ b/core/src/main/java/hudson/security/AuthorizationMatrixProperty.java @@ -17,9 +17,6 @@ import java.util.Map.Entry; import net.sf.json.JSONObject; -import org.acegisecurity.Authentication; -import org.acegisecurity.acls.sid.GrantedAuthoritySid; -import org.acegisecurity.acls.sid.PrincipalSid; import org.acegisecurity.acls.sid.Sid; import org.kohsuke.stapler.StaplerRequest; @@ -120,10 +117,6 @@ public class AuthorizationMatrixProperty extends JobProperty> { return amp; } - protected DescriptorImpl() { - super(AuthorizationMatrixProperty.class); - } - @Override public boolean isApplicable(Class jobType) { // only applicable when ProjectMatrixAuthorizationStrategy is in charge diff --git a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java index ca490d28b0..117f9e8917 100644 --- a/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java +++ b/core/src/main/java/hudson/security/HudsonPrivateSecurityRealm.java @@ -361,10 +361,6 @@ public class HudsonPrivateSecurityRealm extends SecurityRealm implements ModelOb public static final class DescriptorImpl extends Descriptor { public static final DescriptorImpl INSTANCE = new DescriptorImpl(); - private DescriptorImpl() { - super(HudsonPrivateSecurityRealm.class); - } - public String getDisplayName() { return Messages.HudsonPrivateSecurityRealm_DisplayName(); } diff --git a/core/src/main/java/hudson/security/LDAPSecurityRealm.java b/core/src/main/java/hudson/security/LDAPSecurityRealm.java index f6e1fe02a2..3bf9394889 100644 --- a/core/src/main/java/hudson/security/LDAPSecurityRealm.java +++ b/core/src/main/java/hudson/security/LDAPSecurityRealm.java @@ -236,10 +236,6 @@ public class LDAPSecurityRealm extends SecurityRealm { public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl(); public static final class DescriptorImpl extends Descriptor { - private DescriptorImpl() { - super(LDAPSecurityRealm.class); - } - public String getDisplayName() { return Messages.LDAPSecurityRealm_DisplayName(); } diff --git a/core/src/main/java/hudson/security/LegacyAuthorizationStrategy.java b/core/src/main/java/hudson/security/LegacyAuthorizationStrategy.java index 1d3c74aea0..4ffa3e80b0 100644 --- a/core/src/main/java/hudson/security/LegacyAuthorizationStrategy.java +++ b/core/src/main/java/hudson/security/LegacyAuthorizationStrategy.java @@ -33,10 +33,6 @@ public final class LegacyAuthorizationStrategy extends AuthorizationStrategy { public static final Descriptor DESCRIPTOR = new DescriptorImpl(); public static final class DescriptorImpl extends Descriptor { - private DescriptorImpl() { - super(LegacyAuthorizationStrategy.class); - } - public String getDisplayName() { return Messages.LegacyAuthorizationStrategy_DisplayName(); } diff --git a/core/src/main/java/hudson/slaves/CommandLauncher.java b/core/src/main/java/hudson/slaves/CommandLauncher.java index 7d9b32ec66..869dd14f57 100644 --- a/core/src/main/java/hudson/slaves/CommandLauncher.java +++ b/core/src/main/java/hudson/slaves/CommandLauncher.java @@ -119,10 +119,6 @@ public class CommandLauncher extends ComputerLauncher { } public static class DescriptorImpl extends Descriptor { - public DescriptorImpl() { - super(CommandLauncher.class); - } - public String getDisplayName() { return Messages.CommandLauncher_displayName(); } diff --git a/core/src/main/java/hudson/slaves/DumbSlave.java b/core/src/main/java/hudson/slaves/DumbSlave.java index e6fbaa0633..0de7902483 100644 --- a/core/src/main/java/hudson/slaves/DumbSlave.java +++ b/core/src/main/java/hudson/slaves/DumbSlave.java @@ -23,10 +23,6 @@ public final class DumbSlave extends Slave { public static final class DescriptorImpl extends NodeDescriptor { public static final DescriptorImpl INSTANCE = new DescriptorImpl(); - private DescriptorImpl() { - super(DumbSlave.class); - } - public String getDisplayName() { return Messages.DumbSlave_displayName(); } diff --git a/core/src/main/java/hudson/slaves/NodeDescriptor.java b/core/src/main/java/hudson/slaves/NodeDescriptor.java index 85d6a2c071..8af4135060 100644 --- a/core/src/main/java/hudson/slaves/NodeDescriptor.java +++ b/core/src/main/java/hudson/slaves/NodeDescriptor.java @@ -22,6 +22,9 @@ public abstract class NodeDescriptor extends Descriptor { super(clazz); } + protected NodeDescriptor() { + } + public final String newInstanceDetailPage() { return '/'+clazz.getName().replace('.','/').replace('$','/')+"/newInstanceDetail.jelly"; } diff --git a/core/src/main/java/hudson/slaves/RetentionStrategy.java b/core/src/main/java/hudson/slaves/RetentionStrategy.java index 1ad5060d8d..5486176c6b 100644 --- a/core/src/main/java/hudson/slaves/RetentionStrategy.java +++ b/core/src/main/java/hudson/slaves/RetentionStrategy.java @@ -109,13 +109,6 @@ public abstract class RetentionStrategy implements Describab public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl(); private static class DescriptorImpl extends Descriptor> { - /** - * Constructs a new DescriptorImpl. - */ - public DescriptorImpl() { - super(Always.class); - } - public String getDisplayName() { return Messages.RetentionStrategy_Always_displayName(); } @@ -196,13 +189,6 @@ public abstract class RetentionStrategy implements Describab } private static class DescriptorImpl extends Descriptor> { - /** - * Constructs a new DescriptorImpl. - */ - public DescriptorImpl() { - super(Demand.class); - } - public String getDisplayName() { return Messages.RetentionStrategy_Demand_displayName(); } diff --git a/core/src/main/java/hudson/slaves/SimpleScheduledRetentionStrategy.java b/core/src/main/java/hudson/slaves/SimpleScheduledRetentionStrategy.java index 9f662cf529..2c804cf34c 100644 --- a/core/src/main/java/hudson/slaves/SimpleScheduledRetentionStrategy.java +++ b/core/src/main/java/hudson/slaves/SimpleScheduledRetentionStrategy.java @@ -207,14 +207,6 @@ public class SimpleScheduledRetentionStrategy extends RetentionStrategy> { - - /** - * Constructs a new DescriptorImpl. - */ - public DescriptorImpl() { - super(SimpleScheduledRetentionStrategy.class); - } - public String getDisplayName() { return Messages.SimpleScheduledRetentionStrategy_displayName(); } diff --git a/core/src/main/java/hudson/tasks/Ant.java b/core/src/main/java/hudson/tasks/Ant.java index 56dcdee732..6b61dd7457 100644 --- a/core/src/main/java/hudson/tasks/Ant.java +++ b/core/src/main/java/hudson/tasks/Ant.java @@ -220,7 +220,6 @@ public class Ant extends Builder { private volatile AntInstallation[] installations = new AntInstallation[0]; private DescriptorImpl() { - super(Ant.class); load(); } diff --git a/core/src/main/java/hudson/tasks/ArtifactArchiver.java b/core/src/main/java/hudson/tasks/ArtifactArchiver.java index 9f7a3fb6f7..1cae99fc41 100644 --- a/core/src/main/java/hudson/tasks/ArtifactArchiver.java +++ b/core/src/main/java/hudson/tasks/ArtifactArchiver.java @@ -126,10 +126,6 @@ public class ArtifactArchiver extends Publisher { public static final Descriptor DESCRIPTOR = new DescriptorImpl(); public static class DescriptorImpl extends BuildStepDescriptor { - public DescriptorImpl() { - super(ArtifactArchiver.class); - } - public String getDisplayName() { return Messages.ArtifactArchiver_DisplayName(); } diff --git a/core/src/main/java/hudson/tasks/BatchFile.java b/core/src/main/java/hudson/tasks/BatchFile.java index f8ad47b3c7..8cf7814e41 100644 --- a/core/src/main/java/hudson/tasks/BatchFile.java +++ b/core/src/main/java/hudson/tasks/BatchFile.java @@ -34,10 +34,6 @@ public class BatchFile extends CommandInterpreter { public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl(); public static final class DescriptorImpl extends Descriptor { - private DescriptorImpl() { - super(BatchFile.class); - } - public String getHelpFile() { return "/help/project-config/batch.html"; } diff --git a/core/src/main/java/hudson/tasks/BuildStepDescriptor.java b/core/src/main/java/hudson/tasks/BuildStepDescriptor.java index 19380b4ed5..58eaeadcc1 100644 --- a/core/src/main/java/hudson/tasks/BuildStepDescriptor.java +++ b/core/src/main/java/hudson/tasks/BuildStepDescriptor.java @@ -21,6 +21,16 @@ public abstract class BuildStepDescriptor> super(clazz); } + /** + * Infers the type of the corresponding {@link BuildStep} from the outer class. + * This version works when you follow the common convention, where a descriptor + * is written as the static nested class of the describable class. + * + * @since 1.278 + */ + protected BuildStepDescriptor() { + } + /** * Returns true if this task is applicable to the given project. * diff --git a/core/src/main/java/hudson/tasks/BuildTrigger.java b/core/src/main/java/hudson/tasks/BuildTrigger.java index f5291816b8..9b7662bd8e 100644 --- a/core/src/main/java/hudson/tasks/BuildTrigger.java +++ b/core/src/main/java/hudson/tasks/BuildTrigger.java @@ -222,8 +222,6 @@ public class BuildTrigger extends Publisher implements DependecyDeclarer, Matrix public static class DescriptorImpl extends BuildStepDescriptor { public DescriptorImpl() { - super(BuildTrigger.class); - Hudson.getInstance().getJobListeners().add(new ItemListener() { @Override public void onRenamed(Item item, String oldName, String newName) { diff --git a/core/src/main/java/hudson/tasks/BuildWrapperDescriptor.java b/core/src/main/java/hudson/tasks/BuildWrapperDescriptor.java index c277fe90b9..0312b2df2b 100644 --- a/core/src/main/java/hudson/tasks/BuildWrapperDescriptor.java +++ b/core/src/main/java/hudson/tasks/BuildWrapperDescriptor.java @@ -2,6 +2,7 @@ package hudson.tasks; import hudson.model.AbstractProject; import hudson.model.Descriptor; +import hudson.model.Describable; /** * {@link Descriptor} for {@link BuildWrapper}. @@ -15,6 +16,16 @@ public abstract class BuildWrapperDescriptor extends Descriptor { super(clazz); } + /** + * Infers the type of the corresponding {@link Describable} from the outer class. + * This version works when you follow the common convention, where a descriptor + * is written as the static nested class of the describable class. + * + * @since 1.278 + */ + protected BuildWrapperDescriptor() { + } + /** * Returns true if this task is applicable to the given project. * diff --git a/core/src/main/java/hudson/tasks/Fingerprinter.java b/core/src/main/java/hudson/tasks/Fingerprinter.java index dbb45db335..d2b8023c17 100644 --- a/core/src/main/java/hudson/tasks/Fingerprinter.java +++ b/core/src/main/java/hudson/tasks/Fingerprinter.java @@ -179,10 +179,6 @@ public class Fingerprinter extends Publisher implements Serializable { public static final Descriptor DESCRIPTOR = new DescriptorImpl(); public static class DescriptorImpl extends BuildStepDescriptor { - public DescriptorImpl() { - super(Fingerprinter.class); - } - public String getDisplayName() { return Messages.Fingerprinter_DisplayName(); } diff --git a/core/src/main/java/hudson/tasks/JavadocArchiver.java b/core/src/main/java/hudson/tasks/JavadocArchiver.java index 459b10a325..ded61276fa 100644 --- a/core/src/main/java/hudson/tasks/JavadocArchiver.java +++ b/core/src/main/java/hudson/tasks/JavadocArchiver.java @@ -175,10 +175,6 @@ public class JavadocArchiver extends Publisher { } public static class DescriptorImpl extends BuildStepDescriptor { - private DescriptorImpl() { - super(JavadocArchiver.class); - } - public String getDisplayName() { return Messages.JavadocArchiver_DisplayName(); } diff --git a/core/src/main/java/hudson/tasks/LogRotator.java b/core/src/main/java/hudson/tasks/LogRotator.java index 3e83dec769..42416ba682 100644 --- a/core/src/main/java/hudson/tasks/LogRotator.java +++ b/core/src/main/java/hudson/tasks/LogRotator.java @@ -7,15 +7,11 @@ import hudson.model.Run; import hudson.scm.SCM; import org.kohsuke.stapler.DataBoundConstructor; -import org.kohsuke.stapler.StaplerRequest; -import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.Calendar; import java.util.GregorianCalendar; -import net.sf.json.JSONObject; - /** * Deletes old log files. * @@ -104,10 +100,6 @@ public class LogRotator implements Describable { public static final LRDescriptor DESCRIPTOR = new LRDescriptor(); public static final class LRDescriptor extends Descriptor { - private LRDescriptor() { - super(LogRotator.class); - } - public String getDisplayName() { return "Log Rotation"; } diff --git a/core/src/main/java/hudson/tasks/Mailer.java b/core/src/main/java/hudson/tasks/Mailer.java index 50e78aabfb..a8b2afdbfe 100644 --- a/core/src/main/java/hudson/tasks/Mailer.java +++ b/core/src/main/java/hudson/tasks/Mailer.java @@ -149,7 +149,6 @@ public class Mailer extends Publisher { public DescriptorImpl() { - super(Mailer.class); load(); } @@ -422,10 +421,6 @@ public class Mailer extends Publisher { } public static final class DescriptorImpl extends UserPropertyDescriptor { - public DescriptorImpl() { - super(UserProperty.class); - } - public String getDisplayName() { return Messages.Mailer_UserProperty_DisplayName(); } diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java index 80bd8e3e2c..f70b3b4dfd 100644 --- a/core/src/main/java/hudson/tasks/Maven.java +++ b/core/src/main/java/hudson/tasks/Maven.java @@ -239,7 +239,6 @@ public class Maven extends Builder { private volatile MavenInstallation[] installations = new MavenInstallation[0]; private DescriptorImpl() { - super(Maven.class); load(); } diff --git a/core/src/main/java/hudson/tasks/Shell.java b/core/src/main/java/hudson/tasks/Shell.java index cbb1717b67..cbc481238e 100644 --- a/core/src/main/java/hudson/tasks/Shell.java +++ b/core/src/main/java/hudson/tasks/Shell.java @@ -83,7 +83,6 @@ public class Shell extends CommandInterpreter { private String shell; private DescriptorImpl() { - super(Shell.class); load(); } diff --git a/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java b/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java index bf5bd48933..71aa2b6340 100644 --- a/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java +++ b/core/src/main/java/hudson/tasks/junit/JUnitResultArchiver.java @@ -116,10 +116,6 @@ public class JUnitResultArchiver extends Publisher implements Serializable, Matr public static class DescriptorImpl extends BuildStepDescriptor { public static final Descriptor DESCRIPTOR = new DescriptorImpl(); - public DescriptorImpl() { - super(JUnitResultArchiver.class); - } - public String getDisplayName() { return Messages.JUnitResultArchiver_DisplayName(); } diff --git a/core/src/main/java/hudson/tasks/test/AggregatedTestResultPublisher.java b/core/src/main/java/hudson/tasks/test/AggregatedTestResultPublisher.java index 764bc7dd6b..c5bb33417a 100644 --- a/core/src/main/java/hudson/tasks/test/AggregatedTestResultPublisher.java +++ b/core/src/main/java/hudson/tasks/test/AggregatedTestResultPublisher.java @@ -210,10 +210,6 @@ public class AggregatedTestResultPublisher extends Publisher { } public static final class DescriptorImpl extends BuildStepDescriptor { - public DescriptorImpl() { - super(AggregatedTestResultPublisher.class); - } - public boolean isApplicable(Class jobType) { return true; // for all types } diff --git a/core/src/main/java/hudson/triggers/SCMTrigger.java b/core/src/main/java/hudson/triggers/SCMTrigger.java index 4198c3a0c4..814cec73d9 100644 --- a/core/src/main/java/hudson/triggers/SCMTrigger.java +++ b/core/src/main/java/hudson/triggers/SCMTrigger.java @@ -133,7 +133,6 @@ public class SCMTrigger extends Trigger { /*package*/ final AdministrativeMonitorImpl monitor = new AdministrativeMonitorImpl(); DescriptorImpl() { - super(SCMTrigger.class); load(); /* * Need to resize the thread pool here in case there is no existing configuration file for SCMTrigger as diff --git a/core/src/main/java/hudson/triggers/TimerTrigger.java b/core/src/main/java/hudson/triggers/TimerTrigger.java index 2e640f0888..61fba873c8 100644 --- a/core/src/main/java/hudson/triggers/TimerTrigger.java +++ b/core/src/main/java/hudson/triggers/TimerTrigger.java @@ -39,10 +39,6 @@ public class TimerTrigger extends Trigger { public static final TriggerDescriptor DESCRIPTOR = new DescriptorImpl(); public static class DescriptorImpl extends TriggerDescriptor { - public DescriptorImpl() { - super(TimerTrigger.class); - } - public boolean isApplicable(Item item) { return item instanceof BuildableItem; } diff --git a/core/src/main/java/hudson/triggers/TriggerDescriptor.java b/core/src/main/java/hudson/triggers/TriggerDescriptor.java index f9b0231743..e492281e76 100644 --- a/core/src/main/java/hudson/triggers/TriggerDescriptor.java +++ b/core/src/main/java/hudson/triggers/TriggerDescriptor.java @@ -2,6 +2,7 @@ package hudson.triggers; import hudson.model.Descriptor; import hudson.model.Item; +import hudson.scm.SCM; /** * {@link Descriptor} for Trigger. @@ -12,6 +13,16 @@ public abstract class TriggerDescriptor extends Descriptor> { super(clazz); } + /** + * Infers the type of the corresponding {@link SCM} from the outer class. + * This version works when you follow the common convention, where a descriptor + * is written as the static nested class of the describable class. + * + * @since 1.278 + */ + protected TriggerDescriptor() { + } + /** * Returns true if this trigger is applicable to the * given {@link Item}. diff --git a/test/src/main/java/org/jvnet/hudson/test/FailureBuilder.java b/test/src/main/java/org/jvnet/hudson/test/FailureBuilder.java index acc5e8a8cb..2fe3d86344 100644 --- a/test/src/main/java/org/jvnet/hudson/test/FailureBuilder.java +++ b/test/src/main/java/org/jvnet/hudson/test/FailureBuilder.java @@ -31,10 +31,6 @@ public class FailureBuilder extends Builder { public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl(); public static final class DescriptorImpl extends Descriptor { - private DescriptorImpl() { - super(FailureBuilder.class); - } - public Builder newInstance(StaplerRequest req, JSONObject data) { throw new UnsupportedOperationException(); } diff --git a/test/src/main/java/org/jvnet/hudson/test/SleepBuilder.java b/test/src/main/java/org/jvnet/hudson/test/SleepBuilder.java index 0b36e562cf..340c0df789 100644 --- a/test/src/main/java/org/jvnet/hudson/test/SleepBuilder.java +++ b/test/src/main/java/org/jvnet/hudson/test/SleepBuilder.java @@ -36,10 +36,6 @@ public class SleepBuilder extends Builder { public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl(); public static final class DescriptorImpl extends Descriptor { - private DescriptorImpl() { - super(SleepBuilder.class); - } - public Builder newInstance(StaplerRequest req, JSONObject data) { throw new UnsupportedOperationException(); } diff --git a/test/src/test/java/hudson/model/JobPropertyTest.java b/test/src/test/java/hudson/model/JobPropertyTest.java index bfd804ea5f..db2d1cb33f 100644 --- a/test/src/test/java/hudson/model/JobPropertyTest.java +++ b/test/src/test/java/hudson/model/JobPropertyTest.java @@ -48,10 +48,6 @@ public class JobPropertyTest extends HudsonTestCase { @SuppressWarnings("unchecked") private static class DescriptorImpl extends JobPropertyDescriptor { - protected DescriptorImpl() { - super(JobPropertyImpl.class); - } - @Override public boolean isApplicable(Class jobType) { return false; diff --git a/test/src/test/java/hudson/model/UserTestCase.java b/test/src/test/java/hudson/model/UserTestCase.java index ea0353b0fc..30e1731d2f 100644 --- a/test/src/test/java/hudson/model/UserTestCase.java +++ b/test/src/test/java/hudson/model/UserTestCase.java @@ -25,11 +25,6 @@ public class UserTestCase extends HudsonTestCase { } public static class UserPropertyDescriptorImpl extends UserPropertyDescriptor { - - protected UserPropertyDescriptorImpl() { - super(UserPropertyImpl.class); - } - @Override public UserProperty newInstance(User user) { return null;