From 56f1f97761ec80bc8e6edda7f66d13ba4f9aa487 Mon Sep 17 00:00:00 2001
From: Harrison <Harrison@fanruan.com>
Date: Tue, 8 Mar 2022 15:04:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20KERNEL-10354=20bytebuddy=20/=20?=
 =?UTF-8?q?=E5=8A=A0=E8=A7=A3=E5=AF=86=E6=80=A7=E8=83=BD=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=20@Harrison=201.=20=E5=88=A0=E6=8E=89=E4=B8=80=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E4=BB=A3=E7=A0=81=EF=BC=8C=E7=B2=BE=E7=AE=80=E6=95=B4?=
 =?UTF-8?q?=E4=BD=93=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analyzer/DesignerAnalyzerActivator.java     | 17 ++++++++---------
 .../analyzer/DesignerAssemblyFactory.java       |  4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/record/analyzer/DesignerAnalyzerActivator.java b/designer-base/src/main/java/com/fr/design/record/analyzer/DesignerAnalyzerActivator.java
index 61ce3cdad..f2e57ef7d 100644
--- a/designer-base/src/main/java/com/fr/design/record/analyzer/DesignerAnalyzerActivator.java
+++ b/designer-base/src/main/java/com/fr/design/record/analyzer/DesignerAnalyzerActivator.java
@@ -21,7 +21,6 @@ import com.fr.record.analyzer.AnalyzerConfiguration;
 import com.fr.record.analyzer.AnalyzerKey;
 import com.fr.record.analyzer.DBMetrics;
 import com.fr.record.analyzer.FineAnalyzer;
-import com.fr.record.analyzer.advice.AnalyzerAdviceConfiguration;
 import com.fr.record.analyzer.advice.AnalyzerAdviceKey;
 import com.fr.record.analyzer.advice.FineAdviceAssistant;
 import com.fr.record.analyzer.configuration.AnalyzerAssemblyFactory;
@@ -60,7 +59,7 @@ public class DesignerAnalyzerActivator extends Activator implements Prepare {
                     ExecutorService es = newSingleThreadExecutor(new NamedThreadFactory("designer-analyzer", true));
                     try {
                         // 加入 retransform 部分的逻辑
-                        List<AnalyzerAdviceConfiguration> adviceConfigurations = findMutable(AnalyzerAdviceKey.KEY);
+                        List<FineAdviceAssistant> adviceConfigurations = findMutable(AnalyzerAdviceKey.KEY);
     
                         if (!CollectionUtils.isEmpty(adviceConfigurations)) {
                             AnalyzerConfiguration[] configurations = convertConfigurations(adviceConfigurations);
@@ -77,10 +76,10 @@ public class DesignerAnalyzerActivator extends Activator implements Prepare {
     }
     
     @NotNull
-    private AnalyzerConfiguration[] convertConfigurations(List<AnalyzerAdviceConfiguration> list) {
+    private AnalyzerConfiguration[] convertConfigurations(List<FineAdviceAssistant> list) {
     
         return list.stream()
-                .map((e) -> AnalyzerConfiguration.create(new FineAdviceAssistant(e.getMatcher(), e.getAdviceClass())))
+                .map(AnalyzerConfiguration::create)
                 .toArray(AnalyzerConfiguration[]::new);
     }
     
@@ -92,27 +91,27 @@ public class DesignerAnalyzerActivator extends Activator implements Prepare {
     @Override
     public void prepare() {
     
-        addMutable(AnalyzerAdviceKey.KEY, AnalyzerAdviceConfiguration.create(
+        addMutable(AnalyzerAdviceKey.KEY, FineAdviceAssistant.create(
                 ElementMatchers.isAnnotatedWith(Focus.class),
                 FocusAdvice.class
         ));
         
-        addMutable(AnalyzerAdviceKey.KEY, AnalyzerAdviceConfiguration.create(
+        addMutable(AnalyzerAdviceKey.KEY, FineAdviceAssistant.create(
                 ElementMatchers.isAnnotatedWith(Compute.class),
                 MonitorAdvice.class
         ));
         
-        addMutable(AnalyzerAdviceKey.KEY, AnalyzerAdviceConfiguration.create(
+        addMutable(AnalyzerAdviceKey.KEY, FineAdviceAssistant.create(
                 ElementMatchers.isAnnotatedWith(DBMetrics.class),
                 DBMonitorAdvice.class
         ));
         
-        addMutable(AnalyzerAdviceKey.KEY, AnalyzerAdviceConfiguration.create(
+        addMutable(AnalyzerAdviceKey.KEY, FineAdviceAssistant.create(
                 ElementMatchers.isAnnotatedWith(PerformancePoint.class),
                 PerformancePointAdvice.class
         ));
         
-        addMutable(AnalyzerAdviceKey.KEY, AnalyzerAdviceConfiguration.create(
+        addMutable(AnalyzerAdviceKey.KEY, FineAdviceAssistant.create(
                 ElementMatchers.isAnnotatedWith(FaultTolerance.class),
                 FaultToleranceAdvice.class
         ));
diff --git a/designer-base/src/main/java/com/fr/design/record/analyzer/DesignerAssemblyFactory.java b/designer-base/src/main/java/com/fr/design/record/analyzer/DesignerAssemblyFactory.java
index 0c8ffa40e..2e5fdc408 100644
--- a/designer-base/src/main/java/com/fr/design/record/analyzer/DesignerAssemblyFactory.java
+++ b/designer-base/src/main/java/com/fr/design/record/analyzer/DesignerAssemblyFactory.java
@@ -12,7 +12,7 @@ import java.util.Map;
  *
  * created by Harrison on 2022/03/07
  **/
-public class DesignerAssemblyFactory implements AnalyzerAssemblyFactory {
+public class DesignerAssemblyFactory implements AnalyzerAssemblyFactory<Void> {
     
     /**
      * 每次执行 1 个 class 的 retransform
@@ -38,7 +38,7 @@ public class DesignerAssemblyFactory implements AnalyzerAssemblyFactory {
     }
     
     @Override
-    public AnalyzerAssemblyFactory prepare(Object material) {
+    public AnalyzerAssemblyFactory<Void> prepare(Void material) {
         
         return this;
     }