Deletes AutoCodec.Strategy.SINGLETON now that we have @AutoCodec field tags.

This also gets rid of some static initialization cycles which we should try very hard to avoid in the future.

PiperOrigin-RevId: 187334087

1 files changed, 1 insertions, 17 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec/AutoCodecProcessor.java b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec/AutoCodecProcessor.java
index d7c2e8a7fd..250e391adf 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec/AutoCodecProcessor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec/AutoCodecProcessor.java
@@ -109,9 +109,6 @@ public class AutoCodecProcessor extends AbstractProcessor {
           case PUBLIC_FIELDS:
             codecClassBuilder = buildClassWithPublicFieldsStrategy(encodedType);
             break;
-          case SINGLETON:
-            codecClassBuilder = buildClassWithSingletonStrategy(encodedType, env);
-            break;
           default:
             throw new IllegalArgumentException("Unknown strategy: " + annotation.strategy());
         }
@@ -142,6 +139,7 @@ public class AutoCodecProcessor extends AbstractProcessor {
     return true;
   }
 
+  @SuppressWarnings("MutableConstantField")
   private static final Collection<Modifier> REQUIRED_SINGLETON_MODIFIERS =
       ImmutableList.of(Modifier.STATIC, Modifier.FINAL);
 
@@ -532,20 +530,6 @@ public class AutoCodecProcessor extends AbstractProcessor {
     return Optional.empty();
   }
 
-  private static TypeSpec.Builder buildClassWithSingletonStrategy(
-      TypeElement encodedType, ProcessingEnvironment env) {
-    TypeSpec.Builder codecClassBuilder =
-        AutoCodecUtil.initializeCodecClassBuilder(encodedType, env);
-    // Serialization is a no-op.
-    codecClassBuilder.addMethod(
-        AutoCodecUtil.initializeSerializeMethodBuilder(encodedType, env).build());
-    MethodSpec.Builder deserializeMethodBuilder =
-        AutoCodecUtil.initializeDeserializeMethodBuilder(encodedType, env);
-    deserializeMethodBuilder.addStatement("return $T.INSTANCE", TypeName.get(encodedType.asType()));
-    codecClassBuilder.addMethod(deserializeMethodBuilder.build());
-    return codecClassBuilder;
-  }
-
   /** True when {@code type} has the same type as {@code clazz}. */
   private boolean matchesType(TypeMirror type, Class<?> clazz) {
     return env.getTypeUtils()