Merge commit '8a5cd1f8de8db7db35d9f741bcfe30ef269100e5' into feat/contains-all-starting-with

Author: eduardbosch

.travis.yml

@@ -13,12 +13,13 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-26.0.1
-    - android-26
-    - doc-26
+    - build-tools-27.0.0
+    - android-27
+    - doc-27
 
 before_install:
     - pip install --user codecov
+    - yes | sdkmanager "platforms;android-27"
 
 script:
   - ./gradlew clean testDebugUnitTest jacocoTestReport

Parse/build.gradle

@@ -5,7 +5,7 @@ apply plugin: 'com.github.kt3k.coveralls'
 apply plugin: 'com.jfrog.bintray'
 
 group = 'com.parse'
-version = '1.16.3'
+version = '1.16.6'
 
 ext {
     projDescription = 'A library that gives you access to the powerful Parse cloud platform from your Android app.'
@@ -51,18 +51,18 @@ android {
 }
 
 ext {
-    okhttpVersion = '3.8.1'
+    okhttpVersion = '3.9.0'
 }
 
 dependencies {
-    compile "com.android.support:support-annotations:$supportLibVersion"
-    compile 'com.parse.bolts:bolts-tasks:1.4.0'
-    compile "com.squareup.okhttp3:okhttp:$okhttpVersion"
-
-    testCompile 'org.robolectric:robolectric:3.3.2'
-    testCompile 'org.skyscreamer:jsonassert:1.5.0'
-    testCompile 'org.mockito:mockito-core:1.10.19'
-    testCompile "com.squareup.okhttp3:mockwebserver:$okhttpVersion"
+    api "com.android.support:support-annotations:$supportLibVersion"
+    api 'com.parse.bolts:bolts-tasks:1.4.0'
+    api "com.squareup.okhttp3:okhttp:$okhttpVersion"
+
+    testImplementation 'org.robolectric:robolectric:3.3.2'
+    testImplementation 'org.skyscreamer:jsonassert:1.5.0'
+    testImplementation 'org.mockito:mockito-core:1.10.19'
+    testImplementation "com.squareup.okhttp3:mockwebserver:$okhttpVersion"
 }
 
 android.libraryVariants.all { variant ->
@@ -244,7 +244,6 @@ bintray {
 
 // Create the publication with the pom configuration:
 apply plugin: 'maven-publish'
-
 publishing {
     publications {
         MyPublication(MavenPublication) {
@@ -264,7 +263,7 @@ publishing {
                 def dependenciesNode = asNode().appendNode('dependencies')
 
                 //Iterate over the compile dependencies (we don't want the test ones), adding a <dependency> node for each
-                configurations.compile.allDependencies.each {
+                configurations.implementation.allDependencies.each {
                     def dependencyNode = dependenciesNode.appendNode('dependency')
                     dependencyNode.appendNode('groupId', it.group)
                     dependencyNode.appendNode('artifactId', it.name)

Parse/src/main/java/com/parse/ParseDecoder.java

@@ -71,6 +71,10 @@ public Object decode(Object object) {
       return convertJSONArrayToList((JSONArray) object);
     }
 
+    if (object == JSONObject.NULL) {
+      return null;
+    }
+
     if (!(object instanceof JSONObject)) {
       return object;
     }

Parse/src/main/java/com/parse/ParseQuery.java

@@ -482,6 +482,14 @@ public Builder<T> whereGeoIntersects(String key, ParseGeoPoint point) {
         return addCondition(key, "$geoIntersects", dictionary);
       }
 
+      public Builder<T> whereText(String key, String value) {
+        Map<String, String> termDictionary = new HashMap<>();
+        Map<String, Map<String, String>> searchDictionary = new HashMap<>();
+        termDictionary.put("$term", value);
+        searchDictionary.put("$search", termDictionary);
+        return addCondition(key, "$text", searchDictionary);
+      }
+
       public Builder<T> addCondition(String key, String condition,
           Collection<? extends Object> value) {
         return addConditionInternal(key, condition, Collections.unmodifiableCollection(value));
@@ -1681,6 +1689,23 @@ public ParseQuery<T> whereContainsAll(String key, Collection<?> values) {
     return this;
   }
 
+    /**
+   * Adds a constraint for finding string values that contain a provided
+   * string using Full Text Search
+   *
+   * Requires Parse-Server@2.5.0
+   *
+   * @param key
+   *          The key to be constrained.
+   * @param text
+   *          String to be searched
+   * @return this, so you can chain this call.
+   */
+  public ParseQuery<T> whereFullText(String key, String text) {
+    builder.whereText(key, text);
+    return this;
+  }
+
   /**
    * Add a constraint to the query that requires a particular key's value to contain each one of
    * the provided list of strings entirely or just starting with given strings.

Parse/src/test/java/com/parse/ParseDecoderTest.java

@@ -73,6 +73,12 @@ public void testNonJSONObject() {
     assertSame(obj, ParseDecoder.get().decode(obj));
   }
 
+  @Test
+  public void testNull() {
+    Object object = ParseDecoder.get().decode(JSONObject.NULL);
+    assertNull(object);
+  }
+
   @Test
   public void testParseFieldOperations() throws JSONException {
     JSONObject json = new JSONObject();

Parse/src/test/java/com/parse/ParseQueryTest.java

@@ -365,6 +365,22 @@ public void testWhereContainedIn() throws Exception {
     verifyCondition(query, "key", "$in", values);
   }
 
+  @Test
+  public void testWhereFullText() throws Exception {
+    ParseQuery<ParseObject> query = new ParseQuery<>("Test");
+    String text = "TestString";
+    query.whereFullText("key", text);
+
+    // We generate a state to verify the content of the builder
+    ParseQuery.State state = query.getBuilder().build();
+    ParseQuery.QueryConstraints queryConstraints = state.constraints();
+    ParseQuery.KeyConstraints keyConstraints = (ParseQuery.KeyConstraints) queryConstraints.get("key");
+    Map searchDictionary = (Map) keyConstraints.get("$text");
+    Map termDictionary = (Map) searchDictionary.get("$search");
+    String value = (String) termDictionary.get("$term");
+    assertEquals(value, text);
+  }
+
   @Test
   public void testWhereContainsAll() throws Exception {
     ParseQuery<ParseObject> query = new ParseQuery<>("Test");