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 29bd41b11f50e9b06c20b2effd48e2970ff5b5fc
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Wed Aug 7 14:21:36 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-netty4 to
camel-netty - Fixed hl7 tests
---
.../camel/component/hl7/HL7MLLPNettyCodecBoundaryTest.java | 4 ++--
.../component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java | 10 +++++-----
.../apache/camel/component/hl7/HL7MLLPNettyCodecLongTest.java | 4 ++--
.../component/hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java | 4 ++--
.../org/apache/camel/component/hl7/HL7MLLPNettyCodecTest.java | 4 ++--
.../component/hl7/HL7MLLPNettyDecoderResourceLeakTest.java | 4 ++--
.../apache/camel/component/hl7/HL7MLLPNettyRouteToTest.java | 4 ++--
.../java/org/apache/camel/component/hl7/HL7NettyRouteTest.java | 8 ++++----
8 files changed, 21 insertions(+), 21 deletions(-)
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecBoundaryTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecBoundaryTest.java
index 2f606c6..f785287 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecBoundaryTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecBoundaryTest.java
@@ -56,7 +56,7 @@ public class HL7MLLPNettyCodecBoundaryTest extends
HL7TestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty4:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoder=#hl7decoder&encoder=#hl7encoder").process(new Processor() {
+ from("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoder=#hl7decoder&encoder=#hl7encoder").process(new Processor() {
public void process(Exchange exchange) throws Exception {
// check presence of correct message type
exchange.getIn().getBody(MDM_T02.class);
@@ -80,7 +80,7 @@ public class HL7MLLPNettyCodecBoundaryTest extends
HL7TestSupport {
assertEquals(1022, message.length());
MockEndpoint mockEndpoint = getMockEndpoint("mock:result");
mockEndpoint.expectedMessageCount(1);
- template.requestBody("netty4:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", message);
+ template.requestBody("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", message);
mockEndpoint.assertIsSatisfied();
}
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java
index 3742064..4f9b451 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecByteArrayRouteTest.java
@@ -32,7 +32,7 @@ import org.apache.camel.spi.DataFormat;
import org.junit.Test;
/**
- * Unit test for HL7 routing where the netty4 endpoint passes on a byte array
+ * Unit test for HL7 routing where the netty endpoint passes on a byte array
* instead of a string and leaves charset interpretation to the dataformat.
*/
public class HL7MLLPNettyCodecByteArrayRouteTest extends HL7TestSupport {
@@ -65,7 +65,7 @@ public class HL7MLLPNettyCodecByteArrayRouteTest extends
HL7TestSupport {
in.append("\r");
in.append(line2);
- String out = template.requestBody("netty4:tcp://127.0.0.1:" +
getPort() + "?sync=true&encoder=#hl7encoder&decoder=#hl7decoder",
in.toString(), String.class);
+ String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort()
+ "?sync=true&encoder=#hl7encoder&decoder=#hl7decoder", in.toString(),
String.class);
String[] lines = out.split("\r");
assertEquals("MSH|^~\\&|MYSENDER||||200701011539||ADR^A19||||123|||||UNICODE
UTF-8", lines[0]);
@@ -88,7 +88,7 @@ public class HL7MLLPNettyCodecByteArrayRouteTest extends
HL7TestSupport {
in.append("\r");
in.append(line2);
- String out = template.requestBody("netty4:tcp://127.0.0.1:" +
getPort() + "?sync=true&encoder=#hl7encoder&decoder=#hl7decoder",
in.toString(), String.class);
+ String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort()
+ "?sync=true&encoder=#hl7encoder&decoder=#hl7decoder", in.toString(),
String.class);
String[] lines = out.split("\r");
assertEquals("MSH|^~\\&|MYSENDER||||200701011539||ADT^A01||||123|||||UNICODE
UTF-8", lines[0]);
assertEquals("PID|||123||Döe^John", lines[1]);
@@ -110,7 +110,7 @@ public class HL7MLLPNettyCodecByteArrayRouteTest extends
HL7TestSupport {
in.append("\r");
in.append(line2);
- template.requestBody("netty4:tcp://127.0.0.1:" + getPort() +
"?sync=true&encoder=#hl7encoder&decoder=#hl7decoder", in.toString());
+ template.requestBody("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&encoder=#hl7encoder&decoder=#hl7decoder", in.toString());
assertMockEndpointsSatisfied();
}
@@ -123,7 +123,7 @@ public class HL7MLLPNettyCodecByteArrayRouteTest extends
HL7TestSupport {
DataFormat hl7 = new HL7DataFormat();
// we setup or HL7 listener on port 8888 (using the hl7codec)
// and in sync mode so we can return a response
- from("netty4:tcp://127.0.0.1:" + getPort() +
"?sync=true&encoder=#hl7encoder&decoder=#hl7decoder")
+ from("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&encoder=#hl7encoder&decoder=#hl7decoder")
// we use the HL7 data format to unmarshal from HL7 stream
// to the HAPI Message model
// this ensures that the camel message has been enriched
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecLongTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecLongTest.java
index f61a884..801d7b5 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecLongTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecLongTest.java
@@ -55,7 +55,7 @@ public class HL7MLLPNettyCodecLongTest extends HL7TestSupport
{
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty4:tcp://127.0.0.1:" + getPort() +
"?sync=true&encoder=#hl7encoder&decoder=#hl7decoder").process(new Processor() {
+ from("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&encoder=#hl7encoder&decoder=#hl7decoder").process(new Processor() {
public void process(Exchange exchange) throws Exception {
assertEquals(70010,
exchange.getIn().getBody(byte[].class).length);
MDM_T02 input =
(MDM_T02)exchange.getIn().getBody(Message.class);
@@ -82,7 +82,7 @@ public class HL7MLLPNettyCodecLongTest extends HL7TestSupport
{
}
message = message.substring(0, message.length() - 1);
assertEquals(70010, message.length());
- String out = template.requestBody("netty4:tcp://127.0.0.1:" +
getPort() + "?sync=true&encoder=#hl7encoder&decoder=#hl7decoder", message,
String.class);
+ String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort()
+ "?sync=true&encoder=#hl7encoder&decoder=#hl7decoder", message, String.class);
assertEquals("some response", out);
// END SNIPPET: e2
}
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java
index b877a92..07ee84b 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecStandAndEndBytesTest.java
@@ -63,7 +63,7 @@ public class HL7MLLPNettyCodecStandAndEndBytesTest extends
HL7TestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty4:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoder=#hl7decoder&encoder=#hl7encoder").process(new Processor() {
+ from("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoder=#hl7decoder&encoder=#hl7encoder").process(new Processor() {
public void process(Exchange exchange) throws Exception {
Message input =
exchange.getIn().getBody(Message.class);
@@ -89,7 +89,7 @@ public class HL7MLLPNettyCodecStandAndEndBytesTest extends
HL7TestSupport {
in.append("\r");
in.append(line2);
- String out = template.requestBody("netty4:tcp://127.0.0.1:" +
getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder",
in.toString(), String.class);
+ String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort()
+ "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", in.toString(),
String.class);
String[] lines = out.split("\r");
assertEquals("MSH|^~\\&|MYSENDER||||200701011539||ADR^A19||||123",
lines[0]);
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecTest.java
index a226455..f7da10e1 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyCodecTest.java
@@ -55,7 +55,7 @@ public class HL7MLLPNettyCodecTest extends HL7TestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty4:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoder=#hl7decoder&encoder=#hl7encoder").process(new Processor() {
+ from("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoder=#hl7decoder&encoder=#hl7encoder").process(new Processor() {
public void process(Exchange exchange) throws Exception {
Message input =
exchange.getIn().getBody(Message.class);
@@ -82,7 +82,7 @@ public class HL7MLLPNettyCodecTest extends HL7TestSupport {
in.append("\n");
in.append(line2);
- String out = template.requestBody("netty4:tcp://127.0.0.1:" +
getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder",
in.toString(), String.class);
+ String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort()
+ "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", in.toString(),
String.class);
// END SNIPPET: e2
String[] lines = out.split("\r");
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyDecoderResourceLeakTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyDecoderResourceLeakTest.java
index a2e5173..28ca0a1 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyDecoderResourceLeakTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyDecoderResourceLeakTest.java
@@ -45,7 +45,7 @@ public class HL7MLLPNettyDecoderResourceLeakTest extends
HL7TestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("netty4:tcp://127.0.0.1:" + getPort() +
"?decoder=#hl7decoder&encoder=#hl7encoder").process(new Processor() {
+ from("netty:tcp://127.0.0.1:" + getPort() +
"?decoder=#hl7decoder&encoder=#hl7encoder").process(new Processor() {
public void process(Exchange exchange) throws Exception {
Message input =
exchange.getIn().getBody(Message.class);
exchange.getOut().setBody(input.generateACK());
@@ -60,7 +60,7 @@ public class HL7MLLPNettyDecoderResourceLeakTest extends
HL7TestSupport {
String message =
"MSH|^~\\&|MYSENDER|MYRECEIVER|MYAPPLICATION||200612211200||QRY^A19|1234|P|2.4";
for (int i = 0; i < 10; i++) {
- template.sendBody("netty4:tcp://127.0.0.1:" + getPort() +
"?decoder=#hl7decoder&encoder=#hl7encoder", message);
+ template.sendBody("netty:tcp://127.0.0.1:" + getPort() +
"?decoder=#hl7decoder&encoder=#hl7encoder", message);
}
}
}
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyRouteToTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyRouteToTest.java
index 6ced122..681d940 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyRouteToTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPNettyRouteToTest.java
@@ -55,12 +55,12 @@ public class HL7MLLPNettyRouteToTest extends HL7TestSupport
{
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("direct:start").to("netty4:tcp://127.0.0.1:" + getPort()
+ "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder")
+ from("direct:start").to("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoder=#hl7decoder&encoder=#hl7encoder")
// because HL7 message contains a bunch of control chars
// then the logger do not log all of the data
.log("HL7 message: ${body}").to("mock:result");
- from("netty4:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoder=#hl7decoder&encoder=#hl7encoder").process(new Processor() {
+ from("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoder=#hl7decoder&encoder=#hl7encoder").process(new Processor() {
public void process(Exchange exchange) throws Exception {
Message input =
exchange.getIn().getBody(Message.class);
diff --git
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7NettyRouteTest.java
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7NettyRouteTest.java
index d85bc71..ec5dcbb 100644
---
a/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7NettyRouteTest.java
+++
b/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7NettyRouteTest.java
@@ -69,7 +69,7 @@ public class HL7NettyRouteTest extends HL7TestSupport {
in.append("\r");
in.append(line2);
- String out = template.requestBody("netty4:tcp://127.0.0.1:" +
getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder",
in.toString(), String.class);
+ String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort()
+ "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", in.toString(),
String.class);
String[] lines = out.split("\r");
assertEquals("MSH|^~\\&|MYSENDER||||200701011539||ADR^A19||||123",
lines[0]);
@@ -92,7 +92,7 @@ public class HL7NettyRouteTest extends HL7TestSupport {
in.append("\r");
in.append(line2);
- String out = template.requestBody("netty4:tcp://127.0.0.1:" +
getPort() + "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder",
in.toString(), String.class);
+ String out = template.requestBody("netty:tcp://127.0.0.1:" + getPort()
+ "?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", in.toString(),
String.class);
String[] lines = out.split("\r");
assertEquals("MSH|^~\\&|MYSENDER||||200701011539||ADT^A01||||123",
lines[0]);
assertEquals("PID|||123||Doe^John", lines[1]);
@@ -114,7 +114,7 @@ public class HL7NettyRouteTest extends HL7TestSupport {
in.append("\r");
in.append(line2);
- template.requestBody("netty4:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", in.toString());
+ template.requestBody("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoder=#hl7decoder&encoder=#hl7encoder", in.toString());
assertMockEndpointsSatisfied();
}
@@ -127,7 +127,7 @@ public class HL7NettyRouteTest extends HL7TestSupport {
DataFormat hl7 = new HL7DataFormat();
// we setup or HL7 listener on port 8888 (using the hl7codec)
// and in sync mode so we can return a response
- from("netty4:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoder=#hl7decoder&encoder=#hl7encoder")
+ from("netty:tcp://127.0.0.1:" + getPort() +
"?sync=true&decoder=#hl7decoder&encoder=#hl7encoder")
// we use the HL7 data format to unmarshal from HL7 stream
// to the HAPI Message model
// this ensures that the camel message has been enriched
