add as separate property

Author: vegeris

slack-api-client/src/main/java/com/slack/api/methods/RequestFormBuilder.java

@@ -1601,18 +1601,26 @@ public static FormBody.Builder toForm(ChatPostMessageRequest req) {
         if (req.getMetadataAsString() != null) {
             form.add("metadata", req.getMetadataAsString());
         } else if (req.getMetadata() != null) {
-            Message.Metadata metadata = req.getMetadata();
-            if (req.getMetadata().getEntities() == null) {
+            String json = GSON.toJson(req.getMetadata());
+            form.add("metadata", json);
+        }
+
+        if (req.getEventAndEntityMetadataAsString() != null) {
+            form.add("metadata", req.getEventAndEntityMetadataAsString());
+        } else if (req.getEventAndEntityMetadata() != null) {
+            Message.EventAndEntityMetadata metadata = req.getEventAndEntityMetadata();
+            if (metadata.getEntities() == null) {
                 String json = GSON.toJson(metadata);
                 form.add("metadata", json);
             } else {
                 EntityMetadata[] entities = metadata.getEntities();
                 entities = prepareEntities(metadata.getEntities());
                 metadata.setEntities(entities);
-                String json = GSON.toJson(req.getMetadata());
+                String json = GSON.toJson(metadata);
                 form.add("metadata", json);
             }
         }
+        
         if (req.getBlocksAsString() != null) {
             form.add("blocks", req.getBlocksAsString());
         } else if (req.getBlocks() != null) {

slack-api-client/src/main/java/com/slack/api/methods/request/chat/ChatPostMessageRequest.java

@@ -65,6 +65,22 @@ public class ChatPostMessageRequest implements SlackApiRequest {
      */
     private String metadataAsString;
 
+    /**
+     * JSON object with event and/or entity metadata.
+     * For event metadata, provide event_type and event_payload fields.
+     * For entity metadata, provide the entities field.
+     * This field will overwrite the `metadata` field.
+     */
+    private Message.EventAndEntityMetadata eventAndEntityMetadata;
+
+    /**
+     * JSON object with event and/or entity metadata.
+     * For event metadata, provide event_type and event_payload fields.
+     * For entity metadata, provide the entities field.
+     * This field will overwrite the `metadata` field.
+     */
+    private String eventAndEntityMetadataAsString;
+
     /**
      * A JSON-based array of structured blocks, presented as a URL-encoded string.
      */

slack-api-client/src/test/java/test_with_remote_apis/methods/chat_Test.java

@@ -947,15 +947,15 @@ public void postMessage_with_work_object_from_object() throws Exception {
                                 .entityPayload(payload)
                                 .build();
                 EntityMetadata[] entities = { entity };
-                Message.Metadata metadata = Message.Metadata.builder().entities(entities).build();
+                Message.EventAndEntityMetadata metadata = Message.EventAndEntityMetadata.builder().entities(entities).build();
 
                 // Post the message
 
                 ChatPostMessageResponse postResponse = slack.methods().chatPostMessage(ChatPostMessageRequest.builder()
                                 .token(botToken)
                                 .channel(randomChannelId)
                                 .text("I have important information to share :wave:")
-                                .metadata(metadata)
+                                .eventAndEntityMetadata(metadata)
                                 .build());
                 assertThat(postResponse.getError(), is(nullValue()));
 

slack-api-model/src/main/java/com/slack/api/model/Message.java

@@ -238,6 +238,16 @@ public static class Metadata {
         // Event metadata
         private String eventType;
         private Map<String, Object> eventPayload;
+    }
+
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class EventAndEntityMetadata {
+        // Event metadata
+        private String eventType;
+        private Map<String, Object> eventPayload;
 
         // Work object metadata
         private EntityMetadata[] entities;