You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ra...@apache.org on 2011/02/16 17:05:12 UTC
svn commit: r1071296 - in
/camel/trunk/camel-core/src/main/java/org/apache/camel:
builder/RouteBuilder.java model/FilterDefinition.java
model/ProcessorDefinition.java model/RouteDefinition.java
Author: rajdavies
Date: Wed Feb 16 16:05:11 2011
New Revision: 1071296
URL: http://svn.apache.org/viewvc?rev=1071296&view=rev
Log:
fix for https://issues.apache.org/jira/browse/CAMEL-3672
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java?rev=1071296&r1=1071295&r2=1071296&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java Wed Feb 16 16:05:11 2011
@@ -50,7 +50,7 @@ public abstract class RouteBuilder exten
@Override
public String toString() {
- return routeCollection.toString();
+ return getRouteCollection().toString();
}
/**
@@ -70,8 +70,8 @@ public abstract class RouteBuilder exten
* @return the builder
*/
public RouteDefinition from(String uri) {
- routeCollection.setCamelContext(getContext());
- RouteDefinition answer = routeCollection.from(uri);
+ getRouteCollection().setCamelContext(getContext());
+ RouteDefinition answer = getRouteCollection().from(uri);
configureRoute(answer);
return answer;
}
@@ -84,8 +84,8 @@ public abstract class RouteBuilder exten
* @return the builder
*/
public RouteDefinition fromF(String uri, Object... args) {
- routeCollection.setCamelContext(getContext());
- RouteDefinition answer = routeCollection.from(String.format(uri, args));
+ getRouteCollection().setCamelContext(getContext());
+ RouteDefinition answer = getRouteCollection().from(String.format(uri, args));
configureRoute(answer);
return answer;
}
@@ -97,8 +97,8 @@ public abstract class RouteBuilder exten
* @return the builder
*/
public RouteDefinition from(Endpoint endpoint) {
- routeCollection.setCamelContext(getContext());
- RouteDefinition answer = routeCollection.from(endpoint);
+ getRouteCollection().setCamelContext(getContext());
+ RouteDefinition answer = getRouteCollection().from(endpoint);
configureRoute(answer);
return answer;
}
@@ -110,8 +110,8 @@ public abstract class RouteBuilder exten
* @return the builder
*/
public RouteDefinition from(String... uris) {
- routeCollection.setCamelContext(getContext());
- RouteDefinition answer = routeCollection.from(uris);
+ getRouteCollection().setCamelContext(getContext());
+ RouteDefinition answer = getRouteCollection().from(uris);
configureRoute(answer);
return answer;
}
@@ -123,8 +123,8 @@ public abstract class RouteBuilder exten
* @return the builder
*/
public RouteDefinition from(Endpoint... endpoints) {
- routeCollection.setCamelContext(getContext());
- RouteDefinition answer = routeCollection.from(endpoints);
+ getRouteCollection().setCamelContext(getContext());
+ RouteDefinition answer = getRouteCollection().from(endpoints);
configureRoute(answer);
return answer;
}
@@ -136,10 +136,10 @@ public abstract class RouteBuilder exten
* @return the current builder with the error handler configured
*/
public RouteBuilder errorHandler(ErrorHandlerBuilder errorHandlerBuilder) {
- if (!routeCollection.getRoutes().isEmpty()) {
+ if (!getRouteCollection().getRoutes().isEmpty()) {
throw new IllegalArgumentException("errorHandler must be defined before any routes in the RouteBuilder");
}
- routeCollection.setCamelContext(getContext());
+ getRouteCollection().setCamelContext(getContext());
setErrorHandlerBuilder(errorHandlerBuilder);
return this;
}
@@ -150,11 +150,11 @@ public abstract class RouteBuilder exten
* @return the builder
*/
public InterceptDefinition intercept() {
- if (!routeCollection.getRoutes().isEmpty()) {
+ if (!getRouteCollection().getRoutes().isEmpty()) {
throw new IllegalArgumentException("intercept must be defined before any routes in the RouteBuilder");
}
- routeCollection.setCamelContext(getContext());
- return routeCollection.intercept();
+ getRouteCollection().setCamelContext(getContext());
+ return getRouteCollection().intercept();
}
/**
@@ -163,11 +163,11 @@ public abstract class RouteBuilder exten
* @return the builder
*/
public InterceptFromDefinition interceptFrom() {
- if (!routeCollection.getRoutes().isEmpty()) {
+ if (!getRouteCollection().getRoutes().isEmpty()) {
throw new IllegalArgumentException("interceptFrom must be defined before any routes in the RouteBuilder");
}
- routeCollection.setCamelContext(getContext());
- return routeCollection.interceptFrom();
+ getRouteCollection().setCamelContext(getContext());
+ return getRouteCollection().interceptFrom();
}
/**
@@ -177,11 +177,11 @@ public abstract class RouteBuilder exten
* @return the builder
*/
public InterceptFromDefinition interceptFrom(String uri) {
- if (!routeCollection.getRoutes().isEmpty()) {
+ if (!getRouteCollection().getRoutes().isEmpty()) {
throw new IllegalArgumentException("interceptFrom must be defined before any routes in the RouteBuilder");
}
- routeCollection.setCamelContext(getContext());
- return routeCollection.interceptFrom(uri);
+ getRouteCollection().setCamelContext(getContext());
+ return getRouteCollection().interceptFrom(uri);
}
/**
@@ -191,11 +191,11 @@ public abstract class RouteBuilder exten
* @return the builder
*/
public InterceptSendToEndpointDefinition interceptSendToEndpoint(String uri) {
- if (!routeCollection.getRoutes().isEmpty()) {
+ if (!getRouteCollection().getRoutes().isEmpty()) {
throw new IllegalArgumentException("interceptSendToEndpoint must be defined before any routes in the RouteBuilder");
}
- routeCollection.setCamelContext(getContext());
- return routeCollection.interceptSendToEndpoint(uri);
+ getRouteCollection().setCamelContext(getContext());
+ return getRouteCollection().interceptSendToEndpoint(uri);
}
/**
@@ -207,11 +207,11 @@ public abstract class RouteBuilder exten
*/
public OnExceptionDefinition onException(Class exception) {
// is only allowed at the top currently
- if (!routeCollection.getRoutes().isEmpty()) {
+ if (!getRouteCollection().getRoutes().isEmpty()) {
throw new IllegalArgumentException("onException must be defined before any routes in the RouteBuilder");
}
- routeCollection.setCamelContext(getContext());
- return routeCollection.onException(exception);
+ getRouteCollection().setCamelContext(getContext());
+ return getRouteCollection().onException(exception);
}
/**
@@ -237,11 +237,11 @@ public abstract class RouteBuilder exten
*/
public OnCompletionDefinition onCompletion() {
// is only allowed at the top currently
- if (!routeCollection.getRoutes().isEmpty()) {
+ if (!getRouteCollection().getRoutes().isEmpty()) {
throw new IllegalArgumentException("onCompletion must be defined before any routes in the RouteBuilder");
}
- routeCollection.setCamelContext(getContext());
- return routeCollection.onCompletion();
+ getRouteCollection().setCamelContext(getContext());
+ return getRouteCollection().onCompletion();
}
// Properties
@@ -303,7 +303,7 @@ public abstract class RouteBuilder exten
@Override
public void setErrorHandlerBuilder(ErrorHandlerBuilder errorHandlerBuilder) {
super.setErrorHandlerBuilder(errorHandlerBuilder);
- routeCollection.setErrorHandlerBuilder(getErrorHandlerBuilder());
+ getRouteCollection().setErrorHandlerBuilder(getErrorHandlerBuilder());
}
// Implementation methods
@@ -329,8 +329,8 @@ public abstract class RouteBuilder exten
if (camelContext == null) {
throw new IllegalArgumentException("CamelContext has not been injected!");
}
- routeCollection.setCamelContext(camelContext);
- camelContext.addRouteDefinitions(routeCollection.getRoutes());
+ getRouteCollection().setCamelContext(camelContext);
+ camelContext.addRouteDefinitions(getRouteCollection().getRoutes());
}
public void setRouteCollection(RoutesDefinition routeCollection) {
@@ -343,6 +343,7 @@ public abstract class RouteBuilder exten
/**
* Factory method
+ * @return the CamelContext
*/
protected CamelContext createContainer() {
return new DefaultCamelContext();
@@ -355,6 +356,7 @@ public abstract class RouteBuilder exten
/**
* Adds a collection of routes to this context
*
+ * @param routes
* @throws Exception if the routes could not be created for whatever reason
* @deprecated use {@link #includeRoutes(org.apache.camel.RoutesBuilder) includeRoutes} instead.
*/
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java?rev=1071296&r1=1071295&r2=1071296&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java Wed Feb 16 16:05:11 2011
@@ -68,7 +68,7 @@ public class FilterDefinition extends Ex
* Set the expression that this FilterType will use
* @return the builder
*/
- public ExpressionClause<FilterDefinition> expression() {
+ public ExpressionClause<? extends FilterDefinition> expression() {
return ExpressionClause.createAndSetExpression(this);
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java?rev=1071296&r1=1071295&r2=1071296&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java Wed Feb 16 16:05:11 2011
@@ -1103,7 +1103,7 @@ public abstract class ProcessorDefinitio
*
* @return the clause used to create the filter expression
*/
- public ExpressionClause<FilterDefinition> filter() {
+ public ExpressionClause<? extends FilterDefinition> filter() {
FilterDefinition filter = new FilterDefinition();
addOutput(filter);
return ExpressionClause.createAndSetExpression(filter);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java?rev=1071296&r1=1071295&r2=1071296&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java Wed Feb 16 16:05:11 2011
@@ -591,7 +591,7 @@ public class RouteDefinition extends Pro
/**
* Sets the error handler if one is not already set
*/
- protected void setErrorHandlerBuilderIfNull(ErrorHandlerBuilder errorHandlerBuilder) {
+ public void setErrorHandlerBuilderIfNull(ErrorHandlerBuilder errorHandlerBuilder) {
if (this.errorHandlerBuilder == null) {
setErrorHandlerBuilder(errorHandlerBuilder);
}