Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Detected candidate inner classes

Browse Source 
This commit improves the indexer to also consider static inner classes
on top of regular top level classes.

Issue: SPR-16112
This commit is contained in:
Stephane Nicoll
2017-11-03 13:25:23 +01:00
parent ef39092b3b
commit fb76aa0150
4 changed files with 119 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-context-indexer/src/main/java/org/springframework/context/index/CandidateComponentsIndexer.java
View File

@@ -19,6 +19,7 @@ package org.springframework.context.index;
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;
@@ -29,7 +30,9 @@ import javax.annotation.processing.RoundEnvironment;
import javax.lang.model.SourceVersion;
import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.TypeElement;
/**
@@ -42,6 +45,10 @@ import javax.lang.model.element.TypeElement;
*/
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;
@@ -102,6 +109,11 @@ public class CandidateComponentsIndexer implements Processor {
}
private void processElement(Element element) {
addMetadataFor(element);
staticTypesIn(element.getEnclosedElements()).forEach(this::processElement);
}
private void addMetadataFor(Element element) {
Set<String> stereotypes = new LinkedHashSet<>();
this.stereotypesProviders.forEach(p -> stereotypes.addAll(p.getStereotypes(element)));
if (!stereotypes.isEmpty()) {
@@ -121,4 +133,14 @@ public class CandidateComponentsIndexer implements Processor {
}
}
private static List<TypeElement> staticTypesIn(Iterable<? extends Element> elements) {
List<TypeElement> list = new ArrayList<>();
for (Element e : elements) {
if (TYPE_KINDS.contains(e.getKind())
&& e.getModifiers().contains(Modifier.STATIC))
list.add(TypeElement.class.cast(e));
}
return list;
}
}