Fix: TextMessageV2.Substitution type

examples/echo_bot/server.go

@@ -64,6 +64,15 @@ func main() {
 								messaging_api.TextMessage{
 									Text: message.Text,
 								},
+								messaging_api.TextMessageV2{
+									Text: "Hello! {smile}",
+									Substitution: map[string]messaging_api.SubstitutionObjectInterface{
+										"smile": &messaging_api.EmojiSubstitutionObject{
+											ProductId: "5ac1bfd5040ab15980c9b435",
+											EmojiId: "002",
+										},
+									},
+								},
 							},
 						},
 					); err != nil {

generator/src/main/java/line/bot/generator/LineBotSdkGoGeneratorGenerator.java

@@ -82,6 +82,11 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
                         var.getVendorExtensions().put("x-is-discriminator-array", true);
                         model.getVendorExtensions().put("x-has-discriminator", true);
                         System.out.println("UnmarshalJSON[]: " + model.name + " " + var.name + " " + var.baseType + " " + var.complexType);
+                    } else if (var.baseType.equals("map") && discriminators.contains(var.complexType)) {
+                        // TextMessageV2 contains `map[string]SubstitutionObject`.
+                        // in this case, baseType=map, complexType=SubstitutionObject
+                        // UnmarshalJSON is not needed for this case.
+                        var.getVendorExtensions().put("x-is-discriminator-map", true);
                     } else if (discriminators.contains(var.dataType)) {
                         var.getVendorExtensions().put("x-is-discriminator", true);
                         model.getVendorExtensions().put("x-has-discriminator", true);
@@ -96,7 +101,10 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
     }
 
     private String type(CodegenModel model, CodegenProperty var) {
-        boolean isDiscriminator = var.vendorExtensions.get("x-is-discriminator-array") != null || var.vendorExtensions.get("x-is-discriminator") != null;
+        boolean isDiscriminator =
+                var.vendorExtensions.get("x-is-discriminator-array") != null ||
+                var.vendorExtensions.get("x-is-discriminator") != null ||
+                var.vendorExtensions.get("x-is-discriminator-map") != null;
 
         if (var.isEnum) {
             return model.classname + var.datatypeWithEnum;

linebot/messaging_api/model_text_message_v2.go

@@ -47,7 +47,7 @@ type TextMessageV2 struct {
 	/**
 	 * A mapping that specifies substitutions for parts enclosed in {} within the `text` field.
 	 */
-	Substitution map[string]SubstitutionObject `json:"substitution,omitempty"`
+	Substitution map[string]SubstitutionObjectInterface `json:"substitution,omitempty"`
 
 	/**
 	 * Quote token of the message you want to quote.

linebot/messaging_api/tests/handwritten/model_text_message_v2_test.go

@@ -0,0 +1,45 @@
+package tests
+
+import (
+	"encoding/json"
+	"strings"
+	"testing"
+
+	"github.com/line/line-bot-sdk-go/v8/linebot/messaging_api"
+)
+
+func TestTextMessageV2(t *testing.T) {
+	req := &messaging_api.ReplyMessageRequest{
+		ReplyToken: "JKLJDSFhkljdsjfkla",
+		Messages: []messaging_api.MessageInterface{
+			&messaging_api.TextMessageV2{
+				Text: "Hello, {newbee}! {smile}",
+				Substitution: map[string]messaging_api.SubstitutionObjectInterface{
+					"newbee": &messaging_api.MentionSubstitutionObject{
+						Mentionee: &messaging_api.UserMentionTarget{
+							UserId: "U1234567890abcdef1234567890abcdef",
+						},
+					},
+					"smile": &messaging_api.EmojiSubstitutionObject{
+						ProductId: "5ac1bfd5040ab15980c9b435",
+						EmojiId: "002",
+					},
+				},
+			},
+		},
+	}
+	encodedMsg, err := json.Marshal(req)
+	if err != nil {
+		t.Fatalf("Failed to encode message: %v", err)
+	}
+	encodedMsgStr := string(encodedMsg)
+	if !strings.Contains(encodedMsgStr, `"type":"textV2"`) {
+		t.Errorf("Encoded message doens't contains expected default value: %s", encodedMsgStr)
+	}
+	if !strings.Contains(encodedMsgStr, `"type":"mention"`) {
+		t.Errorf("Encoded message doens't contains expected default value: %s", encodedMsgStr)
+	}
+	if !strings.Contains(encodedMsgStr, `"type":"emoji"`) {
+		t.Errorf("Encoded message doens't contains expected default value: %s", encodedMsgStr)
+	}
+}