Remove deprecated IteratorType (#154)

benalexau · benalexau · commit ccf468aba77e · 2020-04-27T12:39:22.000+10:00
diff --git a/src/main/java/org/lmdbjava/CursorIterable.java b/src/main/java/org/lmdbjava/CursorIterable.java
@@ -228,23 +228,6 @@ void setV(final T val) {
 
   }
 
-  /**
-   * Represents the internal {@link CursorIterable} state.
-   *
-   * @deprecated use {@link Dbi} iterate method with a {@link KeyRange} instead
-   */
-  @Deprecated
-  public enum IteratorType {
-    /**
-     * Move forward.
-     */
-    FORWARD,
-    /**
-     * Move backward.
-     */
-    BACKWARD
-  }
-
   /**
    * Represents the internal {@link CursorIterator} state.
    */
diff --git a/src/main/java/org/lmdbjava/Dbi.java b/src/main/java/org/lmdbjava/Dbi.java
@@ -30,15 +30,10 @@
 import jnr.ffi.Pointer;
 import jnr.ffi.byref.IntByReference;
 import jnr.ffi.byref.PointerByReference;
-import org.lmdbjava.CursorIterable.IteratorType;
-import static org.lmdbjava.CursorIterable.IteratorType.FORWARD;
 import static org.lmdbjava.Dbi.KeyExistsException.MDB_KEYEXIST;
 import static org.lmdbjava.Dbi.KeyNotFoundException.MDB_NOTFOUND;
 import static org.lmdbjava.Env.SHOULD_CHECK;
 import static org.lmdbjava.KeyRange.all;
-import static org.lmdbjava.KeyRange.allBackward;
-import static org.lmdbjava.KeyRange.atLeast;
-import static org.lmdbjava.KeyRange.atLeastBackward;
 import org.lmdbjava.Library.ComparatorCallback;
 import static org.lmdbjava.Library.LIB;
 import org.lmdbjava.Library.MDB_stat;
@@ -55,7 +50,6 @@
  *
  * @param <T> buffer type
  */
-@SuppressWarnings("PMD.GodClass")
 public final class Dbi<T> {
 
   private final ComparatorCallback ccb;
@@ -263,50 +257,6 @@ public CursorIterable<T> iterate(final Txn<T> txn) {
     return iterate(txn, all());
   }
 
-  /**
-   * Iterate the database from the first/last item and forwards/backwards.
-   *
-   * @param txn  transaction handle (not null; not committed)
-   * @param type direction of iterator (not null)
-   * @return iterator (never null)
-   * @deprecated use iterate method with a {@link KeyRange} instead
-   */
-  @Deprecated
-  public CursorIterable<T> iterate(final Txn<T> txn, final IteratorType type) {
-    if (SHOULD_CHECK) {
-      requireNonNull(type);
-    }
-    final KeyRange<T> range = type == FORWARD ? all() : allBackward();
-    return iterate(txn, range);
-  }
-
-  /**
-   * Iterate the database from the first/last item and forwards/backwards by
-   * first seeking to the provided key.
-   *
-   * @param txn  transaction handle (not null; not committed)
-   * @param key  the key to search from (may be null to denote first record)
-   * @param type direction of iterator (not null)
-   * @return iterator (never null)
-   * @deprecated use iterate method with a {@link KeyRange} instead
-   */
-  @Deprecated
-  public CursorIterable<T> iterate(final Txn<T> txn, final T key,
-                                   final IteratorType type) {
-    if (SHOULD_CHECK) {
-      requireNonNull(type);
-    }
-
-    final KeyRange<T> range;
-    if (type == FORWARD) {
-      range = key == null ? all() : atLeast(key);
-    } else {
-      range = key == null ? allBackward() : atLeastBackward(key);
-    }
-
-    return iterate(txn, range);
-  }
-
   /**
    * Iterate the database in accordance with the provided {@link KeyRange} and
    * default {@link Comparator}.
diff --git a/src/test/java/org/lmdbjava/CursorIteratorTest.java b/src/test/java/org/lmdbjava/CursorIteratorTest.java
@@ -41,8 +41,6 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import static org.lmdbjava.CursorIterable.IteratorType.BACKWARD;
-import static org.lmdbjava.CursorIterable.IteratorType.FORWARD;
 import org.lmdbjava.CursorIterable.KeyVal;
 import static org.lmdbjava.DbiFlags.MDB_CREATE;
 import static org.lmdbjava.Env.create;
@@ -121,31 +119,6 @@ public void atMostTest() {
     verify(atMost(bb(6)), 2, 4, 6);
   }
 
-  @Test
-  public void backwardDeprecated() {
-    try (Txn<ByteBuffer> txn = env.txnRead();
-         CursorIterable<ByteBuffer> c = db.iterate(txn, BACKWARD)) {
-      for (final KeyVal<ByteBuffer> kv : c) {
-        assertThat(kv.val().getInt(), is(list.pollLast()));
-        assertThat(kv.key().getInt(), is(list.pollLast()));
-      }
-    }
-  }
-
-  @Test
-  public void backwardSeekDeprecated() {
-    final ByteBuffer key = bb(6);
-    list.pollLast();
-    list.pollLast();
-    try (Txn<ByteBuffer> txn = env.txnRead();
-         CursorIterable<ByteBuffer> c = db.iterate(txn, key, BACKWARD)) {
-      for (final KeyVal<ByteBuffer> kv : c) {
-        assertThat(kv.val().getInt(), is(list.pollLast()));
-        assertThat(kv.key().getInt(), is(list.pollLast()));
-      }
-    }
-  }
-
   @Before
   @SuppressWarnings("PMD.CloseResource")
   public void before() throws IOException {
@@ -195,32 +168,6 @@ public void closedTest() {
     verify(closed(bb(1), bb(7)), 2, 4, 6);
   }
 
-  @Test
-  public void forwardDeprecated() {
-    try (Txn<ByteBuffer> txn = env.txnRead();
-         CursorIterable<ByteBuffer> c = db.iterate(txn, FORWARD)) {
-      for (final KeyVal<ByteBuffer> kv : c) {
-        assertThat(kv.key().getInt(), is(list.pollFirst()));
-        assertThat(kv.val().getInt(), is(list.pollFirst()));
-      }
-    }
-  }
-
-  @Test
-  public void forwardSeekDeprecated() {
-    final ByteBuffer key = bb(4);
-    list.pollFirst();
-    list.pollFirst();
-
-    try (Txn<ByteBuffer> txn = env.txnRead();
-         CursorIterable<ByteBuffer> c = db.iterate(txn, key, FORWARD)) {
-      for (final KeyVal<ByteBuffer> kv : c) {
-        assertThat(kv.key().getInt(), is(list.pollFirst()));
-        assertThat(kv.val().getInt(), is(list.pollFirst()));
-      }
-    }
-  }
-
   @Test
   public void greaterThanBackwardTest() {
     verify(greaterThanBackward(bb(6)), 4, 2);
