New static methods for removeDuplicates, removeAllDuplicates and replace

Author: pellse

assembler/src/main/java/io/github/pellse/assembler/caching/factory/CacheContext.java

@@ -19,6 +19,7 @@
 import io.github.pellse.assembler.RuleMapperContext.OneToManyContext;
 import io.github.pellse.assembler.RuleMapperContext.OneToOneContext;
 import io.github.pellse.assembler.caching.merge.MergeFunction;
+import io.github.pellse.assembler.caching.merge.MergeFunctions;
 
 import java.util.*;
 import java.util.function.BiFunction;
@@ -27,7 +28,6 @@
 import java.util.stream.Collector;
 
 import static io.github.pellse.assembler.caching.factory.ConcurrentCacheFactory.concurrent;
-import static io.github.pellse.assembler.caching.merge.MergeFunctions.replace;
 import static io.github.pellse.util.collection.CollectionUtils.*;
 import static java.util.Objects.requireNonNullElse;
 
@@ -49,7 +49,7 @@ record OneToOneCacheContext<ID, R>(
             CacheTransformer<ID, R, R, OneToOneCacheContext<ID, R>> cacheTransformer) implements CacheContext<ID, R, R, OneToOneCacheContext<ID, R>> {
 
         public OneToOneCacheContext {
-                mergeFunction = requireNonNullElse(mergeFunction, replace());
+                mergeFunction = requireNonNullElse(mergeFunction, MergeFunctions::replace);
         }
 
         static <ID, R> OneToOneCacheContext<ID, R> oneToOneCacheContext(OneToOneContext<?, ?, ID, R> ctx) {

assembler/src/main/java/io/github/pellse/assembler/caching/merge/MergeFunctions.java

@@ -14,15 +14,23 @@
 public interface MergeFunctions {
 
     static <ID, EID, R> MergeFunctionFactory<ID, EID, R> removeDuplicates() {
-        return ctx -> removeDuplicates(ctx.idResolver());
+        return MergeFunctions::removeDuplicates;
+    }
+
+    static <ID, EID, R> MergeFunction<ID, List<R>> removeDuplicates(MergeFunctionContext<EID, R> ctx) {
+        return removeDuplicates(ctx.idResolver());
     }
 
     static <ID, EID, R> MergeFunction<ID, List<R>> removeDuplicates(Function<R, EID> idResolver) {
         return (id, existingList, newList) -> CollectionUtils.removeDuplicates(concat(existingList, newList), idResolver);
     }
 
     static <EID, R> Function<MergeFunctionContext<EID, R>, Function<List<R>, List<R>>> removeAllDuplicates() {
-        return ctx -> list -> CollectionUtils.removeDuplicates(list, ctx.idResolver());
+        return MergeFunctions::removeAllDuplicates;
+    }
+
+    static <EID, R> Function<List<R>, List<R>> removeAllDuplicates(MergeFunctionContext<EID, R> ctx) {
+        return list -> CollectionUtils.removeDuplicates(list, ctx.idResolver());
     }
 
     static <ID, R> MergeFunction<ID, List<R>> keepFirst(int nbElements) {
@@ -50,7 +58,11 @@ static <R> Function<List<R>, List<R>> keepLastN(int nbElements) {
     }
 
     static <ID, R> MergeFunction<ID, R> replace() {
-        return (k, r1, r2) -> r2 != null ? r2 : r1;
+        return MergeFunctions::replace;
+    }
+
+    static <ID, R> R replace(ID id, R r1, R r2) {
+        return r2 != null ? r2 : r1;
     }
 
     private static <R> Function<List<R>, List<R>> keep(int nbElements, Function<List<R>, List<R>> subListFunction) {

assembler/src/test/java/io/github/pellse/assembler/test/CacheTest.java

@@ -22,6 +22,8 @@
 import io.github.pellse.assembler.caching.factory.CacheContext.OneToOneCacheContext;
 import io.github.pellse.assembler.caching.factory.CacheFactory;
 import io.github.pellse.assembler.caching.factory.CacheTransformer;
+import io.github.pellse.assembler.caching.merge.MergeFunctionFactory;
+import io.github.pellse.assembler.caching.merge.MergeFunctions;
 import io.github.pellse.assembler.util.*;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -269,11 +271,16 @@ public void testReusableAssemblerBuilderWithMergeFunctions() {
                         .filter(billingInfo -> customerIds.contains(billingInfo.customerId()))
                         .doOnComplete(billingInvocationCount::incrementAndGet);
 
+        MergeFunctionFactory<Long, String, OrderItem> mff = pipe(MergeFunctions::removeDuplicates, keepLastN(20));
+        var mff2 = MergeFunctions.<Long, String, OrderItem>removeDuplicates().pipe(keepLastN(20));
+        var mff3 = MergeFunctionFactory.<Long, String, OrderItem>from(MergeFunctions::removeDuplicates).pipe(keepLastN(20));
+
         var assembler = assemblerOf(Transaction.class)
                 .withCorrelationIdResolver(Customer::customerId)
                 .withRules(
-                        rule(BillingInfo::customerId, oneToOne(cached(call(getBillingInfo), replace()), BillingInfo::new)),
-                        rule(OrderItem::customerId, oneToMany(OrderItem::id, cachedMany(this::getAllOrders, pipe(removeDuplicates(), keepLastN(20))))),
+                        rule(BillingInfo::customerId, oneToOne(cached(call(getBillingInfo), MergeFunctions::replace), BillingInfo::new)),
+                        rule(OrderItem::customerId, oneToMany(OrderItem::id, cachedMany(this::getAllOrders, mff))),
+//                        rule(OrderItem::customerId, oneToMany(OrderItem::id, cachedMany(this::getAllOrders, pipe(removeDuplicates(), keepLastN(20))))),
 //                        rule(OrderItem::customerId, oneToMany(OrderItem::id, cachedMany(this::getAllOrders, pipeWith(keepLast(20), removeAllDuplicates())))),
                         Transaction::new)
                 .build();