Author: ningjiang
Date: Wed Apr 22 08:07:53 2009
New Revision: 767404
URL: http://svn.apache.org/viewvc?rev=767404&view=rev
Log:
Fixed the CS errors of camel-guice
Modified:
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/CamelModule.java
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/CamelModuleWithRouteTypes.java
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/GuiceCamelContext.java
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ConsumerInjection.java
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/EndpointInjector.java
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java
camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/CollectionOfCustomRoutesTest.java
Modified:
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/CamelModule.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/CamelModule.java?rev=767404&r1=767403&r2=767404&view=diff
==============================================================================
---
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/CamelModule.java
(original)
+++
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/CamelModule.java
Wed Apr 22 08:07:53 2009
@@ -16,12 +16,11 @@
*/
package org.apache.camel.guice;
-import com.google.inject.matcher.Matchers;
import org.apache.camel.CamelContext;
import org.apache.camel.Consume;
-import org.apache.camel.Routes;
import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
+import org.apache.camel.Routes;
import org.apache.camel.guice.impl.ConsumerInjection;
import org.apache.camel.guice.impl.EndpointInjector;
import org.apache.camel.guice.impl.ProduceInjector;
Modified:
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/CamelModuleWithRouteTypes.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/CamelModuleWithRouteTypes.java?rev=767404&r1=767403&r2=767404&view=diff
==============================================================================
---
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/CamelModuleWithRouteTypes.java
(original)
+++
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/CamelModuleWithRouteTypes.java
Wed Apr 22 08:07:53 2009
@@ -16,14 +16,14 @@
*/
package org.apache.camel.guice;
-import java.util.Set;
import java.util.HashSet;
+import java.util.Set;
import com.google.inject.Injector;
import com.google.inject.Provides;
import com.google.inject.internal.Sets;
+
import org.apache.camel.Routes;
-import org.apache.camel.Route;
/**
Modified:
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/GuiceCamelContext.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/GuiceCamelContext.java?rev=767404&r1=767403&r2=767404&view=diff
==============================================================================
---
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/GuiceCamelContext.java
(original)
+++
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/GuiceCamelContext.java
Wed Apr 22 08:07:53 2009
@@ -16,8 +16,17 @@
*/
package org.apache.camel.guice;
+import java.util.List;
+import java.util.Set;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+
import com.google.inject.Binding;
import com.google.inject.Inject;
+
import org.apache.camel.Route;
import org.apache.camel.Routes;
import org.apache.camel.RuntimeCamelException;
@@ -35,13 +44,6 @@
import org.apache.camel.spi.Registry;
import org.guiceyfruit.Injectors;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.List;
-import java.util.Set;
-
/**
* The default CamelContext implementation for working with Guice.
* <p/>
Modified:
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ConsumerInjection.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ConsumerInjection.java?rev=767404&r1=767403&r2=767404&view=diff
==============================================================================
---
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ConsumerInjection.java
(original)
+++
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ConsumerInjection.java
Wed Apr 22 08:07:53 2009
@@ -16,20 +16,21 @@
*/
package org.apache.camel.guice.impl;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
import com.google.inject.Inject;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Consume;
import org.apache.camel.impl.CamelPostProcessorHelper;
import org.apache.camel.util.ObjectHelper;
import org.guiceyfruit.support.MethodHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-
/**
* @version $Revision$
*/
-public class ConsumerInjection<I> extends CamelPostProcessorHelper implements
MethodHandler<I,Consume> {
+public class ConsumerInjection<I> extends CamelPostProcessorHelper implements
MethodHandler<I, Consume> {
public void afterInjection(I injectee, Consume consume, Method method)
throws InvocationTargetException, IllegalAccessException {
consumerInjection(method, injectee);
}
Modified:
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/EndpointInjector.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/EndpointInjector.java?rev=767404&r1=767403&r2=767404&view=diff
==============================================================================
---
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/EndpointInjector.java
(original)
+++
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/EndpointInjector.java
Wed Apr 22 08:07:53 2009
@@ -17,10 +17,12 @@
package org.apache.camel.guice.impl;
-import com.google.inject.Inject;
-import com.google.inject.TypeLiteral;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+
+import com.google.inject.Inject;
+import com.google.inject.TypeLiteral;
+
import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
import org.apache.camel.impl.CamelPostProcessorHelper;
@@ -32,36 +34,35 @@
*
* @version $Revision$
*/
-public class EndpointInjector extends CamelPostProcessorHelper
- implements AnnotationMemberProvider<EndpointInject> {
+public class EndpointInjector extends CamelPostProcessorHelper implements
+ AnnotationMemberProvider<EndpointInject> {
- @Inject
- public EndpointInjector(CamelContext camelContext) {
- super(camelContext);
- }
-
- public Object provide(EndpointInject inject, TypeLiteral<?> typeLiteral,
Field field) {
- Class<?> type = field.getType();
- String injectionPointName = field.getName();
- String uri = inject.uri();
- String endpointRef = inject.name();
- return getInjectionValue(type, uri, endpointRef, injectionPointName);
- }
-
- public Object provide(EndpointInject inject, TypeLiteral<?> typeLiteral,
Method method,
- Class<?> aClass, int index) {
-
- Class<?>[] parameterTypes = method.getParameterTypes();
- Class<?> type = parameterTypes[index];
- String injectionPointName = ObjectHelper.getPropertyName(method);
- String endpointRef = inject.name();
- String uri = inject.uri();
-
- return getInjectionValue(type, uri, endpointRef, injectionPointName);
- }
-
- public boolean isNullParameterAllowed(EndpointInject endpointInject, Method
method,
- Class<?> aClass, int i) {
- return false;
- }
+ @Inject
+ public EndpointInjector(CamelContext camelContext) {
+ super(camelContext);
+ }
+
+ public Object provide(EndpointInject inject, TypeLiteral<?> typeLiteral,
Field field) {
+ Class<?> type = field.getType();
+ String injectionPointName = field.getName();
+ String uri = inject.uri();
+ String endpointRef = inject.name();
+ return getInjectionValue(type, uri, endpointRef, injectionPointName);
+ }
+
+ public Object provide(EndpointInject inject, TypeLiteral<?> typeLiteral,
Method method, Class<?> aClass,
+ int index) {
+
+ Class<?>[] parameterTypes = method.getParameterTypes();
+ Class<?> type = parameterTypes[index];
+ String injectionPointName = ObjectHelper.getPropertyName(method);
+ String endpointRef = inject.name();
+ String uri = inject.uri();
+
+ return getInjectionValue(type, uri, endpointRef, injectionPointName);
+ }
+
+ public boolean isNullParameterAllowed(EndpointInject endpointInject,
Method method, Class<?> aClass, int i) {
+ return false;
+ }
}
Modified:
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java?rev=767404&r1=767403&r2=767404&view=diff
==============================================================================
---
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java
(original)
+++
camel/trunk/components/camel-guice/src/main/java/org/apache/camel/guice/impl/ProduceInjector.java
Wed Apr 22 08:07:53 2009
@@ -17,10 +17,12 @@
package org.apache.camel.guice.impl;
-import com.google.inject.Inject;
-import com.google.inject.TypeLiteral;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+
+import com.google.inject.Inject;
+import com.google.inject.TypeLiteral;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Produce;
import org.apache.camel.impl.CamelPostProcessorHelper;
@@ -32,35 +34,34 @@
*
* @version $Revision$
*/
-public class ProduceInjector extends CamelPostProcessorHelper
- implements AnnotationMemberProvider<Produce> {
+public class ProduceInjector extends CamelPostProcessorHelper implements
AnnotationMemberProvider<Produce> {
- @Inject
- public ProduceInjector(CamelContext camelContext) {
- super(camelContext);
- }
-
- public boolean isNullParameterAllowed(Produce produce, Method method,
Class<?> aClass, int i) {
- return false;
- }
-
- public Object provide(Produce inject, TypeLiteral<?> typeLiteral, Field
field) {
- Class<?> type = field.getType();
- String injectionPointName = field.getName();
- String endpointRef = inject.ref();
- String uri = inject.uri();
-
- return getInjectionValue(type, uri, endpointRef, injectionPointName);
- }
-
- public Object provide(Produce inject, TypeLiteral<?> typeLiteral, Method
method, Class<?> aClass,
- int index) {
-
- Class<?>[] parameterTypes = method.getParameterTypes();
- Class<?> type = parameterTypes[index];
- String injectionPointName = ObjectHelper.getPropertyName(method);
- String endpointRef = inject.ref();
- String uri = inject.uri();
- return getInjectionValue(type, uri, endpointRef, injectionPointName);
- }
-}
\ No newline at end of file
+ @Inject
+ public ProduceInjector(CamelContext camelContext) {
+ super(camelContext);
+ }
+
+ public boolean isNullParameterAllowed(Produce produce, Method method,
Class<?> aClass, int i) {
+ return false;
+ }
+
+ public Object provide(Produce inject, TypeLiteral<?> typeLiteral, Field
field) {
+ Class<?> type = field.getType();
+ String injectionPointName = field.getName();
+ String endpointRef = inject.ref();
+ String uri = inject.uri();
+
+ return getInjectionValue(type, uri, endpointRef, injectionPointName);
+ }
+
+ public Object provide(Produce inject, TypeLiteral<?> typeLiteral, Method
method, Class<?> aClass,
+ int index) {
+
+ Class<?>[] parameterTypes = method.getParameterTypes();
+ Class<?> type = parameterTypes[index];
+ String injectionPointName = ObjectHelper.getPropertyName(method);
+ String endpointRef = inject.ref();
+ String uri = inject.uri();
+ return getInjectionValue(type, uri, endpointRef, injectionPointName);
+ }
+}
Modified:
camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/CollectionOfCustomRoutesTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/CollectionOfCustomRoutesTest.java?rev=767404&r1=767403&r2=767404&view=diff
==============================================================================
---
camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/CollectionOfCustomRoutesTest.java
(original)
+++
camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/CollectionOfCustomRoutesTest.java
Wed Apr 22 08:07:53 2009
@@ -16,19 +16,21 @@
*/
package org.apache.camel.guice;
+import java.util.Collection;
+import java.util.List;
+
+import junit.framework.TestCase;
+
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Provides;
import com.google.inject.internal.Lists;
import com.google.inject.name.Named;
-import junit.framework.TestCase;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Route;
import org.apache.camel.Routes;
-import java.util.Collection;
-import java.util.List;
-
/**
* Create a collection of routes via a provider method
*
@@ -50,7 +52,7 @@
}
- public void DONTtestGuice() throws Exception {
+ public void xtestGuice() throws Exception {
Injector injector = Guice.createInjector(new MyModule());
CamelContext camelContext = injector.getInstance(CamelContext.class);
