Merge pull request #3 from prchen/release

Release 0.0.2

Author: prchen

README.md

@@ -8,7 +8,7 @@ Antares is an SpringBoot extension used to simplify the process of dynamically r
 <dependency>
     <groupId>com.github.prchen</groupId>
     <artifactId>spring-boot-starter-antares</artifactId>
-    <version>0.0.1</version>
+    <version>0.0.2</version>
 </dependency>
 ```
 

pom.xml

@@ -10,7 +10,7 @@
 
     <groupId>com.github.prchen</groupId>
     <artifactId>spring-boot-starter-antares</artifactId>
-    <version>0.0.1</version>
+    <version>0.0.2</version>
     <packaging>jar</packaging>
 
     <name>Antares</name>
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

src/main/java/com/github/prchen/antares/starter/AntaresFactoryBean.java

@@ -29,7 +29,7 @@ public abstract class AntaresFactoryBean implements FactoryBean<Object> {
      * @param objectType Bean type
      */
     public final void setObjectType(Class<?> objectType) {
-        if (this.objectType != null) {
+        if (this.objectType != null && this.objectType != objectType) {
             throw new IllegalStateException("objectType already set");
         }
         this.objectType = objectType;
@@ -39,8 +39,8 @@ public final void setObjectType(Class<?> objectType) {
      * Get the bean type
      * @return Bean type
      */
-    @Nullable
     @Override
+    @Nullable
     public final Class<?> getObjectType() {
         return objectType;
     }

src/main/java/com/github/prchen/antares/starter/AntaresRegistry.java

@@ -31,6 +31,7 @@
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
 import org.springframework.core.Ordered;
 import org.springframework.core.PriorityOrdered;
+import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.core.type.filter.AssignableTypeFilter;
 import org.springframework.stereotype.Component;
@@ -82,7 +83,7 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory factory) thro
     @Override
     public Set<Class<?>> getManifest(Class<? extends Annotation> advice) {
         return manifest.stream()
-                .filter(x -> x.getAnnotation(advice) != null)
+                .filter(x -> AnnotationUtils.findAnnotation(x, advice) != null)
                 .collect(Collectors.toSet());
     }
 
@@ -96,7 +97,7 @@ private void initBasePackages(BeanDefinitionRegistry registry) {
             if (className != null) {
                 try {
                     Class<?> clazz = Class.forName(className);
-                    if (clazz.getAnnotation(AntaresScan.class) != null) {
+                    if (AnnotationUtils.findAnnotation(clazz, AntaresScan.class) != null) {
                         result.add(clazz.getPackage().getName());
                     }
                 } catch (ClassNotFoundException e) {
@@ -114,31 +115,48 @@ private void initBasePackages(BeanDefinitionRegistry registry) {
 
     @SuppressWarnings("unchecked")
     private void initManifestAdvises() {
-        Set<Class<?>> types = new CandidateScanner(
-                Collections.singletonList(Annotation.class),
-                Collections.singletonList(AntaresManifestAdvice.class))
-                .scanTypes();
+        CandidateScanner scanner = new CandidateScanner();
+        AssignableTypeFilter classFilter = new AssignableTypeFilter(Annotation.class);
+        AnnotationTypeFilter metaFilter = new AnnotationTypeFilter(AntaresManifestAdvice.class);
+        scanner.addIncludeFilter((x, y) -> classFilter.match(x, y) && metaFilter.match(x, y));
+        Set<Class<?>> types = scanner.scanTypes();
         manifestAdvices = types.stream()
                 .map(x -> (Class<? extends Annotation>) x)
                 .collect(Collectors.toList())
                 .toArray(new Class[0]);
+        if (manifestAdvices.length > 0) {
+            String manifest = String.join(", ", Arrays.stream(manifestAdvices)
+                    .map(Class::getName)
+                    .collect(Collectors.toList()));
+            logger.info("Antares ManifestAdvice: " + manifest);
+        } else {
+            logger.info("No ManifestAdvice detected");
+        }
     }
 
     private void initFactories(BeanDefinitionRegistry registry) {
         for (Class<? extends Annotation> advise : manifestAdvices) {
-            Class<?> factoryClass = advise.getAnnotation(AntaresManifestAdvice.class).factoryClass();
-            if (factoryClass != AntaresFactoryBean.class) {
-                logger.info("Loading factory: " + factoryClass.getName());
-                new DefinitionScanner(registry, advise).scan(basePackages);
+            AntaresManifestAdvice meta = AnnotationUtils.findAnnotation(advise, AntaresManifestAdvice.class);
+            if (meta == null) {
+                logger.info("Skipping AntaresManifestAdvice due to unexpected reflection failure: " + advise.getName());
+            } else {
+                Class<?> factoryClass = meta.factoryClass();
+                if (factoryClass != AntaresFactoryBean.class) {
+                    logger.info("Loading factory: " + factoryClass.getName());
+                    new DefinitionScanner(registry, advise).scan(basePackages);
+                }
             }
         }
     }
 
     private void initManifest() {
-        manifest = new CandidateScanner(
-                Collections.emptyList(),
-                Arrays.asList(manifestAdvices))
-                .scanTypes();
+        CandidateScanner scanner = new CandidateScanner();
+        for (Class<? extends Annotation> advice : manifestAdvices) {
+            scanner.addIncludeFilter(new AnnotationTypeFilter(advice, false));
+        }
+        manifest = scanner.scanTypes().stream()
+                .filter(x -> !x.isAnnotation())
+                .collect(Collectors.toSet());
         if (manifest.size() > 0) {
             String manifest = String.join(", ", this.manifest.stream()
                     .map(Class::getName)
@@ -152,11 +170,12 @@ private void initManifest() {
     class DefinitionScanner extends ClassPathBeanDefinitionScanner {
         private Class<?> factory;
 
+        @SuppressWarnings("all")
         private DefinitionScanner(BeanDefinitionRegistry registry, Class<? extends Annotation> advise) {
             super(registry, false);
             super.setResourceLoader(context);
             super.setBeanNameGenerator((d, r) -> StringUtils.uncapitalize(d.getBeanClassName()));
-            this.factory = advise.getAnnotation(AntaresManifestAdvice.class).factoryClass();
+            this.factory = AnnotationUtils.findAnnotation(advise, AntaresManifestAdvice.class).factoryClass();
             addIncludeFilter(new AnnotationTypeFilter(advise, false));
         }
 
@@ -180,6 +199,7 @@ protected Set<BeanDefinitionHolder> doScan(String... basePackages) {
                     beanDefinition.getPropertyValues().add("objectType", beanClass);
                 } catch (ClassNotFoundException e) {
                     AntaresRegistry.this.logger.warn("Failed to load class: " + className);
+                    beanDefinitions.remove(definition);
                 }
             }
             return beanDefinitions;
@@ -189,14 +209,8 @@ protected Set<BeanDefinitionHolder> doScan(String... basePackages) {
 
     class CandidateScanner extends ClassPathScanningCandidateComponentProvider {
 
-        private CandidateScanner(List<Class<?>> types, List<Class<? extends Annotation>> annotations) {
+        private CandidateScanner() {
             super(false);
-            for (Class<?> type : types) {
-                addIncludeFilter(new AssignableTypeFilter(type));
-            }
-            for (Class<? extends Annotation> annotation : annotations) {
-                addIncludeFilter(new AnnotationTypeFilter(annotation, false));
-            }
         }
 
         @Override
@@ -206,7 +220,7 @@ protected boolean isCandidateComponent(AnnotatedBeanDefinition beanDefinition) {
                             beanDefinition.getMetadata().isIndependent());
         }
 
-        Set<Class<?>> scanTypes() {
+        private Set<Class<?>> scanTypes() {
             Set<String> classNames = new HashSet<>();
             for (String basePackage : basePackages) {
                 findCandidateComponents(basePackage).stream()

src/test/java/com/github/prchen/test/antares/starter/classes/BarCandidate1.java

@@ -1,4 +1,4 @@
-package com.github.prchen.test.antares.starter;
+package test;
 
 import com.github.prchen.antares.starter.AntaresScan;
 import org.springframework.boot.SpringApplication;

src/test/java/com/github/prchen/test/antares/starter/classes/BarCandidate2.java

@@ -1,11 +1,11 @@
-package com.github.prchen.test.antares.starter;
+package test;
 
 import com.github.prchen.antares.starter.AntaresContext;
-import com.github.prchen.test.antares.starter.annotations.Bar;
-import com.github.prchen.test.antares.starter.annotations.Foo;
-import com.github.prchen.test.antares.starter.classes.BarCandidate1;
-import com.github.prchen.test.antares.starter.classes.BarCandidate2;
-import com.github.prchen.test.antares.starter.interfaces.FooInterface;
+import test.annotations.Bar;
+import test.annotations.Foo;
+import test.classes.BarCandidate1;
+import test.classes.BarCandidate2;
+import test.interfaces.FooInterface;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;

src/test/java/com/github/prchen/test/antares/starter/interfaces/FooInterface.java

@@ -0,0 +1,12 @@
+package test.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@BarMeta
+public @interface Bar {
+}

src/test/java/com/github/prchen/test/antares/starter/TestApp.java renamed to src/test/java/test/TestApp.java

@@ -1,4 +1,4 @@
-package com.github.prchen.test.antares.starter.annotations;
+package test.annotations;
 
 import com.github.prchen.antares.starter.AntaresManifestAdvice;
 
@@ -7,8 +7,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({ElementType.TYPE})
+@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 @AntaresManifestAdvice
-public @interface Bar {
+public @interface BarMeta {
 }

src/test/java/com/github/prchen/test/antares/starter/TestCase.java renamed to src/test/java/test/TestCase.java

@@ -1,7 +1,7 @@
-package com.github.prchen.test.antares.starter.annotations;
+package test.annotations;
 
 import com.github.prchen.antares.starter.AntaresManifestAdvice;
-import com.github.prchen.test.antares.starter.factories.FooFactoryBean;
+import test.factories.FooFactoryBean;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/test/java/test/annotations/Bar.java

@@ -0,0 +1,7 @@
+package test.classes;
+
+import test.annotations.Bar;
+
+@Bar
+public class BarCandidate1 {
+}

src/test/java/com/github/prchen/test/antares/starter/annotations/Bar.java renamed to src/test/java/test/annotations/BarMeta.java

@@ -0,0 +1,7 @@
+package test.classes;
+
+import test.annotations.Bar;
+
+@Bar
+public class BarCandidate2 {
+}

src/test/java/com/github/prchen/test/antares/starter/annotations/Foo.java renamed to src/test/java/test/annotations/Foo.java

@@ -1,4 +1,4 @@
-package com.github.prchen.test.antares.starter.factories;
+package test.factories;
 
 import com.github.prchen.antares.starter.AntaresFactoryBean;
 import org.springframework.lang.Nullable;

src/test/java/test/classes/BarCandidate1.java

@@ -0,0 +1,10 @@
+package test.interfaces;
+
+import test.annotations.Foo;
+
+@Foo
+public interface FooInterface {
+
+    String sayHi();
+
+}

src/test/java/test/classes/BarCandidate2.java

@@ -9,7 +9,7 @@
     </appender>
 
     <logger name="org.neetfx.antares" level="INFO"/>
-    <logger name="org.neetfx.test.antares" level="INFO"/>
+    <logger name="test" level="INFO"/>
 
     <root level="WARN">
         <appender-ref ref="STDOUT" />