Refactoring packages related to VersionedMapDeltaImpl + VersionedMapStoreStateImpl, update builder.

- details of the maps goes to internal packages
- ModelStoreBuilderImpl uses VersionedMapStoreFactoryBuilder

1 files changed, 9 insertions, 8 deletions

diff --git a/subprojects/store/src/jmh/java/tools/refinery/store/map/benchmarks/ImmutablePutExecutionPlan.java b/subprojects/store/src/jmh/java/tools/refinery/store/map/benchmarks/ImmutablePutExecutionPlan.java
index 7e89cd06..4708e6d3 100644
--- a/subprojects/store/src/jmh/java/tools/refinery/store/map/benchmarks/ImmutablePutExecutionPlan.java
+++ b/subprojects/store/src/jmh/java/tools/refinery/store/map/benchmarks/ImmutablePutExecutionPlan.java
@@ -5,12 +5,13 @@
  */
 package tools.refinery.store.map.benchmarks;
 
+import java.util.Objects;
 import java.util.Random;
 
-import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.ContinuousHashProvider;
 import tools.refinery.store.map.VersionedMapStore;
-import tools.refinery.store.map.VersionedMapStoreImpl;
-import tools.refinery.store.map.internal.VersionedMapImpl;
+import tools.refinery.store.map.internal.state.VersionedMapStoreStateImpl;
+import tools.refinery.store.map.internal.state.VersionedMapStateImpl;
 import tools.refinery.store.map.tests.utils.MapTestEnvironment;
 
 import org.openjdk.jmh.annotations.Level;
@@ -35,7 +36,7 @@ public class ImmutablePutExecutionPlan {
 
         private String[] values;
 
-        private ContinousHashProvider<Integer> hashProvider = MapTestEnvironment.prepareHashProvider(false);
+        private ContinuousHashProvider<Integer> hashProvider = MapTestEnvironment.prepareHashProvider(false);
 
         @Setup(Level.Trial)
         public void setUpTrial() {
@@ -43,9 +44,9 @@ public class ImmutablePutExecutionPlan {
                 values = MapTestEnvironment.prepareValues(nValues, true);
         }
 
-        public VersionedMapImpl<Integer, String> createSut() {
-                VersionedMapStore<Integer, String> store = new VersionedMapStoreImpl<Integer, String>(hashProvider, values[0]);
-                return (VersionedMapImpl<Integer, String>) store.createMap();
+        public VersionedMapStateImpl<Integer, String> createSut() {
+                VersionedMapStore<Integer, String> store = new VersionedMapStoreStateImpl<>(hashProvider, values[0]);
+                return (VersionedMapStateImpl<Integer, String>) store.createMap();
         }
 
         public Integer nextKey() {
@@ -53,7 +54,7 @@ public class ImmutablePutExecutionPlan {
         }
 
         public boolean isDefault(String value) {
-                return value == values[0];
+                return Objects.equals(value,values[0]);
         }
 
         public String nextValue() {