CandidateComponentsIndexer introspects any kind of class (including r…

…ecords) Closes gh-26909
spring-projects · May 11, 2021 · 4164fc6 · 4164fc6
1 parent 0865abe
commit 4164fc6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/...src/main/java/org/springframework/context/index/processor/CandidateComponentsIndexer.java b/...src/main/java/org/springframework/context/index/processor/CandidateComponentsIndexer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.EnumSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
@@ -46,9 +45,6 @@
  */
 public class CandidateComponentsIndexer implements Processor {
 
-	private static final Set<ElementKind> TYPE_KINDS =
-			Collections.unmodifiableSet(EnumSet.of(ElementKind.CLASS, ElementKind.INTERFACE));
-
 	private MetadataStore metadataStore;
 
 	private MetadataCollector metadataCollector;
@@ -136,7 +132,8 @@ private void writeMetaData() {
 	private static List<TypeElement> staticTypesIn(Iterable<? extends Element> elements) {
 		List<TypeElement> list = new ArrayList<>();
 		for (Element element : elements) {
-			if (TYPE_KINDS.contains(element.getKind()) && element.getModifiers().contains(Modifier.STATIC)) {
+			if ((element.getKind().isClass() || element.getKind() == ElementKind.INTERFACE) &&
+					element.getModifiers().contains(Modifier.STATIC) && element instanceof TypeElement) {
 				list.add((TypeElement) element);
 			}
 		}

diff --git a/...src/main/java/org/springframework/context/index/processor/IndexedStereotypesProvider.java b/...src/main/java/org/springframework/context/index/processor/IndexedStereotypesProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ public IndexedStereotypesProvider(TypeHelper typeHelper) {
 	public Set<String> getStereotypes(Element element) {
 		Set<String> stereotypes = new LinkedHashSet<>();
 		ElementKind kind = element.getKind();
-		if (kind != ElementKind.CLASS && kind != ElementKind.INTERFACE) {
+		if (!kind.isClass() && kind != ElementKind.INTERFACE) {
 			return stereotypes;
 		}
 		Set<Element> seen = new HashSet<>();