merge nimak/refactor-adapter

uber · Nov 5, 2024 · 8af557a · 8af557a
2 parents 32194c8 + 36930c0
commit 8af557a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/nullaway/src/main/java/com/uber/nullaway/fixserialization/FixSerializationConfig.java b/nullaway/src/main/java/com/uber/nullaway/fixserialization/FixSerializationConfig.java
@@ -59,7 +59,8 @@ public FixSerializationConfig(boolean fieldInitInfoEnabled, @Nullable String out
     this.fieldInitInfoEnabled = fieldInitInfoEnabled;
     this.outputDirectory = outputDirectory;
     serializer =
-        new Serializer(this, SerializationAdapter.getAdapter(SerializationAdapter.LATEST_VERSION));
+        new Serializer(
+            this, SerializationAdapter.getAdapterForVersion(SerializationAdapter.LATEST_VERSION));
   }
 
   /**
@@ -89,7 +90,7 @@ public FixSerializationConfig(String configFilePath, int serializationVersion) {
                 document, "/serialization/fieldInitInfo", "active", Boolean.class)
             .orElse(false);
     SerializationAdapter serializationAdapter =
-        SerializationAdapter.getAdapter(serializationVersion);
+        SerializationAdapter.getAdapterForVersion(serializationVersion);
     serializer = new Serializer(this, serializationAdapter);
   }
 

diff --git a/nullaway/src/main/java/com/uber/nullaway/fixserialization/adapters/SerializationAdapter.java b/nullaway/src/main/java/com/uber/nullaway/fixserialization/adapters/SerializationAdapter.java
@@ -78,7 +78,7 @@ public interface SerializationAdapter {
    * @param version The version of the adapter to return.
    * @return The adapter corresponding to the given version.
    */
-  static SerializationAdapter getAdapter(int version) {
+  static SerializationAdapter getAdapterForVersion(int version) {
     switch (version) {
       case 1:
         return new SerializationV1Adapter();

diff --git a/nullaway/src/test/java/com/uber/nullaway/SerializationTest.java b/nullaway/src/test/java/com/uber/nullaway/SerializationTest.java
@@ -1988,7 +1988,7 @@ ERROR_FILE_NAME, new SerializationV1Adapter().getErrorsOutputFileHeader())
    */
   public void checkVersionSerialization(int version) {
     SerializationTestHelper<ErrorDisplay> tester = new SerializationTestHelper<>(root);
-    SerializationAdapter adapter = SerializationAdapter.getAdapter(version);
+    SerializationAdapter adapter = SerializationAdapter.getAdapterForVersion(version);
     tester
         .setArgs(
             Arrays.asList(