Merge pull request #339 from robszewczyk/bug/java-11-compatibility

Remove references to java.xml.bind.DataTypeConverter

Author: robszewczyk

src/device-manager/java/src/nl/Weave/DeviceManager/TestMain.java

@@ -20,7 +20,6 @@
 
 import java.text.SimpleDateFormat;
 import java.util.EnumSet;
-import javax.xml.bind.DatatypeConverter;
 import java.math.BigInteger;
 
 public class TestMain implements WeaveDeviceManager.CompletionHandler
@@ -33,6 +32,33 @@ public TestFailedException(String testName)
         }
     }
 
+    protected byte [] parseHexBinary(String s)
+    {
+        byte [] retval = new byte[s.length()/2];
+        try {
+            for (int i = 0; i < s.length(); i += 2)
+            {
+                retval[i/2] = (byte) Integer.parseInt(s.substring(i, i + 2), 16);
+            }
+        }
+        catch (NumberFormatException nfe)
+        {
+            retval = null;
+        }
+
+        return retval;
+    }
+
+    protected String printHexBinary(byte [] inArray)
+    {
+        StringBuilder sb = new StringBuilder(inArray.length * 2);
+        for (byte b: inArray)
+        {
+            sb.append(String.format("%02x", b));
+        }
+        return sb.toString();
+    }
+
     public static void main(String[] args)
     {
         TestMain mainObj = new TestMain();
@@ -48,7 +74,7 @@ public static void main(String[] args)
     String TestResult = null;
     WeaveDeviceManager DeviceMgr;
     long AddNetworkId = -1;
-    byte[] TestDeviceDescriptor = DatatypeConverter.parseHexBinary(
+    byte[] TestDeviceDescriptor = parseHexBinary(
         "95010024002A24010124020125033245" +
         "2C041030354241303141433033313330" +
         "30334730050818B43000000A91B33006" +
@@ -178,7 +204,7 @@ void RunUnitTests()
         System.out.println("AddNetwork Test");
         System.out.println("    Adding new Thread network...");
         networkInfo = NetworkInfo.MakeThread("Thread-Test",
-                                        DatatypeConverter.parseHexBinary("0102030405060708"),
+                                        parseHexBinary("0102030405060708"),
                                         "akey".getBytes(),
                                         0x1234,
                                         (byte)21);
@@ -524,9 +550,9 @@ public void print(WeaveDeviceDescriptor deviceDesc, String prefix)
         if (deviceDesc.manufacturingDate != null)
             System.out.format("%sManufacturing Date: %s%n", prefix, new SimpleDateFormat("yyyy/MM/dd").format(deviceDesc.manufacturingDate.getTime()));
         if (deviceDesc.primary802154MACAddress != null)
-            System.out.format("%sPrimary 802.15.4 MAC Address: %s%n", prefix, DatatypeConverter.printHexBinary(deviceDesc.primary802154MACAddress));
+            System.out.format("%sPrimary 802.15.4 MAC Address: %s%n", prefix, printHexBinary(deviceDesc.primary802154MACAddress));
         if (deviceDesc.primaryWiFiMACAddress != null)
-            System.out.format("%sPrimary WiFi MAC Address: %s%n", prefix, DatatypeConverter.printHexBinary(deviceDesc.primaryWiFiMACAddress));
+            System.out.format("%sPrimary WiFi MAC Address: %s%n", prefix, printHexBinary(deviceDesc.primaryWiFiMACAddress));
         if (deviceDesc.rendezvousWiFiESSID != null)
             System.out.format("%sRendezvous WiFi ESSID: %s%n", prefix, deviceDesc.rendezvousWiFiESSID);
         if (deviceDesc.pairingCode != null)
@@ -557,13 +583,13 @@ public void print(NetworkInfo[] networks, String indent)
             if (n.WiFiSecurityType != WiFiSecurityType.NotSpecified)
                 System.out.format("%s  WiFi Security Type: %s%n", indent, n.WiFiSecurityType.name());
             if (n.WiFiKey != null)
-                System.out.format("%s  WiFi Key: %s%n", indent, DatatypeConverter.printHexBinary(n.WiFiKey));
+                System.out.format("%s  WiFi Key: %s%n", indent, printHexBinary(n.WiFiKey));
             if (n.ThreadNetworkName != null)
                 System.out.format("%s  Thread Network Name: \"%s\"%n", indent, n.ThreadNetworkName);
             if (n.ThreadExtendedPANId != null)
-                System.out.format("%s  Thread Extended PAN Id: %s%n", indent, DatatypeConverter.printHexBinary(n.ThreadExtendedPANId));
+                System.out.format("%s  Thread Extended PAN Id: %s%n", indent, printHexBinary(n.ThreadExtendedPANId));
             if (n.ThreadNetworkKey != null)
-                System.out.format("%s  Thread Network Key: %s%n", indent, DatatypeConverter.printHexBinary(n.ThreadNetworkKey));
+                System.out.format("%s  Thread Network Key: %s%n", indent, printHexBinary(n.ThreadNetworkKey));
             if (n.WirelessSignalStrength != Short.MIN_VALUE)
                 System.out.format("%s  Wireless Signal Strength: %d%n", indent, n.WirelessSignalStrength);
             i++;

src/test-apps/wrapper-tests/jni/src/WeaveKeyExportClientTest.java

@@ -19,6 +19,7 @@
 import com.nestlabs.weave.security.WeaveKeyExportClient;
 import com.nestlabs.weave.security.WeaveKeyExportSupport;
 import com.nestlabs.weave.security.WeaveKeyId;
+import java.util.Base64;
 
 public class WeaveKeyExportClientTest extends SimpleTest {
 
@@ -133,7 +134,7 @@ public void testKeyExport_SHA1DeviceCert() throws Exception
             0x98, 0xc2, 0x8d, 0x9c, 0xec, 0x3e, 0xfe, 0x04, 0xb9, 0xf4, 0xa0, 0x67, 0x8b, 0x28, 0xc7, 0xa5, 
         });
 
-    private static final byte[] accessToken = javax.xml.bind.DatatypeConverter.parseBase64Binary(
+  private static final byte[] accessToken = Base64.getDecoder().decode(
             "1QAABAAJADUBMAEITi8yS0HXOtskAgQ3AyyBEERVTU1ZLUFDQ09VTlQtSUQYJgTLqPobJgVLNU9C" +
             "NwYsgRBEVU1NWS1BQ0NPVU5ULUlEGCQHAiYIJQBaIzAKOQQr2dtaYu+6sVMqD5ljt4owxYpBKaUZ" +
             "TksL837axemzNfB1GG1JXYbERCUHQbTTqe/utCrWCl2d4DWDKQEYNYIpASQCBRg1hCkBNgIEAgQB" +