diff --git a/src/main/java/org/openrewrite/java/spring/boot2/MergeBootstrapYamlWithApplicationYaml.java b/src/main/java/org/openrewrite/java/spring/boot2/MergeBootstrapYamlWithApplicationYaml.java index c60b4286d..825a73f01 100644 --- a/src/main/java/org/openrewrite/java/spring/boot2/MergeBootstrapYamlWithApplicationYaml.java +++ b/src/main/java/org/openrewrite/java/spring/boot2/MergeBootstrapYamlWithApplicationYaml.java @@ -75,7 +75,7 @@ protected List visit(List before, ExecutionContext ctx) return (SourceFile) new CoalescePropertiesVisitor().visit(a.withDocuments(ListUtils.map((List) a.getDocuments(), doc -> { if (merged.compareAndSet(false, true) && FindProperty.find(doc, "spring.config.activate.on-profile", true).isEmpty()) { return (Yaml.Document) new MergeYamlVisitor(doc.getBlock(), b.getDocuments() - .get(0).getBlock(), true).visit(doc, 0, new Cursor(new Cursor(null, a), doc)); + .get(0).getBlock(), true, null).visit(doc, 0, new Cursor(new Cursor(null, a), doc)); } return doc; })), 0); diff --git a/src/main/java/org/openrewrite/java/spring/boot2/MigrateDatabaseCredentials.java b/src/main/java/org/openrewrite/java/spring/boot2/MigrateDatabaseCredentials.java index caca47e0d..7904edd18 100644 --- a/src/main/java/org/openrewrite/java/spring/boot2/MigrateDatabaseCredentials.java +++ b/src/main/java/org/openrewrite/java/spring/boot2/MigrateDatabaseCredentials.java @@ -85,8 +85,8 @@ protected TreeVisitor getVisitor() { return new YamlVisitor() { @Override public Yaml visitDocuments(Yaml.Documents documents, ExecutionContext executionContext) { - doAfterVisit(new MergeYaml("$.spring." + tool,"username: ${spring.datasource.username}", true, null)); - doAfterVisit(new MergeYaml("$.spring." + tool,"password: ${spring.datasource.password}", true, null)); + doAfterVisit(new MergeYaml("$.spring." + tool,"username: ${spring.datasource.username}", true, null, null)); + doAfterVisit(new MergeYaml("$.spring." + tool,"password: ${spring.datasource.password}", true, null, null)); doAfterVisit(new CoalesceProperties()); return documents; }