Skip to content

Commit d82a3df

Browse files
committed
Follow up to #57: move table error entry out of metadata
1 parent 0aab6f8 commit d82a3df

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

ice/src/main/java/com/altinity/ice/cli/internal/cmd/Describe.java

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,15 @@ public static void run(RESTCatalog catalog, String target, boolean json, Option.
7777
}
7878

7979
Describe.Table.Data tableData = null;
80-
Table.Metadata tableMetadata;
80+
Table.Error tableError = null;
8181
try {
8282
tableData = gatherTableData(catalog, tableId, optionsSet);
83-
tableMetadata = new Table.Metadata(tableId.toString());
8483
} catch (ServiceFailureException e) {
85-
tableMetadata = new Table.Metadata(tableId.toString(), e.getMessage());
84+
tableError = new Table.Error(e.getMessage());
8685
}
8786

88-
tablesMetadata.add(new Table("Table", tableMetadata, tableData));
87+
tablesMetadata.add(
88+
new Table("Table", new Table.Metadata(tableId.toString()), tableData, tableError));
8989
}
9090
}
9191

@@ -226,20 +226,16 @@ private static void gatherNestedTableMetrics(
226226
}
227227

228228
@JsonInclude(JsonInclude.Include.NON_NULL)
229-
record Table(String kind, Table.Metadata metadata, Table.Data data) {
229+
record Table(String kind, Table.Metadata metadata, Table.Data data, Table.Error error) {
230230
public Table {
231231
if (kind == null) {
232232
kind = "Table";
233233
}
234234
}
235235

236-
record Metadata(String id, String status) {
237-
static final String STATUS_OK = "OK";
236+
record Metadata(String id) {}
238237

239-
Metadata(String id) {
240-
this(id, STATUS_OK);
241-
}
242-
}
238+
record Error(String message) {}
243239

244240
record Data(
245241
String schemaRaw,

0 commit comments

Comments
 (0)