Merge pull request #134 from openrewrite/serializable-uid-context-free

Context-free template for `AddSerialVersionUidToSerializable`
openrewrite · Nov 22, 2023 · e9190fa · e9190fa
2 parents 039558f + 31b492d
commit e9190fa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/main/java/org/openrewrite/staticanalysis/AddSerialVersionUidToSerializable.java b/src/main/java/org/openrewrite/staticanalysis/AddSerialVersionUidToSerializable.java
@@ -54,7 +54,7 @@ public Set<String> getTags() {
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor() {
         return new JavaIsoVisitor<ExecutionContext>() {
-            final JavaTemplate template = JavaTemplate.builder("private static final long serialVersionUID = 1;").contextSensitive().build();
+            final JavaTemplate template = JavaTemplate.builder("private static final long serialVersionUID = 1;").build();
 
             @Override
             public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext executionContext) {
@@ -100,11 +100,10 @@ private J.VariableDeclarations maybeFixVariableDeclarations(J.VariableDeclaratio
                 if (!J.Modifier.hasModifier(modifiers, J.Modifier.Type.Private)
                         || !J.Modifier.hasModifier(modifiers, J.Modifier.Type.Static)
                         || !J.Modifier.hasModifier(modifiers, J.Modifier.Type.Final)) {
-                    Space singleSpace = Space.build(" ", Collections.emptyList());
                     varDecls = varDecls.withModifiers(Arrays.asList(
                             new J.Modifier(Tree.randomId(), Space.EMPTY, Markers.EMPTY, null, J.Modifier.Type.Private, Collections.emptyList()),
-                            new J.Modifier(Tree.randomId(), singleSpace, Markers.EMPTY, null, J.Modifier.Type.Static, Collections.emptyList()),
-                            new J.Modifier(Tree.randomId(), singleSpace, Markers.EMPTY, null, J.Modifier.Type.Final, Collections.emptyList())
+                            new J.Modifier(Tree.randomId(), Space.SINGLE_SPACE, Markers.EMPTY, null, J.Modifier.Type.Static, Collections.emptyList()),
+                            new J.Modifier(Tree.randomId(), Space.SINGLE_SPACE, Markers.EMPTY, null, J.Modifier.Type.Final,   Collections.emptyList())
                     ));
                 }
                 if (TypeUtils.asPrimitive(varDecls.getType()) != JavaType.Primitive.Long) {

diff --git a/src/test/java/org/openrewrite/staticanalysis/AddSerialVersionUidToSerializableTest.java b/src/test/java/org/openrewrite/staticanalysis/AddSerialVersionUidToSerializableTest.java
@@ -255,18 +255,17 @@ void serializableInnerClass() {
           java(
             """
               import java.io.Serializable;
-              public class Outer {
+              public class Outer implements Serializable {
                   public static class Inner implements Serializable {
-                  
                   }
               }
               """,
             """
               import java.io.Serializable;
-              public class Outer {
+              public class Outer implements Serializable {
+                  private static final long serialVersionUID = 1;
                   public static class Inner implements Serializable {
                       private static final long serialVersionUID = 1;
-                  
                   }
               }
               """