Skip to content

Commit ab0930b

Browse files
authored
Refactor internals - In InjectProcessor use APContext.isAssignable(te, "io.avaje.inject.spi.InjectExtension") (#625)
1 parent 1640f35 commit ab0930b

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed

inject-generator/src/main/java/io/avaje/inject/generator/InjectProcessor.java

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import javax.lang.model.element.ElementKind;
1212
import javax.lang.model.element.ExecutableElement;
1313
import javax.lang.model.element.TypeElement;
14-
import javax.lang.model.type.TypeMirror;
1514
import javax.lang.model.util.ElementFilter;
1615
import javax.lang.model.util.Elements;
1716
import javax.tools.StandardLocation;
@@ -338,24 +337,14 @@ private void readInjectModule(RoundEnvironment roundEnv) {
338337

339338
private void registerSPI(Set<? extends Element> beans) {
340339
ElementFilter.typesIn(beans).stream()
341-
.filter(InjectProcessor::isInjectExtension)
340+
.filter(this::isExtension)
342341
.map(TypeElement::getQualifiedName)
343342
.map(Object::toString)
344343
.forEach(ProcessingContext::addInjectSPI);
345344
}
346345

347-
private static boolean isInjectExtension(TypeElement te) {
348-
return te.getInterfaces().stream()
349-
.map(TypeMirror::toString)
350-
.anyMatch(EXTENSION_TYPES::contains);
346+
private boolean isExtension(TypeElement te) {
347+
return APContext.isAssignable(te, "io.avaje.inject.spi.InjectExtension");
351348
}
352349

353-
private static final Set<String> EXTENSION_TYPES = Set.of(
354-
"io.avaje.inject.spi.ModuleOrdering",
355-
"io.avaje.inject.spi.AvajeModule",
356-
"io.avaje.inject.spi.InjectPlugin",
357-
"io.avaje.inject.spi.ConfigPropertyPlugin",
358-
"io.avaje.inject.spi.PropertyRequiresPlugin"
359-
);
360-
361350
}

0 commit comments

Comments
 (0)