From 2b4970b39363e13c4f357fa70f1628606a3b9068 Mon Sep 17 00:00:00 2001 From: Lazaro Clapp Date: Fri, 13 May 2022 19:32:16 -0400 Subject: [PATCH] Also switch the argument type of getKnownInitializers and refactor it --- .../com/uber/nullaway/AbstractConfig.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/nullaway/src/main/java/com/uber/nullaway/AbstractConfig.java b/nullaway/src/main/java/com/uber/nullaway/AbstractConfig.java index ee5c0ca233..31f983f0a8 100644 --- a/nullaway/src/main/java/com/uber/nullaway/AbstractConfig.java +++ b/nullaway/src/main/java/com/uber/nullaway/AbstractConfig.java @@ -30,7 +30,6 @@ import com.google.errorprone.util.ASTHelpers; import com.sun.tools.javac.code.Symbol; import com.uber.nullaway.fixserialization.FixSerializationConfig; -import java.util.LinkedHashSet; import java.util.Set; import java.util.regex.Pattern; import javax.annotation.Nullable; @@ -292,15 +291,17 @@ public boolean isContractAnnotation(String annotationName) { return contractAnnotations.contains(annotationName); } - protected ImmutableSet getKnownInitializers(Set qualifiedNames) { - Set result = new LinkedHashSet<>(); - for (String name : qualifiedNames) { - int lastDot = name.lastIndexOf('.'); - String methodName = name.substring(lastDot + 1); - String className = name.substring(0, lastDot); - result.add(MethodClassAndName.create(className, methodName)); - } - return ImmutableSet.copyOf(result); + protected ImmutableSet getKnownInitializers( + ImmutableSet 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