This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new d5af3f7 CAMEL-13164: camel3 - Remove includeRoutes on RouteBuilder
d5af3f7 is described below
commit d5af3f781d6dd8c3dcf95bf5a73f938eb6da6051
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Feb 6 10:00:55 2019 +0100
CAMEL-13164: camel3 - Remove includeRoutes on RouteBuilder
---
MIGRATION.md | 2 +
.../camel/builder/RecordableInputStream.java | 3 +-
.../org/apache/camel/builder/RecordableReader.java | 3 +-
.../org/apache/camel/builder/RouteBuilder.java | 28 +----------
.../RouteBuilderAddRoutesOnlyInterceptTest.java | 8 +---
.../camel/builder/RouteBuilderAddRoutesTest.java | 12 ++---
.../camel/builder/xml/NodeListToDocumentTest.java | 54 ----------------------
.../component/rest/FromRestConfigurationTest.java | 6 +--
8 files changed, 13 insertions(+), 103 deletions(-)
diff --git a/MIGRATION.md b/MIGRATION.md
index 29222fb..8d4a821 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -66,6 +66,8 @@ The getter/setter for `bindingMode` on `RestEndpoint` has
been changed to use ty
The `activemq-camel` component has been moved from ActiveMQ into Camel and it
is now called `camel-activemq`, the package has been changed accordingly to
`org.apache.camel.component.activemq`
+The method `includeRoutes` on `RouteBuilder` has been removed. This
functionality was not fully in use and was deprecated in Camel 2.x.
+
#### Generic Classes
The class `JNDIContext` has been moved from
`org.apache.camel.util.jndi.JNDIContext` in the camel-core JAR to
`org.apache.camel.support.jndi.JNDIContext` and moved to the `camel-support`
JAR.
diff --git
a/core/camel-core/src/main/java/org/apache/camel/builder/RecordableInputStream.java
b/core/camel-core/src/main/java/org/apache/camel/builder/RecordableInputStream.java
index 1dac498..4a4fcee 100644
---
a/core/camel-core/src/main/java/org/apache/camel/builder/RecordableInputStream.java
+++
b/core/camel-core/src/main/java/org/apache/camel/builder/RecordableInputStream.java
@@ -30,7 +30,8 @@ class RecordableInputStream extends FilterInputStream {
private TrimmableByteArrayOutputStream buf;
private String charset;
private boolean recording;
- protected RecordableInputStream(InputStream in, String charset) {
+
+ RecordableInputStream(InputStream in, String charset) {
super(in);
this.buf = new TrimmableByteArrayOutputStream();
this.charset = charset;
diff --git
a/core/camel-core/src/main/java/org/apache/camel/builder/RecordableReader.java
b/core/camel-core/src/main/java/org/apache/camel/builder/RecordableReader.java
index 45fb584..e05bd6f 100644
---
a/core/camel-core/src/main/java/org/apache/camel/builder/RecordableReader.java
+++
b/core/camel-core/src/main/java/org/apache/camel/builder/RecordableReader.java
@@ -28,7 +28,8 @@ import java.io.Reader;
class RecordableReader extends FilterReader {
private TrimmableCharArrayWriter buf;
private boolean recording;
- protected RecordableReader(Reader in) {
+
+ RecordableReader(Reader in) {
super(in);
this.buf = new TrimmableCharArrayWriter();
this.recording = true;
diff --git
a/core/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
b/core/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
index 1277641..6cac0ce 100644
--- a/core/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
@@ -396,33 +396,7 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
restCollection.setCamelContext(context);
return restCollection;
}
-
- /**
- * Includes the routes from the build to this builder.
- * <p/>
- * This allows you to use other builds as route templates.
- * @param routes other builder with routes to include
- *
- * @throws Exception can be thrown during configuration
- */
- public void includeRoutes(RoutesBuilder routes) throws Exception {
- // TODO: We should support including multiple routes so I think
invoking configure()
- // needs to be deferred to later
- if (routes instanceof RouteBuilder) {
- // if its a RouteBuilder then let it use my route collection and
error handler
- // then we are integrated seamless
- RouteBuilder builder = (RouteBuilder) routes;
- builder.setContext(this.getContext());
- builder.setRouteCollection(this.getRouteCollection());
- builder.setRestCollection(this.getRestCollection());
- builder.setErrorHandlerBuilder(this.getErrorHandlerBuilder());
- // must invoke configure on the original builder so it adds its
configuration to me
- builder.configure();
- } else {
- getContext().addRoutes(routes);
- }
- }
-
+
@Override
public void setErrorHandlerBuilder(ErrorHandlerBuilder
errorHandlerBuilder) {
super.setErrorHandlerBuilder(errorHandlerBuilder);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesOnlyInterceptTest.java
b/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesOnlyInterceptTest.java
index fbce18f..7d80f2f 100644
---
a/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesOnlyInterceptTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesOnlyInterceptTest.java
@@ -26,7 +26,7 @@ public class RouteBuilderAddRoutesOnlyInterceptTest extends
ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- includeRoutes(new MyExtraRoute());
+ interceptSendToEndpoint("mock:result").transform(constant("Foo
was here"));
from("direct:start").to("mock:result");
}
@@ -42,10 +42,4 @@ public class RouteBuilderAddRoutesOnlyInterceptTest extends
ContextTestSupport {
assertMockEndpointsSatisfied();
}
- private static class MyExtraRoute extends RouteBuilder {
-
- public void configure() throws Exception {
- interceptSendToEndpoint("mock:result").transform(constant("Foo was
here"));
- }
- }
}
\ No newline at end of file
diff --git
a/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesTest.java
b/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesTest.java
index 4554807..b823ce2 100644
---
a/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderAddRoutesTest.java
@@ -26,7 +26,9 @@ public class RouteBuilderAddRoutesTest extends
ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- includeRoutes(new MyExtraRoute());
+ interceptSendToEndpoint("mock:result").transform(constant("Foo
was here"));
+
+ from("direct:foo").to("mock:foo");
from("direct:start").to("mock:result");
}
@@ -44,12 +46,4 @@ public class RouteBuilderAddRoutesTest extends
ContextTestSupport {
assertMockEndpointsSatisfied();
}
- private static class MyExtraRoute extends RouteBuilder {
-
- public void configure() throws Exception {
- interceptSendToEndpoint("mock:result").transform(constant("Foo was
here"));
-
- from("direct:foo").to("mock:foo");
- }
- }
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/builder/xml/NodeListToDocumentTest.java
b/core/camel-core/src/test/java/org/apache/camel/builder/xml/NodeListToDocumentTest.java
deleted file mode 100644
index 88a94fe..0000000
---
a/core/camel-core/src/test/java/org/apache/camel/builder/xml/NodeListToDocumentTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.builder.xml;
-
-import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Exchange;
-import org.junit.Ignore;
-//import com.sun.org.apache.xerces.internal.dom.ElementNSImpl;
-import org.junit.Test;
-
-@Ignore("For manual testing CAMEL-6922")
-public class NodeListToDocumentTest extends ContextTestSupport {
-
- @Override
- public boolean isUseRouteBuilder() {
- return false;
- }
-
- @Test
- public void testXPathNodeResultToDocument() throws Exception {
- // TODO: uses an internal nexus class which can only be tested on some
platforms
- /*
- Object result =
xpath("/foo").nodeResult().evaluate(createExchange("<foo><bar>1</bar><bar>2</bar></foo>"));
- ElementNSImpl el = assertIsInstanceOf(ElementNSImpl.class, result);
- assertNotNull(el);
- NodeList nodeList = (NodeList) el;
- assertEquals(0, nodeList.getLength());
- Document doc = context.getTypeConverter().convertTo(Document.class,
nodeList);
- assertNotNull(doc);
- assertEquals("foo", doc.getFirstChild().getLocalName());
- */
- }
-
- protected Exchange createExchange(Object xml) {
- Exchange exchange = createExchangeWithBody(context, xml);
- exchange.getIn().setHeader("name", "James");
- return exchange;
- }
-
-}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestConfigurationTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestConfigurationTest.java
index 66cdff9..4bb1074 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestConfigurationTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestConfigurationTest.java
@@ -33,8 +33,6 @@ public class FromRestConfigurationTest extends
FromRestGetTest {
@Override
@Test
public void testFromRestModel() throws Exception {
- super.testFromRestModel();
-
assertEquals("dummy-rest",
context.getRestConfiguration().getComponent());
assertEquals("localhost", context.getRestConfiguration().getHost());
assertEquals(9090, context.getRestConfiguration().getPort());
@@ -52,7 +50,6 @@ public class FromRestConfigurationTest extends
FromRestGetTest {
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
- final RouteBuilder lowerR = super.createRouteBuilder();
return new RouteBuilder() {
@Override
public void configure() throws Exception {
@@ -63,7 +60,8 @@ public class FromRestConfigurationTest extends
FromRestGetTest {
.consumerProperty("pollTimeout", "1000")
.consumerProperty("dummy", "#myDummy");
- includeRoutes(lowerR);
+ rest("/say/hello")
+ .get().to("log:hello");
}
};
}
