You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/07/09 04:25:02 UTC
svn commit: r1144577 - in /camel/branches/camel-2.7.x/camel-core/src:
main/java/org/apache/camel/builder/
main/java/org/apache/camel/language/bean/ main/java/org/apache/camel/model/
test/java/org/apache/camel/language/
Author: dkulp
Date: Sat Jul 9 02:25:01 2011
New Revision: 1144577
URL: http://svn.apache.org/viewvc?rev=1144577&view=rev
Log:
Fix some checkstyle things
Modified:
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/language/SimpleTest.java
Modified: camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java?rev=1144577&r1=1144576&r2=1144577&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java (original)
+++ camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java Sat Jul 9 02:25:01 2011
@@ -183,10 +183,10 @@ public final class ExpressionBuilder {
List<String> methods;
if (ognl.startsWith("[") && ognl.endsWith("]")) {
- methods = new ArrayList<String>();
- methods.add(ognl);
+ methods = new ArrayList<String>();
+ methods.add(ognl);
} else {
- methods = OgnlHelper.splitOgnl(ognl);
+ methods = OgnlHelper.splitOgnl(ognl);
}
// remove any OGNL operators so we got the pure key name
Modified: camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java?rev=1144577&r1=1144576&r2=1144577&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java (original)
+++ camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java Sat Jul 9 02:25:01 2011
@@ -189,10 +189,10 @@ public class BeanExpression implements E
List<String> methods;
if (ognl.startsWith("[") && ognl.endsWith("]")) {
- methods = new ArrayList<String>();
- methods.add(ognl);
+ methods = new ArrayList<String>();
+ methods.add(ognl);
} else {
- methods = OgnlHelper.splitOgnl(ognl);
+ methods = OgnlHelper.splitOgnl(ognl);
}
for (String methodName : methods) {
Modified: camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java?rev=1144577&r1=1144576&r2=1144577&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java (original)
+++ camel/branches/camel-2.7.x/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java Sat Jul 9 02:25:01 2011
@@ -230,7 +230,7 @@ public class RouteDefinition extends Pro
// we must check the error handler on builder is not the same as on camel context, as that would be the default
// context scoped error handler, in case no error handlers was configured
if (builder.getRouteCollection().getErrorHandlerBuilder() != null
- && camelContext.getErrorHandlerBuilder() != builder.getRouteCollection().getErrorHandlerBuilder() ) {
+ && camelContext.getErrorHandlerBuilder() != builder.getRouteCollection().getErrorHandlerBuilder()) {
throw new IllegalArgumentException("You can not advice with error handlers. Remove the error handlers from the route builder.");
}
Modified: camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/language/SimpleTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/language/SimpleTest.java?rev=1144577&r1=1144576&r2=1144577&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/language/SimpleTest.java (original)
+++ camel/branches/camel-2.7.x/camel-core/src/test/java/org/apache/camel/language/SimpleTest.java Sat Jul 9 02:25:01 2011
@@ -391,10 +391,10 @@ public class SimpleTest extends Language
public void testOGNLHeaderMapWithDot() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
- map.put("this.code","This code");
+ map.put("this.code", "This code");
exchange.getIn().setHeader("wicket", map);
- assertExpression("${header.wicket[this.code]}","This code");
+ assertExpression("${header.wicket[this.code]}", "This code");
}
public void testOGNLHeaderMapNotMap() throws Exception {