Merge branch 'develop'

annotationwrapper/api/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-annotationwrapper-parent</artifactId>
-        <version>0.27.0</version>
+        <version>0.28.0</version>
     </parent>
 
     <name>aptk-annotationwrapper-api</name>

annotationwrapper/integrationtest/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-annotationwrapper-parent</artifactId>
-        <version>0.27.0</version>
+        <version>0.28.0</version>
     </parent>
 
     <name>aptk-annotationwrapper-integrationTest</name>

annotationwrapper/integrationtest/src/test/java/io/toolisticon/aptk/annotationwrapper/test/annotationontype/IntegrationTest.java

@@ -8,6 +8,7 @@
 import io.toolisticon.aptk.tools.AnnotationUtils;
 import io.toolisticon.aptk.tools.MessagerUtils;
 import io.toolisticon.aptk.tools.TypeMirrorWrapper;
+import io.toolisticon.aptk.tools.wrapper.TypeElementWrapper;
 import io.toolisticon.cute.CompileTestBuilder;
 import io.toolisticon.cute.CompileTestBuilderApi;
 import io.toolisticon.cute.PassIn;
@@ -115,6 +116,21 @@ public void aptkUnitTest(ProcessingEnvironment processingEnvironment, TypeElemen
                 .compilationShouldSucceed()
                 .executeTest();
     }
+
+    @Test
+    public void testWrappingWithElementWrapper() {
+        unitTestBuilder.defineTestWithPassedInElement(TestUsage.class, new APTKUnitTestProcessor<TypeElement>() {
+            @Override
+            public void aptkUnitTest(ProcessingEnvironment processingEnvironment, TypeElement typeElement) {
+            	TypeElementWrapper typeElementWrapper = TypeElementWrapper.wrap(typeElement);
+                ExampleTestAnnotationWrapper testAnnotationWrapper = ExampleTestAnnotationWrapper.wrap(typeElementWrapper);
+
+                MatcherAssert.assertThat(testAnnotationWrapper._annotatedElement(), Matchers.is(typeElement));
+            }
+        })
+                .compilationShouldSucceed()
+                .executeTest();
+    }
 
     @PassIn
     @TestDefaultsAnnotation(withoutDefault = "ABC")

annotationwrapper/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-parent</artifactId>
-        <version>0.27.0</version>
+        <version>0.28.0</version>
     </parent>
 
 

annotationwrapper/processor/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-annotationwrapper-parent</artifactId>
-        <version>0.27.0</version>
+        <version>0.28.0</version>
     </parent>
 
     <name>aptk-annotationwrapper-processor</name>

annotationwrapper/processor/src/main/resources/AnnotationWrapper.tpl

@@ -365,6 +365,15 @@ ${state.visibilityModifier}class ${atw.simpleName}Wrapper !{if atw.customInterfa
     ${state.visibilityModifier}static ${atw.simpleName}Wrapper wrap(Element element) {
         return isAnnotated(element) ? new ${atw.simpleName}Wrapper(element) : null;
     }
+
+     /**
+      * Gets the AnnotationMirror from passed element for this wrappers annotation type and creates a wrapper instance.
+      * @param element The element to read the annotations from
+      * @return The wrapped AnnotationMirror if Element is annotated with this wrappers annotation type, otherwise null.
+      */
+    ${state.visibilityModifier}static ${atw.simpleName}Wrapper wrap(ElementWrapper element) {
+        return wrap(element.unwrap());
+    }
 
     /**
      * Wraps an AnnotationMirror.

common/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-parent</artifactId>
-        <version>0.27.0</version>
+        <version>0.28.0</version>
     </parent>
 
     <name>aptk-common</name>

compilermessages/api/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-compilermessages-parent</artifactId>
-        <version>0.27.0</version>
+        <version>0.28.0</version>
     </parent>
 
     <name>aptk-compilermessages-api</name>

compilermessages/integrationtest/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-compilermessages-parent</artifactId>
-        <version>0.27.0</version>
+        <version>0.28.0</version>
     </parent>
 
     <name>aptk-compilermessages-integrationTest</name>

compilermessages/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-parent</artifactId>
-        <version>0.27.0</version>
+        <version>0.28.0</version>
     </parent>
 
 

compilermessages/processor/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-compilermessages-parent</artifactId>
-        <version>0.27.0</version>
+        <version>0.28.0</version>
     </parent>
 
     <name>aptk-compilermessages-processor</name>

cute/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-parent</artifactId>
-        <version>0.27.0</version>
+        <version>0.28.0</version>
     </parent>
 
     <name>aptk-cute</name>

example/example-annotationprocessor/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-example-parent</artifactId>
-        <version>0.27.0</version>
+        <version>0.28.0</version>
     </parent>
 
     <name>aptk-example-annotationprocessor</name>

example/example-annotations/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-example-parent</artifactId>
-        <version>0.27.0</version>
+        <version>0.28.0</version>
     </parent>
 
     <name>aptk-example-annotations</name>

example/example-usecase/.gitignore

@@ -0,0 +1 @@
+/.apt_generated_tests/

example/example-usecase/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-example-parent</artifactId>
-        <version>0.27.0</version>
+        <version>0.28.0</version>
     </parent>
 
     <name>aptk-example-usecase</name>

example/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-parent</artifactId>
-        <version>0.27.0</version>
+        <version>0.28.0</version>
     </parent>
 
     <name>aptk-example-parent</name>

integrationtest/java16/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>integrationtest-parent</artifactId>
-        <version>0.27.0</version>
+        <version>0.28.0</version>
     </parent>
 
     <name>aptk-integrationtest-java16</name>

integrationtest/java17/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>integrationtest-parent</artifactId>
-        <version>0.27.0</version>
+        <version>0.28.0</version>
     </parent>
 
     <name>aptk-integrationtest-java17</name>

integrationtest/java9/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>integrationtest-parent</artifactId>
-        <version>0.27.0</version>
+        <version>0.28.0</version>
     </parent>
 
     <name>aptk-integrationtest-java9</name>

integrationtest/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-parent</artifactId>
-        <version>0.27.0</version>
+        <version>0.28.0</version>
     </parent>
 
     <name>integrationtest-parent</name>

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>io.toolisticon.aptk</groupId>
     <artifactId>aptk-parent</artifactId>
-    <version>0.27.0</version>
+    <version>0.28.0</version>
     <packaging>pom</packaging>
 
     <name>aptk-parent</name>

templating/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-parent</artifactId>
-        <version>0.27.0</version>
+        <version>0.28.0</version>
     </parent>
 
     <name>aptk-templating</name>

tools/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-parent</artifactId>
-        <version>0.27.0</version>
+        <version>0.28.0</version>
     </parent>
 
     <name>aptk-tools</name>

tools/src/main/java/io/toolisticon/aptk/tools/generators/FileObjectSimpleWriter.java

@@ -10,7 +10,7 @@
 /**
  * Abstract base class for writers of java code and resources.
  */
-public class FileObjectSimpleWriter<T extends FileObject> extends SimpleWriter{
+public class FileObjectSimpleWriter<T extends FileObject> extends SimpleWriter implements AutoCloseable{
 
     private final T fileObject;
     private final Writer foWriter;

tools/src/main/java/io/toolisticon/aptk/tools/generators/SimpleKotlinWriter.java

@@ -15,7 +15,7 @@
 /**
  * A simple writer for writing kotlin source files.
  */
-public class SimpleKotlinWriter extends SimpleWriter {
+public class SimpleKotlinWriter extends SimpleWriter implements AutoCloseable{
 
     final static String KAPT_KOTLIN_GENERATED = "kapt.kotlin.generated";
     private final static Pattern PACKAGE_PATTERN = Pattern.compile("(\\w+?(?:[.]\\w+?)*)[.]\\w*");

tools/src/main/java/io/toolisticon/aptk/tools/generators/SimpleResourceReader.java

@@ -11,7 +11,7 @@
 /**
  * Simple helper class to open and read a resource file.
  */
-public class SimpleResourceReader {
+public class SimpleResourceReader implements AutoCloseable{
 
     private final FileObject fileObject;
     private final BufferedReader foReader;

tools/src/main/java/io/toolisticon/aptk/tools/wrapper/ElementWrapper.java

@@ -127,7 +127,7 @@ public String getSimpleName() {
     public boolean hasSimpleName(String name) {
         return name != null && this.getSimpleName().equals(name);
     }
-
+    
     /**
      * Checks if element has all passed modifiers are present.
      *

tools/src/main/java/io/toolisticon/aptk/tools/wrapper/TypeElementWrapper.java

@@ -54,6 +54,28 @@ public boolean hasNestingKind(NestingKind nestingKind) {
     public boolean isNested() {
         return getNestingKind().isNested();
     }
+
+    /**
+     * Gets the nested name of the element.
+     * If the TypeElement isn't a nested type the simple name will be returned.
+     *
+     * @return the nested name of the element
+     */
+    public String getNestedName() {
+
+    	String name = getSimpleName();
+
+    	TypeElementWrapper current = this;
+
+    	while (current.isNested()) {
+
+    		current = current.getOuterType().get();
+    		name = current.getSimpleName() + "." + name;
+
+    	}
+
+        return name;
+    }
 
     /**
      * Returns the qualified name.

tools/src/test/java/io/toolisticon/aptk/tools/wrapper/TypeElementWrapperTest.java

@@ -34,6 +34,17 @@ private static class EmbeddedTestClass implements Cloneable, Serializable {
     private static class ChildTestClass extends EmbeddedTestClass implements WhatsUp {
 
     }
+
+    private static class OuterNestedClass {
+
+    	@PassIn
+        private static class InnerNestedClass {
+
+
+
+        }
+    }
+
 
     @Test
     public void test_wrapAndUnwrap() {
@@ -69,6 +80,18 @@ public void test_isNested() {
         MatcherAssert.assertThat("Shoud not have found nesting kind", !unit.isNested());
     }
 
+
+    @Test
+    public void test_getNestedName() {
+        CompileTestBuilder.unitTest().<TypeElement>defineTestWithPassedInElement(OuterNestedClass.InnerNestedClass.class, PassIn.class, (processingEnvironment, element) -> {
+
+                    TypeElementWrapper unit = TypeElementWrapper.wrap(element);
+                    MatcherAssert.assertThat(unit.getNestedName(), Matchers.is(TypeElementWrapperTest.class.getSimpleName() + "." + OuterNestedClass.class.getSimpleName() + "." + OuterNestedClass.InnerNestedClass.class.getSimpleName() ));
+
+                })
+                .executeTest();
+    }
+
     @Test
     public void test_getQualifiedName_and_hasQualifiedName() {
         CompileTestBuilder.unitTest().<TypeElement>defineTestWithPassedInElement(EmbeddedTestClass.class, PassIn.class, (processingEnvironment, element) -> {