camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r685050 - in /activemq/camel/trunk/camel-core/src: main/java/org/apache/camel/ main/java/org/apache/camel/component/bean/ main/java/org/apache/camel/component/file/ test/java/org/apache/camel/component/bean/ test/java/org/apache/camel/compo...
Date Tue, 12 Aug 2008 06:14:21 GMT
Author: ningjiang
Date: Mon Aug 11 23:14:20 2008
New Revision: 685050

URL: http://svn.apache.org/viewvc?rev=685050&view=rev
Log:
Fixed the CS errors of the camel-core

Modified:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/OneWay.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfoCache.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProducer.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTestTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAlwaysConsumeTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFileOnlyTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSingleDirectoryOnlyTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceAppendTest.java
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorTest.java

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/OneWay.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/OneWay.java?rev=685050&r1=685049&r2=685050&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/OneWay.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/OneWay.java Mon Aug 11
23:14:20 2008
@@ -70,5 +70,5 @@
      * Allows the exact exchange pattern type to be specified though the default value of
      * {@link org.apache.camel.ExchangePattern#InOnly} should be fine for most uses
      */
-    public abstract ExchangePattern value() default ExchangePattern.InOnly;
+    ExchangePattern value() default ExchangePattern.InOnly;
 }
\ No newline at end of file

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java?rev=685050&r1=685049&r2=685050&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java
Mon Aug 11 23:14:20 2008
@@ -16,14 +16,14 @@
  */
 package org.apache.camel.component.bean;
 
-import org.apache.camel.Endpoint;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.Producer;
-
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
+import org.apache.camel.Endpoint;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.Producer;
+
 /**
  * An {@link java.lang.reflect.InvocationHandler} which invokes a
  * message exchange on a camel {@link Endpoint}

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=685050&r1=685049&r2=685050&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
Mon Aug 11 23:14:20 2008
@@ -17,16 +17,15 @@
 package org.apache.camel.component.bean;
 
 import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.ArrayList;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.Expression;
 import org.apache.camel.ExchangePattern;
+import org.apache.camel.Expression;
 import org.apache.camel.OneWay;
 import org.apache.camel.util.ExchangeHelper;
 import org.apache.camel.util.ObjectHelper;
@@ -203,7 +202,7 @@
 
             // now lets scan for a type which the current declared class overloads
             answer = findOneWayAnnotationOnMethod(typesToSearch, method);
-            if (answer == null ){
+            if (answer == null) {
                 answer = findOneWayAnnotation(typesToSearch);
             }
         }

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfoCache.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfoCache.java?rev=685050&r1=685049&r2=685050&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfoCache.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfoCache.java
Mon Aug 11 23:14:20 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,
@@ -17,12 +16,12 @@
  */
 package org.apache.camel.component.bean;
 
-import org.apache.camel.CamelContext;
-import org.apache.camel.util.LRUCache;
-
 import java.lang.reflect.Method;
 import java.util.Map;
 
+import org.apache.camel.CamelContext;
+import org.apache.camel.util.LRUCache;
+
 /**
  * Represents a cache of MethodInfo objects to avoid the expense of introspection for each
invocation of a method
  * via a proxy
@@ -31,8 +30,8 @@
  */
 public class MethodInfoCache {
     private final CamelContext camelContext;
-    private Map<Method,MethodInfo> methodCache;
-    private Map<Class,BeanInfo> classCache;
+    private Map<Method, MethodInfo> methodCache;
+    private Map<Class, BeanInfo> classCache;
 
     public MethodInfoCache(CamelContext camelContext) {
         this(camelContext, 1000, 10000);

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProducer.java?rev=685050&r1=685049&r2=685050&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProducer.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileProducer.java
Mon Aug 11 23:14:20 2008
@@ -17,11 +17,11 @@
 package org.apache.camel.component.file;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.RandomAccessFile;
-import java.io.IOException;
-import java.io.FileInputStream;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 
@@ -30,7 +30,6 @@
 import org.apache.camel.impl.DefaultProducer;
 import org.apache.camel.util.ExchangeHelper;
 import org.apache.camel.util.ObjectHelper;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTest.java?rev=685050&r1=685049&r2=685050&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTest.java
Mon Aug 11 23:14:20 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,
@@ -17,16 +16,16 @@
  */
 package org.apache.camel.component.bean;
 
+import java.lang.reflect.Method;
+
 import junit.framework.TestCase;
-import org.apache.camel.OneWay;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.CamelContext;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.OneWay;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import java.lang.reflect.Method;
-
 /**
  * @version $Revision: 1.1 $
  */
@@ -104,26 +103,26 @@
     }
 
     public interface Foo {
-        public void inOutMethod();
+        void inOutMethod();
 
         @OneWay
-        public void inOnlyMethod();
+        void inOnlyMethod();
 
         @OneWay(ExchangePattern.RobustInOnly)
-        public void robustInOnlyMethod();
+        void robustInOnlyMethod();
     }
 
     @OneWay
     public interface MyOneWayInterface {
-        public void inOnlyMethod();
+        void inOnlyMethod();
     }
 
     @OneWay
     public interface MyOneWayInterfaceWithOverloadedMethod {
-        public void inOnlyMethod();
+        void inOnlyMethod();
 
         @OneWay(ExchangePattern.RobustInOnly)
-        public void robustInOnlyMethod();
+        void robustInOnlyMethod();
     }
 
     public static class OverloadOnMethod implements MyOneWayInterface {

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTestTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTestTest.java?rev=685050&r1=685049&r2=685050&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTestTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTestTest.java
Mon Aug 11 23:14:20 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,
@@ -17,14 +16,14 @@
  */
 package org.apache.camel.component.bean;
 
+import java.lang.reflect.Method;
+
 import junit.framework.TestCase;
-import org.apache.camel.OneWay;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.CamelContext;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.OneWay;
 import org.apache.camel.impl.DefaultCamelContext;
 
-import java.lang.reflect.Method;
-
 /**
  * @version $Revision: 1.1 $
  */
@@ -53,12 +52,12 @@
     }
 
     public interface Foo {
-        public void inOutMethod();
+        void inOutMethod();
 
         @OneWay
-        public void inOnlyMethod();
+        void inOnlyMethod();
 
         @OneWay(ExchangePattern.RobustInOnly)
-        public void robustInOnlyMethod();
+        void robustInOnlyMethod();
     }
 }

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAlwaysConsumeTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAlwaysConsumeTest.java?rev=685050&r1=685049&r2=685050&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAlwaysConsumeTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAlwaysConsumeTest.java
Mon Aug 11 23:14:20 2008
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.component.file;
 
+import java.io.File;
+
 import org.apache.camel.ContextTestSupport;
-import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.builder.RouteBuilder;
-
-import java.io.File;
+import org.apache.camel.component.mock.MockEndpoint;
 
 /**
  * Unit test for the alwaysConsume option.

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFileOnlyTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFileOnlyTest.java?rev=685050&r1=685049&r2=685050&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFileOnlyTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFileOnlyTest.java
Mon Aug 11 23:14:20 2008
@@ -17,8 +17,8 @@
 package org.apache.camel.component.file;
 
 import org.apache.camel.ContextTestSupport;
-import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
 
 /**
  * Unit test for consuming the same filename only.

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSingleDirectoryOnlyTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSingleDirectoryOnlyTest.java?rev=685050&r1=685049&r2=685050&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSingleDirectoryOnlyTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSingleDirectoryOnlyTest.java
Mon Aug 11 23:14:20 2008
@@ -17,8 +17,8 @@
 package org.apache.camel.component.file;
 
 import org.apache.camel.ContextTestSupport;
-import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
 
 /**
  * Unit test for consuming the single directory only.

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceAppendTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceAppendTest.java?rev=685050&r1=685049&r2=685050&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceAppendTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProduceAppendTest.java
Mon Aug 11 23:14:20 2008
@@ -16,13 +16,12 @@
  */
 package org.apache.camel.component.file;
 
+import java.io.File;
+
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.converter.IOConverter;
 
-import java.io.File;
-import java.io.OutputStream;
-
 /**
  * Unit test to verify the append option
  */

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorTest.java?rev=685050&r1=685049&r2=685050&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorTest.java
(original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorTest.java
Mon Aug 11 23:14:20 2008
@@ -43,11 +43,11 @@
         MockEndpoint mock = getMockEndpoint("mock:valid");
         mock.expectedMessageCount(1);
 
-        String xml = "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>" +
-                "<user xmlns=\"http://foo.com/bar\">" +
-                "  <id>1</id>" +
-                "  <username>davsclaus</username>" +
-                "</user>";
+        String xml = "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>"
+            + "<user xmlns=\"http://foo.com/bar\">"
+            + "  <id>1</id>"
+            + "  <username>davsclaus</username>"
+            + "</user>";
 
         template.sendBody("direct:start", xml);
 
@@ -58,10 +58,10 @@
         MockEndpoint mock = getMockEndpoint("mock:invalid");
         mock.expectedMessageCount(1);
 
-        String xml = "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>" +
-                "<user xmlns=\"http://foo.com/bar\">" +
-                "  <username>someone</username>" +
-                "</user>";
+        String xml = "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>"
+            + "<user xmlns=\"http://foo.com/bar\">"
+            + "  <username>someone</username>"
+            + "</user>";
 
         template.sendBody("direct:start", xml);
 



Mime
View raw message