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 c1ef314fff491be523be4a30407e766464466070
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Mon Jul 29 14:32:29 2019 +0200
Camel-mina2 - Use BindToRegistry annotation wherever possible
---
.../apache/camel/component/mina2/BaseMina2Test.java | 18 +++---------------
.../camel/component/mina2/Mina2CustomCodecTest.java | 15 +++++++--------
.../component/mina2/Mina2NoResponseFromServerTest.java | 10 ++++------
.../camel/component/mina2/Mina2VMCustomCodecTest.java | 12 +++++-------
4 files changed, 19 insertions(+), 36 deletions(-)
diff --git
a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/BaseMina2Test.java
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/BaseMina2Test.java
index 7a12bfc..ffca065 100644
---
a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/BaseMina2Test.java
+++
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/BaseMina2Test.java
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.camel.component.mina2;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.support.jsse.ClientAuthentication;
import org.apache.camel.support.jsse.KeyManagersParameters;
@@ -49,21 +50,8 @@ public class BaseMina2Test extends CamelTestSupport {
return false;
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry reg = super.createRegistry();
-
- if (isUseSslContext()) {
- addSslContextParametersToRegistry(reg);
- }
- return reg;
- }
-
- protected void addSslContextParametersToRegistry(JndiRegistry registry) {
- registry.bind("sslContextParameters", createSslContextParameters());
- }
-
- protected SSLContextParameters createSslContextParameters() {
+ @BindToRegistry("sslContextParameters")
+ public SSLContextParameters createSslContextParameters() {
KeyStoreParameters ksp = new KeyStoreParameters();
ksp.setResource(this.getClass().getClassLoader().getResource("jsse/localhost.ks").toString());
ksp.setPassword(KEY_STORE_PASSWORD);
diff --git
a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
index a2017fe..fa9f883 100644
---
a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
+++
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2CustomCodecTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.mina2;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.builder.RouteBuilder;
@@ -35,6 +36,12 @@ import org.junit.Test;
* Unit test with custom codec.
*/
public class Mina2CustomCodecTest extends BaseMina2Test {
+
+ @BindToRegistry("myCodec")
+ private MyCodec codec1 = new MyCodec();
+
+ @BindToRegistry("failingCodec")
+ private MyCodec codec2 = new MyCodec(true);
@Test
public void testMyCodec() throws Exception {
@@ -102,14 +109,6 @@ public class Mina2CustomCodecTest extends BaseMina2Test {
}
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("myCodec", new MyCodec());
- jndi.bind("failingCodec", new MyCodec(true));
- return jndi;
- }
-
- @Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
diff --git
a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2NoResponseFromServerTest.java
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2NoResponseFromServerTest.java
index 1fb2c38..d9dfa84 100644
---
a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2NoResponseFromServerTest.java
+++
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2NoResponseFromServerTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.mina2;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelExchangeException;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
@@ -34,6 +35,9 @@ import org.junit.Test;
* Unit test to test what happens if remote server closes session but doesn't
reply
*/
public class Mina2NoResponseFromServerTest extends BaseMina2Test {
+
+ @BindToRegistry("myCodec")
+ private MyCodec codec1 = new MyCodec();
@Test
public void testNoResponse() throws Exception {
@@ -50,12 +54,6 @@ public class Mina2NoResponseFromServerTest extends
BaseMina2Test {
mock.assertIsSatisfied();
}
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("myCodec", new MyCodec());
- return jndi;
- }
-
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
diff --git
a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VMCustomCodecTest.java
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VMCustomCodecTest.java
index e7dfaef..0778b34 100644
---
a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VMCustomCodecTest.java
+++
b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2VMCustomCodecTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.mina2;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -34,7 +35,10 @@ import org.junit.Test;
* Unit test with custom codec using the VM protocol.
*/
public class Mina2VMCustomCodecTest extends BaseMina2Test {
-
+
+ @BindToRegistry("myCodec")
+ private MyCodec codec1 = new MyCodec();
+
@Test
public void testMyCodec() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
@@ -78,12 +82,6 @@ public class Mina2VMCustomCodecTest extends BaseMina2Test {
}
}
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("myCodec", new MyCodec());
- return jndi;
- }
-
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
