Merge branch 'develop'

toolisticon · Nov 11, 2023 · f5f10db · f5f10db
2 parents 4606e91 + b41fa7f
commit f5f10db
Show file tree

Hide file tree

Showing 22 changed files with 51 additions and 20 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.7</version>
+        <version>0.22.8</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.7</version>
+        <version>0.22.8</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.7</version>
+        <version>0.22.8</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.7</version>
+        <version>0.22.8</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.7</version>
+        <version>0.22.8</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.7</version>
+        <version>0.22.8</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.7</version>
+        <version>0.22.8</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.7</version>
+        <version>0.22.8</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.7</version>
+        <version>0.22.8</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.7</version>
+        <version>0.22.8</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.7</version>
+        <version>0.22.8</version>
     </parent>
 
     <name>aptk-example-annotationprocessor</name>
@@ -114,7 +114,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.9.1</version>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <id>add-resource</id>

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.7</version>
+        <version>0.22.8</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.7</version>
+        <version>0.22.8</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.7</version>
+        <version>0.22.8</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.7</version>
+        <version>0.22.8</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.7</version>
+        <version>0.22.8</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.7</version>
+    <version>0.22.8</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.7</version>
+        <version>0.22.8</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.7</version>
+        <version>0.22.8</version>
     </parent>
 
     <name>aptk-tools</name>

diff --git a/tools/src/main/java/io/toolisticon/aptk/tools/wrapper/AnnotationMirrorWrapper.java b/tools/src/main/java/io/toolisticon/aptk/tools/wrapper/AnnotationMirrorWrapper.java
@@ -68,6 +68,26 @@ public TypeElementWrapper getAnnotationTypeAsWrappedTypeElement() {
         return getAnnotationTypeAsWrappedTypeMirror().getTypeElement().get();
     }
 
+
+    /**
+     * Gets the wrapped type mirror of the 'value' annotation attribute.
+     * @return an optional containing the wrapped type mirror of the annotation attribute or an empty Optional if the attribute doesn't exist.
+     */
+    public Optional<TypeMirrorWrapper> getAttributeTypeMirror() {
+        return getAttributeTypeMirror("value");
+    }
+
+    /**
+     * Gets the wrapped type mirror of an annotation attribute.
+     * @param attributeName the name of the attribute
+     * @return an optional containing the wrapped type mirror of the annotation attribute or an empty Optional if the attribute doesn't exist.
+     */
+    public Optional<TypeMirrorWrapper> getAttributeTypeMirror(String attributeName) {
+        Optional<ExecutableElementWrapper> annotationAttribute = this.getAnnotationTypeAsWrappedTypeElement().getMethod(attributeName);
+        return !annotationAttribute.isPresent() ? Optional.empty() : Optional.of(annotationAttribute.get().getReturnType());
+    }
+
+
     /**
      * Returns the "value" attribute
      *

diff --git a/tools/src/main/java/io/toolisticon/aptk/tools/wrapper/TypeElementWrapper.java b/tools/src/main/java/io/toolisticon/aptk/tools/wrapper/TypeElementWrapper.java
@@ -126,6 +126,7 @@ public List<TypeParameterElementWrapper> getTypeParameters() {
     public Optional<ExecutableElementWrapper> getMethod(String name, Class<?>... parameterTypes) {
         List<ExecutableElement> filterResult = FluentElementFilter.createFluentElementFilter(this.element.getEnclosedElements())
                 .applyFilter(AptkCoreMatchers.IS_METHOD)
+                .applyFilter(AptkCoreMatchers.BY_NAME).filterByOneOf(name)
                 .applyFilter(AptkCoreMatchers.BY_PARAMETER_TYPE).filterByOneOf(parameterTypes)
                 .getResult();
         return Optional.ofNullable(filterResult.size() > 0 ? ExecutableElementWrapper.wrap(filterResult.get(0)) : null);

diff --git a/tools/src/test/java/io/toolisticon/aptk/tools/wrapper/AnnotationMirrorWrapperTest.java b/tools/src/test/java/io/toolisticon/aptk/tools/wrapper/AnnotationMirrorWrapperTest.java
@@ -47,6 +47,16 @@ public void test_wrap_null() {
         AnnotationMirrorWrapper.wrap((AnnotationMirror) null);
     }
 
+
+    @Test
+    public void test_getAttributesTypeMirror() {
+        CompileTestBuilder.unitTest().<TypeElement>defineTestWithPassedInElement(MyTestClass.class, (processingEnvironment, element) -> {
+            AnnotationMirrorWrapper unit = ElementWrapper.wrap(element).getAnnotationMirror(MyTestAnnotation.class).get();
+
+            MatcherAssert.assertThat(unit.getAttributeTypeMirror().get().getSimpleName(), Matchers.is("String"));
+        }).executeTest();
+    }
+
     @Test
     public void test_getAttribute() {