tore encoded GERRIT_CHANGE_COMMIT_MESSAGE into custom parameter type

Fix for JENKINS-23421
jenkinsci · Jun 13, 2014 · 0ac7c4b · 0ac7c4b
1 parent 74b65aa
commit 0ac7c4b
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/...com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerParameters.java b/...com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerParameters.java
@@ -34,6 +34,7 @@
 import com.sonyericsson.hudson.plugins.gerrit.trigger.GerritServer;
 import com.sonyericsson.hudson.plugins.gerrit.trigger.PluginImpl;
 import com.sonyericsson.hudson.plugins.gerrit.trigger.config.IGerritHudsonTriggerConfig;
+import com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.parameters.Base64EncodedStringParameterValue;
 import com.sonyericsson.hudson.plugins.gerrit.trigger.utils.StringUtil;
 
 import hudson.model.AbstractProject;
@@ -280,7 +281,7 @@ public void setOrCreateStringParameterValue(List<ParameterValue> parameters, Str
     /**
      * Creates a {@link hudson.model.TextParameterValue} and adds it to the provided list.
      * If the parameter with the same name already exists in the list it will be replaced by the new parameter,
-     * but its description will be used, unless the parameter type is something else than a StringParameterValue.
+     * but its description will be used, unless the parameter type is something else than a TextParameterValue.
      *
      * @param parameters   the list of existing parameters.
      * @param value        the value.
@@ -290,6 +291,23 @@ public void setOrCreateTextParameterValue(List<ParameterValue> parameters, Strin
         setOrCreateParameterValue(parameters, value, escapeQuotes, TextParameterValue.class);
     }
 
+    /**
+     * Creates a {@link Base64EncodedStringParameterValue} and adds it to the provided list.
+     * If the parameter with the same name already exists in the list it will be replaced by the new parameter,
+     * but its description will be used, unless the parameter type is something else
+     * than a Base64EncodedStringParameterValue.
+     *
+     * @param parameters   the list of existing parameters.
+     * @param value        the value.
+     * @param escapeQuotes if quote characters should be escaped.
+     */
+    public void setOrCreateBase64EncodedStringParameterValue(
+            List<ParameterValue> parameters,
+            String value,
+            boolean escapeQuotes) {
+        setOrCreateParameterValue(parameters, value, escapeQuotes, Base64EncodedStringParameterValue.class);
+    }
+
     /**
      * Adds or sets all the Gerrit-parameter values to the provided list.
      * @param gerritEvent the event.
@@ -372,7 +390,7 @@ public static void setOrCreateParameters(GerritTriggeredEvent gerritEvent, Abstr
                 } else {
                     try {
                         byte[] encodedBytes = Base64.encodeBase64(commitMessage.getBytes("UTF-8"));
-                        GERRIT_CHANGE_COMMIT_MESSAGE.setOrCreateStringParameterValue(
+                        GERRIT_CHANGE_COMMIT_MESSAGE.setOrCreateBase64EncodedStringParameterValue(
                             parameters, new String(encodedBytes), escapeQuotes);
                     } catch (UnsupportedEncodingException uee) {
                         logger.error("Failed to encode commit message as Base64: ", uee);