zaaarf/route-cartographer
1
0
Fork 0
mirror of https://github.com/zaaarf/route-cartographer.git synced 2024-11-12 23:59:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix: correctly handle parent recursion and type parameters

Browse source
This commit is contained in:
zaaarf 2024-01-23 17:04:03 +01:00
parent ff54940b4a
commit f5bff65ba8
No known key found for this signature in database
GPG key ID: C91CFF9E2262BBA1
1 changed files with 29 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/main/java/foo/zaaarf/routecompass/RouteCompass.java
View file

@ -1,15 +1,14 @@
package foo.zaaarf.routecompass; package foo.zaaarf.routecompass;
import org.springframework.http.RequestEntity;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.AbstractProcessor;
import javax.annotation.processing.RoundEnvironment; import javax.annotation.processing.RoundEnvironment;
import javax.annotation.processing.SupportedSourceVersion; import javax.annotation.processing.SupportedSourceVersion;
import javax.lang.model.SourceVersion; import javax.lang.model.SourceVersion;
import javax.lang.model.element.Element; import javax.lang.model.element.*;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;
import javax.lang.model.element.VariableElement;
import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror; import javax.lang.model.type.TypeMirror;
import javax.tools.Diagnostic; import javax.tools.Diagnostic;
@ -267,8 +266,30 @@ public class RouteCompass extends AbstractProcessor {
if(!(type instanceof TypeElement)) //doubles as null check if(!(type instanceof TypeElement)) //doubles as null check
return null; return null;
List<VariableElement> fieldElements = new ArrayList<>();
TypeElement typeElement = (TypeElement) type; TypeElement typeElement = (TypeElement) type;
//parameter checks
Name base = typeElement.getQualifiedName();
if(base.contentEquals(ResponseEntity.class.getCanonicalName())
|| base.contentEquals(RequestEntity.class.getCanonicalName())) {
typeElement = (TypeElement) typeElement.getTypeParameters()
.stream()
.findFirst()
.map(TypeParameterElement::getBounds)
.map(l -> {
List<TypeMirror> lst = new ArrayList<>(l); //mutable
lst.removeIf(b -> b.toString().equals("java.lang.Object"));
return lst;
}).flatMap(l -> l.stream().findFirst())
.map(m -> this.processingEnv.getTypeUtils().asElement(m))
.filter(m -> m instanceof TypeElement)
.orElse(null );
if(typeElement == null)
return new Route.DTO(base.toString());
}
List<VariableElement> fieldElements = new ArrayList<>();
do { do {
fieldElements.addAll(typeElement fieldElements.addAll(typeElement
.getEnclosedElements() .getEnclosedElements()
@ -302,7 +323,7 @@ public class RouteCompass extends AbstractProcessor {
throws ReflectiveOperationException { throws ReflectiveOperationException {
Class<? extends Annotation> annClass = this.annotationClasses.stream() Class<? extends Annotation> annClass = this.annotationClasses.stream()
.filter(c -> annotationType.getQualifiedName().contentEquals(c.getName())) .filter(c -> annotationType.getQualifiedName().contentEquals(c.getCanonicalName()))
.findFirst() .findFirst()
.get(); //should never fail .get(); //should never fail
@ -340,9 +361,8 @@ public class RouteCompass extends AbstractProcessor {
); );
return fun.apply( return fun.apply(
this.processingEnv.getElementUtils() this.processingEnv.getElementUtils().getTypeElement(found.get(0).getCanonicalName()),
.getTypeElement(found.get(0).getName()), element.getEnclosingElement()
element
); );
} }