From 7717ca73ac3e400931bcc6446f4038ba47519407 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 18 Jul 2016 16:19:35 +0200 Subject: [PATCH] Remove use of Guava Charsets We have StandardCharsets, use those. Change-Id: I92677e8a72cf16fc03df25226c967221959f14c5 Signed-off-by: Robert Varga --- .../yang/data/impl/codec/xml/Bug2964Test.java | 4 ++-- .../data/impl/codec/xml/XmlDocumentUtilsTest.java | 4 ++-- .../operations/retest/YangDataOperationsTest.java | 5 ++--- .../util/FilesystemSchemaSourceCacheTest.java | 8 ++++---- .../repo/util/InMemorySchemaSourceCacheTest.java | 4 ++-- .../yang/parser/util/TextToASTTransformer.java | 4 ++-- .../parser/repo/SharedSchemaRepositoryTest.java | 15 +++++++-------- 7 files changed, 21 insertions(+), 23 deletions(-) diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/Bug2964Test.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/Bug2964Test.java index 3ab0ecc038..9976f4379c 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/Bug2964Test.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/Bug2964Test.java @@ -11,12 +11,12 @@ package org.opendaylight.yangtools.yang.data.impl.codec.xml; import static org.hamcrest.CoreMatchers.instanceOf; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; -import com.google.common.base.Charsets; import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; import java.io.InputStream; import java.net.URI; +import java.nio.charset.StandardCharsets; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -64,7 +64,7 @@ public class Bug2964Test { } public static Document readXmlToDocument(final String xmlContent) throws SAXException, IOException { - return readXmlToDocument(new ByteArrayInputStream(xmlContent.getBytes(Charsets.UTF_8))); + return readXmlToDocument(new ByteArrayInputStream(xmlContent.getBytes(StandardCharsets.UTF_8))); } @Test diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlDocumentUtilsTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlDocumentUtilsTest.java index dc86f82ea7..0324bb45ae 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlDocumentUtilsTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/xml/XmlDocumentUtilsTest.java @@ -8,13 +8,13 @@ package org.opendaylight.yangtools.yang.data.impl.codec.xml; -import com.google.common.base.Charsets; import com.google.common.base.Optional; import com.google.common.collect.Lists; import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -84,7 +84,7 @@ public class XmlDocumentUtilsTest { } public static Document readXmlToDocument(final String xmlContent) throws SAXException, IOException { - return readXmlToDocument(new ByteArrayInputStream(xmlContent.getBytes(Charsets.UTF_8))); + return readXmlToDocument(new ByteArrayInputStream(xmlContent.getBytes(StandardCharsets.UTF_8))); } public static Document readXmlToDocument(final InputStream xmlContent) throws SAXException, IOException { diff --git a/yang/yang-data-operations/src/test/java/org/opendaylight/yangtools/yang/data/operations/retest/YangDataOperationsTest.java b/yang/yang-data-operations/src/test/java/org/opendaylight/yangtools/yang/data/operations/retest/YangDataOperationsTest.java index 4367c77def..e1b779f78a 100644 --- a/yang/yang-data-operations/src/test/java/org/opendaylight/yangtools/yang/data/operations/retest/YangDataOperationsTest.java +++ b/yang/yang-data-operations/src/test/java/org/opendaylight/yangtools/yang/data/operations/retest/YangDataOperationsTest.java @@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.data.operations.retest; import static org.junit.Assert.assertNull; -import com.google.common.base.Charsets; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.io.Files; @@ -21,10 +20,10 @@ import java.io.InputStream; import java.io.StringWriter; import java.net.URISyntaxException; import java.net.URL; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Collection; import java.util.Collections; - import javax.activation.UnsupportedDataTypeException; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -140,7 +139,7 @@ public class YangDataOperationsTest { return ModifyAction.MERGE; } - return ModifyAction.fromXmlValue(Files.toString(new File(resource.toURI()), Charsets.UTF_8).trim()); + return ModifyAction.fromXmlValue(Files.toString(new File(resource.toURI()), StandardCharsets.UTF_8).trim()); } private void verifyModificationResult(final Optional result, final Optional expectedResult) diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCacheTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCacheTest.java index 0c4d48cb7b..ec956dbb98 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCacheTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCacheTest.java @@ -21,7 +21,6 @@ import static org.mockito.Mockito.verify; import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; -import com.google.common.base.Charsets; import com.google.common.base.Function; import com.google.common.base.MoreObjects; import com.google.common.base.Optional; @@ -32,6 +31,7 @@ import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Collection; import java.util.List; @@ -83,8 +83,8 @@ public class FilesystemSchemaSourceCacheTest { assertThat(fileNames, both(hasItem("test2@0000-00-00")).and(hasItem("test@2012-12-12"))); - assertThat(Files.toString(storedFiles.get(0), Charsets.UTF_8), either(containsString(content)).or(containsString(content2))); - assertThat(Files.toString(storedFiles.get(1), Charsets.UTF_8), either(containsString(content)).or(containsString(content2))); + assertThat(Files.toString(storedFiles.get(0), StandardCharsets.UTF_8), either(containsString(content)).or(containsString(content2))); + assertThat(Files.toString(storedFiles.get(1), StandardCharsets.UTF_8), either(containsString(content)).or(containsString(content2))); verify(this.registry, times(2)).registerSchemaSource(any(SchemaSourceProvider.class), any(PotentialSchemaSource.class)); @@ -240,7 +240,7 @@ public class FilesystemSchemaSourceCacheTest { @Override public InputStream openStream() throws IOException { - return new ByteArrayInputStream(this.content.getBytes(Charsets.UTF_8)); + return new ByteArrayInputStream(this.content.getBytes(StandardCharsets.UTF_8)); } } } diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/InMemorySchemaSourceCacheTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/InMemorySchemaSourceCacheTest.java index 14d5e2ffce..597d16017c 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/InMemorySchemaSourceCacheTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/InMemorySchemaSourceCacheTest.java @@ -10,13 +10,13 @@ package org.opendaylight.yangtools.yang.model.repo.util; import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; -import com.google.common.base.Charsets; import com.google.common.base.MoreObjects; import com.google.common.base.Optional; import com.google.common.util.concurrent.CheckedFuture; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import org.junit.Assert; @@ -143,7 +143,7 @@ public class InMemorySchemaSourceCacheTest { @Override public InputStream openStream() throws IOException { - return new ByteArrayInputStream(this.content.getBytes(Charsets.UTF_8)); + return new ByteArrayInputStream(this.content.getBytes(StandardCharsets.UTF_8)); } } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TextToASTTransformer.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TextToASTTransformer.java index aed627fd54..25b5b9d1e5 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TextToASTTransformer.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/TextToASTTransformer.java @@ -9,11 +9,11 @@ package org.opendaylight.yangtools.yang.parser.util; import com.google.common.annotations.Beta; -import com.google.common.base.Charsets; import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.Futures; import java.io.IOException; import java.io.InputStream; +import java.nio.charset.StandardCharsets; import org.antlr.v4.runtime.ParserRuleContext; import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; import org.opendaylight.yangtools.yang.model.repo.api.SchemaRepository; @@ -42,7 +42,7 @@ public final class TextToASTTransformer extends SchemaSourceTransformer cache = new FilesystemSchemaSourceCache<>(sharedSchemaRepository, YangTextSchemaSource.class, storageDir); @@ -279,7 +278,7 @@ public class SharedSchemaRepositoryTest { @Override public InputStream openStream() throws IOException { - return new ByteArrayInputStream("running".getBytes(Charsets.UTF_8)); + return new ByteArrayInputStream("running".getBytes(StandardCharsets.UTF_8)); } }); } -- 2.36.6