Merge branch 'develop'

toolisticon · Oct 9, 2023 · 6945e5a · 6945e5a
2 parents b06114b + 3694d19
commit 6945e5a
Show file tree

Hide file tree

Showing 20 changed files with 44 additions and 44 deletions.
diff --git a/annotationwrapper/api/pom.xml b/annotationwrapper/api/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-annotationwrapper-parent</artifactId>
-        <version>0.22.4</version>
+        <version>0.22.5</version>
     </parent>
 
     <name>aptk-annotationwrapper-api</name>

diff --git a/annotationwrapper/integrationtest/pom.xml b/annotationwrapper/integrationtest/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-annotationwrapper-parent</artifactId>
-        <version>0.22.4</version>
+        <version>0.22.5</version>
     </parent>
 
     <name>aptk-annotationwrapper-integrationTest</name>

diff --git a/annotationwrapper/pom.xml b/annotationwrapper/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-parent</artifactId>
-        <version>0.22.4</version>
+        <version>0.22.5</version>
     </parent>
 
 

diff --git a/annotationwrapper/processor/pom.xml b/annotationwrapper/processor/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-annotationwrapper-parent</artifactId>
-        <version>0.22.4</version>
+        <version>0.22.5</version>
     </parent>
 
     <name>aptk-annotationwrapper-processor</name>

diff --git a/common/pom.xml b/common/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-parent</artifactId>
-        <version>0.22.4</version>
+        <version>0.22.5</version>
     </parent>
 
     <name>aptk-common</name>

diff --git a/compilermessages/api/pom.xml b/compilermessages/api/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-compilermessages-parent</artifactId>
-        <version>0.22.4</version>
+        <version>0.22.5</version>
     </parent>
 
     <name>aptk-compilermessages-api</name>

diff --git a/compilermessages/integrationtest/pom.xml b/compilermessages/integrationtest/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-compilermessages-parent</artifactId>
-        <version>0.22.4</version>
+        <version>0.22.5</version>
     </parent>
 
     <name>aptk-compilermessages-integrationTest</name>

diff --git a/compilermessages/pom.xml b/compilermessages/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-parent</artifactId>
-        <version>0.22.4</version>
+        <version>0.22.5</version>
     </parent>
 
 

diff --git a/compilermessages/processor/pom.xml b/compilermessages/processor/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-compilermessages-parent</artifactId>
-        <version>0.22.4</version>
+        <version>0.22.5</version>
     </parent>
 
     <name>aptk-compilermessages-processor</name>

diff --git a/cute/pom.xml b/cute/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-parent</artifactId>
-        <version>0.22.4</version>
+        <version>0.22.5</version>
     </parent>
 
     <name>aptk-cute</name>

diff --git a/example/example-annotationprocessor/pom.xml b/example/example-annotationprocessor/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-example-parent</artifactId>
-        <version>0.22.4</version>
+        <version>0.22.5</version>
     </parent>
 
     <name>aptk-example-annotationprocessor</name>

diff --git a/example/example-annotations/pom.xml b/example/example-annotations/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-example-parent</artifactId>
-        <version>0.22.4</version>
+        <version>0.22.5</version>
     </parent>
 
     <name>aptk-example-annotations</name>

diff --git a/example/example-usecase/pom.xml b/example/example-usecase/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-example-parent</artifactId>
-        <version>0.22.4</version>
+        <version>0.22.5</version>
     </parent>
 
     <name>aptk-example-usecase</name>

diff --git a/example/pom.xml b/example/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-parent</artifactId>
-        <version>0.22.4</version>
+        <version>0.22.5</version>
     </parent>
 
     <name>aptk-example-parent</name>

diff --git a/extensions/java9/pom.xml b/extensions/java9/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>extension-parent</artifactId>
-        <version>0.22.4</version>
+        <version>0.22.5</version>
     </parent>
 
     <name>aptk-tools-java9</name>

diff --git a/extensions/pom.xml b/extensions/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-parent</artifactId>
-        <version>0.22.4</version>
+        <version>0.22.5</version>
     </parent>
 
     <name>extension-parent</name>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>io.toolisticon.aptk</groupId>
     <artifactId>aptk-parent</artifactId>
-    <version>0.22.4</version>
+    <version>0.22.5</version>
     <packaging>pom</packaging>
 
     <name>aptk-parent</name>

diff --git a/templating/pom.xml b/templating/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-parent</artifactId>
-        <version>0.22.4</version>
+        <version>0.22.5</version>
     </parent>
 
     <name>aptk-templating</name>

diff --git a/tools/pom.xml b/tools/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-parent</artifactId>
-        <version>0.22.4</version>
+        <version>0.22.5</version>
     </parent>
 
     <name>aptk-tools</name>

diff --git a/tools/src/main/java/io/toolisticon/aptk/tools/InterfaceUtils.java b/tools/src/main/java/io/toolisticon/aptk/tools/InterfaceUtils.java
@@ -141,20 +141,23 @@ static TypeMirrorWrapper[] getTypeArgumentsForParentInterface(TypeMirrorWrapper
     }
 
 
-    static class TVTypeMirrorWrapper extends TypeMirrorWrapper {
+    public static class TVTypeMirrorWrapper extends TypeMirrorWrapper {
 
+        private final TypeMirrorWrapper originalTypeMirror;
         private final Map<String, TypeMirrorWrapper> typeVarMap;
 
         TVTypeMirrorWrapper(TypeMirror typeMirror, Map<String, TypeMirrorWrapper> typeVarMap) {
-            super(typeMirror);
+            super(getTypeMirrorWithReplacedTypeVars(typeMirror, typeVarMap).unwrap());
+            this.originalTypeMirror = TypeMirrorWrapper.wrap(typeMirror);
             this.typeVarMap = typeVarMap;
         }
 
-        TypeMirrorWrapper getTypeMirrorWithReplacedTypeVars() {
-            if (isTypeVar() && typeVarMap.containsKey(getTypeVar().toString())) {
-                return typeVarMap.get(getTypeVar().toString());
+        static TypeMirrorWrapper getTypeMirrorWithReplacedTypeVars(TypeMirror typeMirror, Map<String, TypeMirrorWrapper> typeVarMap) {
+            TypeMirrorWrapper typeMirrorWrapper = TypeMirrorWrapper.wrap(typeMirror);
+            if (typeMirrorWrapper.isTypeVar() && typeVarMap.containsKey(typeMirrorWrapper.getTypeVar().toString())) {
+                return typeVarMap.get(typeMirrorWrapper.getTypeVar().toString());
             } else {
-                return TypeMirrorWrapper.wrap(this.unwrap());
+                return typeMirrorWrapper;
             }
         }
 
@@ -167,26 +170,25 @@ TypeMirrorWrapper getTypeMirrorWithReplacedTypeVars() {
          */
         public String getTypeDeclaration() {
 
-            TypeMirrorWrapper typeMirror = getTypeMirrorWithReplacedTypeVars();
 
-            if (typeMirror.getKind() == TypeKind.VOID) {
+            if (this.getKind() == TypeKind.VOID) {
                 return "void";
-            } else if (typeMirror.isPrimitive()) {
-                return typeMirror.toString();
-            } else if (typeMirror.isArray()) {
-                return getTypeDeclaration(typeMirror.getComponentType()) + "[]";
-            } else if (typeMirror.isTypeVar()) {
-                return typeMirror.toString();
-            } else if (typeMirror.isDeclared()) {
-
-                return typeMirror.getSimpleName() + (
-                        typeMirror.hasTypeArguments() ? "<" + typeMirror.getWrappedTypeArguments().stream()
+            } else if (this.isPrimitive()) {
+                return this.toString();
+            } else if (this.isArray()) {
+                return getTypeDeclaration(this.getComponentType()) + "[]";
+            } else if (this.isTypeVar()) {
+                return this.toString();
+            } else if (this.isDeclared()) {
+
+                return this.getSimpleName() + (
+                        this.hasTypeArguments() ? "<" + this.getWrappedTypeArguments().stream()
                                 .map(e -> new TVTypeMirrorWrapper(e.unwrap(), typeVarMap))
                                 .map(e -> e.getTypeDeclaration()).collect(Collectors.joining(", ")) + ">" : ""
                 );
 
-            } else if (typeMirror.isWildcardType()) {
-                WildcardType wildcardType = typeMirror.getWildcardType();
+            } else if (this.isWildcardType()) {
+                WildcardType wildcardType = this.getWildcardType();
                 if (wildcardType.getSuperBound() != null) {
                     return "? super " + new TVTypeMirrorWrapper(wildcardType.getSuperBound(), typeVarMap).getTypeDeclaration();
                 } else if (wildcardType.getExtendsBound() != null) {
@@ -196,13 +198,11 @@ public String getTypeDeclaration() {
                 }
             }
 
-            return typeMirror.toString();
+            return this.toString();
         }
 
-        @Override
-        public Set<String> getImports() {
-            return getTypeMirrorWithReplacedTypeVars().getImports();
-        }
+
+
     }