You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by fm...@apache.org on 2024/01/25 12:46:38 UTC
(camel-spring-boot) 25/40: [infinispan] Client property configurable in tests (#995)
This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit a4218590f230278963af4bf97d32a9b451251f0b
Author: Marco Carletti <mc...@redhat.com>
AuthorDate: Fri Nov 3 10:43:04 2023 +0100
[infinispan] Client property configurable in tests (#995)
---
.../remote/InfinispanRemoteConfigurationIT.java | 4 +-
.../remote/InfinispanRemoteTestSupport.java | 4 +-
.../InfinispanRemoteClusteredTestSupport.java | 52 ++++++++++------------
3 files changed, 29 insertions(+), 31 deletions(-)
diff --git a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationIT.java b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationIT.java
index f65c92fdc12..15c811b3312 100644
--- a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationIT.java
+++ b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteConfigurationIT.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.infinispan.remote;
+import static org.apache.camel.component.infinispan.remote.InfinispanRemoteTestSupport.CLIENT_INTELLIGENCE_BASIC;
+
import org.apache.camel.spring.boot.CamelAutoConfiguration;
import org.apache.camel.test.infra.infinispan.services.InfinispanService;
import org.apache.camel.test.infra.infinispan.services.InfinispanServiceFactory;
@@ -59,7 +61,7 @@ public class InfinispanRemoteConfigurationIT {
configuration.setSecurityServerName("infinispan");
configuration.setSaslMechanism("DIGEST-MD5");
configuration.setSecurityRealm("default");
- if (SystemUtils.IS_OS_MAC) {
+ if (CLIENT_INTELLIGENCE_BASIC) {
configuration.addConfigurationProperty(
"infinispan.client.hotrod.client_intelligence", "BASIC");
}
diff --git a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteTestSupport.java b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteTestSupport.java
index 4d0bbec4f29..17cce5a55e6 100644
--- a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteTestSupport.java
+++ b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteTestSupport.java
@@ -49,6 +49,8 @@ public class InfinispanRemoteTestSupport {
public static InfinispanService service = InfinispanServiceFactory.createService();
protected static RemoteCacheManager cacheContainer;
+ public static final boolean CLIENT_INTELLIGENCE_BASIC = SystemUtils.IS_OS_MAC || Boolean.parseBoolean(System.getProperty("infinispan.client_intelligence.basic", "false"));
+
@Autowired
ProducerTemplate template;
@@ -133,7 +135,7 @@ public class InfinispanRemoteTestSupport {
.saslMechanism("DIGEST-MD5")
.realm("default");
- if (SystemUtils.IS_OS_MAC) {
+ if (CLIENT_INTELLIGENCE_BASIC) {
Properties properties = new Properties();
properties.put("infinispan.client.hotrod.client_intelligence", "BASIC");
clientBuilder.withProperties(properties);
diff --git a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/cluster/InfinispanRemoteClusteredTestSupport.java b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/cluster/InfinispanRemoteClusteredTestSupport.java
index 6b3da5d6c5e..54c65d3abfa 100644
--- a/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/cluster/InfinispanRemoteClusteredTestSupport.java
+++ b/components-starter/camel-infinispan-starter/src/test/java/org/apache/camel/component/infinispan/remote/cluster/InfinispanRemoteClusteredTestSupport.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.infinispan.remote.cluster;
+import static org.apache.camel.component.infinispan.remote.InfinispanRemoteTestSupport.CLIENT_INTELLIGENCE_BASIC;
+
import java.util.Properties;
import org.apache.camel.test.infra.infinispan.services.InfinispanService;
@@ -24,43 +26,35 @@ import org.infinispan.client.hotrod.RemoteCacheManager;
import org.infinispan.client.hotrod.configuration.Configuration;
import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
import org.infinispan.configuration.cache.CacheMode;
-import org.testcontainers.shaded.org.apache.commons.lang3.SystemUtils;
public final class InfinispanRemoteClusteredTestSupport {
+
private InfinispanRemoteClusteredTestSupport() {
}
public static Configuration createConfiguration(InfinispanService service) {
- if (SystemUtils.IS_OS_MAC) {
- Properties properties = new Properties();
+
+ final ConfigurationBuilder configBuilder = new ConfigurationBuilder();
+
+ if (CLIENT_INTELLIGENCE_BASIC) {
+ final Properties properties = new Properties();
properties.put("infinispan.client.hotrod.client_intelligence", "BASIC");
- return new ConfigurationBuilder()
- .withProperties(properties)
- .addServer()
- .host(service.host())
- .port(service.port())
- .security()
- .authentication()
- .username(service.username())
- .password(service.password())
- .serverName("infinispan")
- .saslMechanism("DIGEST-MD5")
- .realm("default")
- .build();
- } else {
- return new ConfigurationBuilder()
- .addServer()
- .host(service.host())
- .port(service.port())
- .security()
- .authentication()
- .username(service.username())
- .password(service.password())
- .serverName("infinispan")
- .saslMechanism("DIGEST-MD5")
- .realm("default")
- .build();
+ configBuilder.withProperties(properties);
}
+
+ configBuilder
+ .addServer()
+ .host(service.host())
+ .port(service.port())
+ .security()
+ .authentication()
+ .username(service.username())
+ .password(service.password())
+ .serverName("infinispan")
+ .saslMechanism("DIGEST-MD5")
+ .realm("default");
+
+ return configBuilder.build();
}
public static void createCache(RemoteCacheManager cacheContainer, String cacheName) {