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>
import static org.junit.Assert.assertEquals;
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;
import com.google.gson.JsonElement;
import com.google.gson.JsonIOException;
import com.google.gson.JsonParser;
import java.io.Writer;
import java.net.URI;
import java.net.URISyntaxException;
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;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
}
private static ContainerNode createRootNode() {
}
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();
}
return ImmutableContainerNodeBuilder.create().withNodeIdentifier(new NodeIdentifier(ROOT_QNAME))
.withChild(ipAddress).build();
}
import static java.util.Objects.requireNonNull;
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.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;
import java.util.Optional;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
Object value = ipAdress.getValue();
assertTrue(value instanceof byte[]);
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);
DOMResult serializationResult = writeNormalizedNode(docNode, schemaContext);
assertNotNull(serializationResult);
}
private static ContainerNode createDocNode() {
}
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)
ContainerNode root = ImmutableContainerNodeBuilder.create().withNodeIdentifier(new NodeIdentifier(ROOT_QNAME))
.withChild(ipAddress).build();
return ImmutableContainerNodeBuilder.create().withNodeIdentifier(new NodeIdentifier(ROOT_QNAME)).withChild(root)
import static java.util.Objects.requireNonNull;
import com.google.common.annotations.Beta;
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;
import java.util.Optional;
import javax.xml.bind.DatatypeConverter;
import org.opendaylight.yangtools.yang.data.api.codec.BinaryCodec;
@Override
public String serialize(final byte[] data) {
@Override
public String serialize(final byte[] data) {
- return data == null ? "" : BaseEncoding.base64().encode(data);
+ return data == null ? "" : Base64.getEncoder().encodeToString(data);
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
* 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;
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;
import java.util.Objects;
import java.util.Optional;
import org.opendaylight.yangtools.yang.data.api.codec.UnionCodec;
@Override
public String serialize(final Object data) {
if (data instanceof byte[]) {
@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, "");
}
}
return Objects.toString(data, "");
}
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
* 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;
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;
import org.junit.Test;
import org.opendaylight.yangtools.yang.data.api.codec.BinaryCodec;
import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
public void testSerialize() {
BinaryCodec<String> codec = getCodec(BaseTypes.binaryType(), BinaryCodec.class);
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));
}
codec.serialize(new byte[] { 1, 2, 3, 4 }));
assertEquals("serialize", "", codec.serialize(null));
}
BinaryCodec<String> codec = getCodec(BaseTypes.binaryType(), BinaryCodec.class);
assertArrayEquals("deserialize", new byte[] {1, 2, 3, 4 },
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));
}
}
assertEquals("deserialize", null, codec.deserialize(null));
}
}
import com.google.common.base.Verify;
import com.google.common.collect.Iterators;
import com.google.common.collect.UnmodifiableIterator;
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;
import java.util.Iterator;
import java.util.Map.Entry;
import java.util.NoSuchElementException;
// allocations.
if (value instanceof byte[]) {
// Binary
// allocations.
if (value instanceof byte[]) {
// Binary
- return BaseEncoding.base64().encode((byte[]) value);
+ return Base64.getEncoder().encodeToString((byte[]) value);
}
if (value instanceof Set) {
// Bits
}
if (value instanceof Set) {
// Bits