From f51fcde6db53e1be8c553ca43f23f30e1e373774 Mon Sep 17 00:00:00 2001
From: Lea Morschel <lea.morschel@desy.de>
Date: Fri, 23 Feb 2024 16:48:27 +0100
Subject: [PATCH] bulk: fix divergent command params format strings

Motivation:
Some of the format strings that manage the formatting of command results sent to the user expect a different number of parameters than provided.

Modification:
Pass as many arguments as expected to the format frings.
Simplify some expressions.

Result:
The returned bulk info strings return all expected values.

Target: master, 9.2
Requires-notes: no
Requires-book: no
Acked-by: Tigran Mkrtchyan
---
 .../dcache/services/bulk/BulkServiceCommands.java   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/BulkServiceCommands.java b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/BulkServiceCommands.java
index 15e05239ba3..e3441048693 100644
--- a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/BulkServiceCommands.java
+++ b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/BulkServiceCommands.java
@@ -183,7 +183,7 @@ public final class BulkServiceCommands implements CellCommandListener {
     /**
      * name | class | type | permits
      */
-    private static final String FORMAT_ACTIVITY = "%-20s | %100s | %7s";
+    private static final String FORMAT_ACTIVITY = "%-20s | %100s | %7s | %10s";
 
     /**
      * name | required | description
@@ -328,7 +328,7 @@ private static String formatRequest(BulkRequest request,
             subject = Optional.empty();
         }
 
-        String user = subject.isPresent() ? BulkRequestStore.uidGidKey(subject.get()) : "?";
+        String user = subject.map(BulkRequestStore::uidGidKey).orElse("?");
 
         long arrivalTime = 0L;
         long modifiedTime = 0L;
@@ -807,7 +807,7 @@ public String call() throws Exception {
             configureFilters();
             List<String> uids = requestUids();
             StringBuilder requests = new StringBuilder();
-            uids.stream().forEach(id -> requests.append("\t").append(id).append("\n"));
+            uids.forEach(id -> requests.append("\t").append(id).append("\n"));
 
             for (String id : uids) {
                 try {
@@ -844,7 +844,7 @@ public String call() throws Exception {
             List<String> targetPaths = List.of(path);
             requestManager.cancelTargets(rid, targetPaths);
             return "Request " + rid + ", cancelled: \n"
-                  + targetPaths.stream().collect(Collectors.joining("\n"));
+                  + String.join("\n", targetPaths);
         }
     }
 
@@ -989,9 +989,8 @@ public PagedRequestResult call() throws Exception {
                 case FULL:
                     partialResult =
                           String.format(FORMAT_REQUEST_FULL, "ID", "ARRIVED", "STARTED",
-                                "MODIFIED", "OWNER", "ACTIVITY", "DEPTH", "STATUS", "PRESTORE",
-                                "URL PREF",
-                                "UID") + "\n" + requests;
+                                "MODIFIED", "OWNER", "ACTIVITY", "DEPTH", "STATUS",
+                                "URL PREF", "UID") + "\n" + requests;
                     break;
                 case TARGET:
                     partialResult = String.format(FORMAT_REQUEST_TARGET, "URL PREF", "ID", "TARGET")