Skip to content

Commit e7e6732

Browse files
committed
Add null arguments to MergeYaml usage
1 parent 9b949d8 commit e7e6732

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/main/java/org/openrewrite/java/spring/AddSpringProperty.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ private MergeYaml createMergeYamlVisitor() {
140140
} else {
141141
yaml.append(" ").append(value);
142142
}
143-
return new MergeYaml("$", yaml.toString(), true, null, null);
143+
return new MergeYaml("$", yaml.toString(), true, null, null, null);
144144
}
145145

146146
private static final Pattern scalarNeedsAQuote = Pattern.compile("[^a-zA-Z\\d\\s]*");

src/main/java/org/openrewrite/java/spring/boot2/MergeBootstrapYamlWithApplicationYaml.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public TreeVisitor<?, ExecutionContext> getVisitor(Accumulator acc) {
110110
source = new CoalescePropertiesVisitor<Integer>().visitDocuments(a.withDocuments(ListUtils.map((List<Yaml.Document>) a.getDocuments(), doc -> {
111111
if (merged.compareAndSet(false, true) && FindProperty.find(doc, "spring.config.activate.on-profile", true).isEmpty()) {
112112
return (Yaml.Document) new MergeYamlVisitor<Integer>(doc.getBlock(), b.getDocuments()
113-
.get(0).getBlock(), true, null).visit(doc, 0, new Cursor(new Cursor(null, a), doc));
113+
.get(0).getBlock(), true, null, null).visit(doc, 0, new Cursor(new Cursor(null, a), doc));
114114
}
115115
return doc;
116116
})), 0);

src/main/java/org/openrewrite/java/spring/boot2/MigrateDatabaseCredentials.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ public Yaml visitDocuments(Yaml.Documents documents, ExecutionContext ctx) {
9090
}, new YamlVisitor<ExecutionContext>() {
9191
@Override
9292
public Yaml visitDocuments(Yaml.Documents documents, ExecutionContext ctx) {
93-
doAfterVisit(new MergeYaml("$.spring." + tool, "username: ${spring.datasource.username}", true, null, null).getVisitor());
94-
doAfterVisit(new MergeYaml("$.spring." + tool, "password: ${spring.datasource.password}", true, null, null).getVisitor());
93+
doAfterVisit(new MergeYaml("$.spring." + tool, "username: ${spring.datasource.username}", true, null, null, null).getVisitor());
94+
doAfterVisit(new MergeYaml("$.spring." + tool, "password: ${spring.datasource.password}", true, null, null, null).getVisitor());
9595
doAfterVisit(new CoalesceProperties().getVisitor());
9696
return documents;
9797
}

0 commit comments

Comments
 (0)