rfc

Author: leonchen83

src/main/java/com/redislabs/modules/rejson/Path.java

@@ -28,6 +28,8 @@
 
 package com.redislabs.modules.rejson;
 
+import java.util.Objects;
+
 /**
  * Path is a ReJSON path, representing a valid path into an object
  */
@@ -77,94 +79,86 @@ public int hashCode() {
         return strPath.hashCode();
     }
 
-    private static String escape(String path) {
-        StringBuilder builder = new StringBuilder();
-        builder.append('"');
-        builder.append(path);
-        builder.append('"');
-        return builder.toString();
-    }
-    
     private static String parse(String path) {
-        if (path == null) {
-            throw new NullPointerException("Json Pointer Path cannot be null.");
-        }
+        Objects.requireNonNull(path, "Json Pointer Path cannot be null.");
+        
         if (path.isEmpty()) {
-            // ”“ means all document 
+            // "" means all document 
             return ROOT_PATH.toString();
         }
         if (path.charAt(0) != '/') {
             throw new IllegalArgumentException("Json Pointer Path must start with '/'.");
         }
-        char[] ary = path.toCharArray();
-        StringBuilder r = new StringBuilder(ary.length);
+        
+        final char[] ary = path.toCharArray();
+        StringBuilder result = new StringBuilder();
         StringBuilder builder = new StringBuilder();
-        boolean num = true;
+        boolean number = true;
         char prev = '/';
         for (int i = 1; i < ary.length; i++) {
             char c = ary[i];
             switch (c) {
             case '~':
                 if (prev == '~') {
-                    num = false;
+                    number = false;
                     builder.append('~');
                 }
                 break;
             case '/':
                 if (prev == '~') {
-                    num = false;
+                    number = false;
                     builder.append('~');
                 }
-                if (builder.length() > 0 && num) {
-                    r.append(".[" + builder.toString() + "]");
+                if (builder.length() > 0 && number) {
+                    result.append(".[").append(builder).append("]");
                 } else {
-                    r.append(".[" + escape(builder.toString()) + "]");
+                    result.append(".[\"").append(builder).append("\"]");
                 }
-                num = true;
+                number = true;
                 builder.setLength(0);
                 break;
             case '0':
                 if (prev == '~') {
-                    num = false;
+                    number = false;
                     builder.append("~");
                 } else {
                     builder.append(c);
                 }
                 break;
             case '1':
                 if (prev == '~') {
-                    num = false;
+                    number = false;
                     builder.append("/");
                 } else {
                     builder.append(c);
                 }
                 break;
             default:
                 if (prev == '~') {
-                    num = false;
+                    number = false;
                     builder.append('~');
                 }
                 if (c < '0' || c > '9') {
-                    num = false;
+                    number = false;
                 }
                 builder.append(c);
                 break;
             }
             prev = c;
         }
         if (prev == '~') {
-            num = false;
+            number = false;
             builder.append("~");
         }
         if (builder.length() > 0) {
-            if (num) {
-                r.append(".[" + builder.toString() + "]");
+            if (number) {
+                result.append(".[").append(builder).append("]");
             } else {
-                r.append(".[" + escape(builder.toString()) + "]");
+                result.append(".[\"").append(builder).append("\"]");
             }
         } else if (prev == '/') {
-            r.append(".[" + escape(builder.toString()) + "]");
+            result.append(".[\"").append(builder).append("\"]");
         }
-        return r.toString();
+        return result.toString();
     }
 }