Merge pull request #26 from juanmbellini/dev

Merge 1.0.1-RELEASE changes into master
juanmbellini · Oct 16, 2017 · e40d01e · e40d01e
2 parents 0e51bf4 + d420a35
commit e40d01e
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Error-Handler [![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![Build Status](https://travis-ci.org/juanmbellini/error-handler.svg?branch=master)](https://travis-ci.org/juanmbellini/error-handler) [![Maven Central](https://img.shields.io/maven-central/v/com.bellotapps.utils/error-handler.svg)](https://repo.maven.apache.org/maven2/com/bellotapps/utils/error-handler/1.0.0-RELEASE)
+# Error-Handler [![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![Build Status](https://travis-ci.org/juanmbellini/error-handler.svg?branch=master)](https://travis-ci.org/juanmbellini/error-handler) [![Maven Central](https://img.shields.io/maven-central/v/com.bellotapps.utils/error-handler.svg)](https://repo.maven.apache.org/maven2/com/bellotapps/utils/error-handler/1.0.1-RELEASE)
 A centralized error management system
 
 ## Description

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.bellotapps.utils</groupId>
     <artifactId>error-handler</artifactId>
-    <version>1.0.0-RELEASE</version>
+    <version>1.0.1-RELEASE</version>
     <packaging>jar</packaging>
 
     <name>error-handler</name>

diff --git a/src/main/java/com/bellotapps/utils/error_handler/ErrorHandlerCreationConfigurer.java b/src/main/java/com/bellotapps/utils/error_handler/ErrorHandlerCreationConfigurer.java
@@ -11,10 +11,14 @@
 import org.springframework.core.ResolvableType;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.type.AnnotationMetadata;
+import org.springframework.core.type.classreading.MetadataReader;
+import org.springframework.core.type.classreading.MetadataReaderFactory;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.core.type.filter.AssignableTypeFilter;
+import org.springframework.core.type.filter.TypeFilter;
 import org.springframework.util.ClassUtils;
 
+import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.*;
@@ -154,8 +158,7 @@ private void scanPackages(final EnableErrorHandler enableErrorHandler) {
         // and are annotated with ExceptionHandlerObject annotation
         final ClassPathScanningCandidateComponentProvider scanner =
                 new ClassPathScanningCandidateComponentProvider(false);
-        scanner.addIncludeFilter(new AnnotationTypeFilter(ExceptionHandlerObject.class));
-        scanner.addIncludeFilter(new AssignableTypeFilter(ExceptionHandler.class));
+        scanner.addIncludeFilter(new ExceptionHandlerObjectAnnotatedAndExceptionHandlerAssignableTypeFilter());
 
         // Scan packages to get classes used as exception handlers
         // (i.e are located in the packages to scan and, implement ExceptionHandler interface,
@@ -244,4 +247,36 @@ private void instantiateNoBeanHandlers() {
 
         this.handlers.addAll(createdHandlers);
     }
+
+    /**
+     * Custom filter to get classes annotated with {@link ExceptionHandlerObject}
+     * and that implement {@link ExceptionHandler} interface.
+     */
+    private static class ExceptionHandlerObjectAnnotatedAndExceptionHandlerAssignableTypeFilter implements TypeFilter {
+
+        /**
+         * Annotation type filter to get those classes annotated with {@link ExceptionHandlerObject}.
+         */
+        private final AnnotationTypeFilter exceptionHandlerObjectAnnotationFilter;
+
+        /**
+         * Assignable type filter to get those classes that implement {@link ExceptionHandler} interface.
+         */
+        private final AssignableTypeFilter assignableFromExceptionHandlerInterfaceFilter;
+
+        /**
+         * Constructor.
+         */
+        private ExceptionHandlerObjectAnnotatedAndExceptionHandlerAssignableTypeFilter() {
+            this.exceptionHandlerObjectAnnotationFilter = new AnnotationTypeFilter(ExceptionHandlerObject.class);
+            this.assignableFromExceptionHandlerInterfaceFilter = new AssignableTypeFilter(ExceptionHandler.class);
+        }
+
+        @Override
+        public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory)
+                throws IOException {
+            return exceptionHandlerObjectAnnotationFilter.match(metadataReader, metadataReaderFactory)
+                    && assignableFromExceptionHandlerInterfaceFilter.match(metadataReader, metadataReaderFactory);
+        }
+    }
 }