Merge branch 'develop'

annotationwrapper/api/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-annotationwrapper-parent</artifactId>
-        <version>0.22.8</version>
+        <version>0.22.9</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.22.8</version>
+        <version>0.22.9</version>
     </parent>
 
     <name>aptk-annotationwrapper-integrationTest</name>

annotationwrapper/pom.xml

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

annotationwrapper/processor/pom.xml

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

common/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-parent</artifactId>
-        <version>0.22.8</version>
+        <version>0.22.9</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.22.8</version>
+        <version>0.22.9</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.22.8</version>
+        <version>0.22.9</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.22.8</version>
+        <version>0.22.9</version>
     </parent>
 
 

compilermessages/processor/pom.xml

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

compilermessages/processor/src/main/java/io/toolisticon/aptk/compilermessage/processor/CompilerMessageWrapperCustomCode.java

@@ -8,7 +8,6 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import java.util.Optional;
-import java.util.UUID;
 
 public class CompilerMessageWrapperCustomCode {
 

compilermessages/processor/src/test/resources/testcase/happyPath_OnClass/RemoteTestClass.java

@@ -2,7 +2,6 @@
 
 
 import io.toolisticon.aptk.compilermessage.api.DeclareCompilerMessage;
-import io.toolisticon.aptk.compilermessage.api.DeclareCompilerMessageCodePrefix;
 
 @DeclareCompilerMessage(processorClass = io.toolisticon.aptk.compilermessage.processor.test.TestClass.class, enumValueName = "ON_REMOTE_CLASS", code = "005", message = "TEST 5")
 public class RemoteTestClass {

cute/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-parent</artifactId>
-        <version>0.22.8</version>
+        <version>0.22.9</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.22.8</version>
+        <version>0.22.9</version>
     </parent>
 
     <name>aptk-example-annotationprocessor</name>
@@ -43,7 +43,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.3</version>
+                <version>3.5.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>

example/example-annotations/pom.xml

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

example/example-usecase/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-example-parent</artifactId>
-        <version>0.22.8</version>
+        <version>0.22.9</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.22.8</version>
+        <version>0.22.9</version>
     </parent>
 
     <name>aptk-example-parent</name>

extensions/java9/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>extension-parent</artifactId>
-        <version>0.22.8</version>
+        <version>0.22.9</version>
     </parent>
 
     <name>aptk-tools-java9</name>

extensions/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-parent</artifactId>
-        <version>0.22.8</version>
+        <version>0.22.9</version>
     </parent>
 
     <name>extension-parent</name>

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>io.toolisticon.aptk</groupId>
     <artifactId>aptk-parent</artifactId>
-    <version>0.22.8</version>
+    <version>0.22.9</version>
     <packaging>pom</packaging>
 
     <name>aptk-parent</name>
@@ -93,18 +93,18 @@
         <junit.version>4.13.2</junit.version>
         <hamcrest.version>2.2</hamcrest.version>
         <mockito.version>4.3.1</mockito.version>
-        <lombok.version>1.18.22</lombok.version>
+        <lombok.version>1.18.30</lombok.version>
 
         <!-- sonatype url-->
         <sonatype-oss-dist-mgmt-snapshots-url>https://oss.sonatype.org/content/repositories/snapshots/
         </sonatype-oss-dist-mgmt-snapshots-url>
 
 
         <!-- plugin versions -->
-        <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
+        <maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version>
         <maven-build-helper-plugin.version>3.5.0</maven-build-helper-plugin.version>
-        <maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
-        <maven-checkstyle-plugin.version>3.2.1</maven-checkstyle-plugin.version>
+        <maven-clean-plugin.version>3.3.2</maven-clean-plugin.version>
+        <maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
         <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
         <maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version>
         <maven-deploy-plugin.version>3.1.0</maven-deploy-plugin.version>
@@ -116,10 +116,10 @@
         <maven-install-plugin.version>3.1.0</maven-install-plugin.version>
         <maven-jacoco-plugin.version>0.8.10</maven-jacoco-plugin.version>
         <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
-        <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
+        <maven-javadoc-plugin.version>3.6.2</maven-javadoc-plugin.version>
         <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
         <maven-resources-plugin.version>3.3.0</maven-resources-plugin.version>
-        <maven-shade-plugin.version>3.4.1</maven-shade-plugin.version>
+        <maven-shade-plugin.version>3.5.1</maven-shade-plugin.version>
         <maven-site-plugin.version>3.12.1</maven-site-plugin.version>
         <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
         <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>

templating/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-parent</artifactId>
-        <version>0.22.8</version>
+        <version>0.22.9</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.22.8</version>
+        <version>0.22.9</version>
     </parent>
 
     <name>aptk-tools</name>

tools/src/main/java/io/toolisticon/aptk/tools/AnnotationUtils.java

@@ -1,9 +1,6 @@
 package io.toolisticon.aptk.tools;
 
 
-import io.toolisticon.aptk.tools.wrapper.AnnotationMirrorWrapper;
-import io.toolisticon.aptk.tools.wrapper.TypeElementWrapper;
-
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.Element;
@@ -83,7 +80,7 @@ public static String[] getMandatoryAttributeValueNames(AnnotationMirror annotati
                 result.add(entry.getKey().getSimpleName().toString());
             }
         }
-        return result.toArray(new String[result.size()]);
+        return result.toArray(new String[0]);
 
     }
 
@@ -107,7 +104,7 @@ public static String[] getOptionalAttributeValueNames(AnnotationMirror annotatio
 
     /**
      * Gets the AnnotationValue for the passed key.
-     * Also implicitly set default values will be found.
+     * Also, implicitly set default values will be found.
      *
      * @param annotationMirror the annotation mirror to get the value from
      * @param key              the attribute key to search for
@@ -124,8 +121,8 @@ public static AnnotationValue getAnnotationValueOfAttributeWithDefaults(Annotati
 
 
     /**
-     * Gets the ExecutableElement of a annotation attribute for the passed key.
-     * This can be used to determine the type of an attribute.
+     * Gets the ExecutableElement of an annotation attribute for the passed key.
+     * This can be used to determine the type of the attribute.
      * This is very useful if you want to generate code that uses the annotation.
      *
      * @param annotationMirror the annotation mirror to get the value from
@@ -144,7 +141,7 @@ public static ExecutableElement getExecutableElementForAnnotationAttributeName(A
     }
 
     /**
-     * Gets the a FQN of a Class based "value" attribute from annotation.
+     * Gets the FQN of a Class based "value" attribute from annotation.
      *
      * @param element        the element to get the annotation for.
      * @param annotationType the annotation type to get the FQN from
@@ -155,7 +152,7 @@ public static String getClassAttributeFromAnnotationAsFqn(Element element, Class
     }
 
     /**
-     * Gets the a FQN of a Class based attribute from annotation.
+     * Gets the FQN of a Class based attribute from annotation.
      *
      * @param element        the element to get the annotation for.
      * @param annotationType the annotation type to get the FQN from
@@ -171,7 +168,7 @@ public static String getClassAttributeFromAnnotationAsFqn(Element element, Class
     }
 
     /**
-     * Gets the a FQN of a Class based attribute from annotation.
+     * Gets the FQN of a Class based attribute from annotation.
      *
      * @param annotationMirror the AnnotationMirror to get the attribute from.
      * @param attributeName    the name of the attribute to get
@@ -186,7 +183,7 @@ public static String getClassAttributeFromAnnotationAsFqn(AnnotationMirror annot
     }
 
     /**
-     * Gets the a FQN of a Class based attribute from annotation.
+     * Gets the FQN of a Class based attribute from annotation.
      *
      * @param annotationMirror the AnnotationMirror to get the value attribute from.
      * @return the FQN of the searched annotation value or null if annotation can't be found or attribute isn't of type class.
@@ -200,7 +197,7 @@ public static String getClassAttributeFromAnnotationAsFqn(AnnotationMirror annot
     }
 
     /**
-     * Gets the a TypeMirror of a Class based "value" attribute from annotation.
+     * Gets the TypeMirror of a Class based "value" attribute from annotation.
      *
      * @param element        the element to get the annotation for.
      * @param annotationType the annotation type to get the TypeMirror from
@@ -211,7 +208,7 @@ public static TypeMirror getClassAttributeFromAnnotationAsTypeMirror(Element ele
     }
 
     /**
-     * Gets the a TypeMirror of a Class based attribute from annotation.
+     * Gets the TypeMirror of a Class based attribute from annotation.
      *
      * @param element        the element to get the annotation for.
      * @param annotationType the annotation type to get the TypeMirror from
@@ -226,7 +223,7 @@ public static TypeMirror getClassAttributeFromAnnotationAsTypeMirror(Element ele
     }
 
     /**
-     * Gets the a TypeMirror of a Class based attribute from annotation.
+     * Gets the TypeMirror of a Class based attribute from annotation.
      *
      * @param annotationMirror the annotation mirror to get the TypeMirror from
      * @param attributeName    the name of the attribute to get
@@ -389,7 +386,8 @@ public static TypeMirror[] getClassArrayAttributeFromAnnotationAsTypeMirror(Anno
 
     /**
      * Checks if passed annotation is repeatable.
-     * (annotataed with Repeatable annotation)
+     * (annotated with Repeatable annotation)
+     *
      * @param annotation the annotation to check
      * @return true if the annotation is repeatable, otherwise false
      */
@@ -399,21 +397,22 @@ public static boolean isRepeatableAnnotation(Class<? extends Annotation> annotat
 
     /**
      * Gets the repeatable wrapper type of annotation
+     *
      * @param annotation the annotation to get the repeatable annotation wrapper type for
      * @return an optional containing the repeatable wrapper type or an empty optional if passed annotation is null or annotation is no repeatable.
      */
     public static Optional<Class<? extends Annotation>> getRepeatableAnnotationWrapperClass(Class<? extends Annotation> annotation) {
-        if(isRepeatableAnnotation(annotation)) {
+        if (isRepeatableAnnotation(annotation)) {
 
             TypeElement annotationTypeElement = TypeUtils.TypeRetrieval.getTypeElement(annotation);
             AnnotationMirror annotationMirror = AnnotationUtils.getAnnotationMirror(annotationTypeElement, Repeatable.class);
 
             TypeMirror typeMirror = getClassAttributeFromAnnotationAsTypeMirror(annotationMirror, "value");
 
             try {
-                return Optional.of((Class<? extends Annotation>)Class.forName(typeMirror.toString()));
+                return Optional.of((Class<? extends Annotation>) Class.forName(typeMirror.toString()));
             } catch (ClassNotFoundException e) {
-              // ignore - shouldn't happen since
+                // ignore - shouldn't happen since
             }
 
         }
@@ -422,7 +421,7 @@ public static Optional<Class<? extends Annotation>> getRepeatableAnnotationWrapp
 
     public static Optional<List<AnnotationMirror>> getRepeatableAnnotation(Element element, Class<? extends Annotation> annotation) {
 
-        if (annotation == null || element == null || !isRepeatableAnnotation(annotation)) {
+        if (element == null || !isRepeatableAnnotation(annotation)) {
             return Optional.empty();
         }
 
@@ -447,5 +446,4 @@ public static Optional<List<AnnotationMirror>> getRepeatableAnnotation(Element e
     }
 
 
-
 }