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 2014/12/30 11:42:30 UTC
[14/29] camel git commit: CAMEL-7999: JAXB in DSL should be aligned
and all use XmlAccessType.FIELD
CAMEL-7999: JAXB in DSL should be aligned and all use XmlAccessType.FIELD
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/24dfea82
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/24dfea82
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/24dfea82
Branch: refs/heads/master
Commit: 24dfea825f07e6081f14b5e58d6ad36d841bbc6f
Parents: 294c91a
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Dec 26 15:10:48 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Dec 30 10:56:42 2014 +0100
----------------------------------------------------------------------
.../model/OptionalIdentifiedDefinition.java | 15 +++++-
.../apache/camel/model/ProcessorDefinition.java | 26 +++++------
.../org/apache/camel/model/RouteDefinition.java | 48 ++++++++++----------
3 files changed, 48 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/24dfea82/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java b/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
index 1000750..43caaf9 100644
--- a/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
@@ -34,9 +34,9 @@ import org.apache.camel.spi.NodeIdFactory;
*/
@XmlType(name = "optionalIdentifiedDefinition")
@XmlAccessorType(XmlAccessType.PROPERTY)
+// must use XmlAccessType.PROPERTY which is required by camel-spring / camel-blueprint for their namespace parsers
public abstract class OptionalIdentifiedDefinition<T extends OptionalIdentifiedDefinition<T>> implements NamedNode {
- @XmlTransient
- private String shortName;
+ private transient String shortName;
private String id;
private Boolean customId;
private DescriptionDefinition description;
@@ -62,6 +62,11 @@ public abstract class OptionalIdentifiedDefinition<T extends OptionalIdentifiedD
return description;
}
+ /**
+ * Sets the description of this node
+ *
+ * @param description sets the text description, use null to not set a text
+ */
@XmlElement
public void setDescription(DescriptionDefinition description) {
this.description = description;
@@ -159,10 +164,16 @@ public abstract class OptionalIdentifiedDefinition<T extends OptionalIdentifiedD
return getId();
}
+ /**
+ * Whether the node id was explicit set, or was auto generated by Camel.
+ */
public Boolean isCustomId() {
return customId;
}
+ /**
+ * Whether the node id was explicit set, or was auto generated by Camel.
+ */
@XmlAttribute
public void setCustomId(Boolean customId) {
this.customId = customId;
http://git-wip-us.apache.org/repos/asf/camel/blob/24dfea82/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
index d90bea0..63f2053 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
@@ -75,17 +75,24 @@ import org.slf4j.LoggerFactory;
*
* @version
*/
-@XmlAccessorType(XmlAccessType.PROPERTY)
+@XmlAccessorType(XmlAccessType.FIELD)
public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>> extends OptionalIdentifiedDefinition<Type> implements Block {
+ @XmlTransient
private static final AtomicInteger COUNTER = new AtomicInteger();
+ @XmlTransient
protected final Logger log = LoggerFactory.getLogger(getClass());
-
+ @XmlAttribute
protected Boolean inheritErrorHandler;
+ @XmlTransient
private final LinkedList<Block> blocks = new LinkedList<Block>();
+ @XmlTransient
private ProcessorDefinition<?> parent;
+ @XmlTransient
private final List<InterceptStrategy> interceptStrategies = new ArrayList<InterceptStrategy>();
// use xs:any to support optional property placeholders
+ @XmlAnyAttribute
private Map<QName, Object> otherAttributes;
+ @XmlTransient
private final int index;
protected ProcessorDefinition() {
@@ -100,7 +107,6 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
*
* @return the index number
*/
- @XmlTransient // do not expose this in the XML DSL
public int getIndex() {
return index;
}
@@ -1600,7 +1606,6 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @return the builder
* @deprecated prefer to use {@link #routingSlip(org.apache.camel.Expression, String)} instead
*/
- @SuppressWarnings("unchecked")
@Deprecated
public Type routingSlip(String header, String uriDelimiter) {
RoutingSlipDefinition<Type> answer = new RoutingSlipDefinition<Type>(header, uriDelimiter);
@@ -1622,7 +1627,6 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @return the builder
* @deprecated prefer to use {@link #routingSlip(org.apache.camel.Expression)} instead
*/
- @SuppressWarnings("unchecked")
@Deprecated
public Type routingSlip(String header) {
RoutingSlipDefinition<Type> answer = new RoutingSlipDefinition<Type>(header);
@@ -1646,7 +1650,6 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @return the builder
* @deprecated prefer to use {@link #routingSlip()} instead
*/
- @SuppressWarnings("unchecked")
@Deprecated
public Type routingSlip(String header, String uriDelimiter, boolean ignoreInvalidEndpoints) {
RoutingSlipDefinition<Type> answer = new RoutingSlipDefinition<Type>(header, uriDelimiter);
@@ -1671,7 +1674,6 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @return the builder
* @deprecated prefer to use {@link #routingSlip()} instead
*/
- @SuppressWarnings("unchecked")
@Deprecated
public Type routingSlip(String header, boolean ignoreInvalidEndpoints) {
RoutingSlipDefinition<Type> answer = new RoutingSlipDefinition<Type>(header);
@@ -2074,7 +2076,6 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @param exception the exception to throw
* @return the builder
*/
- @SuppressWarnings("unchecked")
public Type throwException(Exception exception) {
ThrowExceptionDefinition answer = new ThrowExceptionDefinition();
answer.setException(exception);
@@ -2092,7 +2093,6 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @see #rollback(String)
* @see #markRollbackOnlyLast()
*/
- @SuppressWarnings("unchecked")
public Type markRollbackOnly() {
RollbackDefinition answer = new RollbackDefinition();
answer.setMarkRollbackOnly(true);
@@ -2113,7 +2113,6 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @see #rollback(String)
* @see #markRollbackOnly()
*/
- @SuppressWarnings("unchecked")
public Type markRollbackOnlyLast() {
RollbackDefinition answer = new RollbackDefinition();
answer.setMarkRollbackOnlyLast(true);
@@ -2144,7 +2143,6 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* @return the builder
* @see #markRollbackOnly()
*/
- @SuppressWarnings("unchecked")
public Type rollback(String message) {
RollbackDefinition answer = new RollbackDefinition(message);
addOutput(answer);
@@ -2305,6 +2303,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
return blocks.isEmpty() ? null : blocks.removeLast();
}
+ @SuppressWarnings("unchecked")
public Type startupOrder(int startupOrder) {
ProcessorDefinition<?> def = this;
@@ -2559,6 +2558,7 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
* Cache can be enabled if the bean in the Registry is defined as a singleton scope.
* @return the builder
*/
+ @SuppressWarnings("unchecked")
public Type bean(Class<?> beanType, String method, boolean multiParameterArray, boolean cache) {
BeanDefinition answer = new BeanDefinition();
answer.setBeanType(beanType);
@@ -3403,7 +3403,6 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
// Properties
// -------------------------------------------------------------------------
- @XmlTransient
public ProcessorDefinition<?> getParent() {
return parent;
}
@@ -3412,7 +3411,6 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
this.parent = parent;
}
- @XmlTransient
public List<InterceptStrategy> getInterceptStrategies() {
return interceptStrategies;
}
@@ -3425,7 +3423,6 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
return inheritErrorHandler;
}
- @XmlAttribute
public void setInheritErrorHandler(Boolean inheritErrorHandler) {
this.inheritErrorHandler = inheritErrorHandler;
}
@@ -3434,7 +3431,6 @@ public abstract class ProcessorDefinition<Type extends ProcessorDefinition<Type>
return otherAttributes;
}
- @XmlAnyAttribute
public void setOtherAttributes(Map<QName, Object> otherAttributes) {
this.otherAttributes = otherAttributes;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/24dfea82/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java b/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
index 989eccc..b1d90bb 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
@@ -60,29 +60,49 @@ import org.apache.camel.util.ObjectHelper;
*/
@XmlRootElement(name = "route")
@XmlType(propOrder = {"inputs", "outputs"})
-@XmlAccessorType(XmlAccessType.PROPERTY)
+@XmlAccessorType(XmlAccessType.FIELD)
public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
+ @XmlTransient
private final AtomicBoolean prepared = new AtomicBoolean(false);
+ @XmlElementRef
private List<FromDefinition> inputs = new ArrayList<FromDefinition>();
+ @XmlElementRef
private List<ProcessorDefinition<?>> outputs = new ArrayList<ProcessorDefinition<?>>();
+ @XmlAttribute
private String group;
+ @XmlAttribute
private String streamCache;
+ @XmlAttribute
private String trace;
+ @XmlAttribute
private String messageHistory;
+ @XmlAttribute
private String handleFault;
+ @XmlAttribute
private String delayer;
+ @XmlAttribute
private String autoStartup;
+ @XmlAttribute
private Integer startupOrder;
+ @XmlTransient
private List<RoutePolicy> routePolicies;
+ @XmlAttribute
private String routePolicyRef;
+ @XmlAttribute
private ShutdownRoute shutdownRoute;
+ @XmlAttribute
private ShutdownRunningTask shutdownRunningTask;
+ @XmlAttribute
private String errorHandlerRef;
+ @XmlTransient
private ErrorHandlerFactory errorHandlerBuilder;
// keep state whether the error handler is context scoped or not
// (will by default be context scoped of no explicit error handler configured)
+ @XmlTransient
private boolean contextScopedErrorHandler = true;
+ @XmlAttribute
private Boolean rest;
+ @XmlTransient
private RestDefinition restDefinition;
public RouteDefinition() {
@@ -577,7 +597,6 @@ public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
return inputs;
}
- @XmlElementRef
public void setInputs(List<FromDefinition> inputs) {
this.inputs = inputs;
}
@@ -586,7 +605,6 @@ public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
return outputs;
}
- @XmlElementRef
public void setOutputs(List<ProcessorDefinition<?>> outputs) {
this.outputs = outputs;
@@ -611,7 +629,6 @@ public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
return group;
}
- @XmlAttribute
public void setGroup(String group) {
this.group = group;
}
@@ -620,7 +637,6 @@ public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
return streamCache;
}
- @XmlAttribute
public void setStreamCache(String streamCache) {
this.streamCache = streamCache;
}
@@ -629,7 +645,6 @@ public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
return trace;
}
- @XmlAttribute
public void setTrace(String trace) {
this.trace = trace;
}
@@ -638,7 +653,6 @@ public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
return messageHistory;
}
- @XmlAttribute
public void setMessageHistory(String messageHistory) {
this.messageHistory = messageHistory;
}
@@ -647,7 +661,6 @@ public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
return handleFault;
}
- @XmlAttribute
public void setHandleFault(String handleFault) {
this.handleFault = handleFault;
}
@@ -656,7 +669,6 @@ public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
return delayer;
}
- @XmlAttribute
public void setDelayer(String delayer) {
this.delayer = delayer;
}
@@ -674,7 +686,6 @@ public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
return isAutoStartup != null && isAutoStartup;
}
- @XmlAttribute
public void setAutoStartup(String autoStartup) {
this.autoStartup = autoStartup;
}
@@ -683,7 +694,6 @@ public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
return startupOrder;
}
- @XmlAttribute
public void setStartupOrder(Integer startupOrder) {
this.startupOrder = startupOrder;
}
@@ -691,7 +701,6 @@ public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
/**
* Sets the bean ref name of the error handler builder to use on this route
*/
- @XmlAttribute
public void setErrorHandlerRef(String errorHandlerRef) {
this.errorHandlerRef = errorHandlerRef;
// we use an specific error handler ref (from Spring DSL) then wrap that
@@ -712,7 +721,6 @@ public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
}
}
- @XmlAttribute
public void setRoutePolicyRef(String routePolicyRef) {
this.routePolicyRef = routePolicyRef;
}
@@ -725,7 +733,6 @@ public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
return routePolicies;
}
- @XmlTransient
public void setRoutePolicies(List<RoutePolicy> routePolicies) {
this.routePolicies = routePolicies;
}
@@ -734,7 +741,6 @@ public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
return shutdownRoute;
}
- @XmlAttribute
public void setShutdownRoute(ShutdownRoute shutdownRoute) {
this.shutdownRoute = shutdownRoute;
}
@@ -743,7 +749,6 @@ public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
return shutdownRunningTask;
}
- @XmlAttribute
public void setShutdownRunningTask(ShutdownRunningTask shutdownRunningTask) {
this.shutdownRunningTask = shutdownRunningTask;
}
@@ -757,7 +762,6 @@ public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
return new ErrorHandlerBuilderRef(ErrorHandlerBuilderRef.DEFAULT_ERROR_HANDLER_BUILDER);
}
- @XmlTransient
public ErrorHandlerFactory getErrorHandlerBuilder() {
if (errorHandlerBuilder == null) {
errorHandlerBuilder = createErrorHandlerBuilder();
@@ -772,7 +776,6 @@ public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
this.errorHandlerBuilder = errorHandlerBuilder;
}
- @XmlAttribute
public Boolean isRest() {
return rest;
}
@@ -781,7 +784,6 @@ public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
return restDefinition;
}
- @XmlTransient
public void setRestDefinition(RestDefinition restDefinition) {
this.restDefinition = restDefinition;
}
@@ -799,7 +801,7 @@ public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
return routeScoped != null && contextScoped != null && routeScoped == contextScoped;
}
- return contextScopedErrorHandler;
+ return true;
}
// Implementation methods
@@ -916,10 +918,8 @@ public class RouteDefinition extends ProcessorDefinition<RouteDefinition> {
routeContext.setInterceptStrategies(this.getInterceptStrategies());
// force endpoint resolution
routeContext.getEndpoint();
- if (camelContext != null) {
- for (LifecycleStrategy strategy : camelContext.getLifecycleStrategies()) {
- strategy.onRouteContextCreate(routeContext);
- }
+ for (LifecycleStrategy strategy : camelContext.getLifecycleStrategies()) {
+ strategy.onRouteContextCreate(routeContext);
}
// validate route has output processors