Switch to using java.util.Base64

This follows modernizer recommendation of using java.util.Base64
instead of Guava's BaseEncoding.

Change-Id: I72a49503980fb615ce27d2e3d0a84cbb1b033236
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug5446Test.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug5446Test.java
index c18324d01882a8a9a7f3697151ee6ad828bb537c..45d50e54c3c884bb209d2d978c00dae22656975d 100644 (file)
--- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug5446Test.java
+++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug5446Test.java
@@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.data.codec.gson;
 
 import static org.junit.Assert.assertEquals;
 
-import com.google.common.io.BaseEncoding;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonIOException;
 import com.google.gson.JsonParser;
@@ -21,6 +20,7 @@ import java.io.StringWriter;
 import java.io.Writer;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.Base64;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -87,8 +87,7 @@ public class Bug5446Test {
     }
 
     private static ContainerNode createRootNode() {
-        LeafNode<byte[]> ipAddress = ImmutableNodes.leafNode(IP_ADDRESS_QNAME,
-            BaseEncoding.base64().decode("fwAAAQ=="));
+        LeafNode<byte[]> ipAddress = ImmutableNodes.leafNode(IP_ADDRESS_QNAME, Base64.getDecoder().decode("fwAAAQ=="));
         return ImmutableContainerNodeBuilder.create().withNodeIdentifier(new NodeIdentifier(ROOT_QNAME))
                 .withChild(ipAddress).build();
     }

diff --git a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug5446Test.java b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug5446Test.java
index 3fe82d80cdbc1aeac47968aae13565bef178cdb1..f9f396ca676f6c33efdd58ff877116a0a1cb5f38 100644 (file)
--- a/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug5446Test.java
+++ b/yang/yang-data-codec-xml/src/test/java/org/opendaylight/yangtools/yang/data/codec/xml/Bug5446Test.java
@@ -9,11 +9,11 @@ package org.opendaylight.yangtools.yang.data.codec.xml;
 
 import static java.util.Objects.requireNonNull;
 
-import com.google.common.io.BaseEncoding;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringWriter;
 import java.net.URI;
+import java.util.Base64;
 import java.util.Optional;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
@@ -70,7 +70,7 @@ public class Bug5446Test extends XMLTestCase {
 
         Object value = ipAdress.getValue();
         assertTrue(value instanceof byte[]);
-        assertEquals("fwAAAQ==", BaseEncoding.base64().encode((byte[]) value));
+        assertEquals("fwAAAQ==", Base64.getEncoder().encodeToString((byte[]) value));
 
         DOMResult serializationResult = writeNormalizedNode(docNode, schemaContext);
         assertNotNull(serializationResult);
@@ -87,8 +87,7 @@ public class Bug5446Test extends XMLTestCase {
     }
 
     private static ContainerNode createDocNode() {
-        LeafNode<byte[]> ipAddress = ImmutableNodes.leafNode(IP_ADDRESS_QNAME, BaseEncoding.base64()
-                .decode("fwAAAQ=="));
+        LeafNode<byte[]> ipAddress = ImmutableNodes.leafNode(IP_ADDRESS_QNAME, Base64.getDecoder().decode("fwAAAQ=="));
         ContainerNode root = ImmutableContainerNodeBuilder.create().withNodeIdentifier(new NodeIdentifier(ROOT_QNAME))
                 .withChild(ipAddress).build();
         return ImmutableContainerNodeBuilder.create().withNodeIdentifier(new NodeIdentifier(ROOT_QNAME)).withChild(root)

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/BinaryStringCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/BinaryStringCodec.java
index 912283c2eed03c2873023d07bc0273d794cfbf31..69881ef44fc30e2efcbf465aeb6095884ca72530 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/BinaryStringCodec.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/BinaryStringCodec.java
@@ -11,7 +11,7 @@ import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.annotations.Beta;
-import com.google.common.io.BaseEncoding;
+import java.util.Base64;
 import java.util.Optional;
 import javax.xml.bind.DatatypeConverter;
 import org.opendaylight.yangtools.yang.data.api.codec.BinaryCodec;
@@ -62,7 +62,7 @@ public abstract class BinaryStringCodec extends TypeDefinitionAwareCodec<byte[],
 
     @Override
     public String serialize(final byte[] data) {
-        return data == null ? "" : BaseEncoding.base64().encode(data);
+        return data == null ? "" : Base64.getEncoder().encodeToString(data);
     }
 
     @Override

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/UnionStringCodec.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/UnionStringCodec.java
index 7381992777980f08803cfa903a86897fc398bc13..74b708486e2eede108075370cb9179ca8899e569 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/UnionStringCodec.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/codec/UnionStringCodec.java
@@ -5,10 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.yangtools.yang.data.impl.codec;
 
-import com.google.common.io.BaseEncoding;
+import java.util.Base64;
 import java.util.Objects;
 import java.util.Optional;
 import org.opendaylight.yangtools.yang.data.api.codec.UnionCodec;
@@ -33,7 +32,7 @@ final class UnionStringCodec extends TypeDefinitionAwareCodec<Object, UnionTypeD
     @Override
     public String serialize(final Object data) {
         if (data instanceof byte[]) {
-            return BaseEncoding.base64().encode((byte[]) data);
+            return Base64.getEncoder().encodeToString((byte[]) data);
         }
         return Objects.toString(data, "");
     }

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/BinaryCodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/BinaryCodecStringTest.java
index 2695196159da031b0227f6cd0d744c84accd2d62..0cee1285f3099e69c174e668008a276ed53ec424 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/BinaryCodecStringTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/BinaryCodecStringTest.java
@@ -5,14 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.yangtools.yang.data.impl.codecs;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.opendaylight.yangtools.yang.data.impl.codecs.TypeDefinitionAwareCodecTestHelper.getCodec;
 
-import com.google.common.io.BaseEncoding;
+import java.util.Base64;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.data.api.codec.BinaryCodec;
 import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
@@ -29,7 +28,7 @@ public class BinaryCodecStringTest {
     public void testSerialize() {
         BinaryCodec<String> codec = getCodec(BaseTypes.binaryType(), BinaryCodec.class);
 
-        assertEquals("serialize", BaseEncoding.base64().encode(new byte[] { 1, 2, 3, 4 }),
+        assertEquals("serialize", Base64.getEncoder().encodeToString(new byte[] { 1, 2, 3, 4 }),
                       codec.serialize(new byte[] { 1, 2, 3, 4 }));
         assertEquals("serialize", "", codec.serialize(null));
     }
@@ -40,7 +39,7 @@ public class BinaryCodecStringTest {
         BinaryCodec<String> codec = getCodec(BaseTypes.binaryType(), BinaryCodec.class);
 
         assertArrayEquals("deserialize", new byte[] {1, 2, 3, 4 },
-                      codec.deserialize(BaseEncoding.base64().encode(new byte[] { 1, 2, 3, 4 })));
+                      codec.deserialize(Base64.getEncoder().encodeToString(new byte[] { 1, 2, 3, 4 })));
         assertEquals("deserialize", null, codec.deserialize(null));
     }
 }

diff --git a/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/NormalizedNodeNavigator.java b/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/NormalizedNodeNavigator.java
index 96fa50bd75dbd872c210bf7d82891ec4fc4faaa1..e28e56475dbe0e7d238ce9fa5ad1e151515a871b 100644 (file)
--- a/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/NormalizedNodeNavigator.java
+++ b/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/NormalizedNodeNavigator.java
@@ -13,7 +13,7 @@ import com.google.common.base.Joiner;
 import com.google.common.base.Verify;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.UnmodifiableIterator;
-import com.google.common.io.BaseEncoding;
+import java.util.Base64;
 import java.util.Iterator;
 import java.util.Map.Entry;
 import java.util.NoSuchElementException;
@@ -165,7 +165,7 @@ final class NormalizedNodeNavigator extends DefaultNavigator implements NamedAcc
             //       allocations.
             if (value instanceof byte[]) {
                 // Binary
-                return BaseEncoding.base64().encode((byte[]) value);
+                return Base64.getEncoder().encodeToString((byte[]) value);
             }
             if (value instanceof Set) {
                 // Bits