Merge remote-tracking branch 'origin/drop-unused-cursor-native-find-methods' into dev

Author: greenrobot

objectbox-java/src/main/java/io/objectbox/Box.java

@@ -298,26 +298,6 @@ public boolean isEmpty() {
         return count(1) == 0;
     }
 
-//    @Temporary
-//    public List<T> find(Property property, String value) {
-//        Cursor<T> reader = getReader();
-//        try {
-//            return reader.find(property, value);
-//        } finally {
-//            releaseReader(reader);
-//        }
-//    }
-//
-//    @Temporary
-//    public List<T> find(Property property, long value) {
-//        Cursor<T> reader = getReader();
-//        try {
-//            return reader.find(property, value);
-//        } finally {
-//            releaseReader(reader);
-//        }
-//    }
-
     /**
      * Returns all stored Objects in this Box.
      */

objectbox-java/src/main/java/io/objectbox/Cursor.java

@@ -60,10 +60,6 @@ public abstract class Cursor<T> implements Closeable {
 
     static native long nativeCount(long cursor, long maxCountOrZero);
 
-    static native List nativeFindScalarPropertyId(long cursor, int propertyId, long value);
-
-    static native List nativeFindStringPropertyId(long cursor, int propertyId, String value);
-
     // TODO not implemented
     static native long nativeGetKey(long cursor);
 
@@ -235,16 +231,6 @@ public int getPropertyId(String propertyName) {
         return nativePropertyId(cursor, propertyName);
     }
 
-//    @Temporary
-//    public List<T> find(Property property, long value) {
-//        return nativeFindScalarPropertyId(cursor, property.id, value);
-//    }
-//
-//    @Temporary
-//    public List<T> find(Property property, String value) {
-//        return nativeFindStringPropertyId(cursor, property.id, value);
-//    }
-
     /**
      * @return key or 0 if not found
      * @deprecated TODO only used in tests, remove in the future

tests/objectbox-java-test/src/test/java/io/objectbox/BoxTest.java

@@ -245,30 +245,6 @@ public void testCollectionsNull() {
         box.removeByKeys(null);
     }
 
-//    @Test
-//    public void testFindString() {
-//        putTestEntity("banana", 0);
-//        putTestEntity("apple", 0);
-//        putTestEntity("banana", 0);
-//
-//        List<TestEntity> list = box.find(TestEntity_.simpleString, "banana");
-//        assertEquals(2, list.size());
-//        assertEquals(1, list.get(0).getId());
-//        assertEquals(3, list.get(1).getId());
-//    }
-//
-//    @Test
-//    public void testFindInt() {
-//        putTestEntity(null, 42);
-//        putTestEntity(null, 23);
-//        putTestEntity(null, 42);
-//
-//        List<TestEntity> list = box.find(TestEntity_.simpleInt, 42);
-//        assertEquals(2, list.size());
-//        assertEquals(1, list.get(0).getId());
-//        assertEquals(3, list.get(1).getId());
-//    }
-
     @Test
     public void testGetId() {
         TestEntity entity = putTestEntity(null, 42);

tests/objectbox-java-test/src/test/java/io/objectbox/CursorTest.java

@@ -160,59 +160,6 @@ public void testPutSameIndexValue() {
         assertEquals(value, read.getSimpleString());
     }
 
-//    @Test
-//    public void testFindStringInEntity() {
-//        insertTestEntities("find me", "not me");
-//
-//        Transaction transaction = store.beginTx();
-//        Cursor<TestEntity> cursor = transaction.createCursor(TestEntity.class);
-//        TestEntity entityRead = cursor.find(TestEntity_.simpleString, "find me").get(0);
-//        assertNotNull(entityRead);
-//        assertEquals(1, entityRead.getId());
-//
-//        cursor.close();
-//        transaction.abort();
-//
-//        transaction = store.beginTx();
-//        cursor = transaction.createCursor(TestEntity.class);
-//        entityRead = cursor.find(TestEntity_.simpleString, "not me").get(0);
-//        assertNotNull(entityRead);
-//        assertEquals(2, entityRead.getId());
-//
-//        cursor.close();
-//        transaction.abort();
-//
-//        transaction = store.beginTx();
-//        cursor = transaction.createCursor(TestEntity.class);
-//        assertEquals(0, cursor.find(TestEntity_.simpleString, "non-existing").size());
-//
-//        cursor.close();
-//        transaction.abort();
-//    }
-
-//    @Test
-//    public void testFindScalars() {
-//        Transaction transaction1 = store.beginTx();
-//        Cursor<TestEntity> cursor1 = transaction1.createCursor(TestEntity.class);
-//        putEntity(cursor1, "nope", 2015);
-//        putEntity(cursor1, "foo", 2016);
-//        putEntity(cursor1, "bar", 2016);
-//        putEntity(cursor1, "nope", 2017);
-//        cursor1.close();
-//        transaction1.commit();
-//
-//        Transaction transaction = store.beginReadTx();
-//        Cursor<TestEntity> cursor = transaction.createCursor(TestEntity.class);
-//        List<TestEntity> result = cursor.find(TestEntity_.simpleInt, 2016);
-//        assertEquals(2, result.size());
-//
-//        assertEquals("foo", result.get(0).getSimpleString());
-//        assertEquals("bar", result.get(1).getSimpleString());
-//
-//        cursor.close();
-//        transaction.abort();
-//    }
-
     private void insertTestEntities(String... texts) {
         Transaction transaction = store.beginTx();
         Cursor<TestEntity> cursor = transaction.createCursor(TestEntity.class);
@@ -223,11 +170,6 @@ private void insertTestEntities(String... texts) {
         transaction.commitAndClose();
     }
 
-//    @Test
-//    public void testFindStringInEntityWithIndex() {
-//        testFindStringInEntity();
-//    }
-
     @Test
     public void testLookupKeyUsingIndex() throws IOException {
         insertTestEntities("find me", "not me");