ChangeSpringPropertyKey no longer expands entire affected yaml (#272)

* ChangeSpringPropertyKey no longer expands entire affected yaml * test fix Co-authored-by: Nick McKinney <[email protected]>
openrewrite · Jan 19, 2023 · f701dc0 · f701dc0
1 parent cfd91d8
commit f701dc0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 24 deletions.
diff --git a/src/main/java/org/openrewrite/java/spring/ChangeSpringPropertyKey.java b/src/main/java/org/openrewrite/java/spring/ChangeSpringPropertyKey.java
@@ -70,18 +70,13 @@ protected List<SourceFile> visit(List<SourceFile> before, ExecutionContext ctx)
                 new org.openrewrite.properties.ChangePropertyKey(oldPropertyKey, newPropertyKey, true, null, false);
         org.openrewrite.properties.ChangePropertyKey subpropertiesChangePropertyKey =
                 new org.openrewrite.properties.ChangePropertyKey(Pattern.quote(oldPropertyKey + ".") + exceptRegex() + "(.*)", newPropertyKey + ".$1", true, null, true);
-        ExpandProperties expandYaml = new ExpandProperties();
         return ListUtils.map(before, s -> {
             if (s instanceof Yaml.Documents) {
-                Yaml.Documents after = (Yaml.Documents) yamlChangePropertyKey.getVisitor().visit(s, ctx);
-                if (after != s) {
-                    s = (Yaml.Documents) expandYaml.getVisitor().visit(after, ctx);
-                }
+                s = (Yaml.Documents) yamlChangePropertyKey.getVisitor().visit(s, ctx);
             } else if (s instanceof Properties.File) {
                 s = (Properties.File) propertiesChangePropertyKey.getVisitor().visit(s, ctx);
                 s = (Properties.File) subpropertiesChangePropertyKey.getVisitor().visit(s, ctx);
             }
-
             return s;
         });
     }

diff --git a/src/test/java/org/openrewrite/java/spring/ChangeSpringPropertyKeyTest.java b/src/test/java/org/openrewrite/java/spring/ChangeSpringPropertyKeyTest.java
@@ -45,8 +45,7 @@ void changeLastKey() {
                         """,
                         """
                             server:
-                              servlet:
-                                path: /tmp/my-server-path
+                              servlet.path: /tmp/my-server-path
                         """
                 )
         );
@@ -75,10 +74,7 @@ void changePropertyPath() {
                         """
                             server:
                               port: 8888
-                            servlet:
-                              session:
-                                cookie:
-                                  path: /tmp/my-server-path
+                            servlet.session.cookie.path: /tmp/my-server-path
                         """
                 )
         );
@@ -113,15 +109,14 @@ void subproperties() {
                   """,
             """
                 spring:
-                  web:
-                    resources:
-                      chain:
-                        strategy:
-                          content:
-                            enabled: true
-                            paths:
-                              - /foo/**
-                              - /bar/**
+                  web.resources:
+                    chain:
+                      strategy:
+                        content:
+                          enabled: true
+                          paths:
+                            - /foo/**
+                            - /bar/**
                   """
           )
         );

diff --git a/...gBoot_2_4/java/org/openrewrite/java/spring/boot2/UpgradeSpringBoot2ConfigurationTest.java b/...gBoot_2_4/java/org/openrewrite/java/spring/boot2/UpgradeSpringBoot2ConfigurationTest.java
@@ -68,9 +68,7 @@ void activateOnProfileDoNotMoveActivate() {
                                 active: dev
                             ---
                             spring:
-                              config:
-                                activate:
-                                  on-profile: prod
+                              config.activate.on-profile: prod
                         """,
                         s -> s.path("src/main/resources/application.yml")
                 )