Merge pull request #217 from sinch/fix/DEVEXP-756-conversation-fix-card-message

Fix/DEVEXP-756: conversation fix card message

Author: JPPortier

client/src/main/com/sinch/sdk/domains/conversation/api/v1/adapters/ConversationService.java

@@ -24,6 +24,7 @@
 import com.sinch.sdk.domains.conversation.models.v1.messages.internal.ChannelSpecificMessageInternalMapper;
 import com.sinch.sdk.domains.conversation.models.v1.messages.internal.ContactMessageInternalMapper;
 import com.sinch.sdk.domains.conversation.models.v1.messages.types.carousel.CarouselMessageMapper;
+import com.sinch.sdk.domains.conversation.models.v1.messages.types.internal.CardMessageMapper;
 import com.sinch.sdk.domains.conversation.models.v1.messages.types.internal.ChoiceMessageMapper;
 import com.sinch.sdk.domains.conversation.models.v1.messages.types.template.TemplateMessageMapper;
 import com.sinch.sdk.domains.conversation.templates.models.v2.TemplateTranslationMapper;
@@ -166,6 +167,7 @@ private LocalLazyInit() {
       AppEventMapper.initMapper();
       AppMessageMapper.initMapper();
       AppMessageInternalMapper.initMapper();
+      CardMessageMapper.initMapper();
       CarouselMessageMapper.initMapper();
       ChoiceItemMapper.initMapper();
       ChannelSpecificContactMessageMapper.initMapper();

client/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/card/CardMessageMedia.java

@@ -0,0 +1,29 @@
+package com.sinch.sdk.domains.conversation.models.v1.messages.types.card;
+
+import com.sinch.sdk.domains.conversation.models.v1.messages.types.media.MediaMessage;
+
+/**
+ * Deprecated class, use
+ *
+ * @deprecated use {@link
+ *     com.sinch.sdk.domains.conversation.models.v1.messages.types.media.MediaMessage} instead.
+ */
+@Deprecated
+public interface CardMessageMedia extends MediaMessage {
+  /**
+   * Getting builder
+   *
+   * @return New Builder instance
+   * @deprecated use {@link MediaMessage#builder()} instead.
+   */
+  @Deprecated
+  static Builder builder() {
+    return new CardMessageMediaImpl.Builder();
+  }
+
+  /**
+   * @deprecated use {@link MediaMessage.Builder} instead.
+   */
+  @Deprecated
+  interface Builder extends MediaMessage.Builder {}
+}

client/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/card/CardMessageMediaImpl.java

@@ -0,0 +1,42 @@
+package com.sinch.sdk.domains.conversation.models.v1.messages.types.card;
+
+import com.sinch.sdk.core.models.OptionalValue;
+import com.sinch.sdk.domains.conversation.models.v1.messages.types.media.MediaMessage;
+import com.sinch.sdk.domains.conversation.models.v1.messages.types.media.MediaMessage.Builder;
+import com.sinch.sdk.domains.conversation.models.v1.messages.types.media.MediaMessageImpl;
+
+@Deprecated
+public class CardMessageMediaImpl extends MediaMessageImpl implements CardMessageMedia {
+
+  protected CardMessageMediaImpl(MediaMessageImpl mediaMessage) {
+    super(OptionalValue.of(mediaMessage.getMediaMessage()));
+  }
+
+  static class Builder implements CardMessageMedia.Builder {
+
+    MediaMessage.Builder builder = MediaMessage.builder();
+
+    @Override
+    public Builder setThumbnailUrl(String thumbnailUrl) {
+      builder.setThumbnailUrl(thumbnailUrl);
+      return this;
+    }
+
+    @Override
+    public Builder setUrl(String url) {
+      builder.setUrl(url);
+      return this;
+    }
+
+    @Override
+    public Builder setFilenameOverride(String filenameOverride) {
+      builder.setFilenameOverride(filenameOverride);
+      return this;
+    }
+
+    public CardMessageMedia build() {
+
+      return new CardMessageMediaImpl((MediaMessageImpl) builder.build());
+    }
+  }
+}

client/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/internal/CardMessageMapper.java

@@ -0,0 +1,37 @@
+package com.sinch.sdk.domains.conversation.models.v1.messages.types.internal;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.sinch.sdk.core.models.OptionalValue;
+import com.sinch.sdk.core.utils.databind.Mapper;
+import com.sinch.sdk.domains.conversation.models.v1.messages.types.card.CardMessageImpl;
+import com.sinch.sdk.domains.conversation.models.v1.messages.types.media.MediaMessage;
+import com.sinch.sdk.domains.conversation.models.v1.messages.types.media.MediaMessageImpl;
+
+public class CardMessageMapper {
+
+  public static void initMapper() {
+
+    Mapper.getInstance()
+        .addMixIn(CardMessageInternal.class, CardMessageMixinSerializer.class)
+        .addMixIn(CardMessageInternalImpl.Builder.class, CardMessageBuilderMapperMixin.class);
+  }
+
+  static class CardMessageMixinSerializer extends CardMessageImpl {
+
+    @Override
+    @JsonSerialize(using = MediaMessageImpl.DelegatedSerializer.class)
+    public OptionalValue<MediaMessage> media() {
+      return super.media();
+    }
+  }
+
+  static class CardMessageBuilderMapperMixin extends CardMessageInternalImpl.Builder {
+
+    @Override
+    @JsonDeserialize(using = MediaMessageImpl.DelegatedDeSerializer.class)
+    public CardMessageInternalImpl.Builder setMedia(MediaMessage media) {
+      return super.setMedia(media);
+    }
+  }
+}

openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/card/CardMessage.java

@@ -12,6 +12,7 @@
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.sinch.sdk.domains.conversation.models.v1.messages.types.choice.Choice;
+import com.sinch.sdk.domains.conversation.models.v1.messages.types.media.MediaMessage;
 import java.util.List;
 
 /** Field containing a Card Message */
@@ -46,7 +47,7 @@ public interface CardMessage
    *
    * @return media
    */
-  CardMessageMedia getMedia();
+  MediaMessage getMedia();
 
   /**
    * The title of the card message.
@@ -101,7 +102,7 @@ interface Builder {
      * @return Current builder
      * @see #getMedia
      */
-    Builder setMedia(CardMessageMedia media);
+    Builder setMedia(MediaMessage media);
 
     /**
      * see getter

openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/card/CardMessageImpl.java

@@ -16,6 +16,7 @@
 import com.sinch.sdk.domains.conversation.models.v1.messages.types.choice.Choice;
 import com.sinch.sdk.domains.conversation.models.v1.messages.types.internal.CardMessageInternal;
 import com.sinch.sdk.domains.conversation.models.v1.messages.types.internal.CardMessageInternalImpl;
+import com.sinch.sdk.domains.conversation.models.v1.messages.types.media.MediaMessage;
 import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
@@ -100,14 +101,14 @@ public OptionalValue<CardHeight> height() {
   }
 
   @JsonIgnore
-  public CardMessageMedia getMedia() {
+  public MediaMessage getMedia() {
     if (null == cardMessage || !cardMessage.isPresent() || null == cardMessage.get().getMedia()) {
       return null;
     }
     return cardMessage.get().getMedia();
   }
 
-  public OptionalValue<CardMessageMedia> media() {
+  public OptionalValue<MediaMessage> media() {
     return null != cardMessage && cardMessage.isPresent()
         ? cardMessage.map(f -> ((CardMessageInternalImpl) f).media()).orElse(OptionalValue.empty())
         : OptionalValue.empty();
@@ -195,7 +196,7 @@ public Builder setHeight(CardHeight height) {
     }
 
     @JsonIgnore
-    public Builder setMedia(CardMessageMedia media) {
+    public Builder setMedia(MediaMessage media) {
       getDelegatedBuilder().setMedia(media);
       return this;
     }

openapi-contracts/src/main/com/sinch/sdk/domains/conversation/models/v1/messages/types/card/CardMessageMedia.java

@@ -12,8 +12,8 @@
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.sinch.sdk.domains.conversation.models.v1.messages.types.card.CardHeight;
-import com.sinch.sdk.domains.conversation.models.v1.messages.types.card.CardMessageMedia;
 import com.sinch.sdk.domains.conversation.models.v1.messages.types.choice.Choice;
+import com.sinch.sdk.domains.conversation.models.v1.messages.types.media.MediaMessage;
 import java.util.List;
 
 /** Message containing text, media and choices. */
@@ -46,7 +46,7 @@ public interface CardMessageInternal {
    *
    * @return media
    */
-  CardMessageMedia getMedia();
+  MediaMessage getMedia();
 
   /**
    * The title of the card message.
@@ -101,7 +101,7 @@ interface Builder {
      * @return Current builder
      * @see #getMedia
      */
-    Builder setMedia(CardMessageMedia media);
+    Builder setMedia(MediaMessage media);
 
     /**
      * see getter