From 6043c29e7e7379d731b05927659f971089163d4e Mon Sep 17 00:00:00 2001 From: Aiden Scandella Date: Thu, 9 Jul 2015 14:30:05 -0600 Subject: [PATCH 1/2] Lint more things --- config/checkstyle.xml | 36 ++++++++++++++++--- .../PhabricatorBuildWrapperDescriptor.java | 2 +- .../phabricator/PhabricatorNotifier.java | 3 +- .../PhabricatorNotifierDescriptor.java | 15 ++++---- .../phabricator/PhabricatorPlugin.java | 5 +-- 5 files changed, 44 insertions(+), 17 deletions(-) diff --git a/config/checkstyle.xml b/config/checkstyle.xml index 8219cd8b..1c1ce261 100644 --- a/config/checkstyle.xml +++ b/config/checkstyle.xml @@ -4,18 +4,40 @@ "http://www.puppycrawl.com/dtds/configuration_1_2.dtd"> + + + + + + + + + + + + + + + + + + + + + + + - @@ -34,11 +56,17 @@ - - - + + + + + + + + + diff --git a/src/main/java/com/uber/jenkins/phabricator/PhabricatorBuildWrapperDescriptor.java b/src/main/java/com/uber/jenkins/phabricator/PhabricatorBuildWrapperDescriptor.java index ed0cb92b..8fe7fc22 100644 --- a/src/main/java/com/uber/jenkins/phabricator/PhabricatorBuildWrapperDescriptor.java +++ b/src/main/java/com/uber/jenkins/phabricator/PhabricatorBuildWrapperDescriptor.java @@ -27,7 +27,7 @@ import org.kohsuke.stapler.StaplerRequest; @SuppressWarnings("UnusedDeclaration") -@Extension // This indicates to Jenkins that this is an implementation of an extension point. +@Extension public final class PhabricatorBuildWrapperDescriptor extends BuildWrapperDescriptor { private String conduitURL; private String conduitToken; diff --git a/src/main/java/com/uber/jenkins/phabricator/PhabricatorNotifier.java b/src/main/java/com/uber/jenkins/phabricator/PhabricatorNotifier.java index 381478b3..dbc5d051 100644 --- a/src/main/java/com/uber/jenkins/phabricator/PhabricatorNotifier.java +++ b/src/main/java/com/uber/jenkins/phabricator/PhabricatorNotifier.java @@ -284,8 +284,7 @@ private String getRemoteComment(AbstractBuild build, PrintStream logger, S FilePath source = src[0]; - int DEFAULT_COMMENT_SIZE = 1000; - int maxLength = DEFAULT_COMMENT_SIZE; + int maxLength = 1000; if (!CommonUtils.isBlank(maxSize)) { maxLength = parseInt(maxSize, 10); } diff --git a/src/main/java/com/uber/jenkins/phabricator/PhabricatorNotifierDescriptor.java b/src/main/java/com/uber/jenkins/phabricator/PhabricatorNotifierDescriptor.java index eb053fdf..1738208f 100644 --- a/src/main/java/com/uber/jenkins/phabricator/PhabricatorNotifierDescriptor.java +++ b/src/main/java/com/uber/jenkins/phabricator/PhabricatorNotifierDescriptor.java @@ -36,11 +36,17 @@ * for the actual HTML fragment for the configuration screen. */ @SuppressWarnings("UnusedDeclaration") -@Extension // This indicates to Jenkins that this is an implementation of an extension point. +@Extension public final class PhabricatorNotifierDescriptor extends BuildStepDescriptor { private String conduitURL; private String uberallsURL; private String commentFile; + private String commentSize; + + public PhabricatorNotifierDescriptor() { + super(PhabricatorNotifier.class); + load(); + } public String getCommentSize() { return commentSize; @@ -50,13 +56,6 @@ public void setCommentSize(String commentSize) { this.commentSize = commentSize; } - private String commentSize; - - public PhabricatorNotifierDescriptor() { - super(PhabricatorNotifier.class); - load(); - } - public boolean isApplicable(Class aClass) { // Indicates that this builder can be used with all kinds of project types return true; diff --git a/src/main/java/com/uber/jenkins/phabricator/PhabricatorPlugin.java b/src/main/java/com/uber/jenkins/phabricator/PhabricatorPlugin.java index c44ec1ee..13663d25 100644 --- a/src/main/java/com/uber/jenkins/phabricator/PhabricatorPlugin.java +++ b/src/main/java/com/uber/jenkins/phabricator/PhabricatorPlugin.java @@ -27,14 +27,15 @@ import java.io.File; public class PhabricatorPlugin extends Plugin { + public static final String CONDUIT_TOKEN = "CONDUIT_TOKEN"; + public static final String ARCANIST_PATH = "ARCANIST_PATH"; + // Diff ID (not differential ID) static final String DIFFERENTIAL_ID_FIELD = "DIFF_ID"; // Phabricator object ID (for Harbormaster) static final String PHID_FIELD = "PHID"; static final String WRAP_KEY = "PHABRICATOR_JENKINS"; - public static final String CONDUIT_TOKEN = "CONDUIT_TOKEN"; - public static final String ARCANIST_PATH = "ARCANIST_PATH"; public static String getIconPath(String icon) { if (icon == null) { From ffbd2f279c475a280729a99a6c5c06980b15f520 Mon Sep 17 00:00:00 2001 From: Aiden Scandella Date: Thu, 9 Jul 2015 17:25:41 -0600 Subject: [PATCH 2/2] Make DEFAULT_COMMENT_SIZE a final static --- .../com/uber/jenkins/phabricator/PhabricatorNotifier.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/uber/jenkins/phabricator/PhabricatorNotifier.java b/src/main/java/com/uber/jenkins/phabricator/PhabricatorNotifier.java index dbc5d051..28fa28a7 100644 --- a/src/main/java/com/uber/jenkins/phabricator/PhabricatorNotifier.java +++ b/src/main/java/com/uber/jenkins/phabricator/PhabricatorNotifier.java @@ -52,7 +52,7 @@ import static java.lang.Integer.parseInt; public class PhabricatorNotifier extends Notifier { - + private static final int DEFAULT_COMMENT_SIZE = 1000; // Post a comment on success. Useful for lengthy builds. private final boolean commentOnSuccess; private final boolean uberallsEnabled; @@ -284,7 +284,7 @@ private String getRemoteComment(AbstractBuild build, PrintStream logger, S FilePath source = src[0]; - int maxLength = 1000; + int maxLength = DEFAULT_COMMENT_SIZE; if (!CommonUtils.isBlank(maxSize)) { maxLength = parseInt(maxSize, 10); }