Support dependency Map notation for version reference in Settings (#5912)

Author: bmuschko

rewrite-gradle/src/main/java/org/openrewrite/gradle/UpgradeDependencyVersion.java

@@ -200,13 +200,17 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)
                             } else if (arg.getValue() instanceof J.Identifier) {
                                 J.Identifier value = (J.Identifier) arg.getValue();
                                 valueValue = value.getSimpleName();
+                            } else if (arg.getValue() instanceof J.FieldAccess) {
+                                valueValue = arg.getValue().printTrimmed(getCursor());
                             } else if (arg.getValue() instanceof G.GString) {
                                 G.GString value = (G.GString) arg.getValue();
                                 List<J> strings = value.getStrings();
                                 if (!strings.isEmpty() && strings.get(0) instanceof G.GString.Value) {
                                     G.GString.Value versionGStringValue = (G.GString.Value) strings.get(0);
                                     if (versionGStringValue.getTree() instanceof J.Identifier) {
                                         valueValue = ((J.Identifier) versionGStringValue.getTree()).getSimpleName();
+                                    } else if (versionGStringValue.getTree() instanceof J.FieldAccess) {
+                                        valueValue = versionGStringValue.getTree().printTrimmed(getCursor());
                                     }
                                 }
                             }
@@ -454,11 +458,13 @@ private void gatherVariables(J.MethodInvocation method) {
                         artifactValue = ((J.Assignment) depArgs.get(1)).getAssignment();
                         versionExp = ((J.Assignment) depArgs.get(2)).getAssignment();
                     }
-                    if (groupValue instanceof J.Literal && artifactValue instanceof J.Literal && versionExp instanceof J.Identifier) {
+                    if (groupValue instanceof J.Literal && artifactValue instanceof J.Literal && (versionExp instanceof J.Identifier || versionExp instanceof J.FieldAccess)) {
                         J.Literal groupLiteral = (J.Literal) groupValue;
                         J.Literal artifactLiteral = (J.Literal) artifactValue;
                         if (groupLiteral.getValue() instanceof String && artifactLiteral.getValue() instanceof String && shouldResolveVersion((String) groupLiteral.getValue(), (String) artifactLiteral.getValue())) {
-                            String versionVariableName = ((J.Identifier) versionExp).getSimpleName();
+                            String versionVariableName = versionExp instanceof J.Identifier ?
+                                    ((J.Identifier) versionExp).getSimpleName() :
+                                    (versionExp).printTrimmed(getCursor());
                             acc.variableNames.computeIfAbsent(versionVariableName, it -> new HashMap<>())
                                     .computeIfAbsent(new GroupArtifact((String) groupLiteral.getValue(), (String) artifactLiteral.getValue()), it -> new HashSet<>())
                                     .add(method.getSimpleName());
@@ -624,6 +630,10 @@ public J.Assignment visitAssignment(J.Assignment assignment, ExecutionContext ex
                             return a;
                         }
                         Map<GroupArtifact, Set<String>> groupArtifactSetMap = acc.versionPropNameToGA.get("gradle." + a.getVariable());
+                        // Guard to ensure that an unsupported notation doesn't throw an exception
+                        if (groupArtifactSetMap == null) {
+                            return a;
+                        }
                         GroupArtifact ga = groupArtifactSetMap.entrySet().stream().findFirst().map(Map.Entry::getKey).orElse(null);
                         if (ga == null) {
                             return a;

rewrite-gradle/src/test/java/org/openrewrite/gradle/UpgradeDependencyVersionTest.java

@@ -1953,8 +1953,14 @@ void ignoreVersionDefinedInExtraPropertiesWithConcatenatedReferenceInDependencie
         );
     }
 
-    @Test
-    void upgradeVersionInSettingsGradleExt() {
+    @ParameterizedTest
+    @ValueSource(strings = {
+      "\"com.fasterxml.jackson.core:jackson-databind:${gradle.jackson}\"",
+      "group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: gradle.jackson",
+      "group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: \"$gradle.jackson\"",
+      "group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: \"${gradle.jackson}\""
+    })
+    void upgradeVersionInSettingsGradleExt(String dependencyNotation) {
         rewriteRun(
           spec -> spec.recipe(new UpgradeDependencyVersion("com.fasterxml.jackson.core", "jackson-databind", "2.15.0", null)),
           settingsGradle(
@@ -1980,9 +1986,9 @@ void upgradeVersionInSettingsGradleExt() {
               }
 
               dependencies {
-                  implementation "com.fasterxml.jackson.core:jackson-databind:${gradle.jackson}"
+                  implementation %s
               }
-              """
+              """.formatted(dependencyNotation)
           )
         );
     }