Merge pull request #30 from Brantone/master

JENKINS-27552 Provide options to select sort order and strategy
jenkinsci · Aug 18, 2016 · 0e4cecd · 0e4cecd
2 parents fd51c70 + ebb4b25
commit 0e4cecd
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 2 deletions.
diff --git a/src/main/java/hockeyapp/HockeyappApplication.java b/src/main/java/hockeyapp/HockeyappApplication.java
@@ -81,17 +81,30 @@ public String getNumberOldVersions() {
         return oldVersionHolder == null ? null : oldVersionHolder.numberOldVersions;
     }
 
+    public String getSortOldVersions() {
+        return oldVersionHolder == null ? null : oldVersionHolder.sortOldVersions;
+    }
+
+    public String getStrategyOldVersions() {
+        return oldVersionHolder == null ? null : oldVersionHolder.strategyOldVersions;
+    }
+
     @Override
     public Descriptor<HockeyappApplication> getDescriptor() {
         return new DescriptorImpl();
     }
 
     public static class OldVersionHolder {
         private String numberOldVersions;
+        // Defaults per https://support.hockeyapp.net/kb/api/api-versions#delete-multiple-versions
+        private String sortOldVersions = "version";
+        private String strategyOldVersions = "purge";
 
         @DataBoundConstructor
-        public OldVersionHolder(String numberOldVersions) {
+        public OldVersionHolder(String numberOldVersions, String sortOldVersions, String strategyOldVersions) {
             this.numberOldVersions = Util.fixEmptyAndTrim(numberOldVersions);
+            this.sortOldVersions = Util.fixEmptyAndTrim(sortOldVersions);
+            this.strategyOldVersions = Util.fixEmptyAndTrim(strategyOldVersions);
         }
     }
 

diff --git a/src/main/java/hockeyapp/HockeyappRecorder.java b/src/main/java/hockeyapp/HockeyappRecorder.java
@@ -510,6 +510,8 @@ private boolean cleanupOldVersions(BuildListener listener, EnvVars vars, String
             httpPost.setHeader("X-HockeyAppToken", vars.expand(fetchApiToken(application)));
             List<NameValuePair> nameValuePairs = new ArrayList<NameValuePair>(1);
             nameValuePairs.add(new BasicNameValuePair("keep", application.getNumberOldVersions()));
+            nameValuePairs.add(new BasicNameValuePair("sort", application.getSortOldVersions()));
+            nameValuePairs.add(new BasicNameValuePair("strategy", application.getStrategyOldVersions()));
             httpPost.setEntity(new UrlEncodedFormEntity(nameValuePairs));
             HttpResponse response = httpclient.execute(httpPost);
             HttpEntity resEntity = response.getEntity();

diff --git a/src/main/java/hockeyapp/HockeyappRecorderConverter.java b/src/main/java/hockeyapp/HockeyappRecorderConverter.java
@@ -71,6 +71,8 @@ private static final class HockeyappRecorderObsolete {
         public boolean downloadAllowed;
         public boolean useChangelog;
         public String numberOldVersions;
+        public String sortOldVersions;
+        public String strategyOldVersions;
         public boolean useAppVersionURL;
         public boolean debugMode;
         public boolean useNotesTypeMarkdown;
@@ -113,7 +115,7 @@ private Object readResolve() {
 
             if (oldVersionHolder == null) {
                 oldVersionHolder =
-                        new HockeyappApplication.OldVersionHolder(Util.fixEmptyAndTrim(numberOldVersions));
+                        new HockeyappApplication.OldVersionHolder(Util.fixEmptyAndTrim(numberOldVersions), Util.fixEmptyAndTrim(sortOldVersions), Util.fixEmptyAndTrim(strategyOldVersions));
             }
 
             return this;

diff --git a/src/main/resources/hockeyapp/HockeyappApplication/config.jelly b/src/main/resources/hockeyapp/HockeyappApplication/config.jelly
@@ -78,6 +78,18 @@
                     <f:textbox
                             checkUrl="'descriptorByName/hockeyapp.HockeyappApplication/checkNumberOldVersions?value='+escape(this.value)"/>
                 </f:entry>
+                <f:entry title="${%Sort Order for Deleting}" field="sortOldVersions">
+                    <select name="sortOldVersions">
+                        <f:option value="version" selected="${instance.sortOldVersions=='version'}">version</f:option>
+                        <f:option value="date" selected="${instance.sortOldVersions=='date'}">date</f:option>
+                    </select>
+                </f:entry>
+                <f:entry title="${%Strategy for Deleting}" field="strategyOldVersions">
+                    <select name="strategyOldVersions">
+                        <f:option value="purge" selected="${instance.strategyOldVersions=='purge'}">purge</f:option>
+                        <f:option value="soft" selected="${instance.strategyOldVersions=='soft'}">soft</f:option>
+                    </select>
+                </f:entry>
             </f:optionalBlock>
         </table>
     </f:block>

diff --git a/src/main/resources/hockeyapp/HockeyappApplication/help-sortOldVersions.html b/src/main/resources/hockeyapp/HockeyappApplication/help-sortOldVersions.html
@@ -0,0 +1,3 @@
+<div>
+When deleting: "version" to sort by version number or "date" to sort by creation date.
+</div>
diff --git a/src/main/resources/hockeyapp/HockeyappApplication/help-strategyOldVersions.html b/src/main/resources/hockeyapp/HockeyappApplication/help-strategyOldVersions.html
@@ -0,0 +1,3 @@
+<div>
+When deleting: "purge" completely removes the version, while "soft" keeps some data including stats and crashes.
+</div>