Use new dedicated containsElement native method.

Author: greenrobot-team

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

@@ -449,12 +449,12 @@ private void checkNotStringArray() {
      */
     public PropertyQueryCondition<ENTITY> containsElement(String value) {
         checkIsStringArray();
-        return new StringCondition<>(this, Operation.CONTAINS, value);
+        return new StringCondition<>(this, Operation.CONTAINS_ELEMENT, value);
     }
 
     public PropertyQueryCondition<ENTITY> containsElement(String value, StringOrder order) {
         checkIsStringArray();
-        return new StringCondition<>(this, Operation.CONTAINS, value, order);
+        return new StringCondition<>(this, Operation.CONTAINS_ELEMENT, value, order);
     }
 
     private void checkIsStringArray() {

objectbox-java/src/main/java/io/objectbox/query/PropertyQueryConditionImpl.java

@@ -288,6 +288,7 @@ public enum Operation {
             LESS,
             LESS_OR_EQUAL,
             CONTAINS,
+            CONTAINS_ELEMENT,
             STARTS_WITH,
             ENDS_WITH
         }
@@ -325,8 +326,10 @@ void applyCondition(QueryBuilder<T> builder) {
                     builder.lessOrEqual(property, value, order);
                     break;
                 case CONTAINS:
-                    // Note: contains used for String[] as well, so do not enforce String type here.
-                    builder.containsNoTypeCheck(property, value, order);
+                    builder.contains(property, value, order);
+                    break;
+                case CONTAINS_ELEMENT:
+                    builder.containsElement(property, value, order);
                     break;
                 case STARTS_WITH:
                     builder.startsWith(property, value, order);

objectbox-java/src/main/java/io/objectbox/query/QueryBuilder.java

@@ -182,6 +182,8 @@ private native long nativeLink(long handle, long storeHandle, int relationOwnerE
 
     private native long nativeContains(long handle, int propertyId, String value, boolean caseSensitive);
 
+    private native long nativeContainsElement(long handle, int propertyId, String value, boolean caseSensitive);
+
     private native long nativeStartsWith(long handle, int propertyId, String value, boolean caseSensitive);
 
     private native long nativeEndsWith(long handle, int propertyId, String value, boolean caseSensitive);
@@ -759,7 +761,8 @@ public QueryBuilder<T> contains(Property<T> property, String value, StringOrder
         if (String[].class == property.type) {
             throw new UnsupportedOperationException("For String[] only containsElement() is supported at this time.");
         }
-        containsNoTypeCheck(property, value, order);
+        verifyHandle();
+        checkCombineCondition(nativeContains(handle, property.getId(), value, order == StringOrder.CASE_SENSITIVE));
         return this;
     }
 
@@ -770,13 +773,9 @@ public QueryBuilder<T> containsElement(Property<T> property, String value, Strin
         if (String[].class != property.type) {
             throw new IllegalArgumentException("containsElement is only supported for String[] properties.");
         }
-        containsNoTypeCheck(property, value, order);
-        return this;
-    }
-
-    void containsNoTypeCheck(Property<T> property, String value, StringOrder order) {
         verifyHandle();
-        checkCombineCondition(nativeContains(handle, property.getId(), value, order == StringOrder.CASE_SENSITIVE));
+        checkCombineCondition(nativeContainsElement(handle, property.getId(), value, order == StringOrder.CASE_SENSITIVE));
+        return this;
     }
 
     public QueryBuilder<T> startsWith(Property<T> property, String value, StringOrder order) {