You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cs...@apache.org on 2017/07/18 14:51:29 UTC
[1/3] camel git commit: [CAMEL-11551] Use base class for route events
Repository: camel
Updated Branches:
refs/heads/camel-2.17.x 6301a62be -> 51b340a5b
[CAMEL-11551] Use base class for route events
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4d67d822
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4d67d822
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4d67d822
Branch: refs/heads/camel-2.17.x
Commit: 4d67d8226872849c82ecec3098eebf01e4a68675
Parents: 2380493
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Tue Jul 18 11:37:34 2017 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Tue Jul 18 16:51:03 2017 +0200
----------------------------------------------------------------------
.../management/event/AbstractRouteEvent.java | 41 ++++++++++++++++++++
.../camel/management/event/RouteAddedEvent.java | 12 +-----
.../management/event/RouteRemovedEvent.java | 12 +-----
.../management/event/RouteStartedEvent.java | 13 +------
.../management/event/RouteStoppedEvent.java | 13 +------
5 files changed, 49 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4d67d822/camel-core/src/main/java/org/apache/camel/management/event/AbstractRouteEvent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/AbstractRouteEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/AbstractRouteEvent.java
new file mode 100644
index 0000000..8de3be8
--- /dev/null
+++ b/camel-core/src/main/java/org/apache/camel/management/event/AbstractRouteEvent.java
@@ -0,0 +1,41 @@
+/**
+ * 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.management.event;
+
+import java.util.EventObject;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Route;
+
+/**
+ * Base class for {@link CamelContext} events.
+ *
+ * @version
+ */
+public abstract class AbstractRouteEvent extends EventObject {
+ private static final long serialVersionUID = 1L;
+ private Route route;
+
+ public AbstractRouteEvent(Route source) {
+ super(source);
+ this.route = source;
+ }
+
+ public Route getRoute() {
+ return route;
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/4d67d822/camel-core/src/main/java/org/apache/camel/management/event/RouteAddedEvent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/RouteAddedEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/RouteAddedEvent.java
index 8e19394..52f67e9 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/RouteAddedEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/RouteAddedEvent.java
@@ -16,29 +16,21 @@
*/
package org.apache.camel.management.event;
-import java.util.EventObject;
-
import org.apache.camel.Route;
/**
* @version
*/
-public class RouteAddedEvent extends EventObject {
+public class RouteAddedEvent extends AbstractRouteEvent {
private static final long serialVersionUID = 9155960708789798708L;
- private final Route route;
public RouteAddedEvent(Route source) {
super(source);
- this.route = source;
- }
-
- public Route getRoute() {
- return route;
}
@Override
public String toString() {
- return "Added route: " + route.getId();
+ return "Added route: " + getRoute().getId();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/4d67d822/camel-core/src/main/java/org/apache/camel/management/event/RouteRemovedEvent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/RouteRemovedEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/RouteRemovedEvent.java
index d08a6b3..f4f5c66 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/RouteRemovedEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/RouteRemovedEvent.java
@@ -16,29 +16,21 @@
*/
package org.apache.camel.management.event;
-import java.util.EventObject;
-
import org.apache.camel.Route;
/**
* @version
*/
-public class RouteRemovedEvent extends EventObject {
+public class RouteRemovedEvent extends AbstractRouteEvent {
private static final long serialVersionUID = 7966471393751298719L;
- private final Route route;
public RouteRemovedEvent(Route source) {
super(source);
- this.route = source;
- }
-
- public Route getRoute() {
- return route;
}
@Override
public String toString() {
- return "Removed route: " + route.getId();
+ return "Removed route: " + getRoute().getId();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/4d67d822/camel-core/src/main/java/org/apache/camel/management/event/RouteStartedEvent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/RouteStartedEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/RouteStartedEvent.java
index 6cd2ed2..bafa273 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/RouteStartedEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/RouteStartedEvent.java
@@ -16,29 +16,20 @@
*/
package org.apache.camel.management.event;
-import java.util.EventObject;
-
import org.apache.camel.Route;
/**
* @version
*/
-public class RouteStartedEvent extends EventObject {
+public class RouteStartedEvent extends AbstractRouteEvent {
private static final long serialVersionUID = 1330257282431407329L;
- private final Route route;
-
public RouteStartedEvent(Route source) {
super(source);
- this.route = source;
- }
-
- public Route getRoute() {
- return route;
}
@Override
public String toString() {
- return "Started route: " + route.getId();
+ return "Started route: " + getRoute().getId();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/4d67d822/camel-core/src/main/java/org/apache/camel/management/event/RouteStoppedEvent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/RouteStoppedEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/RouteStoppedEvent.java
index 850725b..4b1bc96 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/RouteStoppedEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/RouteStoppedEvent.java
@@ -16,29 +16,20 @@
*/
package org.apache.camel.management.event;
-import java.util.EventObject;
-
import org.apache.camel.Route;
/**
* @version
*/
-public class RouteStoppedEvent extends EventObject {
+public class RouteStoppedEvent extends AbstractRouteEvent {
private static final long serialVersionUID = -4466503512787398888L;
- private final Route route;
-
public RouteStoppedEvent(Route source) {
super(source);
- this.route = source;
- }
-
- public Route getRoute() {
- return route;
}
@Override
public String toString() {
- return "Stopped route: " + route.getId();
+ return "Stopped route: " + getRoute().getId();
}
}
[3/3] camel git commit: [CAMEL-11552] Provide FailureEvent interface
as a general means of retrieving the cause
Posted by cs...@apache.org.
[CAMEL-11552] Provide FailureEvent interface as a general means of retrieving the cause
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/51b340a5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/51b340a5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/51b340a5
Branch: refs/heads/camel-2.17.x
Commit: 51b340a5bafb5c55945d7c2976e0dbce57e69fa1
Parents: 4d67d82
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Tue Jul 18 14:28:48 2017 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Tue Jul 18 16:51:04 2017 +0200
----------------------------------------------------------------------
.../event/CamelContextResumeFailureEvent.java | 3 ++-
.../event/CamelContextStartupFailureEvent.java | 3 ++-
.../event/CamelContextStopFailureEvent.java | 3 ++-
.../management/event/ExchangeFailedEvent.java | 8 +++++++-
.../camel/management/event/FailureEvent.java | 21 ++++++++++++++++++++
.../event/ServiceStartupFailureEvent.java | 3 ++-
.../event/ServiceStopFailureEvent.java | 3 ++-
7 files changed, 38 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/51b340a5/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumeFailureEvent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumeFailureEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumeFailureEvent.java
index 9f2d974..c2f4df2 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumeFailureEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumeFailureEvent.java
@@ -21,7 +21,7 @@ import org.apache.camel.CamelContext;
/**
* @version
*/
-public class CamelContextResumeFailureEvent extends AbstractContextEvent {
+public class CamelContextResumeFailureEvent extends AbstractContextEvent implements FailureEvent {
private static final long serialVersionUID = -4271899927507894566L;
private Throwable cause;
@@ -31,6 +31,7 @@ public class CamelContextResumeFailureEvent extends AbstractContextEvent {
this.cause = cause;
}
+ @Override
public Throwable getCause() {
return cause;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/51b340a5/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailureEvent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailureEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailureEvent.java
index c890a59..11f31a2 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailureEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailureEvent.java
@@ -21,7 +21,7 @@ import org.apache.camel.CamelContext;
/**
* @version
*/
-public class CamelContextStartupFailureEvent extends AbstractContextEvent {
+public class CamelContextStartupFailureEvent extends AbstractContextEvent implements FailureEvent {
private static final long serialVersionUID = -4271899927507894567L;
private Throwable cause;
@@ -31,6 +31,7 @@ public class CamelContextStartupFailureEvent extends AbstractContextEvent {
this.cause = cause;
}
+ @Override
public Throwable getCause() {
return cause;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/51b340a5/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStopFailureEvent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStopFailureEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStopFailureEvent.java
index 5ad915b..9dc4365 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStopFailureEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStopFailureEvent.java
@@ -21,7 +21,7 @@ import org.apache.camel.CamelContext;
/**
* @version
*/
-public class CamelContextStopFailureEvent extends AbstractContextEvent {
+public class CamelContextStopFailureEvent extends AbstractContextEvent implements FailureEvent {
private static final long serialVersionUID = -802046840118188292L;
private Throwable cause;
@@ -31,6 +31,7 @@ public class CamelContextStopFailureEvent extends AbstractContextEvent {
this.cause = cause;
}
+ @Override
public Throwable getCause() {
return cause;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/51b340a5/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailedEvent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailedEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailedEvent.java
index 026fa6d..f6cf273 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailedEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailedEvent.java
@@ -21,12 +21,17 @@ import org.apache.camel.Exchange;
/**
* @version
*/
-public class ExchangeFailedEvent extends AbstractExchangeEvent {
+public class ExchangeFailedEvent extends AbstractExchangeEvent implements FailureEvent {
private static final long serialVersionUID = -8484326904627268101L;
public ExchangeFailedEvent(Exchange source) {
super(source);
}
+
+ @Override
+ public Throwable getCause() {
+ return getExchange().getException();
+ }
@Override
public String toString() {
@@ -37,4 +42,5 @@ public class ExchangeFailedEvent extends AbstractExchangeEvent {
return getExchange().getExchangeId() + " exchange failure: " + getExchange();
}
}
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/51b340a5/camel-core/src/main/java/org/apache/camel/management/event/FailureEvent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/FailureEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/FailureEvent.java
new file mode 100644
index 0000000..28c9e5e
--- /dev/null
+++ b/camel-core/src/main/java/org/apache/camel/management/event/FailureEvent.java
@@ -0,0 +1,21 @@
+/**
+ * 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.management.event;
+
+public interface FailureEvent {
+ Throwable getCause();
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/51b340a5/camel-core/src/main/java/org/apache/camel/management/event/ServiceStartupFailureEvent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/ServiceStartupFailureEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/ServiceStartupFailureEvent.java
index e9e1a91..3a47fc5 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/ServiceStartupFailureEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/ServiceStartupFailureEvent.java
@@ -23,7 +23,7 @@ import org.apache.camel.CamelContext;
/**
* @version
*/
-public class ServiceStartupFailureEvent extends EventObject {
+public class ServiceStartupFailureEvent extends EventObject implements FailureEvent {
private static final long serialVersionUID = -9171964933795931862L;
private CamelContext context;
@@ -45,6 +45,7 @@ public class ServiceStartupFailureEvent extends EventObject {
return service;
}
+ @Override
public Throwable getCause() {
return cause;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/51b340a5/camel-core/src/main/java/org/apache/camel/management/event/ServiceStopFailureEvent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/ServiceStopFailureEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/ServiceStopFailureEvent.java
index 27d32a8..b37d4ea 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/ServiceStopFailureEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/ServiceStopFailureEvent.java
@@ -23,7 +23,7 @@ import org.apache.camel.CamelContext;
/**
* @version
*/
-public class ServiceStopFailureEvent extends EventObject {
+public class ServiceStopFailureEvent extends EventObject implements FailureEvent {
private static final long serialVersionUID = 4139591666998762617L;
private CamelContext context;
@@ -45,6 +45,7 @@ public class ServiceStopFailureEvent extends EventObject {
return service;
}
+ @Override
public Throwable getCause() {
return cause;
}
[2/3] camel git commit: [CAMEL-11551] Use common base class for
context events
Posted by cs...@apache.org.
[CAMEL-11551] Use common base class for context events
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/23804936
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/23804936
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/23804936
Branch: refs/heads/camel-2.17.x
Commit: 23804936ad1c86bd7cd0512b4372ec046725a8d4
Parents: 6301a62
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Tue Jul 18 11:06:51 2017 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Tue Jul 18 16:51:03 2017 +0200
----------------------------------------------------------------------
.../management/event/AbstractContextEvent.java | 40 ++++++++++++++++++++
.../event/CamelContextResumeFailureEvent.java | 12 +-----
.../event/CamelContextResumedEvent.java | 13 +------
.../event/CamelContextResumingEvent.java | 13 +------
.../event/CamelContextStartedEvent.java | 13 +------
.../event/CamelContextStartingEvent.java | 13 +------
.../event/CamelContextStartupFailureEvent.java | 12 +-----
.../event/CamelContextStopFailureEvent.java | 12 +-----
.../event/CamelContextStoppedEvent.java | 13 +------
.../event/CamelContextStoppingEvent.java | 13 +------
.../event/CamelContextSuspendedEvent.java | 13 +------
.../event/CamelContextSuspendingEvent.java | 13 +------
12 files changed, 62 insertions(+), 118 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/23804936/camel-core/src/main/java/org/apache/camel/management/event/AbstractContextEvent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/AbstractContextEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/AbstractContextEvent.java
new file mode 100644
index 0000000..cd3540e
--- /dev/null
+++ b/camel-core/src/main/java/org/apache/camel/management/event/AbstractContextEvent.java
@@ -0,0 +1,40 @@
+/**
+ * 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.management.event;
+
+import java.util.EventObject;
+
+import org.apache.camel.CamelContext;
+
+/**
+ * Base class for {@link CamelContext} events.
+ *
+ * @version
+ */
+public abstract class AbstractContextEvent extends EventObject {
+ private static final long serialVersionUID = 1L;
+ private CamelContext context;
+
+ public AbstractContextEvent(CamelContext source) {
+ super(source);
+ this.context = source;
+ }
+
+ public CamelContext getContext() {
+ return context;
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/23804936/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumeFailureEvent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumeFailureEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumeFailureEvent.java
index 5e9bea4..9f2d974 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumeFailureEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumeFailureEvent.java
@@ -16,35 +16,27 @@
*/
package org.apache.camel.management.event;
-import java.util.EventObject;
-
import org.apache.camel.CamelContext;
/**
* @version
*/
-public class CamelContextResumeFailureEvent extends EventObject {
+public class CamelContextResumeFailureEvent extends AbstractContextEvent {
private static final long serialVersionUID = -4271899927507894566L;
- private CamelContext context;
private Throwable cause;
public CamelContextResumeFailureEvent(CamelContext context, Throwable cause) {
super(context);
- this.context = context;
this.cause = cause;
}
- public CamelContext getContext() {
- return context;
- }
-
public Throwable getCause() {
return cause;
}
@Override
public String toString() {
- return "Failed to resume Camel: " + context.getName() + " due to " + cause.getMessage();
+ return "Failed to resume Camel: " + getContext().getName() + " due to " + cause.getMessage();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/23804936/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumedEvent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumedEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumedEvent.java
index 894784c..5baa430 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumedEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumedEvent.java
@@ -16,29 +16,20 @@
*/
package org.apache.camel.management.event;
-import java.util.EventObject;
-
import org.apache.camel.CamelContext;
/**
* @version
*/
-public class CamelContextResumedEvent extends EventObject {
+public class CamelContextResumedEvent extends AbstractContextEvent {
private static final long serialVersionUID = 6761726800283234512L;
- private final CamelContext context;
-
public CamelContextResumedEvent(CamelContext source) {
super(source);
- this.context = source;
- }
-
- public CamelContext getContext() {
- return context;
}
@Override
public String toString() {
- return "Resumed CamelContext: " + context.getName();
+ return "Resumed CamelContext: " + getContext().getName();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/23804936/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumingEvent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumingEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumingEvent.java
index 8dbd08d..d788b4a 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumingEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextResumingEvent.java
@@ -16,29 +16,20 @@
*/
package org.apache.camel.management.event;
-import java.util.EventObject;
-
import org.apache.camel.CamelContext;
/**
* @version
*/
-public class CamelContextResumingEvent extends EventObject {
+public class CamelContextResumingEvent extends AbstractContextEvent {
private static final long serialVersionUID = 6761726800283234511L;
- private final CamelContext context;
-
public CamelContextResumingEvent(CamelContext source) {
super(source);
- this.context = source;
- }
-
- public CamelContext getContext() {
- return context;
}
@Override
public String toString() {
- return "Resuming CamelContext: " + context.getName();
+ return "Resuming CamelContext: " + getContext().getName();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/23804936/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartedEvent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartedEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartedEvent.java
index 62b5ef3..2086be5 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartedEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartedEvent.java
@@ -16,29 +16,20 @@
*/
package org.apache.camel.management.event;
-import java.util.EventObject;
-
import org.apache.camel.CamelContext;
/**
* @version
*/
-public class CamelContextStartedEvent extends EventObject {
+public class CamelContextStartedEvent extends AbstractContextEvent {
private static final long serialVersionUID = 6761726800283073490L;
- private final CamelContext context;
-
public CamelContextStartedEvent(CamelContext source) {
super(source);
- this.context = source;
- }
-
- public CamelContext getContext() {
- return context;
}
@Override
public String toString() {
- return "Started CamelContext: " + context.getName();
+ return "Started CamelContext: " + getContext().getName();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/23804936/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartingEvent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartingEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartingEvent.java
index fe194b0..de5b9a7 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartingEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartingEvent.java
@@ -16,29 +16,20 @@
*/
package org.apache.camel.management.event;
-import java.util.EventObject;
-
import org.apache.camel.CamelContext;
/**
* @version
*/
-public class CamelContextStartingEvent extends EventObject {
+public class CamelContextStartingEvent extends AbstractContextEvent {
private static final long serialVersionUID = -1120225323715688981L;
- private final CamelContext context;
-
public CamelContextStartingEvent(CamelContext source) {
super(source);
- this.context = source;
- }
-
- public CamelContext getContext() {
- return context;
}
@Override
public String toString() {
- return "Starting CamelContext: " + context.getName();
+ return "Starting CamelContext: " + getContext().getName();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/23804936/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailureEvent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailureEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailureEvent.java
index f490510..c890a59 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailureEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStartupFailureEvent.java
@@ -16,35 +16,27 @@
*/
package org.apache.camel.management.event;
-import java.util.EventObject;
-
import org.apache.camel.CamelContext;
/**
* @version
*/
-public class CamelContextStartupFailureEvent extends EventObject {
+public class CamelContextStartupFailureEvent extends AbstractContextEvent {
private static final long serialVersionUID = -4271899927507894567L;
- private CamelContext context;
private Throwable cause;
public CamelContextStartupFailureEvent(CamelContext context, Throwable cause) {
super(context);
- this.context = context;
this.cause = cause;
}
- public CamelContext getContext() {
- return context;
- }
-
public Throwable getCause() {
return cause;
}
@Override
public String toString() {
- return "Failed to start Camel: " + context.getName() + " due to " + cause.getMessage();
+ return "Failed to start Camel: " + getContext().getName() + " due to " + cause.getMessage();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/23804936/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStopFailureEvent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStopFailureEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStopFailureEvent.java
index 66f9bfb..5ad915b 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStopFailureEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStopFailureEvent.java
@@ -16,35 +16,27 @@
*/
package org.apache.camel.management.event;
-import java.util.EventObject;
-
import org.apache.camel.CamelContext;
/**
* @version
*/
-public class CamelContextStopFailureEvent extends EventObject {
+public class CamelContextStopFailureEvent extends AbstractContextEvent {
private static final long serialVersionUID = -802046840118188292L;
- private CamelContext context;
private Throwable cause;
public CamelContextStopFailureEvent(CamelContext context, Throwable cause) {
super(context);
- this.context = context;
this.cause = cause;
}
- public CamelContext getContext() {
- return context;
- }
-
public Throwable getCause() {
return cause;
}
@Override
public String toString() {
- return "Failed to stop Camel: " + context.getName() + " due to " + cause.getMessage();
+ return "Failed to stop Camel: " + getContext().getName() + " due to " + cause.getMessage();
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/23804936/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStoppedEvent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStoppedEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStoppedEvent.java
index 3b6b414..86e64e3 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStoppedEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStoppedEvent.java
@@ -16,29 +16,20 @@
*/
package org.apache.camel.management.event;
-import java.util.EventObject;
-
import org.apache.camel.CamelContext;
/**
* @version
*/
-public class CamelContextStoppedEvent extends EventObject {
+public class CamelContextStoppedEvent extends AbstractContextEvent {
private static final long serialVersionUID = -8406258841784891998L;
- private final CamelContext context;
-
public CamelContextStoppedEvent(CamelContext source) {
super(source);
- this.context = source;
- }
-
- public CamelContext getContext() {
- return context;
}
@Override
public String toString() {
- return "Stopped CamelContext: " + context.getName();
+ return "Stopped CamelContext: " + getContext().getName();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/23804936/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStoppingEvent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStoppingEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStoppingEvent.java
index d2d6bfc..59b63db 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStoppingEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextStoppingEvent.java
@@ -16,29 +16,20 @@
*/
package org.apache.camel.management.event;
-import java.util.EventObject;
-
import org.apache.camel.CamelContext;
/**
* @version
*/
-public class CamelContextStoppingEvent extends EventObject {
+public class CamelContextStoppingEvent extends AbstractContextEvent {
private static final long serialVersionUID = -1074581102102126334L;
- private final CamelContext context;
-
public CamelContextStoppingEvent(CamelContext source) {
super(source);
- this.context = source;
- }
-
- public CamelContext getContext() {
- return context;
}
@Override
public String toString() {
- return "Stopping CamelContext: " + context.getName();
+ return "Stopping CamelContext: " + getContext().getName();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/23804936/camel-core/src/main/java/org/apache/camel/management/event/CamelContextSuspendedEvent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextSuspendedEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextSuspendedEvent.java
index 5c1ac42..8c54d71 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextSuspendedEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextSuspendedEvent.java
@@ -16,29 +16,20 @@
*/
package org.apache.camel.management.event;
-import java.util.EventObject;
-
import org.apache.camel.CamelContext;
/**
* @version
*/
-public class CamelContextSuspendedEvent extends EventObject {
+public class CamelContextSuspendedEvent extends AbstractContextEvent {
private static final long serialVersionUID = 6761726800283072242L;
- private final CamelContext context;
-
public CamelContextSuspendedEvent(CamelContext source) {
super(source);
- this.context = source;
- }
-
- public CamelContext getContext() {
- return context;
}
@Override
public String toString() {
- return "Suspended CamelContext: " + context.getName();
+ return "Suspended CamelContext: " + getContext().getName();
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/23804936/camel-core/src/main/java/org/apache/camel/management/event/CamelContextSuspendingEvent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextSuspendingEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextSuspendingEvent.java
index 417d4fd..4c8cce1 100644
--- a/camel-core/src/main/java/org/apache/camel/management/event/CamelContextSuspendingEvent.java
+++ b/camel-core/src/main/java/org/apache/camel/management/event/CamelContextSuspendingEvent.java
@@ -16,29 +16,20 @@
*/
package org.apache.camel.management.event;
-import java.util.EventObject;
-
import org.apache.camel.CamelContext;
/**
* @version
*/
-public class CamelContextSuspendingEvent extends EventObject {
+public class CamelContextSuspendingEvent extends AbstractContextEvent {
private static final long serialVersionUID = 6761726800283072241L;
- private final CamelContext context;
-
public CamelContextSuspendingEvent(CamelContext source) {
super(source);
- this.context = source;
- }
-
- public CamelContext getContext() {
- return context;
}
@Override
public String toString() {
- return "Suspending CamelContext: " + context.getName();
+ return "Suspending CamelContext: " + getContext().getName();
}
}