refactor(block-kit): share the TableCell cell model across table + data_table

The data_table cells (raw_text / raw_number / rich_text) are the same
cell model the table block uses. Rather than ship a parallel
DataTableCell family, adopt the shared TableCell interface and its
RawTextTableCell / RawNumberTableCell implementations in
com.slack.api.model.block.composition, deserialized by a single
GsonTableCellFactory:

- Remove DataTableCell, RawTextDataTableCell, RawNumberDataTableCell,
  and GsonDataTableCellFactory.
- Add TableCell, RawTextTableCell, RawNumberTableCell (in ...block.composition)
  and GsonTableCellFactory (in ...util.json).
- DataTableBlock.rows is now List<List<TableCell>>; RichTextBlock
  implements TableCell; the client and model-test GsonFactory register
  TableCell -> GsonTableCellFactory.

This is the same cell model the sibling table-block PR (#1611)
introduces, placed in the same package with identical definitions, so
whichever of the two lands second drops the now-duplicate files in a
trivial merge. Mirrors how node (@slack/types composition objects) and
python (slack_sdk basic_components) also share one cell model across
both blocks.

Co-Authored-By: Claude <svc-devxp-claude@slack-corp.com>

Author: zimeg

slack-api-client/src/main/java/com/slack/api/util/json/GsonFactory.java

@@ -10,8 +10,8 @@
 import com.slack.api.model.admin.AppWorkflow;
 import com.slack.api.model.block.ContextBlockElement;
 import com.slack.api.model.block.ContextActionsBlockElement;
-import com.slack.api.model.block.DataTableCell;
 import com.slack.api.model.block.LayoutBlock;
+import com.slack.api.model.block.composition.TableCell;
 import com.slack.api.model.block.composition.TextObject;
 import com.slack.api.model.block.element.BlockElement;
 import com.slack.api.model.block.element.RichTextElement;
@@ -81,7 +81,7 @@ public static void registerTypeAdapters(GsonBuilder builder, boolean failOnUnkno
                 .registerTypeAdapter(ContextActionsBlockElement.class, new GsonContextActionsBlockElementFactory(failOnUnknownProps))
                 .registerTypeAdapter(BlockElement.class, new GsonBlockElementFactory(failOnUnknownProps))
                 .registerTypeAdapter(RichTextElement.class, new GsonRichTextElementFactory(failOnUnknownProps))
-                .registerTypeAdapter(DataTableCell.class, new GsonDataTableCellFactory(failOnUnknownProps))
+                .registerTypeAdapter(TableCell.class, new GsonTableCellFactory(failOnUnknownProps))
                 .registerTypeAdapter(FunctionExecutedEvent.InputValue.class, new GsonFunctionExecutedEventInputValueFactory())
                 .registerTypeAdapter(Attachment.VideoHtml.class, new GsonMessageAttachmentVideoHtmlFactory(failOnUnknownProps))
                 .registerTypeAdapter(MessageChangedEvent.PreviousMessage.class, new GsonMessageChangedEventPreviousMessageFactory(failOnUnknownProps))

slack-api-model/src/main/java/com/slack/api/model/block/DataTableBlock.java

@@ -1,5 +1,6 @@
 package com.slack.api.model.block;
 
+import com.slack.api.model.block.composition.TableCell;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -25,7 +26,7 @@ public class DataTableBlock implements LayoutBlock {
      * An array consisting of table rows.
      */
     @Builder.Default
-    private List<List<DataTableCell>> rows = new ArrayList<>();
+    private List<List<TableCell>> rows = new ArrayList<>();
 
     /**
      * A caption for the table; used as the value for the HTML caption element.

slack-api-model/src/main/java/com/slack/api/model/block/DataTableCell.java

@@ -16,7 +16,7 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class RichTextBlock implements LayoutBlock, DataTableCell {
+public class RichTextBlock implements LayoutBlock, com.slack.api.model.block.composition.TableCell {
     public static final String TYPE = "rich_text";
     private final String type = TYPE;
     @Builder.Default

slack-api-model/src/main/java/com/slack/api/model/block/RichTextBlock.java

@@ -1,30 +1,24 @@
-package com.slack.api.model.block;
+package com.slack.api.model.block.composition;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * A {@code raw_number} cell within a {@link DataTableBlock}: an object containing a numeric value.
+ * A {@code raw_number} table cell, holding a numeric value. The optional {@code text}
+ * field carries the display representation of the value (for example a formatted string).
  *
+ * @see <a href="https://docs.slack.dev/reference/block-kit/blocks/table-block">Table block</a>
  * @see <a href="https://docs.slack.dev/reference/block-kit/blocks/data-table-block">Data table block</a>
  */
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class RawNumberDataTableCell implements DataTableCell {
+public class RawNumberTableCell implements TableCell {
     public static final String TYPE = "raw_number";
     private final String type = TYPE;
-
-    /**
-     * The numeric value.
-     */
     private Double value;
-
-    /**
-     * The text used to display the value. The minimum length is 1 character.
-     */
     private String text;
 }

…/model/block/RawNumberDataTableCell.java …lock/composition/RawNumberTableCell.javaslack-api-model/src/main/java/com/slack/api/model/block/RawNumberDataTableCell.java renamed to slack-api-model/src/main/java/com/slack/api/model/block/composition/RawNumberTableCell.java slack-api-model/src/main/java/com/slack/api/model/block/RawNumberDataTableCell.java renamed to slack-api-model/src/main/java/com/slack/api/model/block/composition/RawNumberTableCell.java

@@ -1,25 +1,22 @@
-package com.slack.api.model.block;
+package com.slack.api.model.block.composition;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * A {@code raw_text} cell within a {@link DataTableBlock}: an object containing some text.
+ * A {@code raw_text} table cell, holding unformatted plain text.
  *
+ * @see <a href="https://docs.slack.dev/reference/block-kit/blocks/table-block">Table block</a>
  * @see <a href="https://docs.slack.dev/reference/block-kit/blocks/data-table-block">Data table block</a>
  */
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class RawTextDataTableCell implements DataTableCell {
+public class RawTextTableCell implements TableCell {
     public static final String TYPE = "raw_text";
     private final String type = TYPE;
-
-    /**
-     * The text for the block. The minimum length is 1 character.
-     */
     private String text;
 }

…pi/model/block/RawTextDataTableCell.java …/block/composition/RawTextTableCell.javaslack-api-model/src/main/java/com/slack/api/model/block/RawTextDataTableCell.java renamed to slack-api-model/src/main/java/com/slack/api/model/block/composition/RawTextTableCell.java slack-api-model/src/main/java/com/slack/api/model/block/RawTextDataTableCell.java renamed to slack-api-model/src/main/java/com/slack/api/model/block/composition/RawTextTableCell.java

@@ -0,0 +1,19 @@
+package com.slack.api.model.block.composition;
+
+/**
+ * A single cell within a table or data table row. A cell can be one of:
+ *
+ * <ul>
+ *   <li>{@link RawTextTableCell} ({@code raw_text})</li>
+ *   <li>{@link RawNumberTableCell} ({@code raw_number})</li>
+ *   <li>{@link com.slack.api.model.block.RichTextBlock RichTextBlock} ({@code rich_text})</li>
+ * </ul>
+ *
+ * @see <a href="https://docs.slack.dev/reference/block-kit/blocks/table-block">Table block</a>
+ * @see <a href="https://docs.slack.dev/reference/block-kit/blocks/data-table-block">Data table block</a>
+ */
+public interface TableCell {
+
+    String getType();
+
+}

slack-api-model/src/main/java/com/slack/api/model/block/composition/TableCell.java

@@ -0,0 +1,56 @@
+package com.slack.api.util.json;
+
+import com.google.gson.*;
+import com.slack.api.model.block.RichTextBlock;
+import com.slack.api.model.block.composition.RawNumberTableCell;
+import com.slack.api.model.block.composition.RawTextTableCell;
+import com.slack.api.model.block.composition.TableCell;
+
+import java.lang.reflect.Type;
+
+/**
+ * Factory for deserializing the cells of a
+ * {@link com.slack.api.model.block.DataTableBlock data table block}.
+ *
+ * @see <a href="https://docs.slack.dev/reference/block-kit/blocks/data-table-block">Data table block</a>
+ */
+public class GsonTableCellFactory implements JsonDeserializer<TableCell>, JsonSerializer<TableCell> {
+
+    private final boolean failOnUnknownProperties;
+
+    public GsonTableCellFactory() {
+        this(false);
+    }
+
+    public GsonTableCellFactory(boolean failOnUnknownProperties) {
+        this.failOnUnknownProperties = failOnUnknownProperties;
+    }
+
+    @Override
+    public TableCell deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
+            throws JsonParseException {
+        final JsonObject jsonObject = json.getAsJsonObject();
+        final JsonPrimitive prim = (JsonPrimitive) jsonObject.get("type");
+        final String typeName = prim.getAsString();
+        final Class<? extends TableCell> clazz = getTableCellClassInstance(typeName);
+        return context.deserialize(jsonObject, clazz);
+    }
+
+    @Override
+    public JsonElement serialize(TableCell src, Type typeOfSrc, JsonSerializationContext context) {
+        return context.serialize(src);
+    }
+
+    private Class<? extends TableCell> getTableCellClassInstance(String typeName) {
+        switch (typeName) {
+            case RawTextTableCell.TYPE:
+                return RawTextTableCell.class;
+            case RawNumberTableCell.TYPE:
+                return RawNumberTableCell.class;
+            case RichTextBlock.TYPE:
+                return RichTextBlock.class;
+            default:
+                throw new JsonParseException("Unknown table cell type: " + typeName);
+        }
+    }
+}

slack-api-model/src/main/java/com/slack/api/util/json/GsonDataTableCellFactory.java

@@ -5,6 +5,9 @@
 import com.slack.api.model.Message;
 import com.slack.api.model.block.*;
 import com.slack.api.model.block.composition.ConfirmationDialogObject;
+import com.slack.api.model.block.composition.RawNumberTableCell;
+import com.slack.api.model.block.composition.RawTextTableCell;
+import com.slack.api.model.block.composition.TableCell;
 import com.slack.api.model.block.element.*;
 import com.slack.api.model.view.View;
 import org.junit.Test;
@@ -1786,15 +1789,15 @@ public void parseDataTableBlock() {
         assertThat(block.getRowHeaderColumnIndex(), is(0));
         assertThat(block.getRows().size(), is(2));
 
-        RawTextDataTableCell header = (RawTextDataTableCell) block.getRows().get(0).get(0);
+        RawTextTableCell header = (RawTextTableCell) block.getRows().get(0).get(0);
         assertThat(header.getType(), is("raw_text"));
         assertThat(header.getText(), is("Team"));
 
-        DataTableCell richCell = block.getRows().get(1).get(0);
+        TableCell richCell = block.getRows().get(1).get(0);
         assertTrue(richCell instanceof RichTextBlock);
         assertThat(richCell.getType(), is("rich_text"));
 
-        RawNumberDataTableCell numberCell = (RawNumberDataTableCell) block.getRows().get(1).get(1);
+        RawNumberTableCell numberCell = (RawNumberTableCell) block.getRows().get(1).get(1);
         assertThat(numberCell.getType(), is("raw_number"));
         assertThat(numberCell.getValue(), is(1234.5));
         assertThat(numberCell.getText(), is("$1,234.50"));
@@ -1809,12 +1812,12 @@ public void buildDataTableBlock() {
                 .rowHeaderColumnIndex(0)
                 .rows(Arrays.asList(
                         Arrays.asList(
-                                RawTextDataTableCell.builder().text("Team").build(),
-                                RawTextDataTableCell.builder().text("Revenue").build()
+                                RawTextTableCell.builder().text("Team").build(),
+                                RawTextTableCell.builder().text("Revenue").build()
                         ),
                         Arrays.asList(
-                                RawTextDataTableCell.builder().text("Platform").build(),
-                                RawNumberDataTableCell.builder().value(1234.5).text("$1,234.50").build()
+                                RawTextTableCell.builder().text("Platform").build(),
+                                RawNumberTableCell.builder().value(1234.5).text("$1,234.50").build()
                         )
                 )));
         assertThat(block, is(notNullValue()));
@@ -1826,7 +1829,7 @@ public void buildDataTableBlock() {
         assertThat(restored.getCaption(), is("Quarterly results"));
         assertThat(restored.getPageSize(), is(10));
         assertThat(restored.getRows().size(), is(2));
-        RawNumberDataTableCell numberCell = (RawNumberDataTableCell) restored.getRows().get(1).get(1);
+        RawNumberTableCell numberCell = (RawNumberTableCell) restored.getRows().get(1).get(1);
         assertThat(numberCell.getValue(), is(1234.5));
     }