Working towards Quarkus

EnMasseProject · Jul 1, 2020 · 1a7abab · 1a7abab
1 parent dd5e515
commit 1a7abab
Show file tree

Hide file tree

Showing 135 changed files with 1,356 additions and 505 deletions.
diff --git a/Makefile.common b/Makefile.common
@@ -17,6 +17,14 @@ ifeq ($(MAVEN_BATCH),true)
 	MAVEN_ARGS+=-B
 endif
 
+ifneq (, $(shell which podman))
+QUARKUS_CONTAINER_RUNTIME=podman
+else ifneq  (, $(shell which docker))
+QUARKUS_CONTAINER_RUNTIME=docker
+else
+$(error "No container runtime found for native Quarkus build. You need either 'podman' or 'docker')
+endif
+
 all: init build test package
 
 init:

diff --git a/Makefile.java.mk b/Makefile.java.mk
@@ -21,7 +21,7 @@ else
 endif
 
 package_java:
-	$(IMAGE_ENV) IMAGE_ENV="$(IMAGE_ENV)" mvn package -DskipTests $(MAVEN_ARGS)
+	$(IMAGE_ENV) IMAGE_ENV="$(IMAGE_ENV)" mvn package -DskipTests $(MAVEN_ARGS) $(MAVEN_PACKAGE_ARGS)
 
 package: package_java
 endif

diff --git a/api-model/pom.xml b/api-model/pom.xml
@@ -50,6 +50,10 @@
       <groupId>org.glassfish</groupId>
       <artifactId>javax.el</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -166,6 +170,19 @@
           </dependency>
         </dependencies>
       </plugin>
+      <plugin>
+        <!-- we need the jandex index for quarkus to process our CRDs -->
+        <groupId>org.jboss.jandex</groupId>
+        <artifactId>jandex-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>make-index</id>
+            <goals>
+              <goal>jandex</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/api-model/src/main/java/io/enmasse/common/model/AbstractHasMetadata.java b/api-model/src/main/java/io/enmasse/common/model/AbstractHasMetadata.java
@@ -16,6 +16,7 @@
 import io.fabric8.kubernetes.api.model.Doneable;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.Inline;
 
@@ -28,6 +29,7 @@
                 prefix = "Doneable",
                 value = "done"))
 @SuppressWarnings("serial")
+@RegisterForReflection
 public abstract class AbstractHasMetadata<T> extends AbstractResource<T> implements HasMetadata {
 
     @FunctionalInterface

diff --git a/api-model/src/main/java/io/enmasse/common/model/AbstractList.java b/api-model/src/main/java/io/enmasse/common/model/AbstractList.java
@@ -15,8 +15,10 @@
 import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
 import io.fabric8.kubernetes.api.model.ListMeta;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 
 @SuppressWarnings("serial")
+@RegisterForReflection
 public abstract class AbstractList<T extends HasMetadata> extends AbstractResource<T>
                 implements KubernetesResource, KubernetesResourceList<T> {
 

diff --git a/api-model/src/main/java/io/enmasse/common/model/AbstractResource.java b/api-model/src/main/java/io/enmasse/common/model/AbstractResource.java
@@ -6,6 +6,7 @@
 package io.enmasse.common.model;
 
 import io.fabric8.kubernetes.api.model.Doneable;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.Inline;
 
@@ -17,6 +18,7 @@
                                 type = Doneable.class,
                                 prefix = "Doneable",
                                 value = "done"))
+@RegisterForReflection
 public abstract class AbstractResource<T> {
 
     private String kind;

diff --git a/api-model/src/main/java/io/enmasse/common/model/DefaultCustomResource.java b/api-model/src/main/java/io/enmasse/common/model/DefaultCustomResource.java
@@ -15,6 +15,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 
 /**
  * A default set of Jackson annotations for custom resources.
@@ -25,6 +26,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @Retention(RUNTIME)
 @Target(TYPE)
+@RegisterForReflection
 public @interface DefaultCustomResource {
 
 }
diff --git a/api-model/src/main/java/io/enmasse/iot/model/v1/AcceptedStatus.java b/api-model/src/main/java/io/enmasse/iot/model/v1/AcceptedStatus.java
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.fabric8.kubernetes.api.model.Doneable;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.Inline;
 
@@ -22,6 +23,7 @@
                 )
         )
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@RegisterForReflection
 public class AcceptedStatus {
 
     /*

diff --git a/api-model/src/main/java/io/enmasse/iot/model/v1/AdapterConfig.java b/api-model/src/main/java/io/enmasse/iot/model/v1/AdapterConfig.java
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.fabric8.kubernetes.api.model.Doneable;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.Inline;
 
@@ -22,6 +23,7 @@
                 )
         )
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@RegisterForReflection
 public class AdapterConfig extends ServiceConfig {
 
     private Boolean enabled;

diff --git a/api-model/src/main/java/io/enmasse/iot/model/v1/AdapterConfiguration.java b/api-model/src/main/java/io/enmasse/iot/model/v1/AdapterConfiguration.java
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import io.fabric8.kubernetes.api.model.Doneable;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.Inline;
 
@@ -20,6 +21,7 @@
                 prefix = "Doneable",
                 value = "done"))
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@RegisterForReflection
 public class AdapterConfiguration {
 
     private Boolean enabled;

diff --git a/api-model/src/main/java/io/enmasse/iot/model/v1/AdapterOptions.java b/api-model/src/main/java/io/enmasse/iot/model/v1/AdapterOptions.java
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.fabric8.kubernetes.api.model.Doneable;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.Inline;
 
@@ -20,6 +21,7 @@
                 prefix = "Doneable",
                 value = "done"))
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@RegisterForReflection
 public class AdapterOptions {
 
     private long maxPayloadSize;

diff --git a/api-model/src/main/java/io/enmasse/iot/model/v1/AdapterStatus.java b/api-model/src/main/java/io/enmasse/iot/model/v1/AdapterStatus.java
@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.fabric8.kubernetes.api.model.Doneable;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.Inline;
 
@@ -21,6 +22,7 @@
                 )
         )
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@RegisterForReflection
 public class AdapterStatus extends CommonStatus {
 
     private boolean enabled;

diff --git a/api-model/src/main/java/io/enmasse/iot/model/v1/AdaptersConfig.java b/api-model/src/main/java/io/enmasse/iot/model/v1/AdaptersConfig.java
@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import io.fabric8.kubernetes.api.model.Doneable;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.Inline;
 
@@ -23,6 +24,7 @@
                 )
         )
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@RegisterForReflection
 public class AdaptersConfig {
     private AdapterOptions defaults;
     private AdapterConfig http;

diff --git a/api-model/src/main/java/io/enmasse/iot/model/v1/AddressConfig.java b/api-model/src/main/java/io/enmasse/iot/model/v1/AddressConfig.java
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.fabric8.kubernetes.api.model.Doneable;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.Inline;
 
@@ -20,6 +21,7 @@
                 prefix = "Doneable",
                 value = "done"))
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@RegisterForReflection
 public class AddressConfig {
 
     private String plan;

diff --git a/api-model/src/main/java/io/enmasse/iot/model/v1/AddressSpaceConfig.java b/api-model/src/main/java/io/enmasse/iot/model/v1/AddressSpaceConfig.java
@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.fabric8.kubernetes.api.model.Doneable;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.Inline;
 
@@ -19,6 +20,7 @@
                 prefix = "Doneable",
                 value = "done"))
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@RegisterForReflection
 public class AddressSpaceConfig {
     private String name;
     private String plan;

diff --git a/api-model/src/main/java/io/enmasse/iot/model/v1/AddressesConfig.java b/api-model/src/main/java/io/enmasse/iot/model/v1/AddressesConfig.java
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.fabric8.kubernetes.api.model.Doneable;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.Inline;
 
@@ -20,6 +21,7 @@
                 prefix = "Doneable",
                 value = "done"))
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@RegisterForReflection
 public class AddressesConfig {
 
     private AddressConfig command;

diff --git a/api-model/src/main/java/io/enmasse/iot/model/v1/AuthenticationServiceConfig.java b/api-model/src/main/java/io/enmasse/iot/model/v1/AuthenticationServiceConfig.java
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.fabric8.kubernetes.api.model.Doneable;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.Inline;
 
@@ -20,5 +21,6 @@
                 prefix = "Doneable",
                 value = "done"))
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@RegisterForReflection
 public class AuthenticationServiceConfig extends CommonServiceConfig {
 }
diff --git a/api-model/src/main/java/io/enmasse/iot/model/v1/CollectorConfig.java b/api-model/src/main/java/io/enmasse/iot/model/v1/CollectorConfig.java
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.fabric8.kubernetes.api.model.Doneable;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.Inline;
 
@@ -20,6 +21,7 @@
                 prefix = "Doneable",
                 value = "done"))
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@RegisterForReflection
 public class CollectorConfig {
     private ContainerConfig container;
 

diff --git a/api-model/src/main/java/io/enmasse/iot/model/v1/CommonAdapterContainers.java b/api-model/src/main/java/io/enmasse/iot/model/v1/CommonAdapterContainers.java
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.fabric8.kubernetes.api.model.Doneable;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.Inline;
 
@@ -22,6 +23,7 @@
                 )
         )
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@RegisterForReflection
 public class CommonAdapterContainers {
 
     private JavaContainerConfig adapter;

diff --git a/api-model/src/main/java/io/enmasse/iot/model/v1/CommonCondition.java b/api-model/src/main/java/io/enmasse/iot/model/v1/CommonCondition.java
@@ -10,6 +10,7 @@
 import com.google.common.base.MoreObjects.ToStringHelper;
 
 import io.fabric8.kubernetes.api.model.Doneable;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.Inline;
 
@@ -22,6 +23,7 @@
                 prefix = "Doneable",
                 value = "done"))
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@RegisterForReflection
 public class CommonCondition<T extends Enum<T>> {
 
     private T type;

diff --git a/api-model/src/main/java/io/enmasse/iot/model/v1/CommonDeviceRegistry.java b/api-model/src/main/java/io/enmasse/iot/model/v1/CommonDeviceRegistry.java
@@ -10,6 +10,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.fabric8.kubernetes.api.model.Doneable;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.Inline;
 
@@ -22,6 +23,7 @@
                 prefix = "Doneable",
                 value = "done"))
 @JsonInclude(NON_DEFAULT)
+@RegisterForReflection
 public class CommonDeviceRegistry {
     private boolean disabled;
 

diff --git a/api-model/src/main/java/io/enmasse/iot/model/v1/CommonLoggingConfig.java b/api-model/src/main/java/io/enmasse/iot/model/v1/CommonLoggingConfig.java
@@ -13,6 +13,7 @@
 
 import io.fabric8.kubernetes.api.model.Doneable;
 import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.BuildableReference;
 import io.sundr.builder.annotations.Inline;
@@ -27,6 +28,7 @@
                 prefix = "Doneable",
                 value = "done"))
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
+@RegisterForReflection
 public class CommonLoggingConfig {
 
     private String level;

diff --git a/api-model/src/main/java/io/enmasse/iot/model/v1/CommonServiceConfig.java b/api-model/src/main/java/io/enmasse/iot/model/v1/CommonServiceConfig.java
@@ -10,6 +10,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.fabric8.kubernetes.api.model.Doneable;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.Inline;
 
@@ -22,6 +23,7 @@
                 prefix = "Doneable",
                 value = "done"))
 @JsonInclude(NON_NULL)
+@RegisterForReflection
 public class CommonServiceConfig extends ServiceConfig {
 
     private JavaContainerConfig container;

diff --git a/api-model/src/main/java/io/enmasse/iot/model/v1/CommonStatus.java b/api-model/src/main/java/io/enmasse/iot/model/v1/CommonStatus.java
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.fabric8.kubernetes.api.model.Doneable;
+import io.quarkus.runtime.annotations.RegisterForReflection;
 import io.sundr.builder.annotations.Buildable;
 import io.sundr.builder.annotations.Inline;
 
@@ -20,6 +21,7 @@
                 prefix = "Doneable",
                 value = "done"))
 @JsonInclude(JsonInclude.Include.NON_NULL)
+@RegisterForReflection
 public class CommonStatus {
 
     private EndpointStatus endpoint;