beanfactoryaware

Author: code4craft

src/main/java/us/codecraft/tinyioc/aop/AdvisedSupport.java

@@ -12,6 +12,8 @@ public class AdvisedSupport {
 
     private MethodInterceptor methodInterceptor;
 
+    private MethodMatcher methodMatcher;
+
     public TargetSource getTargetSource() {
         return targetSource;
     }
@@ -27,4 +29,12 @@ public MethodInterceptor getMethodInterceptor() {
     public void setMethodInterceptor(MethodInterceptor methodInterceptor) {
         this.methodInterceptor = methodInterceptor;
     }
+
+    public MethodMatcher getMethodMatcher() {
+        return methodMatcher;
+    }
+
+    public void setMethodMatcher(MethodMatcher methodMatcher) {
+        this.methodMatcher = methodMatcher;
+    }
 }

src/main/java/us/codecraft/tinyioc/aop/AspectJAwareAdvisorAutoProxyCreator.java

@@ -1,18 +1,48 @@
 package us.codecraft.tinyioc.aop;
 
+import org.aopalliance.intercept.MethodInterceptor;
 import us.codecraft.tinyioc.beans.BeanPostProcessor;
+import us.codecraft.tinyioc.beans.factory.AbstractBeanFactory;
+import us.codecraft.tinyioc.beans.factory.BeanFactory;
+
+import java.util.List;
 
 /**
  * @author [email protected]
  */
-public class AspectJAwareAdvisorAutoProxyCreator implements BeanPostProcessor {
+public class AspectJAwareAdvisorAutoProxyCreator implements BeanPostProcessor, BeanFactoryAware {
+
+	private AbstractBeanFactory beanFactory;
+
 	@Override
 	public Object postProcessBeforeInitialization(Object bean, String beanName) throws Exception {
 		return bean;
 	}
 
 	@Override
 	public Object postProcessAfterInitialization(Object bean, String beanName) throws Exception {
+		if (bean instanceof AspectJExpressionPointcutAdvisor) {
+			return bean;
+		}
+		List<AspectJExpressionPointcutAdvisor> advisors = beanFactory
+				.getBeansForType(AspectJExpressionPointcutAdvisor.class);
+		for (AspectJExpressionPointcutAdvisor advisor : advisors) {
+			if (advisor.getPointcut().getClassFilter().matches(bean.getClass())) {
+				AdvisedSupport advisedSupport = new AdvisedSupport();
+				advisedSupport.setMethodInterceptor((MethodInterceptor) advisor.getAdvice());
+				advisedSupport.setMethodMatcher(advisor.getPointcut().getMethodMatcher());
+
+				TargetSource targetSource = new TargetSource(bean, bean.getClass());
+				advisedSupport.setTargetSource(targetSource);
+
+				return new JdkDynamicAopProxy(advisedSupport);
+			}
+		}
 		return bean;
 	}
+
+	@Override
+	public void setBeanFactory(BeanFactory beanFactory) throws Exception {
+		this.beanFactory = (AbstractBeanFactory) beanFactory;
+	}
 }

src/main/java/us/codecraft/tinyioc/aop/BeanFactoryAware.java

@@ -0,0 +1,11 @@
+package us.codecraft.tinyioc.aop;
+
+import us.codecraft.tinyioc.beans.factory.BeanFactory;
+
+/**
+ * @author [email protected]
+ */
+public interface BeanFactoryAware {
+
+    void setBeanFactory(BeanFactory beanFactory) throws Exception;
+}

src/main/java/us/codecraft/tinyioc/aop/JdkDynamicAopProxy.java

@@ -19,7 +19,7 @@ public JdkDynamicAopProxy(AdvisedSupport advised) {
 		this.advised = advised;
 	}
 
-    @Override
+	@Override
 	public Object getProxy() {
 		return Proxy.newProxyInstance(getClass().getClassLoader(), new Class[] { advised.getTargetSource()
 				.getTargetClass() }, this);
@@ -28,8 +28,13 @@ public Object getProxy() {
 	@Override
 	public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
 		MethodInterceptor methodInterceptor = advised.getMethodInterceptor();
-		return methodInterceptor.invoke(new ReflectiveMethodInvocation(advised.getTargetSource().getTarget(), method,
-				args));
+		if (advised.getMethodMatcher() != null
+				&& advised.getMethodMatcher().matches(method, advised.getTargetSource().getTarget().getClass())) {
+			return methodInterceptor.invoke(new ReflectiveMethodInvocation(advised.getTargetSource().getTarget(),
+					method, args));
+		} else {
+			return method.invoke(advised.getTargetSource().getTarget(), args);
+		}
 	}
 
 }

src/main/java/us/codecraft/tinyioc/beans/factory/AutowireCapableBeanFactory.java

@@ -1,6 +1,7 @@
 package us.codecraft.tinyioc.beans.factory;
 
 import us.codecraft.tinyioc.BeanReference;
+import us.codecraft.tinyioc.aop.BeanFactoryAware;
 import us.codecraft.tinyioc.beans.BeanDefinition;
 import us.codecraft.tinyioc.beans.PropertyValue;
 
@@ -14,6 +15,9 @@
 public class AutowireCapableBeanFactory extends AbstractBeanFactory {
 
 	protected void applyPropertyValues(Object bean, BeanDefinition mbd) throws Exception {
+        if (bean instanceof BeanFactoryAware){
+            ((BeanFactoryAware)bean).setBeanFactory(this);
+        }
 		for (PropertyValue propertyValue : mbd.getPropertyValues().getPropertyValues()) {
 			Field declaredField = bean.getClass().getDeclaredField(propertyValue.getName());
 			declaredField.setAccessible(true);