Make the default value for percentage appear in config forms.

This makes it consistent with how the files pattern works, i.e. its default value appears in the job config form, and the Pipeline snippet generator. Also made percentage values appear with the %-sign suffix, as it looks a little bit nicer, and helps further reinfoce that it's a percentage value and not a fraction, i.e. should be set to '50%' rather than '0.5'.
jenkinsci · May 22, 2020 · 6d111db · 6d111db
1 parent 22fac28
commit 6d111db
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/ApkPublisher.java b/src/main/java/org/jenkinsci/plugins/googleplayandroidpublisher/ApkPublisher.java
@@ -134,15 +134,19 @@ public void setRolloutPercentage(@Nonnull String percentage) {
             this.rolloutPercentage = percentage;
             return;
         }
-        this.rolloutPercentage = pct.intValue() == DescriptorImpl.defaultRolloutPercent ? null : pctStr;
+        this.rolloutPercentage = pct.intValue() == DescriptorImpl.defaultRolloutPercentage ? null : pctStr;
     }
 
     @Nonnull
     public String getRolloutPercentage() {
-        if (fixEmptyAndTrim(rolloutPercentage) == null) {
-            return String.valueOf(DescriptorImpl.defaultRolloutPercent);
+        String pct = fixEmptyAndTrim(rolloutPercentage);
+        if (pct == null) {
+            pct = String.valueOf(DescriptorImpl.defaultRolloutPercentage);
         }
-        return rolloutPercentage;
+        if (!pct.endsWith("%") && !pct.matches(REGEX_VARIABLE)) {
+            pct += "%";
+        }
+        return pct;
     }
 
     // Required for Pipeline builds using the deprecated `rolloutPercent` option
@@ -610,7 +614,7 @@ public FormValidation doCheckText(@QueryParameter String value) {
     @Extension
     public static final class DescriptorImpl extends GooglePlayBuildStepDescriptor<Publisher> {
         public static final String defaultFilesPattern = "**/build/outputs/**/*.aab, **/build/outputs/**/*.apk";
-        public static final int defaultRolloutPercent = 100;
+        public static final int defaultRolloutPercentage = 100;
 
         public String getDisplayName() {
             return "Upload Android AAB/APKs to Google Play";

diff --git a/.../java/org/jenkinsci/plugins/googleplayandroidpublisher/ReleaseTrackAssignmentBuilder.java b/.../java/org/jenkinsci/plugins/googleplayandroidpublisher/ReleaseTrackAssignmentBuilder.java
@@ -144,15 +144,19 @@ public void setRolloutPercentage(@Nonnull String percentage) {
             this.rolloutPercentage = percentage;
             return;
         }
-        this.rolloutPercentage = pct.intValue() == DescriptorImpl.defaultRolloutPercent ? null : pctStr;
+        this.rolloutPercentage = pct.intValue() == DescriptorImpl.defaultRolloutPercentage ? null : pctStr;
     }
 
     @Nonnull
     public String getRolloutPercentage() {
-        if (fixEmptyAndTrim(rolloutPercentage) == null) {
-            return String.valueOf(DescriptorImpl.defaultRolloutPercent);
+        String pct = fixEmptyAndTrim(rolloutPercentage);
+        if (pct == null) {
+            pct = String.valueOf(ApkPublisher.DescriptorImpl.defaultRolloutPercentage);
         }
-        return rolloutPercentage;
+        if (!pct.endsWith("%") && !pct.matches(REGEX_VARIABLE)) {
+            pct += "%";
+        }
+        return pct;
     }
 
     // Required for Pipeline builds using the deprecated `rolloutPercent` option
@@ -369,7 +373,7 @@ private static final class AppInfo {
     @Extension
     public static final class DescriptorImpl extends GooglePlayBuildStepDescriptor<Builder> {
         public static final String defaultFilesPattern = "**/build/outputs/**/*.aab, **/build/outputs/**/*.apk";
-        public static final int defaultRolloutPercent = 100;
+        public static final int defaultRolloutPercentage = 100;
 
         public String getDisplayName() {
             return "Move Android apps to a different release track";

diff --git a/...main/resources/org/jenkinsci/plugins/googleplayandroidpublisher/ApkPublisher/config.jelly b/...main/resources/org/jenkinsci/plugins/googleplayandroidpublisher/ApkPublisher/config.jelly
@@ -27,7 +27,7 @@
 
   <f:entry title="${%Rollout %}" field="rolloutPercentage"
       description="${%Defaults to 100% if not set}">
-    <f:combobox style="width:15em" default="${descriptor.defaultRolloutPercent}" />
+    <f:textbox style="width:15em" default="${descriptor.defaultRolloutPercentage}%" />
   </f:entry>
 
   <f:entry title="${%Recent changes}" field="recentChangeList">

diff --git a/...g/jenkinsci/plugins/googleplayandroidpublisher/ReleaseTrackAssignmentBuilder/config.jelly b/...g/jenkinsci/plugins/googleplayandroidpublisher/ReleaseTrackAssignmentBuilder/config.jelly
@@ -35,7 +35,7 @@
 
   <f:entry title="${%Rollout %}" field="rolloutPercentage"
       description="${%Defaults to 100% if not set}">
-    <f:combobox style="width:15em" default="${descriptor.defaultRolloutPercent}" />
+    <f:textbox style="width:15em" default="${descriptor.defaultRolloutPercentage}%" />
   </f:entry>
 
 </j:jelly>