Updates to Infinispan 16.0

karesti · karesti · commit bab0bf152eab · 2025-11-12T15:32:17.000+01:00
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -130,8 +130,8 @@
         <shrinkwrap.version>1.2.6</shrinkwrap.version>
         <hamcrest.version>2.2</hamcrest.version><!-- The version needs to be compatible with both REST Assured and Awaitility -->
         <junit.jupiter.version>5.13.4</junit.jupiter.version>
-        <infinispan.version>15.0.19.Final</infinispan.version>
-        <infinispan.protostream.version>5.0.13.Final</infinispan.protostream.version>
+        <infinispan.version>16.0.1</infinispan.version>
+        <infinispan.protostream.version>6.0.1</infinispan.protostream.version>
         <caffeine.version>3.2.3</caffeine.version>
         <netty.version>4.1.128.Final</netty.version>
         <brotli4j.version>1.16.0</brotli4j.version>
@@ -5842,16 +5842,6 @@
                 <artifactId>infinispan-client-hotrod</artifactId>
                 <version>${infinispan.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.infinispan</groupId>
-                <artifactId>infinispan-remote-query-client</artifactId>
-                <version>${infinispan.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.infinispan</groupId>
-                <artifactId>infinispan-query-dsl</artifactId>
-                <version>${infinispan.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.infinispan</groupId>
                 <artifactId>infinispan-server-hotrod</artifactId>
diff --git a/extensions/infinispan-cache/runtime/src/main/java/io/quarkus/cache/infinispan/runtime/InfinispanCacheImpl.java b/extensions/infinispan-cache/runtime/src/main/java/io/quarkus/cache/infinispan/runtime/InfinispanCacheImpl.java
@@ -16,7 +16,7 @@
 import java.util.function.Supplier;
 
 import org.infinispan.client.hotrod.RemoteCache;
-import org.infinispan.client.hotrod.impl.protocol.Codec27;
+import org.infinispan.client.hotrod.impl.protocol.Codec41;
 import org.infinispan.commons.util.NullValue;
 import org.reactivestreams.FlowAdapters;
 
@@ -288,7 +288,7 @@ public CompletionStage<Void> get() {
     @Override
     public Uni<Void> invalidateIf(Predicate<Object> predicate) {
         Flow.Publisher<Map.Entry> entriesPublisher = FlowAdapters
-                .toFlowPublisher(remoteCache.publishEntries(Codec27.EMPTY_VALUE_CONVERTER, null, null, 512));
+                .toFlowPublisher(remoteCache.publishEntries(Codec41.EMPTY_VALUE_CONVERTER, null, null, 512));
         return Uni.createFrom().multi(Multi.createFrom().publisher(entriesPublisher)
                 .map(e -> ((Map.Entry<Object, Object>) e).getKey())
                 .filter(key -> predicate.test(key))
diff --git a/extensions/infinispan-client/deployment/src/main/java/io/quarkus/infinispan/client/deployment/InfinispanClientProcessor.java b/extensions/infinispan-client/deployment/src/main/java/io/quarkus/infinispan/client/deployment/InfinispanClientProcessor.java
@@ -33,7 +33,7 @@
 import org.infinispan.client.hotrod.RemoteCache;
 import org.infinispan.client.hotrod.RemoteCacheManager;
 import org.infinispan.client.hotrod.annotation.ClientListener;
-import org.infinispan.client.hotrod.configuration.NearCacheMode;
+import org.infinispan.client.hotrod.configuration.RemoteCacheConfiguration;
 import org.infinispan.client.hotrod.exceptions.HotRodClientException;
 import org.infinispan.client.hotrod.impl.ConfigurationProperties;
 import org.infinispan.client.hotrod.logging.Log;
@@ -46,7 +46,6 @@
 import org.infinispan.protostream.FileDescriptorSource;
 import org.infinispan.protostream.GeneratedSchema;
 import org.infinispan.protostream.MessageMarshaller;
-import org.infinispan.protostream.SerializationContextInitializer;
 import org.infinispan.protostream.WrappedMessage;
 import org.infinispan.protostream.schema.Schema;
 import org.jboss.jandex.AnnotationInstance;
@@ -190,7 +189,7 @@ InfinispanPropertiesBuildItem setup(ApplicationArchivesBuildItem applicationArch
         additionalBeans.produce(AdditionalBeanBuildItem.builder().addBeanClass(InfinispanClientName.class).build());
         additionalBeans.produce(AdditionalBeanBuildItem.builder().addBeanClass(Remote.class).build());
 
-        resourceBuildItem.produce(new NativeImageResourceBuildItem("proto/generated/query.proto"));
+        resourceBuildItem.produce(new NativeImageResourceBuildItem("org/infinispan/commons/query/client/query.proto"));
         resourceBuildItem.produce(new NativeImageResourceBuildItem(WrappedMessage.PROTO_FILE));
         hotDeployment
                 .produce(new HotDeploymentWatchedFileBuildItem(META_INF + File.separator + DEFAULT_HOTROD_CLIENT_PROPERTIES));
@@ -249,26 +248,26 @@ InfinispanPropertiesBuildItem setup(ApplicationArchivesBuildItem applicationArch
                     }
                 }
                 properties.putAll(marshallingBuildItem.getProperties());
-                Collection<ClassInfo> initializerClasses = index.getAllKnownImplementations(DotName.createSimple(
-                        SerializationContextInitializer.class.getName()));
-                initializerClasses
+                Collection<ClassInfo> schemaClasses = index.getAllKnownImplementations(DotName.createSimple(
+                        Schema.class.getName()));
+                schemaClasses
                         .addAll(index.getAllKnownImplementations(DotName.createSimple(GeneratedSchema.class.getName())));
 
-                Set<SerializationContextInitializer> initializers = new HashSet<>(initializerClasses.size());
-                for (ClassInfo ci : initializerClasses) {
+                Set<Schema> schemas = new HashSet<>(schemaClasses.size());
+                for (ClassInfo ci : schemaClasses) {
                     Class<?> initializerClass = Thread.currentThread().getContextClassLoader().loadClass(ci.toString());
                     try {
-                        SerializationContextInitializer sci = (SerializationContextInitializer) initializerClass
+                        Schema sci = (Schema) initializerClass
                                 .getDeclaredConstructor().newInstance();
-                        initializers.add(sci);
+                        schemas.add(sci);
                     } catch (InstantiationException | IllegalAccessException | InvocationTargetException
                             | NoSuchMethodException e) {
                         // This shouldn't ever be possible as annotation processor should generate empty constructor
                         throw new RuntimeException(e);
                     }
                 }
-                if (!initializers.isEmpty()) {
-                    properties.put(InfinispanClientProducer.PROTOBUF_INITIALIZERS, initializers);
+                if (!schemas.isEmpty()) {
+                    properties.put(InfinispanClientProducer.PROTOBUF_SCHEMAS, schemas);
                 }
             }
         }
@@ -338,14 +337,6 @@ private void handlePerCacheFileConfig(InfinispanClientBuildTimeConfig config,
     BeanContainerListenerBuildItem build(InfinispanRecorder recorder, InfinispanPropertiesBuildItem builderBuildItem) {
         Map<String, Properties> propertiesMap = builderBuildItem.getProperties();
 
-        addMaxEntries(DEFAULT_INFINISPAN_CLIENT_NAME,
-                infinispanClientsBuildTimeConfig.defaultInfinispanClient(), propertiesMap.get(DEFAULT_INFINISPAN_CLIENT_NAME));
-        for (Map.Entry<String, InfinispanClientBuildTimeConfig> config : infinispanClientsBuildTimeConfig
-                .namedInfinispanClients()
-                .entrySet()) {
-            addMaxEntries(config.getKey(), config.getValue(), propertiesMap.get(config.getKey()));
-        }
-
         // This is necessary to be done for Protostream Marshaller init in native
         return new BeanContainerListenerBuildItem(recorder.configureInfinispan(propertiesMap));
     }
@@ -424,7 +415,7 @@ private Properties loadHotrodProperties(String clientName,
             }
 
             // We use caffeine for bounded near cache - so register that reflection if we have a bounded near cache
-            if (properties.containsKey(ConfigurationProperties.NEAR_CACHE_MAX_ENTRIES)) {
+            if (properties.containsKey(RemoteCacheConfiguration.NEAR_CACHE_MAX_ENTRIES)) {
                 reflectiveClass
                         .produce(ReflectiveClassBuildItem.builder("com.github.benmanes.caffeine.cache.SSMS").build());
                 reflectiveClass
@@ -450,20 +441,6 @@ private Properties loadFromStream(InputStream stream) {
         return properties;
     }
 
-    private void addMaxEntries(String clientName, InfinispanClientBuildTimeConfig config, Properties properties) {
-        if (log.isDebugEnabled()) {
-            log.debugf("Applying micro profile configuration: %s", config);
-        }
-        // Only write the entries if it is a valid number and it isn't already configured
-        if (config.nearCacheMaxEntries() > 0 && !properties.containsKey(ConfigurationProperties.NEAR_CACHE_MODE)) {
-            // This is already empty so no need for putIfAbsent
-            if (InfinispanClientUtil.isDefault(clientName)) {
-                properties.put(ConfigurationProperties.NEAR_CACHE_MODE, NearCacheMode.INVALIDATED.toString());
-                properties.putIfAbsent(ConfigurationProperties.NEAR_CACHE_MAX_ENTRIES, config.nearCacheMaxEntries());
-            }
-        }
-    }
-
     @BuildStep
     UnremovableBeanBuildItem ensureBeanLookupAvailable() {
         return UnremovableBeanBuildItem.beanTypes(BaseMarshaller.class, EnumMarshaller.class, MessageMarshaller.class,
diff --git a/extensions/infinispan-client/runtime/pom.xml b/extensions/infinispan-client/runtime/pom.xml
@@ -117,15 +117,6 @@
             <groupId>org.infinispan</groupId>
             <artifactId>infinispan-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.infinispan</groupId>
-            <artifactId>infinispan-remote-query-client</artifactId>
-        </dependency>
-        <!-- This dependency is required as otherwise the RemoteCacheImpl substitution fails-->
-        <dependency>
-            <groupId>org.infinispan</groupId>
-            <artifactId>infinispan-query-dsl</artifactId>
-        </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
diff --git a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java
@@ -26,6 +26,7 @@
 import org.infinispan.client.hotrod.logging.Log;
 import org.infinispan.client.hotrod.logging.LogFactory;
 import org.infinispan.commons.configuration.StringConfiguration;
+import org.infinispan.commons.internal.InternalCacheNames;
 import org.infinispan.commons.marshall.Marshaller;
 import org.infinispan.commons.marshall.ProtoStreamMarshaller;
 import org.infinispan.counter.api.CounterManager;
@@ -34,7 +35,6 @@
 import org.infinispan.protostream.SerializationContext;
 import org.infinispan.protostream.SerializationContextInitializer;
 import org.infinispan.protostream.schema.Schema;
-import org.infinispan.query.remote.client.ProtobufMetadataManagerConstants;
 
 import io.quarkus.arc.Arc;
 
@@ -48,7 +48,7 @@ public class InfinispanClientProducer {
     public static final StringConfiguration DEFAULT_CONFIG = new StringConfiguration(
             "<distributed-cache><encoding media-type=\"application/x-protostream\"/></distributed-cache>");
     public static final String PROTOBUF_FILE_PREFIX = "infinispan.client.hotrod.protofile.";
-    public static final String PROTOBUF_INITIALIZERS = "infinispan.client.hotrod.proto-initializers";
+    public static final String PROTOBUF_SCHEMAS = "infinispan.client.hotrod.proto-schemas";
 
     private final Map<String, RemoteCacheManager> remoteCacheManagers = new HashMap<>();
 
@@ -66,27 +66,27 @@ private void registerSchemaInServer(String infinispanConfigName,
             RemoteCacheManager cacheManager) {
         RemoteCache<String, String> protobufMetadataCache = null;
         Properties namedProperties = properties.get(infinispanConfigName);
-        Set<SerializationContextInitializer> initializers = (Set) namedProperties.remove(PROTOBUF_INITIALIZERS);
+        Set<Schema> schemas = (Set) namedProperties.remove(PROTOBUF_SCHEMAS);
         InfinispanClientRuntimeConfig runtimeConfig = this.infinispanClientsRuntimeConfigHandle.get()
                 .getInfinispanClientRuntimeConfig(infinispanConfigName);
-        if (initializers != null) {
-            for (SerializationContextInitializer initializer : initializers) {
+        if (schemas != null) {
+            for (Schema schema : schemas) {
                 if (protobufMetadataCache == null) {
                     protobufMetadataCache = cacheManager.getCache(
-                            ProtobufMetadataManagerConstants.PROTOBUF_METADATA_CACHE_NAME);
+                            InternalCacheNames.PROTOBUF_METADATA_CACHE_NAME);
                 }
-                protobufMetadataCache.put(initializer.getProtoFileName(), initializer.getProtoFile());
+                protobufMetadataCache.put(schema.getName(), schema.getContent());
             }
             runtimeConfig.backupCluster().entrySet().forEach(backup -> {
                 if (backup.getValue().useSchemaRegistration().orElse(true)) {
                     cacheManager.switchToCluster(backup.getKey());
-                    for (SerializationContextInitializer initializer : initializers) {
+                    for (Schema schema : schemas) {
                         RemoteCache<String, String> backupProtobufMetadataCache = null;
                         if (backupProtobufMetadataCache == null) {
                             backupProtobufMetadataCache = cacheManager.getCache(
-                                    ProtobufMetadataManagerConstants.PROTOBUF_METADATA_CACHE_NAME);
+                                    InternalCacheNames.PROTOBUF_METADATA_CACHE_NAME);
                         }
-                        backupProtobufMetadataCache.put(initializer.getProtoFileName(), initializer.getProtoFile());
+                        backupProtobufMetadataCache.put(schema.getName(), schema.getContent());
                     }
                     cacheManager.switchToDefaultCluster();
                 }
@@ -102,7 +102,7 @@ private void registerSchemaInServer(String infinispanConfigName,
                     String fileContents = (String) property.getValue();
                     if (protobufMetadataCache == null) {
                         protobufMetadataCache = cacheManager.getCache(
-                                ProtobufMetadataManagerConstants.PROTOBUF_METADATA_CACHE_NAME);
+                                InternalCacheNames.PROTOBUF_METADATA_CACHE_NAME);
                     }
                     protobufMetadataCache.put(fileName, fileContents);
                 }
@@ -122,7 +122,7 @@ private void registerSchemaInServer(String infinispanConfigName,
                             String fileContents = (String) property.getValue();
                             if (backupProtobufMetadataCache == null) {
                                 backupProtobufMetadataCache = cacheManager.getCache(
-                                        ProtobufMetadataManagerConstants.PROTOBUF_METADATA_CACHE_NAME);
+                                        InternalCacheNames.PROTOBUF_METADATA_CACHE_NAME);
                             }
                             backupProtobufMetadataCache.put(fileName, fileContents);
                         }
@@ -393,7 +393,7 @@ private static void handleProtoStreamMarshaller(ProtoStreamMarshaller marshaller
         SerializationContext serializationContext = marshaller.getSerializationContext();
 
         Set<SerializationContextInitializer> initializers = (Set) properties
-                .get(PROTOBUF_INITIALIZERS);
+                .get(PROTOBUF_SCHEMAS);
         if (initializers != null) {
             for (SerializationContextInitializer initializer : initializers) {
                 initializer.registerSchema(serializationContext);
diff --git a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/graal/SubstituteRemoteCacheImpl.java b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/graal/SubstituteRemoteCacheImpl.java
@@ -4,7 +4,7 @@
 
 import org.infinispan.client.hotrod.configuration.Configuration;
 import org.infinispan.client.hotrod.impl.RemoteCacheImpl;
-import org.infinispan.client.hotrod.impl.operations.OperationsFactory;
+import org.infinispan.client.hotrod.impl.transport.netty.OperationDispatcher;
 
 import com.oracle.svm.core.annotate.Delete;
 import com.oracle.svm.core.annotate.Substitute;
@@ -31,6 +31,6 @@ private void unregisterMBean() {
     // Sadly this method is public, so technically a user could get a Runtime error if they were referencing
     // it before - but it is the only way to make graal happy
     @Delete
-    public void init(OperationsFactory operationsFactory, Configuration configuration, ObjectName jmxParent) {
+    public void init(Configuration configuration, OperationDispatcher operationDispatcher, ObjectName jmxParent) {
     }
 }
diff --git a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/graal/SubstituteRemoteCacheManager.java b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/graal/SubstituteRemoteCacheManager.java
@@ -3,7 +3,7 @@
 import org.infinispan.client.hotrod.RemoteCacheManager;
 import org.infinispan.client.hotrod.configuration.Configuration;
 import org.infinispan.client.hotrod.impl.InternalRemoteCache;
-import org.infinispan.client.hotrod.impl.operations.OperationsFactory;
+import org.infinispan.client.hotrod.impl.transport.netty.OperationDispatcher;
 import org.infinispan.commons.marshall.Marshaller;
 import org.infinispan.commons.marshall.ProtoStreamMarshaller;
 import org.infinispan.protostream.SerializationContext;
@@ -24,11 +24,13 @@ public final class SubstituteRemoteCacheManager {
     private Marshaller marshaller;
     @Alias
     private Configuration configuration;
+    @Alias
+    private OperationDispatcher dispatcher;
 
     @Substitute
-    private void initRemoteCache(InternalRemoteCache<?, ?> remoteCache, OperationsFactory operationsFactory) {
+    private void initRemoteCache(InternalRemoteCache<?, ?> remoteCache) {
         // Invoke the init method that doesn't have the JMX ObjectName argument
-        remoteCache.init(operationsFactory, configuration);
+        remoteCache.init(configuration, dispatcher);
     }
 
     @Substitute
diff --git a/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/CacheSetup.java b/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/CacheSetup.java
@@ -24,8 +24,8 @@
 import org.infinispan.client.hotrod.event.ClientCacheEntryRemovedEvent;
 import org.infinispan.client.hotrod.logging.Log;
 import org.infinispan.client.hotrod.logging.LogFactory;
-import org.infinispan.query.api.continuous.ContinuousQuery;
-import org.infinispan.query.api.continuous.ContinuousQueryListener;
+import org.infinispan.commons.api.query.ContinuousQuery;
+import org.infinispan.commons.api.query.ContinuousQueryListener;
 import org.infinispan.query.dsl.Query;
 import org.infinispan.query.dsl.QueryFactory;
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`import org.infinispan.client.hotrod.configuration.Configuration;`
`6`	`6`	`import org.infinispan.client.hotrod.impl.RemoteCacheImpl;`
`7`		`-import org.infinispan.client.hotrod.impl.operations.OperationsFactory;`
	`7`	`+import org.infinispan.client.hotrod.impl.transport.netty.OperationDispatcher;`
`8`	`8`
`9`	`9`	`import com.oracle.svm.core.annotate.Delete;`
`10`	`10`	`import com.oracle.svm.core.annotate.Substitute;`
`@@ -31,6 +31,6 @@ private void unregisterMBean() {`
`31`	`31`	`// Sadly this method is public, so technically a user could get a Runtime error if they were referencing`
`32`	`32`	`// it before - but it is the only way to make graal happy`
`33`	`33`	`@Delete`
`34`		`- public void init(OperationsFactory operationsFactory, Configuration configuration, ObjectName jmxParent) {`
	`34`	`+ public void init(Configuration configuration, OperationDispatcher operationDispatcher, ObjectName jmxParent) {`
`35`	`35`	`}`
`36`	`36`	`}`