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 522883f7d54893a26a440ac6eed75158fee335af
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu May 28 13:13:32 2020 +0200
camel-core - Move inlined class into its own class.
---
.../camel/impl/engine/AbstractCamelContext.java | 42 +------------
.../engine/OnCamelContextLifecycleStrategy.java | 70 ++++++++++++++++++++++
2 files changed, 72 insertions(+), 40 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 470cd66..0972e19 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
@@ -336,46 +336,8 @@ public abstract class AbstractCamelContext extends
BaseService
// add the defer service startup listener
this.startupListeners.add(deferStartupListener);
- // add a default LifecycleStrategy that discover strategies on the
registry
- // and invoke them
- // TODO: Move this into its own class to reduce number of code lines
here
- this.lifecycleStrategies.add(new LifecycleStrategySupport() {
- @Override
- public void onContextInitialized(CamelContext context) throws
VetoCamelContextStartException {
- for (OnCamelContextInitialized handler :
context.getRegistry().findByType(OnCamelContextInitialized.class)) {
- // RoutesBuilder should register them-self to the camel
context
- // to avoid invoking them multiple times if routes are
discovered
- // from the registry (i.e. camel-main)
- if (!(handler instanceof RoutesBuilder)) {
- handler.onContextInitialized(context);
- }
- }
- }
-
- @Override
- public void onContextStart(CamelContext context) throws
VetoCamelContextStartException {
- for (OnCamelContextStart handler :
context.getRegistry().findByType(OnCamelContextStart.class)) {
- // RoutesBuilder should register them-self to the camel
context
- // to avoid invoking them multiple times if routes are
discovered
- // from the registry (i.e. camel-main)
- if (!(handler instanceof RoutesBuilder)) {
- handler.onContextStart(context);
- }
- }
- }
-
- @Override
- public void onContextStop(CamelContext context) {
- for (OnCamelContextStop handler :
context.getRegistry().findByType(OnCamelContextStop.class)) {
- // RoutesBuilder should register them-self to the camel
context
- // to avoid invoking them multiple times if routes are
discovered
- // from the registry (i.e. camel-main)
- if (!(handler instanceof RoutesBuilder)) {
- handler.onContextStop(context);
- }
- }
- }
- });
+ // add a default LifecycleStrategy that discover strategies on the
registry and invoke them
+ this.lifecycleStrategies.add(new OnCamelContextLifecycleStrategy());
if (build) {
try {
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/OnCamelContextLifecycleStrategy.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/OnCamelContextLifecycleStrategy.java
new file mode 100644
index 0000000..e420fb1
--- /dev/null
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/OnCamelContextLifecycleStrategy.java
@@ -0,0 +1,70 @@
+/*
+ * 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.impl.engine;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.VetoCamelContextStartException;
+import org.apache.camel.spi.LifecycleStrategy;
+import org.apache.camel.spi.OnCamelContextInitialized;
+import org.apache.camel.spi.OnCamelContextStart;
+import org.apache.camel.spi.OnCamelContextStop;
+import org.apache.camel.support.LifecycleStrategySupport;
+
+/**
+ * {@link LifecycleStrategy} for invoking callbacks {@link
OnCamelContextInitialized}, {@link OnCamelContextStart}, and {@link
OnCamelContextStop}
+ * which has been registered in the Camel {@link
org.apache.camel.spi.Registry}.
+ */
+class OnCamelContextLifecycleStrategy extends LifecycleStrategySupport {
+
+ @Override
+ public void onContextInitialized(CamelContext context) throws
VetoCamelContextStartException {
+ for (OnCamelContextInitialized handler :
context.getRegistry().findByType(OnCamelContextInitialized.class)) {
+ // RoutesBuilder should register them-self to the camel context
+ // to avoid invoking them multiple times if routes are discovered
+ // from the registry (i.e. camel-main)
+ if (!(handler instanceof RoutesBuilder)) {
+ handler.onContextInitialized(context);
+ }
+ }
+ }
+
+ @Override
+ public void onContextStart(CamelContext context) throws
VetoCamelContextStartException {
+ for (OnCamelContextStart handler :
context.getRegistry().findByType(OnCamelContextStart.class)) {
+ // RoutesBuilder should register them-self to the camel context
+ // to avoid invoking them multiple times if routes are discovered
+ // from the registry (i.e. camel-main)
+ if (!(handler instanceof RoutesBuilder)) {
+ handler.onContextStart(context);
+ }
+ }
+ }
+
+ @Override
+ public void onContextStop(CamelContext context) {
+ for (OnCamelContextStop handler :
context.getRegistry().findByType(OnCamelContextStop.class)) {
+ // RoutesBuilder should register them-self to the camel context
+ // to avoid invoking them multiple times if routes are discovered
+ // from the registry (i.e. camel-main)
+ if (!(handler instanceof RoutesBuilder)) {
+ handler.onContextStop(context);
+ }
+ }
+ }
+
+}
