Merge pull request #388 from HubSpot/fix/update_models_for_link_unfurling

Fix/update models for link unfurling

Author: Viktor-Pelepiak

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

@@ -1,11 +1,13 @@
 package com.hubspot.slack.client.methods.params.chat.workobject;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.hubspot.immutables.style.HubSpotStyle;
 import java.util.Optional;
 import org.immutables.value.Value;
 
 @Value.Immutable
 @HubSpotStyle
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
 public interface ExternalRefIF {
   String getId();
   Optional<String> getType();

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

@@ -1,5 +1,7 @@
 package com.hubspot.slack.client.methods.params.chat.workobject;
 
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.hubspot.immutables.style.HubSpotStyle;
 import com.hubspot.slack.client.methods.params.chat.workobject.entity.EntityPayload;
@@ -8,6 +10,7 @@
 
 @Value.Immutable
 @HubSpotStyle
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public interface WorkObjectIF {
   String getAppUnfurlUrl();
   String getUrl();

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

@@ -0,0 +1,10 @@
+package com.hubspot.slack.client.methods.params.chat.workobject.entity;
+
+import com.hubspot.immutables.style.HubSpotStyle;
+import org.immutables.value.Value;
+
+@Value.Immutable
+@HubSpotStyle
+public interface EntityPayloadAttributeTitleIF {
+  String getText();
+}

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

@@ -1,5 +1,8 @@
 package com.hubspot.slack.client.methods.params.chat.workobject.entity;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.hubspot.immutables.style.HubSpotStyle;
 import com.hubspot.slack.client.methods.params.chat.workobject.serializers.DisplayTypeSerializer;
@@ -8,10 +11,13 @@
 
 @Value.Immutable
 @HubSpotStyle
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
 public interface EntityPayloadAttributesIF {
-  String getTitle();
+  EntityPayloadAttributeTitle getTitle();
   Optional<String> getDisplayId();
 
+  @JsonInclude(JsonInclude.Include.NON_ABSENT)
   @JsonSerialize(using = DisplayTypeSerializer.class)
   Optional<DisplayType> getDisplayType();
 

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

@@ -1,15 +1,21 @@
 package com.hubspot.slack.client.methods.params.chat.workobject.entity;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import com.hubspot.immutables.style.HubSpotStyle;
 import com.hubspot.slack.client.methods.params.chat.workobject.entity.fields.EntityPayloadFields;
 import java.util.List;
+import java.util.Optional;
 import org.immutables.value.Value;
 
 @Value.Immutable
 @HubSpotStyle
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
 public interface EntityPayloadIF {
   EntityPayloadAttributes getAttributes();
-  EntityPayloadFields getFields();
+  Optional<EntityPayloadFields> getFields();
   List<EntityPayloadAttributesCustomField> getCustomFields();
   List<String> getDisplayOrder();
 }

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

@@ -1,10 +1,13 @@
 package com.hubspot.slack.client.methods.params.chat.workobject.entity;
 
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import com.hubspot.immutables.style.HubSpotStyle;
 import org.immutables.value.Value;
 
 @Value.Immutable
 @HubSpotStyle
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public interface ProductIconIF {
   String getUrl();
   String getAltText();

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

@@ -1,8 +1,10 @@
 package com.hubspot.slack.client.methods.params.chat.workobject.entity.fields;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.hubspot.immutables.style.HubSpotStyle;
 import org.immutables.value.Value;
 
 @Value.Immutable
 @HubSpotStyle
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
 public interface ItemFieldsIF extends EntityPayloadFields {}

slack-base/src/main/java/com/hubspot/slack/client/methods/params/chat/workobject/serializers/DisplayTypeSerializer.java

@@ -21,4 +21,9 @@ public void serialize(
       gen.writeNull();
     }
   }
+
+  @Override
+  public boolean isEmpty(SerializerProvider provider, Optional<DisplayType> value) {
+    return value.isEmpty();
+  }
 }

slack-base/src/main/java/com/hubspot/slack/client/methods/params/chat/workobject/serializers/EntityTypeSerializer.java

@@ -5,20 +5,15 @@
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.hubspot.slack.client.methods.params.chat.workobject.EntityType;
 import java.io.IOException;
-import java.util.Optional;
 
-public class EntityTypeSerializer extends JsonSerializer<Optional<EntityType>> {
+public class EntityTypeSerializer extends JsonSerializer<EntityType> {
 
   @Override
   public void serialize(
-    Optional<EntityType> entityType,
+    EntityType entityType,
     JsonGenerator gen,
     SerializerProvider serializers
   ) throws IOException {
-    if (entityType.isPresent()) {
-      gen.writeString(entityType.get().getValue());
-    } else {
-      gen.writeNull();
-    }
+    gen.writeString(entityType.getValue());
   }
 }