From: Vladyslav Marchenko Date: Fri, 23 Oct 2020 10:02:48 +0000 (+0300) Subject: Fixes from modernizer maven plugin in rfc8040 module X-Git-Tag: v1.13.0~66 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=c1c44ca68a57780ecb530da3345450998e2bffc2;p=netconf.git Fixes from modernizer maven plugin in rfc8040 module Remove some legacy APIs Change-Id: I689190caf9be2357b2ffb2d2197783ebaba694d9 Signed-off-by: Vladyslav Marchenko --- diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapper.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapper.java index a9a640e24c..b5d713f5ec 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapper.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/errors/RestconfDocumentedExceptionMapper.java @@ -14,7 +14,6 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; -import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.LinkedHashSet; @@ -217,11 +216,7 @@ public final class RestconfDocumentedExceptionMapper implements ExceptionMapper< } catch (IOException e) { throw new IllegalStateException("Cannot write error response body", e); } - try { - return outputStream.toString(StandardCharsets.UTF_8.name()); - } catch (UnsupportedEncodingException e) { - throw new IllegalStateException("Output stream cannot be converted to string representation", e); - } + return outputStream.toString(StandardCharsets.UTF_8); } /** diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040Impl.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040Impl.java index cf6752f5ba..3470c593f6 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040Impl.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/JSONRestconfServiceRfc8040Impl.java @@ -234,7 +234,7 @@ public final class JSONRestconfServiceRfc8040Impl implements JSONRestconfService final ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); writer.writeTo(patchStatusContext, PatchStatusContext.class, null, EMPTY_ANNOTATIONS, MediaType.APPLICATION_JSON_TYPE, null, outputStream); - return outputStream.toString(StandardCharsets.UTF_8.name()); + return outputStream.toString(StandardCharsets.UTF_8); } private static String toJson(final NormalizedNodeContext readData) throws IOException { @@ -242,7 +242,7 @@ public final class JSONRestconfServiceRfc8040Impl implements JSONRestconfService final ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); writer.writeTo(readData, NormalizedNodeContext.class, null, EMPTY_ANNOTATIONS, MediaType.APPLICATION_JSON_TYPE, null, outputStream); - return outputStream.toString(StandardCharsets.UTF_8.name()); + return outputStream.toString(StandardCharsets.UTF_8); } private static boolean isDataMissing(final Exception exception) { diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestUtils.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestUtils.java index 86ba28be75..c950aa1166 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestUtils.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestUtils.java @@ -189,7 +189,7 @@ public final class TestUtils { } public static String loadTextFile(final String filePath) throws IOException { - final FileReader fileReader = new FileReader(filePath); + final FileReader fileReader = new FileReader(filePath, StandardCharsets.UTF_8); final BufferedReader bufReader = new BufferedReader(fileReader); String line = null; diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtilTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtilTest.java index edd27c49c6..dde3ec98f7 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtilTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtilTest.java @@ -94,7 +94,7 @@ public class CreateStreamUtilTest { Builders.containerBuilder(rpcInputSchemaNode); final QName lfQName = QName.create(rpcModule.getQNameModule(), inputOutputName); - final DataSchemaNode lfSchemaNode = rpcInputSchemaNode.getDataChildByName(lfQName); + final DataSchemaNode lfSchemaNode = rpcInputSchemaNode.findDataChildByName(lfQName).orElseThrow(); assertTrue(lfSchemaNode instanceof LeafSchemaNode); diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtilTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtilTest.java index 0e251c8124..6a96617ee9 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtilTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtilTest.java @@ -21,6 +21,7 @@ import static org.opendaylight.yangtools.util.concurrent.FluentFutures.immediate import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.util.Collection; import java.util.Optional; import javax.ws.rs.core.Response; @@ -195,7 +196,7 @@ public class PostDataTransactionUtilTest { Response response = PostDataTransactionUtil.postData(this.uriInfo, payload, new MdsalRestconfStrategy(transactionChainHandler), this.schema, null, null); assertEquals(201, response.getStatus()); - assertThat(URLDecoder.decode(response.getLocation().toString(), "UTF-8"), + assertThat(URLDecoder.decode(response.getLocation().toString(), StandardCharsets.UTF_8), containsString(identifier.getValue(identifier.keySet().iterator().next()).toString())); verify(this.readWrite).exists(LogicalDatastoreType.CONFIGURATION, node); verify(this.readWrite).put(LogicalDatastoreType.CONFIGURATION, node, data.getValue().iterator().next()); @@ -203,7 +204,7 @@ public class PostDataTransactionUtilTest { response = PostDataTransactionUtil.postData(this.uriInfo, payload, new NetconfRestconfStrategy(netconfService), this.schema, null, null); assertEquals(201, response.getStatus()); - assertThat(URLDecoder.decode(response.getLocation().toString(), "UTF-8"), + assertThat(URLDecoder.decode(response.getLocation().toString(), StandardCharsets.UTF_8), containsString(identifier.getValue(identifier.keySet().iterator().next()).toString())); verify(this.netconfService).getConfig(node); verify(this.netconfService).create(LogicalDatastoreType.CONFIGURATION, node, data.getValue().iterator().next(),