Merge remote-tracking branch 'origin/dev' into 3.x

LostRed · Apr 16, 2023 · c06351d · c06351d
2 parents 1f3d401 + 4073390
commit c06351d
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 16 deletions.
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>info.lostred.ruler</groupId>
     <artifactId>integration-tests</artifactId>
-    <version>3.2.7</version>
+    <version>3.2.8</version>
     <name>integration tests</name>
     <description>tests for ruler project.</description>
 
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>info.lostred.ruler</groupId>
             <artifactId>ruler-spring-boot-starter</artifactId>
-            <version>3.2.7</version>
+            <version>3.2.8</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>

diff --git a/integration-tests/src/main/java/info/lostred/ruler/test/Application.java b/integration-tests/src/main/java/info/lostred/ruler/test/Application.java
@@ -1,20 +1,17 @@
 package info.lostred.ruler.test;
 
 import info.lostred.ruler.annotation.RuleScan;
-import info.lostred.ruler.factory.DomainFactory;
+import info.lostred.ruler.factory.RuleFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 
-import java.util.Set;
-
 @SpringBootApplication
 @RuleScan("info.lostred.ruler.test.elem")
 public class Application {
     public static void main(String[] args) {
         ConfigurableApplicationContext run = SpringApplication.run(Application.class, args);
-        DomainFactory bean = run.getBean(DomainFactory.class);
-        Set<Class<?>> allDomain = bean.getAllDomain();
-        allDomain.forEach(System.out::println);
+        RuleFactory bean = run.getBean(RuleFactory.class);
+        System.out.println(bean);
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>info.lostred.ruler</groupId>
     <artifactId>ruler-project</artifactId>
     <packaging>pom</packaging>
-    <version>3.2.7</version>
+    <version>3.2.8</version>
     <name>ruler project</name>
     <description>ruler project</description>
 

diff --git a/ruler-core/pom.xml b/ruler-core/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>info.lostred.ruler</groupId>
     <artifactId>ruler-core</artifactId>
-    <version>3.2.7</version>
+    <version>3.2.8</version>
     <name>ruler core</name>
     <description>ruler core.</description>
 

diff --git a/ruler-spring-boot-starter/pom.xml b/ruler-spring-boot-starter/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>info.lostred.ruler</groupId>
     <artifactId>ruler-spring-boot-starter</artifactId>
-    <version>3.2.7</version>
+    <version>3.2.8</version>
     <name>ruler spring boot starter</name>
     <description>ruler's spring boot starter.</description>
 
@@ -52,7 +52,7 @@
         <dependency>
             <groupId>info.lostred.ruler</groupId>
             <artifactId>ruler-core</artifactId>
-            <version>3.2.7</version>
+            <version>3.2.8</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/ruler-spring-boot-starter/src/main/java/info/lostred/ruler/factory/RuleFactoryBean.java b/ruler-spring-boot-starter/src/main/java/info/lostred/ruler/factory/RuleFactoryBean.java
@@ -1,6 +1,9 @@
 package info.lostred.ruler.factory;
 
 import info.lostred.ruler.rule.AbstractRule;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.FactoryBean;
 
 /**
@@ -9,13 +12,12 @@
  * @author lostred
  * @since 3.2.0
  */
-public class RuleFactoryBean implements FactoryBean<AbstractRule> {
+public class RuleFactoryBean implements FactoryBean<AbstractRule>, BeanFactoryAware {
     private final Class<? extends AbstractRule> ruleClass;
-    private final RuleFactory ruleFactory;
+    private RuleFactory ruleFactory;
 
-    public RuleFactoryBean(Class<? extends AbstractRule> ruleClass, RuleFactory ruleFactory) {
+    public RuleFactoryBean(Class<? extends AbstractRule> ruleClass) {
         this.ruleClass = ruleClass;
-        this.ruleFactory = ruleFactory;
     }
 
     @Override
@@ -27,4 +29,9 @@ public AbstractRule getObject() {
     public Class<?> getObjectType() {
         return ruleClass;
     }
+
+    @Override
+    public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+        this.ruleFactory = beanFactory.getBean(RuleFactory.class);
+    }
 }