From 41986a7e8f4a9c9b475d0302816c667eb96021f7 Mon Sep 17 00:00:00 2001 From: pancx Date: Tue, 25 Feb 2025 16:27:36 +0800 Subject: [PATCH] [#6496] feat(CLI): Support plain format output for Schema and Table command fix COMMA_JOINER. --- .../apache/gravitino/cli/outputs/OutputFormat.java | 2 +- .../gravitino/cli/output/TestPlainFormat.java | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/clients/cli/src/main/java/org/apache/gravitino/cli/outputs/OutputFormat.java b/clients/cli/src/main/java/org/apache/gravitino/cli/outputs/OutputFormat.java index fe0d7b7c9e0..378fdf746bb 100644 --- a/clients/cli/src/main/java/org/apache/gravitino/cli/outputs/OutputFormat.java +++ b/clients/cli/src/main/java/org/apache/gravitino/cli/outputs/OutputFormat.java @@ -26,7 +26,7 @@ */ public interface OutputFormat { /** Joiner for creating comma-separated output strings, ignoring null values */ - Joiner COMMA_JOINER = Joiner.on(", ").skipNulls(); + Joiner COMMA_JOINER = Joiner.on(",").skipNulls(); /** Joiner for creating line-separated output strings, ignoring null values */ Joiner NEWLINE_JOINER = Joiner.on(System.lineSeparator()).skipNulls(); diff --git a/clients/cli/src/test/java/org/apache/gravitino/cli/output/TestPlainFormat.java b/clients/cli/src/test/java/org/apache/gravitino/cli/output/TestPlainFormat.java index 32e9e7dbc86..33836588f83 100644 --- a/clients/cli/src/test/java/org/apache/gravitino/cli/output/TestPlainFormat.java +++ b/clients/cli/src/test/java/org/apache/gravitino/cli/output/TestPlainFormat.java @@ -67,7 +67,7 @@ void testMetalakeDetailsWithPlainFormat() { PlainFormat.output(mockMetalake, mockContext); String output = new String(outContent.toByteArray(), StandardCharsets.UTF_8).trim(); - Assertions.assertEquals("demo_metalake, This is a demo metalake", output); + Assertions.assertEquals("demo_metalake,This is a demo metalake", output); } @Test @@ -88,8 +88,7 @@ void testCatalogDetailsWithPlainFormat() { PlainFormat.output(mockCatalog, mockContext); String output = new String(outContent.toByteArray(), StandardCharsets.UTF_8).trim(); - Assertions.assertEquals( - "demo_catalog, RELATIONAL, demo_provider, This is a demo catalog", output); + Assertions.assertEquals("demo_catalog,RELATIONAL,demo_provider,This is a demo catalog", output); } @Test @@ -111,7 +110,7 @@ void testSchemaDetailsWithPlainFormat() { Schema mockSchema = getMockSchema(); PlainFormat.output(mockSchema, mockContext); String output = new String(outContent.toByteArray(), StandardCharsets.UTF_8).trim(); - Assertions.assertEquals("demo_schema, This is a demo schema", output); + Assertions.assertEquals("demo_schema,This is a demo schema", output); } @Test @@ -131,7 +130,7 @@ void testTableDetailsWithPlainFormat() { Table mockTable = getMockTable(); PlainFormat.output(mockTable, mockContext); String output = new String(outContent.toByteArray(), StandardCharsets.UTF_8).trim(); - Assertions.assertEquals("demo_table, This is a demo table", output); + Assertions.assertEquals("demo_table,This is a demo table", output); } @Test @@ -146,7 +145,7 @@ void testAuditWithTableFormat() { PlainFormat.output(mockAudit, mockContext); String output = new String(outContent.toByteArray(), StandardCharsets.UTF_8).trim(); Assertions.assertEquals( - "demo_user, 2021-01-20T02:51:51.111Z, demo_user, 2021-01-20T02:51:51.111Z", output); + "demo_user,2021-01-20T02:51:51.111Z,demo_user,2021-01-20T02:51:51.111Z", output); } @Test @@ -160,7 +159,7 @@ void testAuditWithTableFormatWithNullValues() { PlainFormat.output(mockAudit, mockContext); String output = new String(outContent.toByteArray(), StandardCharsets.UTF_8).trim(); - Assertions.assertEquals("demo_user, N/A, N/A, N/A", output); + Assertions.assertEquals("demo_user,N/A,N/A,N/A", output); } @Test