Skip to content

Commit 6f5a67f

Browse files
Merge pull request #395 from HubSpot/fix/update_models_for_flexpane
Fix/update models for flexpane
2 parents a034a8e + d0411d6 commit 6f5a67f

File tree

6 files changed

+33
-8
lines changed

6 files changed

+33
-8
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.hubspot.slack.client.methods.params.chat;
22

3+
import com.fasterxml.jackson.annotation.JsonInclude;
34
import com.fasterxml.jackson.annotation.JsonProperty;
45
import com.fasterxml.jackson.databind.PropertyNamingStrategies.SnakeCaseStrategy;
56
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -33,5 +34,6 @@ public interface ChatUnfurlParamsIF extends HasChannel {
3334

3435
Optional<URI> getUserAuthUrl();
3536

37+
@JsonInclude(JsonInclude.Include.NON_EMPTY)
3638
Optional<Metadata> getMetadata();
3739
}

slack-base/src/main/java/com/hubspot/slack/client/methods/params/chat/workobject/entity/EntityPayloadIF.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ public interface EntityPayloadIF {
1919
Optional<EntityPayloadFields> getFields();
2020
List<EntityPayloadAttributesCustomField> getCustomFields();
2121
List<String> getDisplayOrder();
22-
WorkObjectActionBlock getActions();
22+
Optional<WorkObjectActionBlock> getActions();
2323
}

slack-base/src/main/java/com/hubspot/slack/client/methods/params/chat/workobject/flexpane/WorkObjectFlexpaneParamsIF.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
44
import com.fasterxml.jackson.databind.annotation.JsonNaming;
55
import com.hubspot.immutables.style.HubSpotStyle;
6-
import com.hubspot.slack.client.methods.params.chat.workobject.Metadata;
76
import java.util.Optional;
87
import org.immutables.value.Value;
98

@@ -12,7 +11,7 @@
1211
@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
1312
public interface WorkObjectFlexpaneParamsIF {
1413
String getTriggerId();
15-
Metadata getMetadata();
14+
FlexPaneMetadata getMetadata();
1615
Optional<Boolean> getIsUserAuthRequired();
1716
Optional<String> getUserAuthUrl();
1817
Optional<WorkObjectFlexpaneError> getError();
Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,34 @@
11
package com.hubspot.slack.client.models.events.links;
22

3+
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
5+
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
6+
import com.fasterxml.jackson.databind.annotation.JsonNaming;
37
import com.hubspot.immutables.style.HubSpotStyle;
8+
import com.hubspot.slack.client.methods.params.chat.workobject.ExternalRef;
9+
import com.hubspot.slack.client.models.events.SlackEvent;
10+
import java.util.Optional;
411
import org.immutables.value.Value;
512

613
@HubSpotStyle
714
@Value.Immutable
8-
public interface EntityDetailsRequestedEventIF {}
15+
@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
16+
@JsonDeserialize(as = EntityDetailsRequestedEvent.class)
17+
public interface EntityDetailsRequestedEventIF extends SlackEvent {
18+
@JsonProperty("user")
19+
String getUserId();
20+
21+
@JsonProperty("channel")
22+
Optional<String> getChannelId();
23+
24+
ExternalRef getExternalRef();
25+
String getEntityUrl();
26+
Link getLink();
27+
String getAppUnfurlUrl();
28+
String getEventTs();
29+
String getTriggerId();
30+
String getUserLocale();
31+
32+
Optional<String> getMessageTs();
33+
Optional<String> getThreadTs();
34+
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,5 @@
2626
},
2727
"user_auth_message": null,
2828
"user_auth_url": null,
29-
"is_user_auth_required": null,
30-
"metadata" : null
29+
"is_user_auth_required": null
3130
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,5 @@
2121
},
2222
"user_auth_message": null,
2323
"user_auth_url": null,
24-
"is_user_auth_required": null,
25-
"metadata" : null
24+
"is_user_auth_required": null
2625
}

0 commit comments

Comments
 (0)