Update Quarkus version #336

enonic · Feb 21, 2023 · fdbae79 · fdbae79
1 parent 1d64892
commit fdbae79
Show file tree

Hide file tree

Showing 10 changed files with 228 additions and 232 deletions.
diff --git a/java-client/pom.xml b/java-client/pom.xml
@@ -32,7 +32,7 @@
 
         <jsonschema2pojo.version>1.1.2</jsonschema2pojo.version>
 
-        <fabric8-kubernetes-client.version>6.2.0</fabric8-kubernetes-client.version>
+        <fabric8-kubernetes-client.version>6.4.1</fabric8-kubernetes-client.version>
         <junit.version>5.9.1</junit.version>
         <slf4j-simple.version>1.7.36</slf4j-simple.version>
         <okhttp.version>3.12.12</okhttp.version>
@@ -81,6 +81,13 @@
             </exclusions>
         </dependency>
 
+      <dependency>
+        <groupId>io.fabric8</groupId>
+        <artifactId>crd-generator-apt</artifactId>
+        <version>${fabric8-kubernetes-client.version}</version>
+        <scope>provided</scope>
+      </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>

diff --git a/java-client/src/main/java/com/enonic/kubernetes/client/CrdMappingProvider.java b/java-client/src/main/java/com/enonic/kubernetes/client/CrdMappingProvider.java
@@ -4,59 +4,61 @@
 import com.enonic.kubernetes.client.v1.xp7app.Xp7App;
 import com.enonic.kubernetes.client.v1.xp7config.Xp7Config;
 import com.enonic.kubernetes.client.v1.xp7deployment.Xp7Deployment;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
-import io.fabric8.kubernetes.api.KubernetesResourceMappingProvider;
+
 import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.fabric8.kubernetes.internal.KubernetesDeserializer;
 
 import java.util.HashMap;
 import java.util.Map;
 
 public class CrdMappingProvider
-        implements KubernetesResourceMappingProvider {
+{
     private static final String group = "enonic.cloud";
 
     private final Map<String, Class<? extends KubernetesResource>> mappings;
 
     @SuppressWarnings("WeakerAccess")
-    public CrdMappingProvider() {
+    public CrdMappingProvider()
+    {
         mappings = createMappings();
     }
 
     @SuppressWarnings("unused")
-    public static void register() {
+    public static void register()
+    {
         CrdMappingProvider m = new CrdMappingProvider();
-        for (Map.Entry<String, Class<? extends KubernetesResource>> s : m.getMappings().entrySet()) {
-            KubernetesDeserializer.registerCustomKind(s.getKey(), s.getValue());
+        for ( Map.Entry<String, Class<? extends KubernetesResource>> s : m.mappings.entrySet() )
+        {
+            KubernetesDeserializer.registerCustomKind( s.getKey(), s.getValue() );
         }
     }
 
     @SuppressWarnings("unused")
-    public static void registerDeserializer(ObjectMapper objectMapper) {
+    public static void registerDeserializer( ObjectMapper objectMapper )
+    {
         SimpleModule module = new SimpleModule();
-        module.addDeserializer(KubernetesResource.class, new KubernetesDeserializer());
-        objectMapper.registerModule(module);
+        module.addDeserializer( KubernetesResource.class, new KubernetesDeserializer() );
+        objectMapper.registerModule( module );
     }
 
-    private Map<String, Class<? extends KubernetesResource>> createMappings() {
+    private Map<String, Class<? extends KubernetesResource>> createMappings()
+    {
         Map<String, Class<? extends KubernetesResource>> map = new HashMap<>();
 
-        put(map, "v1", "Xp7App", Xp7App.class);
-        put(map, "v1", "Xp7Config", Xp7Config.class);
-        put(map, "v1", "Xp7Deployment", Xp7Deployment.class);
-        put(map, "v1", "Domain", Domain.class);
+        put( map, "v1", "Xp7App", Xp7App.class );
+        put( map, "v1", "Xp7Config", Xp7Config.class );
+        put( map, "v1", "Xp7Deployment", Xp7Deployment.class );
+        put( map, "v1", "Domain", Domain.class );
 
         return map;
     }
 
-    private void put(Map<String, Class<? extends KubernetesResource>> map, String apiVersion, String kind,
-                     Class<? extends KubernetesResource> klass) {
-        map.put(String.format("%s/%s#%s", group, apiVersion, kind), klass);
-    }
-
-    @Override
-    public Map<String, Class<? extends KubernetesResource>> getMappings() {
-        return mappings;
+    private void put( Map<String, Class<? extends KubernetesResource>> map, String apiVersion, String kind,
+                      Class<? extends KubernetesResource> klass )
+    {
+        map.put( String.format( "%s/%s#%s", group, apiVersion, kind ), klass );
     }
 }
diff --git a/java-client/src/main/java/com/enonic/kubernetes/client/v1/xp7config/Xp7Config.java b/java-client/src/main/java/com/enonic/kubernetes/client/v1/xp7config/Xp7Config.java
@@ -4,30 +4,33 @@
 
 import io.fabric8.kubernetes.api.model.DefaultKubernetesResourceList;
 import io.fabric8.kubernetes.api.model.Namespaced;
-import io.fabric8.kubernetes.client.CustomResourceList;
 import io.fabric8.kubernetes.model.annotation.Group;
 import io.fabric8.kubernetes.model.annotation.Kind;
+import io.fabric8.kubernetes.model.annotation.ShortNames;
 import io.fabric8.kubernetes.model.annotation.Version;
 
 @Group("enonic.cloud")
 @Version("v1")
 @Kind("Xp7Config")
 public class Xp7Config
-        extends Crd<Xp7ConfigSpec, Xp7ConfigStatus>
-        implements Namespaced {
+    extends Crd<Xp7ConfigSpec, Xp7ConfigStatus>
+    implements Namespaced
+{
 
-    public Xp7Config withSpec(final Xp7ConfigSpec spec) {
-        this.setSpec(spec);
+    public Xp7Config withSpec( final Xp7ConfigSpec spec )
+    {
+        this.setSpec( spec );
         return this;
     }
 
-    public Xp7Config withStatus(final Xp7ConfigStatus status) {
-        this.setStatus(status);
+    public Xp7Config withStatus( final Xp7ConfigStatus status )
+    {
+        this.setStatus( status );
         return this;
     }
 
     public static class Xp7ConfigList
-            extends DefaultKubernetesResourceList<Xp7Config>
+        extends DefaultKubernetesResourceList<Xp7Config>
     {
     }
 }
diff --git a/java-client/src/main/java/com/enonic/kubernetes/client/v1/xp7deployment/Xp7Deployment.java b/java-client/src/main/java/com/enonic/kubernetes/client/v1/xp7deployment/Xp7Deployment.java
@@ -13,21 +13,24 @@
 @Version("v1")
 @Kind("Xp7Deployment")
 public class Xp7Deployment
-        extends Crd<Xp7DeploymentSpec, Xp7DeploymentStatus>
-        implements Namespaced {
+    extends Crd<Xp7DeploymentSpec, Xp7DeploymentStatus>
+    implements Namespaced
+{
 
-    public Xp7Deployment withSpec(final Xp7DeploymentSpec spec) {
-        this.setSpec(spec);
+    public Xp7Deployment withSpec( final Xp7DeploymentSpec spec )
+    {
+        this.setSpec( spec );
         return this;
     }
 
-    public Xp7Deployment withStatus(final Xp7DeploymentStatus status) {
-        this.setStatus(status);
+    public Xp7Deployment withStatus( final Xp7DeploymentStatus status )
+    {
+        this.setStatus( status );
         return this;
     }
 
     public static class Xp7DeploymentList
-            extends DefaultKubernetesResourceList<Xp7Deployment>
+        extends DefaultKubernetesResourceList<Xp7Deployment>
     {
     }
 }
diff --git a/...n/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider b/...n/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider
diff --git a/...t/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource b/...t/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.model.KubernetesResource
@@ -0,0 +1,4 @@
+com.enonic.kubernetes.client.v1.xp7deployment.Xp7Deployment
+com.enonic.kubernetes.client.v1.xp7app.Xp7App
+com.enonic.kubernetes.client.v1.xp7config.Xp7Config
+com.enonic.kubernetes.client.v1.domain.Domain