cleanup

Author: jmwski

firebase-database/src/main/java/com/google/firebase/database/Query.java

@@ -479,10 +479,10 @@ private Query startAt(Node node, String key) {
   }
 
   /**
-   * Create a query constrained to only return child nodes with a value greater than the given
-   * value, using the given orderBy directive or priority as default.
+   * Create a query constrained to only return child nodes with a value less than the given value,
+   * using the given orderBy directive or priority as default.
    *
-   * @param value The value to start at, exclusive
+   * @param value The value to end at, exclusive
    * @return A Query with the new constraint
    * @since 19.6
    */
@@ -492,10 +492,10 @@ public Query endBefore(@Nullable String value) {
   }
 
   /**
-   * Create a query constrained to only return child nodes with a value greater than the given
-   * value, using the given orderBy directive or priority as default.
+   * Create a query constrained to only return child nodes with a value less than the given value,
+   * using the given orderBy directive or priority as default.
    *
-   * @param value The value to start at, exclusive
+   * @param value The value to end at, exclusive
    * @return A Query with the new constraint
    * @since 19.6
    */
@@ -505,10 +505,10 @@ public Query endBefore(double value) {
   }
 
   /**
-   * Create a query constrained to only return child nodes with a value greater than the given
-   * value, using the given orderBy directive or priority as default.
+   * Create a query constrained to only return child nodes with a value less than the given value,
+   * using the given orderBy directive or priority as default.
    *
-   * @param value The value to start at, exclusive
+   * @param value The value to end at, exclusive
    * @return A Query with the new constraint
    * @since 19.6
    */
@@ -518,12 +518,12 @@ public Query endBefore(boolean value) {
   }
 
   /**
-   * Create a query constrained to only return child nodes with a value greater than the given
-   * value, using the given orderBy directive or priority as default, and additionally only child
-   * nodes with a key greater than or equal to the given key.
+   * Create a query constrained to only return child nodes with a value less than or equal to the
+   * given value, using the given orderBy directive or priority as default, and additionally only
+   * child nodes with a key less than the given key.
    *
-   * @param value The priority to start at
-   * @param key The key to start at, exclusive
+   * @param value The value to end at
+   * @param key The key to end at, exclusive
    * @return A Query with the new constraint
    * @since 19.6
    */
@@ -535,12 +535,12 @@ public Query endBefore(@Nullable String value, @Nullable String key) {
   }
 
   /**
-   * Create a query constrained to only return child nodes with a value greater than the given
-   * value, using the given orderBy directive or priority as default, and additionally only child
-   * nodes with a key greater than or equal to the given key.
+   * Create a query constrained to only return child nodes with a value less than or equal to the
+   * given value, using the given orderBy directive or priority as default, and additionally only
+   * child nodes with a key less than the given key.
    *
-   * @param value The priority to start at
-   * @param key The key name to start at, exclusive
+   * @param value The value to end at
+   * @param key The key to end at, exclusive
    * @return A Query with the new constraint
    * @since 19.6
    */
@@ -550,12 +550,12 @@ public Query endBefore(double value, @Nullable String key) {
   }
 
   /**
-   * Create a query constrained to only return child nodes with a value greater than the given
-   * value, using the given orderBy directive or priority as default, and additionally only child
-   * nodes with a key greater than or equal to the given key.
+   * Create a query constrained to only return child nodes with a value less than or equal to the
+   * given value, using the given orderBy directive or priority as default, and additionally only
+   * child nodes with a key less than the given key.
    *
-   * @param value The priority to start at
-   * @param key The key to start at, exclusive
+   * @param value The value to end at
+   * @param key The key to end at, exclusive
    * @return A Query with the new constraint
    * @since 19.6
    */

firebase-database/src/main/java/com/google/firebase/database/core/utilities/PushIdGenerator.java

@@ -18,7 +18,6 @@
 import static com.google.firebase.database.core.utilities.Utilities.tryParseInt;
 
 import com.google.firebase.database.snapshot.ChildKey;
-import java.util.Collections;
 import java.util.Random;
 
 public class PushIdGenerator {
@@ -91,7 +90,9 @@ public static final String predecessor(String key) {
     next.setCharAt(
         next.length() - 1,
         PUSH_CHARS.charAt(PUSH_CHARS.indexOf(next.charAt(next.length() - 1)) - 1));
-    return next.append(Collections.nCopies(MAX_PUSH_CHAR, MAX_KEY_LEN - next.length())).toString();
+    return next.append(
+            new String(new char[MAX_KEY_LEN - next.length()]).replace("\0", "" + MAX_PUSH_CHAR))
+        .toString();
   };
 
   public static final String successor(String key) {

firebase-database/src/test/java/com/google/firebase/database/PushIdGeneratorTest.java

@@ -61,17 +61,16 @@ public void testSuccessorBasic() {
   @Test
   public void testPredecessorSpecialValue() {
     assertEquals(
-        PushIdGenerator.predecessor(String.valueOf(MIN_PUSH_CHAR)),
-        String.valueOf(Integer.MAX_VALUE));
-    assertEquals(PushIdGenerator.predecessor(String.valueOf(Integer.MIN_VALUE)), MIN_KEY_NAME);
+        String.valueOf(Integer.MAX_VALUE),
+        PushIdGenerator.predecessor(String.valueOf(MIN_PUSH_CHAR)));
+    assertEquals(MIN_KEY_NAME, PushIdGenerator.predecessor(String.valueOf(Integer.MIN_VALUE)));
   }
 
   @Test
   public void testPredecessorBasicValue() {
     assertEquals(
-        PushIdGenerator.predecessor("abc"),
-        "abb"
-            + StringUtils.repeat(Character.toString(MAX_PUSH_CHAR), MAX_KEY_LEN - "abc".length()));
-    assertEquals(PushIdGenerator.predecessor("abc" + MIN_PUSH_CHAR), "abc");
+        "abb" + StringUtils.repeat(Character.toString(MAX_PUSH_CHAR), MAX_KEY_LEN - "abc".length()),
+        PushIdGenerator.predecessor("abc"));
+    assertEquals("abc", PushIdGenerator.predecessor("abc" + MIN_PUSH_CHAR));
   }
 }