CLEANUP: Remove SMGetMode class

src/main/java/net/spy/memcached/ArcusClient.java

@@ -104,7 +104,6 @@
 import net.spy.memcached.collection.MapUpdate;
 import net.spy.memcached.collection.MapUpsert;
 import net.spy.memcached.collection.SMGetElement;
-import net.spy.memcached.collection.SMGetMode;
 import net.spy.memcached.collection.SetCreate;
 import net.spy.memcached.collection.SetDelete;
 import net.spy.memcached.collection.SetExist;
@@ -1815,14 +1814,6 @@ public void complete() {
     return rv;
   }
 
-  @Deprecated
-  @Override
-  public SMGetFuture<List<SMGetElement<Object>>> asyncBopSortMergeGet(
-          List<String> keyList, long from, long to, ElementFlagFilter eFlagFilter,
-          int count, SMGetMode smgetMode) {
-    return this.asyncBopSortMergeGet(keyList, from, to, eFlagFilter, count, smgetMode == SMGetMode.UNIQUE);
-  }
-
   private <T> SMGetFuture<List<SMGetElement<T>>> smget(
           final List<BTreeSMGet<T>> smGetList, final int count, final boolean unique,
           final boolean reverse, final Transcoder<T> tc) {
@@ -2718,14 +2709,6 @@ public void gotStatus(Integer index, OperationStatus status) {
     return rv;
   }
 
-  @Deprecated
-  @Override
-  public SMGetFuture<List<SMGetElement<Object>>> asyncBopSortMergeGet(
-          List<String> keyList, byte[] from, byte[] to, ElementFlagFilter eFlagFilter,
-          int count, SMGetMode smgetMode) {
-    return this.asyncBopSortMergeGet(keyList, from, to, eFlagFilter, count, smgetMode == SMGetMode.UNIQUE);
-  }
-
   @Override
   public SMGetFuture<List<SMGetElement<Object>>> asyncBopSortMergeGet(
           List<String> keyList, byte[] from, byte[] to, ElementFlagFilter eFlagFilter,

src/main/java/net/spy/memcached/ArcusClientIF.java

@@ -31,7 +31,6 @@
 import net.spy.memcached.collection.ElementFlagUpdate;
 import net.spy.memcached.collection.ElementValueType;
 import net.spy.memcached.collection.SMGetElement;
-import net.spy.memcached.collection.SMGetMode;
 import net.spy.memcached.internal.BTreeStoreAndGetFuture;
 import net.spy.memcached.internal.CollectionFuture;
 import net.spy.memcached.internal.CollectionGetBulkFuture;
@@ -1394,23 +1393,6 @@ <T> CollectionFuture<Map<Integer, CollectionOperationStatus>> asyncSopPipedInser
    */
   OperationFuture<Boolean> flush(final String prefix, final int delay);
 
-  /**
-   * Get elements that matched both filter and bkey range criteria from
-   * multiple b+tree. The result is sorted by order of bkey.
-   *
-   * @param keyList     b+ tree key list
-   * @param from        bkey index from
-   * @param to          bkey index to
-   * @param eFlagFilter element flag filter
-   * @param count       number of returning values. must be larger than 0 and not more than 1000.
-   * @param smgetMode   smgetMode
-   * @return a future that will hold the return value list of the fetch.
-   */
-  @Deprecated
-  SMGetFuture<List<SMGetElement<Object>>> asyncBopSortMergeGet(
-          List<String> keyList, long from, long to, ElementFlagFilter eFlagFilter,
-          int count, SMGetMode smgetMode);
-
   /**
    * Update or insert an element.
    * <p>
@@ -1928,23 +1910,6 @@ <T> CollectionFuture<Map<ByteArrayBKey, Element<T>>> asyncBopGet(
           int count, boolean withDelete, boolean dropIfEmpty,
           Transcoder<T> tc);
 
-  /**
-   * Get elements that matched both filter and bkey range criteria from
-   * multiple b+tree. The result is sorted by order of bkey.
-   *
-   * @param keyList     b+ tree key list
-   * @param from        bkey index from
-   * @param to          bkey index to
-   * @param eFlagFilter element flag filter
-   * @param count       number of returning values. must be larger than 0 and not more than 1000.
-   * @param smgetMode   smgetMode
-   * @return a future that will hold the return value list of the fetch.
-   */
-  @Deprecated
-  SMGetFuture<List<SMGetElement<Object>>> asyncBopSortMergeGet(
-          List<String> keyList, byte[] from, byte[] to, ElementFlagFilter eFlagFilter,
-          int count, SMGetMode smgetMode);
-
   /**
    * Get elements that matched both filter and bkey range criteria from
    * multiple b+tree. The result is sorted by order of bkey.

src/main/java/net/spy/memcached/ArcusClientPool.java

@@ -37,7 +37,6 @@
 import net.spy.memcached.collection.ElementFlagUpdate;
 import net.spy.memcached.collection.ElementValueType;
 import net.spy.memcached.collection.SMGetElement;
-import net.spy.memcached.collection.SMGetMode;
 import net.spy.memcached.internal.BTreeStoreAndGetFuture;
 import net.spy.memcached.internal.BulkFuture;
 import net.spy.memcached.internal.CollectionFuture;
@@ -1148,15 +1147,6 @@ public OperationFuture<Boolean> flush(String prefix, int delay) {
     return this.getClient().flush(prefix, delay);
   }
 
-  @Deprecated
-  @Override
-  public SMGetFuture<List<SMGetElement<Object>>> asyncBopSortMergeGet(
-          List<String> keyList, long from, long to,
-          ElementFlagFilter eFlagFilter, int count, SMGetMode smgetMode) {
-    return this.getClient().asyncBopSortMergeGet(keyList, from, to,
-            eFlagFilter, count, smgetMode);
-  }
-
   @Override
   public CollectionFuture<Boolean> asyncBopUpsert(String key, long bkey,
                                                   byte[] elementFlag, Object value,
@@ -1400,15 +1390,6 @@ public <T> CollectionFuture<Map<ByteArrayBKey, Element<T>>> asyncBopGet(
             count, withDelete, dropIfEmpty, tc);
   }
 
-  @Deprecated
-  @Override
-  public SMGetFuture<List<SMGetElement<Object>>> asyncBopSortMergeGet(
-          List<String> keyList, byte[] from, byte[] to,
-          ElementFlagFilter eFlagFilter, int count, SMGetMode smgetMode) {
-    return this.getClient().asyncBopSortMergeGet(keyList, from, to,
-            eFlagFilter, count, smgetMode);
-  }
-
   @Override
   public SMGetFuture<List<SMGetElement<Object>>> asyncBopSortMergeGet(
           List<String> keyList, byte[] from, byte[] to, ElementFlagFilter eFlagFilter,