From ae2c2b37da96f8f8a81f1c4132c2fc2be81c8b62 Mon Sep 17 00:00:00 2001 From: Katia Aresti Date: Mon, 3 Feb 2025 11:05:05 +0100 Subject: [PATCH] remove BASIC workaround --- .../tutorial/simple/connect/TutorialsConnectorHelper.java | 8 -------- .../simple/spring/remote/InfinispanConfiguration.java | 5 ----- .../simple/spring/remote/InfinispanConfiguration.java | 8 -------- .../simple/spring/session/InfinispanConfiguration.java | 8 -------- 4 files changed, 29 deletions(-) diff --git a/infinispan-remote/connect-to-infinispan-server/src/main/java/org/infinispan/tutorial/simple/connect/TutorialsConnectorHelper.java b/infinispan-remote/connect-to-infinispan-server/src/main/java/org/infinispan/tutorial/simple/connect/TutorialsConnectorHelper.java index e5438326..e1ea6971 100644 --- a/infinispan-remote/connect-to-infinispan-server/src/main/java/org/infinispan/tutorial/simple/connect/TutorialsConnectorHelper.java +++ b/infinispan-remote/connect-to-infinispan-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/integrations/spring-boot/cache-remote-reactor/src/main/java/org/infinispan/tutorial/simple/spring/remote/InfinispanConfiguration.java b/integrations/spring-boot/cache-remote-reactor/src/main/java/org/infinispan/tutorial/simple/spring/remote/InfinispanConfiguration.java index d5628e01..17d12be7 100644 --- a/integrations/spring-boot/cache-remote-reactor/src/main/java/org/infinispan/tutorial/simple/spring/remote/InfinispanConfiguration.java +++ b/integrations/spring-boot/cache-remote-reactor/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/integrations/spring-boot/cache-remote/src/main/java/org/infinispan/tutorial/simple/spring/remote/InfinispanConfiguration.java b/integrations/spring-boot/cache-remote/src/main/java/org/infinispan/tutorial/simple/spring/remote/InfinispanConfiguration.java index 3a7fe0d1..25191eb7 100644 --- a/integrations/spring-boot/cache-remote/src/main/java/org/infinispan/tutorial/simple/spring/remote/InfinispanConfiguration.java +++ b/integrations/spring-boot/cache-remote/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/integrations/spring-boot/session-remote/src/main/java/org/infinispan/tutorial/simple/spring/session/InfinispanConfiguration.java b/integrations/spring-boot/session-remote/src/main/java/org/infinispan/tutorial/simple/spring/session/InfinispanConfiguration.java index f5eadd3e..22515a47 100644 --- a/integrations/spring-boot/session-remote/src/main/java/org/infinispan/tutorial/simple/spring/session/InfinispanConfiguration.java +++ b/integrations/spring-boot/session-remote/src/main/java/org/infinispan/tutorial/simple/spring/session/InfinispanConfiguration.java @@ -1,8 +1,6 @@ package org.infinispan.tutorial.simple.spring.session; -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; @@ -30,12 +28,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); - } }; } }