You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/09/29 04:27:01 UTC
svn commit: r819797 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/util/
camel-core/src/test/java/org/apache/camel/component/seda/
camel-core/src/test/java/org/apache/camel/processor/
camel-core/src/test/java/org/apache/camel/processor/ag...
Author: ningjiang
Date: Tue Sep 29 02:27:00 2009
New Revision: 819797
URL: http://svn.apache.org/viewvc?rev=819797&view=rev
Log:
Fixed the CS errors
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaAsyncProducerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaEndpointTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/CBRHeaderPredicateTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateMultipleSourceTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/util/IntrospectionSupportTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java?rev=819797&r1=819796&r2=819797&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java Tue Sep 29 02:27:00 2009
@@ -25,6 +25,7 @@
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.net.URL;
import java.nio.channels.ReadableByteChannel;
import java.nio.charset.Charset;
import java.util.ArrayList;
@@ -34,7 +35,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Scanner;
-import java.net.URL;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java?rev=819797&r1=819796&r2=819797&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/ServiceHelper.java Tue Sep 29 02:27:00 2009
@@ -16,9 +16,9 @@
*/
package org.apache.camel.util;
+import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import java.util.Arrays;
import org.apache.camel.Service;
import org.apache.commons.logging.Log;
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaAsyncProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaAsyncProducerTest.java?rev=819797&r1=819796&r2=819797&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaAsyncProducerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaAsyncProducerTest.java Tue Sep 29 02:27:00 2009
@@ -20,12 +20,12 @@
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.Processor;
import org.apache.camel.WaitForTaskToComplete;
-import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.DefaultExchange;
/**
* The new Async API version of doing async routing based on the old AsyncProcessor API
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaEndpointTest.java?rev=819797&r1=819796&r2=819797&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaEndpointTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaEndpointTest.java Tue Sep 29 02:27:00 2009
@@ -16,14 +16,14 @@
*/
package org.apache.camel.component.seda;
-import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import org.apache.camel.Consumer;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
-import org.apache.camel.Producer;
-import org.apache.camel.Consumer;
import org.apache.camel.Processor;
+import org.apache.camel.Producer;
/**
* @version $Revision$
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/CBRHeaderPredicateTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/CBRHeaderPredicateTest.java?rev=819797&r1=819796&r2=819797&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/CBRHeaderPredicateTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/CBRHeaderPredicateTest.java Tue Sep 29 02:27:00 2009
@@ -69,11 +69,7 @@
public boolean checkHeader(Exchange exchange) {
Message inMsg = exchange.getIn();
String foo = (String) inMsg.getHeader("foo");
- if (foo.equals("bar")) {
- return true;
- } else {
- return false;
- }
+ return foo.equals("bar");
}
}
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateMultipleSourceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateMultipleSourceTest.java?rev=819797&r1=819796&r2=819797&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateMultipleSourceTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateMultipleSourceTest.java Tue Sep 29 02:27:00 2009
@@ -18,8 +18,8 @@
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
-import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.aggregate.AggregationStrategy;
/**
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/util/IntrospectionSupportTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/util/IntrospectionSupportTest.java?rev=819797&r1=819796&r2=819797&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/util/IntrospectionSupportTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/util/IntrospectionSupportTest.java Tue Sep 29 02:27:00 2009
@@ -16,10 +16,10 @@
*/
package org.apache.camel.util;
+import java.lang.reflect.Method;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.lang.reflect.Method;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.util.jndi.ExampleBean;
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java?rev=819797&r1=819796&r2=819797&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/util/MessageHelperTest.java Tue Sep 29 02:27:00 2009
@@ -20,9 +20,9 @@
import java.io.OutputStream;
import junit.framework.TestCase;
+import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.StreamCache;
-import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultMessage;
/**
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java?rev=819797&r1=819796&r2=819797&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/util/ObjectHelperTest.java Tue Sep 29 02:27:00 2009
@@ -20,9 +20,9 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Date;
import java.util.Iterator;
import java.util.List;
-import java.util.Date;
import junit.framework.TestCase;
@@ -193,7 +193,7 @@
}
public void testAsString() {
- String[] args = new String[] { "foo", "bar"};
+ String[] args = new String[] {"foo", "bar"};
String out = ObjectHelper.asString(args);
assertNotNull(out);
assertEquals("{foo, bar}", out);
Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java?rev=819797&r1=819796&r2=819797&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java Tue Sep 29 02:27:00 2009
@@ -16,28 +16,28 @@
*/
package org.apache.camel.itest.karaf;
+
import org.apache.camel.CamelContext;
import org.apache.camel.osgi.CamelContextFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.After;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
import org.junit.Before;
+import org.ops4j.pax.exam.Inject;
+import org.ops4j.pax.exam.Option;
+import org.osgi.framework.BundleContext;
+
+import static org.junit.Assert.assertNotNull;
import static org.ops4j.pax.exam.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.felix;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
-import org.ops4j.pax.exam.Inject;
-import org.ops4j.pax.exam.Option;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.cleanCaches;
import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.profile;
import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
-import org.osgi.framework.BundleContext;
public abstract class AbstractFeatureTest {
- protected final transient Log LOG = LogFactory.getLog(getClass());
+ protected final transient Log log = LogFactory.getLog(getClass());
@Inject
protected BundleContext bundleContext;
@@ -122,7 +122,7 @@
protected CamelContext createCamelContext() throws Exception {
CamelContextFactory factory = new CamelContextFactory();
factory.setBundleContext(bundleContext);
- LOG.info("Get the bundleContext is " + bundleContext);
+ log.info("Get the bundleContext is " + bundleContext);
return factory.createContext();
}
@@ -150,8 +150,7 @@
scanFeatures(mavenBundle().groupId("org.apache.camel.karaf").
artifactId("features").versionAsInProject().type("xml/features"),
"camel-osgi", "camel-" + feature),
-
- cleanCaches(),
+ //cleanCaches(),
felix(),
equinox());