Adjust ReplaceDuplicateStringLiterals after feedback

Fixes #385
openrewrite · Jan 12, 2025 · 3609cd7 · 3609cd7
1 parent c878681
commit 3609cd7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/src/main/java/org/openrewrite/staticanalysis/ReplaceDuplicateStringLiterals.java b/src/main/java/org/openrewrite/staticanalysis/ReplaceDuplicateStringLiterals.java
@@ -231,8 +231,8 @@ public J.VariableDeclarations.NamedVariable visitVariable(J.VariableDeclarations
                     // `private static final String`(s) are handled separately by `FindExistingPrivateStaticFinalFields`.
                     if (v.getInitializer() instanceof J.Literal &&
                             (parentScope.getValue() instanceof J.MethodDeclaration || parentScope.getValue() instanceof J.ClassDeclaration) &&
-                            ((J.Literal) v.getInitializer()).getValue() instanceof String &&
-                            !privateStaticFinalVariable) {
+                            !(privateStaticFinalVariable && ((J.Literal) v.getInitializer()).getValue() instanceof String) &&
+                            !(((J.Literal) v.getInitializer()).getValue() == null)) {
                         String value = (((J.Literal) v.getInitializer()).getValue()).toString();
                         result.existingFieldValueToFieldName.put(v.getSimpleName(), value);
                     }

diff --git a/src/test/java/org/openrewrite/staticanalysis/ReplaceDuplicateStringLiteralsTest.java b/src/test/java/org/openrewrite/staticanalysis/ReplaceDuplicateStringLiteralsTest.java
@@ -221,9 +221,9 @@ void staticImportCollidesWithNewStringLiteral() {
           java(
             """
               package org.foo;
-              
+
               import static java.lang.Long.MAX_VALUE;
-              
+
               class A {
                   final String val1 = "max_value";
                   final String val2 = "max_value";
@@ -233,9 +233,9 @@ class A {
               """,
             """
               package org.foo;
-              
+
               import static java.lang.Long.MAX_VALUE;
-              
+
               class A {
                   private static final String MAX_VALUE_1 = "max_value";
                   final String val1 = MAX_VALUE_1;
@@ -387,7 +387,7 @@ class A {
               class A {
                   private static final String EXAMPLE_STRING_WITH_SPECIAL_CHARACTERS = "Example,, :: String with `` special __ characters.";
                   final String val1 = EXAMPLE_STRING_WITH_SPECIAL_CHARACTERS;
-                  final String val2 = EXAMPLE_STRING_WITH_SPECIAL_CHARACTERS; 
+                  final String val2 = EXAMPLE_STRING_WITH_SPECIAL_CHARACTERS;
                   final String val3 = EXAMPLE_STRING_WITH_SPECIAL_CHARACTERS;
               }
               """
@@ -431,7 +431,7 @@ class A {
                   final String val1 = "value";
                   final String val2 = "value";
                   final String val3 = "value";
-              
+
                   private static class B {
                       // Do not change inner class value.
                       private static final String CONSTANT = "value";
@@ -444,7 +444,7 @@ class A {
                   final String val1 = CONSTANT;
                   final String val2 = CONSTANT;
                   final String val3 = CONSTANT;
-              
+
                   private static class B {
                       // Do not change inner class value.
                       private static final String CONSTANT = "value";
@@ -657,13 +657,13 @@ void enumDefinition() {
               enum A {
                   /**/
                   ONE, TWO, THREE;
-              
+
                   public void example() {
                       final String val1 = "value";
                       final String val2 = "value";
                       final String val3 = "value";
                   }
-              
+
                   public void bar() {}
               }
               """,
@@ -672,13 +672,13 @@ enum A {
                   /**/
                   ONE, TWO, THREE;
                   private static final String VALUE = "value";
-              
+
                   public void example() {
                       final String val1 = VALUE;
                       final String val2 = VALUE;
                       final String val3 = VALUE;
                   }
-              
+
                   public void bar() {}
               }
               """
@@ -746,5 +746,4 @@ public void method() {
         );
     }
 
-
 }