[FIXED JENKINS-12075] Fixed parsing of form data in WarningsPublisher.

Now the data is correctly flattened before the instance is invoked.
jenkinsci · Dec 12, 2011 · 1771c8a · 1771c8a
1 parent 1ca1850
commit 1771c8a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.jvnet.hudson.plugins</groupId>
       <artifactId>analysis-core</artifactId>
-      <version>1.34</version>
+      <version>1.35</version>
     </dependency>
     <dependency>
       <groupId>org.jvnet.hudson.plugins</groupId>

diff --git a/src/main/java/hudson/plugins/warnings/WarningsDescriptor.java b/src/main/java/hudson/plugins/warnings/WarningsDescriptor.java
@@ -1,5 +1,6 @@
 package hudson.plugins.warnings;
 
+import static hudson.plugins.analysis.core.PluginDescriptor.*;
 import groovy.lang.Binding;
 import groovy.lang.GroovyShell;
 import hudson.Extension;
@@ -96,10 +97,11 @@ public boolean isApplicable(final Class<? extends AbstractProject> jobType) {
     /** {@inheritDoc} */
     @Override
     public WarningsPublisher newInstance(final StaplerRequest request, final JSONObject formData) throws FormException {
-        Set<String> consoleLogParsers = extractConsoleLogParsers(formData);
-        List<ParserConfiguration> parserConfigurations = request.bindJSONToList(ParserConfiguration.class, formData.get(FILE_LOCATIONS_KEY));
+        JSONObject flattenedData = convertHierarchicalFormData(formData);
+        Set<String> consoleLogParsers = extractConsoleLogParsers(flattenedData);
+        List<ParserConfiguration> parserConfigurations = request.bindJSONToList(ParserConfiguration.class, flattenedData.get(FILE_LOCATIONS_KEY));
 
-        WarningsPublisher publisher = request.bindJSON(WarningsPublisher.class, formData);
+        WarningsPublisher publisher = request.bindJSON(WarningsPublisher.class, flattenedData);
         publisher.setConsoleLogParsers(consoleLogParsers);
         publisher.setParserConfigurations(parserConfigurations);