Skip to content

ignore empty string class name when building dataflow metadata #454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 2, 2024
Merged

ignore empty string class name when building dataflow metadata #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef27fa9
Fixing issues #438. For a lot of properties sourceType field is absen…
tinedel Mar 27, 2024
0f0a654
minor fix
tinedel Mar 27, 2024
d4ee3db
Merge branch 'main' into issue-438-trailing-comma-bug
tinedel Mar 27, 2024
731ef6c
Merge branch 'main' into issue-438-trailing-comma-bug
tinedel Mar 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion boot/configuration_metadata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand Down
15 changes: 15 additions & 0 deletions boot/configuration_metadata_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
Loading