svn commit: r1404479 - in /camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi: Main.java internal/CamelExtension.java internal/InjectLiteral.java

[ni...@apache.org]

Author: ningjiang
Date: Thu Nov  1 07:11:32 2012
New Revision: 1404479

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

Removed:
    camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/InjectLiteral.java
Modified:
    camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/Main.java
    camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java

Modified: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/Main.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/Main.java?rev=1404479&r1=1404478&r2=1404479&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/Main.java (original)
+++ camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/Main.java Thu Nov  1 07:11:32 2012
@@ -16,20 +16,21 @@
  */
 package org.apache.camel.cdi;
 
-import org.apache.camel.CamelContext;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.main.MainSupport;
-import org.apache.camel.view.ModelFileGenerator;
-import org.apache.deltaspike.core.api.provider.BeanProvider;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.main.MainSupport;
+import org.apache.camel.view.ModelFileGenerator;
+import org.apache.deltaspike.core.api.provider.BeanProvider;
+
 /**
  * Allows Camel and CDI applications to be booted up on the command line as a Java Application
  */
@@ -43,7 +44,7 @@ public abstract class Main extends MainS
     }
 
     public static void main(String... args) throws Exception {
-        Main main = new Main() {};
+        Main main = new Main() { };
         instance = main;
         main.enableHangupSupport();
         main.run(args);

Modified: camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java?rev=1404479&r1=1404478&r2=1404479&view=diff
==============================================================================
--- camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java (original)
+++ camel/trunk/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java Thu Nov  1 07:11:32 2012
@@ -16,21 +16,16 @@
  */
 package org.apache.camel.cdi.internal;
 
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.Consume;
-import org.apache.camel.EndpointInject;
-import org.apache.camel.Produce;
-import org.apache.camel.RoutesBuilder;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.cdi.CdiCamelContext;
-import org.apache.camel.cdi.ContextName;
-import org.apache.camel.impl.DefaultCamelBeanPostProcessor;
-import org.apache.camel.model.RouteContainer;
-import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.ReflectionHelper;
-import org.apache.deltaspike.core.api.provider.BeanProvider;
-import org.apache.deltaspike.core.util.metadata.builder.AnnotatedTypeBuilder;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.event.Observes;
@@ -48,22 +43,28 @@ import javax.enterprise.inject.spi.Proce
 import javax.enterprise.inject.spi.ProcessProducerMethod;
 import javax.enterprise.util.AnnotationLiteral;
 import javax.inject.Inject;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
+import org.apache.camel.Consume;
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Produce;
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.cdi.CdiCamelContext;
+import org.apache.camel.cdi.ContextName;
+import org.apache.camel.impl.DefaultCamelBeanPostProcessor;
+import org.apache.camel.model.RouteContainer;
+import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.ReflectionHelper;
+import org.apache.deltaspike.core.api.provider.BeanProvider;
+import org.apache.deltaspike.core.util.metadata.builder.AnnotatedTypeBuilder;
 
 /**
  * Set of camel specific hooks for CDI.
  */
 public class CamelExtension implements Extension {
-    private static class InjectLiteral extends AnnotationLiteral<Inject> implements Inject {}
+    private static class InjectLiteral extends AnnotationLiteral<Inject> implements Inject { }
 
     CamelContextMap camelContextMap;
 
@@ -106,7 +107,7 @@ public class CamelExtension implements E
     }
 
     protected <T> void detectRouteBuilders(@Observes ProcessAnnotatedType<T> process)
-            throws Exception {
+        throws Exception {
         AnnotatedType<T> annotatedType = process.getAnnotatedType();
         ContextName annotation = annotatedType.getAnnotation(ContextName.class);
         Class<T> javaClass = annotatedType.getJavaClass();