Skip to content

Commit d8679fc

Browse files
karestipruivo
authored andcommitted
remove BASIC workaround
1 parent 476bb97 commit d8679fc

File tree

4 files changed

+0
-29
lines changed

4 files changed

+0
-29
lines changed

infinispan-remote/connect-to-infinispan-server/src/main/java/org/infinispan/tutorial/simple/connect/TutorialsConnectorHelper.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
import org.infinispan.client.hotrod.RemoteCache;
44
import org.infinispan.client.hotrod.RemoteCacheManager;
5-
import org.infinispan.client.hotrod.configuration.ClientIntelligence;
65
import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
76
import org.infinispan.client.hotrod.impl.ConfigurationProperties;
8-
import org.infinispan.commons.util.OS;
97
import org.infinispan.server.test.core.InfinispanContainer;
108

119
/**
@@ -39,12 +37,6 @@ public static final ConfigurationBuilder connectionConfig() {
3937
.username(USER)
4038
.password(PASSWORD);
4139

42-
// ### Docker 4 Mac Workaround. Don't use BASIC intelligence in production
43-
if (OS.getCurrentOs().equals(OS.MAC_OS) || OS.getCurrentOs().equals(OS.WINDOWS)) {
44-
builder.clientIntelligence(ClientIntelligence.BASIC);
45-
}
46-
// ### Docker 4 Mac and Windows Workaround. Don't use BASIC intelligence in production
47-
4840
// Make sure the remote cache is available.
4941
// If the cache does not exist, the cache will be created
5042
builder.remoteCache(TUTORIAL_CACHE_NAME)

integrations/spring-boot/cache-remote-reactor/src/main/java/org/infinispan/tutorial/simple/spring/remote/InfinispanConfiguration.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package org.infinispan.tutorial.simple.spring.remote;
22

3-
import org.infinispan.client.hotrod.configuration.ClientIntelligence;
43
import org.infinispan.commons.marshall.ProtoStreamMarshaller;
5-
import org.infinispan.commons.util.OS;
64
import org.infinispan.spring.starter.remote.InfinispanRemoteCacheCustomizer;
75
import org.infinispan.tutorial.simple.connect.TutorialsConnectorHelper;
86
import org.springframework.context.annotation.Bean;
@@ -26,9 +24,6 @@ public InfinispanRemoteCacheCustomizer configurer() {
2624
port = TutorialsConnectorHelper.INFINISPAN_CONTAINER.getFirstMappedPort();
2725
}
2826
b.addServer().host(host).port(port);
29-
if (OS.getCurrentOs().equals(OS.MAC_OS) || OS.getCurrentOs().equals(OS.WINDOWS)) {
30-
b.clientIntelligence(ClientIntelligence.BASIC);
31-
}
3227
b.security().authentication()
3328
.username(TutorialsConnectorHelper.USER)
3429
.password(TutorialsConnectorHelper.PASSWORD);

integrations/spring-boot/cache-remote/src/main/java/org/infinispan/tutorial/simple/spring/remote/InfinispanConfiguration.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package org.infinispan.tutorial.simple.spring.remote;
22

3-
import org.infinispan.client.hotrod.configuration.ClientIntelligence;
43
import org.infinispan.commons.marshall.ProtoStreamMarshaller;
5-
import org.infinispan.commons.util.OS;
64
import org.infinispan.spring.starter.remote.InfinispanRemoteCacheCustomizer;
75
import org.springframework.context.annotation.Bean;
86
import org.springframework.context.annotation.Configuration;
@@ -33,12 +31,6 @@ public InfinispanRemoteCacheCustomizer caches() {
3331

3432
// Add marshaller in the client, the class is generated from the interface in compile time
3533
b.addContextInitializer(new BasquesNamesSchemaBuilderImpl());
36-
37-
// #### This is to avoid connectivity issues locally with docker and mac.
38-
// ### Don't use client intelligence basic in production
39-
if (OS.getCurrentOs().equals(OS.MAC_OS) || OS.getCurrentOs().equals(OS.WINDOWS)) {
40-
b.clientIntelligence(ClientIntelligence.BASIC);
41-
}
4234
};
4335
}
4436
}

integrations/spring-boot/session-remote/src/main/java/org/infinispan/tutorial/simple/spring/session/InfinispanConfiguration.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package org.infinispan.tutorial.simple.spring.session;
22

3-
import org.infinispan.client.hotrod.configuration.ClientIntelligence;
43
import org.infinispan.commons.marshall.ProtoStreamMarshaller;
5-
import org.infinispan.commons.util.OS;
64
import org.infinispan.spring.starter.remote.InfinispanRemoteCacheCustomizer;
75
import org.springframework.context.annotation.Bean;
86
import org.springframework.context.annotation.Configuration;
@@ -30,12 +28,6 @@ public InfinispanRemoteCacheCustomizer caches() {
3028
b.remoteCache("sessions").configurationURI(uri);
3129
// Use protostream marshaller to serialize the sessions with Protobuf
3230
b.remoteCache("sessions").marshaller(ProtoStreamMarshaller.class);
33-
34-
// #### This is to avoid connectivity issues locally with docker and mac.
35-
// ### Don't use client intelligence basic in production
36-
if (OS.getCurrentOs().equals(OS.MAC_OS) || OS.getCurrentOs().equals(OS.WINDOWS)) {
37-
b.clientIntelligence(ClientIntelligence.BASIC);
38-
}
3931
};
4032
}
4133
}

0 commit comments

Comments
 (0)