Merge pull request #454 from tinedel/issue-438-trailing-comma-bug

ignore empty string class name when building dataflow metadata

Author: pivotal-david-osullivan

boot/configuration_metadata.go

@@ -160,7 +160,11 @@ func NewDataFlowConfigurationMetadata(path string, metadata ConfigurationMetadat
 
 	var classes []string
 	for _, s := range strings.Split(s, ",") {
-		classes = append(classes, strings.TrimSpace(s))
+		class := strings.TrimSpace(s)
+		if class == "" {
+			continue
+		}
+		classes = append(classes, class)
 	}
 
 	m := ConfigurationMetadata{}

boot/configuration_metadata_test.go

@@ -77,6 +77,21 @@ func testConfigurationMetadata(t *testing.T, context spec.G, it spec.S) {
 			}))
 		})
 
+		it("returns dataflow decoded contents handling trailing comma correctly", func() {
+			Expect(os.MkdirAll(filepath.Join(path, "META-INF"), 0755)).To(Succeed())
+			Expect(ioutil.WriteFile(filepath.Join(path, "META-INF", "spring-configuration-metadata.json"),
+				[]byte(`{ "properties": [ { "name": "alpha", "sourceType": "alpha" }, { "name": "beta" } ] }`), 0644))
+			Expect(ioutil.WriteFile(filepath.Join(path, "META-INF", "dataflow-configuration-metadata.properties"),
+				[]byte("configuration-properties.classes=alpha,"), 0644))
+
+			cm, err := boot.NewConfigurationMetadataFromPath(path)
+			Expect(err).NotTo(HaveOccurred())
+
+			Expect(boot.NewDataFlowConfigurationMetadata(path, cm)).To(Equal(boot.ConfigurationMetadata{
+				Properties: []boot.Property{{Name: "alpha", SourceType: "alpha"}},
+			}))
+		})
+
 		it("returns dataflow decoded contents", func() {
 			Expect(os.MkdirAll(filepath.Join(path, "META-INF"), 0755)).To(Succeed())
 			Expect(ioutil.WriteFile(filepath.Join(path, "META-INF", "spring-configuration-metadata.json"),