Bit of a diminishing-returns refactoring, but...

uber · May 13, 2022 · 7df44b4 · 7df44b4
1 parent 2b4970b
commit 7df44b4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/nullaway/src/main/java/com/uber/nullaway/AbstractConfig.java b/nullaway/src/main/java/com/uber/nullaway/AbstractConfig.java
@@ -291,26 +291,20 @@ public boolean isContractAnnotation(String annotationName) {
     return contractAnnotations.contains(annotationName);
   }
 
-  protected ImmutableSet<MethodClassAndName> getKnownInitializers(
-      ImmutableSet<String> qualifiedNames) {
-    return qualifiedNames.stream()
-        .map(
-            name -> {
-              int lastDot = name.lastIndexOf('.');
-              String methodName = name.substring(lastDot + 1);
-              String className = name.substring(0, lastDot);
-              return MethodClassAndName.create(className, methodName);
-            })
-        .collect(ImmutableSet.toImmutableSet());
-  }
-
   @AutoValue
   abstract static class MethodClassAndName {
 
     static MethodClassAndName create(String enclosingClass, String methodName) {
       return new AutoValue_AbstractConfig_MethodClassAndName(enclosingClass, methodName);
     }
 
+    static MethodClassAndName fromClassDotMethod(String classDotMethod) {
+      int lastDot = classDotMethod.lastIndexOf('.');
+      String methodName = classDotMethod.substring(lastDot + 1);
+      String className = classDotMethod.substring(0, lastDot);
+      return MethodClassAndName.create(className, methodName);
+    }
+
     abstract String enclosingClass();
 
     abstract String methodName();

diff --git a/nullaway/src/main/java/com/uber/nullaway/ErrorProneCLIFlagsConfig.java b/nullaway/src/main/java/com/uber/nullaway/ErrorProneCLIFlagsConfig.java
@@ -163,8 +163,9 @@ final class ErrorProneCLIFlagsConfig extends AbstractConfig {
     sourceClassesToExclude = getFlagStringSet(flags, FL_CLASSES_TO_EXCLUDE);
     unannotatedClasses = getFlagStringSet(flags, FL_UNANNOTATED_CLASSES);
     knownInitializers =
-        getKnownInitializers(
-            getFlagStringSet(flags, FL_KNOWN_INITIALIZERS, DEFAULT_KNOWN_INITIALIZERS));
+        getFlagStringSet(flags, FL_KNOWN_INITIALIZERS, DEFAULT_KNOWN_INITIALIZERS).stream()
+            .map(MethodClassAndName::fromClassDotMethod)
+            .collect(ImmutableSet.toImmutableSet());
     excludedClassAnnotations =
         getFlagStringSet(
             flags, FL_CLASS_ANNOTATIONS_TO_EXCLUDE, DEFAULT_CLASS_ANNOTATIONS_TO_EXCLUDE);