[JENKINS-43507] Fix optionality of configuration

jenkinsci · Jun 8, 2017 · fc225569f9de83bc21aa43806223b95e1d34fc45 · fc22556
1 parent e09089d
commit fc225569f9de83bc21aa43806223b95e1d34fc45
Unified Split

Showing with 76 additions and 45 deletions.

+12 −6 src/main/java/hudson/plugins/mercurial/MercurialSCMBuilder.java

+64 −39 src/main/java/hudson/plugins/mercurial/MercurialSCMSource.java
diff --git a/src/main/java/hudson/plugins/mercurial/MercurialSCMBuilder.java b/src/main/java/hudson/plugins/mercurial/MercurialSCMBuilder.java
@@ -29,7 +29,8 @@
    /**
     * The repository to track. This can be URL or a local file path.
     */
-  
-    private final @Nonnull String source;
+  
+    private @Nonnull
+  
+    String source;
    public MercurialSCMBuilder(@Nonnull SCMHead head, @CheckForNull SCMRevision revision, String source,
                               String credentialsId) {
@@ -78,14 +79,19 @@ public final String source() {
        return (B) this;
    }
+  
+    @SuppressWarnings("unchecked")
+  
+    public @Nonnull
+  
+    B withSource(String source) {
+  
+        this.source = source;
+  
+        return (B) this;
+  
+    }
+  
+
    @Override public @Nonnull MercurialSCM build() {
-  
-        String rev = revision() instanceof MercurialSCMSource.MercurialRevision
-  
-                ? ((MercurialSCMSource.MercurialRevision) revision()).getHash()
-  
-                : head().getName();
+  
+        SCMRevision revision = revision();
        MercurialSCM result = new MercurialSCM(source());
-  
-        if (revision() instanceof MercurialSCMSource.MercurialRevision) {
+  
+        if (revision instanceof MercurialSCMSource.MercurialRevision) {
            result.setRevisionType(MercurialSCM.RevisionType.CHANGESET);
-  
-            result.setRevision(((MercurialSCMSource.MercurialRevision) revision()).getHash());
+  
+            result.setRevision(((MercurialSCMSource.MercurialRevision) revision).getHash());
        } else {
            result.setRevisionType(MercurialSCM.RevisionType.BRANCH);
            result.setRevision(head().getName());

diff --git a/src/main/java/hudson/plugins/mercurial/MercurialSCMSource.java b/src/main/java/hudson/plugins/mercurial/MercurialSCMSource.java
@@ -6,6 +6,7 @@
 import com.cloudbees.plugins.credentials.domains.URIRequirementBuilder;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+  
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.EnvVars;
 import hudson.Extension;
 import hudson.FilePath;
@@ -65,7 +66,8 @@
 public final class MercurialSCMSource extends SCMSource {
    private final @Nonnull String source;
-  
-    private final @CheckForNull String credentialsId;
+  
+    private @CheckForNull
+  
+    String credentialsId;
    private @Nonnull List<SCMSourceTrait> traits;
    @Deprecated @Restricted(NoExternalUse.class) @RestrictedSince("2.0") private transient String installation;
    @Deprecated @Restricted(NoExternalUse.class) @RestrictedSince("2.0") private transient String branchPattern;
@@ -75,10 +77,9 @@
    @Deprecated @Restricted(NoExternalUse.class) @RestrictedSince("2.0") private transient boolean clean;
    @DataBoundConstructor
-  
-    public MercurialSCMSource(String id, String source, String credentialsId) {
+  
+    public MercurialSCMSource(String id, String source) {
        super(id);
        this.source = source;
-  
-        this.credentialsId = credentialsId;
        this.traits = new ArrayList<>();
    }
@@ -103,6 +104,7 @@ public MercurialSCMSource(String id, String source, String credentialsId) {
        }
    }
+  
+    @SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE")
    @SuppressWarnings({"deprecation", "ConstantConditions"}) private Object readResolve() throws ObjectStreamException {
        if (traits == null) {
            traits = new ArrayList<>();
@@ -137,6 +139,11 @@ public MercurialSCMSource(String id, String source, String credentialsId) {
        return credentialsId;
    }
+  
+    @DataBoundSetter
+  
+    public void setCredentialsId(@CheckForNull String credentialsId) {
+  
+        this.credentialsId = credentialsId;
+  
+    }
+  
+
    @DataBoundSetter public void setTraits(@CheckForNull List<SCMSourceTrait> traits) {
        this.traits = new ArrayList<>(Util.fixNull(traits));
    }
@@ -234,40 +241,7 @@ MercurialRevision create(@Nonnull SCMHead branch) {
                                public @Nonnull
                                SCMSourceCriteria.Probe create(@Nonnull SCMHead branch, @Nullable final
                                MercurialRevision revision) {
-  
-                                    return new SCMProbe() {
-  
-                                        @Override
-  
-                                        public @Nonnull
-  
-                                        SCMProbeStat stat(@Nonnull String path) throws IOException {
-  
-                                            try {
-  
-                                                String files = hg.popen(cache, listener, true,
-  
-                                                        new ArgumentListBuilder("locate",
-  
-                                                                "-r",
-  
-                                                                revision.getHash(),
-  
-                                                                "-I",
-  
-                                                                "path:" + path));
-  
-                                                if (StringUtils.isBlank(files)) {
-  
-                                                    return SCMProbeStat.fromType(SCMFile.Type.NONEXISTENT);
-  
-                                                }
-  
-                                                return SCMProbeStat.fromType(SCMFile.Type.REGULAR_FILE);
-  
-                                            } catch (InterruptedException e) {
-  
-                                                throw new IOException(e);
-  
-                                            }
-  
-                                        }
-  
-
-  
-                                        @Override
-  
-                                        public void close() throws IOException {
-  
-                                        }
-  
-
-  
-                                        @Override
-  
-                                        public String name() {
-  
-                                            return name;
-  
-                                        }
-  
-
-  
-                                        @Override
-  
-                                        public long lastModified() {
-  
-                                            return 0;
-  
-                                        }
-  
-                                    };
+  
+                                    return new SCMProbeImpl(hg, cache, listener, revision, name);
                                }
                            }, new SCMSourceRequest.Witness() {
                                @Override
@@ -375,9 +349,10 @@ public ListBoxModel doFillCredentialsIdItems(@AncestorInPath SCMSourceOwner owne
    }
-  
-    /*package*/ static final class MercurialRevision extends SCMRevision {
+  
+    public static final class MercurialRevision extends SCMRevision {
        @Nonnull private final String hash;
-  
-        MercurialRevision(@Nonnull SCMHead branch, @Nonnull String hash) {
+  
+
+  
+        public MercurialRevision(@Nonnull SCMHead branch, @Nonnull String hash) {
            super(branch);
            this.hash = hash;
        }
@@ -395,4 +370,54 @@ public ListBoxModel doFillCredentialsIdItems(@AncestorInPath SCMSourceOwner owne
        }
    }
+  
+    private static class SCMProbeImpl extends SCMProbe {
+  
+        private static final long serialVersionUID = 1L;
+  
+        private final transient HgExe hg;
+  
+        private final FilePath cache;
+  
+        private final TaskListener listener;
+  
+        private final MercurialRevision revision;
+  
+        private final String name;
+  
+
+  
+        public SCMProbeImpl(HgExe hg, FilePath cache, TaskListener listener, MercurialRevision revision,
+  
+                            String name) {
+  
+            this.hg = hg;
+  
+            this.cache = cache;
+  
+            this.listener = listener;
+  
+            this.revision = revision;
+  
+            this.name = name;
+  
+        }
+  
+
+  
+        @Override
+  
+        public @Nonnull
+  
+        SCMProbeStat stat(@Nonnull String path) throws IOException {
+  
+            try {
+  
+                String files = hg.popen(cache, listener, true,
+  
+                        new ArgumentListBuilder("locate",
+  
+                                "-r",
+  
+                                revision.getHash(),
+  
+                                "-I",
+  
+                                "path:" + path));
+  
+                if (StringUtils.isBlank(files)) {
+  
+                    return SCMProbeStat.fromType(SCMFile.Type.NONEXISTENT);
+  
+                }
+  
+                return SCMProbeStat.fromType(SCMFile.Type.REGULAR_FILE);
+  
+            } catch (InterruptedException e) {
+  
+                throw new IOException(e);
+  
+            }
+  
+        }
+  
+
+  
+        @Override
+  
+        public void close() throws IOException {
+  
+        }
+  
+
+  
+        @Override
+  
+        public String name() {
+  
+            return name;
+  
+        }
+  
+
+  
+        @Override
+  
+        public long lastModified() {
+  
+            return 0;
+  
+        }
+  
+    }
 }