MINOR: Fix broken output layout of kafka-consumer-groups.sh (#17058)

Reviewers: Andrew Schofield <aschofield@confluent.io>, Lianet Magrans <lmagrans@confluent.io>
apache · Sep 4, 2024 · 748d202 · 748d202
1 parent 0294b14
commit 748d202
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/tools/src/main/java/org/apache/kafka/tools/consumer/group/ConsumerGroupCommand.java b/tools/src/main/java/org/apache/kafka/tools/consumer/group/ConsumerGroupCommand.java
@@ -156,9 +156,9 @@ static void printError(String msg, Optional<Throwable> e) {
     }
 
     static void printOffsetsToReset(Map<String, Map<TopicPartition, OffsetAndMetadata>> groupAssignmentsToReset) {
-        String format = "%-30s %-30s %-10s %-15s";
+        String format = "%n%-30s %-30s %-10s %-15s";
         if (!groupAssignmentsToReset.isEmpty())
-            System.out.printf("\n" + format, "GROUP", "TOPIC", "PARTITION", "NEW-OFFSET");
+            System.out.printf(format, "GROUP", "TOPIC", "PARTITION", "NEW-OFFSET");
 
         groupAssignmentsToReset.forEach((groupId, assignment) ->
             assignment.forEach((consumerAssignment, offsetAndMetadata) ->
@@ -167,6 +167,7 @@ static void printOffsetsToReset(Map<String, Map<TopicPartition, OffsetAndMetadat
                     consumerAssignment.topic(),
                     consumerAssignment.partition(),
                     offsetAndMetadata.offset())));
+        System.out.println();
     }
 
     @SuppressWarnings("ClassFanOutComplexity")
@@ -338,6 +339,7 @@ private void printOffsets(Map<String, Entry<Optional<ConsumerGroupState>, Option
                                 consumerAssignment.host.orElse(MISSING_COLUMN_VALUE), consumerAssignment.clientId.orElse(MISSING_COLUMN_VALUE)
                             );
                         }
+                        System.out.println();
                     }
                 }
             });
@@ -655,9 +657,9 @@ void deleteOffsets() {
                     printError("Encounter some unknown error: " + topLevelResult, Optional.empty());
             }
 
-            String format = "%-30s %-15s %-15s";
+            String format = "%n%-30s %-15s %-15s";
 
-            System.out.printf("\n" + format, "TOPIC", "PARTITION", "STATUS");
+            System.out.printf(format, "TOPIC", "PARTITION", "STATUS");
             partitionLevelResult.entrySet().stream()
                 .sorted(Comparator.comparing(e -> e.getKey().topic() + e.getKey().partition()))
                 .forEach(e -> {
@@ -669,6 +671,7 @@ void deleteOffsets() {
                         error != null ? "Error: :" + error.getMessage() : "Successful"
                     );
                 });
+            System.out.println();
         }
 
         Map<String, ConsumerGroupDescription> describeConsumerGroups(Collection<String> groupIds) throws Exception {