cleanup

Author: daspilker

docs/Job-reference.md

@@ -3944,7 +3944,6 @@ job {
                     label(String label)
                 }
                 xmlFile(String fileName) {
-                    label(String label)
                     nodeType(String nodeType)                   // defaults to 'NODESET'
                     url(String url)
                     xpath(String xpath)

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/publisher/PlotContext.groovy

@@ -3,6 +3,7 @@ package javaposse.jobdsl.dsl.helpers.publisher
 import com.google.common.base.Strings
 import javaposse.jobdsl.dsl.ContextHelper
 import javaposse.jobdsl.dsl.Context
+import javaposse.jobdsl.dsl.DslContext
 
 import static com.google.common.base.Preconditions.checkArgument
 
@@ -61,7 +62,7 @@ class PlotContext implements Context {
         this.logarithmic = logarithmic
     }
 
-    void propertiesFile(String fileName, Closure plotSeriesClosure = null) {
+    void propertiesFile(String fileName, @DslContext(PlotSeriesContext) Closure plotSeriesClosure = null) {
         checkArgument(!Strings.isNullOrEmpty(fileName), 'fileName must not be null or empty')
 
         PlotSeriesContext plotSeriesContext = new PlotSeriesContext(fileName, 'properties', 'PropertiesSeries')
@@ -70,10 +71,10 @@ class PlotContext implements Context {
         dataSeriesList << plotSeriesContext
     }
 
-    void xmlFile(String fileName, Closure plotSeriesClosure = null) {
+    void xmlFile(String fileName, @DslContext(PlotXMLSeriesContext) Closure plotSeriesClosure = null) {
         checkArgument(!Strings.isNullOrEmpty(fileName), 'fileName must not be null or empty')
 
-        PlotSeriesContext plotSeriesContext = new PlotXMLContext(fileName)
+        PlotSeriesContext plotSeriesContext = new PlotXMLSeriesContext(fileName)
         ContextHelper.executeInContext(plotSeriesClosure, plotSeriesContext)
 
         dataSeriesList << plotSeriesContext

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/publisher/PlotSeriesContext.groovy

@@ -4,9 +4,9 @@ import javaposse.jobdsl.dsl.Context
 
 class PlotSeriesContext implements Context {
     final String fileName
+    final String fileType
+    final String seriesType
     String label
-    String fileType
-    String seriesType
 
     PlotSeriesContext(String fileName, String fileType, String seriesType) {
         this.fileName = fileName

…/helpers/publisher/PlotXMLContext.groovy …rs/publisher/PlotXMLSeriesContext.groovyjob-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/publisher/PlotXMLContext.groovy renamed to job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/publisher/PlotXMLSeriesContext.groovy job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/publisher/PlotXMLContext.groovy renamed to job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/publisher/PlotXMLSeriesContext.groovy

@@ -2,21 +2,21 @@ package javaposse.jobdsl.dsl.helpers.publisher
 
 import static com.google.common.base.Preconditions.checkArgument
 
-class PlotXMLContext extends PlotSeriesContext {
-    private static final List<String> NODETYPES = [
+class PlotXMLSeriesContext extends PlotSeriesContext {
+    private static final List<String> NODE_TYPES = [
         'NODESET', 'NODE', 'STRING', 'BOOLEAN', 'NUMBER'
     ]
 
     String nodeType = 'NODESET'
     String url
     String xpath
 
-    PlotXMLContext(String fileName) {
+    PlotXMLSeriesContext(String fileName) {
         super(fileName, 'xml', 'XMLSeries')
     }
 
     void nodeType(String nodeType) {
-        checkArgument(NODETYPES.contains(nodeType), "nodeType must be one of ${NODETYPES.join(', ')}")
+        checkArgument(NODE_TYPES.contains(nodeType), "nodeType must be one of ${NODE_TYPES.join(', ')}")
         this.nodeType = nodeType
     }
 

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/publisher/PublisherContext.groovy

@@ -388,11 +388,10 @@ class PublisherContext implements Context {
                                     file(data.fileName)
                                     label(data.label ?: '')
                                     fileType(data.fileType)
-
-                                    if (data.seriesType == 'XMLSeries') {
-                                        nodeTypeString(data.nodeType ?: '')
-                                        url(data.url ?: '')
+                                    if (data instanceof PlotXMLSeriesContext) {
                                         xpathString(data.xpath ?: '')
+                                        url(data.url ?: '')
+                                        nodeTypeString(data.nodeType)
                                     }
                                 }
                             }