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 2931c66 Polished
2931c66 is described below
commit 2931c66abe2405556a4ed54c560d035cf4192855
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Jul 29 07:50:36 2019 +0200
Polished
---
.../src/main/java/org/apache/camel/spi/InterceptStrategy.java | 4 ----
.../src/test/java/org/apache/camel/issues/TwoTimerWithJMXIssue.java | 5 ++++-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/InterceptStrategy.java
b/core/camel-api/src/main/java/org/apache/camel/spi/InterceptStrategy.java
index 72e814b..581f9c9 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/InterceptStrategy.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/InterceptStrategy.java
@@ -25,8 +25,6 @@ import org.apache.camel.Processor;
* processors in a route with interceptors. For example, a possible
* usecase is to gather performance statistics at the processor's level.
* <p/>
- * <b>Important: </b> This SPI is not intended to be used by Camel end users -
do NOT use this.
- * <p/>
* Its <b>strongly</b> adviced to use an {@link
org.apache.camel.AsyncProcessor} as the returned wrapped
* {@link Processor} which ensures the interceptor works well with the
asynchronous routing engine.
* You can use the {@link org.apache.camel.processor.DelegateAsyncProcessor}
to easily return an
@@ -36,8 +34,6 @@ import org.apache.camel.Processor;
*/
public interface InterceptStrategy {
- // TODO: Camel 3.0 make this an internal API
-
/**
* This method is invoked by
* {@link
org.apache.camel.model.ProcessorDefinition#wrapProcessor(RouteContext,
Processor)}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/TwoTimerWithJMXIssue.java
b/core/camel-core/src/test/java/org/apache/camel/issues/TwoTimerWithJMXIssue.java
index 7ddc20d..c62c77c 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/TwoTimerWithJMXIssue.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/TwoTimerWithJMXIssue.java
@@ -24,6 +24,7 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.InterceptStrategy;
+import org.junit.Test;
/**
* Trying to reproduce CAMEL-927.
@@ -38,6 +39,7 @@ public class TwoTimerWithJMXIssue extends ContextTestSupport {
return true;
}
+ @Test
public void testFromWithNoOutputs() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(2);
@@ -53,7 +55,8 @@ public class TwoTimerWithJMXIssue extends ContextTestSupport {
public void configure() throws Exception {
context.adapt(ExtendedCamelContext.class).addInterceptStrategy(new MyTracer());
-
from("timer://kickoff_1?period=250").from("timer://kickoff_2?period=250&delay=10").to("mock:result");
+ from("timer://kickoff_1?period=250").to("mock:result");
+
from("timer://kickoff_2?period=250&delay=10").to("mock:result");
}
};
}
