Remove jaxb-api dependency 53/94253/3
authorRobert Varga <robert.varga@pantheon.tech>
Tue, 15 Dec 2020 19:00:20 +0000 (20:00 +0100)
committerRobert Varga <robert.varga@pantheon.tech>
Tue, 15 Dec 2020 19:10:08 +0000 (20:10 +0100)
We need just a simple java.util.Base64 encoder, not the entire API.

Change-Id: I3ff7388bbf8f2cb3bf97c6141bb182483027578c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/LibraryModulesSchemas.java

index a8616b535a7f44799f540db299e887adc8b9782b..2f6786066478bbc975d9c6693ff7527df159ceec 100644 (file)
@@ -10,7 +10,6 @@ package org.opendaylight.netconf.sal.connect.netconf;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static java.util.Objects.requireNonNull;
-import static javax.xml.bind.DatatypeConverter.printBase64Binary;
 import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_DATA_NODEID;
 import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_GET_NODEID;
 import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_GET_QNAME;
@@ -30,6 +29,7 @@ import java.net.URLConnection;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.AbstractMap.SimpleImmutableEntry;
+import java.util.Base64;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -144,9 +144,8 @@ public final class LibraryModulesSchemas implements NetconfDeviceSchemas {
             if (connection instanceof HttpURLConnection) {
                 connection.setRequestProperty("Accept", "application/xml");
                 final String userpass = username + ":" + password;
-                final String basicAuth = "Basic " + printBase64Binary(userpass.getBytes(StandardCharsets.UTF_8));
-
-                connection.setRequestProperty("Authorization", basicAuth);
+                connection.setRequestProperty("Authorization",
+                    "Basic " + Base64.getEncoder().encodeToString(userpass.getBytes(StandardCharsets.UTF_8)));
             }
 
             return createFromURLConnection(connection);