Support Attachment upon link unfurling

slack-base/src/main/java/com/hubspot/slack/client/methods/params/chat/ChatUnfurlBlocksIF.java

@@ -5,14 +5,15 @@
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import com.hubspot.immutables.style.HubSpotStyle;
 import com.hubspot.slack.client.models.BlockOrAttachment;
+import com.hubspot.slack.client.models.ChatUnfurlBlocksOrAttachment;
 import com.hubspot.slack.client.models.json.BlockOrAttachmentDeserializer;
 import java.util.List;
 import org.immutables.value.Value;
 
 @HubSpotStyle
 @Value.Immutable
 @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
-public interface ChatUnfurlBlocksIF {
+public interface ChatUnfurlBlocksIF extends ChatUnfurlBlocksOrAttachment {
   @Value.Parameter(order = 1)
   @JsonDeserialize(contentUsing = BlockOrAttachmentDeserializer.class)
   List<? extends BlockOrAttachment> getBlocks();

slack-base/src/main/java/com/hubspot/slack/client/methods/params/chat/ChatUnfurlParamsIF.java

@@ -1,18 +1,19 @@
 package com.hubspot.slack.client.methods.params.chat;
 
+import java.net.URI;
+import java.util.Map;
+import java.util.Optional;
+
+import org.immutables.value.Value.Immutable;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy.SnakeCaseStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import com.hubspot.immutables.style.HubSpotStyle;
 import com.hubspot.slack.client.methods.interceptor.HasChannel;
-import com.hubspot.slack.client.models.BlockOrAttachment;
+import com.hubspot.slack.client.models.ChatUnfurlBlocksOrAttachment;
 import com.hubspot.slack.client.models.json.BlockOrAttachmentDeserializer;
-import java.net.URI;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import org.immutables.value.Value.Immutable;
 
 @Immutable
 @HubSpotStyle
@@ -24,7 +25,8 @@ public interface ChatUnfurlParamsIF extends HasChannel {
 
   String getTs();
 
-  Map<String, ChatUnfurlBlocks> getUnfurls();
+  @JsonDeserialize(contentUsing = BlockOrAttachmentDeserializer.class)
+  Map<String, ChatUnfurlBlocksOrAttachment> getUnfurls();
 
   Optional<Boolean> isUserAuthRequired();
 

slack-base/src/main/java/com/hubspot/slack/client/models/BlockOrAttachment.java

@@ -1,4 +1,4 @@
 package com.hubspot.slack.client.models;
 
-public interface BlockOrAttachment {
+public interface BlockOrAttachment extends ChatUnfurlBlocksOrAttachment {
 }

slack-base/src/main/java/com/hubspot/slack/client/models/ChatUnfurlBlocksOrAttachment.java

@@ -0,0 +1,6 @@
+package com.hubspot.slack.client.models;
+
+// We need common interface to make unfurl call using any of - old or Block Kit framework.
+// Having this we can construct ChatUnfurlParams for both cases.
+public interface ChatUnfurlBlocksOrAttachment {
+}

slack-base/src/main/java/com/hubspot/slack/client/models/json/BlockOrAttachmentDeserializer.java

@@ -7,23 +7,27 @@
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import com.hubspot.slack.client.methods.params.chat.ChatUnfurlBlocks;
 import com.hubspot.slack.client.models.Attachment;
-import com.hubspot.slack.client.models.BlockOrAttachment;
+import com.hubspot.slack.client.models.ChatUnfurlBlocksOrAttachment;
 import com.hubspot.slack.client.models.blocks.Block;
 
-public class BlockOrAttachmentDeserializer extends StdDeserializer<BlockOrAttachment> {
+public class BlockOrAttachmentDeserializer extends StdDeserializer<ChatUnfurlBlocksOrAttachment> {
+  private static final String BLOCKS_FIELD = "blocks";
   private static final String TYPE_FIELD = "type";
 
   protected BlockOrAttachmentDeserializer() {
-    super(BlockOrAttachment.class);
+    super(ChatUnfurlBlocksOrAttachment.class);
   }
 
   @Override
-  public BlockOrAttachment deserialize(JsonParser jsonParser, DeserializationContext context) throws IOException {
+  public ChatUnfurlBlocksOrAttachment deserialize(JsonParser jsonParser, DeserializationContext context) throws IOException {
     ObjectCodec codec = jsonParser.getCodec();
     JsonNode node = codec.readTree(jsonParser);
 
-    if (node.has(TYPE_FIELD)) {
+    if (node.has(BLOCKS_FIELD)) {
+      return codec.treeToValue(node, ChatUnfurlBlocks.class);
+    } else if (node.has(TYPE_FIELD)){
       return codec.treeToValue(node, Block.class);
     } else {
       return codec.treeToValue(node, Attachment.class);

slack-base/src/test/java/com/hubspot/slack/client/methods/params/chat/ChatUnfurlParamsTest.java

@@ -58,4 +58,9 @@ public void itCanBuildChatUnfurlParamsWithBlock() throws URISyntaxException {
   public void itCanDeserChatUnfurlParamsWithBlock() throws IOException {
     testSerialization("chat_unfurl_params_using_block.json", ChatUnfurlParams.class);
   }
+
+  @Test
+  public void itCanDeserChatUnfurlParamsWithAttachment() throws IOException {
+    testSerialization("chat_unfurl_params_using_attachment.json", ChatUnfurlParams.class);
+  }
 }

slack-base/src/test/resources/chat_unfurl_params_using_attachment.json

@@ -0,0 +1,30 @@
+{
+  "channel": "C123456",
+  "ts": "123456789.9875",
+  "unfurls": {
+    "https://gentle-buttons.com/carafe": {
+      "fallback": null,
+      "color": null,
+      "pretext": null,
+      "author_name": null,
+      "author_link": null,
+      "author_icon": null,
+      "title": null,
+      "title_link": null,
+      "text": "Take a look at this carafe, just another cousin of glass",
+      "image_url": null,
+      "attachment_type": null,
+      "fields": [],
+      "footer": null,
+      "footer_icon": null,
+      "thumb_url": null,
+      "callback_id": null,
+      "actions": [],
+      "mrkdwn_in": [],
+      "ts": null
+    }
+  },
+  "user_auth_message": null,
+  "user_auth_url": null,
+  "is_user_auth_required": null
+}