From: Robert Varga Date: Tue, 21 Sep 2021 20:10:37 +0000 (+0200) Subject: Use URLEncoder.encode(String, Charset) X-Git-Tag: v4.0.4~13 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=02215a58e5c9ebe4624e6ca2103b00a796fcd5f7 Use URLEncoder.encode(String, Charset) We are running with Java 11 and as Modernizer correctly points out, we can use direct charset variant which was introduced with Java 10. This cuts down a tiny bit of dead code. Change-Id: I7c42984bc1e05e94f5266f26e13aaab650ae4f70 Signed-off-by: Robert Varga --- diff --git a/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml b/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml index a1dc7b2793..94793f6e26 100644 --- a/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml +++ b/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml @@ -19,11 +19,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html sal-akka-segmented-journal bundle - - - false - - diff --git a/opendaylight/md-sal/sal-akka-segmented-journal/src/main/java/org/opendaylight/controller/akka/segjournal/SegmentedFileJournal.java b/opendaylight/md-sal/sal-akka-segmented-journal/src/main/java/org/opendaylight/controller/akka/segjournal/SegmentedFileJournal.java index ac59c8fb41..8efb2db3ab 100644 --- a/opendaylight/md-sal/sal-akka-segmented-journal/src/main/java/org/opendaylight/controller/akka/segjournal/SegmentedFileJournal.java +++ b/opendaylight/md-sal/sal-akka-segmented-journal/src/main/java/org/opendaylight/controller/akka/segjournal/SegmentedFileJournal.java @@ -21,7 +21,6 @@ import com.typesafe.config.ConfigMemorySize; import io.atomix.storage.StorageLevel; import io.atomix.storage.journal.SegmentedJournal; import java.io.File; -import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -117,7 +116,7 @@ public class SegmentedFileJournal extends AsyncWriteJournal { } private ActorRef createHandler(final String persistenceId) { - final String directoryName = encode(persistenceId); + final String directoryName = URLEncoder.encode(persistenceId, StandardCharsets.UTF_8); final File directory = new File(rootDir, directoryName); LOG.debug("Creating handler for {} in directory {}", persistenceId, directory); @@ -142,16 +141,6 @@ public class SegmentedFileJournal extends AsyncWriteJournal { return message.promise.future(); } - private static String encode(final String str) { - try { - return URLEncoder.encode(str, StandardCharsets.UTF_8.name()); - } catch (UnsupportedEncodingException e) { - // Shouldn't happen - LOG.warn("Error encoding {}", str, e); - return str; - } - } - private static int getBytes(final Config config, final String path, final int defaultValue) { if (!config.hasPath(path)) { return defaultValue; diff --git a/opendaylight/md-sal/sal-clustering-commons/pom.xml b/opendaylight/md-sal/sal-clustering-commons/pom.xml index 9959edf2af..b465fccc86 100644 --- a/opendaylight/md-sal/sal-clustering-commons/pom.xml +++ b/opendaylight/md-sal/sal-clustering-commons/pom.xml @@ -11,11 +11,6 @@ sal-clustering-commons bundle - - - false - - diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/persistence/LocalSnapshotStore.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/persistence/LocalSnapshotStore.java index 695f34ecee..b63b732f5b 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/persistence/LocalSnapshotStore.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/persistence/LocalSnapshotStore.java @@ -28,7 +28,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; @@ -70,7 +69,7 @@ public class LocalSnapshotStore extends SnapshotStore { private final File snapshotDir; public LocalSnapshotStore(final Config config) { - this.executionContext = context().system().dispatchers().lookup(config.getString("stream-dispatcher")); + executionContext = context().system().dispatchers().lookup(config.getString("stream-dispatcher")); snapshotDir = new File(config.getString("dir")); final int localMaxLoadAttempts = config.getInt("max-load-attempts"); @@ -331,23 +330,11 @@ public class LocalSnapshotStore extends SnapshotStore { } private static String encode(final String str) { - try { - return URLEncoder.encode(str, StandardCharsets.UTF_8.name()); - } catch (UnsupportedEncodingException e) { - // Shouldn't happen - LOG.warn("Error encoding {}", str, e); - return str; - } + return URLEncoder.encode(str, StandardCharsets.UTF_8); } private static String decode(final String str) { - try { - return URLDecoder.decode(str, StandardCharsets.UTF_8.name()); - } catch (final UnsupportedEncodingException e) { - // Shouldn't happen - LOG.warn("Error decoding {}", str, e); - return str; - } + return URLDecoder.decode(str, StandardCharsets.UTF_8); } @VisibleForTesting diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/persistence/LocalSnapshotStoreTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/persistence/LocalSnapshotStoreTest.java index 8531501fa2..d45042567d 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/persistence/LocalSnapshotStoreTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/persistence/LocalSnapshotStoreTest.java @@ -32,7 +32,6 @@ import com.typesafe.config.ConfigFactory; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import org.apache.commons.io.FileUtils; @@ -196,9 +195,7 @@ public class LocalSnapshotStoreTest { } } - private static String toSnapshotName(final String persistenceId, final int seqNr, final int timestamp) - throws UnsupportedEncodingException { - final String encodedPersistenceId = URLEncoder.encode(persistenceId, StandardCharsets.UTF_8.name()); - return "snapshot-" + encodedPersistenceId + "-" + seqNr + "-" + timestamp; + private static String toSnapshotName(final String persistenceId, final int seqNr, final int timestamp) { + return "snapshot-" + URLEncoder.encode(persistenceId, StandardCharsets.UTF_8) + "-" + seqNr + "-" + timestamp; } }