You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2018/04/24 10:24:22 UTC
[camel] branch master updated (241f7bd -> db48967)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 241f7bd Fixed typos
new 623d620 CAMEL-12450: Added unit test sample how to do this today.
new db48967 Fixed CS
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../seda/SedaDefaultBlockWhenFullTest.java | 5 +-
.../camel/processor/PipelineStepWithEventTest.java | 210 +++++++++++++++++++++
2 files changed, 212 insertions(+), 3 deletions(-)
create mode 100644 camel-core/src/test/java/org/apache/camel/processor/PipelineStepWithEventTest.java
--
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.
[camel] 01/02: CAMEL-12450: Added unit test sample how to do this
today.
Posted by da...@apache.org.
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
commit 623d620ffa50460e240e1e0e01894e67fce0889c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Apr 24 12:23:23 2018 +0200
CAMEL-12450: Added unit test sample how to do this today.
---
.../camel/processor/PipelineStepWithEventTest.java | 210 +++++++++++++++++++++
1 file changed, 210 insertions(+)
diff --git a/camel-core/src/test/java/org/apache/camel/processor/PipelineStepWithEventTest.java b/camel-core/src/test/java/org/apache/camel/processor/PipelineStepWithEventTest.java
new file mode 100644
index 0000000..5f63c43
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/processor/PipelineStepWithEventTest.java
@@ -0,0 +1,210 @@
+/**
+ * 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.processor;
+
+import java.util.ArrayList;
+import java.util.EventObject;
+import java.util.List;
+
+import org.apache.camel.AsyncCallback;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.management.event.AbstractExchangeEvent;
+import org.apache.camel.model.PipelineDefinition;
+import org.apache.camel.model.ProcessorDefinition;
+import org.apache.camel.spi.InterceptStrategy;
+import org.apache.camel.support.ServiceSupport;
+import org.apache.camel.util.StopWatch;
+
+/**
+ * Test showing how you can use pipeline to group together statistics and implement your own event listener.
+ */
+public class PipelineStepWithEventTest extends ContextTestSupport {
+
+ private final MyStepEventListener listener = new MyStepEventListener();
+
+ public void testPipelineStep() throws Exception {
+ getMockEndpoint("mock:a").expectedMessageCount(1);
+ getMockEndpoint("mock:a2").expectedMessageCount(1);
+ getMockEndpoint("mock:b").expectedMessageCount(1);
+ getMockEndpoint("mock:b2").expectedMessageCount(1);
+ getMockEndpoint("mock:result").expectedMessageCount(1);
+
+ template.sendBody("direct:start", "Hello World");
+
+ assertMockEndpointsSatisfied();
+
+ assertEquals(4, listener.getEvents().size());
+
+ BeforeStepEvent event = (BeforeStepEvent) listener.getEvents().get(0);
+ assertEquals("step-a", event.getId());
+ AfterStepEvent event2 = (AfterStepEvent) listener.getEvents().get(1);
+ assertEquals("step-a", event2.getId());
+ assertTrue("Should take a little time", event2.getTimeTaken() > 0);
+ BeforeStepEvent event3 = (BeforeStepEvent) listener.getEvents().get(2);
+ assertEquals("step-b", event3.getId());
+ AfterStepEvent event4 = (AfterStepEvent) listener.getEvents().get(3);
+ assertEquals("step-b", event4.getId());
+ assertTrue("Should take a little time", event4.getTimeTaken() > 0);
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .pipeline().id("step-a")
+ .to("mock:a")
+ .delay(constant(10)).end() // a bit ugly by need to end delay
+ .to("mock:a2")
+ .end()
+ .pipeline().id("step-b")
+ .to("mock:b")
+ .delay(constant(20)).end() // a bit ugly by need to end delay
+ .to("mock:b2")
+ .end()
+ .to("mock:result");
+ }
+ };
+ }
+
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext context = super.createCamelContext();
+ context.addInterceptStrategy(new MyInterceptStrategy());
+ // register the event listener
+ context.addService(listener);
+ return context;
+ }
+
+ private interface StepEventListener {
+
+ void beforeStep(BeforeStepEvent event);
+
+ void afterStep(AfterStepEvent event);
+
+ }
+
+ private class MyStepEventListener extends ServiceSupport implements StepEventListener {
+
+ private final List<EventObject> events = new ArrayList<>();
+
+ @Override
+ public void beforeStep(BeforeStepEvent event) {
+ events.add(event);
+ }
+
+ @Override
+ public void afterStep(AfterStepEvent event) {
+ events.add(event);
+ }
+
+ public List<EventObject> getEvents() {
+ return events;
+ }
+
+ @Override
+ protected void doStart() throws Exception {
+ // noop
+ }
+
+ @Override
+ protected void doStop() throws Exception {
+ // noop
+ }
+ }
+
+ private class MyInterceptStrategy implements InterceptStrategy {
+
+ @Override
+ public Processor wrapProcessorInInterceptors(CamelContext context, ProcessorDefinition<?> definition, Processor target, Processor nextTarget) throws Exception {
+ // grab the listener
+ StepEventListener listener = context.hasService(StepEventListener.class);
+
+ // wrap the pipelines so we can emit events
+ if (definition instanceof PipelineDefinition) {
+ return new MyStepEventProcessor(definition.getId(), target, listener);
+ } else {
+ return target;
+ }
+ }
+ }
+
+ private class MyStepEventProcessor extends DelegateAsyncProcessor {
+
+ private final StepEventListener listener;
+ private final String id;
+
+ public MyStepEventProcessor(String id, Processor processor, StepEventListener listener) {
+ super(processor);
+ this.id = id;
+ this.listener = listener;
+ }
+
+ @Override
+ public boolean process(final Exchange exchange, final AsyncCallback callback) {
+ final StopWatch watch = new StopWatch();
+ if (listener != null) {
+ listener.beforeStep(new BeforeStepEvent(exchange, id));
+ }
+ return super.process(exchange, doneSync -> {
+ if (listener != null) {
+ listener.afterStep(new AfterStepEvent(exchange, id, watch.taken()));
+ }
+ callback.done(doneSync);
+ });
+ }
+
+ }
+ private class BeforeStepEvent extends AbstractExchangeEvent {
+
+ private final String id;
+
+ public BeforeStepEvent(Exchange source, String id) {
+ super(source);
+ this.id = id;
+ }
+
+ public String getId() {
+ return id;
+ }
+ }
+
+ private class AfterStepEvent extends AbstractExchangeEvent {
+
+ private final String id;
+ private final long timeTaken;
+
+ public AfterStepEvent(Exchange source, String id, long timeTaken) {
+ super(source);
+ this.id = id;
+ this.timeTaken = timeTaken;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public long getTimeTaken() {
+ return timeTaken;
+ }
+ }
+}
--
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.
[camel] 02/02: Fixed CS
Posted by da...@apache.org.
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
commit db489679b57285a6523a91c6de532ed7b63788d4
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Apr 24 12:24:09 2018 +0200
Fixed CS
---
.../apache/camel/component/seda/SedaDefaultBlockWhenFullTest.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/camel-core/src/test/java/org/apache/camel/component/seda/SedaDefaultBlockWhenFullTest.java b/camel-core/src/test/java/org/apache/camel/component/seda/SedaDefaultBlockWhenFullTest.java
index c23e992..05d112c 100644
--- a/camel-core/src/test/java/org/apache/camel/component/seda/SedaDefaultBlockWhenFullTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/seda/SedaDefaultBlockWhenFullTest.java
@@ -1,4 +1,4 @@
-/*
+/**
* 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.
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.seda;
-
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
@@ -25,6 +24,7 @@ import org.apache.camel.impl.JndiRegistry;
* Tests that a Seda component properly set blockWhenFull on endpoints.
*/
public class SedaDefaultBlockWhenFullTest extends ContextTestSupport {
+
private static final int QUEUE_SIZE = 1;
private static final int DELAY = 10;
private static final int DELAY_LONG = 100;
@@ -33,7 +33,6 @@ public class SedaDefaultBlockWhenFullTest extends ContextTestSupport {
private static final String BLOCK_WHEN_FULL_URI = "seda:blockingFoo" + String.format(SIZE_PARAM, QUEUE_SIZE) + "&timeout=0";
private static final String DEFAULT_URI = "seda:foo" + String.format(SIZE_PARAM, QUEUE_SIZE) + "&blockWhenFull=false&timeout=0";
-
@Override
protected JndiRegistry createRegistry() throws Exception {
SedaComponent component = new SedaComponent();
--
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.