PVA: Show 'echo12' sent and received

Author: kasemir

core/pva/src/main/java/org/epics/pva/client/EchoHandler.java

@@ -20,7 +20,6 @@
 /** Handle a server's ECHO reply
  *  @author Kay Kasemir
  */
-@SuppressWarnings("nls")
 class EchoHandler implements CommandHandler<ClientTCPHandler>
 {
     @Override
@@ -39,10 +38,10 @@ public void handleCommand(final ClientTCPHandler tcp, final ByteBuffer buffer) t
             buffer.get(payload);
             final String expected = tcp.getActiveEchoRequest();
             if (Arrays.equals(payload, expected.getBytes()))
-                logger.log(Level.FINE, () -> "Received ECHO:\n" + Hexdump.toHexdump(payload));
+                logger.log(Level.FINE, () -> "Received ECHO '" + expected + "'");
             else
             {
-                logger.log(Level.WARNING, this + " received invalid echo reply, expected " + expected + ":\n" +
+                logger.log(Level.WARNING, this + " received invalid echo reply, expected '" + expected + "':\n" +
                                           Hexdump.toHexdump(payload));
                 return;
             }

core/pva/src/main/java/org/epics/pva/client/EchoRequest.java

@@ -19,7 +19,6 @@
 /** Send a 'ECHO' request to server
  *  @author Kay Kasemir
  */
-@SuppressWarnings("nls")
 class EchoRequest implements RequestEncoder
 {
     // Random number so replies don't all start with 'echo00'
@@ -40,7 +39,7 @@ public void encodeRequest(final byte version, final ByteBuffer buffer) throws Ex
             final int count = counter.incrementAndGet();
             active_check = String.format("echo%02d",  count % 100);
             final byte[] check = active_check.getBytes();
-            logger.log(Level.FINE, () -> "Sending ECHO request (Version " + version + ")");
+            logger.log(Level.FINE, () -> "Sending ECHO request (Version " + version + " '" + active_check + "')");
             PVAHeader.encodeMessageHeader(buffer, PVAHeader.FLAG_NONE, PVAHeader.CMD_ECHO, check.length);
             buffer.put(check);
         }