You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/10/02 16:53:03 UTC
[camel] 03/08: CAMEL-15603 - Camel-Infinispan: Support
Authentication through URI options
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5888a03ee9e05ff9d8c265df4ab7e22e36490d92
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Oct 2 16:48:26 2020 +0200
CAMEL-15603 - Camel-Infinispan: Support Authentication through URI options
---
.../apache/camel/component/infinispan/InfinispanManager.java | 10 ++++++++--
.../testcontainers/InfinispanTestContainerSupport.java | 1 -
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanManager.java b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanManager.java
index 2ccea72..a072cb8 100644
--- a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanManager.java
+++ b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanManager.java
@@ -99,8 +99,14 @@ public class InfinispanManager extends ServiceSupport {
}
if (configuration.isSecure()) {
- builder.security().authentication().username(configuration.getUsername())
- .password(configuration.getPassword());
+ if (ObjectHelper.isNotEmpty(configuration.getUsername())
+ && ObjectHelper.isNotEmpty(configuration.getPassword())) {
+ builder.security().authentication().username(configuration.getUsername())
+ .password(configuration.getPassword());
+ } else {
+ throw new IllegalArgumentException(
+ "If the Infinispan instance is secured, username and password are needed");
+ }
}
Properties properties = new Properties();
diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/testcontainers/InfinispanTestContainerSupport.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/testcontainers/InfinispanTestContainerSupport.java
index 39128a1..3be8eee 100644
--- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/testcontainers/InfinispanTestContainerSupport.java
+++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/testcontainers/InfinispanTestContainerSupport.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.infinispan.testcontainers;
import org.apache.camel.test.testcontainers.junit5.ContainerAwareTestSupport;
import org.apache.camel.test.testcontainers.junit5.Wait;
import org.infinispan.client.hotrod.DefaultTemplate;
-import org.infinispan.client.hotrod.RemoteCache;
import org.infinispan.client.hotrod.RemoteCacheManager;
import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
import org.junit.jupiter.api.TestInstance;