improve defaults subtraction

Author: azahnen

xtraplatform-entities/src/main/java/de/ii/xtraplatform/entities/app/EntityDataDefaultsStoreImpl.java

@@ -271,10 +271,7 @@ private List<Identifier> getCacheKeys(
 
   @Override
   public Map<String, Object> subtractDefaults(
-      Identifier identifier,
-      Optional<String> subType,
-      Map<String, Object> data,
-      List<String> ignoreKeys) {
+      Identifier identifier, Optional<String> subType, Map<String, Object> data) {
 
     Identifier defaultsIdentifier = EntityDataStore.defaults(identifier, subType);
 
@@ -287,9 +284,10 @@ public Map<String, Object> subtractDefaults(
       Map<String, Object> defaults =
           valueEncodingMap.deserialize(
               defaultsIdentifier, payload, valueEncodingBuilder.getDefaultFormat(), false);
+      EntityFactory factory = getFactory(defaultsIdentifier);
 
       return MapSubtractor.subtract(
-          data, defaults, ignoreKeys, getFactory(defaultsIdentifier).getListEntryKeys());
+          data, defaults, factory.getIgnoreKeys(), factory.getListEntryKeys());
 
     } catch (Throwable e) {
       boolean br = true;

xtraplatform-entities/src/main/java/de/ii/xtraplatform/entities/app/EntityDataStoreImpl.java

@@ -8,7 +8,6 @@
 package de.ii.xtraplatform.entities.app;
 
 import com.github.azahnen.dagger.annotations.AutoBind;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
 import com.google.common.collect.ObjectArrays;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -592,8 +591,7 @@ public CompletableFuture<EntityData> put(String id, EntityData data, String... p
       Map<String, Object> map = asMap(identifier, data);
 
       Map<String, Object> withoutDefaults =
-          defaultsStore.subtractDefaults(
-              identifier, data.getEntitySubType(), map, ImmutableList.of());
+          defaultsStore.subtractDefaults(identifier, data.getEntitySubType(), map);
 
       return getEventSourcing()
           .pushPartialMutationEvent(identifier, withoutDefaults)
@@ -645,8 +643,7 @@ public CompletableFuture<EntityData> patch(
 
       // TODO: I guess the correct way to define ignoreKeys would be in EntityFactory
       Map<String, Object> withoutDefaults =
-          defaultsStore.subtractDefaults(
-              identifier, merged.getEntitySubType(), map, ImmutableList.of("enabled"));
+          defaultsStore.subtractDefaults(identifier, merged.getEntitySubType(), map);
 
       Map<String, Object> withoutResetted =
           MapAligner.align(

xtraplatform-entities/src/main/java/de/ii/xtraplatform/entities/app/MapSubtractor.java

@@ -56,10 +56,12 @@ public static Map<String, Object> subtract(
     for (String key : data.keySet()) {
       if (ignoreKeys.contains(key)) {
         result.put(key, data.get(key));
+        continue;
       }
 
       if (newEntries.containsKey(key)) {
         result.put(key, newEntries.get(key));
+        continue;
       }
 
       if (differingEntries.containsKey(key)) {

xtraplatform-entities/src/main/java/de/ii/xtraplatform/entities/domain/EntityDataDefaultsStore.java

@@ -9,7 +9,6 @@
 
 import de.ii.xtraplatform.values.domain.Identifier;
 import java.io.IOException;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
@@ -18,10 +17,7 @@ public interface EntityDataDefaultsStore extends MergeableKeyValueStore<Map<Stri
   String EVENT_TYPE = "defaults";
 
   Map<String, Object> subtractDefaults(
-      Identifier identifier,
-      Optional<String> subType,
-      Map<String, Object> data,
-      List<String> ignoreKeys);
+      Identifier identifier, Optional<String> subType, Map<String, Object> data);
 
   Map<String, Object> asMap(Identifier identifier, EntityData entityData) throws IOException;
 

xtraplatform-entities/src/main/java/de/ii/xtraplatform/entities/domain/EntityFactory.java

@@ -8,6 +8,7 @@
 package de.ii.xtraplatform.entities.domain;
 
 import com.github.azahnen.dagger.annotations.AutoMultiBind;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
@@ -77,6 +78,10 @@ default Map<String, String> getListEntryKeys() {
     return Map.of();
   }
 
+  default List<String> getIgnoreKeys() {
+    return List.of("enabled");
+  }
+
   void addEntityListener(Consumer<PersistentEntity> listener, boolean existing);
 
   void addEntityGoneListener(Consumer<PersistentEntity> listener);

xtraplatform-entities/src/main/java/de/ii/xtraplatform/entities/domain/maptobuilder/BuildableMap.java

@@ -24,21 +24,15 @@ public abstract static class Builder {}
 
   @Value.Derived
   Map<String, T> getDelegate() {
-    return /*Stream.concat(
-           getInstances().entrySet()
-                         .stream(),
-           */ getBuilders().entrySet().stream()
+    return getBuilders().entrySet().stream()
         .map(
             entry ->
                 new AbstractMap.SimpleImmutableEntry<>(entry.getKey(), entry.getValue().build()))
-        // )
         .collect(ImmutableMap.toImmutableMap(Map.Entry::getKey, Map.Entry::getValue));
   }
 
   abstract Map<String, U> getBuilders();
 
-  // abstract Map<String, T> getInstances();
-
   @Override
   protected Map<String, T> delegate() {
     return getDelegate();