Author: ningjiang
Date: Wed Aug 20 20:33:50 2008
New Revision: 687545
URL: http://svn.apache.org/viewvc?rev=687545&view=rev
Log:
Fixed the CS errors
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/PropertyEditorTypeConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodTypeConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/MyBean.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/StaticMethodWithExchangeTestConverter.java
activemq/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackConverter.java
activemq/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java?rev=687545&r1=687544&r2=687545&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
Wed Aug 20 20:33:50 2008
@@ -170,7 +170,7 @@
}
}
}
-
+
Class superclass = type.getSuperclass();
if (superclass != null && !superclass.equals(Object.class)) {
loadConverterMethods(registry, superclass);
@@ -180,15 +180,15 @@
}
}
- protected void registerTypeConverter(TypeConverterRegistry registry,
- Method method, Class toType, Class fromType, TypeConverter
typeConverter) {
+ protected void registerTypeConverter(TypeConverterRegistry registry,
+ Method method, Class toType, Class
fromType, TypeConverter typeConverter) {
registry.addTypeConverter(toType, fromType, typeConverter);
}
-
+
protected boolean isValidConverterMethod(Method method) {
- Class<?>[] parameterTypes = method.getParameterTypes();
- return (parameterTypes != null) &&
- (parameterTypes.length == 1 || (parameterTypes.length == 2 &&
parameterTypes[1] == Exchange.class));
+ Class<?>[] parameterTypes = method.getParameterTypes();
+ return (parameterTypes != null)
+ && (parameterTypes.length == 1 || (parameterTypes.length == 2 &&
parameterTypes[1] == Exchange.class));
}
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java?rev=687545&r1=687544&r2=687545&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ArrayTypeConverter.java
Wed Aug 20 20:33:50 2008
@@ -29,7 +29,7 @@
* A type converter which is used to convert to and from array types
* particularly for derived types of array component types and dealing with
* primitive array types.
- *
+ *
* @version $Revision$
*/
public class ArrayTypeConverter implements TypeConverter {
@@ -72,8 +72,8 @@
}
return null;
}
-
+
public <T> T convertTo(Class<T> type, Exchange exchange, Object value) {
- return convertTo(type, value);
+ return convertTo(type, value);
}
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java?rev=687545&r1=687544&r2=687545&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/AsyncProcessorTypeConverter.java
Wed Aug 20 20:33:50 2008
@@ -27,7 +27,7 @@
* A simple converter that can convert any [EMAIL PROTECTED] Processor} to an
[EMAIL PROTECTED] AsyncProcessor}.
* Processing will still occur synchronously but it will provide the required
* notifications that the caller expects.
- *
+ *
* @version $Revision$
*/
public class AsyncProcessorTypeConverter implements TypeConverter {
@@ -66,9 +66,9 @@
}
public <T> T convertTo(Class<T> toType, Exchange exchange, Object value) {
- return convertTo(toType, value);
+ return convertTo(toType, value);
}
-
+
public static AsyncProcessor convert(Processor value) {
if (value instanceof AsyncProcessor) {
return (AsyncProcessor)value;
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java?rev=687545&r1=687544&r2=687545&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/DefaultTypeConverter.java
Wed Aug 20 20:33:50 2008
@@ -61,9 +61,9 @@
public <T> T convertTo(Class<T> type, Object value) {
return convertTo(type, null, value);
}
-
- @SuppressWarnings("unchecked")
- public <T> T convertTo(Class<T> type, Exchange exchange, Object value) {
+
+ @SuppressWarnings("unchecked")
+ public <T> T convertTo(Class<T> type, Exchange exchange, Object value) {
if (type.isInstance(value)) {
return type.cast(value);
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java?rev=687545&r1=687544&r2=687545&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/EnumTypeConverter.java
Wed Aug 20 20:33:50 2008
@@ -46,8 +46,8 @@
return null;
}
- public <T> T convertTo(Class<T> type, Exchange exchange, Object value) {
- // ignore exchange
- return convertTo(type, value);
- }
+ public <T> T convertTo(Class<T> type, Exchange exchange, Object value) {
+ // ignore exchange
+ return convertTo(type, value);
+ }
}
\ No newline at end of file
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java?rev=687545&r1=687544&r2=687545&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/InstanceMethodTypeConverter.java
Wed Aug 20 20:33:50 2008
@@ -49,13 +49,13 @@
return convertTo(type, null, value);
}
- public <T> T convertTo(Class<T> type, Exchange exchange, Object value) {
+ public <T> T convertTo(Class<T> type, Exchange exchange, Object value) {
Object instance = injector.newInstance();
if (instance == null) {
throw new RuntimeCamelException("Could not instantiate an instance
of: " + type.getName());
}
- return useExchange ?
- (T) ObjectHelper.invokeMethod(method, instance, value, exchange) :
- (T) ObjectHelper.invokeMethod(method, instance, value);
- }
+ return useExchange
+ ? (T)ObjectHelper.invokeMethod(method, instance, value, exchange)
: (T)ObjectHelper
+ .invokeMethod(method, instance, value);
+ }
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/PropertyEditorTypeConverter.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/PropertyEditorTypeConverter.java?rev=687545&r1=687544&r2=687545&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/PropertyEditorTypeConverter.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/PropertyEditorTypeConverter.java
Wed Aug 20 20:33:50 2008
@@ -61,6 +61,6 @@
}
public <T> T convertTo(Class<T> type, Exchange exchange, Object value) {
- return convertTo(type, value);
+ return convertTo(type, value);
}
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodTypeConverter.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodTypeConverter.java?rev=687545&r1=687544&r2=687545&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodTypeConverter.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/StaticMethodTypeConverter.java
Wed Aug 20 20:33:50 2008
@@ -45,9 +45,8 @@
return convertTo(type, null, value);
}
- public <T> T convertTo(Class<T> type, Exchange exchange, Object value) {
- return useExchange ?
- (T) ObjectHelper.invokeMethod(method, null, value, exchange) :
- (T) ObjectHelper.invokeMethod(method, null, value);
- }
+ public <T> T convertTo(Class<T> type, Exchange exchange, Object value) {
+ return useExchange ? (T)ObjectHelper.invokeMethod(method, null, value,
exchange)
+ : (T)ObjectHelper.invokeMethod(method, null, value);
+ }
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java?rev=687545&r1=687544&r2=687545&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/converter/ToStringTypeConverter.java
Wed Aug 20 20:33:50 2008
@@ -22,7 +22,7 @@
/**
* A simple converter that can convert any object to a String type by using the
* toString() method of the object.
- *
+ *
* @version $Revision$
*/
public class ToStringTypeConverter implements TypeConverter {
@@ -37,6 +37,6 @@
}
public <T> T convertTo(Class<T> type, Exchange exchange, Object value) {
- return convertTo(type, value);
+ return convertTo(type, value);
}
}
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java?rev=687545&r1=687544&r2=687545&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java
Wed Aug 20 20:33:50 2008
@@ -191,12 +191,12 @@
value = converter.convertTo(Boolean.class, null);
assertEquals("converted boolean value", null, value);
}
-
+
public void testStaticMethodConversionWithExchange() throws Exception {
- CamelContext camel = new DefaultCamelContext();
- Exchange e = new DefaultExchange(camel);
- e.setProperty("prefix", "foo-");
- MyBean bean = converter.convertTo(MyBean.class, e, "5:bar");
+ CamelContext camel = new DefaultCamelContext();
+ Exchange e = new DefaultExchange(camel);
+ e.setProperty("prefix", "foo-");
+ MyBean bean = converter.convertTo(MyBean.class, e, "5:bar");
assertEquals("converted using exchange", 5, bean.getFoo(), 5);
assertEquals("converted using exchange", "foo-bar", bean.getBar());
}
@@ -204,10 +204,10 @@
public void testInstanceMethodConversionWithExchange() throws Exception {
String[] values = new String[]{"5", "bar"};
- CamelContext camel = new DefaultCamelContext();
- Exchange e = new DefaultExchange(camel);
- e.setProperty("prefix", "foo-");
- MyBean bean = converter.convertTo(MyBean.class, e, values);
+ CamelContext camel = new DefaultCamelContext();
+ Exchange e = new DefaultExchange(camel);
+ e.setProperty("prefix", "foo-");
+ MyBean bean = converter.convertTo(MyBean.class, e, values);
assertEquals("converted using exchange", 5, bean.getFoo(), 5);
assertEquals("converted using exchange", "foo-bar", bean.getBar());
}
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/MyBean.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/MyBean.java?rev=687545&r1=687544&r2=687545&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/MyBean.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/MyBean.java
Wed Aug 20 20:33:50 2008
@@ -21,14 +21,14 @@
private String bar;
public MyBean() {
- this(0, "");
+ this(0, "");
}
-
+
public MyBean(int foo, String bar) {
- this.foo = foo;
- this.bar = bar;
+ this.foo = foo;
+ this.bar = bar;
}
-
+
public int getFoo() {
return foo;
}
@@ -36,12 +36,12 @@
public void setFoo(int foo) {
this.foo = foo;
}
-
+
public String getBar() {
- return bar;
+ return bar;
}
-
+
public void setBar(String bar) {
- this.bar = bar;
+ this.bar = bar;
}
}
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/StaticMethodWithExchangeTestConverter.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/StaticMethodWithExchangeTestConverter.java?rev=687545&r1=687544&r2=687545&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/StaticMethodWithExchangeTestConverter.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/StaticMethodWithExchangeTestConverter.java
Wed Aug 20 20:33:50 2008
@@ -21,10 +21,10 @@
import org.apache.camel.util.ObjectHelper;
@Converter
-public final class StaticMethodWithExchangeTestConverter {
+public class StaticMethodWithExchangeTestConverter {
@Converter
- public static MyBean fromString(String text, Exchange exchange) {
+ public MyBean fromString(String text, Exchange exchange) {
String[] values = ObjectHelper.splitOnCharacter(text, ":", 2);
return new MyBean(Integer.parseInt(values[0]),
exchange.getProperty("prefix", String.class) + values[1]);
}
Modified:
activemq/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackConverter.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackConverter.java?rev=687545&r1=687544&r2=687545&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackConverter.java
(original)
+++
activemq/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackConverter.java
Wed Aug 20 20:33:50 2008
@@ -16,10 +16,10 @@
*/
package org.apache.camel.component.flatpack;
+import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Map;
import java.util.List;
-import java.util.ArrayList;
+import java.util.Map;
import net.sf.flatpack.DataSet;
import org.apache.camel.Converter;
Modified:
activemq/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java?rev=687545&r1=687544&r2=687545&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
(original)
+++
activemq/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
Wed Aug 20 20:33:50 2008
@@ -73,7 +73,7 @@
}
public <T> T convertTo(Class<T> type, Exchange exchange, Object value) {
- return convertTo(type, value);
+ return convertTo(type, value);
}
protected <T> boolean isJaxbType(Class<T> type) {
