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 dc410a7b3984623824653f1dcd1534607a537798
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Wed Aug 7 13:06:34 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-netty4 to
camel-netty - Fixed syslog tests
---
.../java/org/apache/camel/component/syslog/NettyDataFormatTest.java | 4 ++--
.../org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java | 2 +-
.../apache/camel/component/syslog/NettyRfc5425LongMessageTest.java | 2 +-
.../test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java | 2 +-
.../org/apache/camel/component/syslog/applicationContext-Netty.xml | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
index ab2bd2d..244089e 100644
---
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
+++
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java
@@ -78,7 +78,7 @@ public class NettyDataFormatTest extends CamelTestSupport {
mock2.expectedMessageCount(1);
mock2.expectedBodiesReceived(message);
- template.sendBody("netty4:udp://127.0.0.1:" + serverPort +
"?sync=false&allowDefaultCodec=false&useByteBuf=true", message);
+ template.sendBody("netty:udp://127.0.0.1:" + serverPort +
"?sync=false&allowDefaultCodec=false&useByteBuf=true", message);
assertMockEndpointsSatisfied();
}
@@ -92,7 +92,7 @@ public class NettyDataFormatTest extends CamelTestSupport {
DataFormat syslogDataFormat = new SyslogDataFormat();
// we setup a Syslog listener on a random port.
- from("netty4:udp://127.0.0.1:" + serverPort +
"?sync=false&allowDefaultCodec=false").unmarshal(syslogDataFormat)
+ from("netty:udp://127.0.0.1:" + serverPort +
"?sync=false&allowDefaultCodec=false").unmarshal(syslogDataFormat)
.process(new Processor() {
public void process(Exchange ex) {
assertTrue(ex.getIn().getBody() instanceof
SyslogMessage);
diff --git
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
index 50f4943..48cb9aa 100644
---
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
+++
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyManyUDPMessagesTest.java
@@ -75,7 +75,7 @@ public class NettyManyUDPMessagesTest extends
CamelTestSupport {
DataFormat syslogDataFormat = new SyslogDataFormat();
// we setup a Syslog listener on a random port.
- from("netty4:udp://127.0.0.1:" + serverPort +
"?sync=false&allowDefaultCodec=false").unmarshal(syslogDataFormat)
+ from("netty:udp://127.0.0.1:" + serverPort +
"?sync=false&allowDefaultCodec=false").unmarshal(syslogDataFormat)
.process(new Processor() {
public void process(Exchange ex) {
assertTrue(ex.getIn().getBody() instanceof
SyslogMessage);
diff --git
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java
index f9340d0..35715c9 100644
---
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java
+++
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java
@@ -56,7 +56,7 @@ public class NettyRfc5425LongMessageTest extends
CamelTestSupport {
@BeforeClass
public static void initPort() {
serverPort = AvailablePortFinder.getNextAvailable();
- uri = "netty4:tcp://localhost:" + serverPort +
"?sync=false&allowDefaultCodec=false&decoders=#decoder&encoder=#encoder";
+ uri = "netty:tcp://localhost:" + serverPort +
"?sync=false&allowDefaultCodec=false&decoders=#decoder&encoder=#encoder";
}
@Test
diff --git
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java
index 4a37351..f99fb9a 100644
---
a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java
+++
b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java
@@ -48,7 +48,7 @@ public class NettyRfc5425Test extends CamelTestSupport {
@BeforeClass
public static void initPort() {
serverPort = AvailablePortFinder.getNextAvailable();
- uri = "netty4:tcp://localhost:" + serverPort +
"?sync=false&allowDefaultCodec=false&decoders=#decoder&encoder=#encoder";
+ uri = "netty:tcp://localhost:" + serverPort +
"?sync=false&allowDefaultCodec=false&decoders=#decoder&encoder=#encoder";
uriClient = uri + "&useByteBuf=true";
}
diff --git
a/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/applicationContext-Netty.xml
b/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/applicationContext-Netty.xml
index b0e175f..08506d4 100644
---
a/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/applicationContext-Netty.xml
+++
b/components/camel-syslog/src/test/resources/org/apache/camel/component/syslog/applicationContext-Netty.xml
@@ -33,7 +33,7 @@
</dataFormats>
<route>
- <from
uri="netty4:udp://localhost:{{server-port}}?sync=false&allowDefaultCodec=false"/>
+ <from
uri="netty:udp://localhost:{{server-port}}?sync=false&allowDefaultCodec=false"/>
<unmarshal><custom ref="mySyslog"/></unmarshal>
<to uri="mock:stop1"/>
<marshal><custom ref="mySyslog"/></marshal>
