Merge branch 'feature/cleanup' into develop

seam · Nov 2, 2011 · 40eb1fe · 40eb1fe
2 parents 960d9c6 + 3449935
commit 40eb1fe
Show file tree

Hide file tree

Showing 38 changed files with 172 additions and 133 deletions.
diff --git a/core/src/main/java/org/jboss/seam/spring/bootstrap/Configuration.java b/core/src/main/java/org/jboss/seam/spring/bootstrap/Configuration.java
@@ -26,7 +26,7 @@
 /**
  * Describes a set of configuration locations that can be used to bootstrap a Spring
  * {@link org.springframework.context.ApplicationContext}.
- *
+ * <p/>
  * When a producer field has this annotation, the extension will automatically bootstrap
  * an application context which will be injected into all the injection points serviced
  * by this producer.

diff --git a/core/src/main/java/org/jboss/seam/spring/bootstrap/SpringBeanProducer.java b/core/src/main/java/org/jboss/seam/spring/bootstrap/SpringBeanProducer.java
@@ -1,19 +1,26 @@
 package org.jboss.seam.spring.bootstrap;
 
-import org.jboss.seam.spring.injection.SpringBean;
-import org.springframework.context.ApplicationContext;
-
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.*;
 import java.lang.reflect.Field;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.inject.spi.ProcessProducer;
+import javax.enterprise.inject.spi.Producer;
+
+import org.jboss.seam.spring.injection.SpringBean;
+import org.springframework.context.ApplicationContext;
+
 /**
-* @author Marius Bogoevici
-*/
+ * Producer class for Spring bean instances that are injected into CDI injection points.
+ *
+ * @author Marius Bogoevici
+ */
 class SpringBeanProducer implements Producer<Object> {
     private final ProcessProducer<?, Object> processProducer;
     private final BeanManager beanManager;

diff --git a/core/src/main/java/org/jboss/seam/spring/bootstrap/SpringContext.java b/core/src/main/java/org/jboss/seam/spring/bootstrap/SpringContext.java
@@ -17,8 +17,14 @@
 
 package org.jboss.seam.spring.bootstrap;
 
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
 import javax.inject.Qualifier;
-import java.lang.annotation.*;
 
 /**
  * Qualifier for Spring {@link org.springframework.context.ApplicationContext} instances

diff --git a/core/src/main/java/org/jboss/seam/spring/bootstrap/SpringContextBean.java b/core/src/main/java/org/jboss/seam/spring/bootstrap/SpringContextBean.java
@@ -1,17 +1,18 @@
 package org.jboss.seam.spring.bootstrap;
 
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.Set;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.InjectionPoint;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.Collections;
-import java.util.Set;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
  * @author Marius Bogoevici

diff --git a/core/src/main/java/org/jboss/seam/spring/bootstrap/SpringContextBootstrapExtension.java b/core/src/main/java/org/jboss/seam/spring/bootstrap/SpringContextBootstrapExtension.java
@@ -17,19 +17,26 @@
 
 package org.jboss.seam.spring.bootstrap;
 
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import javax.enterprise.inject.spi.ProcessProducer;
+
 import org.jboss.seam.spring.injection.SpringBean;
 import org.jboss.seam.spring.utils.Locations;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.*;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.*;
-
-import static org.jboss.seam.spring.utils.Locations.SEAM_SPRING_CONTEXTS_LOCATION;
-
 /**
  * @author: Marius Bogoevici
  */

diff --git a/core/src/main/java/org/jboss/seam/spring/bootstrap/SpringContextProducer.java b/core/src/main/java/org/jboss/seam/spring/bootstrap/SpringContextProducer.java
@@ -1,16 +1,16 @@
 package org.jboss.seam.spring.bootstrap;
 
-import org.springframework.beans.BeansException;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.web.context.ContextLoader;
-import org.springframework.web.context.WebApplicationContext;
+import java.util.Set;
 
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.InjectionPoint;
 import javax.enterprise.inject.spi.ProcessProducer;
 import javax.enterprise.inject.spi.Producer;
-import java.util.Set;
+
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.web.context.ContextLoader;
+import org.springframework.web.context.WebApplicationContext;
 
 /**
  * @author Marius Bogoevici

diff --git a/core/src/main/java/org/jboss/seam/spring/bootstrap/Web.java b/core/src/main/java/org/jboss/seam/spring/bootstrap/Web.java
@@ -17,7 +17,11 @@
 
 package org.jboss.seam.spring.bootstrap;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /**
  * When a producer field has this annotation, the extension will automatically look up the

diff --git a/core/src/main/java/org/jboss/seam/spring/config/CdiBeanImportBeanDefinitionParser.java b/core/src/main/java/org/jboss/seam/spring/config/CdiBeanImportBeanDefinitionParser.java
@@ -17,6 +17,13 @@
 
 package org.jboss.seam.spring.config;
 
+import static org.jboss.seam.spring.config.BeanManagerBeanDefinitionParser.DEFAULT_BEAN_MANAGER_ID;
+import static org.jboss.seam.spring.injection.TypeSafeCdiBeanLookup.Qualifier;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
@@ -29,13 +36,6 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.jboss.seam.spring.config.BeanManagerBeanDefinitionParser.DEFAULT_BEAN_MANAGER_ID;
-import static org.jboss.seam.spring.injection.TypeSafeCdiBeanLookup.Qualifier;
-
 /**
  * @author: Marius Bogoevici
  */

diff --git a/core/src/main/java/org/jboss/seam/spring/config/JndiBeanManagerLocator.java b/core/src/main/java/org/jboss/seam/spring/config/JndiBeanManagerLocator.java
@@ -17,14 +17,14 @@
 
 package org.jboss.seam.spring.config;
 
+import javax.enterprise.inject.spi.BeanManager;
+import javax.naming.NamingException;
+
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.jndi.JndiLocatorSupport;
 import org.springframework.util.Assert;
 
-import javax.enterprise.inject.spi.BeanManager;
-import javax.naming.NamingException;
-
 /**
  * @author: Marius Bogoevici
  */

diff --git a/core/src/main/java/org/jboss/seam/spring/injection/CdiBeanFactoryBean.java b/core/src/main/java/org/jboss/seam/spring/injection/CdiBeanFactoryBean.java
@@ -17,12 +17,12 @@
 
 package org.jboss.seam.spring.injection;
 
+import javax.enterprise.inject.spi.BeanManager;
+
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
 
-import javax.enterprise.inject.spi.BeanManager;
-
 /**
  * {@link FactoryBean} for referencing CDI beans from within a Spring {@link org.springframework.context.ApplicationContext}.
  *

diff --git a/core/src/main/java/org/jboss/seam/spring/injection/NamedCdiBeanLookup.java b/core/src/main/java/org/jboss/seam/spring/injection/NamedCdiBeanLookup.java
@@ -17,11 +17,11 @@
 
 package org.jboss.seam.spring.injection;
 
-import org.springframework.beans.factory.BeanCreationException;
-
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
 
+import org.springframework.beans.factory.BeanCreationException;
+
 /**
  * @author: Marius Bogoevici
  */

diff --git a/core/src/main/java/org/jboss/seam/spring/injection/TypeSafeCdiBeanLookup.java b/core/src/main/java/org/jboss/seam/spring/injection/TypeSafeCdiBeanLookup.java
@@ -17,7 +17,16 @@
 
 package org.jboss.seam.spring.injection;
 
-import org.jboss.seam.spring.reflections.AnnotationInvocationHandler;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Proxy;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+
+import org.jboss.seam.spring.utils.AnnotationInvocationHandler;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.context.ApplicationContext;
@@ -27,15 +36,6 @@
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Proxy;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 /**
  * @author: Marius Bogoevici
  */

diff --git a/...lections/AnnotationInvocationHandler.java → ...ng/utils/AnnotationInvocationHandler.java b/...lections/AnnotationInvocationHandler.java → ...ng/utils/AnnotationInvocationHandler.java
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package org.jboss.seam.spring.reflections;
-
-import org.springframework.core.convert.ConversionService;
+package org.jboss.seam.spring.utils;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.springframework.core.convert.ConversionService;
+
 /**
  * {@link InvocationHandler} implementation for dynamically instantiating annotations
  *

diff --git a/.../seam/spring/reflections/Annotations.java → .../jboss/seam/spring/utils/Annotations.java b/.../seam/spring/reflections/Annotations.java → .../jboss/seam/spring/utils/Annotations.java
@@ -15,9 +15,7 @@
  * limitations under the License.
  */
 
-package org.jboss.seam.spring.reflections;
-
-import org.springframework.core.convert.support.GenericConversionService;
+package org.jboss.seam.spring.utils;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Proxy;
@@ -34,7 +32,8 @@ public class Annotations {
     /**
      * Create an {@link Annotation} instance from its given class
      * @param clazz - the annotation class
-     * @param attributes - atrt
+     * @param attributes - attribute values for the annotation (if not set, the default will be used,
+     *                   must be set for attributes that do no specify a default)
      * @param <T> the annotation type
      * @return an annotation instance
      */

diff --git a/core/src/test/java/org/jboss/seam/spring/test/bootstrap/ConfigurationContextProducer.java b/core/src/test/java/org/jboss/seam/spring/test/bootstrap/ConfigurationContextProducer.java
@@ -17,14 +17,12 @@
 
 package org.jboss.seam.spring.test.bootstrap;
 
+import javax.enterprise.inject.Produces;
+
 import org.jboss.seam.spring.bootstrap.Configuration;
 import org.jboss.seam.spring.bootstrap.SpringContext;
 import org.springframework.context.ApplicationContext;
 
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-
 public class ConfigurationContextProducer {
 
    @Produces

diff --git a/core/src/test/java/org/jboss/seam/spring/test/bootstrap/SpringBootstrapInContainerTest.java b/core/src/test/java/org/jboss/seam/spring/test/bootstrap/SpringBootstrapInContainerTest.java
@@ -17,6 +17,9 @@
 
 package org.jboss.seam.spring.test.bootstrap;
 
+import static org.jboss.seam.spring.test.utils.Dependencies.corePackages;
+import static org.jboss.seam.spring.test.utils.Dependencies.springDependencies;
+
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.seam.spring.test.injection.ComplicatedBean;
@@ -30,9 +33,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.jboss.seam.spring.test.utils.Dependencies.springDependencies;
-import static org.jboss.seam.spring.test.utils.Dependencies.corePackages;
-
 
 /**
  * @author: Marius Bogoevici

diff --git a/core/src/test/java/org/jboss/seam/spring/test/bootstrap/SpringBootstrapStandaloneTest.java b/core/src/test/java/org/jboss/seam/spring/test/bootstrap/SpringBootstrapStandaloneTest.java
@@ -17,6 +17,8 @@
 
 package org.jboss.seam.spring.test.bootstrap;
 
+import static org.jboss.seam.spring.test.utils.Dependencies.corePackages;
+
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.seam.spring.test.utils.ContextInjected;
@@ -28,9 +30,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.jboss.seam.spring.test.utils.Dependencies.corePackages;
-import static org.jboss.seam.spring.test.utils.Dependencies.springDependencies;
-
 
 /**
  * @author: Marius Bogoevici

diff --git a/core/src/test/java/org/jboss/seam/spring/test/bootstrap/SpringWebContextAccessTest.java b/core/src/test/java/org/jboss/seam/spring/test/bootstrap/SpringWebContextAccessTest.java
@@ -17,6 +17,9 @@
 
 package org.jboss.seam.spring.test.bootstrap;
 
+import static org.jboss.seam.spring.test.utils.Dependencies.corePackages;
+import static org.jboss.seam.spring.test.utils.Dependencies.springDependencies;
+
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.seam.spring.test.utils.ContextInjected;
@@ -28,9 +31,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.jboss.seam.spring.test.utils.Dependencies.*;
-import static org.jboss.seam.spring.test.utils.Dependencies.corePackages;
-
 /**
  * @author: Marius Bogoevici
  */

diff --git a/core/src/test/java/org/jboss/seam/spring/test/bootstrap/WebContextProducer.java b/core/src/test/java/org/jboss/seam/spring/test/bootstrap/WebContextProducer.java
@@ -17,12 +17,12 @@
 
 package org.jboss.seam.spring.test.bootstrap;
 
+import javax.enterprise.inject.Produces;
+
 import org.jboss.seam.spring.bootstrap.SpringContext;
 import org.jboss.seam.spring.bootstrap.Web;
 import org.springframework.context.ApplicationContext;
 
-import javax.enterprise.inject.Produces;
-
 public class WebContextProducer {
 
    @Produces