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 09:31:17 UTC
camel git commit: [CAMEL-11551] Use common base class for context
events
Repository: camel
Updated Branches:
refs/heads/master 1c47be0ad -> c15fa1e20
[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/c15fa1e2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c15fa1e2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c15fa1e2
Branch: refs/heads/master
Commit: c15fa1e208ada67894e83f6971ba19b69bcdf710
Parents: 1c47be0
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 11:06:51 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/c15fa1e2/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/c15fa1e2/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/c15fa1e2/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/c15fa1e2/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/c15fa1e2/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/c15fa1e2/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/c15fa1e2/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/c15fa1e2/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/c15fa1e2/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/c15fa1e2/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/c15fa1e2/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/c15fa1e2/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();
}
}