From 213171f95845ebc5efcfa73d1cab4b723ff2abf2 Mon Sep 17 00:00:00 2001 From: Ben Culkin Date: Tue, 17 Nov 2020 17:44:05 -0500 Subject: Implement IFreezable for IMap --- src/main/java/bjc/funcdata/ExtendedMap.java | 125 ++++++++++++--------- src/main/java/bjc/funcdata/FunctionalMap.java | 108 ++++++++++-------- src/main/java/bjc/funcdata/IMap.java | 24 +++- .../java/bjc/funcdata/TransformedValueMap.java | 63 ++++++++--- 4 files changed, 202 insertions(+), 118 deletions(-) (limited to 'src/main/java/bjc/funcdata') diff --git a/src/main/java/bjc/funcdata/ExtendedMap.java b/src/main/java/bjc/funcdata/ExtendedMap.java index bd500f4..19e3b4e 100644 --- a/src/main/java/bjc/funcdata/ExtendedMap.java +++ b/src/main/java/bjc/funcdata/ExtendedMap.java @@ -1,8 +1,7 @@ package bjc.funcdata; -import java.util.function.BiConsumer; -import java.util.function.Consumer; -import java.util.function.Function; +import java.util.*; +import java.util.function.*; /** * An extended version of a map, that stores values into a map, but can look @@ -22,6 +21,9 @@ class ExtendedMap implements IMap { /* The map we store things in. */ private final IMap store; + private boolean isFrozen = false; + private boolean thawEnabled = true; + /** * Create a new extended map. * @@ -39,20 +41,15 @@ class ExtendedMap implements IMap { @Override public void clear() { + if (isFrozen) return; + store.clear(); } @Override public boolean containsKey(final KeyType key) { - if (store.containsKey(key)) - return true; - - return delegate.containsKey(key); - } - - @Override - public IMap extend() { - return new ExtendedMap<>(this, new FunctionalMap<>()); + if (store.containsKey(key)) return true; + else return delegate.containsKey(key); } @Override @@ -78,10 +75,8 @@ class ExtendedMap implements IMap { @Override public ValueType get(final KeyType key) { - if (store.containsKey(key)) - return store.get(key); - - return delegate.get(key); + if (store.containsKey(key)) return store.get(key); + else return delegate.get(key); } @Override @@ -99,23 +94,21 @@ class ExtendedMap implements IMap { return ilst; } - @Override - public IMap - transform(final Function transformer) { - return new TransformedValueMap<>(this, transformer); - } - @Override public ValueType put(final KeyType key, final ValueType val) { + if (isFrozen) + throw new ObjectFrozen("Can't insert key " + key + " into frozen map"); + return store.put(key, val); } @Override public ValueType remove(final KeyType key) { - if (!store.containsKey(key)) - return delegate.remove(key); - - return store.remove(key); + if (isFrozen) + throw new ObjectFrozen("Can't remove key " + key + " from frozen map"); + + if (!store.containsKey(key)) return delegate.remove(key); + else return store.remove(key); } @Override @@ -127,43 +120,69 @@ class ExtendedMap implements IMap { return ilst; } - + @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + (delegate == null ? 0 : delegate.hashCode()); - result = prime * result + (store == null ? 0 : store.hashCode()); - return result; + public int hashCode() { + // isFrozen isn't counted + return Objects.hash(delegate, store); + } + + /* Misc. object support. */ + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null) return false; + if (getClass() != obj.getClass()) return false; + + ExtendedMap other = (ExtendedMap) obj; + + // isFrozen isn't counted + return Objects.equals(delegate, other.delegate) && Objects.equals(store, other.store); + } + + @Override + public String toString() { + return String.format("ExtendedMap [delegate=%s, store=%s]", delegate, store); } + /* IFreezable support */ + @Override - public boolean equals(final Object obj) { - if (this == obj) + public boolean freeze() { + isFrozen = true; + return true; - if (obj == null) - return false; - if (!(obj instanceof ExtendedMap)) - return false; + } - final ExtendedMap other = (ExtendedMap) obj; + @Override + public boolean deepFreeze() { + thawEnabled = false; - if (delegate == null) { - if (other.delegate != null) - return false; - } else if (!delegate.equals(other.delegate)) - return false; - if (store == null) { - if (other.store != null) - return false; - } else if (!store.equals(other.store)) + return freeze(); + } + + @Override + public boolean thaw() { + if (thawEnabled) { + isFrozen = false; + return true; + } else { return false; + } + } + @Override + public boolean isFrozen() { + return isFrozen; + } + + @Override + public boolean canFreeze() { return true; } - + @Override - public String toString() { - return String.format("ExtendedMap [delegate=%s, store=%s]", delegate, store); + public boolean canThaw() { + return thawEnabled; } -} +} \ No newline at end of file diff --git a/src/main/java/bjc/funcdata/FunctionalMap.java b/src/main/java/bjc/funcdata/FunctionalMap.java index aba3dd1..c088ff3 100644 --- a/src/main/java/bjc/funcdata/FunctionalMap.java +++ b/src/main/java/bjc/funcdata/FunctionalMap.java @@ -1,12 +1,9 @@ package bjc.funcdata; -import java.util.HashMap; -import java.util.Map; -import java.util.function.BiConsumer; -import java.util.function.Consumer; -import java.util.function.Function; +import java.util.*; +import java.util.function.*; -import bjc.data.IPair; +import bjc.data.*; /** * Basic implementation of {@link IMap} @@ -23,6 +20,9 @@ public class FunctionalMap implements IMap wrappedMap; + private boolean isFrozen = false; + private boolean thawEnabled = true; + /** Create a new blank functional map */ public FunctionalMap() { wrappedMap = new HashMap<>(); @@ -39,9 +39,7 @@ public class FunctionalMap implements IMap entry : entries) { - entry.doWith((key, val) -> { - wrappedMap.put(key, val); - }); + entry.doWith(wrappedMap::put); } } @@ -52,14 +50,15 @@ public class FunctionalMap implements IMap wrap) { - if (wrap == null) - throw new NullPointerException("Map to wrap must not be null"); + if (wrap == null) throw new NullPointerException("Map to wrap must not be null"); wrappedMap = wrap; } @Override public void clear() { + if (isFrozen) throw new ObjectFrozen("Can't clear frozen map"); + wrappedMap.clear(); } @@ -68,11 +67,6 @@ public class FunctionalMap implements IMap extend() { - return new ExtendedMap<>(this, new FunctionalMap<>()); - } - @Override public void forEach(final BiConsumer action) { wrappedMap.forEach(action); @@ -90,8 +84,7 @@ public class FunctionalMap implements IMap implements IMap keyList() { final FunctionalList keys = new FunctionalList<>(); - wrappedMap.keySet().forEach(key -> { - keys.add(key); - }); + wrappedMap.keySet().forEach(keys::add); return keys; } - @Override - public IMap - transform(final Function transformer) { - if (transformer == null) - throw new NullPointerException("Transformer must not be null"); - - return new TransformedValueMap<>(this, transformer); - } - @Override public ValueType put(final KeyType key, final ValueType val) { - if (key == null) - throw new NullPointerException("Key must not be null"); + if (isFrozen) throw new ObjectFrozen("Can't put key " + key + " into frozen map"); + if (key == null) throw new NullPointerException("Key must not be null"); return wrappedMap.put(key, val); } @Override public ValueType remove(final KeyType key) { + if (isFrozen) throw new ObjectFrozen("Can't remove key " + key + " from frozen map"); + return wrappedMap.remove(key); } @@ -149,9 +133,7 @@ public class FunctionalMap implements IMap valueList() { final FunctionalList values = new FunctionalList<>(); - wrappedMap.values().forEach(value -> { - values.add(value); - }); + wrappedMap.values().forEach(values::add); return values; } @@ -166,20 +148,58 @@ public class FunctionalMap implements IMap other = (FunctionalMap) obj; if (wrappedMap == null) { - if (other.wrappedMap != null) - return false; - } else if (!wrappedMap.equals(other.wrappedMap)) + if (other.wrappedMap != null) return false; + } else if (!wrappedMap.equals(other.wrappedMap)) { + return false; + } + + return true; + } + + // IFreezable support + @Override + public boolean freeze() { + isFrozen = true; + + return true; + } + + @Override + public boolean thaw() { + if (thawEnabled) { + isFrozen = false; + return true; + } else { return false; + } + } + + @Override + public boolean deepFreeze() { + thawEnabled = false; + + return freeze(); + } + + @Override + public boolean canFreeze() { return true; } + + @Override + public boolean canThaw() { + return thawEnabled; + } + + @Override + public boolean isFrozen() { + return isFrozen; + } } diff --git a/src/main/java/bjc/funcdata/IMap.java b/src/main/java/bjc/funcdata/IMap.java index dc5ee00..e723507 100644 --- a/src/main/java/bjc/funcdata/IMap.java +++ b/src/main/java/bjc/funcdata/IMap.java @@ -1,8 +1,6 @@ package bjc.funcdata; -import java.util.function.BiConsumer; -import java.util.function.Consumer; -import java.util.function.Function; +import java.util.function.*; /** * Functional wrapper over map providing some useful things. @@ -15,7 +13,7 @@ import java.util.function.Function; * @param * The type of this map's values. */ -public interface IMap { +public interface IMap extends IFreezable { /** * Execute an action for each entry in the map. * @@ -109,7 +107,7 @@ public interface IMap { /** Delete all the values in the map. */ default void clear() { - keyList().forEach(key -> remove(key)); + keyList().forEach(IMap.this::remove); } /** @@ -151,7 +149,21 @@ public interface IMap { * * @return An extended map. */ - IMap extend(); + default IMap extend() { + return extend(new FunctionalMap<>()); + }; + + /** + * Extends this map, creating a new map that will delegate queries to this map, + * but store any added values in the provided map. + * + * @param backer The map to store added values in. + * + * @return An extended map. + */ + default IMap extend(IMap backer) { + return new ExtendedMap<>(this, backer); + }; /** * Remove the value bound to the key. diff --git a/src/main/java/bjc/funcdata/TransformedValueMap.java b/src/main/java/bjc/funcdata/TransformedValueMap.java index 5de6fc3..e51c9eb 100644 --- a/src/main/java/bjc/funcdata/TransformedValueMap.java +++ b/src/main/java/bjc/funcdata/TransformedValueMap.java @@ -1,8 +1,6 @@ package bjc.funcdata; -import java.util.function.BiConsumer; -import java.util.function.Consumer; -import java.util.function.Function; +import java.util.function.*; /** * A map that transforms values from one type to another @@ -26,6 +24,9 @@ final class TransformedValueMap /* Our transforming function. */ private final Function transformer; + private boolean isFrozen = false; + private boolean thawEnabled = true; + /** * Create a new transformed-value loop. * @@ -43,6 +44,8 @@ final class TransformedValueMap @Override public void clear() { + if (isFrozen) throw new ObjectFrozen("Can't clear frozen map"); + backing.clear(); } @@ -51,11 +54,6 @@ final class TransformedValueMap return backing.containsKey(key); } - @Override - public IMap extend() { - return new ExtendedMap<>(this, new FunctionalMap<>()); - } - @Override public void forEach(final BiConsumer action) { backing.forEach((key, value) -> { @@ -90,12 +88,6 @@ final class TransformedValueMap return backing.keyList(); } - @Override - public IMap - transform(final Function transform) { - return new TransformedValueMap<>(this, transform); - } - @Override public NewValue put(final OldKey key, final NewValue value) { throw new UnsupportedOperationException("Can't add items to transformed map"); @@ -103,6 +95,8 @@ final class TransformedValueMap @Override public NewValue remove(final OldKey key) { + if (isFrozen) throw new ObjectFrozen("Can't remove key " + key + " from frozen map"); + return transformer.apply(backing.remove(key)); } @@ -115,4 +109,43 @@ final class TransformedValueMap public IList valueList() { return backing.valueList().map(transformer); } -} + + @Override + public boolean freeze() { + isFrozen = true; + + return true; + } + + @Override + public boolean thaw() { + if (thawEnabled) { + isFrozen = false; + return true; + } else { + return false; + } + } + + @Override + public boolean deepFreeze() { + thawEnabled = false; + + return freeze(); + } + + @Override + public boolean canFreeze() { + return true; + } + + @Override + public boolean canThaw() { + return thawEnabled; + } + + @Override + public boolean isFrozen() { + return isFrozen; + } +} \ No newline at end of file -- cgit v1.2.3