Author: ningjiang
Date: Fri Jun 27 06:50:03 2008
New Revision: 672271
URL: http://svn.apache.org/viewvc?rev=672271&view=rev
Log:
Fixed the CS errors
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTestSupport.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateAndProceedRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateAndStopRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithStopRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithoutProceedRouteTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceTest.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java?rev=672271&r1=672270&r2=672271&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java
Fri Jun 27 06:50:03 2008
@@ -57,7 +57,7 @@
public String getShortName() {
return "intercept";
}
-
+
@Override
public Processor createProcessor(RouteContext routeContext) throws
Exception {
Interceptor interceptor = new Interceptor();
@@ -73,7 +73,7 @@
* Applies this interceptor only if the given predicate is true
*/
public ChoiceType when(Predicate predicate) {
- usePredicate = Boolean.TRUE;
+ usePredicate = Boolean.TRUE;
ChoiceType choice = choice().when(PredicateBuilder.not(predicate));
choice.addOutput(proceed);
return choice.otherwise();
@@ -84,7 +84,7 @@
}
public void stopIntercept() {
- stop = Boolean.TRUE;
+ stop = Boolean.TRUE;
}
public InterceptType createProxy() {
@@ -97,16 +97,16 @@
// outputs of the otherwise or last when clause for the predicated
version.
if (answer.getOutputs().size() > 0) {
// this is for the predicate version or if a choice() is present
- ChoiceType choice = null;
+ ChoiceType choice = null;
for (ProcessorType processor : answer.getOutputs()) {
- if (processor instanceof ChoiceType) {
+ if (processor instanceof ChoiceType) {
choice = (ChoiceType) processor;
-
+
// for the predicated version we add the proceed() to
otherwise()
// before knowing if stop() will follow, so let's make a
small adjustment
if (usePredicate.booleanValue() && stop.booleanValue()) {
- WhenType when = choice.getWhenClauses().get(0);
- when.getOutputs().remove(this.getProceed());
+ WhenType when = choice.getWhenClauses().get(0);
+ when.getOutputs().remove(this.getProceed());
}
addProceedProxy(this.getProceed(), answer.getProceed(),
choice.getWhenClauses().get(choice.getWhenClauses().size() - 1),
usePredicate.booleanValue() && !stop.booleanValue());
@@ -117,7 +117,7 @@
if (choice == null) {
addProceedProxy(this.getProceed(), answer.getProceed(),
answer, !stop.booleanValue());
}
- }
+ }
return answer;
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedType.java?rev=672271&r1=672270&r2=672271&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedType.java
Fri Jun 27 06:50:03 2008
@@ -16,10 +16,9 @@
*/
package org.apache.camel.model;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.Collections;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -40,7 +39,7 @@
@XmlAccessorType(XmlAccessType.FIELD)
public abstract class OptionalIdentifiedType<T extends OptionalIdentifiedType>
{
@XmlTransient
- protected static Map<String,AtomicInteger> nodeCounters = new
HashMap<String, AtomicInteger>();
+ protected static Map<String, AtomicInteger> nodeCounters = new
HashMap<String, AtomicInteger>();
@XmlAttribute(required = false)
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@XmlID
@@ -116,7 +115,7 @@
// Implementation methods
//
-------------------------------------------------------------------------
-
+
/**
* A helper method to create a new ID for this node
*/
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java?rev=672271&r1=672270&r2=672271&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
Fri Jun 27 06:50:03 2008
@@ -934,7 +934,7 @@
if (currentProcessor instanceof InterceptType) {
((InterceptType) currentProcessor).stopIntercept();
} else {
- ProcessorType node;
+ ProcessorType node;
for (node = parent; node != null; node = node.getParent()) {
if (node instanceof InterceptType) {
((InterceptType) node).stopIntercept();
@@ -948,7 +948,7 @@
return (Type) this;
}
-
+
public ExceptionType exception(Class exceptionType) {
ExceptionType answer = new ExceptionType(exceptionType);
addOutput(answer);
@@ -1534,8 +1534,8 @@
if (!interceptors.contains(interceptor)) {
interceptors.add(interceptor);
if (interceptor.getProcessor() != null) {
- LOG.warn("Interceptor " + interceptor + " currently wraps
target "
- + interceptor.getProcessor()
+ LOG.warn("Interceptor " + interceptor + " currently wraps
target "
+ + interceptor.getProcessor()
+ " is attempting to change target " + target
+ " new wrapping has been denied.");
} else {
@@ -1556,13 +1556,13 @@
if (target == null) {
throw new RuntimeCamelException("target not provided.");
}
-
+
ErrorHandlerWrappingStrategy strategy =
routeContext.getErrorHandlerWrappingStrategy();
-
+
if (strategy != null) {
return strategy.wrapProcessorInErrorHandler(this, target);
}
-
+
return getErrorHandlerBuilder().createErrorHandler(target);
}
@@ -1605,12 +1605,12 @@
for (ProcessorType output : outputs) {
Processor processor = output.createProcessor(routeContext);
processor = output.wrapProcessorInInterceptors(routeContext,
processor);
-
- ProcessorType currentProcessor = this;
+
+ ProcessorType currentProcessor = this;
if (!(currentProcessor instanceof ExceptionType ||
currentProcessor instanceof TryType)) {
processor = output.wrapInErrorHandler(routeContext, processor);
}
-
+
list.add(processor);
}
Processor processor = null;
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java?rev=672271&r1=672270&r2=672271&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/TraceFormatter.java
Fri Jun 27 06:50:03 2008
@@ -18,8 +18,8 @@
import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import org.apache.camel.util.ObjectHelper;
import org.apache.camel.spi.UnitOfWork;
+import org.apache.camel.util.ObjectHelper;
/**
* @version $Revision: 1.1 $
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTest.java?rev=672271&r1=672270&r2=672271&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTest.java
Fri Jun 27 06:50:03 2008
@@ -22,7 +22,7 @@
* @version $Revision$
*/
public class InterceptRouteTest extends InterceptRouteTestSupport {
- @Override
+ @Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
@@ -35,15 +35,15 @@
};
}
- @Override
- protected void prepareMatchingTest() {
+ @Override
+ protected void prepareMatchingTest() {
a.expectedMessageCount(0);
b.expectedMessageCount(1);
}
- @Override
- protected void prepareNonMatchingTest() {
+ @Override
+ protected void prepareNonMatchingTest() {
a.expectedMessageCount(1);
b.expectedMessageCount(0);
- }
+ }
}
\ No newline at end of file
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTestSupport.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTestSupport.java?rev=672271&r1=672270&r2=672271&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTestSupport.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTestSupport.java
Fri Jun 27 06:50:03 2008
@@ -27,13 +27,13 @@
protected MockEndpoint b;
public void testSendMatchingMessage() throws Exception {
- prepareMatchingTest();
+ prepareMatchingTest();
template.sendBodyAndHeader("direct:start", "<matched/>", "foo", "bar");
assertMockEndpointsSatisifed();
}
public void testSendNonMatchingMessage() throws Exception {
- prepareNonMatchingTest();
+ prepareNonMatchingTest();
template.sendBodyAndHeader("direct:start", "<notMatched/>", "foo",
"notMatchedHeaderValue");
assertMockEndpointsSatisifed();
}
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateAndProceedRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateAndProceedRouteTest.java?rev=672271&r1=672270&r2=672271&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateAndProceedRouteTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateAndProceedRouteTest.java
Fri Jun 27 06:50:03 2008
@@ -22,7 +22,7 @@
* @version $Revision$
*/
public class InterceptWithPredicateAndProceedRouteTest extends
InterceptRouteTestSupport {
- @Override
+ @Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
@@ -33,15 +33,15 @@
};
}
- @Override
- protected void prepareMatchingTest() {
+ @Override
+ protected void prepareMatchingTest() {
a.expectedMessageCount(1);
b.expectedMessageCount(1);
- }
+ }
- @Override
- protected void prepareNonMatchingTest() {
+ @Override
+ protected void prepareNonMatchingTest() {
a.expectedMessageCount(1);
b.expectedMessageCount(0);
- }
+ }
}
\ No newline at end of file
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateAndStopRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateAndStopRouteTest.java?rev=672271&r1=672270&r2=672271&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateAndStopRouteTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateAndStopRouteTest.java
Fri Jun 27 06:50:03 2008
@@ -22,9 +22,9 @@
* @version $Revision: $
*/
public class InterceptWithPredicateAndStopRouteTest extends
- InterceptRouteTestSupport {
+ InterceptRouteTestSupport {
- @Override
+ @Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
@@ -35,15 +35,15 @@
};
}
- @Override
- protected void prepareMatchingTest() {
+ @Override
+ protected void prepareMatchingTest() {
a.expectedMessageCount(0);
b.expectedMessageCount(1);
- }
+ }
- @Override
- protected void prepareNonMatchingTest() {
+ @Override
+ protected void prepareNonMatchingTest() {
a.expectedMessageCount(0);
b.expectedMessageCount(0);
- }
+ }
}
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateRouteTest.java?rev=672271&r1=672270&r2=672271&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateRouteTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateRouteTest.java
Fri Jun 27 06:50:03 2008
@@ -22,7 +22,7 @@
* @version $Revision$
*/
public class InterceptWithPredicateRouteTest extends InterceptRouteTestSupport
{
- @Override
+ @Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
@@ -33,15 +33,15 @@
};
}
- @Override
- protected void prepareMatchingTest() {
+ @Override
+ protected void prepareMatchingTest() {
a.expectedMessageCount(0);
b.expectedMessageCount(1);
- }
+ }
- @Override
- protected void prepareNonMatchingTest() {
+ @Override
+ protected void prepareNonMatchingTest() {
a.expectedMessageCount(1);
b.expectedMessageCount(0);
- }
+ }
}
\ No newline at end of file
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithStopRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithStopRouteTest.java?rev=672271&r1=672270&r2=672271&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithStopRouteTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithStopRouteTest.java
Fri Jun 27 06:50:03 2008
@@ -23,7 +23,7 @@
*/
public class InterceptWithStopRouteTest extends InterceptRouteTestSupport {
- @Override
+ @Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
@@ -34,15 +34,15 @@
};
}
- @Override
- protected void prepareMatchingTest() {
+ @Override
+ protected void prepareMatchingTest() {
a.expectedMessageCount(0);
b.expectedMessageCount(1);
- }
+ }
- @Override
- protected void prepareNonMatchingTest() {
+ @Override
+ protected void prepareNonMatchingTest() {
a.expectedMessageCount(0);
b.expectedMessageCount(0);
- }
+ }
}
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithoutProceedRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithoutProceedRouteTest.java?rev=672271&r1=672270&r2=672271&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithoutProceedRouteTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithoutProceedRouteTest.java
Fri Jun 27 06:50:03 2008
@@ -22,7 +22,7 @@
* @version $Revision$
*/
public class InterceptWithoutProceedRouteTest extends
InterceptRouteTestSupport {
- @Override
+ @Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
@@ -33,15 +33,15 @@
};
}
- @Override
- protected void prepareMatchingTest() {
+ @Override
+ protected void prepareMatchingTest() {
a.expectedMessageCount(1);
b.expectedMessageCount(1);
- }
+ }
- @Override
- protected void prepareNonMatchingTest() {
+ @Override
+ protected void prepareNonMatchingTest() {
a.expectedMessageCount(1);
b.expectedMessageCount(0);
- }
+ }
}
\ No newline at end of file
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceTest.java?rev=672271&r1=672270&r2=672271&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringTraceTest.java
Fri Jun 27 06:50:03 2008
@@ -1,5 +1,4 @@
/**
- *
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -7,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
