Use UTF-8 to format output

jline seems to pick a different charset with JDK17, make sure we use
UTF-8.

Change-Id: Id8a2bf9fa22f67a8d387bf16c93af28fc474e9cc
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 099bf0ff37492930999dafd92903d27bd383cbe2)

diff --git a/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/GlobalStateCliUtils.java b/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/GlobalStateCliUtils.java
index 2bdb8c0eb0f520b364563b333d10bcf88b19f593..e1c55955ac62ab6c3202dfc719683e05d3239a31 100644 (file)
--- a/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/GlobalStateCliUtils.java
+++ b/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/GlobalStateCliUtils.java
@@ -10,6 +10,7 @@ package org.opendaylight.protocol.bgp.cli.utils;
 import static org.opendaylight.protocol.bgp.cli.utils.NeighborStateCliUtils.addHeader;
 
 import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
 import org.apache.karaf.shell.support.table.ShellTable;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.multiprotocol.rev151009.bgp.common.afi.safi.list.AfiSafi;
@@ -37,7 +38,7 @@ final class GlobalStateCliUtils {
         table.addRow().addContent("Total Paths", globalState.getTotalPaths());
         table.addRow().addContent("Total Prefixes", globalState.getTotalPrefixes());
         global.getAfiSafis().nonnullAfiSafi().values().forEach(afiSafi -> displayAfiSafi(afiSafi, table));
-        table.print(stream);
+        table.print(stream, StandardCharsets.UTF_8, true);
     }
 
     private static void displayAfiSafi(final AfiSafi afiSafi, final ShellTable table) {

diff --git a/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/NeighborStateCliUtils.java b/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/NeighborStateCliUtils.java
index a1cd0c60145d8f691c4d57a86883df83177641c9..df1aefc4c7fa3f0c8d6f7bddf03543083a7de7ee 100644 (file)
--- a/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/NeighborStateCliUtils.java
+++ b/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/NeighborStateCliUtils.java
@@ -8,6 +8,7 @@
 package org.opendaylight.protocol.bgp.cli.utils;
 
 import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.List;
 import org.apache.karaf.shell.support.table.ShellTable;
@@ -59,7 +60,7 @@ final class NeighborStateCliUtils {
         printMessagesState(neighborState, table);
         printAfiSafisState(neighbor.getAfiSafis().nonnullAfiSafi().values(), table);
 
-        table.print(stream);
+        table.print(stream, StandardCharsets.UTF_8, true);
     }
 
     private static void printCapabilitiesState(final List<Class<? extends BgpCapability>> supportedCapabilities,

diff --git a/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/PeerGroupStateCliUtils.java b/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/PeerGroupStateCliUtils.java
index 7c06b8b44bfaef905f89a24fbcadad09d3e76479..0b4e998c7e399e3c6458cecc6443d485cd4db287 100644 (file)
--- a/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/PeerGroupStateCliUtils.java
+++ b/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/PeerGroupStateCliUtils.java
@@ -10,6 +10,7 @@ package org.opendaylight.protocol.bgp.cli.utils;
 import static org.opendaylight.protocol.bgp.cli.utils.NeighborStateCliUtils.addHeader;
 
 import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import org.apache.karaf.shell.support.table.ShellTable;
 import org.eclipse.jdt.annotation.NonNull;
@@ -30,7 +31,7 @@ final class PeerGroupStateCliUtils {
         table.column("Value").alignLeft();
 
         peerGroupList.forEach(group -> displayState(group, table));
-        table.print(stream);
+        table.print(stream, StandardCharsets.UTF_8, true);
     }
 
     private static void displayState(final PeerGroup group, final ShellTable table) {

diff --git a/pcep/topology/cli/src/main/java/org/opendaylight/protocol/pcep/cli/utils/PcepStateUtils.java b/pcep/topology/cli/src/main/java/org/opendaylight/protocol/pcep/cli/utils/PcepStateUtils.java
index 39694328c011f0af26d61081a620a01a4f16ede4..b4665a84b120d2cdae9aea591f61b7d22c766f77 100644 (file)
--- a/pcep/topology/cli/src/main/java/org/opendaylight/protocol/pcep/cli/utils/PcepStateUtils.java
+++ b/pcep/topology/cli/src/main/java/org/opendaylight/protocol/pcep/cli/utils/PcepStateUtils.java
@@ -8,6 +8,7 @@
 package org.opendaylight.protocol.pcep.cli.utils;
 
 import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.concurrent.ExecutionException;
 import org.apache.karaf.shell.support.table.ShellTable;
@@ -109,7 +110,7 @@ public final class PcepStateUtils {
         final ReplyTime reply = messages.getReplyTime();
         showReplyMessages(table, reply);
 
-        table.print(stream);
+        table.print(stream, StandardCharsets.UTF_8, true);
     }
 
     private static void showNodeState(final ShellTable table, final String topologyId, final String nodeId,