Remove requiresValue method as we don't need it for now.

voldemort · Oct 15, 2009 · 5daf42c · 5daf42c
1 parent 39f633b
commit 5daf42c
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 33 deletions.
diff --git a/src/java/voldemort/versioning/ArbitraryInconsistencyResolver.java b/src/java/voldemort/versioning/ArbitraryInconsistencyResolver.java
@@ -28,10 +28,6 @@
  */
 public class ArbitraryInconsistencyResolver<T> implements InconsistencyResolver<T> {
 
-    public boolean requiresValue() {
-        return false;
-    }
-
     /**
      * Arbitrarily resolve the inconsistency by choosing the first object if
      * there is one.

diff --git a/src/java/voldemort/versioning/ChainedResolver.java b/src/java/voldemort/versioning/ChainedResolver.java
@@ -38,14 +38,6 @@ public ChainedResolver(InconsistencyResolver<T>... resolvers) {
             this.resolvers.add(Utils.notNull(resolver));
     }
 
-    public boolean requiresValue() {
-        for(InconsistencyResolver<T> resolver: resolvers) {
-            if(resolver.requiresValue())
-                return true;
-        }
-        return false;
-    }
-
     public List<T> resolveConflicts(List<T> items) {
         for(InconsistencyResolver<T> resolver: resolvers) {
             if(items.size() <= 1)

diff --git a/src/java/voldemort/versioning/FailingInconsistencyResolver.java b/src/java/voldemort/versioning/FailingInconsistencyResolver.java
@@ -32,9 +32,4 @@ public List<T> resolveConflicts(List<T> items) {
         else
             return items;
     }
-
-    public boolean requiresValue() {
-        return false;
-    }
-
 }
diff --git a/src/java/voldemort/versioning/InconsistencyResolver.java b/src/java/voldemort/versioning/InconsistencyResolver.java
@@ -28,8 +28,6 @@
  */
 public interface InconsistencyResolver<T> {
 
-    public boolean requiresValue();
-
     /**
      * Take two different versions of an object and combine them into a single
      * version of the object Implementations must maintain the contract that

diff --git a/src/java/voldemort/versioning/MergingInconsistencyResolver.java b/src/java/voldemort/versioning/MergingInconsistencyResolver.java
@@ -50,9 +50,4 @@ public List<Versioned<T>> resolveConflicts(List<Versioned<T>> items) {
             return Collections.singletonList(new Versioned<T>(merged, clock));
         }
     }
-
-    public boolean requiresValue() {
-        return true;
-    }
-
 }
diff --git a/src/java/voldemort/versioning/TimeBasedInconsistencyResolver.java b/src/java/voldemort/versioning/TimeBasedInconsistencyResolver.java
@@ -44,8 +44,4 @@ public List<Versioned<T>> resolveConflicts(List<Versioned<T>> items) {
             return Collections.singletonList(max);
         }
     }
-
-    public boolean requiresValue() {
-        return false;
-    }
 }
diff --git a/src/java/voldemort/versioning/VectorClockInconsistencyResolver.java b/src/java/voldemort/versioning/VectorClockInconsistencyResolver.java
@@ -55,9 +55,4 @@ public List<Versioned<T>> resolveConflicts(List<Versioned<T>> items) {
         }
         return newItems;
     }
-
-    public boolean requiresValue() {
-        return false;
-    }
-
 }