Merge pull request #10989 from karesti/upgrade-infinispan-version

Upgrade Infinispan to 11.0.1.Final
quarkusio · Jul 29, 2020 · 63af920 · 63af920
2 parents 599e79a + 642c86a
commit 63af920
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 22 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -123,8 +123,8 @@
         <testng.version>6.14.2</testng.version>
         <assertj.version>3.16.1</assertj.version>
         <json-smart.version>2.3</json-smart.version>
-        <infinispan.version>10.1.5.Final</infinispan.version>
-        <infinispan.protostream.version>4.3.2.Final</infinispan.protostream.version>
+        <infinispan.version>11.0.1.Final</infinispan.version>
+        <infinispan.protostream.version>4.3.3.Final</infinispan.protostream.version>
         <caffeine.version>2.8.5</caffeine.version>
         <netty.version>4.1.49.Final</netty.version>
         <reactive-streams.version>1.0.3</reactive-streams.version>

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
@@ -20,7 +20,7 @@
 import org.infinispan.client.hotrod.impl.ConfigurationProperties;
 import org.infinispan.client.hotrod.logging.Log;
 import org.infinispan.client.hotrod.logging.LogFactory;
-import org.infinispan.client.hotrod.marshall.ProtoStreamMarshaller;
+import org.infinispan.commons.marshall.ProtoStreamMarshaller;
 import org.infinispan.commons.util.Util;
 import org.infinispan.protostream.BaseMarshaller;
 import org.infinispan.protostream.EnumMarshaller;

diff --git a/.../runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java b/.../runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java
@@ -25,8 +25,8 @@
 import org.infinispan.client.hotrod.impl.ConfigurationProperties;
 import org.infinispan.client.hotrod.logging.Log;
 import org.infinispan.client.hotrod.logging.LogFactory;
-import org.infinispan.client.hotrod.marshall.ProtoStreamMarshaller;
 import org.infinispan.commons.marshall.Marshaller;
+import org.infinispan.commons.marshall.ProtoStreamMarshaller;
 import org.infinispan.commons.util.Util;
 import org.infinispan.counter.api.CounterManager;
 import org.infinispan.protostream.BaseMarshaller;
@@ -309,10 +309,10 @@ void configure(Properties properties) {
     }
 
     /**
-     * Retrieves the deprecated {@link Remote} annotation instance from the set
+     * Retrieves the deprecated {@link io.quarkus.infinispan.client.Remote} annotation instance from the set
      *
      * @param annotationSet the annotation set.
-     * @return the {@link Remote} annotation instance or {@code null} if not found.
+     * @return the {@link io.quarkus.infinispan.client.Remote} annotation instance or {@code null} if not found.
      */
     private io.quarkus.infinispan.client.Remote getRemoteAnnotation(Set<Annotation> annotationSet) {
         for (Annotation annotation : annotationSet) {

diff --git a/.../main/java/io/quarkus/infinispan/client/runtime/graal/SubstituteConfigurationBuilder.java b/.../main/java/io/quarkus/infinispan/client/runtime/graal/SubstituteConfigurationBuilder.java
@@ -4,7 +4,6 @@
 import org.infinispan.client.hotrod.marshall.BytesOnlyMarshaller;
 import org.infinispan.commons.marshall.Marshaller;
 
-import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 
@@ -15,11 +14,9 @@
  */
 @TargetClass(ConfigurationBuilder.class)
 public final class SubstituteConfigurationBuilder {
-    @Alias
-    private Marshaller marshaller;
 
     @Substitute
-    private void handleNullMarshaller() {
-        marshaller = BytesOnlyMarshaller.INSTANCE;
+    private Marshaller handleNullMarshaller() {
+        return BytesOnlyMarshaller.INSTANCE;
     }
 }
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,6 +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 org.infinispan.commons.marshall.Marshaller;
@@ -31,7 +32,7 @@ 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(Marshaller marshaller, OperationsFactory operationsFactory, int estimateKeySize,
-            int estimateValueSize, int batchSize, ObjectName jmxParent) {
+    public void init(Marshaller marshaller, 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
@@ -2,7 +2,7 @@
 
 import org.infinispan.client.hotrod.RemoteCacheManager;
 import org.infinispan.client.hotrod.configuration.Configuration;
-import org.infinispan.client.hotrod.impl.RemoteCacheImpl;
+import org.infinispan.client.hotrod.impl.InternalRemoteCache;
 import org.infinispan.client.hotrod.impl.operations.OperationsFactory;
 import org.infinispan.commons.marshall.Marshaller;
 
@@ -23,10 +23,9 @@ public final class SubstituteRemoteCacheManager {
     private Configuration configuration;
 
     @Substitute
-    private void initRemoteCache(RemoteCacheImpl remoteCache, OperationsFactory operationsFactory) {
+    private void initRemoteCache(InternalRemoteCache<?, ?> remoteCache, OperationsFactory operationsFactory) {
         // Invoke the init method that doesn't have the JMX ObjectName argument
-        remoteCache.init(marshaller, operationsFactory, configuration.keySizeEstimate(),
-                configuration.valueSizeEstimate(), configuration.batchSize());
+        remoteCache.init(marshaller, operationsFactory, configuration);
     }
 
     @Substitute

diff --git a/integration-tests/infinispan-client/pom.xml b/integration-tests/infinispan-client/pom.xml
@@ -95,17 +95,17 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.10.0</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.10.0</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.10.0</version>
+            <version>2.11.0</version>
         </dependency>
 
     </dependencies>

diff --git a/...an-client/src/test/java/io/quarkus/it/infinispan/client/InfinispanServerTestResource.java b/...an-client/src/test/java/io/quarkus/it/infinispan/client/InfinispanServerTestResource.java
@@ -3,6 +3,7 @@
 import java.util.Collections;
 import java.util.Map;
 
+import org.infinispan.commons.dataconversion.MediaType;
 import org.infinispan.commons.test.TestResourceTracker;
 import org.infinispan.configuration.cache.ConfigurationBuilder;
 import org.infinispan.configuration.global.GlobalConfigurationBuilder;
@@ -23,10 +24,14 @@ public class InfinispanServerTestResource implements QuarkusTestResourceLifecycl
     @Override
     public Map<String, String> start() {
         TestResourceTracker.setThreadTestName("InfinispanServer");
+        ConfigurationBuilder configurationBuilder = new ConfigurationBuilder();
+        configurationBuilder.encoding().mediaType(MediaType.APPLICATION_PROTOSTREAM_TYPE);
         EmbeddedCacheManager ecm = TestCacheManagerFactory.createCacheManager(
                 new GlobalConfigurationBuilder().nonClusteredDefault().defaultCacheName("default"),
-                new ConfigurationBuilder());
-        ecm.defineConfiguration("magazine", new ConfigurationBuilder().build());
+                configurationBuilder);
+
+        ecm.defineConfiguration("magazine", configurationBuilder.build());
+
         // Client connects to a non default port
         final HotRodServerConfigurationBuilder hotRodServerConfigurationBuilder = new HotRodServerConfigurationBuilder();
         hotRodServerConfigurationBuilder