From 9e33a7dc7549a4f95cf15444bc0e509a0d8fae16 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 18 Jul 2016 16:23:03 +0200 Subject: [PATCH] Use StandardCharsets instead of Guava Use of Guava's Charsets for recent Java versions is deprecated. Change-Id: Iefdaca294dbbcfbcd0a9b97074dd4612f348cfa7 Signed-off-by: Robert Varga --- .../opendaylight/ovsdb/lib/jsonrpc/JsonRpcDecoderTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/library/impl/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcDecoderTest.java b/library/impl/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcDecoderTest.java index 48c58e62f..64f439f7f 100644 --- a/library/impl/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcDecoderTest.java +++ b/library/impl/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcDecoderTest.java @@ -10,12 +10,12 @@ package org.opendaylight.ovsdb.lib.jsonrpc; import static io.netty.buffer.Unpooled.copiedBuffer; import static org.junit.Assert.assertEquals; -import com.google.common.base.Charsets; import com.google.common.io.Resources; import io.netty.channel.embedded.EmbeddedChannel; import io.netty.handler.codec.DecoderException; import io.netty.util.CharsetUtil; import java.net.URL; +import java.nio.charset.StandardCharsets; import org.junit.Before; import org.junit.Test; @@ -37,9 +37,9 @@ public class JsonRpcDecoderTest { ch = new EmbeddedChannel(decoder); URL testJsonUrl = Resources.getResource(JsonRpcDecoderTest.class, "test.json"); - testJson = Resources.toString(testJsonUrl, Charsets.UTF_8); + testJson = Resources.toString(testJsonUrl, StandardCharsets.UTF_8); URL prettyTestJsoUrl = Resources.getResource(JsonRpcDecoderTest.class, "pretty-test.json"); - prettyTestJson = Resources.toString(prettyTestJsoUrl, Charsets.UTF_8); + prettyTestJson = Resources.toString(prettyTestJsoUrl, StandardCharsets.UTF_8); } /** -- 2.36.6