Skip to content

Commit

Permalink
Remove disabled DelegateCASMap inheritance
Browse files Browse the repository at this point in the history
  • Loading branch information
werkt committed Jun 16, 2018
1 parent d0522f3 commit c48a715
Showing 1 changed file with 1 addition and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;

class DelegateCASMap<K,V extends Message> /* implements Map<K,V> */ {
class DelegateCASMap<K,V extends Message> {
private final ContentAddressableStorage contentAddressableStorage;
private final Parser<V> parser;
private final DigestUtil digestUtil;
Expand All @@ -44,15 +44,13 @@ public DelegateCASMap(
digestMap = new ConcurrentHashMap<>();
}

// @Override
public V put(K key, V value) throws InterruptedException {
Blob blob = new Blob(value.toByteString(), digestUtil);
digestMap.put(key, blob.getDigest());
contentAddressableStorage.put(blob, () -> digestMap.remove(key));
return value;
}

// @Override
public V get(Object key) {
Digest valueDigest = digestMap.get(key);
if (valueDigest == null) {
Expand All @@ -62,48 +60,39 @@ public V get(Object key) {
return expectValueType(valueDigest);
}

// @Override
public boolean isEmpty() {
return digestMap.isEmpty();
}

// @Override
public int size() {
return digestMap.size();
}

// @Override
public boolean containsKey(Object key) {
return digestMap.get(key) != null;
}

// @Override
public boolean containsValue(Object value) {
Preconditions.checkState(value instanceof Message);
return contentAddressableStorage.contains(digestUtil.compute((Message) value));
}

// @Override
public Set<Map.Entry<K, V>> entrySet() {
return delegate().entrySet();
}

// @Override
public Collection<V> values() {
return delegate().values();
}

// @Override
public Set<K> keySet() {
return digestMap.keySet();
}

// @Override
public void clear() {
digestMap.clear();
}

// @Override
public void putAll(Map<? extends K,? extends V> m) throws InterruptedException {
Map<? extends K, Blob> blobs = Maps.transformValues(
m,
Expand All @@ -114,7 +103,6 @@ public void putAll(Map<? extends K,? extends V> m) throws InterruptedException {
digestMap.putAll(Maps.transformValues(blobs, (blob) -> blob.getDigest()));
}

// @Override
public V remove(Object key) {
Digest valueDigest = digestMap.remove(key);
return expectValueType(valueDigest);
Expand Down

0 comments on commit c48a715

Please sign in to comment.