Author: ningjiang
Date: Thu Aug 14 23:20:25 2008
New Revision: 686152
URL: http://svn.apache.org/viewvc?rev=686152&view=rev
Log:
Fixed the CS errors of camel-core
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Pattern.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Produce.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/ProxyHelper.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoggingErrorHandler.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanInfoTest.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Pattern.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Pattern.java?rev=686152&r1=686151&r2=686152&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Pattern.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Pattern.java
Thu Aug 14 23:20:25 2008
@@ -52,5 +52,5 @@
/**
* Specifies the exchange pattern to be used for this method
*/
- public abstract ExchangePattern value();
+ ExchangePattern value();
}
\ No newline at end of file
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Produce.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Produce.java?rev=686152&r1=686151&r2=686152&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Produce.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Produce.java
Thu Aug 14 23:20:25 2008
@@ -37,7 +37,7 @@
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR })
public @interface Produce {
- public abstract String uri() default "";
+ String uri() default "";
- public abstract String ref() default "";
+ String ref() default "";
}
\ No newline at end of file
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=686152&r1=686151&r2=686152&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
Thu Aug 14 23:20:25 2008
@@ -16,18 +16,18 @@
*/
package org.apache.camel.component.bean;
+import java.lang.annotation.Annotation;
import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.annotation.Annotation;
+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.Pattern;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.ObjectHelper;
@@ -208,7 +208,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/ProxyHelper.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java?rev=686152&r1=686151&r2=686152&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ProxyHelper.java
Thu Aug 14 23:20:25 2008
@@ -16,11 +16,11 @@
*/
package org.apache.camel.component.bean;
+import java.lang.reflect.Proxy;
+
import org.apache.camel.Endpoint;
import org.apache.camel.Producer;
-import java.lang.reflect.Proxy;
-
/**
* A helper class for creating proxies which delegate to Camel
*
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java?rev=686152&r1=686151&r2=686152&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
Thu Aug 14 23:20:25 2008
@@ -340,12 +340,12 @@
List bodyList = new ArrayList();
bodyList.addAll(Arrays.asList(bodies));
expectedBodiesReceived(bodyList);
- }
+ }
/**
* Adds an expectation that the given body values are received by this
* endpoint in any order
- */
+ */
public void expectedBodiesReceivedInAnyOrder(final List bodies) {
expectedMessageCount(bodies.size());
this.expectedBodyValues = bodies;
@@ -359,24 +359,24 @@
assertTrue("No exchange received for counter: " + i,
exchange != null);
Object expectedBody = expectedBodyValues.get(i);
- assertTrue("Message with body " + expectedBody +
- " was expected but not found in " +
actualBodyValuesSet,
+ assertTrue("Message with body " + expectedBody
+ + " was expected but not found in " +
actualBodyValuesSet,
actualBodyValuesSet.remove(expectedBody));
}
}
});
- }
+ }
/**
* Adds an expectation that the given body values are received by this
* endpoint in any order
- */
+ */
public void expectedBodiesReceivedInAnyOrder(Object... bodies) {
List bodyList = new ArrayList();
bodyList.addAll(Arrays.asList(bodies));
expectedBodiesReceivedInAnyOrder(bodyList);
- }
-
+ }
+
/**
* Adds an expectation that messages received should have ascending values
* of the given expression such as a user generated counter value
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoggingErrorHandler.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoggingErrorHandler.java?rev=686152&r1=686151&r2=686152&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoggingErrorHandler.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoggingErrorHandler.java
Thu Aug 14 23:20:25 2008
@@ -24,7 +24,7 @@
/**
* An [EMAIL PROTECTED] ErrorHandler} which uses commons-logging to dump the
error
- *
+ *
* @version $Revision$
*/
public class LoggingErrorHandler extends ErrorHandlerSupport {
@@ -65,7 +65,7 @@
logError(exchange, error);
}
}
- }
+ }
// Properties
//
-------------------------------------------------------------------------
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=686152&r1=686151&r2=686152&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
Thu Aug 14 23:20:25 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,19 @@
*/
package org.apache.camel.component.bean;
+import java.lang.reflect.Method;
+
import junit.framework.TestCase;
-import org.apache.camel.*;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.InOnly;
+import org.apache.camel.InOut;
+import org.apache.camel.Pattern;
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,29 +108,29 @@
}
public interface Foo {
- public void inOutMethod();
+ void inOutMethod();
@Pattern(ExchangePattern.InOnly)
- public void inOnlyMethod();
+ void inOnlyMethod();
@Pattern(ExchangePattern.RobustInOnly)
- public void robustInOnlyMethod();
+ void robustInOnlyMethod();
}
@InOnly
public interface MyOneWayInterface {
- public void inOnlyMethod();
+ void inOnlyMethod();
}
@InOnly
public interface MyOneWayInterfaceWithOverloadedMethod {
- public void inOnlyMethod();
+ void inOnlyMethod();
@Pattern(ExchangePattern.RobustInOnly)
- public void robustInOnlyMethod();
+ void robustInOnlyMethod();
@InOut
- public Object inOutMethod();
+ Object inOutMethod();
}
public static class OverloadOnMethod implements MyOneWayInterface {
