Implement icon & nickname switch (#464)

https://developers.line.biz/en/news/2020/03/17/icon-nickname-switch/

Author: tokuhirom

line-bot-model/src/main/java/com/linecorp/bot/model/message/AudioMessage.java

@@ -23,6 +23,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 
 import com.linecorp.bot.model.message.quickreply.QuickReply;
+import com.linecorp.bot.model.message.sender.Sender;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -54,13 +55,15 @@ public class AudioMessage implements Message {
 
     private final QuickReply quickReply;
 
+    private final Sender sender;
+
     /**
      * Constructor without {@link #quickReply} parameter.
      *
      * <p>If you want use {@link QuickReply}, please use {@link #builder()} instead.
      */
     public AudioMessage(final URI originalContentUrl, final Integer duration) {
-        this(originalContentUrl, duration, null);
+        this(originalContentUrl, duration, null, null);
     }
 
     @JsonPOJOBuilder(withPrefix = "")

line-bot-model/src/main/java/com/linecorp/bot/model/message/FlexMessage.java

@@ -22,6 +22,7 @@
 
 import com.linecorp.bot.model.message.flex.container.FlexContainer;
 import com.linecorp.bot.model.message.quickreply.QuickReply;
+import com.linecorp.bot.model.message.sender.Sender;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -50,6 +51,8 @@ public class FlexMessage implements Message {
 
     private final QuickReply quickReply;
 
+    private final Sender sender;
+
     /**
      * Constructor without {@link #quickReply} parameter.
      *
@@ -58,7 +61,7 @@ public class FlexMessage implements Message {
     public FlexMessage(
             final String altText,
             final FlexContainer contents) {
-        this(altText, contents, null);
+        this(altText, contents, null, null);
     }
 
     @JsonPOJOBuilder(withPrefix = "")

line-bot-model/src/main/java/com/linecorp/bot/model/message/ImageMessage.java

@@ -23,6 +23,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 
 import com.linecorp.bot.model.message.quickreply.QuickReply;
+import com.linecorp.bot.model.message.sender.Sender;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -41,14 +42,15 @@ public class ImageMessage implements Message {
     private final URI originalContentUrl;
     private final URI previewImageUrl;
     private final QuickReply quickReply;
+    private final Sender sender;
 
     /**
      * Constructor without {@link #quickReply} parameter.
      *
      * <p>If you want use {@link QuickReply}, please use {@link #builder()} instead.
      */
     public ImageMessage(final URI originalContentUrl, final URI previewImageUrl) {
-        this(originalContentUrl, previewImageUrl, null);
+        this(originalContentUrl, previewImageUrl, null, null);
     }
 
     @JsonPOJOBuilder(withPrefix = "")

line-bot-model/src/main/java/com/linecorp/bot/model/message/ImagemapMessage.java

@@ -27,6 +27,7 @@
 import com.linecorp.bot.model.message.imagemap.ImagemapBaseSize;
 import com.linecorp.bot.model.message.imagemap.ImagemapVideo;
 import com.linecorp.bot.model.message.quickreply.QuickReply;
+import com.linecorp.bot.model.message.sender.Sender;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -71,6 +72,8 @@ public class ImagemapMessage implements Message {
 
     private final QuickReply quickReply;
 
+    private final Sender sender;
+
     /**
      * Constructor without {@link #quickReply} parameter.
      *
@@ -84,7 +87,7 @@ public ImagemapMessage(
             final ImagemapBaseSize imagemapBaseSize,
             final List<ImagemapAction> actions,
             final ImagemapVideo imagemapVideo) {
-        this(baseUrl, altText, imagemapBaseSize, actions, imagemapVideo, null);
+        this(baseUrl, altText, imagemapBaseSize, actions, imagemapVideo, null, null);
     }
 
     /**

line-bot-model/src/main/java/com/linecorp/bot/model/message/LocationMessage.java

@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 
 import com.linecorp.bot.model.message.quickreply.QuickReply;
+import com.linecorp.bot.model.message.sender.Sender;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -58,14 +59,16 @@ public class LocationMessage implements Message {
 
     private final QuickReply quickReply;
 
+    private final Sender sender;
+
     /**
      * Constructor without {@link #quickReply} parameter.
      *
      * <p>If you want use {@link QuickReply}, please use {@link #builder()} instead.
      */
     public LocationMessage(
             final String title, final String address, final double latitude, final double longitude) {
-        this(title, address, latitude, longitude, null);
+        this(title, address, latitude, longitude, null, null);
     }
 
     @JsonPOJOBuilder(withPrefix = "")

line-bot-model/src/main/java/com/linecorp/bot/model/message/Message.java

@@ -23,6 +23,7 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
 
 import com.linecorp.bot.model.message.quickreply.QuickReply;
+import com.linecorp.bot.model.message.sender.Sender;
 
 /**
  * Interface of Message object.
@@ -52,4 +53,7 @@
 public interface Message {
     @JsonInclude(Include.NON_NULL)
     QuickReply getQuickReply();
+
+    @JsonInclude(Include.NON_NULL)
+    Sender getSender();
 }

line-bot-model/src/main/java/com/linecorp/bot/model/message/StickerMessage.java

@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 
 import com.linecorp.bot.model.message.quickreply.QuickReply;
+import com.linecorp.bot.model.message.sender.Sender;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -51,13 +52,15 @@ public class StickerMessage implements Message {
 
     private final QuickReply quickReply;
 
+    private final Sender sender;
+
     /**
      * Constructor without {@link #quickReply} parameter.
      *
      * <p>If you want use {@link QuickReply}, please use {@link #builder()} instead.
      */
     public StickerMessage(final String packageId, final String stickerId) {
-        this(packageId, stickerId, null);
+        this(packageId, stickerId, null, null);
     }
 
     @JsonPOJOBuilder(withPrefix = "")

line-bot-model/src/main/java/com/linecorp/bot/model/message/TemplateMessage.java

@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 
 import com.linecorp.bot.model.message.quickreply.QuickReply;
+import com.linecorp.bot.model.message.sender.Sender;
 import com.linecorp.bot.model.message.template.Template;
 
 import lombok.AccessLevel;
@@ -50,13 +51,15 @@ public class TemplateMessage implements Message {
 
     private final QuickReply quickReply;
 
+    private final Sender sender;
+
     /**
      * Constructor without {@link #quickReply} parameter.
      *
      * <p>If you want use {@link QuickReply}, please use {@link #builder()} instead.
      */
     public TemplateMessage(final String altText, final Template template) {
-        this(altText, template, null);
+        this(altText, template, null, null);
     }
 
     @JsonPOJOBuilder(withPrefix = "")

line-bot-model/src/main/java/com/linecorp/bot/model/message/TextMessage.java

@@ -21,30 +21,36 @@
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 
 import com.linecorp.bot.model.message.quickreply.QuickReply;
+import com.linecorp.bot.model.message.sender.Sender;
 
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
 import lombok.Value;
 
 @Value
 @Builder(toBuilder = true)
 @JsonTypeName("text")
-@RequiredArgsConstructor
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
 @JsonDeserialize(builder = TextMessage.TextMessageBuilder.class)
 public class TextMessage implements Message {
     @NonNull
     private final String text;
     private final QuickReply quickReply;
+    private final Sender sender;
 
     /**
      * Constructor without {@link #quickReply} parameter.
      *
      * <p>If you want use {@link QuickReply}, please use {@link #builder()} instead.
      */
     public TextMessage(final String text) {
-        this.text = text;
-        this.quickReply = null;
+        this(text, null, null);
+    }
+
+    public TextMessage(final @NonNull String text, final QuickReply quickReply) {
+        this(text, quickReply, null);
     }
 
     @JsonPOJOBuilder(withPrefix = "")

line-bot-model/src/main/java/com/linecorp/bot/model/message/VideoMessage.java

@@ -23,6 +23,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 
 import com.linecorp.bot.model.message.quickreply.QuickReply;
+import com.linecorp.bot.model.message.sender.Sender;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -64,13 +65,15 @@ public class VideoMessage implements Message {
 
     private final QuickReply quickReply;
 
+    private final Sender sender;
+
     /**
      * Constructor without {@link #quickReply} parameter.
      *
      * <p>If you want use {@link QuickReply}, please use {@link #builder()} instead.
      */
     public VideoMessage(final URI originalContentUrl, final URI previewImageUrl) {
-        this(originalContentUrl, previewImageUrl, null);
+        this(originalContentUrl, previewImageUrl, null, null);
     }
 
     @JsonPOJOBuilder(withPrefix = "")