ppalaga commented on a change in pull request #2841:
URL: https://github.com/apache/camel-quarkus/pull/2841#discussion_r657649298
##########
File path:
integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanServerTestResource.java
##########
@@ -54,24 +55,48 @@
// Create 2 sets of configuration to test scenarios:
// - Quarkus Infinispan client bean being autowired into the Camel
Infinispan component
// - Component configuration where the Infinispan client is
managed by Camel (E.g Infinispan client autowiring disabled)
- return CollectionHelper.mapOf(
- // quarkus
- "quarkus.infinispan-client.server-list", serverList,
- "quarkus.infinispan-client.near-cache-max-entries", "3",
- "quarkus.infinispan-client.auth-username", USER,
- "quarkus.infinispan-client.auth-password", PASS,
- "quarkus.infinispan-client.auth-realm", "default",
- "quarkus.infinispan-client.sasl-mechanism", "DIGEST-MD5",
- "quarkus.infinispan-client.auth-server-name", "infinispan",
- // camel
- "camel.component.infinispan.autowired-enabled", "false",
- "camel.component.infinispan.hosts", serverList,
- "camel.component.infinispan.username", USER,
- "camel.component.infinispan.password", PASS,
- "camel.component.infinispan.secure", "true",
- "camel.component.infinispan.security-realm", "default",
- "camel.component.infinispan.sasl-mechanism", "DIGEST-MD5",
- "camel.component.infinispan.security-server-name",
"infinispan");
+ if (SystemUtils.IS_OS_LINUX) {
+ return CollectionHelper.mapOf(
+ // quarkus
+ "quarkus.infinispan-client.server-list", serverList,
+ "quarkus.infinispan-client.near-cache-max-entries",
"3",
+ "quarkus.infinispan-client.auth-username", USER,
+ "quarkus.infinispan-client.auth-password", PASS,
+ "quarkus.infinispan-client.auth-realm", "default",
+ "quarkus.infinispan-client.sasl-mechanism",
"DIGEST-MD5",
+ "quarkus.infinispan-client.auth-server-name",
"infinispan",
+ // camel
+ "camel.component.infinispan.autowired-enabled",
"false",
+ "camel.component.infinispan.hosts", serverList,
+ "camel.component.infinispan.username", USER,
+ "camel.component.infinispan.password", PASS,
+ "camel.component.infinispan.secure", "true",
+ "camel.component.infinispan.security-realm", "default",
+ "camel.component.infinispan.sasl-mechanism",
"DIGEST-MD5",
+ "camel.component.infinispan.security-server-name",
+ "infinispan");
+ } else {
+ return CollectionHelper.mapOf(
+ // quarkus
+ "quarkus.infinispan-client.server-list", serverList,
+ "quarkus.infinispan-client.near-cache-max-entries",
"3",
+ "quarkus.infinispan-client.auth-username", USER,
+ "quarkus.infinispan-client.auth-password", PASS,
+ "quarkus.infinispan-client.auth-realm", "default",
+ "quarkus.infinispan-client.sasl-mechanism",
"DIGEST-MD5",
+ "quarkus.infinispan-client.auth-server-name",
"infinispan",
+ "quarkus.infinispan-client.client-intelligence",
"BASIC",
+ // camel
+ "camel.component.infinispan.autowired-enabled",
"false",
+ "camel.component.infinispan.hosts", serverList,
+ "camel.component.infinispan.username", USER,
+ "camel.component.infinispan.password", PASS,
+ "camel.component.infinispan.secure", "true",
+ "camel.component.infinispan.security-realm", "default",
+ "camel.component.infinispan.sasl-mechanism",
"DIGEST-MD5",
+ "camel.component.infinispan.security-server-name",
+ "infinispan");
+ }
Review comment:
Could we perhaps reduce the number of lines a bit? Maybe something like
the following?
```suggestion
Map<String, String> result = CollectionHelper.mapOf(
// quarkus
"quarkus.infinispan-client.server-list", serverList,
"quarkus.infinispan-client.near-cache-max-entries",
"3",
"quarkus.infinispan-client.auth-username", USER,
"quarkus.infinispan-client.auth-password", PASS,
"quarkus.infinispan-client.auth-realm", "default",
"quarkus.infinispan-client.sasl-mechanism",
"DIGEST-MD5",
"quarkus.infinispan-client.auth-server-name",
"infinispan",
// camel
"camel.component.infinispan.autowired-enabled",
"false",
"camel.component.infinispan.hosts", serverList,
"camel.component.infinispan.username", USER,
"camel.component.infinispan.password", PASS,
"camel.component.infinispan.secure", "true",
"camel.component.infinispan.security-realm",
"default",
"camel.component.infinispan.sasl-mechanism",
"DIGEST-MD5",
"camel.component.infinispan.security-server-name",
"infinispan");
if (SystemUtils.IS_OS_MAC) {
/* Fix for
https://github.com/apache/camel-quarkus/issues/2840 */
result.put("quarkus.infinispan-client.client-intelligence",
"BASIC");
}
return result;
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
