aop complete

Author: code4craft

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

@@ -24,6 +24,9 @@ public Object postProcessAfterInitialization(Object bean, String beanName) throw
 		if (bean instanceof AspectJExpressionPointcutAdvisor) {
 			return bean;
 		}
+        if (bean instanceof MethodInterceptor) {
+            return bean;
+        }
 		List<AspectJExpressionPointcutAdvisor> advisors = beanFactory
 				.getBeansForType(AspectJExpressionPointcutAdvisor.class);
 		for (AspectJExpressionPointcutAdvisor advisor : advisors) {
@@ -32,10 +35,10 @@ public Object postProcessAfterInitialization(Object bean, String beanName) throw
 				advisedSupport.setMethodInterceptor((MethodInterceptor) advisor.getAdvice());
 				advisedSupport.setMethodMatcher(advisor.getPointcut().getMethodMatcher());
 
-				TargetSource targetSource = new TargetSource(bean, bean.getClass());
+				TargetSource targetSource = new TargetSource(bean, bean.getClass().getInterfaces());
 				advisedSupport.setTargetSource(targetSource);
 
-				return new JdkDynamicAopProxy(advisedSupport);
+				return new JdkDynamicAopProxy(advisedSupport).getProxy();
 			}
 		}
 		return bean;

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

@@ -21,8 +21,7 @@ public JdkDynamicAopProxy(AdvisedSupport advised) {
 
 	@Override
 	public Object getProxy() {
-		return Proxy.newProxyInstance(getClass().getClassLoader(), new Class[] { advised.getTargetSource()
-				.getTargetClass() }, this);
+		return Proxy.newProxyInstance(getClass().getClassLoader(), advised.getTargetSource().getTargetClass(), this);
 	}
 
 	@Override

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

@@ -6,16 +6,16 @@
  */
 public class TargetSource {
 
-	private Class targetClass;
+	private Class<?>[] targetClass;
 
 	private Object target;
 
-	public TargetSource(Object target, Class<?> targetClass) {
+	public TargetSource(Object target, Class<?>... targetClass) {
 		this.target = target;
 		this.targetClass = targetClass;
 	}
 
-	public Class getTargetClass() {
+	public Class<?>[] getTargetClass() {
 		return targetClass;
 	}
 

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

@@ -29,12 +29,12 @@ public Object getBean(String name) throws Exception {
 		Object bean = beanDefinition.getBean();
 		if (bean == null) {
 			bean = doCreateBean(beanDefinition);
-			initializeBean(bean, name);
+            bean = initializeBean(bean, name);
 		}
 		return bean;
 	}
 
-	protected void initializeBean(Object bean, String name) throws Exception {
+	protected Object initializeBean(Object bean, String name) throws Exception {
 		for (BeanPostProcessor beanPostProcessor : beanPostProcessors) {
 			bean = beanPostProcessor.postProcessBeforeInitialization(bean, name);
 		}
@@ -43,6 +43,7 @@ protected void initializeBean(Object bean, String name) throws Exception {
 		for (BeanPostProcessor beanPostProcessor : beanPostProcessors) {
             bean = beanPostProcessor.postProcessAfterInitialization(bean, name);
 		}
+        return bean;
 	}
 
 	protected Object createBeanInstance(BeanDefinition beanDefinition) throws Exception {

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

@@ -6,6 +6,7 @@
 import us.codecraft.tinyioc.beans.PropertyValue;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 
 /**
  * 可自动装配内容的BeanFactory
@@ -15,18 +16,28 @@
 public class AutowireCapableBeanFactory extends AbstractBeanFactory {
 
 	protected void applyPropertyValues(Object bean, BeanDefinition mbd) throws Exception {
-        if (bean instanceof BeanFactoryAware){
-            ((BeanFactoryAware)bean).setBeanFactory(this);
-        }
+		if (bean instanceof BeanFactoryAware) {
+			((BeanFactoryAware) bean).setBeanFactory(this);
+		}
 		for (PropertyValue propertyValue : mbd.getPropertyValues().getPropertyValues()) {
-			Field declaredField = bean.getClass().getDeclaredField(propertyValue.getName());
-			declaredField.setAccessible(true);
 			Object value = propertyValue.getValue();
 			if (value instanceof BeanReference) {
 				BeanReference beanReference = (BeanReference) value;
 				value = getBean(beanReference.getName());
 			}
-			declaredField.set(bean, value);
+
+			try {
+				Method declaredMethod = bean.getClass().getDeclaredMethod(
+						"set" + propertyValue.getName().substring(0, 1).toUpperCase()
+								+ propertyValue.getName().substring(1), value.getClass());
+				declaredMethod.setAccessible(true);
+
+				declaredMethod.invoke(bean, value);
+			} catch (NoSuchMethodException e) {
+				Field declaredField = bean.getClass().getDeclaredField(propertyValue.getName());
+				declaredField.setAccessible(true);
+				declaredField.set(bean, value);
+			}
 		}
 	}
 }

src/test/java/us/codecraft/tinyioc/HelloWorldServiceImpl.java

@@ -21,4 +21,5 @@ public void setText(String text) {
     public void setOutputService(OutputService outputService) {
         this.outputService = outputService;
     }
+
 }

src/test/java/us/codecraft/tinyioc/OutputService.java

@@ -1,20 +1,8 @@
 package us.codecraft.tinyioc;
 
-import org.junit.Assert;
-
 /**
  * @author [email protected]
  */
-public class OutputService {
-
-    private HelloWorldService helloWorldService;
-
-    public void output(String text){
-        Assert.assertNotNull(helloWorldService);
-        System.out.println(text);
-    }
-
-    public void setHelloWorldService(HelloWorldService helloWorldService) {
-        this.helloWorldService = helloWorldService;
-    }
+public interface OutputService {
+    void output(String text);
 }

src/test/java/us/codecraft/tinyioc/OutputServiceImpl.java

@@ -0,0 +1,13 @@
+package us.codecraft.tinyioc;
+
+/**
+ * @author [email protected]
+ */
+public class OutputServiceImpl implements OutputService {
+
+    @Override
+    public void output(String text){
+        System.out.println(text);
+    }
+
+}

src/test/resources/tinyioc-postbeanprocessor.xml

@@ -8,7 +8,7 @@
 	http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
 	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
-    <bean id="outputService" class="us.codecraft.tinyioc.OutputService">
+    <bean id="outputService" class="us.codecraft.tinyioc.OutputServiceImpl">
         <property name="helloWorldService" ref="helloWorldService"></property>
     </bean>
 

src/test/resources/tinyioc.xml

@@ -8,24 +8,21 @@
 	http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
 	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
-    <bean id="outputService" class="us.codecraft.tinyioc.OutputService">
-        <property name="helloWorldService" ref="helloWorldService"></property>
+    <bean id="timeInterceptor" class="us.codecraft.tinyioc.aop.TimerInterceptor"></bean>
+
+    <bean id="autoProxyCreator" class="us.codecraft.tinyioc.aop.AspectJAwareAdvisorAutoProxyCreator"></bean>
+
+    <bean id="aspectjAspect" class="us.codecraft.tinyioc.aop.AspectJExpressionPointcutAdvisor">
+        <property name="advice" ref="timeInterceptor"></property>
+        <property name="expression" value="execution(* us.codecraft.tinyioc.*.*(..))"></property>
+    </bean>
+
+    <bean id="outputService" class="us.codecraft.tinyioc.OutputServiceImpl">
     </bean>
 
     <bean id="helloWorldService" class="us.codecraft.tinyioc.HelloWorldServiceImpl">
         <property name="text" value="Hello World!"></property>
         <property name="outputService" ref="outputService"></property>
     </bean>
 
-    <bean id="timeInterceptor" class="us.codecraft.tinyioc.aop.TimerInterceptor"></bean>
-
-    <aop:config>
-        <aop:aspect id="aroundExample" ref="timeInterceptor">
-            <aop:pointcut id="timerPointcut" expression="execution( * *.*() )"></aop:pointcut>
-            <aop:around
-                    pointcut-ref="timerPointcut"
-                    method="doBasicProfiling"/>
-        </aop:aspect>
-    </aop:config>
-
 </beans>