domain 2.1.0 unpublished

DomainFactory Supplier 修改返回值类型
cgb-springcloud · Aug 21, 2023 · 1caa40e · 1caa40e
1 parent 6e7e04c
commit 1caa40e
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 23 deletions.
diff --git a/...main/concept-domain-core/src/main/java/com/github/linyuzai/domain/core/DomainFactory.java b/...main/concept-domain-core/src/main/java/com/github/linyuzai/domain/core/DomainFactory.java
@@ -61,7 +61,7 @@ public interface DomainFactory {
     /**
      * 创建延迟调用的领域集合
      */
-    <T extends DomainObject, C extends DomainCollection<T>> C createCollection(Class<C> cls, Supplier<Collection<T>> supplier);
+    <T extends DomainObject, C extends DomainCollection<T>> C createCollection(Class<C> cls, Supplier<C> supplier);
 
     /**
      * 创建在指定集合中指定 ids 的领域集合

diff --git a/...t-domain-core/src/main/java/com/github/linyuzai/domain/core/proxy/ProxyDomainFactory.java b/...t-domain-core/src/main/java/com/github/linyuzai/domain/core/proxy/ProxyDomainFactory.java
@@ -119,9 +119,10 @@ public <T extends DomainObject, C extends DomainCollection<T>> Map<String, T> cr
         C collection = createCollection(cCls, () -> {
             Set<String> ids = new HashSet<>(function.apply(ownerIds).values());
             C c = createCollection(cCls, ids);
-            return ids.stream()
+            List<T> list = ids.stream()
                     .map(it -> createObject(dCls, c, it))
                     .collect(Collectors.toList());
+            return wrapCollection(cCls, list);
         });
 
         Map<String, T> map = new LinkedHashMap<>();
@@ -151,7 +152,7 @@ public <C extends DomainCollection<?>> C createCollection(Class<C> cls, Conditio
     }
 
     @Override
-    public <T extends DomainObject, C extends DomainCollection<T>> C createCollection(Class<C> cls, Supplier<Collection<T>> supplier) {
+    public <T extends DomainObject, C extends DomainCollection<T>> C createCollection(Class<C> cls, Supplier<C> supplier) {
         return obtain(ProxySchrodingerDeferredDomainCollection.class,
                 ProxySchrodingerDeferredDomainCollection::new, cls,
                 create -> {
@@ -216,19 +217,21 @@ public <T extends DomainObject, C extends DomainCollection<T>> Map<String, C> cr
                     .flatMap(Collection::stream)
                     .collect(Collectors.toSet());
             C c = createCollection(cCls, ids);
-            return ids.stream()
+            List<T> list = ids.stream()
                     .map(it -> createObject(dCls, c, it))
                     .collect(Collectors.toList());
+            return wrapCollection(cCls, list);
         });
 
         Map<String, C> map = new LinkedHashMap<>();
         for (String ownerId : ownerIds) {
             C c = createCollection(cCls, () -> {
                 Map<String, ? extends Collection<String>> apply = function.apply(ownerIds);
                 Collection<String> ids = apply.get(ownerId);
-                return ids.stream()
+                List<T> list = ids.stream()
                         .map(collection::get)
                         .collect(Collectors.toList());
+                return wrapCollection(cCls, list);
             });
             map.put(ownerId, c);
         }

diff --git a/...java/com/github/linyuzai/domain/core/schrodinger/AbstractSchrodingerDomainCollection.java b/...java/com/github/linyuzai/domain/core/schrodinger/AbstractSchrodingerDomainCollection.java
@@ -8,7 +8,6 @@
 import lombok.Setter;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -37,7 +36,7 @@ public Map<String, T> getTarget() {
         return this.target;
     }
 
-    protected abstract Collection<T> doGetTarget();
+    protected abstract DomainCollection<T> doGetTarget();
 
     /**
      * 根据 id 获得领域模型

diff --git a/...va/com/github/linyuzai/domain/core/schrodinger/SchrodingerConditionsDomainCollection.java b/...va/com/github/linyuzai/domain/core/schrodinger/SchrodingerConditionsDomainCollection.java
@@ -5,8 +5,6 @@
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.*;
-
 /**
  * 薛定谔的集合模型
  */
@@ -18,8 +16,8 @@ public class SchrodingerConditionsDomainCollection<T extends DomainObject>
     protected Conditions conditions;
 
     @Override
-    protected Collection<T> doGetTarget() {
-        return getRepository().select(conditions).list();
+    protected DomainCollection<T> doGetTarget() {
+        return getRepository().select(conditions);
     }
 
     @Override

diff --git a/...java/com/github/linyuzai/domain/core/schrodinger/SchrodingerDeferredDomainCollection.java b/...java/com/github/linyuzai/domain/core/schrodinger/SchrodingerDeferredDomainCollection.java
@@ -5,8 +5,6 @@
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.Collection;
-import java.util.Collections;
 import java.util.function.Supplier;
 
 /**
@@ -17,15 +15,11 @@
 public class SchrodingerDeferredDomainCollection<T extends DomainObject>
         extends AbstractSchrodingerDomainCollection<T> implements DomainCollection<T> {
 
-    protected Supplier<Collection<T>> supplier;
+    protected Supplier<DomainCollection<T>> supplier;
 
     @Override
-    protected Collection<T> doGetTarget() {
-        Collection<T> collection = supplier.get();
-        if (collection == null) {
-            return Collections.emptyList();
-        }
-        return collection;
+    protected DomainCollection<T> doGetTarget() {
+       return supplier.get();
     }
 
     @Override

diff --git a/...va/com/github/linyuzai/domain/core/schrodinger/SchrodingerIdentifiedDomainCollection.java b/...va/com/github/linyuzai/domain/core/schrodinger/SchrodingerIdentifiedDomainCollection.java
@@ -17,8 +17,8 @@ public class SchrodingerIdentifiedDomainCollection<T extends DomainObject>
     protected Collection<String> ids;
 
     @Override
-    protected Collection<T> doGetTarget() {
-        return getRepository().select(ids).list();
+    protected DomainCollection<T> doGetTarget() {
+        return getRepository().select(ids);
     }
 
     @Override

diff --git a/concept-domain/version.gradle b/concept-domain/version.gradle
@@ -1 +1 @@
-ext.'ConceptDomainVersion' = '2.0.2'
+ext.'ConceptDomainVersion' = '2.1.0' //unpublished
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ext.'ConceptDomainVersion' = '2.0.2'
		ext.'ConceptDomainVersion' = '2.1.0' //unpublished