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/08 11:16:37 UTC
[camel] 12/21: CAMEL-13792 - Rename components to default names,
Camel-netty4-http to camel-netty-http - Fixed refs and
camel-route-parser tests
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 9c715f798811f010cdeb0a30a7a35c1d1acb56c9
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Aug 8 12:24:15 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-netty4-http to camel-netty-http - Fixed refs and camel-route-parser tests
---
.../java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java | 2 +-
.../src/test/java/org/apache/camel/parser/java/MyCdiRouteBuilder.java | 2 +-
.../camel/parser/java/RoasterCdiConcatRouteBuilderConfigureTest.java | 2 +-
.../apache/camel/parser/java/RoasterCdiRouteBuilderConfigureTest.java | 2 +-
.../java/org/apache/camel/parser/java/RoasterEndpointInjectTest.java | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java
index 671b23a..7e50225 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java
@@ -36,7 +36,7 @@ public class MyCdiConcatRouteBuilder extends RouteBuilder {
@Uri("log:a")
private Endpoint loga;
- @EndpointInject("netty4-http:http:someserver:" + PORT + "/hello")
+ @EndpointInject("netty-http:http:someserver:" + PORT + "/hello")
private Endpoint mynetty;
@Override
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiRouteBuilder.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiRouteBuilder.java
index cd8bacc..bb033e1 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiRouteBuilder.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiRouteBuilder.java
@@ -33,7 +33,7 @@ public class MyCdiRouteBuilder extends RouteBuilder {
private Endpoint loga;
@Inject
- @Uri("netty4-http:http:someserver:80/hello")
+ @Uri("netty-http:http:someserver:80/hello")
private Endpoint mynetty;
@Override
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterCdiConcatRouteBuilderConfigureTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterCdiConcatRouteBuilderConfigureTest.java
index 41716aa..424e3f5 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterCdiConcatRouteBuilderConfigureTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterCdiConcatRouteBuilderConfigureTest.java
@@ -49,7 +49,7 @@ public class RoasterCdiConcatRouteBuilderConfigureTest {
LOG.info("Producer: " + result.getElement());
}
Assert.assertEquals("log:a", list.get(0).getElement());
- Assert.assertEquals("netty4-http:http:someserver:80/hello", list.get(1).getElement());
+ Assert.assertEquals("netty-http:http:someserver:80/hello", list.get(1).getElement());
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterCdiRouteBuilderConfigureTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterCdiRouteBuilderConfigureTest.java
index b1b97fb..b47a43f 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterCdiRouteBuilderConfigureTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterCdiRouteBuilderConfigureTest.java
@@ -49,7 +49,7 @@ public class RoasterCdiRouteBuilderConfigureTest {
LOG.info("Producer: " + result.getElement());
}
Assert.assertEquals("log:a", list.get(0).getElement());
- Assert.assertEquals("netty4-http:http:someserver:80/hello", list.get(1).getElement());
+ Assert.assertEquals("netty-http:http:someserver:80/hello", list.get(1).getElement());
}
}
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterEndpointInjectTest.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterEndpointInjectTest.java
index 5d4619d..0e06268 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterEndpointInjectTest.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/RoasterEndpointInjectTest.java
@@ -57,7 +57,7 @@ public class RoasterEndpointInjectTest {
Assert.assertEquals(1144, details.get(1).getAbsolutePosition());
Assert.assertEquals(10, details.get(1).getLinePosition());
- Assert.assertEquals("netty4-http:http:someserver:80/hello", details.get(2).getEndpointUri());
+ Assert.assertEquals("netty-http:http:someserver:80/hello", details.get(2).getEndpointUri());
Assert.assertEquals("36", details.get(2).getLineNumber());
Assert.assertEquals("36", details.get(2).getLineNumberEnd());
Assert.assertEquals(1202, details.get(2).getAbsolutePosition());
@@ -67,7 +67,7 @@ public class RoasterEndpointInjectTest {
Assert.assertEquals("mock:foo?retainFirst=1", details.get(6).getEndpointUri());
Assert.assertEquals("45", details.get(6).getLineNumber());
Assert.assertEquals("46", details.get(6).getLineNumberEnd());
- Assert.assertEquals(1456, details.get(6).getAbsolutePosition());
+ Assert.assertEquals(1455, details.get(6).getAbsolutePosition());
Assert.assertEquals(17, details.get(6).getLinePosition());
List<ParserResult> list = CamelJavaParserHelper.parseCamelConsumerUris(method, true, true);