Merge pull request #33 from hypersolid/issue-31

Fixes #31

Author: dmitry-grytsovets

Diff for: pom.xml

@@ -52,6 +52,18 @@
             <version>4.12</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.2.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <version>1.9.5</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <parent>

Diff for: src/main/java/org/tarantool/AbstractTarantoolOps.java

@@ -6,6 +6,10 @@ public abstract class AbstractTarantoolOps<Space, Tuple, Operation, Result> impl
 
     public abstract Result exec(Code code, Object... args);
 
+    public Result select(Space space, Space index, Tuple key, int offset, int limit, Iterator iterator) {
+        return select(space, index, key, offset, limit, iterator.getValue());
+    }
+
     public Result select(Space space, Space index, Tuple key, int offset, int limit, int iterator) {
         return exec(Code.SELECT, Key.SPACE, space, Key.INDEX, index, Key.KEY, key, Key.ITERATOR, iterator, Key.LIMIT, limit, Key.OFFSET, offset);
     }

Diff for: src/main/java/org/tarantool/Iterator.java

@@ -0,0 +1,27 @@
+package org.tarantool;
+
+// Iterator info was taken from here https://github.com/tarantool/tarantool/blob/f66584c3bcdffe61d6d99a4868a9b72d62338a11/src/box/iterator_type.h#L62
+public enum Iterator {
+    EQ(0), // key == x ASC order
+    REQ(1), // key == x DESC order
+    ALL(2), // all tuples
+    LT(3), // key <  x
+    LE(4), // key <= x
+    GE(5), // key >= x
+    GT(6), // key >  x
+    BITS_ALL_SET(7), // all bits from x are set in key
+    BITS_ANY_SET(8), // at least one x's bit is set
+    BITS_ALL_NOT_SET(9), // all bits are not set
+    OVERLAPS(10), // key overlaps x
+    NEIGHBOR(11); // tuples in distance ascending order from specified point
+
+    private final int value;
+
+    Iterator(int value) {
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+}

Diff for: src/main/java/org/tarantool/TarantoolClientOps.java

@@ -4,6 +4,8 @@
 public interface TarantoolClientOps<T,O,P,R> {
     R select(T space, T index, O key, int offset, int limit, int iterator);
 
+    R select(T space, T index, O key, int offset, int limit, Iterator iterator);
+
     R insert(T space, O tuple);
 
     R replace(T space, O tuple);

Diff for: src/test/java/org/tarantool/IteratorTest.java

@@ -0,0 +1,34 @@
+package org.tarantool;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.mockito.Mockito.*;
+
+
+class IteratorTest {
+    protected class MockOps extends AbstractTarantoolOps<Integer, List<?>, Object, List<?>> {
+
+        @Override
+        public List exec(Code code, Object... args) {
+            return null;
+        }
+
+        @Override
+        public void close() {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    @Test
+    void testSelectWithIteratorInsteadOfInteger() {
+        MockOps ops = new MockOps();
+        MockOps spyOps = spy(ops);
+
+        spyOps.select(1, 1, new ArrayList<Integer>(), 0, 1, Iterator.EQ);
+
+        verify(spyOps, times(1)).select(1, 1, new ArrayList<Integer>(), 0, 1, 0);
+    }
+}