[JENKINS-49237] - Address comments from @jglick and @Wadeck

jenkinsci · Jan 31, 2018 · 0af548b · 0af548b
1 parent b947e77
commit 0af548b
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 15 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,2 +1,2 @@
 // Build the plugin using https://github.com/jenkins-infra/pipeline-library
-buildPlugin()
+buildPlugin(jenkinsVersions: [null, '2.104'])
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
     <packaging>hpi</packaging>
     <version>1.2-SNAPSHOT</version>
     <name>Jenkins CppNCSS plugin</name>
-    <url>http://wiki.jenkins.io/display/JENKINS/CPPNCSS+Plugin</url>
+    <url>httpw://wiki.jenkins.io/display/JENKINS/CPPNCSS+Plugin</url>
 
     <properties>
       <jenkins.version>1.651.3</jenkins.version>

diff --git a/src/main/java/hudson/plugins/cppncss/CppNCSSPublisher.java b/src/main/java/hudson/plugins/cppncss/CppNCSSPublisher.java
@@ -90,12 +90,8 @@ public String getDisplayName() {
             return "Publish " + PluginImpl.DISPLAY_NAME;
         }
 
-        public Publisher newInstance(StaplerRequest req, JSONObject formData) throws FormException {
-            if (req == null) {
-                throw new IllegalStateException("Request has not been passed to " + DescriptorImpl.class);
-            }
+        static {
             ConvertUtils.register(CppNCSSHealthMetrics.CONVERTER, CppNCSSHealthMetrics.class);
-            return req.bindJSON(CppNCSSPublisher.class, formData);
         }
 
         public boolean isApplicable(Class<? extends AbstractProject> aClass) {

diff --git a/src/main/java/hudson/plugins/cppncss/parser/FormattedStatisticSummary.java b/src/main/java/hudson/plugins/cppncss/parser/FormattedStatisticSummary.java
@@ -30,7 +30,6 @@
 
 /**
  * @author Oleg Nenashev
- * @since TODO
  */
 @Restricted(NoExternalUse.class)
 public final class FormattedStatisticSummary extends StatisticSummary {

diff --git a/src/main/java/hudson/plugins/cppncss/parser/Statistic.java b/src/main/java/hudson/plugins/cppncss/parser/Statistic.java
@@ -18,7 +18,7 @@
  * @author Shaohua Wen
  * @since 25-Feb-2008 21:33:40
  */
-@SuppressFBWarnings(value = "SE_NO_SERIALVERSIONID", justification = "Not used in XStream")
+@SuppressFBWarnings(value = "SE_NO_SERIALVERSIONID", justification = "Ignored in XStream")
 public class Statistic implements Serializable {
 // ------------------------------ FIELDS ------------------------------
 

diff --git a/src/main/java/hudson/plugins/cppncss/parser/StringStatisticSummary.java b/src/main/java/hudson/plugins/cppncss/parser/StringStatisticSummary.java
@@ -27,8 +27,8 @@
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
 /**
- * @since TODO
- * @deprecated Compatibility layer for external class usages.
+ * Stores summary string.
+ * @deprecated Compatibility class for {@link hudson.plugins.helpers.AbstractBuildAction#getStatisticSummary()}.
  */
 @Deprecated
 @Restricted(NoExternalUse.class)

diff --git a/src/main/java/hudson/plugins/helpers/AbstractBuildAction.java b/src/main/java/hudson/plugins/helpers/AbstractBuildAction.java
@@ -24,8 +24,7 @@ public abstract class AbstractBuildAction<BUILD extends AbstractBuild<?, ?>>
     private static final long serialVersionUID = 31415926L;
 
     /**
-     * The owner of this Action.  Ideally I'd like this to be final and set in the constructor, but Maven does not
-     * let us do that, so we need a setter.
+     * The owner of this Action.
      */
     private transient BUILD build = null;
 

diff --git a/src/main/resources/META-INF/hudson.remoting.ClassFilter b/src/main/resources/META-INF/hudson.remoting.ClassFilter
@@ -1,6 +1,5 @@
 # TODO: not mergeable in the current state. JENKINS-49237
-# Calendar class implementation has a custom deserialization logic
-# ZoneInfo deserialization happens in the privileged mode...
+# Calendar class implementation has a custom deserialization logic, but it seems to be safe.
 java.util.Calendar
 java.util.GregorianCalendar
 java.util.SimpleTimeZone