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 2021/03/03 08:08:47 UTC
[camel] branch master updated (885f8d5 -> cb75125)
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 885f8d5 core: move route builder loader tests from core to dsl (#5159)
new bf65877 CAMEL-16286: camel-core - Calling doBuild on child services
new ccd5e1d Regen
new cb75125 CAMEL-16286: camel-core - Calling doBuild on child services
The 3 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:
.../camel/impl/engine/AbstractCamelContext.java | 4 +--
.../ManagedNamePatternIncludeHostNameTest.java | 3 ++-
.../org/apache/camel/support/DefaultConsumer.java | 4 +--
.../camel/support/EventDrivenPollingConsumer.java | 9 +------
.../camel/support/SynchronousDelegateProducer.java | 31 ++++++++++++++++++----
.../org/apache/camel/dsl/xml/io/XmlLoadTest.java | 6 ++---
.../apache/camel/dsl/xml/jaxb/JaxbXmlLoadTest.java | 6 ++---
7 files changed, 39 insertions(+), 24 deletions(-)
[camel] 03/03: CAMEL-16286: camel-core - Calling doBuild on child
services
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 cb75125756896bc9e28a11f1aac778932cba256f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Mar 3 08:54:39 2021 +0100
CAMEL-16286: camel-core - Calling doBuild on child services
---
.../org/apache/camel/support/EventDrivenPollingConsumer.java | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/EventDrivenPollingConsumer.java b/core/camel-support/src/main/java/org/apache/camel/support/EventDrivenPollingConsumer.java
index 67dc256..1ee98f4 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/EventDrivenPollingConsumer.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/EventDrivenPollingConsumer.java
@@ -231,12 +231,8 @@ public class EventDrivenPollingConsumer extends PollingConsumerSupport implement
@Override
protected void doBuild() throws Exception {
super.doBuild();
- // lets add ourselves as a consumer
+ // lets add ourselves as a consumer (only create do not build)
consumer = createConsumer();
- // do not call build if its our-self
- if (consumer != this) {
- ServiceHelper.buildService(consumer);
- }
}
@Override
@@ -247,9 +243,6 @@ public class EventDrivenPollingConsumer extends PollingConsumerSupport implement
@Override
protected void doStart() throws Exception {
- // lets add ourselves as a consumer
- consumer = createConsumer();
-
// if the consumer has a polling strategy then invoke that
if (consumer instanceof PollingConsumerPollingStrategy) {
PollingConsumerPollingStrategy strategy = (PollingConsumerPollingStrategy) consumer;
[camel] 01/03: CAMEL-16286: camel-core - Calling doBuild on child
services
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 bf658773944fb3402320b7355eb189b274e8a0ec
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Mar 3 08:37:21 2021 +0100
CAMEL-16286: camel-core - Calling doBuild on child services
---
.../camel/impl/engine/AbstractCamelContext.java | 4 +--
.../ManagedNamePatternIncludeHostNameTest.java | 3 ++-
.../org/apache/camel/support/DefaultConsumer.java | 4 +--
.../camel/support/SynchronousDelegateProducer.java | 31 ++++++++++++++++++----
4 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index e8cf42c..eab4f12 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -668,7 +668,7 @@ public abstract class AbstractCamelContext extends BaseService
if (component != null) {
component.setCamelContext(getCamelContextReference());
- component.build();
+ ServiceHelper.buildService(component);
postInitComponent(name, component);
}
} catch (Exception e) {
@@ -1737,7 +1737,7 @@ public abstract class AbstractCamelContext extends BaseService
Service service = (Service) language;
// init service first
CamelContextAware.trySetCamelContext(service, camelContext);
- service.init();
+ ServiceHelper.initService(service);
startService(service);
} catch (Exception e) {
throw RuntimeCamelException.wrapRuntimeCamelException(e);
diff --git a/core/camel-management/src/test/java/org/apache/camel/management/ManagedNamePatternIncludeHostNameTest.java b/core/camel-management/src/test/java/org/apache/camel/management/ManagedNamePatternIncludeHostNameTest.java
index f9135eb..4236487 100644
--- a/core/camel-management/src/test/java/org/apache/camel/management/ManagedNamePatternIncludeHostNameTest.java
+++ b/core/camel-management/src/test/java/org/apache/camel/management/ManagedNamePatternIncludeHostNameTest.java
@@ -21,6 +21,7 @@ import javax.management.ObjectName;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.support.service.ServiceHelper;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -30,7 +31,7 @@ public class ManagedNamePatternIncludeHostNameTest extends ManagementTestSupport
@Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
- context.getManagementStrategy().init();
+ ServiceHelper.initService(context.getManagementStrategy());
DefaultManagementObjectNameStrategy naming
= (DefaultManagementObjectNameStrategy) context.getManagementStrategy().getManagementObjectNameStrategy();
naming.setHostName("localhost");
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultConsumer.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultConsumer.java
index 0d89803..67f838d 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultConsumer.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultConsumer.java
@@ -172,8 +172,8 @@ public class DefaultConsumer extends ServiceSupport implements Consumer, RouteAw
@Override
protected void doBuild() throws Exception {
- super.doBuild();
- exchangeFactory.build();
+ LOG.debug("Build consumer: {}", this);
+ ServiceHelper.buildService(exchangeFactory, processor);
}
@Override
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/SynchronousDelegateProducer.java b/core/camel-support/src/main/java/org/apache/camel/support/SynchronousDelegateProducer.java
index 73aa082..bcd52d4 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/SynchronousDelegateProducer.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/SynchronousDelegateProducer.java
@@ -20,6 +20,7 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Producer;
import org.apache.camel.support.service.ServiceHelper;
+import org.apache.camel.support.service.ServiceSupport;
/**
* To process the delegated producer in synchronous mode.
@@ -29,7 +30,7 @@ import org.apache.camel.support.service.ServiceHelper;
* This delegate allows the component developers easily to support their existing asynchronous producer to behave
* synchronously by wrapping their producer in this synchronous delegate.
*/
-public class SynchronousDelegateProducer implements Producer {
+public class SynchronousDelegateProducer extends ServiceSupport implements Producer {
private final Producer producer;
@@ -48,21 +49,41 @@ public class SynchronousDelegateProducer implements Producer {
}
@Override
- public void init() {
- producer.init();
+ protected void doBuild() throws Exception {
+ ServiceHelper.buildService(producer);
}
@Override
- public void start() {
+ protected void doInit() throws Exception {
+ ServiceHelper.initService(producer);
+ }
+
+ @Override
+ protected void doStart() throws Exception {
ServiceHelper.startService(producer);
}
@Override
- public void stop() {
+ protected void doStop() throws Exception {
ServiceHelper.stopService(producer);
}
@Override
+ protected void doSuspend() throws Exception {
+ ServiceHelper.suspendService(producer);
+ }
+
+ @Override
+ protected void doResume() throws Exception {
+ ServiceHelper.resumeService(producer);
+ }
+
+ @Override
+ protected void doShutdown() throws Exception {
+ ServiceHelper.stopAndShutdownService(producer);
+ }
+
+ @Override
public boolean isSingleton() {
return producer.isSingleton();
}
[camel] 02/03: Regen
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 ccd5e1da06204fbf8b27b2cc7e06c7be19844b9f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Mar 3 08:37:26 2021 +0100
Regen
---
.../src/test/java/org/apache/camel/dsl/xml/io/XmlLoadTest.java | 6 +++---
.../test/java/org/apache/camel/dsl/xml/jaxb/JaxbXmlLoadTest.java | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlLoadTest.java b/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlLoadTest.java
index b11b75b..2819445 100644
--- a/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlLoadTest.java
+++ b/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlLoadTest.java
@@ -35,8 +35,8 @@ public class XmlLoadTest {
@Override
public void configure() throws Exception {
from("direct:foo")
- .routeId("foo")
- .to("mock:foo");
+ .routeId("foo")
+ .to("mock:foo");
}
});
@@ -63,7 +63,7 @@ public class XmlLoadTest {
assertEquals(2, context.getRoutes().size());
// test that loaded route works
- MockEndpoint bar = context.getEndpoint("mock:bar", MockEndpoint.class);
+ MockEndpoint bar = context.getEndpoint("mock:bar", MockEndpoint.class);
bar.expectedBodiesReceived("Bye World");
context.createProducerTemplate().sendBody("direct:bar", "Bye World");
bar.assertIsSatisfied();
diff --git a/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/JaxbXmlLoadTest.java b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/JaxbXmlLoadTest.java
index 72a73eb..bc02eee 100644
--- a/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/JaxbXmlLoadTest.java
+++ b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/JaxbXmlLoadTest.java
@@ -35,8 +35,8 @@ public class JaxbXmlLoadTest {
@Override
public void configure() throws Exception {
from("direct:foo")
- .routeId("foo")
- .to("mock:foo");
+ .routeId("foo")
+ .to("mock:foo");
}
});
@@ -63,7 +63,7 @@ public class JaxbXmlLoadTest {
assertEquals(2, context.getRoutes().size());
// test that loaded route works
- MockEndpoint bar = context.getEndpoint("mock:bar", MockEndpoint.class);
+ MockEndpoint bar = context.getEndpoint("mock:bar", MockEndpoint.class);
bar.expectedBodiesReceived("Bye World");
context.createProducerTemplate().sendBody("direct:bar", "Bye World");
bar.assertIsSatisfied();