Infinispan Client: add runtime SPI and deployment SPI modules

Some constants from the Infinispan Client runtime module are moved to the runtime SPI module, so that they can be used from other modules that cannot directly depend on the Infinispan Client extension. Two build items, `InfinispanClientBuildItem` and `InfinispanClientNameBuildItem`, are moved from the Infinispan Client deployment module to the deployment SPI module. This is technically a breaking change, because they are also moved to a different package, but these build items don't seem to be used anywhere outside of Quarkus, so it should be safe.
Ladicek · Oct 17, 2023 · 6b09b2b · 6b09b2b
1 parent b2f007e
commit 6b09b2b
Show file tree

Hide file tree

Showing 12 changed files with 99 additions and 12 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -1223,6 +1223,16 @@
                 <artifactId>quarkus-infinispan-client</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-infinispan-client-runtime-spi</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-infinispan-client-deployment-spi</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-infinispan-client-deployment</artifactId>

diff --git a/extensions/infinispan-client/deployment-spi/pom.xml b/extensions/infinispan-client/deployment-spi/pom.xml
@@ -0,0 +1,44 @@
+<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-infinispan-client-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-infinispan-client-deployment-spi</artifactId>
+    <name>Quarkus - Infinispan - Client - Deployment SPI</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-infinispan-client-runtime-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.infinispan</groupId>
+            <artifactId>infinispan-client-hotrod-jakarta</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.infinispan</groupId>
+                    <artifactId>infinispan-jboss-marshalling</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jboss.spec.javax.transaction</groupId>
+                    <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-transport-native-epoll</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/...deployment/InfinispanClientBuildItem.java → ...oyment/spi/InfinispanClientBuildItem.java b/...deployment/InfinispanClientBuildItem.java → ...oyment/spi/InfinispanClientBuildItem.java
@@ -1,4 +1,4 @@
-package io.quarkus.infinispan.client.deployment;
+package io.quarkus.infinispan.client.deployment.spi;
 
 import org.infinispan.client.hotrod.RemoteCacheManager;
 
@@ -12,8 +12,7 @@ public final class InfinispanClientBuildItem extends MultiBuildItem {
     private final RuntimeValue<RemoteCacheManager> client;
     private final String name;
 
-    public InfinispanClientBuildItem(RuntimeValue<RemoteCacheManager> client,
-            String name) {
+    public InfinispanClientBuildItem(RuntimeValue<RemoteCacheManager> client, String name) {
         this.client = client;
         this.name = name;
     }

diff --git a/...oyment/InfinispanClientNameBuildItem.java → ...nt/spi/InfinispanClientNameBuildItem.java b/...oyment/InfinispanClientNameBuildItem.java → ...nt/spi/InfinispanClientNameBuildItem.java
@@ -1,4 +1,4 @@
-package io.quarkus.infinispan.client.deployment;
+package io.quarkus.infinispan.client.deployment.spi;
 
 import io.quarkus.builder.item.MultiBuildItem;
 

diff --git a/extensions/infinispan-client/deployment/pom.xml b/extensions/infinispan-client/deployment/pom.xml
@@ -29,6 +29,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-infinispan-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-infinispan-client-deployment-spi</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-caffeine-deployment</artifactId>

diff --git a/...ent/src/main/java/io/quarkus/infinispan/client/deployment/InfinispanBindingProcessor.java b/...ent/src/main/java/io/quarkus/infinispan/client/deployment/InfinispanBindingProcessor.java
@@ -7,6 +7,7 @@
 
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.infinispan.client.deployment.spi.InfinispanClientBuildItem;
 import io.quarkus.infinispan.client.runtime.InfinispanClientUtil;
 import io.quarkus.kubernetes.service.binding.spi.ServiceBindingQualifierBuildItem;
 

diff --git a/...ment/src/main/java/io/quarkus/infinispan/client/deployment/InfinispanClientProcessor.java b/...ment/src/main/java/io/quarkus/infinispan/client/deployment/InfinispanClientProcessor.java
@@ -92,6 +92,8 @@
 import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild;
 import io.quarkus.infinispan.client.InfinispanClientName;
 import io.quarkus.infinispan.client.Remote;
+import io.quarkus.infinispan.client.deployment.spi.InfinispanClientBuildItem;
+import io.quarkus.infinispan.client.deployment.spi.InfinispanClientNameBuildItem;
 import io.quarkus.infinispan.client.runtime.InfinispanClientBuildTimeConfig;
 import io.quarkus.infinispan.client.runtime.InfinispanClientProducer;
 import io.quarkus.infinispan.client.runtime.InfinispanClientUtil;
@@ -623,9 +625,9 @@ List<InfinispanClientBuildItem> infinispanClients(InfinispanRecorder recorder,
             List<InfinispanClientNameBuildItem> infinispanClientNames,
             // make sure all beans have been initialized
             @SuppressWarnings("unused") BeanContainerBuildItem beanContainer) {
-        List<InfinispanClientBuildItem> result = new ArrayList<>(infinispanClientNames.size());
-        for (InfinispanClientNameBuildItem ic : infinispanClientNames) {
-            String name = ic.getName();
+        Set<String> names = infinispanClientNames.stream().map(icn -> icn.getName()).collect(Collectors.toSet());
+        List<InfinispanClientBuildItem> result = new ArrayList<>(names.size());
+        for (String name : names) {
             result.add(new InfinispanClientBuildItem(recorder.getClient(name), name));
         }
         return result;

diff --git a/extensions/infinispan-client/pom.xml b/extensions/infinispan-client/pom.xml
@@ -15,6 +15,8 @@
     <packaging>pom</packaging>
     <modules>
         <module>deployment</module>
+        <module>deployment-spi</module>
         <module>runtime</module>
+        <module>runtime-spi</module>
     </modules>
 </project>
diff --git a/extensions/infinispan-client/runtime-spi/pom.xml b/extensions/infinispan-client/runtime-spi/pom.xml
@@ -0,0 +1,15 @@
+<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-infinispan-client-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-infinispan-client-runtime-spi</artifactId>
+    <name>Quarkus - Infinispan - Client - Runtime SPI</name>
+
+</project>
diff --git a/...ntime-spi/src/main/java/io/quarkus/infinispan/client/runtime/spi/InfinispanConstants.java b/...ntime-spi/src/main/java/io/quarkus/infinispan/client/runtime/spi/InfinispanConstants.java
@@ -0,0 +1,6 @@
+package io.quarkus.infinispan.client.runtime.spi;
+
+public class InfinispanConstants {
+    public static final String DEFAULT_INFINISPAN_CLIENT_NAME = "<default>";
+    public static final String INFINISPAN_CLIENT_CONFIG_ROOT_NAME = "infinispan-client";
+}
diff --git a/extensions/infinispan-client/runtime/pom.xml b/extensions/infinispan-client/runtime/pom.xml
@@ -41,6 +41,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-elytron-security-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-infinispan-client-runtime-spi</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron-sasl-plain</artifactId>
@@ -75,9 +79,7 @@
                 </exclusion>
                 <exclusion>
                     <groupId>org.jboss.spec.javax.transaction</groupId>
-                    <artifactId>
-                        jboss-transaction-api_1.2_spec
-                    </artifactId>
+                    <artifactId>jboss-transaction-api_1.2_spec</artifactId>
                 </exclusion>
                 <exclusion>
                     <groupId>io.netty</groupId>

diff --git a/...ient/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientUtil.java b/...ient/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientUtil.java
@@ -3,11 +3,13 @@
 import java.util.Collection;
 import java.util.List;
 
+import io.quarkus.infinispan.client.runtime.spi.InfinispanConstants;
+
 public final class InfinispanClientUtil {
 
     public static final String DEFAULT_INFINISPAN_DEV_SERVICE_NAME = "infinispan";
-    public static final String DEFAULT_INFINISPAN_CLIENT_NAME = "<default>";
-    public static final String INFINISPAN_CLIENT_CONFIG_ROOT_NAME = "infinispan-client";
+    public static final String DEFAULT_INFINISPAN_CLIENT_NAME = InfinispanConstants.DEFAULT_INFINISPAN_CLIENT_NAME;
+    public static final String INFINISPAN_CLIENT_CONFIG_ROOT_NAME = InfinispanConstants.INFINISPAN_CLIENT_CONFIG_ROOT_NAME;
 
     public static boolean isDefault(String infinispanClientName) {
         return DEFAULT_INFINISPAN_CLIENT_NAME.equals(infinispanClientName);