update Java version

Author: peteroupc

src/test/java/com/upokecenter/test/CBORObjectTest.java

@@ -2488,20 +2488,22 @@ public void TestEncodeFloat64() {
       }
     }
 
+    public static final int[] EtbRanges = {
+      -24, 23, 1,
+      -256, -25, 2,
+      24, 255, 2,
+      256, 266, 3,
+      -266, -257, 3,
+      65525, 65535, 3,
+      -65536, -65525, 3,
+      65536, 65546, 5,
+      -65547, -65537, 5,
+    };
+
     @Test
     public void TestEncodeToBytes() {
       // Test minimum data length
-      int[] ranges = {
-        -24, 23, 1,
-        -256, -25, 2,
-        24, 255, 2,
-        256, 266, 3,
-        -266, -257, 3,
-        65525, 65535, 3,
-        -65536, -65525, 3,
-        65536, 65546, 5,
-        -65547, -65537, 5,
-      };
+      int[] ranges = EtbRanges;
       String[] bigRanges = {
         "4294967285", "4294967295",
         "4294967296", "4294967306",
@@ -9749,9 +9751,11 @@ public void TestAtJSONPointer() {
       cbor = CBORObject.NewMap().Add("f/o", 0);
       Assert.assertEquals(cbor.get("f/o"), cbor.AtJSONPointer("/f~1o"));
       cbor = CBORObject.NewMap().Add("foo", CBORObject.NewMap().Add("bar",
-  345));
+            345));
 
-  Assert.assertEquals(CBORObject.FromObject(345), cbor.AtJSONPointer("/foo/bar"));
+      Assert.assertEquals(
+        CBORObject.FromObject(345),
+        cbor.AtJSONPointer("/foo/bar"));
       cbor = CBORObject.NewMap().Add("foo", CBORObject.NewArray().Add(678));
       Assert.assertEquals(CBORObject.FromObject(678), cbor.AtJSONPointer("/foo/0"));
       try {
@@ -10360,7 +10364,7 @@ public static void TestParseNumberFxxLine(String line) {
 
     public static void TestParseNumberFxx(
       String str,
-      short _f16,
+      short f16,
       int f32,
       long f64,
       String line) {
@@ -10370,6 +10374,9 @@ public static void TestParseNumberFxx(
         // System.out.println(str);
         return;
       }
+      if (CBORObject.FromObject(f16) == null) {
+        Assert.fail();
+      }
       CBORObject cbor = CBORDataUtilities.ParseJSONNumber(str,
           JSONOptionsDouble);
       if (cbor == null) {
@@ -10608,13 +10615,13 @@ public void TestFromJsonStringZeroWithHighExponent() {
       String decstr = "0E100441809235791722330759976";
       EDecimal ed = EDecimal.FromString(decstr);
       double dbl = ed.ToDouble();
-      Assert.assertEquals((double)0, dbl, 0);
+      Assert.assertEquals((double)0.0d, dbl, 0);
       AssertJSONDouble(decstr, "double", dbl);
       AssertJSONInteger(decstr, "intorfloat", 0);
       decstr = "0E1321909565013040040586";
       ed = EDecimal.FromString(decstr);
       dbl = ed.ToDouble();
-      Assert.assertEquals((double)0, dbl, 0);
+      Assert.assertEquals((double)0.0d, dbl, 0);
       AssertJSONDouble(decstr, "double", dbl);
       AssertJSONInteger(decstr, "intorfloat", 0);
       double dblnegzero = EFloat.FromString("-0").ToDouble();
@@ -10770,7 +10777,7 @@ public void TestFromJsonLeadingTrailingCTL() {
           }
         }
         // Trailing CTL
-        chars = new char[] { (char)0x31, (char)i};
+        chars = new char[] { (char)0x31, (char)i };
         str = new String(chars, 0, chars.length);
         if (i == 0x09 || i == 0x0d || i == 0x0a || i == 0x20) {
           try {

src/test/java/com/upokecenter/test/JSONWithComments.java

@@ -61,9 +61,10 @@ private CBORObject NextJSONString() {
           if (escaped) {
             return CBORObject.FromJSONString(js.substring(
                   startIndex - 1, (
-                  startIndex - 1)+(endIndex - (startIndex - 1)))); }
-                  return
-CBORObject.FromObject(js.substring(startIndex, (startIndex)+((endIndex - 1) - startIndex)));
+                  startIndex - 1)+(endIndex - (startIndex - 1))));
+          }
+          return
+            CBORObject.FromObject(js.substring(startIndex, (startIndex)+((endIndex - 1) - startIndex)));
         } else if (c == '\\') {
           this.index = idx++;
           escaped = true;

src/test/java/com/upokecenter/test/QueryStringHelper.java

@@ -15,7 +15,7 @@ private static String[] SplitAt(String s, String delimiter) {
         throw new IllegalArgumentException();
       }
       if (s == null || s.length() == 0) {
-        return new String[] { ""};
+        return new String[] { "" };
       }
       int index = 0;
       boolean first = true;
@@ -25,7 +25,7 @@ private static String[] SplitAt(String s, String delimiter) {
         int index2 = s.indexOf(delimiter, index);
         if (index2 < 0) {
           if (first) {
-            return new String[] { s};
+            return new String[] { s };
           }
           strings.add(s.substring(index));
           break;
@@ -202,7 +202,7 @@ public static List<String[]> ParseQueryString(
         }
         name = name.replace('+', ' ');
         value = value.replace('+', ' ');
-        String[] pair = new String[] { name, value};
+        String[] pair = new String[] { name, value };
         pairs.add(pair);
       }
       for (String[] pair : pairs) {
@@ -216,7 +216,7 @@ public static List<String[]> ParseQueryString(
     private static String[] GetKeyPath(String s) {
       int index = s.indexOf('[');
       if (index < 0) { // start bracket not found
-        return new String[] { s};
+        return new String[] { s };
       }
       ArrayList<String> path = new ArrayList<String>();
       path.add(s.substring(0, index - 0));