fix gauss factory bug

fenix-Lee · Jul 28, 2022 · 8b46881 · 8b46881
1 parent ee548e3
commit 8b46881
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ To add a dependency by Maven, use the following:
 <dependency>
      <groupId>xyz.gaussframework</groupId>
      <artifactId>gauss-engine-spring-boot-starter</artifactId>
-     <version>2.2.5</version>
+     <version>2.2.6</version>
 </dependency>
 ```
 ## Learn about Gauss

diff --git a/gauss-engine/gauss-engine-core/pom.xml b/gauss-engine/gauss-engine-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.gaussframework</groupId>
         <artifactId>gauss-engine</artifactId>
-        <version>2.2.5</version>
+        <version>2.2.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/gauss-engine/gauss-engine-core/src/main/java/xyz/gaussframework/engine/factory/Creator.java b/gauss-engine/gauss-engine-core/src/main/java/xyz/gaussframework/engine/factory/Creator.java
@@ -1,6 +1,7 @@
 package xyz.gaussframework.engine.factory;
 
 import org.springframework.stereotype.Component;
+import xyz.gaussframework.engine.framework.OverrideClone;
 
 import java.lang.annotation.*;
 
@@ -15,6 +16,7 @@
 @Documented
 @Inherited
 @Component
+@OverrideClone
 public @interface Creator {
 
     /**

diff --git a/...-engine/gauss-engine-core/src/main/java/xyz/gaussframework/engine/factory/GaussChain.java b/...-engine/gauss-engine-core/src/main/java/xyz/gaussframework/engine/factory/GaussChain.java
@@ -36,7 +36,7 @@ public List<T> getModules() {
         return copyModules();
     }
 
-    private List<T> copyModules() {
+    protected List<T> copyModules() {
         return modules.stream()
                 .map(GaussBeanFactory::copyObject)
                 .collect(Collectors.toList());
@@ -47,6 +47,10 @@ protected void setModules(List<T> modules) {
         this.modules = modules;
     }
 
+    protected List<T> findModules() {
+        return modules;
+    }
+
     protected List<T> sortModule(Map<Integer, T> container) {
         return container.entrySet().stream()
                 .sorted(Comparator.comparingInt(Map.Entry::getKey))

diff --git a/...ngine/gauss-engine-core/src/main/java/xyz/gaussframework/engine/factory/GaussFactory.java b/...ngine/gauss-engine-core/src/main/java/xyz/gaussframework/engine/factory/GaussFactory.java
@@ -21,26 +21,28 @@ public abstract class GaussFactory<T, R> extends GaussChain<T>
 
     @SuppressWarnings("unused")
     public List<T> produce() {
-        return getModules();
+        return findModules();
     }
 
     @Override
     public List<R> produce(@NonNull Function<? super T, ? extends R> mapper) {
-        return getModules().stream()
+        return findModules().stream()
                 .map(mapper)
                 .collect(Collectors.toList());
     }
 
     @Override
     public R manufacture(@NonNull Function<List<T>, ? extends R> mapper) {
-        return mapper.apply(getModules());
+        return mapper.apply(findModules());
     }
 
     @Override
     @SuppressWarnings("unchecked")
     public GaussFactory<T, R> clone() {
         try {
-            return (GaussFactory<T, R>) super.clone();
+            GaussFactory<T, R> copy = (GaussFactory<T, R>) super.clone();
+            copy.setModules(getModules());
+            return copy;
         } catch (CloneNotSupportedException e) {
             throw new AssertionError();
         }

diff --git a/gauss-engine/gauss-engine-spring-boot-starter/pom.xml b/gauss-engine/gauss-engine-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.gaussframework</groupId>
         <artifactId>gauss-engine</artifactId>
-        <version>2.2.5</version>
+        <version>2.2.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>xyz.gaussframework</groupId>
             <artifactId>gauss-engine-core</artifactId>
-            <version>2.2.5</version>
+            <version>2.2.6</version>
         </dependency>
     </dependencies>
 

diff --git a/gauss-engine/pom.xml b/gauss-engine/pom.xml
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>gauss-engine</artifactId>
-    <version>2.2.5</version>
+    <version>2.2.6</version>
     <packaging>pom</packaging>
     <modules>
         <module>gauss-engine-spring-boot-starter</module>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>xyz.gaussframework</groupId>
     <artifactId>gauss-parent</artifactId>
-    <version>2.2.5</version>
+    <version>2.2.6</version>
     <name>gauss-parent</name>
     <description>java code engine</description>
     <url>https://github.com/fenix-Lee/gauss-framework</url>