update Java version

Author: peteroupc

src/test/java/com/upokecenter/test/CBORTest.java

@@ -2380,16 +2380,13 @@ public static void TestRandomOne(byte[] array) {
             long oldPos = (startingAvailable - inputStream.available());
             o = CBORObject.Read(inputStream);
             long cborlen = (startingAvailable - inputStream.available()) - oldPos;
-            if (cborlen > 3000) {
-              System.out.println("pos=" + (startingAvailable - inputStream.available()) + " of " +
-                startingAvailable + ", cborlen=" + cborlen);
-            }
+            // if (cborlen > 3000) {
+            //  System.out.println("pos=" + (startingAvailable - inputStream.available()) + " of " +
+            //    startingAvailable + ", cborlen=" + cborlen);
+            // }
             byte[] encodedBytes = (o == null) ? null : o.EncodeToBytes();
             try {
               CBORObject.DecodeFromBytes(encodedBytes);
-            if (cborlen > 3000) {
-                System.out.println("end DecodeFromBytes");
-              }
             } catch (Exception ex) {
               throw new IllegalStateException(ex.getMessage(), ex);
             }
@@ -2400,29 +2397,14 @@ public static void TestRandomOne(byte[] array) {
               }
               if (o != null) {
                 try {
-                  if (cborlen > 3000) {
-                    System.out.println("toJSONString " + java.util.Date.UtcNow);
-                  }
                   jsonString = o.ToJSONString();
-                  if (cborlen > 3000) {
-                    System.out.println("jsonStringLen = " + jsonString.length());
-                  }
                 } catch (CBORException ex) {
                   System.out.println(ex.getMessage());
                   jsonString = "";
                 }
                 if (jsonString.length() > 0) {
-                  if (cborlen > 3000) {
-                    System.out.println("fromJSONString " + java.util.Date.UtcNow);
-                  }
                   CBORObject.FromJSONString(jsonString);
-                if (cborlen > 3000) {
-                    System.out.println("writeToJSON " + java.util.Date.UtcNow);
-                  }
                   TestWriteToJSON(o);
-                if (cborlen > 3000) {
-                    System.out.println("endJSON " + java.util.Date.UtcNow);
-                  }
                 }
               }
             } catch (Exception ex) {

src/test/java/com/upokecenter/test/JSONPointer.java

@@ -319,6 +319,30 @@ public static Map<String, Object> GetPointersWithKey(
       return list;
     }
 
+    private static String Replace(String str, char c, String srep) {
+      int j = -1;
+      for (int i = 0; i < str.length(); ++i) {
+        if (str.charAt(i) == c) {
+          j = i;
+          break;
+        }
+      }
+      if (j == -1) {
+        return str;
+      }
+      StringBuilder sb = new StringBuilder();
+      sb.append(str.substring(0, j));
+      sb.append(srep);
+      for (int i = j + 1; i < str.length(); ++i) {
+        if (str.charAt(i) == c) {
+          sb.append(srep);
+        } else {
+          sb.append(str.charAt(i));
+        }
+      }
+      return sb.toString();
+    }
+
     private static void GetPointersWithKey(
       CBORObject root,
       String keyToFind,
@@ -341,8 +365,8 @@ private static void GetPointersWithKey(
         // Search the key's values
         for (CBORObject key : rootObj.getKeys()) {
           String ptrkey = key.AsString();
-          ptrkey = ptrkey.replace("~", "~0");
-          ptrkey = ptrkey.replace("/", "~1");
+          ptrkey = Replace(ptrkey, '~', "~0");
+          ptrkey = Replace(ptrkey, '/', "~1");
           GetPointersWithKey(
             rootObj.get(key),
             keyToFind,

src/test/java/com/upokecenter/test/RandomObjects.java

@@ -402,18 +402,18 @@ public static EFloat CloseToPowerOfTwo(IRandomGenExtended rg) {
           throw new NullPointerException("rg");
         }
         int pwr = (rg.GetInt32(100) < 80) ? IntInRange(rg, -20, 20) :
-IntInRange(rg, -300, 300);
+          IntInRange(rg, -300, 300);
         int pwr2 = pwr - (rg.GetInt32(100) < 80 ? IntInRange(rg, 51, 61) :
-IntInRange(rg, 2, 300));
+          IntInRange(rg, 2, 300));
         EFloat ef = null;
-        ef = (rg.GetInt32(2) == 0) ? (EFloat.Create(1,
-  pwr).Add(EFloat.Create(1, pwr2))) : (EFloat.Create(1,
-  pwr).Subtract(EFloat.Create(1, pwr2)));
+        ef = (rg.GetInt32(2) == 0) ? EFloat.Create(1,
+          pwr).Add(EFloat.Create(1, pwr2)) : EFloat.Create(1,
+          pwr).Subtract(EFloat.Create(1, pwr2));
         if (rg.GetInt32(10) == 0) {
           pwr2 = pwr - (rg.GetInt32(100) < 80 ? IntInRange(rg, 51, 61) :
-IntInRange(rg, 2, 300));
+            IntInRange(rg, 2, 300));
           ef = (rg.GetInt32(2) == 0) ? ef.Add(EFloat.Create(1, pwr2)) :
-ef.Subtract(EFloat.Create(1, pwr2));
+            ef.Subtract(EFloat.Create(1, pwr2));
         }
         return ef;
     }