From 4e70935003f9624b06f0670e9496cde206c1a87e Mon Sep 17 00:00:00 2001
From: Knut Wannheden <knut@moderne.io>
Date: Wed, 5 Jul 2023 23:09:08 +0200
Subject: [PATCH] Context-free template for `AddSerialVersionUidToSerializable`

---
 .../staticanalysis/AddSerialVersionUidToSerializable.java  | 7 +++----
 .../AddSerialVersionUidToSerializableTest.java             | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/openrewrite/staticanalysis/AddSerialVersionUidToSerializable.java b/src/main/java/org/openrewrite/staticanalysis/AddSerialVersionUidToSerializable.java
index 40f000b45..8f513530a 100644
--- 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, J.Modifier.Type.Private, Collections.emptyList()),
-                            new J.Modifier(Tree.randomId(), singleSpace, Markers.EMPTY, J.Modifier.Type.Static, Collections.emptyList()),
-                            new J.Modifier(Tree.randomId(), singleSpace, Markers.EMPTY, J.Modifier.Type.Final, Collections.emptyList())
+                            new J.Modifier(Tree.randomId(), Space.SINGLE_SPACE, Markers.EMPTY, J.Modifier.Type.Static, Collections.emptyList()),
+                            new J.Modifier(Tree.randomId(), Space.SINGLE_SPACE, Markers.EMPTY, 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
index c8adf42cc..696f00248 100644
--- 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;
-                  
                   }
               }
               """