Polish code

Author: mercyblitz

projects/stage-1/middleware-frameworks/my-cache/src/test/java/org/geektimes/cache/annotation/interceptor/CachePutInterceptorTest.java

@@ -18,8 +18,8 @@
 
 import org.geektimes.cache.DataRepository;
 import org.geektimes.cache.InMemoryDataRepository;
-import org.geektimes.interceptor.DefaultInterceptorEnhancer;
-import org.geektimes.interceptor.InterceptorEnhancer;
+import org.geektimes.interceptor.DefaultComponentEnhancer;
+import org.geektimes.interceptor.ComponentEnhancer;
 import org.junit.Test;
 
 import javax.cache.CacheManager;
@@ -38,7 +38,7 @@ public class CachePutInterceptorTest {
 
     private DataRepository dataRepository = new InMemoryDataRepository();
 
-    private InterceptorEnhancer enhancer = new DefaultInterceptorEnhancer();
+    private ComponentEnhancer enhancer = new DefaultComponentEnhancer();
 
     private CachingProvider cachingProvider = Caching.getCachingProvider();
 

projects/stage-1/middleware-frameworks/my-cache/src/test/java/org/geektimes/cache/annotation/interceptor/CacheRemoveAllInterceptorTest.java

@@ -18,8 +18,8 @@
 
 import org.geektimes.cache.DataRepository;
 import org.geektimes.cache.InMemoryDataRepository;
-import org.geektimes.interceptor.DefaultInterceptorEnhancer;
-import org.geektimes.interceptor.InterceptorEnhancer;
+import org.geektimes.interceptor.DefaultComponentEnhancer;
+import org.geektimes.interceptor.ComponentEnhancer;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
@@ -34,7 +34,7 @@ public class CacheRemoveAllInterceptorTest {
 
     private DataRepository dataRepository = new InMemoryDataRepository();
 
-    private InterceptorEnhancer enhancer = new DefaultInterceptorEnhancer();
+    private ComponentEnhancer enhancer = new DefaultComponentEnhancer();
 
     @Test
     public void test() {

projects/stage-1/middleware-frameworks/my-cache/src/test/java/org/geektimes/cache/annotation/interceptor/CacheRemoveInterceptorTest.java

@@ -18,8 +18,8 @@
 
 import org.geektimes.cache.DataRepository;
 import org.geektimes.cache.InMemoryDataRepository;
-import org.geektimes.interceptor.DefaultInterceptorEnhancer;
-import org.geektimes.interceptor.InterceptorEnhancer;
+import org.geektimes.interceptor.DefaultComponentEnhancer;
+import org.geektimes.interceptor.ComponentEnhancer;
 import org.junit.Test;
 
 import static org.junit.Assert.assertNull;
@@ -35,7 +35,7 @@ public class CacheRemoveInterceptorTest {
 
     private DataRepository dataRepository = new InMemoryDataRepository();
 
-    private InterceptorEnhancer enhancer = new DefaultInterceptorEnhancer();
+    private ComponentEnhancer enhancer = new DefaultComponentEnhancer();
 
     @Test
     public void test() {

projects/stage-1/middleware-frameworks/my-cache/src/test/java/org/geektimes/cache/annotation/interceptor/CacheResultInterceptorTest.java

@@ -18,9 +18,9 @@
 
 import org.geektimes.cache.DataRepository;
 import org.geektimes.cache.InMemoryDataRepository;
-import org.geektimes.interceptor.DefaultInterceptorEnhancer;
+import org.geektimes.interceptor.DefaultComponentEnhancer;
 import org.geektimes.interceptor.Interceptor;
-import org.geektimes.interceptor.InterceptorEnhancer;
+import org.geektimes.interceptor.ComponentEnhancer;
 import org.junit.Test;
 
 import static org.geektimes.commons.util.ServiceLoaders.loadAsArray;
@@ -37,7 +37,7 @@ public class CacheResultInterceptorTest {
 
     private DataRepository dataRepository = new InMemoryDataRepository();
 
-    private InterceptorEnhancer enhancer = new DefaultInterceptorEnhancer();
+    private ComponentEnhancer enhancer = new DefaultComponentEnhancer();
 
     @Test
     public void test() {

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

@@ -34,9 +34,8 @@
 
 import static java.lang.String.format;
 import static java.util.ServiceLoader.load;
-import static org.geektimes.commons.function.Streams.stream;
 import static org.geektimes.commons.reflect.util.TypeUtils.resolveTypeArguments;
-import static org.geektimes.interceptor.InterceptorRegistry.getInstance;
+import static org.geektimes.interceptor.InterceptorManager.getInstance;
 import static org.geektimes.interceptor.util.InterceptorUtils.INTERCEPTOR_ANNOTATION_TYPE;
 
 /**
@@ -51,7 +50,7 @@ public abstract class AnnotatedInterceptor<A extends Annotation> implements Inte
 
     private final Logger logger = Logger.getLogger(getClass().getName());
 
-    private final InterceptorRegistry interceptorRegistry;
+    private final InterceptorManager interceptorManager;
 
     private final Class<A> interceptorBindingType;
 
@@ -63,10 +62,10 @@ public abstract class AnnotatedInterceptor<A extends Annotation> implements Inte
      */
     public AnnotatedInterceptor() throws IllegalArgumentException {
         Class<?> interceptorClass = getClass();
-        this.interceptorRegistry = getInstance(interceptorClass.getClassLoader());
-        this.interceptorRegistry.registerInterceptorClass(interceptorClass);
+        this.interceptorManager = getInstance(interceptorClass.getClassLoader());
+        this.interceptorManager.registerInterceptorClass(interceptorClass);
         this.interceptorBindingType = resolveInterceptorBindingType(interceptorClass);
-        this.interceptorRegistry.registerInterceptor(this);
+        this.interceptorManager.registerInterceptor(this);
     }
 
     @Override
@@ -232,11 +231,11 @@ protected Class<A> resolveInterceptorBindingType(Class<?> interceptorClass) {
     }
 
     private boolean isInterceptorBindingType(Class<? extends Annotation> annotationType) {
-        return interceptorRegistry.isInterceptorBindingType(annotationType);
+        return interceptorManager.isInterceptorBindingType(annotationType);
     }
 
     private void registerSyntheticInterceptorBindingType(Class<A> annotationType) {
-        interceptorRegistry.registerInterceptorBindingType(annotationType);
+        interceptorManager.registerInterceptorBindingType(annotationType);
     }
 
     protected boolean shouldRegisterSyntheticInterceptorBindingType() {
@@ -278,8 +277,8 @@ protected Throwable getFailure(Throwable e) {
         return failure;
     }
 
-    public InterceptorRegistry getInterceptorRegistry() {
-        return interceptorRegistry;
+    public InterceptorManager getInterceptorRegistry() {
+        return interceptorManager;
     }
 
     private boolean excludeInterceptorAnnotation(Annotation annotation) {

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

@@ -19,13 +19,12 @@
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.interceptor.InvocationContext;
-import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.util.List;
 import java.util.Map;
 
-import static org.geektimes.interceptor.InterceptorRegistry.getInstance;
+import static org.geektimes.interceptor.InterceptorManager.getInstance;
 
 /**
  * Chainable {@link InvocationContext}
@@ -41,17 +40,14 @@ public class ChainableInvocationContext implements InvocationContext {
 
     private final int size;
 
-    private final InterceptorRegistry interceptorRegistry;
+    private final InterceptorManager interceptorManager;
 
     private int pos; // position
 
-    public ChainableInvocationContext(InvocationContext delegateContext, Object... interceptors) {
+    public ChainableInvocationContext(InvocationContext delegateContext, Object... defaultInterceptors) {
         this.delegateContext = delegateContext;
-        // sort
-        this.interceptorRegistry = getInstance(resolveClassLoader(interceptors));
-        this.interceptorRegistry.registerInterceptors(interceptors);
-        this.interceptorRegistry.registerDiscoveredInterceptors();
-        this.interceptors = resolveInterceptors();
+        this.interceptorManager = getInstance(resolveClassLoader(defaultInterceptors));
+        this.interceptors = resolveInterceptors(defaultInterceptors);
         this.size = this.interceptors.size();
         this.pos = 0;
     }
@@ -108,16 +104,17 @@ private ClassLoader resolveClassLoader(Object[] interceptors) {
         return target.getClass().getClassLoader();
     }
 
-    private List<Object> resolveInterceptors() {
-        AnnotatedElement annotatedElement = getMethod();
-        if (annotatedElement == null) {
-            annotatedElement = getConstructor();
+    private List<Object> resolveInterceptors(Object[] defaultInterceptors) {
+        Method method = getMethod();
+        if (method != null) {
+            return interceptorManager.resolveInterceptors(method, defaultInterceptors);
         }
-        return interceptorRegistry.getInterceptors(annotatedElement);
+        return interceptorManager.resolveInterceptors(getConstructor(), defaultInterceptors);
     }
 
+
     private Method resolveInterceptionMethod(Object interceptor) {
-        InterceptorInfo interceptorInfo = interceptorRegistry.getInterceptorInfo(interceptor.getClass());
+        InterceptorInfo interceptorInfo = interceptorManager.getInterceptorInfo(interceptor.getClass());
 
         final Method interceptionMethod;  // nerver null
 

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

@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.geektimes.interceptor;
+
+/**
+ * Component Enhancer
+ * <p>
+ * If a component class declares or inherits a class-level interceptor binding,
+ * it must not be declared final, or have any non-static, non-private, final
+ * methods. If a component has a class-level interceptor binding and is declared
+ * final or has a non-static, non-private, final method, the container automatically
+ * detects the problem and treats it as a definition error, and causes deployment to
+ * fail.
+ * <p>
+ * If a non-static, non-private method of a component class declares a method-level
+ * interceptor binding, neither the method nor the component class may be declared final.
+ * If a non-static, non-private, final method of a component has a method-level interceptor
+ * binding, the container automatically detects the problem and treats it as a definition
+ * error, and causes deployment to fail.
+ *
+ * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
+ * @since 1.0.0
+ */
+public interface ComponentEnhancer {
+
+    default <T> T enhance(T component) {
+        return enhance(component, (Class<? super T>) component.getClass());
+    }
+
+    default <T> T enhance(T component, Class<? super T> componentClass) {
+        return enhance(component, componentClass, new Object[0]);
+    }
+
+    default <T> T enhance(T component, Object... defaultInterceptors) {
+        return enhance(component, (Class<? super T>) component.getClass(), defaultInterceptors);
+    }
+
+    <T> T enhance(T component, Class<? super T> componentClass, Object... defaultInterceptors);
+
+}

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

@@ -16,39 +16,39 @@
  */
 package org.geektimes.interceptor;
 
-import org.geektimes.interceptor.cglib.CglibInterceptorEnhancer;
-import org.geektimes.interceptor.jdk.DynamicProxyInterceptorEnhancer;
+import org.geektimes.interceptor.cglib.CglibComponentEnhancer;
+import org.geektimes.interceptor.jdk.DynamicProxyComponentEnhancer;
 
 import static org.geektimes.commons.lang.util.ClassLoaderUtils.getClassLoader;
 
 /**
- * Default {@link InterceptorEnhancer}
+ * Default {@link ComponentEnhancer}
  *
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since 1.0.0
  */
-public class DefaultInterceptorEnhancer implements InterceptorEnhancer {
+public class DefaultComponentEnhancer implements ComponentEnhancer {
 
-    private final InterceptorEnhancer jdkProxyInterceptorEnhancer;
+    private final ComponentEnhancer jdkProxyInterceptorEnhancer;
 
-    private final InterceptorEnhancer cglibInterceptorEnhancer;
+    private final ComponentEnhancer cglibInterceptorEnhancer;
 
-    private final InterceptorRegistry interceptorRegistry;
+    private final InterceptorManager interceptorManager;
 
-    public DefaultInterceptorEnhancer() {
-        this.jdkProxyInterceptorEnhancer = new DynamicProxyInterceptorEnhancer();
-        this.cglibInterceptorEnhancer = new CglibInterceptorEnhancer();
-        this.interceptorRegistry = InterceptorRegistry.getInstance(getClassLoader(this.getClass()));
-        this.interceptorRegistry.registerDiscoveredInterceptors();
+    public DefaultComponentEnhancer() {
+        this.jdkProxyInterceptorEnhancer = new DynamicProxyComponentEnhancer();
+        this.cglibInterceptorEnhancer = new CglibComponentEnhancer();
+        this.interceptorManager = InterceptorManager.getInstance(getClassLoader(this.getClass()));
+        this.interceptorManager.registerDiscoveredInterceptors();
     }
 
     @Override
-    public <T> T enhance(T source, Class<? super T> type, Object... interceptors) {
-        assertType(type);
-        if (type.isInterface()) {
-            return jdkProxyInterceptorEnhancer.enhance(source, type, interceptors);
+    public <T> T enhance(T source, Class<? super T> componentClass, Object... defaultInterceptors) {
+        assertType(componentClass);
+        if (componentClass.isInterface()) {
+            return jdkProxyInterceptorEnhancer.enhance(source, componentClass, defaultInterceptors);
         } else {
-            return cglibInterceptorEnhancer.enhance(source, type, interceptors);
+            return cglibInterceptorEnhancer.enhance(source, componentClass, defaultInterceptors);
         }
     }