Data structure cleanup with Sonar

4 files changed, 50 insertions, 94 deletions

diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMapStoreImpl.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMapStoreImpl.java
index c551ffe7..7b69ae54 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMapStoreImpl.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMapStoreImpl.java
@@ -12,67 +12,50 @@ import org.eclipse.viatra.solver.data.map.internal.MapDiffCursor;
 import org.eclipse.viatra.solver.data.map.internal.Node;
 import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
 
-public class VersionedMapStoreImpl<KEY,VALUE> implements VersionedMapStore<KEY, VALUE> {
+public class VersionedMapStoreImpl<KEY, VALUE> implements VersionedMapStore<KEY, VALUE> {
         // Configuration
-        final private boolean immutableWhenCommiting;
-        
+        private final boolean immutableWhenCommiting;
+
         // Static data
         protected final ContinousHashProvider<? super KEY> hashProvider;
         protected final VALUE defaultValue;
-        
+
         // Dynamic data
-        final protected Map<Long, ImmutableNode<KEY,VALUE>> states;
-        final protected Map<Node<KEY,VALUE>, ImmutableNode<KEY,VALUE>> nodeCache;
-        protected long nextID;
-        
-        public VersionedMapStoreImpl(
-                ContinousHashProvider<? super KEY> hashProvider,
-                VALUE defaultValue,
-                VersionedMapStoreConfiguration config)
-        {
+        protected final Map<Long, ImmutableNode<KEY, VALUE>> states = new HashMap<>();
+        protected final Map<Node<KEY, VALUE>, ImmutableNode<KEY, VALUE>> nodeCache;
+        protected long nextID = 0;
+
+        public VersionedMapStoreImpl(ContinousHashProvider<? super KEY> hashProvider, VALUE defaultValue,
+                        VersionedMapStoreConfiguration config) {
                 this.immutableWhenCommiting = config.immutableWhenCommiting;
-                
                 this.hashProvider = hashProvider;
                 this.defaultValue = defaultValue;
-                
-                states = new HashMap<>();
-                nextID = 0;
-                if(config.sharedNodeCacheInStore) {
+                if (config.sharedNodeCacheInStore) {
                         nodeCache = new HashMap<>();
                 } else {
                         nodeCache = null;
                 }
         }
-        private VersionedMapStoreImpl(
-                ContinousHashProvider<? super KEY> hashProvider,
-                VALUE defaultValue,
-                Map<Node<KEY,VALUE>, ImmutableNode<KEY,VALUE>> nodeCache,
-                VersionedMapStoreConfiguration config)
-        {
+
+        private VersionedMapStoreImpl(ContinousHashProvider<? super KEY> hashProvider, VALUE defaultValue,
+                        Map<Node<KEY, VALUE>, ImmutableNode<KEY, VALUE>> nodeCache, VersionedMapStoreConfiguration config) {
                 this.immutableWhenCommiting = config.immutableWhenCommiting;
-                
                 this.hashProvider = hashProvider;
                 this.defaultValue = defaultValue;
-                
-                states = new HashMap<>();
-                nextID = 0;
                 this.nodeCache = nodeCache;
         }
-        
+
         public VersionedMapStoreImpl(ContinousHashProvider<KEY> hashProvider, VALUE defaultValue) {
-                this(hashProvider,defaultValue,new VersionedMapStoreConfiguration());
+                this(hashProvider, defaultValue, new VersionedMapStoreConfiguration());
         }
-        
-        public static <MAP,KEY,VALUE> List<VersionedMapStore<KEY,VALUE>> createSharedVersionedMapStores(
-                int amount,
-                ContinousHashProvider<? super KEY> hashProvider,
-                VALUE defaultValue,
-                VersionedMapStoreConfiguration config)
-        {
-                List<VersionedMapStore<KEY,VALUE>> result = new ArrayList<>(amount);
-                if(config.sharedNodeCacheInStoreGroups) {
-                        Map<Node<KEY,VALUE>, ImmutableNode<KEY,VALUE>> nodeCache;
-                        if(config.sharedNodeCacheInStore) {
+
+        public static <KEY, VALUE> List<VersionedMapStore<KEY, VALUE>> createSharedVersionedMapStores(int amount,
+                        ContinousHashProvider<? super KEY> hashProvider, VALUE defaultValue,
+                        VersionedMapStoreConfiguration config) {
+                List<VersionedMapStore<KEY, VALUE>> result = new ArrayList<>(amount);
+                if (config.sharedNodeCacheInStoreGroups) {
+                        Map<Node<KEY, VALUE>, ImmutableNode<KEY, VALUE>> nodeCache;
+                        if (config.sharedNodeCacheInStore) {
                                 nodeCache = new HashMap<>();
                         } else {
                                 nodeCache = null;
@@ -87,69 +70,55 @@ public class VersionedMapStoreImpl<KEY,VALUE> implements VersionedMapStore<KEY,
                 }
                 return result;
         }
-        public static <MAP,KEY,VALUE> List<VersionedMapStore<KEY,VALUE>> createSharedVersionedMapStores(
-                int amount,
-                ContinousHashProvider<? super KEY> hashProvider,
-                VALUE defaultValue)
-        {
-                return createSharedVersionedMapStores(amount,hashProvider,defaultValue,new VersionedMapStoreConfiguration());
+
+        public static <KEY, VALUE> List<VersionedMapStore<KEY, VALUE>> createSharedVersionedMapStores(int amount,
+                        ContinousHashProvider<? super KEY> hashProvider, VALUE defaultValue) {
+                return createSharedVersionedMapStores(amount, hashProvider, defaultValue, new VersionedMapStoreConfiguration());
         }
-        
+
         synchronized Set<Long> getStates() {
                 return states.keySet();
         }
-        
+
         @Override
-        public VersionedMap<KEY,VALUE> createMap() {
-                return new VersionedMapImpl<KEY,VALUE>(this,hashProvider,defaultValue);
+        public VersionedMap<KEY, VALUE> createMap() {
+                return new VersionedMapImpl<KEY, VALUE>(this, hashProvider, defaultValue);
         }
+
         @Override
-        public VersionedMap<KEY,VALUE> createMap(long state) {
+        public VersionedMap<KEY, VALUE> createMap(long state) {
                 ImmutableNode<KEY, VALUE> data = revert(state);
-                return new VersionedMapImpl<KEY,VALUE>(this,hashProvider,defaultValue,data); 
+                return new VersionedMapImpl<KEY, VALUE>(this, hashProvider, defaultValue, data);
         }
-        
-        synchronized public ImmutableNode<KEY,VALUE> revert(long state) {
-                if(states.containsKey(state)) {
+
+        public synchronized ImmutableNode<KEY, VALUE> revert(long state) {
+                if (states.containsKey(state)) {
                         return states.get(state);
                 } else {
                         ArrayList<Long> existingKeys = new ArrayList<Long>(states.keySet());
                         Collections.sort(existingKeys);
-                        throw new IllegalArgumentException(
-                                "Store does not contain state "+state+"! Avaliable states: "+existingKeys.toArray().toString());
+                        throw new IllegalArgumentException("Store does not contain state " + state + "! Avaliable states: "
+                                        + existingKeys.toArray().toString());
                 }
         }
-        synchronized public long commit(Node<KEY,VALUE> data, VersionedMapImpl<KEY, VALUE> mapToUpdateRoot) {
-                ImmutableNode<KEY,VALUE> immutable;
-                if(data != null) {
-                        if(this.nodeCache != null) {
-                                immutable = data.toImmutable(this.nodeCache);
-                        } else {
-                                immutable = data.toImmutable();
-                        }
+
+        public synchronized long commit(Node<KEY, VALUE> data, VersionedMapImpl<KEY, VALUE> mapToUpdateRoot) {
+                ImmutableNode<KEY, VALUE> immutable;
+                if (data != null) {
+                        immutable = data.toImmutable(this.nodeCache);
                 } else {
                         immutable = null;
                 }
-                
-                
-                if(nextID == Long.MAX_VALUE) throw new IllegalStateException(
-                        "Map store run out of Id-s");
+
+                if (nextID == Long.MAX_VALUE)
+                        throw new IllegalStateException("Map store run out of Id-s");
                 long id = nextID++;
                 this.states.put(id, immutable);
-                if(this.immutableWhenCommiting) {
+                if (this.immutableWhenCommiting) {
                         mapToUpdateRoot.setRoot(immutable);
                 }
                 return id;
         }
-        
-//      public Map<Node<KEY,VALUE>, ImmutableNode<KEY,VALUE>> getStore() {
-//              return this.nodeCache;
-//      }
-//      public long addState(ImmutableNode<KEY,VALUE> data) {
-//              
-//              states.put(id,data);
-//              return id;
-//      }
 
         @Override
         public DiffCursor<KEY, VALUE> getDiffCursor(long fromState, long toState) {
@@ -157,6 +126,6 @@ public class VersionedMapStoreImpl<KEY,VALUE> implements VersionedMapStore<KEY,
                 VersionedMap<KEY, VALUE> map2 = createMap(toState);
                 Cursor<KEY, VALUE> cursor1 = map1.getCursor();
                 Cursor<KEY, VALUE> cursor2 = map2.getCursor();
-                return new MapDiffCursor<KEY, VALUE>(this.hashProvider,this.defaultValue,cursor1,cursor2);
+                return new MapDiffCursor<KEY, VALUE>(this.hashProvider, this.defaultValue, cursor1, cursor2);
         }
 }
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/map/internal/ImmutableNode.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/map/internal/ImmutableNode.java
index 087c12a1..832742d0 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/map/internal/ImmutableNode.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/map/internal/ImmutableNode.java
@@ -202,11 +202,6 @@ public class ImmutableNode<KEY, VALUE> extends Node<KEY, VALUE> {
         protected MutableNode<KEY,VALUE> toMutable() {
                 return new MutableNode<KEY,VALUE>(this);
         }
-
-        @Override
-        public ImmutableNode<KEY,VALUE> toImmutable() {
-                return this;
-        }
         
         @Override
         public ImmutableNode<KEY, VALUE> toImmutable(
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/map/internal/MutableNode.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/map/internal/MutableNode.java
index 963ce111..d32e5fc9 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/map/internal/MutableNode.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/map/internal/MutableNode.java
@@ -127,8 +127,6 @@ public class MutableNode<KEY,VALUE> extends Node<KEY,VALUE> {
                         }
                 }
         }
-        
-
 
         private Node<KEY, VALUE> addEntry(KEY key, VALUE value, int selectedHashFragment) {
                 content[2*selectedHashFragment] = key;
@@ -255,11 +253,6 @@ public class MutableNode<KEY,VALUE> extends Node<KEY,VALUE> {
         }
         
         @Override
-        public ImmutableNode<KEY,VALUE> toImmutable() {
-                return ImmutableNode.constructImmutable(this,null);
-        }
-        
-        @Override
         public ImmutableNode<KEY, VALUE> toImmutable(Map<Node<KEY, VALUE>, ImmutableNode<KEY, VALUE>> cache) {
                 return ImmutableNode.constructImmutable(this,cache);
         }
diff --git a/model-data/src/main/java/org/eclipse/viatra/solver/data/map/internal/Node.java b/model-data/src/main/java/org/eclipse/viatra/solver/data/map/internal/Node.java
index 3695825d..f19ca06f 100644
--- a/model-data/src/main/java/org/eclipse/viatra/solver/data/map/internal/Node.java
+++ b/model-data/src/main/java/org/eclipse/viatra/solver/data/map/internal/Node.java
@@ -62,7 +62,6 @@ public abstract class Node<KEY,VALUE>{
         abstract public long getSize();
         
         abstract MutableNode<KEY, VALUE> toMutable();
-        public abstract ImmutableNode<KEY, VALUE> toImmutable();
         public abstract ImmutableNode<KEY, VALUE> toImmutable(
                         Map<Node<KEY, VALUE>,ImmutableNode<KEY, VALUE>> cache);