✨ add methodRefund advice, 增强advisor的before和returning逻辑

Author: ccoderJava

src/main/java/com/dianpoint/summer/aop/AopProxyFactory.java

@@ -9,11 +9,10 @@ public interface AopProxyFactory {
 
     /**
      * 创建AopProxy
-     * 
-     * @param target
-     *            被代理类
-     * @return aopProxy代理接口,提供不同代理方式
+     *
+     * @param target 被代理类
+     * @return aopProxy代理接口, 提供不同代理方式
      */
-    AopProxy createAopProxy(Object target);
+    AopProxy createAopProxy(Object target, Advisor advisor);
 
 }

src/main/java/com/dianpoint/summer/aop/DefaultAopProxyFactory.java

@@ -2,16 +2,16 @@
 
 /**
  * 默认的AOP Proxy代理类创建工厂,此处采用JDK动态代理来生成代理类
- * 
+ *
  * @author: github/ccoderJava
  * @email: congccoder@gmail.com
  * @date: 2023/3/26 20:58
  */
 public class DefaultAopProxyFactory implements AopProxyFactory {
     @Override
-    public AopProxy createAopProxy(Object target) {
+    public AopProxy createAopProxy(Object target, Advisor advisor) {
 
         // 采用JDK dynamicProxy来实现代理类的创建
-        return new JdkDynamicAopProxy(target);
+        return new JdkDynamicAopProxy(target, advisor);
     }
 }

src/main/java/com/dianpoint/summer/aop/JdkDynamicAopProxy.java

@@ -6,17 +6,19 @@
 
 /**
  * JDK Dynamic Proxy 实现AOP
- * 
+ *
  * @author: github/ccoderJava
  * @email: congccoder@gmail.com
  * @date: 2023/3/26 21:04
  */
 public class JdkDynamicAopProxy implements AopProxy, InvocationHandler {
 
     Object target;
+    Advisor advisor;
 
-    public JdkDynamicAopProxy(Object target) {
+    public JdkDynamicAopProxy(Object target, Advisor advisor) {
         this.target = target;
+        this.advisor = advisor;
     }
 
     @Override
@@ -26,9 +28,12 @@ public Object getProxy() {
 
     @Override
     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-        System.out.println("代理类执行之前");
-        Object invokeResult = method.invoke(target, args);
-        System.out.println("代理类执行之后");
-        return invokeResult;
+        if (method.getName().equals("doAction")) {
+            Class<?> targetClass = target != null ? target.getClass() : null;
+            MethodInterceptor interceptor = this.advisor.getMethodInterceptor();
+            ReflectiveMethodInvocation invocation = new ReflectiveMethodInvocation(proxy, target, method, args, targetClass);
+            return interceptor.invoke(invocation);
+        }
+        return null;
     }
 }

src/main/java/com/dianpoint/summer/aop/MethodReturningAdvice.java

@@ -0,0 +1,8 @@
+package com.dianpoint.summer.aop;
+
+import java.lang.reflect.Method;
+
+public interface MethodReturningAdvice extends AfterAdvice{
+
+    void afterReturning(Object returnValue, Method method, Object[] args, Object target) throws Throwable;
+}

src/main/java/com/dianpoint/summer/aop/ProxyFactoryBean.java

@@ -1,6 +1,10 @@
 package com.dianpoint.summer.aop;
 
+import com.dianpoint.summer.beans.BeansException;
+import com.dianpoint.summer.beans.factory.BeanFactory;
 import com.dianpoint.summer.beans.factory.FactoryBean;
+import com.dianpoint.summer.util.ClassUtils;
+import com.fasterxml.jackson.databind.util.ClassUtil;
 
 /**
  * @author: github/ccoderJava
@@ -9,11 +13,15 @@
  */
 public class ProxyFactoryBean implements FactoryBean<Object> {
 
+    private BeanFactory beanFactory;
     private AopProxyFactory aopProxyFactory;
-
+    private String interceptorName;
+    private String targetName;
     private Object target;
-
+    private ClassLoader proxyClassLoader = ClassUtils.getDefaultClassLoader();
     private Object singletonInstance;
+    private Advisor advisor;
+
 
     public ProxyFactoryBean() {
         // 默认才用Jdk Dynamic 代理来实现AOP 可在此进行扩展
@@ -25,20 +33,31 @@ public Object getObject() throws Exception {
         return null;
     }
 
+    private synchronized void initializeAdvisor() {
+        Object advice = null;
+        MethodInvocation methodInvocation = null;
+        try {
+            advice = this.beanFactory.getBean(this.interceptorName);
+        } catch (BeansException e) {
+            e.printStackTrace();
+        }
+        advisor = new DefaultAdvisor();
+        advisor.setMethodInterceptor((MethodInterceptor) advice);
+    }
+
     @Override
     public Class<?> getObjectType() {
         return null;
     }
 
     public AopProxy createAopProxy() {
-        return getAopProxyFactory().createAopProxy(target);
+        return getAopProxyFactory().createAopProxy(target, this.advisor);
     }
 
     /**
      * 通过AopProxy接口获取代理类,实现方式为AopProxy接口实现的DefaultAopProxyFactory或者其余可扩展的代理工厂类
-     * 
-     * @param aopProxy
-     *            aopProxy
+     *
+     * @param aopProxy aopProxy
      * @return 代理结果
      */
     public Object getProxy(AopProxy aopProxy) {
@@ -47,7 +66,7 @@ public Object getProxy(AopProxy aopProxy) {
 
     /**
      * 获取代理对象的单例bean
-     * 
+     *
      * @return 单例Bean
      */
     public synchronized Object getSingletonInstance() {

src/main/java/com/dianpoint/summer/aop/ReflectiveMethodInvocation.java

@@ -0,0 +1,57 @@
+package com.dianpoint.summer.aop;
+
+import java.lang.reflect.Method;
+
+public class ReflectiveMethodInvocation implements MethodInvocation {
+
+    private final Object proxy;
+    private final Object target;
+    private final Object[] arguments;
+    private final Method method;
+    private Class<?> targetClass;
+
+    public ReflectiveMethodInvocation(Object proxy, Object target, Method method, Object[] arguments, Class<?> targetClass) {
+        this.proxy = proxy;
+        this.target = target;
+        this.arguments = arguments;
+        this.targetClass = targetClass;
+        this.method = method;
+    }
+
+
+    @Override
+    public Method getMethod() {
+        return this.method;
+    }
+
+    @Override
+    public Object[] getArguments() {
+        return this.arguments;
+    }
+
+    @Override
+    public Object getThis() {
+        return this.target;
+    }
+
+    public Object getProxy() {
+        return proxy;
+    }
+
+    public Object getTarget() {
+        return target;
+    }
+
+    public Class<?> getTargetClass() {
+        return targetClass;
+    }
+
+    public void setTargetClass(Class<?> targetClass) {
+        this.targetClass = targetClass;
+    }
+
+    @Override
+    public Object proceed() throws Throwable {
+        return this.method.invoke(this.target, this.arguments);
+    }
+}

src/main/java/com/dianpoint/summer/util/ClassUtils.java

@@ -0,0 +1,25 @@
+package com.dianpoint.summer.util;
+
+public abstract class ClassUtils {
+
+
+    public static ClassLoader getDefaultClassLoader() {
+        ClassLoader cl = null;
+        try {
+            cl = Thread.currentThread().getContextClassLoader();
+        } catch (Throwable ignored) {
+
+        }
+        if (cl == null) {
+            cl = ClassUtils.class.getClassLoader();
+            if (cl == null) {
+                try {
+                    cl = ClassLoader.getSystemClassLoader();
+                } catch (Throwable ignored) {
+
+                }
+            }
+        }
+        return cl;
+    }
+}

src/test/java/com/dianpoint/summer/test/SimpleIOCTest.java

@@ -2,6 +2,8 @@
 
 import com.dianpoint.summer.beans.BeansException;
 import com.dianpoint.summer.context.ClassPathXmlApplicationContext;
+import com.dianpoint.summer.test.service.ActionOne;
+import com.dianpoint.summer.test.service.IAction;
 import com.dianpoint.summer.test.service.OtherTwoService;
 import com.dianpoint.summer.test.service.SimpleService;
 
@@ -14,14 +16,11 @@ public class SimpleIOCTest {
 
     public static void main(String[] args) throws BeansException {
         ClassPathXmlApplicationContext applicationContext = new ClassPathXmlApplicationContext("beans.xml");
-        SimpleService simpleService = (SimpleService)applicationContext.getBean("simpleService");
-        simpleService.sayHello();
 
-        System.out.println("==================");
 
-        OtherTwoService otherTwoService = (OtherTwoService)applicationContext.getBean("otherTwoService");
-        otherTwoService.sayHello();
-        otherTwoService.sayBye();
+        IAction action = (IAction) applicationContext.getBean("actionOne");
+        action.doAction();
+        action.doSomething();
 
     }
 }

src/test/java/com/dianpoint/summer/test/service/ActionOne.java

@@ -0,0 +1,13 @@
+package com.dianpoint.summer.test.service;
+
+public class ActionOne implements IAction {
+    @Override
+    public void doAction() {
+        System.out.println("执行真是的doAction");
+    }
+
+    @Override
+    public void doSomething() {
+        System.out.println("执行真实的doSomething");
+    }
+}

src/test/java/com/dianpoint/summer/test/service/IAction.java

@@ -0,0 +1,7 @@
+package com.dianpoint.summer.test.service;
+
+public interface IAction {
+    void doAction();
+
+    void doSomething();
+}