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 2021/08/19 12:10:38 UTC
[camel] 04/08: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit be4cf1a1dcee2aa0b8c914b41520564046f5a12c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Aug 19 09:51:11 2021 +0200
Polished
---
.../src/main/java/org/apache/camel/ExtendedCamelContext.java | 8 ++++----
.../org/apache/camel/impl/engine/CamelPostProcessorHelper.java | 4 +---
.../apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java | 2 +-
.../java/org/apache/camel/impl/engine/SimpleCamelContext.java | 3 +--
.../src/main/java/org/apache/camel/model/RouteDefinition.java | 5 ++---
5 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java b/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
index b105f47..070e114 100644
--- a/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
+++ b/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
@@ -104,13 +104,13 @@ public interface ExtendedCamelContext extends CamelContext {
void setupRoutes(boolean done);
/**
- * Indicates whether current thread is setting up route(s) as part of starting Camel from spring/blueprint.
+ * Indicates whether current thread is setting up route(s) as part of starting Camel.
* <p/>
* This can be useful to know by {@link LifecycleStrategy} or the likes, in case they need to react differently.
* <p/>
- * As the startup procedure of {@link CamelContext} is slightly different when using plain Java versus Spring or
- * Blueprint, then we need to know when Spring/Blueprint is setting up the routes, which can happen after the
- * {@link CamelContext} itself is in started state, due the asynchronous event nature of especially Blueprint.
+ * As the startup procedure of {@link CamelContext} is slightly different when using plain Java versus camel-spring-xml or
+ * camel-blueprint, then we need to know when spring/blueprint are setting up the routes, which can happen after the
+ * {@link CamelContext} itself is in started state, due the asynchronous event nature of especially blueprint.
*
* @return <tt>true</tt> if current thread is setting up route(s), or <tt>false</tt> if not.
*/
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
index 546bb1f..38374a8 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
@@ -52,9 +52,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * A helper class for Camel based injector or post processing hooks which can be reused by both the
- * <a href="http://camel.apache.org/spring.html">Spring</a> and
- * <a href="http://camel.apache.org/blueprint.html">Blueprint</a> support.
+ * A helper class for Camel based injector or bean post processing hooks.
*/
public class CamelPostProcessorHelper implements CamelContextAware {
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java
index 4fcc094..d71257d 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java
@@ -60,7 +60,7 @@ import static org.apache.camel.util.ObjectHelper.isEmpty;
* {@link org.apache.camel.RoutingSlip} for creating <a href="http://camel.apache.org/routingslip-annotation.html">a
* Routing Slip router via annotations</a>.
* <p/>
- * Components such as <tt>camel-spring</tt>, and <tt>camel-blueprint</tt> can leverage this post processor to hook in
+ * Components such as camel-spring or camel-blueprint can leverage this post processor to hook in
* Camel bean post processing into their bean processing framework.
*/
public class DefaultCamelBeanPostProcessor implements CamelBeanPostProcessor {
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
index a5aa0f5..711748f 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
@@ -107,8 +107,7 @@ public class SimpleCamelContext extends AbstractCamelContext {
/**
* Creates the {@link CamelContext} and allows to control whether the context should automatic initialize or not.
* <p/>
- * This is used by some Camel components such as camel-cdi and camel-blueprint, however this constructor is not
- * intended for regular Camel end users.
+ * Note: Not for end users - this method is used internally by camel-blueprint/camel-cdi
*
* @param init whether to automatic initialize.
*/
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java
index d546772..59b09ee 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java
@@ -123,9 +123,8 @@ public class RouteDefinition extends OutputDefinition<RouteDefinition> implement
/**
* Marks the route definition as prepared.
* <p/>
- * This is needed if routes have been created by components such as <tt>camel-spring</tt> or
- * <tt>camel-blueprint</tt>. Usually they share logic in the <tt>camel-core-xml</tt> module which prepares the
- * routes.
+ * This is needed if routes have been created by components such as camel-spring-xml or camel-blueprint.
+ * Usually they share logic in the camel-core-xml module which prepares the routes.
*/
public void markPrepared() {
prepared.set(true);