Author: ningjiang
Date: Sat Sep 13 20:32:25 2008
New Revision: 695104
URL: http://svn.apache.org/viewvc?rev=695104&view=rev
Log:
Fixed the CS errors in camel-core
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiErrorHandlerInRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationTest.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java?rev=695104&r1=695103&r2=695104&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
Sat Sep 13 20:32:25 2008
@@ -63,13 +63,13 @@
@Override
public String toString() {
- return "RedeliveryPolicy[maximumRedeliveries=" + maximumRedeliveries +
- ", initialRedeliveryDelay=" + delay +
- ", maximumRedeliveryDelay=" + maximumRedeliveryDelay +
- ", useExponentialBackOff=" + useExponentialBackOff +
- ", backOffMultiplier=" + backOffMultiplier +
- ", useCollisionAvoidance=" + useCollisionAvoidance +
- ", collisionAvoidanceFactor=" + collisionAvoidanceFactor + "]";
+ return "RedeliveryPolicy[maximumRedeliveries=" + maximumRedeliveries
+ + ", initialRedeliveryDelay=" + delay
+ + ", maximumRedeliveryDelay=" + maximumRedeliveryDelay
+ + ", useExponentialBackOff=" + useExponentialBackOff
+ + ", backOffMultiplier=" + backOffMultiplier
+ + ", useCollisionAvoidance=" + useCollisionAvoidance
+ + ", collisionAvoidanceFactor=" + collisionAvoidanceFactor + "]";
}
public RedeliveryPolicy copy() {
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java?rev=695104&r1=695103&r2=695104&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Splitter.java
Sat Sep 13 20:32:25 2008
@@ -16,7 +16,6 @@
*/
package org.apache.camel.processor;
-import static org.apache.camel.util.ObjectHelper.notNull;
import java.util.ArrayList;
import java.util.Collection;
@@ -33,6 +32,8 @@
import org.apache.camel.util.CollectionHelper;
import org.apache.camel.util.ObjectHelper;
+import static org.apache.camel.util.ObjectHelper.notNull;
+
/**
* Implements a dynamic <a
* href="http://activemq.apache.org/camel/splitter.html";>Splitter</a> pattern
@@ -71,7 +72,7 @@
@Override
protected Iterable<ProcessorExchangePair>
createProcessorExchangePairs(Exchange exchange) {
Object value = expression.evaluate(exchange);
-
+
if (streaming) {
return createProcessorExchangePairsIterable(exchange, value);
} else {
@@ -103,7 +104,7 @@
}
};
}
-
+
};
}
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiErrorHandlerInRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiErrorHandlerInRouteTest.java?rev=695104&r1=695103&r2=695104&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiErrorHandlerInRouteTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiErrorHandlerInRouteTest.java
Sat Sep 13 20:32:25 2008
@@ -90,7 +90,7 @@
.process(outer)
.to("direct:outer");
- from("direct:outer")
+ from("direct:outer")
.errorHandler(deadLetterChannel("mock:inner").maximumRedeliveries(2))
.process(inner)
.to("mock:end");
@@ -113,5 +113,5 @@
this.name = name;
}
}
-
+
}
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationTest.java?rev=695104&r1=695103&r2=695104&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationTest.java
Sat Sep 13 20:32:25 2008
@@ -18,8 +18,8 @@
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Processor;
-import org.apache.camel.ValidationException;
import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.ValidationException;
import org.apache.camel.builder.Builder;
import org.apache.camel.builder.ProcessorBuilder;
import org.apache.camel.builder.RouteBuilder;
@@ -81,7 +81,7 @@
validEndpoint = resolveMandatoryEndpoint("mock:valid",
MockEndpoint.class);
invalidEndpoint = resolveMandatoryEndpoint("mock:invalid",
MockEndpoint.class);
-
+
validEndpoint.whenAnyExchangeReceived(ProcessorBuilder.setOutBody(Builder.constant("validResult")));
invalidEndpoint.whenAnyExchangeReceived(ProcessorBuilder.setOutBody(Builder.constant("invalidResult")));
}
