extracted KeyVal to package level

krisskross · krisskross · commit 17d09da2947c · 2016-06-30T19:19:56.000+02:00
diff --git a/src/main/java/org/lmdbjava/CursorIterator.java b/src/main/java/org/lmdbjava/CursorIterator.java
@@ -22,8 +22,7 @@
  * Iterator for entries that follow the same semantics as Cursors
  * with regards to read and write transactions and how they are closed.
  */
-public class CursorIterator<T> implements
-  Iterator<CursorIterator.KeyVal<T>>, AutoCloseable {
+public class CursorIterator<T> implements Iterator<KeyVal<T>>, AutoCloseable {
   private final Cursor<T> cursor;
   private final IteratorType type;
   private final T key;
@@ -39,7 +38,7 @@ private enum State {
     READY, NOT_READY, DONE, FAILED,
   }
 
-  private KeyVal<T> holder = new KeyVal<>();
+  private KeyVal<T> holder = new KeyVal<>(null, null);
   private KeyVal<T> entry;
   private boolean first = true;
 
@@ -127,14 +126,4 @@ public void close() {
   enum IteratorType {
     FORWARD, BACKWARD
   }
-
-  /**
-   * Holder for the current key and value of CursorIterator.
-   *
-   * @param <T> buffer type
-   */
-  public static class KeyVal<T> {
-    T key;
-    T val;
-  }
 }
diff --git a/src/main/java/org/lmdbjava/KeyVal.java b/src/main/java/org/lmdbjava/KeyVal.java
@@ -0,0 +1,29 @@
+package org.lmdbjava;
+
+/**
+ * Holder for a key and value pair.
+ *
+ * @param <T> buffer type
+ */
+public class KeyVal<T> {
+  public T key;
+  public T val;
+
+  public KeyVal(T key, T val) {
+    this.key = key;
+    this.val = val;
+  }
+
+  public void setKey(T key) {
+    this.key = key;
+  }
+
+  public void setVal(T val) {
+    this.val = val;
+  }
+
+  public void wrap(T key, T val) {
+    this.key = key;
+    this.val = val;
+  }
+}
diff --git a/src/test/java/org/lmdbjava/CursorIteratorTest.java b/src/test/java/org/lmdbjava/CursorIteratorTest.java
@@ -3,7 +3,6 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.lmdbjava.CursorIterator.KeyVal;
 
 import java.io.File;
 import java.io.IOException;
@@ -16,7 +15,6 @@
 import static org.lmdbjava.CursorIterator.IteratorType.BACKWARD;
 import static org.lmdbjava.CursorIterator.IteratorType.FORWARD;
 import static org.lmdbjava.DbiFlags.MDB_CREATE;
-import static org.lmdbjava.Env.create;
 import static org.lmdbjava.EnvFlags.MDB_NOSUBDIR;
 import static org.lmdbjava.PutFlags.MDB_NOOVERWRITE;
 import static org.lmdbjava.TestUtils.DB_1;
diff --git a/src/test/java/org/lmdbjava/TutorialTest.java b/src/test/java/org/lmdbjava/TutorialTest.java
@@ -33,16 +33,12 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.lmdbjava.CursorIterator.IteratorType;
-import org.lmdbjava.CursorIterator.KeyVal;
 
 import static org.lmdbjava.CursorIterator.IteratorType.BACKWARD;
 import static org.lmdbjava.CursorIterator.IteratorType.FORWARD;
 import static org.lmdbjava.DbiFlags.MDB_CREATE;
 import static org.lmdbjava.DbiFlags.MDB_DUPSORT;
-import static org.lmdbjava.Env.create;
 import static org.lmdbjava.GetOp.MDB_SET;
-import static org.lmdbjava.MutableDirectBufferProxy.PROXY_MDB;
 import static org.lmdbjava.SeekOp.MDB_FIRST;
 import static org.lmdbjava.SeekOp.MDB_LAST;
 import static org.lmdbjava.SeekOp.MDB_PREV;
