firefly: address latest PR 8044 inline feedback

Signed-off-by: Shawn McKee <smckee@umich.edu>
(cherry picked from commit d0be764)
Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>

Author: ShawnMcKee

modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/XrootdTransfer.java

@@ -1,5 +1,6 @@
 package org.dcache.xrootd.door;
 
+import static com.google.common.net.InetAddresses.toUriString;
 import static java.util.Objects.requireNonNull;
 
 import diskCacheV111.util.FsPath;
@@ -107,9 +108,10 @@ private String formatAddress(InetSocketAddress address) {
             return "-";
         }
 
-        return address.getAddress() == null
+        var inetAddress = address.getAddress();
+        return inetAddress == null
               ? address.getHostString()
-              : address.getAddress().getHostAddress();
+              : toUriString(inetAddress);
     }
 
     @Override

modules/dcache/src/main/java/org/dcache/pool/classic/AbstractMoverProtocolTransferService.java

@@ -230,10 +230,9 @@ private String transferTag() {
         }
 
         private String formatError(Throwable t) {
-            String message = t.getMessage();
-            return message == null || message.isEmpty()
-                  ? t.getClass().getSimpleName()
-                  : t.getClass().getSimpleName() + ':' + message;
+            return t instanceof Exception
+                ? Exceptions.messageOrClassName((Exception) t)
+                : t.getClass().getName();
         }
 
         private synchronized void setThread() throws InterruptedException {

modules/dcache/src/main/java/org/dcache/pool/classic/DefaultPostTransferService.java

@@ -17,6 +17,7 @@
  */
 package org.dcache.pool.classic;
 
+import static com.google.common.net.InetAddresses.toUriString;
 import static org.dcache.util.Exceptions.messageOrClassName;
 
 import com.google.common.base.Throwables;
@@ -342,8 +343,9 @@ private String formatEndpoint(InetSocketAddress endpoint) {
             return "-";
         }
 
-        if (endpoint.getAddress() != null) {
-            return endpoint.getAddress().getHostAddress() + ":" + endpoint.getPort();
+        InetAddress endpointAddress = endpoint.getAddress();
+        if (endpointAddress != null) {
+            return toUriString(endpointAddress) + ":" + endpoint.getPort();
         }
 
         return endpoint.getHostString() + ":" + endpoint.getPort();

modules/dcache/src/main/java/org/dcache/pool/movers/TransferLifeCycle.java

@@ -19,6 +19,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.net.InetAddresses.forString;
+import static com.google.common.net.InetAddresses.toUriString;
 
 import com.google.common.base.Splitter;
 import com.google.common.net.HostAndPort;
@@ -447,7 +448,7 @@ private String formatAddress(InetSocketAddress address) {
         }
 
         InetAddress inetAddress = address.getAddress();
-        return inetAddress == null ? address.getHostString() : inetAddress.getHostAddress();
+        return inetAddress == null ? address.getHostString() : toUriString(inetAddress);
     }
 
     private String formatPort(InetSocketAddress address) {