Skip to content

Commit 9bbfcc3

Browse files
committed
Compatibility with rewrite 7.30.0
1 parent a0befe7 commit 9bbfcc3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ protected List<SourceFile> visit(List<SourceFile> before, ExecutionContext ctx)
7575
return (SourceFile) new CoalescePropertiesVisitor<Integer>().visit(a.withDocuments(ListUtils.map((List<Yaml.Document>) a.getDocuments(), doc -> {
7676
if (merged.compareAndSet(false, true) && FindProperty.find(doc, "spring.config.activate.on-profile", true).isEmpty()) {
7777
return (Yaml.Document) new MergeYamlVisitor<Integer>(doc.getBlock(), b.getDocuments()
78-
.get(0).getBlock(), true).visit(doc, 0, new Cursor(new Cursor(null, a), doc));
78+
.get(0).getBlock(), true, null).visit(doc, 0, new Cursor(new Cursor(null, a), doc));
7979
}
8080
return doc;
8181
})), 0);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ protected TreeVisitor<?, ExecutionContext> getVisitor() {
8585
return new YamlVisitor<ExecutionContext>() {
8686
@Override
8787
public Yaml visitDocuments(Yaml.Documents documents, ExecutionContext executionContext) {
88-
doAfterVisit(new MergeYaml("$.spring." + tool,"username: ${spring.datasource.username}", true, null));
89-
doAfterVisit(new MergeYaml("$.spring." + tool,"password: ${spring.datasource.password}", true, null));
88+
doAfterVisit(new MergeYaml("$.spring." + tool,"username: ${spring.datasource.username}", true, null, null));
89+
doAfterVisit(new MergeYaml("$.spring." + tool,"password: ${spring.datasource.password}", true, null, null));
9090
doAfterVisit(new CoalesceProperties());
9191
return documents;
9292
}

0 commit comments

Comments
 (0)