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 a3a550cb78f468ac575d8b281e50d076945c3673
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Mon Jul 29 14:37:24 2019 +0200
Camel-Mina2: Fixed CS
---
.../org/apache/camel/component/mina2/BaseMina2Test.java | 11 +++++++----
.../apache/camel/component/mina2/Mina2CustomCodecTest.java | 13 ++++++-------
.../component/mina2/Mina2NoResponseFromServerTest.java | 14 ++++++--------
.../camel/component/mina2/Mina2VMCustomCodecTest.java | 11 +++++------
4 files changed, 24 insertions(+), 25 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 ffca065..30c366e 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;
@@ -28,7 +29,7 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.BeforeClass;
public class BaseMina2Test extends CamelTestSupport {
-
+
protected static final String KEY_STORE_PASSWORD = "changeit";
private static volatile int port;
@@ -45,7 +46,7 @@ public class BaseMina2Test extends CamelTestSupport {
protected int getPort() {
return port;
}
-
+
protected boolean isUseSslContext() {
return false;
}
@@ -63,8 +64,10 @@ public class BaseMina2Test extends CamelTestSupport {
TrustManagersParameters tmp = new TrustManagersParameters();
tmp.setKeyStore(ksp);
- // NOTE: Needed since the client uses a loose trust configuration when
no ssl context
- // is provided. We turn on WANT client-auth to prefer using
authentication
+ // NOTE: Needed since the client uses a loose trust configuration when
+ // no ssl context
+ // is provided. We turn on WANT client-auth to prefer using
+ // authentication
SSLContextServerParameters scsp = new SSLContextServerParameters();
scsp.setClientAuthentication(ClientAuthentication.WANT.name());
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 fa9f883..aab0ecb 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
@@ -36,10 +36,10 @@ import org.junit.Test;
* Unit test with custom codec.
*/
public class Mina2CustomCodecTest extends BaseMina2Test {
-
- @BindToRegistry("myCodec")
- private MyCodec codec1 = new MyCodec();
-
+
+ @BindToRegistry("myCodec")
+ private MyCodec codec1 = new MyCodec();
+
@BindToRegistry("failingCodec")
private MyCodec codec2 = new MyCodec(true);
@@ -136,10 +136,9 @@ public class Mina2CustomCodecTest extends BaseMina2Test {
return new ProtocolEncoder() {
@Override
- public void encode(IoSession ioSession, Object message,
ProtocolEncoderOutput out)
- throws Exception {
+ public void encode(IoSession ioSession, Object message,
ProtocolEncoderOutput out) throws Exception {
IoBuffer bb = IoBuffer.allocate(32).setAutoExpand(true);
- String s = (String) message;
+ String s = (String)message;
bb.put(s.getBytes("US-ASCII"));
bb.flip();
out.write(bb);
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 d9dfa84..074c5ac 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
@@ -32,10 +32,11 @@ import org.apache.mina.filter.codec.ProtocolEncoderOutput;
import org.junit.Test;
/**
- * Unit test to test what happens if remote server closes session but doesn't
reply
+ * 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();
@@ -68,8 +69,7 @@ public class Mina2NoResponseFromServerTest extends
BaseMina2Test {
public ProtocolEncoder getEncoder(IoSession session) throws Exception {
return new ProtocolEncoder() {
- public void encode(IoSession ioSession, Object message,
ProtocolEncoderOutput out)
- throws Exception {
+ public void encode(IoSession ioSession, Object message,
ProtocolEncoderOutput out) throws Exception {
// close session instead of returning a reply
ioSession.closeNow();
}
@@ -84,14 +84,12 @@ public class Mina2NoResponseFromServerTest extends
BaseMina2Test {
public ProtocolDecoder getDecoder(IoSession session) throws Exception {
return new ProtocolDecoder() {
- public void decode(IoSession ioSession, IoBuffer in,
- ProtocolDecoderOutput out) throws Exception
{
+ public void decode(IoSession ioSession, IoBuffer in,
ProtocolDecoderOutput out) throws Exception {
// close session instead of returning a reply
ioSession.closeNow();
}
- public void finishDecode(IoSession ioSession,
ProtocolDecoderOutput protocolDecoderOutput)
- throws Exception {
+ public void finishDecode(IoSession ioSession,
ProtocolDecoderOutput protocolDecoderOutput) throws Exception {
// do nothing
}
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 0778b34..3936be9 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
@@ -35,10 +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");
@@ -97,10 +97,9 @@ public class Mina2VMCustomCodecTest extends BaseMina2Test {
public ProtocolEncoder getEncoder(IoSession is) throws Exception {
return new ProtocolEncoder() {
- public void encode(IoSession ioSession, Object message,
ProtocolEncoderOutput out)
- throws Exception {
+ public void encode(IoSession ioSession, Object message,
ProtocolEncoderOutput out) throws Exception {
IoBuffer bb = IoBuffer.allocate(32).setAutoExpand(true);
- String s = (String) message;
+ String s = (String)message;
bb.put(s.getBytes("US-ASCII"));
bb.flip();
out.write(bb);
@@ -130,4 +129,4 @@ public class Mina2VMCustomCodecTest extends BaseMina2Test {
};
}
}
-}
\ No newline at end of file
+}
