Author: ningjiang
Date: Fri Oct 3 19:00:26 2008
New Revision: 701581
URL: http://svn.apache.org/viewvc?rev=701581&view=rev
Log:
Fixed the CS errors of camel-core
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/TwoTimerWithJMXIssue.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/WireTapTest.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java?rev=701581&r1=701580&r2=701581&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
Fri Oct 3 19:00:26 2008
@@ -16,6 +16,11 @@
*/
package org.apache.camel;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+
import org.apache.camel.builder.ErrorHandlerBuilder;
import org.apache.camel.model.RouteType;
import org.apache.camel.model.dataformat.DataFormatType;
@@ -26,11 +31,6 @@
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.Registry;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-
/**
* Interface used to represent the context used to configure routes and the
* policies to use during message exchanges between endpoints.
@@ -132,7 +132,7 @@
* @return collection of endpoints
*/
Collection<Endpoint> getEndpoints(String uri);
-
+
/**
* Returns the collection of all registered singleton endpoints.
*
@@ -308,7 +308,7 @@
* @param errorHandlerBuilder the builder
*/
void setErrorHandlerBuilder(ErrorHandlerBuilder errorHandlerBuilder);
-
+
/**
* Sets the data formats that can be referenced in the routes.
* @param dataFormats the data formats
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java?rev=701581&r1=701580&r2=701581&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
Fri Oct 3 19:00:26 2008
@@ -29,7 +29,6 @@
import org.apache.camel.ExchangePattern;
import org.apache.camel.Expression;
import org.apache.camel.Pattern;
-import org.apache.camel.model.language.MethodCallExpression;
import org.apache.camel.model.language.ConstantExpression;
import org.apache.camel.processor.RecipientList;
import org.apache.camel.util.ExchangeHelper;
@@ -38,7 +37,6 @@
import org.apache.commons.logging.LogFactory;
import static org.apache.camel.util.ObjectHelper.asString;
-
/**
* Information about a method to be used for invocation.
*
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/TwoTimerWithJMXIssue.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/TwoTimerWithJMXIssue.java?rev=701581&r1=701580&r2=701581&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/TwoTimerWithJMXIssue.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/TwoTimerWithJMXIssue.java
Fri Oct 3 19:00:26 2008
@@ -47,8 +47,7 @@
public void configure() throws Exception {
context.addInterceptStrategy(new MyTracer());
- from("timer://kickoff_1?period=250").
- from("timer://kickoff_2?period=250&delay=10");
+
from("timer://kickoff_1?period=250").from("timer://kickoff_2?period=250&delay=10");
}
};
}
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java?rev=701581&r1=701580&r2=701581&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/BeanRecipientListTest.java
Fri Oct 3 19:00:26 2008
@@ -16,15 +16,16 @@
*/
package org.apache.camel.processor;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.naming.Context;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.util.jndi.JndiContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.naming.Context;
-import java.util.concurrent.atomic.AtomicInteger;
-
/**
* @version $Revision$
*/
@@ -82,7 +83,7 @@
@org.apache.camel.RecipientList
public String[] route(String body) {
System.out.println("Called " + this + " with body: " + body);
- return new String[] { "mock:a", "mock:b" };
+ return new String[] {"mock:a", "mock:b"};
}
}
}
\ No newline at end of file
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerTest.java?rev=701581&r1=701580&r2=701581&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ErrorHandlerTest.java
Fri Oct 3 19:00:26 2008
@@ -17,11 +17,11 @@
package org.apache.camel.processor;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Processor;
import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
/**
* Error Handler unit test
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/WireTapTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/WireTapTest.java?rev=701581&r1=701580&r2=701581&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/WireTapTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/WireTapTest.java
Fri Oct 3 19:00:26 2008
@@ -16,12 +16,13 @@
*/
package org.apache.camel.processor;
-import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-public class WireTapTest extends ContextTestSupport {
+import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
+
+public class WireTapTest extends ContextTestSupport {
protected MockEndpoint tap;
protected MockEndpoint result;
