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 2020/07/30 08:34:12 UTC
[camel] branch master updated (edab61a -> 7a87e24)
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 edab61a More improvements to camel archetype stuff
new 2baf292 CAMEL-15351: camel-core - Events for camel context initializing/initialized should have their own event type
new 7a87e24 Polished
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:
.../src/main/java/org/apache/camel/spi/CamelEvent.java | 16 ++++++++++++++++
.../apache/camel/impl/engine/AbstractCamelContext.java | 3 ++-
.../camel/impl/event/CamelContextInitializedEvent.java | 2 +-
.../camel/impl/event/CamelContextInitializingEvent.java | 2 +-
.../main/java/org/apache/camel/reifier/RouteReifier.java | 1 -
5 files changed, 20 insertions(+), 4 deletions(-)
[camel] 01/02: CAMEL-15351: camel-core - Events for camel context
initializing/initialized should have their own event type
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 2baf292401870dcc454d611eb31c86eb5a5e5286
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jul 30 09:40:32 2020 +0200
CAMEL-15351: camel-core - Events for camel context initializing/initialized should have their own event type
---
.../src/main/java/org/apache/camel/spi/CamelEvent.java | 16 ++++++++++++++++
.../camel/impl/event/CamelContextInitializedEvent.java | 2 +-
.../camel/impl/event/CamelContextInitializingEvent.java | 2 +-
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/CamelEvent.java b/core/camel-api/src/main/java/org/apache/camel/spi/CamelEvent.java
index 7ce2bb8..ab2b763 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/CamelEvent.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/CamelEvent.java
@@ -28,6 +28,8 @@ import org.apache.camel.Route;
public interface CamelEvent {
enum Type {
+ CamelContextInitializing,
+ CamelContextInitialized,
CamelContextResumed,
CamelContextResumeFailure,
CamelContextResuming,
@@ -88,6 +90,20 @@ public interface CamelEvent {
}
+ interface CamelContextInitializingEvent extends CamelContextEvent {
+ @Override
+ default Type getType() {
+ return Type.CamelContextInitializing;
+ }
+ }
+
+ interface CamelContextInitializedEvent extends CamelContextEvent {
+ @Override
+ default Type getType() {
+ return Type.CamelContextInitialized;
+ }
+ }
+
interface CamelContextResumedEvent extends CamelContextEvent {
@Override
default Type getType() {
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextInitializedEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextInitializedEvent.java
index a277459..6f3665d 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextInitializedEvent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextInitializedEvent.java
@@ -19,7 +19,7 @@ package org.apache.camel.impl.event;
import org.apache.camel.CamelContext;
import org.apache.camel.spi.CamelEvent;
-public class CamelContextInitializedEvent extends AbstractContextEvent implements CamelEvent.CamelContextStartingEvent {
+public class CamelContextInitializedEvent extends AbstractContextEvent implements CamelEvent.CamelContextInitializedEvent {
private static final long serialVersionUID = -3416082218670845373L;
public CamelContextInitializedEvent(CamelContext source) {
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextInitializingEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextInitializingEvent.java
index 9674817..eebf06d 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextInitializingEvent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/event/CamelContextInitializingEvent.java
@@ -19,7 +19,7 @@ package org.apache.camel.impl.event;
import org.apache.camel.CamelContext;
import org.apache.camel.spi.CamelEvent;
-public class CamelContextInitializingEvent extends AbstractContextEvent implements CamelEvent.CamelContextStartingEvent {
+public class CamelContextInitializingEvent extends AbstractContextEvent implements CamelEvent.CamelContextInitializingEvent {
private static final long serialVersionUID = 3931186946570864733L;
public CamelContextInitializingEvent(CamelContext source) {
[camel] 02/02: Polished
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 7a87e24723831d0152e64083b5673ffdec888b98
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jul 30 10:32:41 2020 +0200
Polished
---
.../main/java/org/apache/camel/impl/engine/AbstractCamelContext.java | 3 ++-
.../src/main/java/org/apache/camel/reifier/RouteReifier.java | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 557e0cf..70a2f70 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -2576,6 +2576,7 @@ public abstract class AbstractCamelContext extends BaseService
ServiceHelper.initService(notifier);
}
+ // the event notifiers must be initialized before we can emit this event
EventHelper.notifyCamelContextInitializing(this);
// re-create endpoint registry as the cache size limit may be set after the constructor of this instance was called.
@@ -2606,7 +2607,7 @@ public abstract class AbstractCamelContext extends BaseService
// start components
ServiceHelper.initService(components.values());
- // create routes from route templates if we have any sources
+ // create route definitions from route templates if we have any sources
for (RouteTemplateParameterSource source : getRegistry().findByType(RouteTemplateParameterSource.class)) {
for (String routeId : source.routeIds()) {
// do a defensive copy of the parameters
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RouteReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RouteReifier.java
index e966f40..cf56eb3 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RouteReifier.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/RouteReifier.java
@@ -512,7 +512,6 @@ public class RouteReifier extends ProcessorReifier<RouteDefinition> {
List<PropertyDefinition> properties = definition.getRouteProperties();
if (properties != null) {
-
for (PropertyDefinition prop : properties) {
try {
final String key = parseString(prop.getKey());