Merge branch 'kotlin'

restx · Jan 9, 2020 · c21b784 · c21b784
2 parents 4bd470f + cea30ff
commit c21b784
Show file tree

Hide file tree

Showing 97 changed files with 1,407 additions and 97 deletions.
diff --git a/pom.xml b/pom.xml
@@ -108,6 +108,11 @@
                 <artifactId>restx-factory</artifactId>
                 <version>${restx.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.restx</groupId>
+                <artifactId>restx-factory-annotation-processor</artifactId>
+                <version>${restx.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.restx</groupId>
                 <artifactId>restx-core</artifactId>
@@ -477,7 +482,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.1</version>
+                    <version>3.7.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -542,6 +547,7 @@
     <modules>
         <module>restx-common</module>
         <module>restx-factory</module>
+        <module>restx-factory-annotation-processor</module>
         <module>restx-factory-testing</module>
         <module>restx-barbarywatch</module>
         <module>restx-classloader</module>
@@ -589,6 +595,8 @@
                 <module>restx-jongo-java8</module>
                 <module>restx-specs-tests-java8</module>
                 <module>restx-samplest-java8</module>
+                <module>restx-kotlin-compiler</module>
+                <module>restx-samplest-kotlin</module>
             </modules>
         </profile>
     </profiles>

diff --git a/restx-admin/md.restx.json b/restx-admin/md.restx.json
@@ -6,12 +6,17 @@
         "@files": ["../restx.build.properties.json"]
     },
 
+    "fragments": {
+        "maven": [
+            "classpath:///restx/build/fragments/maven/core-annotation-processing.xml"
+        ]
+    },
+
     "dependencies": {
         "compile": [
             "io.restx:restx-factory:${restx.version}",
             "io.restx:restx-core:${restx.version}",
             "io.restx:restx-security-basic:${restx.version}",
-            "io.restx:restx-core-annotation-processor:${restx.version}",
             "io.restx:restx-webjars:${restx.version}"
         ]
     }

diff --git a/restx-admin/module.ivy b/restx-admin/module.ivy
@@ -17,7 +17,6 @@
         <dependency org="io.restx" name="restx-factory" rev="latest.integration" conf="default" />
         <dependency org="io.restx" name="restx-core" rev="latest.integration" conf="default" />
         <dependency org="io.restx" name="restx-security-basic" rev="latest.integration" conf="default" />
-        <dependency org="io.restx" name="restx-core-annotation-processor" rev="latest.integration" conf="default" />
         <dependency org="io.restx" name="restx-webjars" rev="latest.integration" conf="default" />
     </dependencies>
 </ivy-module>
diff --git a/restx-admin/pom.xml b/restx-admin/pom.xml
@@ -24,13 +24,31 @@
             <groupId>io.restx</groupId>
             <artifactId>restx-security-basic</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.restx</groupId>
-            <artifactId>restx-core-annotation-processor</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.restx</groupId>
             <artifactId>restx-webjars</artifactId>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <annotationProcessorPath>
+                            <groupId>io.restx</groupId>
+                            <artifactId>restx-factory-annotation-processor</artifactId>
+                            <version>${project.version}</version>
+                        </annotationProcessorPath>
+                        <annotationProcessorPath>
+                            <groupId>io.restx</groupId>
+                            <artifactId>restx-core-annotation-processor</artifactId>
+                            <version>${project.version}</version>
+                        </annotationProcessorPath>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/restx-annotation-processors-package/pom.xml b/restx-annotation-processors-package/pom.xml
@@ -55,7 +55,7 @@
     <dependencies>
         <dependency>
             <groupId>io.restx</groupId>
-            <artifactId>restx-factory</artifactId>
+            <artifactId>restx-factory-annotation-processor</artifactId>
         </dependency>
         <dependency>
             <groupId>io.restx</groupId>

diff --git a/restx-apidocs/md.restx.json b/restx-apidocs/md.restx.json
@@ -6,11 +6,16 @@
         "@files": ["../restx.build.properties.json"]
     },
 
+    "fragments": {
+        "maven": [
+            "classpath:///restx/build/fragments/maven/core-annotation-processing.xml"
+        ]
+    },
+
     "dependencies": {
         "compile": [
             "io.restx:restx-factory:${restx.version}",
             "io.restx:restx-core:${restx.version}",
-            "io.restx:restx-core-annotation-processor:${restx.version}",
             "io.restx:restx-admin:${restx.version}",
             "com.fasterxml.jackson.module:jackson-module-jsonSchema:${jackson.version}",
             "io.restx:restx-webjars:${restx.version}"

diff --git a/restx-apidocs/module.ivy b/restx-apidocs/module.ivy
@@ -16,7 +16,6 @@
     <dependencies>
         <dependency org="io.restx" name="restx-factory" rev="latest.integration" conf="default" />
         <dependency org="io.restx" name="restx-core" rev="latest.integration" conf="default" />
-        <dependency org="io.restx" name="restx-core-annotation-processor" rev="latest.integration" conf="default" />
         <dependency org="io.restx" name="restx-admin" rev="latest.integration" conf="default" />
         <dependency org="com.fasterxml.jackson.module" name="jackson-module-jsonSchema" rev="2.8.10" conf="default" />
         <dependency org="io.restx" name="restx-webjars" rev="latest.integration" conf="default" />

diff --git a/restx-apidocs/pom.xml b/restx-apidocs/pom.xml
@@ -20,10 +20,6 @@
             <groupId>io.restx</groupId>
             <artifactId>restx-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.restx</groupId>
-            <artifactId>restx-core-annotation-processor</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.restx</groupId>
             <artifactId>restx-admin</artifactId>
@@ -37,4 +33,26 @@
             <artifactId>restx-webjars</artifactId>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <annotationProcessorPath>
+                            <groupId>io.restx</groupId>
+                            <artifactId>restx-factory-annotation-processor</artifactId>
+                            <version>${project.version}</version>
+                        </annotationProcessorPath>
+                        <annotationProcessorPath>
+                            <groupId>io.restx</groupId>
+                            <artifactId>restx-core-annotation-processor</artifactId>
+                            <version>${project.version}</version>
+                        </annotationProcessorPath>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/...otation-processor/src/main/java/restx/annotations/processor/RestxAnnotationProcessor.java b/...otation-processor/src/main/java/restx/annotations/processor/RestxAnnotationProcessor.java
@@ -94,6 +94,9 @@ protected boolean processImpl(Set<? extends TypeElement> annotations, RoundEnvir
 
                 ImmutableList.Builder<AnnotationDescription> annotationDescriptionsBuilder = ImmutableList.builder();
                 for(AnnotationMirror methodAnnotation: annotation.methodElem.getAnnotationMirrors()) {
+                    if ("org.jetbrains.annotations.NotNull".equals(methodAnnotation.getAnnotationType().toString())) {
+                        continue;
+                    }
                     AnnotationDescription annotationDescription = createAnnotationDescriptionFrom(methodAnnotation, annotation.methodElem);
                     annotationDescriptionsBuilder.add(annotationDescription);
                 }

diff --git a/restx-core-java8/md.restx.json b/restx-core-java8/md.restx.json
@@ -7,6 +7,12 @@
         "java.version": "1.8"
     },
 
+    "fragments": {
+        "maven": [
+            "classpath:///restx/build/fragments/maven/factory-annotation-processing.xml"
+        ]
+    },
+
     "dependencies": {
         "compile": [
             "io.restx:restx-factory:${restx.version}",

diff --git a/restx-core-java8/pom.xml b/restx-core-java8/pom.xml
@@ -26,4 +26,21 @@
             <artifactId>jackson-datatype-jsr310</artifactId>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <annotationProcessorPath>
+                            <groupId>io.restx</groupId>
+                            <artifactId>restx-factory-annotation-processor</artifactId>
+                            <version>${project.version}</version>
+                        </annotationProcessorPath>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/restx-core/md.restx.json b/restx-core/md.restx.json
@@ -6,6 +6,12 @@
         "@files": ["../restx.build.properties.json"]
     },
 
+    "fragments": {
+        "maven": [
+            "classpath:///restx/build/fragments/maven/factory-annotation-processing.xml"
+        ]
+    },
+
     "dependencies": {
         "compile": [
             "com.fasterxml.jackson.core:jackson-core:${jackson.version}",

diff --git a/restx-core/pom.xml b/restx-core/pom.xml
@@ -86,4 +86,21 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <annotationProcessorPath>
+                            <groupId>io.restx</groupId>
+                            <artifactId>restx-factory-annotation-processor</artifactId>
+                            <version>${project.version}</version>
+                        </annotationProcessorPath>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/restx-factory-admin/md.restx.json b/restx-factory-admin/md.restx.json
@@ -6,6 +6,12 @@
         "@files": ["../restx.build.properties.json"]
     },
 
+    "fragments": {
+        "maven": [
+            "classpath:///restx/build/fragments/maven/core-annotation-processing.xml"
+        ]
+    },
+
     "dependencies": {
         "compile": [
             "io.restx:restx-factory:${restx.version}",

diff --git a/restx-factory-admin/pom.xml b/restx-factory-admin/pom.xml
@@ -29,4 +29,26 @@
             <artifactId>restx-webjars</artifactId>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <annotationProcessorPath>
+                            <groupId>io.restx</groupId>
+                            <artifactId>restx-factory-annotation-processor</artifactId>
+                            <version>${project.version}</version>
+                        </annotationProcessorPath>
+                        <annotationProcessorPath>
+                            <groupId>io.restx</groupId>
+                            <artifactId>restx-core-annotation-processor</artifactId>
+                            <version>${project.version}</version>
+                        </annotationProcessorPath>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/restx-factory-annotation-processor/pom.xml b/restx-factory-annotation-processor/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.restx</groupId>
+        <artifactId>restx-parent</artifactId>
+        <version>0.36-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>restx-factory-annotation-processor</artifactId>
+    <name>restx-factory-annotation-processor</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.restx</groupId>
+            <artifactId>restx-factory</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <compilerArgument>-proc:none</compilerArgument>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/...rocessor/SettingsAnnotationProcessor.java → ...rocessor/SettingsAnnotationProcessor.java b/...rocessor/SettingsAnnotationProcessor.java → ...rocessor/SettingsAnnotationProcessor.java
diff --git a/...processor/FactoryAnnotationProcessor.java → ...processor/FactoryAnnotationProcessor.java b/...processor/FactoryAnnotationProcessor.java → ...processor/FactoryAnnotationProcessor.java
diff --git a/...ces/javax.annotation.processing.Processor → ...ces/javax.annotation.processing.Processor b/...ces/javax.annotation.processing.Processor → ...ces/javax.annotation.processing.Processor
diff --git a/.../config/processor/SettingsConfig.mustache → .../config/processor/SettingsConfig.mustache b/.../config/processor/SettingsConfig.mustache → .../config/processor/SettingsConfig.mustache
diff --git a/...onfig/processor/SettingsProvider.mustache → ...onfig/processor/SettingsProvider.mustache b/...onfig/processor/SettingsProvider.mustache → ...onfig/processor/SettingsProvider.mustache
diff --git a/...ctory/processor/ComponentMachine.mustache → ...ctory/processor/ComponentMachine.mustache b/...ctory/processor/ComponentMachine.mustache → ...ctory/processor/ComponentMachine.mustache
diff --git a/...ory/processor/ConditionalMachine.mustache → ...ory/processor/ConditionalMachine.mustache b/...ory/processor/ConditionalMachine.mustache → ...ory/processor/ConditionalMachine.mustache
diff --git a/.../factory/processor/ModuleMachine.mustache → .../factory/processor/ModuleMachine.mustache b/.../factory/processor/ModuleMachine.mustache → .../factory/processor/ModuleMachine.mustache
diff --git a/restx-factory-testing/md.restx.json b/restx-factory-testing/md.restx.json
@@ -6,6 +6,12 @@
         "@files": ["../restx.build.properties.json"]
     },
 
+    "fragments": {
+        "maven": [
+            "classpath:///restx/build/fragments/maven/factory-annotation-processing.xml"
+        ]
+    },
+
     "dependencies": {
         "test": [
             "io.restx:restx-factory:${restx.version}",

diff --git a/restx-factory-testing/pom.xml b/restx-factory-testing/pom.xml
@@ -28,4 +28,22 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <annotationProcessorPath>
+                            <groupId>io.restx</groupId>
+                            <artifactId>restx-factory-annotation-processor</artifactId>
+                            <version>${project.version}</version>
+                        </annotationProcessorPath>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/restx-factory/md.restx.json b/restx-factory/md.restx.json
@@ -6,12 +6,6 @@
         "@files": ["../restx.build.properties.json"]
     },
 
-    "fragments": {
-        "maven": [
-            "classpath:///restx/build/fragments/maven/annotation-processing-disable.xml"
-        ]
-    },
-
     "dependencies": {
         "compile": [
             "io.restx:restx-common:${restx.version}",