Merge branch 'develop'

.github/workflows/codeql-analysis.yml

@@ -43,7 +43,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v3

annotationwrapper/api/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-annotationwrapper-parent</artifactId>
-        <version>0.23.0</version>
+        <version>0.24.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.23.0</version>
+        <version>0.24.0</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.23.0</version>
+        <version>0.24.0</version>
     </parent>
 
 

annotationwrapper/processor/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-annotationwrapper-parent</artifactId>
-        <version>0.23.0</version>
+        <version>0.24.0</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.23.0</version>
+        <version>0.24.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.23.0</version>
+        <version>0.24.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.23.0</version>
+        <version>0.24.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.23.0</version>
+        <version>0.24.0</version>
     </parent>
 
 

compilermessages/processor/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.toolisticon.aptk</groupId>
         <artifactId>aptk-compilermessages-parent</artifactId>
-        <version>0.23.0</version>
+        <version>0.24.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.23.0</version>
+        <version>0.24.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.23.0</version>
+        <version>0.24.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.23.0</version>
+        <version>0.24.0</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.23.0</version>
+        <version>0.24.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.23.0</version>
+        <version>0.24.0</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.23.0</version>
+        <version>0.24.0</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.23.0</version>
+        <version>0.24.0</version>
     </parent>
 
     <name>extension-parent</name>

idea_aptk_codestyle.xml

@@ -0,0 +1,13 @@
+<code_scheme name="Default (3)" version="173">
+  <option name="AUTODETECT_INDENTS" value="false" />
+  <JavaCodeStyleSettings>
+    <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+    <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+  </JavaCodeStyleSettings>
+  <JetCodeStyleSettings>
+    <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+  </JetCodeStyleSettings>
+  <codeStyleSettings language="kotlin">
+    <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+  </codeStyleSettings>
+</code_scheme>

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>io.toolisticon.aptk</groupId>
     <artifactId>aptk-parent</artifactId>
-    <version>0.23.0</version>
+    <version>0.24.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.23.0</version>
+        <version>0.24.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.23.0</version>
+        <version>0.24.0</version>
     </parent>
 
     <name>aptk-tools</name>

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

@@ -310,8 +310,8 @@ public List<ElementWrapper<Element>> getFlattenedEnclosedElementTree(boolean inc
      * @return a list of all elements up to the max depth of the enclosed element tree plus element itself if includeSelf flag is set
      */
     public List<ElementWrapper<Element>> getFlattenedEnclosedElementTree(boolean includeSelf, int maxDepth) {
-        return ElementUtils.AccessEnclosingElements.getFlattenedEnclosingElementsTree(this.unwrap(), includeSelf, maxDepth)
-                .stream().map(ExecutableElementWrapper::wrap).collect(Collectors.toList());
+        return ElementUtils.AccessEnclosedElements.flattenEnclosedElementTree(this.unwrap(), includeSelf, maxDepth)
+                .stream().map(ElementWrapper::wrap).collect(Collectors.toList());
     }
 
     /**

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

@@ -1,6 +1,9 @@
 package io.toolisticon.aptk.tools.wrapper;
 
+import io.toolisticon.aptk.common.ToolingProvider;
+
 import javax.lang.model.element.PackageElement;
+import java.util.Optional;
 
 /**
  * Wrapper for PackageElement.
@@ -45,4 +48,16 @@ public static PackageElementWrapper wrap(PackageElement element) {
         return new PackageElementWrapper(element);
     }
 
+    /**
+     * Gets the PackageElementWrapper by using a fully qualified package name.
+     * @param fqn the fully qualified name of the package
+     * @return an Optional containing the PackageElementWrapper or an empty Optional if the package element can't be found
+     */
+    public static Optional<PackageElementWrapper> getByFqn(String fqn) {
+
+        PackageElement packageElement = ToolingProvider.getTooling().getElements().getPackageElement(fqn);
+        return packageElement != null ? Optional.of(PackageElementWrapper.wrap(packageElement)) : Optional.empty();
+
+    }
+
 }

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

@@ -8,6 +8,7 @@
 import io.toolisticon.cute.UnitTest;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mockito;
 
@@ -25,6 +26,7 @@
 import java.lang.annotation.Target;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -190,10 +192,11 @@ public void test_getAnnotations() {
 
         CompileTestBuilder.unitTest().<TypeElement>defineTestWithPassedInElement(TestClass.class, (processingEnvironment, element) -> {
             ElementWrapper<TypeElement> unit = ElementWrapper.wrap(element);
-            MatcherAssert.assertThat("Should find annotation", unit.getAnnotations(),Matchers.hasSize(1));
+            MatcherAssert.assertThat("Should find annotation", unit.getAnnotations(), Matchers.hasSize(1));
         }).executeTest();
 
     }
+
     @Test
     public void test_getAnnotation_byFqnString() {
 
@@ -275,7 +278,6 @@ public void test_getFirstEnclosingElementWithKind() {
             MatcherAssert.assertThat(unit.<PackageElementWrapper>getFirstEnclosingElementWithKind(ElementKind.PACKAGE).get().getQualifiedName(), Matchers.is(ElementWrapperTest.class.getPackage().getName()));
 
 
-
         }).executeTest();
 
     }
@@ -943,4 +945,26 @@ public void test_toVariableElementWrapper() {
     }
 
 
+    static class FlattenedNestedTestClass {
+
+    }
+    @Test
+    @Ignore
+    public void test_filterFlattenedEnclosedElementTree() {
+        CompileTestBuilder.unitTest().defineTest((processingEnvironment, element) -> {
+                    try {
+                        ToolingProvider.setTooling(processingEnvironment);
+                        PackageElementWrapper packageElementWrapper = PackageElementWrapper.getByFqn(ElementWrapperTest.class.getPackage().getName()).get();
+                        Set<String> types = packageElementWrapper.filterFlattenedEnclosedElementTree().applyFilter(AptkCoreMatchers.IS_TYPE_ELEMENT).getResult().stream().map(e -> e.getQualifiedName().toString()).collect(Collectors.toSet());
+                        MatcherAssert.assertThat("Must find this class", types.contains(ElementWrapperTest.class.getCanonicalName()));
+                        MatcherAssert.assertThat("Must find nested class", types.contains(FlattenedNestedTestClass.class.getCanonicalName()));
+                    }finally {
+                        ToolingProvider.clearTooling();
+                    }
+                })
+                .compilationShouldSucceed()
+                .executeTest();
+    }
+
+
 }

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

@@ -1,12 +1,14 @@
 package io.toolisticon.aptk.tools.wrapper;
 
+import io.toolisticon.aptk.common.ToolingProvider;
 import io.toolisticon.cute.CompileTestBuilder;
 import io.toolisticon.cute.PassIn;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.mockito.Mockito;
 
+import javax.lang.model.element.Element;
 import javax.lang.model.element.PackageElement;
 import javax.lang.model.element.TypeElement;
 
@@ -26,6 +28,46 @@ public void test_getQualifiedName() {
 
     }
 
+    @Test
+    public void test_getByFqn() {
+
+        CompileTestBuilder.unitTest().<Element>defineTest((processingEnvironment, element) -> {
+
+            try {
+
+                ToolingProvider.setTooling(processingEnvironment);
+
+                String fqn = PackageElementWrapperTest.class.getPackage().getName();
+                MatcherAssert.assertThat(PackageElementWrapper.getByFqn(fqn).get().getQualifiedName(), Matchers.is(fqn));
+
+            } finally {
+                ToolingProvider.clearTooling();
+            }
+
+        }).executeTest();
+
+    }
+
+    @Test
+    public void test_getByFqn_nonExistingPackage() {
+
+        CompileTestBuilder.unitTest().<Element>defineTest((processingEnvironment, element) -> {
+
+            try {
+
+                ToolingProvider.setTooling(processingEnvironment);
+
+                String fqn = "xyz.xyz.xyz";
+                MatcherAssert.assertThat("Package must not be found", !PackageElementWrapper.getByFqn(fqn).isPresent());
+
+            } finally {
+                ToolingProvider.clearTooling();
+            }
+
+        }).executeTest();
+
+    }
+
     @Test
     public void test_isUnnamed() {
         PackageElement packageElement = Mockito.mock(PackageElement.class);