Polish code with issues

Author: mercyblitz

projects/stage-1/middleware-frameworks/my-cdi/src/main/java/org/geektimes/enterprise/inject/standard/beans/interceptor/InterceptorBean.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- package org.geektimes.enterprise.inject.standard.beans.interceptor;
+package org.geektimes.enterprise.inject.standard.beans.interceptor;
 
 import org.geektimes.enterprise.inject.standard.beans.GenericBean;
 import org.geektimes.interceptor.InterceptorInfo;
@@ -36,7 +36,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-    public class InterceptorBean<T> extends GenericBean<T> implements Interceptor<T> {
+public class InterceptorBean<T> extends GenericBean<T> implements Interceptor<T> {
 
     private final AnnotatedType<?> interceptorType;
 

projects/stage-1/middleware-frameworks/my-cdi/src/main/java/org/geektimes/enterprise/inject/standard/beans/manager/BeanArchiveManager.java

@@ -352,7 +352,7 @@ public boolean isQualifier(Class<? extends Annotation> annotationType) {
     }
 
     public boolean isInterceptorBinding(Class<? extends Annotation> annotationType) {
-        return InterceptorUtils.isInterceptorBinding(annotationType) ||
+        return InterceptorUtils.isAnnotatedInterceptorBinding(annotationType) ||
                 // Extensions
                 syntheticInterceptorBindings.containsKey(annotationType);
     }

projects/stage-1/middleware-frameworks/my-interceptor/src/main/java/org/geektimes/interceptor/DefaultInterceptorManager.java

@@ -47,9 +47,10 @@
 public class DefaultInterceptorManager implements InterceptorManager {
 
     /**
-     * The supported annotation types of interceptor binding.
+     * The supported annotation types of interceptor binding mapping
+     * the {@link Interceptor @Interceptor} {@link Class classes}.
      */
-    private final Set<Class<? extends Annotation>> interceptorBindingTypes;
+    private final Map<Class<? extends Annotation>, Set<Class<?>>> bindingInterceptorClasses;
 
     /**
      * The {@link InterceptorInfo} Repository
@@ -66,11 +67,14 @@ public class DefaultInterceptorManager implements InterceptorManager {
      */
     private final Map<Executable, List<Object>> interceptorsCache;
 
+    private final Map<Executable, List<InterceptorInfo>> interceptorInfoCache;
+
     public DefaultInterceptorManager() {
-        this.interceptorBindingTypes = new LinkedHashSet<>();
+        this.bindingInterceptorClasses = new HashMap<>();
         this.interceptorInfoRepository = new TreeMap<>(PriorityComparator.INSTANCE);
-        this.bindingInterceptors = new LinkedHashMap<>();
-        this.interceptorsCache = new LinkedHashMap<>();
+        this.bindingInterceptors = new HashMap<>();
+        this.interceptorsCache = new HashMap<>();
+        this.interceptorInfoCache = new HashMap<>();
         registerDefaultInterceptorBindingType();
     }
 
@@ -153,15 +157,56 @@ public List<Object> resolveInterceptors(Executable executable, Object... default
         });
     }
 
+    @Override
+    public List<Class<?>> resolveInterceptorClasses(Executable executable, Class<?>... defaultInterceptorClasses) {
+        List<InterceptorInfo> interceptorInfoList = interceptorInfoCache.computeIfAbsent(executable, e -> {
+
+            List<Class<?>> interceptorClasses = new LinkedList<>();
+
+            if (!isExcludedDefaultInterceptors(executable)) {
+                // 1. Default interceptors are invoked first
+                interceptorClasses.addAll(asList(defaultInterceptorClasses));
+            }
+
+            // Resolve interceptors using @Interceptors
+            // 2. Interceptors declared by applying the Interceptors annotation at class-level to the target
+            // class are invoked next.
+            // 3. Interceptors declared by applying the Interceptors annotation at method- or constructor-level
+            // are invoked next.
+            interceptorClasses.addAll(resolveAnnotatedInterceptorClasses(executable));
+
+            // Resolve interceptors using Interceptor Bindings
+            // 4. Interceptors declared using interceptor bindings are invoked next.
+            interceptorClasses.addAll(resolveBindingInterceptorClasses(executable));
+
+            // 5.2.1 Use of the Priority Annotation in Ordering Interceptors
+            sortInterceptors(interceptorClasses);
+
+            return unmodifiableList(interceptorClasses);
+        });
+
+
+        return interceptorInfoList;
+    }
+
 
     @Override
     public void registerInterceptorBindingType(Class<? extends Annotation> interceptorBindingType) {
-        this.interceptorBindingTypes.add(interceptorBindingType);
+        registerInterceptorBinding(interceptorBindingType);
+    }
+
+    @Override
+    public void registerInterceptorBinding(Class<? extends Annotation> interceptorBindingType,
+                                           Annotation... interceptorBindingDef) {
+        Set<Class<?>> interceptorClasses = bindingInterceptorClasses.computeIfAbsent(interceptorBindingType,
+                t -> new HashSet<>());
+
+        // TODO
     }
 
     @Override
     public boolean isInterceptorBindingType(Class<? extends Annotation> annotationType) {
-        if (interceptorBindingTypes.contains(annotationType)) {
+        if (bindingInterceptorClasses.containsKey(annotationType)) {
             return true;
         }
         if (isMetaAnnotation(annotationType, InterceptorBinding.class)) {
@@ -178,7 +223,7 @@ public Set<Class<?>> getInterceptorClasses() {
 
     @Override
     public Set<Class<? extends Annotation>> getInterceptorBindingTypes() {
-        return unmodifiableSet(interceptorBindingTypes);
+        return bindingInterceptorClasses.keySet();
     }
 
     @Override
@@ -205,6 +250,11 @@ private boolean isExcludedDefaultInterceptors(Executable executable) {
         return findAnnotation(executable, ExcludeDefaultInterceptors.class) != null;
     }
 
+    private List<Class<?>> resolveBindingInterceptorClasses(Executable executable) {
+        InterceptorBindings interceptorBindings = resolveInterceptorBindings(executable);
+        return unmodifiableSortedSet(bindingInterceptors.getOrDefault(interceptorBindings, emptySortedSet()));
+    }
+
     private SortedSet<Object> resolveBindingInterceptors(Executable executable) {
         InterceptorBindings interceptorBindings = resolveInterceptorBindings(executable);
         return unmodifiableSortedSet(bindingInterceptors.getOrDefault(interceptorBindings, emptySortedSet()));
@@ -221,7 +271,7 @@ private SortedSet<Object> resolveBindingInterceptors(Executable executable) {
      * @see Interceptors
      * @see ExcludeClassInterceptors
      */
-    private List<Object> resolveAnnotatedInterceptors(Executable executable) {
+    protected List<Class<?>> resolveAnnotatedInterceptorClasses(Executable executable) {
         Class<?> componentClass = executable.getDeclaringClass();
 
         List<Class<?>> interceptorClasses = new LinkedList<>();
@@ -242,6 +292,22 @@ private List<Object> resolveAnnotatedInterceptors(Executable executable) {
             }
         }
 
+        return interceptorClasses;
+    }
+
+    /**
+     * Interceptors declared by applying the Interceptors annotation at class-level to the target
+     * class are invoked next.
+     * <p>
+     * Interceptors declared by applying the Interceptors annotation at method- or constructor-level are invoked next.
+     *
+     * @param executable the intercepted of {@linkplain Method method} or {@linkplain Constructor constructor}
+     * @return non-null
+     * @see Interceptors
+     * @see ExcludeClassInterceptors
+     */
+    protected List<Object> resolveAnnotatedInterceptors(Executable executable) {
+        List<Class<?>> interceptorClasses = resolveAnnotatedInterceptorClasses(executable);
         return interceptorClasses.stream()
                 .map(InterceptorUtils::unwrap)
                 .collect(toList());

projects/stage-1/middleware-frameworks/my-interceptor/src/main/java/org/geektimes/interceptor/InterceptorBindingInfo.java

@@ -23,7 +23,7 @@
 
 import static org.geektimes.commons.lang.util.AnnotationUtils.getAttributesMap;
 import static org.geektimes.interceptor.InterceptorBindingAttributeFilter.FILTERS;
-import static org.geektimes.interceptor.util.InterceptorUtils.isInterceptorBinding;
+import static org.geektimes.interceptor.util.InterceptorUtils.isAnnotatedInterceptorBinding;
 
 /**
  * The Metadata Info Class for {@link InterceptorBinding}
@@ -47,7 +47,7 @@ public class InterceptorBindingInfo {
     public InterceptorBindingInfo(Annotation declaredAnnotation) {
         this.declaredAnnotation = declaredAnnotation;
         this.declaredAnnotationType = declaredAnnotation.annotationType();
-        this.synthetic = !isInterceptorBinding(declaredAnnotationType);
+        this.synthetic = !isAnnotatedInterceptorBinding(declaredAnnotationType);
         this.attributes = getAttributesMap(declaredAnnotation, FILTERS);
     }
 
@@ -68,7 +68,9 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         InterceptorBindingInfo that = (InterceptorBindingInfo) o;
-        return synthetic == that.synthetic && Objects.equals(declaredAnnotationType, that.declaredAnnotationType) && Objects.equals(attributes, that.attributes);
+        return synthetic == that.synthetic
+                && Objects.equals(declaredAnnotationType, that.declaredAnnotationType)
+                && Objects.equals(attributes, that.attributes);
     }
 
     @Override

projects/stage-1/middleware-frameworks/my-interceptor/src/main/java/org/geektimes/interceptor/InterceptorManager.java

@@ -150,6 +150,23 @@ default List<Object> resolveInterceptors(Constructor<?> constructor, Object... d
      */
     List<Object> resolveInterceptors(Executable executable, Object... defaultInterceptors);
 
+    /**
+     * Resolve the bindings of {@link javax.interceptor.Interceptor @Interceptor} {@link Class classes} upon
+     * the specified {@linkplain Method method} or {@link Constructor}
+     * <p>
+     * See Specification:
+     * <p>
+     * 5.2 Interceptor Ordering Rules
+     * <p>
+     * 5.2.1 Use of the Priority Annotation in Ordering Interceptors
+     *
+     * @param executable                the intercepted of {@linkplain Method method} or {@linkplain Constructor constructor}
+     * @param defaultInterceptorClasses the default interceptors {@link Class classes}
+     * @return a non-null read-only {@link Priority priority} {@link List list} of
+     * {@link javax.interceptor.Interceptor @Interceptor} {@link Class classes}
+     */
+    List<Class<?>> resolveInterceptorClasses(Executable executable, Class<?>... defaultInterceptorClasses);
+
     /**
      * Register an {@linkplain javax.interceptor.Interceptor @Interceptor} binding {@link Class type}
      * whether it adds {@link InterceptorBinding} or not.
@@ -159,6 +176,15 @@ default List<Object> resolveInterceptors(Constructor<?> constructor, Object... d
      */
     void registerInterceptorBindingType(Class<? extends Annotation> interceptorBindingType);
 
+    /**
+     * Register an {@linkplain javax.interceptor.Interceptor @Interceptor} binding {@link Class type}
+     * whether it adds {@link InterceptorBinding} or not.
+     *
+     * @param interceptorBindingType An interceptor binding type
+     * @param interceptorBindingDef  An optional list of annotations defining the {@linkplain javax.enterprise.inject.spi.Interceptor interceptor}
+     */
+    void registerInterceptorBinding(Class<? extends Annotation> interceptorBindingType, Annotation... interceptorBindingDef);
+
     /**
      * Get all registered {@link Class classes} of {@link javax.interceptor.Interceptor @Interceptor}
      *

projects/stage-1/middleware-frameworks/my-interceptor/src/main/java/org/geektimes/interceptor/util/InterceptorUtils.java

@@ -54,7 +54,7 @@ public static boolean isInterceptorClass(Class<?> interceptorClass) {
         return false;
     }
 
-    public static List<Object> sortInterceptors(List<Object> interceptors) {
+    public static List<Object> sortInterceptors(List<?> interceptors) {
         List<Object> sortedInterceptors = new LinkedList<>(interceptors);
         sortedInterceptors.sort(PriorityComparator.INSTANCE);
         return sortedInterceptors;
@@ -281,7 +281,7 @@ private static void validateInterceptorClassConstructors(Class<?> interceptorCla
     private static void validateInterceptorClassMethods(Class<?> interceptorClass) {
     }
 
-    public static boolean isInterceptorBinding(Class<? extends Annotation> annotationType) {
+    public static boolean isAnnotatedInterceptorBinding(Class<? extends Annotation> annotationType) {
         return isMetaAnnotation(annotationType, InterceptorBinding.class);
     }