Updates to Infinispan 15.1.1.Final

karesti · Dec 19, 2024 · 8a314fe · 8a314fe
1 parent 5e6fb77
commit 8a314fe
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 15 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -129,7 +129,7 @@
         <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.10.5</junit.jupiter.version>
-        <infinispan.version>15.0.11.Final</infinispan.version>
+        <infinispan.version>15.1.1.Final</infinispan.version>
         <infinispan.protostream.version>5.0.12.Final</infinispan.protostream.version>
         <caffeine.version>3.1.8</caffeine.version>
         <netty.version>4.1.115.Final</netty.version>

diff --git a/...-cache/runtime/src/main/java/io/quarkus/cache/infinispan/runtime/InfinispanCacheImpl.java b/...-cache/runtime/src/main/java/io/quarkus/cache/infinispan/runtime/InfinispanCacheImpl.java
@@ -12,7 +12,7 @@
 import java.util.function.Predicate;
 
 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.infinispan.commons.util.concurrent.CompletionStages;
 import org.reactivestreams.FlowAdapters;
@@ -210,7 +210,7 @@ public Uni<Void> invalidateAll() {
     @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/.../test/java/org/quarkus/infinispan/client/deployment/InfinispanConfigurationSetupTest.java b/.../test/java/org/quarkus/infinispan/client/deployment/InfinispanConfigurationSetupTest.java
@@ -49,7 +49,7 @@ public void infinispanConnectionConfiguration() {
         assertThat(configuration.security().ssl().ciphers()).containsExactlyInAnyOrder("SSL_cipher1", "SSL_cipher2");
         assertThat(configuration.security().ssl().hostnameValidation()).isTrue();
         assertThat(configuration.security().ssl().sniHostName()).isEqualTo("sniHostName");
-        assertThat(configuration.socketTimeout()).isEqualTo(10000);
+        assertThat(configuration.socketTimeout()).isEqualTo(2000);
         assertThat(configuration.clusters()).extracting("clusterName", "clientIntelligence")
                 .containsExactly(tuple("bsite", ClientIntelligence.BASIC));
         assertThat(configuration.clusters()).hasSize(1);

diff --git a/...e/src/main/java/io/quarkus/infinispan/client/runtime/graal/SubstituteRemoteCacheImpl.java b/...e/src/main/java/io/quarkus/infinispan/client/runtime/graal/SubstituteRemoteCacheImpl.java
@@ -2,9 +2,7 @@
 
 import javax.management.ObjectName;
 
-import org.infinispan.client.hotrod.configuration.Configuration;
 import org.infinispan.client.hotrod.impl.RemoteCacheImpl;
-import org.infinispan.client.hotrod.impl.operations.OperationsFactory;
 
 import com.oracle.svm.core.annotate.Delete;
 import com.oracle.svm.core.annotate.Substitute;
@@ -27,10 +25,4 @@ private void registerMBean(ObjectName jmxParent) {
     @Substitute
     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) {
-    }
 }
diff --git a/...rc/main/java/io/quarkus/infinispan/client/runtime/graal/SubstituteRemoteCacheManager.java b/...rc/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