You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by sh...@apache.org on 2018/02/27 15:55:21 UTC
[03/11] incubator-unomi git commit: UNOMI-153 add static string for
event ID
UNOMI-153 add static string for event ID
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/244f0a49
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/244f0a49
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/244f0a49
Branch: refs/heads/feature-UNOMI-5-KARAF4-1
Commit: 244f0a490faa9180d0f708bef04dcab4aac6c012
Parents: 33ecebf
Author: dgaillard <dg...@jahia.com>
Authored: Tue Feb 27 15:07:37 2018 +0100
Committer: dgaillard <dg...@jahia.com>
Committed: Tue Feb 27 15:07:37 2018 +0100
----------------------------------------------------------------------
.../unomi/router/core/context/RouterCamelContext.java | 10 +++++++---
.../router/core/event/UpdateCamelRouteEventHandler.java | 4 ++--
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/244f0a49/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/RouterCamelContext.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/RouterCamelContext.java b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/RouterCamelContext.java
index 03b2e04..309d27a 100644
--- a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/RouterCamelContext.java
+++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/RouterCamelContext.java
@@ -74,6 +74,10 @@ public class RouterCamelContext implements SynchronousBundleListener, IRouterCam
private ConfigSharingService configSharingService;
private ClusterService clusterService;
+ public static String EVENT_ID_REMOVE = "org.apache.unomi.router.event.remove";
+ public static String EVENT_ID_IMPORT = "org.apache.unomi.router.event.import";
+ public static String EVENT_ID_EXPORT = "org.apache.unomi.router.event.export";
+
public void setExecHistorySize(String execHistorySize) {
this.execHistorySize = execHistorySize;
}
@@ -180,7 +184,7 @@ public class RouterCamelContext implements SynchronousBundleListener, IRouterCam
}
if (fireEvent) {
- UpdateCamelRouteEvent event = new UpdateCamelRouteEvent("org.apache.unomi.router.event.remove");
+ UpdateCamelRouteEvent event = new UpdateCamelRouteEvent(EVENT_ID_REMOVE);
event.setRouteId(routeId);
clusterService.sendEvent(event);
}
@@ -208,7 +212,7 @@ public class RouterCamelContext implements SynchronousBundleListener, IRouterCam
camelContext.addRoutes(builder);
if (fireEvent) {
- UpdateCamelRouteEvent event = new UpdateCamelRouteEvent("org.apache.unomi.router.event.import");
+ UpdateCamelRouteEvent event = new UpdateCamelRouteEvent(EVENT_ID_IMPORT);
event.setConfiguration(importConfiguration);
clusterService.sendEvent(event);
}
@@ -229,7 +233,7 @@ public class RouterCamelContext implements SynchronousBundleListener, IRouterCam
camelContext.addRoutes(profileExportCollectRouteBuilder);
if (fireEvent) {
- UpdateCamelRouteEvent event = new UpdateCamelRouteEvent("org.apache.unomi.router.event.export");
+ UpdateCamelRouteEvent event = new UpdateCamelRouteEvent(EVENT_ID_EXPORT);
event.setConfiguration(exportConfiguration);
clusterService.sendEvent(event);
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/244f0a49/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/event/UpdateCamelRouteEventHandler.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/event/UpdateCamelRouteEventHandler.java b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/event/UpdateCamelRouteEventHandler.java
index 6760f4c..c752072 100644
--- a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/event/UpdateCamelRouteEventHandler.java
+++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/event/UpdateCamelRouteEventHandler.java
@@ -47,9 +47,9 @@ public class UpdateCamelRouteEventHandler extends CellarSupport implements Event
try {
logger.debug("Event id is {}", event.getId());
- if (event.getId().equals("org.apache.unomi.router.event.remove") && StringUtils.isNotBlank(event.getRouteId())) {
+ if (event.getId().equals(RouterCamelContext.EVENT_ID_REMOVE) && StringUtils.isNotBlank(event.getRouteId())) {
routerCamelContext.killExistingRoute(event.getRouteId(), false);
- } else if ((event.getId().equals("org.apache.unomi.router.event.import") || event.getId().equals("org.apache.unomi.router.event.export")) && event.getConfiguration() != null) {
+ } else if ((event.getId().equals(RouterCamelContext.EVENT_ID_IMPORT) || event.getId().equals(RouterCamelContext.EVENT_ID_EXPORT)) && event.getConfiguration() != null) {
routerCamelContext.updateProfileReaderRoute(event.getConfiguration(), false);
}
} catch (Exception e) {