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 2019/08/02 06:33:52 UTC
[camel] branch master updated (3be3f6f -> 1d374ad)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 3be3f6f Fix checkstyle
new 45f55dd CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Thrift
new 1d374ad Removed unused imports
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/component/thrift/ThriftConsumerSecurityTest.java | 11 ++++++-----
.../camel/component/thrift/ThriftProducerSecurityTest.java | 11 ++++++-----
2 files changed, 12 insertions(+), 10 deletions(-)
[camel] 01/02: CAMEL-13801 - camel3 - Use @BindToRegistry wherever
possible, Camel-Thrift
Posted by ac...@apache.org.
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 45f55dd086989f609bdfec3b1bedbefcecf35e5c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 2 08:33:08 2019 +0200
CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Thrift
---
.../camel/component/thrift/ThriftConsumerSecurityTest.java | 10 ++++++----
.../camel/component/thrift/ThriftProducerSecurityTest.java | 10 ++++++----
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSecurityTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSecurityTest.java
index 978d67a..96f1df0 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSecurityTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSecurityTest.java
@@ -24,6 +24,8 @@ import org.apache.camel.component.thrift.generated.Calculator;
import org.apache.camel.component.thrift.generated.Operation;
import org.apache.camel.component.thrift.generated.Work;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.spi.Registry;
+import org.apache.camel.support.SimpleRegistry;
import org.apache.camel.support.jsse.KeyManagersParameters;
import org.apache.camel.support.jsse.KeyStoreParameters;
import org.apache.camel.support.jsse.SSLContextParameters;
@@ -81,8 +83,8 @@ public class ThriftConsumerSecurityTest extends CamelTestSupport {
}
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
+ protected Registry createCamelRegistry() throws Exception {
+ Registry reg = new SimpleRegistry();
SSLContextParameters sslParameters = new SSLContextParameters();
KeyStoreParameters keyStoreParams = new KeyStoreParameters();
@@ -94,8 +96,8 @@ public class ThriftConsumerSecurityTest extends CamelTestSupport {
sslParameters.setKeyManagers(keyManagerParams);
- jndi.bind("sslParams", sslParameters);
- return jndi;
+ reg.bind("sslParams", sslParameters);
+ return reg;
}
@Test
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSecurityTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSecurityTest.java
index 29eae88..d5f83b9 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSecurityTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSecurityTest.java
@@ -32,6 +32,8 @@ import org.apache.camel.component.thrift.generated.Operation;
import org.apache.camel.component.thrift.generated.Work;
import org.apache.camel.component.thrift.impl.CalculatorSyncServerImpl;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.spi.Registry;
+import org.apache.camel.support.SimpleRegistry;
import org.apache.camel.support.jsse.KeyStoreParameters;
import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.support.jsse.TrustManagersParameters;
@@ -96,8 +98,8 @@ public class ThriftProducerSecurityTest extends CamelTestSupport {
}
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
+ protected Registry createCamelRegistry() throws Exception {
+ Registry reg = new SimpleRegistry();
SSLContextParameters sslParameters = new SSLContextParameters();
KeyStoreParameters keyStoreParams = new KeyStoreParameters();
@@ -109,8 +111,8 @@ public class ThriftProducerSecurityTest extends CamelTestSupport {
sslParameters.setTrustManagers(trustManagerParams);
- jndi.bind("sslParams", sslParameters);
- return jndi;
+ reg.bind("sslParams", sslParameters);
+ return reg;
}
@Test
[camel] 02/02: Removed unused imports
Posted by ac...@apache.org.
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 1d374ad765edbda012a63ad40e701d6e47812bb8
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 2 08:33:33 2019 +0200
Removed unused imports
---
.../org/apache/camel/component/thrift/ThriftConsumerSecurityTest.java | 1 -
.../org/apache/camel/component/thrift/ThriftProducerSecurityTest.java | 1 -
2 files changed, 2 deletions(-)
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSecurityTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSecurityTest.java
index 96f1df0..74626cd 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSecurityTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftConsumerSecurityTest.java
@@ -23,7 +23,6 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.thrift.generated.Calculator;
import org.apache.camel.component.thrift.generated.Operation;
import org.apache.camel.component.thrift.generated.Work;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
import org.apache.camel.support.jsse.KeyManagersParameters;
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSecurityTest.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSecurityTest.java
index d5f83b9..c9b4114 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSecurityTest.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/ThriftProducerSecurityTest.java
@@ -31,7 +31,6 @@ import org.apache.camel.component.thrift.generated.InvalidOperation;
import org.apache.camel.component.thrift.generated.Operation;
import org.apache.camel.component.thrift.generated.Work;
import org.apache.camel.component.thrift.impl.CalculatorSyncServerImpl;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.SimpleRegistry;
import org.apache.camel.support.jsse.KeyStoreParameters;