Updates to 15.1.15 and cleans BASIC intelligence

infinispan · Feb 3, 2025 · fa10114 · fa10114
1 parent 8aea7b2
commit fa10114
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 28 deletions.
diff --git a/...server/src/main/java/org/infinispan/tutorial/simple/connect/TutorialsConnectorHelper.java b/...server/src/main/java/org/infinispan/tutorial/simple/connect/TutorialsConnectorHelper.java
@@ -2,10 +2,8 @@
 
 import org.infinispan.client.hotrod.RemoteCache;
 import org.infinispan.client.hotrod.RemoteCacheManager;
-import org.infinispan.client.hotrod.configuration.ClientIntelligence;
 import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
 import org.infinispan.client.hotrod.impl.ConfigurationProperties;
-import org.infinispan.commons.util.OS;
 import org.infinispan.server.test.core.InfinispanContainer;
 
 /**
@@ -39,12 +37,6 @@ public static final ConfigurationBuilder connectionConfig() {
             .username(USER)
             .password(PASSWORD);
 
-      // ### Docker 4 Mac Workaround. Don't use BASIC intelligence in production
-      if (OS.getCurrentOs().equals(OS.MAC_OS) || OS.getCurrentOs().equals(OS.WINDOWS)) {
-         builder.clientIntelligence(ClientIntelligence.BASIC);
-      }
-      // ### Docker 4 Mac and Windows Workaround. Don't use BASIC intelligence in production
-
       // Make sure the remote cache is available.
       // If the cache does not exist, the cache will be created
       builder.remoteCache(TUTORIAL_CACHE_NAME)

diff --git a/...r/src/main/java/org/infinispan/tutorial/simple/spring/remote/InfinispanConfiguration.java b/...r/src/main/java/org/infinispan/tutorial/simple/spring/remote/InfinispanConfiguration.java
@@ -1,8 +1,6 @@
 package org.infinispan.tutorial.simple.spring.remote;
 
-import org.infinispan.client.hotrod.configuration.ClientIntelligence;
 import org.infinispan.commons.marshall.ProtoStreamMarshaller;
-import org.infinispan.commons.util.OS;
 import org.infinispan.spring.starter.remote.InfinispanRemoteCacheCustomizer;
 import org.infinispan.tutorial.simple.connect.TutorialsConnectorHelper;
 import org.springframework.context.annotation.Bean;
@@ -26,9 +24,6 @@ public InfinispanRemoteCacheCustomizer configurer() {
             port = TutorialsConnectorHelper.INFINISPAN_CONTAINER.getFirstMappedPort();
          }
          b.addServer().host(host).port(port);
-         if (OS.getCurrentOs().equals(OS.MAC_OS) || OS.getCurrentOs().equals(OS.WINDOWS)) {
-            b.clientIntelligence(ClientIntelligence.BASIC);
-         }
          b.security().authentication()
                  .username(TutorialsConnectorHelper.USER)
                  .password(TutorialsConnectorHelper.PASSWORD);

diff --git a/...e/src/main/java/org/infinispan/tutorial/simple/spring/remote/InfinispanConfiguration.java b/...e/src/main/java/org/infinispan/tutorial/simple/spring/remote/InfinispanConfiguration.java
@@ -1,8 +1,6 @@
 package org.infinispan.tutorial.simple.spring.remote;
 
-import org.infinispan.client.hotrod.configuration.ClientIntelligence;
 import org.infinispan.commons.marshall.ProtoStreamMarshaller;
-import org.infinispan.commons.util.OS;
 import org.infinispan.spring.starter.remote.InfinispanRemoteCacheCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -33,12 +31,6 @@ public InfinispanRemoteCacheCustomizer caches() {
 
          // Add marshaller in the client, the class is generated from the interface in compile time
          b.addContextInitializer(new BasquesNamesSchemaBuilderImpl());
-
-         // #### This is to avoid connectivity issues locally with docker and mac.
-         // ### Don't use client intelligence basic in production
-         if (OS.getCurrentOs().equals(OS.MAC_OS) || OS.getCurrentOs().equals(OS.WINDOWS)) {
-            b.clientIntelligence(ClientIntelligence.BASIC);
-         }
       };
    }
 }
diff --git a/.../src/main/java/org/infinispan/tutorial/simple/spring/session/InfinispanConfiguration.java b/.../src/main/java/org/infinispan/tutorial/simple/spring/session/InfinispanConfiguration.java
@@ -30,12 +30,6 @@ public InfinispanRemoteCacheCustomizer caches() {
          b.remoteCache("sessions").configurationURI(uri);
          // Use protostream marshaller to serialize the sessions with Protobuf
          b.remoteCache("sessions").marshaller(ProtoStreamMarshaller.class);
-
-         // #### This is to avoid connectivity issues locally with docker and mac.
-         // ### Don't use client intelligence basic in production
-         if (OS.getCurrentOs().equals(OS.MAC_OS) || OS.getCurrentOs().equals(OS.WINDOWS)) {
-            b.clientIntelligence(ClientIntelligence.BASIC);
-         }
       };
    }
 }
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.infinispan</groupId>
         <artifactId>infinispan-build-configuration-parent</artifactId>
-        <version>15.1.4.Final</version>
+        <version>15.1.5.Final</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.infinispan.tutorial.simple</groupId>