Internal changes

RELNOTES=N/A PiperOrigin-RevId: 568310453
google · Sep 25, 2023 · 7412301 · 7412301
1 parent 76bde06
commit 7412301
Showing 1 changed file with 25 additions and 24 deletions.
diff --git a/java/dagger/internal/codegen/binding/InjectionAnnotations.java b/java/dagger/internal/codegen/binding/InjectionAnnotations.java
@@ -100,18 +100,7 @@ public Optional<Scope> getScope(XElement element) {
   public ImmutableSet<Scope> getScopes(XElement element) {
     superficialValidation.validateTypeOf(element);
     ImmutableSet<Scope> scopes =
-        getScopesFromScopeMetadata(element)
-            .orElseGet(
-                () -> {
-                  // Validate the annotation types before we check for @Scope, otherwise the @Scope
-                  // annotation may appear to be missing (b/213880825).
-                  superficialValidation.validateAnnotationTypesOf(element);
-                  return element.getAllAnnotations().stream()
-                      .filter(InjectionAnnotations::hasScopeAnnotation)
-                      .map(DaggerAnnotation::from)
-                      .map(Scope::scope)
-                      .collect(toImmutableSet());
-                });
+        getScopesWithMetadata(element).orElseGet(() -> getScopesWithoutMetadata(element));
 
     // Fully validate each scope to ensure its values are also valid.
     scopes.stream()
@@ -120,7 +109,18 @@ public ImmutableSet<Scope> getScopes(XElement element) {
     return scopes;
   }
 
-  private Optional<ImmutableSet<Scope>> getScopesFromScopeMetadata(XElement element) {
+  private ImmutableSet<Scope> getScopesWithoutMetadata(XElement element) {
+    // Validate the annotation types before we check for @Scope, otherwise the @Scope
+    // annotation may appear to be missing (b/213880825).
+    superficialValidation.validateAnnotationTypesOf(element);
+    return element.getAllAnnotations().stream()
+        .filter(InjectionAnnotations::hasScopeAnnotation)
+        .map(DaggerAnnotation::from)
+        .map(Scope::scope)
+        .collect(toImmutableSet());
+  }
+
+  private Optional<ImmutableSet<Scope>> getScopesWithMetadata(XElement element) {
     Optional<XAnnotation> scopeMetadata = getScopeMetadata(element);
     if (!scopeMetadata.isPresent()) {
       return Optional.empty();
@@ -203,16 +203,8 @@ public Optional<XAnnotation> getQualifier(XElement element) {
   public ImmutableSet<XAnnotation> getQualifiers(XElement element) {
     superficialValidation.validateTypeOf(element);
     ImmutableSet<XAnnotation> qualifiers =
-        getQualifiersFromQualifierMetadata(element)
-            .orElseGet(
-                () -> {
-                  // Validate the annotation types before we check for @Qualifier, otherwise the
-                  // @Qualifier annotation may appear to be missing (b/213880825).
-                  superficialValidation.validateAnnotationTypesOf(element);
-                  return element.getAllAnnotations().stream()
-                      .filter(InjectionAnnotations::hasQualifierAnnotation)
-                      .collect(toImmutableSet());
-                });
+        getQualifiersWithMetadata(element)
+            .orElseGet(() -> getQualifiersWithoutMetadata(element));
 
     if (isField(element)) {
       XFieldElement field = asField(element);
@@ -237,7 +229,16 @@ && hasInjectAnnotation(field)
     return qualifiers;
   }
 
-  private Optional<ImmutableSet<XAnnotation>> getQualifiersFromQualifierMetadata(XElement element) {
+  private ImmutableSet<XAnnotation> getQualifiersWithoutMetadata(XElement element) {
+    // Validate the annotation types before we check for @Qualifier, otherwise the
+    // @Qualifier annotation may appear to be missing (b/213880825).
+    superficialValidation.validateAnnotationTypesOf(element);
+    return element.getAllAnnotations().stream()
+        .filter(InjectionAnnotations::hasQualifierAnnotation)
+        .collect(toImmutableSet());
+  }
+
+  private Optional<ImmutableSet<XAnnotation>> getQualifiersWithMetadata(XElement element) {
     Optional<XAnnotation> qualifierMetadata = getQualifierMetadata(element);
     if (!qualifierMetadata.isPresent()) {
       return Optional.empty();