From 4341380ed1b5be89720e399bad9aecfb191fb05f Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 6 Aug 2019 12:43:54 +0200 Subject: [PATCH] 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 --- .../yangtools/yang/data/codec/gson/Bug5446Test.java | 5 ++--- .../yangtools/yang/data/codec/xml/Bug5446Test.java | 7 +++---- .../yangtools/yang/data/impl/codec/BinaryStringCodec.java | 4 ++-- .../yangtools/yang/data/impl/codec/UnionStringCodec.java | 5 ++--- .../yang/data/impl/codecs/BinaryCodecStringTest.java | 7 +++---- .../yangtools/yang/data/jaxen/NormalizedNodeNavigator.java | 4 ++-- 6 files changed, 14 insertions(+), 18 deletions(-) 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 c18324d018..45d50e54c3 100644 --- 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 ipAddress = ImmutableNodes.leafNode(IP_ADDRESS_QNAME, - BaseEncoding.base64().decode("fwAAAQ==")); + LeafNode 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 3fe82d80cd..f9f396ca67 100644 --- 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 ipAddress = ImmutableNodes.leafNode(IP_ADDRESS_QNAME, BaseEncoding.base64() - .decode("fwAAAQ==")); + LeafNode 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 912283c2ee..69881ef44f 100644 --- 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 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 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 96fa50bd75..e28e56475d 100644 --- 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 -- 2.36.6