diff --git a/core/src/main/java/org/infinispan/context/EntryLookup.java b/core/src/main/java/org/infinispan/context/EntryLookup.java index f5d77c24ca5a..be41dd577c7e 100644 --- a/core/src/main/java/org/infinispan/context/EntryLookup.java +++ b/core/src/main/java/org/infinispan/context/EntryLookup.java @@ -58,13 +58,6 @@ public interface EntryLookup { */ void putLookedUpEntry(Object key, CacheEntry e); - void putLookedUpEntries(Map lookedUpEntries); - void removeLookedUpEntry(Object key); - /** - * Clears the collection of entries looked up - */ - void clearLookedUpEntries(); - } diff --git a/core/src/main/java/org/infinispan/context/SingleKeyNonTxInvocationContext.java b/core/src/main/java/org/infinispan/context/SingleKeyNonTxInvocationContext.java index e21b5aaa7463..76ca52fbe2eb 100644 --- a/core/src/main/java/org/infinispan/context/SingleKeyNonTxInvocationContext.java +++ b/core/src/main/java/org/infinispan/context/SingleKeyNonTxInvocationContext.java @@ -115,25 +115,12 @@ public void putLookedUpEntry(final Object key, final CacheEntry e) { this.cacheEntry = e; } - @Override - public void putLookedUpEntries(Map lookedUpEntries) { - if (lookedUpEntries.size() > 1) throw illegalStateException(); - Map.Entry e = lookedUpEntries.entrySet().iterator().next(); - this.key = e.getKey(); - this.cacheEntry = e.getValue(); - } - @Override public void removeLookedUpEntry(Object key) { if (key.equals(this.key)) clearLockedKeys(); } - @Override - public void clearLookedUpEntries() { - clearLockedKeys(); - } - public Object getKey() { return key; } diff --git a/core/src/main/java/org/infinispan/context/impl/ImmutableContext.java b/core/src/main/java/org/infinispan/context/impl/ImmutableContext.java index f59e5a8e3065..48260b44c691 100644 --- a/core/src/main/java/org/infinispan/context/impl/ImmutableContext.java +++ b/core/src/main/java/org/infinispan/context/impl/ImmutableContext.java @@ -57,20 +57,11 @@ public void putLookedUpEntry(Object key, CacheEntry e) { throw newUnsupportedMethod(); } - @Override - public void putLookedUpEntries(Map lookedUpEntries) { - throw newUnsupportedMethod(); - } - @Override public void removeLookedUpEntry(Object key) { throw newUnsupportedMethod(); } - @Override - public void clearLookedUpEntries() { - } - @Override public boolean hasLockedKey(Object key) { return false; diff --git a/core/src/main/java/org/infinispan/context/impl/LocalTxInvocationContext.java b/core/src/main/java/org/infinispan/context/impl/LocalTxInvocationContext.java index bffb958cc24b..ca660124a01b 100644 --- a/core/src/main/java/org/infinispan/context/impl/LocalTxInvocationContext.java +++ b/core/src/main/java/org/infinispan/context/impl/LocalTxInvocationContext.java @@ -105,21 +105,11 @@ public void putLookedUpEntry(Object key, CacheEntry e) { localTransaction.putLookedUpEntry(key, e); } - @Override - public void putLookedUpEntries(Map lookedUpEntries) { - localTransaction.putLookedUpEntries(lookedUpEntries); - } - @Override public void removeLookedUpEntry(Object key) { localTransaction.removeLookedUpEntry(key); } - @Override - public void clearLookedUpEntries() { - localTransaction.clearLookedUpEntries(); - } - @Override public boolean hasLockedKey(Object key) { return localTransaction != null && localTransaction.ownsLock(key); diff --git a/core/src/main/java/org/infinispan/context/impl/NonTxInvocationContext.java b/core/src/main/java/org/infinispan/context/impl/NonTxInvocationContext.java index d44a8fbb9295..9894bb70eb5e 100644 --- a/core/src/main/java/org/infinispan/context/impl/NonTxInvocationContext.java +++ b/core/src/main/java/org/infinispan/context/impl/NonTxInvocationContext.java @@ -68,16 +68,6 @@ public void putLookedUpEntry(Object key, CacheEntry e) { lookedUpEntries.put(key, e); } - @Override - public void putLookedUpEntries(Map newLookedUpEntries) { - lookedUpEntries.putAll(newLookedUpEntries); - } - - @Override - public void clearLookedUpEntries() { - lookedUpEntries.clear(); - } - @Override @SuppressWarnings("unchecked") public Map getLookedUpEntries() { diff --git a/core/src/main/java/org/infinispan/context/impl/RemoteTxInvocationContext.java b/core/src/main/java/org/infinispan/context/impl/RemoteTxInvocationContext.java index 8b79709e1041..34f4d227d988 100644 --- a/core/src/main/java/org/infinispan/context/impl/RemoteTxInvocationContext.java +++ b/core/src/main/java/org/infinispan/context/impl/RemoteTxInvocationContext.java @@ -104,16 +104,6 @@ public void removeLookedUpEntry(Object key) { remoteTransaction.removeLookedUpEntry(key); } - @Override - public void clearLookedUpEntries() { - remoteTransaction.clearLookedUpEntries(); - } - - @Override - public void putLookedUpEntries(Map lookedUpEntries) { - remoteTransaction.putLookedUpEntries(lookedUpEntries); - } - @Override public boolean equals(Object o) { if (this == o) return true;