drop discriminator enum

line · Oct 27, 2023 · ac8e394 · ac8e394
1 parent dab09d3
commit ac8e394
Show file tree

Hide file tree

Showing 100 changed files with 82 additions and 289 deletions.
diff --git a/generator/src/main/java/line/bot/generator/LineBotSdkGoGeneratorGenerator.java b/generator/src/main/java/line/bot/generator/LineBotSdkGoGeneratorGenerator.java
@@ -110,8 +110,6 @@ private String type(CodegenModel model, CodegenProperty var) {
             return var.datatypeWithEnum + "Interface";
         } else if (var.isModel) {
             return "*" + var.datatypeWithEnum;
-        } else if (model.parentModel != null && Objects.equals(model.parentModel.discriminator.getPropertyName(), var.name)) {
-            return model.parentModel.classname + model.parentModel.discriminator.getPropertyName();
         } else {
             return var.datatypeWithEnum;
         }

diff --git a/generator/src/main/resources/line-bot-sdk-go-generator/model/interface.pebble b/generator/src/main/resources/line-bot-sdk-go-generator/model/interface.pebble
@@ -5,17 +5,6 @@ import (
 	"errors"
 )
 
-{# Following enum is required??? maybe not used anymore. #}
-// {{ model.classname }}{{ model.discriminator.propertyName }} type
-type {{ model.classname }}{{ model.discriminator.propertyName }} string
-
-// {{ model.classname }}{{ model.discriminator.propertyName }} constants
-const (
-{% for mm in model.discriminator.mappedModels -%}
-	{{ model.classname }}{{ model.discriminator.propertyName }}{{ mm.mappingName | capitalize }}           {{ model.classname }}{{ model.discriminator.propertyName }} = "{{mm.modelName}}"
-{% endfor %}
-)
-
 {# e.g. MessageInterface #}
 type {{ model.classname }}Interface interface {
     Get{{ model.discriminator.propertyName }}() string

diff --git a/linebot/messaging_api/model_action.go b/linebot/messaging_api/model_action.go
@@ -25,21 +25,6 @@ import (
 	"log"
 )
 
-// ActionType type
-type ActionType string
-
-// ActionType constants
-const (
-	ActionTypeCamera         ActionType = "CameraAction"
-	ActionTypeCameraRoll     ActionType = "CameraRollAction"
-	ActionTypeDatetimepicker ActionType = "DatetimePickerAction"
-	ActionTypeLocation       ActionType = "LocationAction"
-	ActionTypeMessage        ActionType = "MessageAction"
-	ActionTypePostback       ActionType = "PostbackAction"
-	ActionTypeRichmenuswitch ActionType = "RichMenuSwitchAction"
-	ActionTypeUri            ActionType = "UriAction"
-)
-
 type ActionInterface interface {
 	GetType() string
 }

diff --git a/linebot/messaging_api/model_age_demographic_filter.go b/linebot/messaging_api/model_age_demographic_filter.go
@@ -56,7 +56,7 @@ func (r *AgeDemographicFilter) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type DemographicFilterType `json:"type,omitempty"`
+		Type string `json:"type,omitempty"`
 	}{
 		Alias: (*Alias)(r),
 

diff --git a/linebot/messaging_api/model_app_type_demographic_filter.go b/linebot/messaging_api/model_app_type_demographic_filter.go
@@ -51,7 +51,7 @@ func (r *AppTypeDemographicFilter) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type DemographicFilterType `json:"type,omitempty"`
+		Type string `json:"type,omitempty"`
 	}{
 		Alias: (*Alias)(r),
 

diff --git a/linebot/messaging_api/model_area_demographic_filter.go b/linebot/messaging_api/model_area_demographic_filter.go
@@ -51,7 +51,7 @@ func (r *AreaDemographicFilter) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type DemographicFilterType `json:"type,omitempty"`
+		Type string `json:"type,omitempty"`
 	}{
 		Alias: (*Alias)(r),
 

diff --git a/linebot/messaging_api/model_audience_recipient.go b/linebot/messaging_api/model_audience_recipient.go
@@ -51,7 +51,7 @@ func (r *AudienceRecipient) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type RecipientType `json:"type,omitempty"`
+		Type string `json:"type,omitempty"`
 	}{
 		Alias: (*Alias)(r),
 

diff --git a/linebot/messaging_api/model_audio_message.go b/linebot/messaging_api/model_audio_message.go
@@ -76,7 +76,7 @@ func (r *AudioMessage) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type MessageType `json:"type"`
+		Type string `json:"type"`
 	}{
 		Alias: (*Alias)(r),
 

diff --git a/linebot/messaging_api/model_buttons_template.go b/linebot/messaging_api/model_buttons_template.go
@@ -171,7 +171,7 @@ func (r *ButtonsTemplate) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type TemplateType `json:"type"`
+		Type string `json:"type"`
 
 		Actions []ActionInterface `json:"actions"`
 	}{

diff --git a/linebot/messaging_api/model_camera_action.go b/linebot/messaging_api/model_camera_action.go
@@ -51,7 +51,7 @@ func (r *CameraAction) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type ActionType `json:"type,omitempty"`
+		Type string `json:"type,omitempty"`
 	}{
 		Alias: (*Alias)(r),
 

diff --git a/linebot/messaging_api/model_camera_roll_action.go b/linebot/messaging_api/model_camera_roll_action.go
@@ -51,7 +51,7 @@ func (r *CameraRollAction) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type ActionType `json:"type,omitempty"`
+		Type string `json:"type,omitempty"`
 	}{
 		Alias: (*Alias)(r),
 

diff --git a/linebot/messaging_api/model_carousel_template.go b/linebot/messaging_api/model_carousel_template.go
@@ -67,7 +67,7 @@ func (r *CarouselTemplate) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type TemplateType `json:"type"`
+		Type string `json:"type"`
 	}{
 		Alias: (*Alias)(r),
 

diff --git a/linebot/messaging_api/model_confirm_template.go b/linebot/messaging_api/model_confirm_template.go
@@ -106,7 +106,7 @@ func (r *ConfirmTemplate) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type TemplateType `json:"type"`
+		Type string `json:"type"`
 
 		Actions []ActionInterface `json:"actions"`
 	}{

diff --git a/linebot/messaging_api/model_datetime_picker_action.go b/linebot/messaging_api/model_datetime_picker_action.go
@@ -76,7 +76,7 @@ func (r *DatetimePickerAction) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type ActionType `json:"type,omitempty"`
+		Type string `json:"type,omitempty"`
 	}{
 		Alias: (*Alias)(r),
 

diff --git a/linebot/messaging_api/model_demographic_filter.go b/linebot/messaging_api/model_demographic_filter.go
@@ -25,19 +25,6 @@ import (
 	"log"
 )
 
-// DemographicFilterType type
-type DemographicFilterType string
-
-// DemographicFilterType constants
-const (
-	DemographicFilterTypeAge                DemographicFilterType = "AgeDemographicFilter"
-	DemographicFilterTypeAppType            DemographicFilterType = "AppTypeDemographicFilter"
-	DemographicFilterTypeArea               DemographicFilterType = "AreaDemographicFilter"
-	DemographicFilterTypeGender             DemographicFilterType = "GenderDemographicFilter"
-	DemographicFilterTypeOperator           DemographicFilterType = "OperatorDemographicFilter"
-	DemographicFilterTypeSubscriptionPeriod DemographicFilterType = "SubscriptionPeriodDemographicFilter"
-)
-
 type DemographicFilterInterface interface {
 	GetType() string
 }

diff --git a/linebot/messaging_api/model_flex_box.go b/linebot/messaging_api/model_flex_box.go
@@ -366,7 +366,7 @@ func (r *FlexBox) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type FlexComponentType `json:"type"`
+		Type string `json:"type"`
 
 		Contents []FlexComponentInterface `json:"contents"`
 	}{

diff --git a/linebot/messaging_api/model_flex_box_background.go b/linebot/messaging_api/model_flex_box_background.go
@@ -25,14 +25,6 @@ import (
 	"log"
 )
 
-// FlexBoxBackgroundType type
-type FlexBoxBackgroundType string
-
-// FlexBoxBackgroundType constants
-const (
-	FlexBoxBackgroundTypeLinearGradient FlexBoxBackgroundType = "FlexBoxLinearGradient"
-)
-
 type FlexBoxBackgroundInterface interface {
 	GetType() string
 }

diff --git a/linebot/messaging_api/model_flex_box_linear_gradient.go b/linebot/messaging_api/model_flex_box_linear_gradient.go
@@ -71,7 +71,7 @@ func (r *FlexBoxLinearGradient) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type FlexBoxBackgroundType `json:"type"`
+		Type string `json:"type"`
 	}{
 		Alias: (*Alias)(r),
 

diff --git a/linebot/messaging_api/model_flex_bubble.go b/linebot/messaging_api/model_flex_bubble.go
@@ -151,7 +151,7 @@ func (r *FlexBubble) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type FlexContainerType `json:"type"`
+		Type string `json:"type"`
 	}{
 		Alias: (*Alias)(r),
 

diff --git a/linebot/messaging_api/model_flex_button.go b/linebot/messaging_api/model_flex_button.go
@@ -212,7 +212,7 @@ func (r *FlexButton) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type FlexComponentType `json:"type"`
+		Type string `json:"type"`
 	}{
 		Alias: (*Alias)(r),
 

diff --git a/linebot/messaging_api/model_flex_carousel.go b/linebot/messaging_api/model_flex_carousel.go
@@ -57,7 +57,7 @@ func (r *FlexCarousel) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type FlexContainerType `json:"type"`
+		Type string `json:"type"`
 	}{
 		Alias: (*Alias)(r),
 

diff --git a/linebot/messaging_api/model_flex_component.go b/linebot/messaging_api/model_flex_component.go
@@ -25,22 +25,6 @@ import (
 	"log"
 )
 
-// FlexComponentType type
-type FlexComponentType string
-
-// FlexComponentType constants
-const (
-	FlexComponentTypeBox       FlexComponentType = "FlexBox"
-	FlexComponentTypeButton    FlexComponentType = "FlexButton"
-	FlexComponentTypeFiller    FlexComponentType = "FlexFiller"
-	FlexComponentTypeIcon      FlexComponentType = "FlexIcon"
-	FlexComponentTypeImage     FlexComponentType = "FlexImage"
-	FlexComponentTypeSeparator FlexComponentType = "FlexSeparator"
-	FlexComponentTypeSpan      FlexComponentType = "FlexSpan"
-	FlexComponentTypeText      FlexComponentType = "FlexText"
-	FlexComponentTypeVideo     FlexComponentType = "FlexVideo"
-)
-
 type FlexComponentInterface interface {
 	GetType() string
 }

diff --git a/linebot/messaging_api/model_flex_container.go b/linebot/messaging_api/model_flex_container.go
@@ -25,15 +25,6 @@ import (
 	"log"
 )
 
-// FlexContainerType type
-type FlexContainerType string
-
-// FlexContainerType constants
-const (
-	FlexContainerTypeBubble   FlexContainerType = "FlexBubble"
-	FlexContainerTypeCarousel FlexContainerType = "FlexCarousel"
-)
-
 type FlexContainerInterface interface {
 	GetType() string
 }

diff --git a/linebot/messaging_api/model_flex_filler.go b/linebot/messaging_api/model_flex_filler.go
@@ -51,7 +51,7 @@ func (r *FlexFiller) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type FlexComponentType `json:"type"`
+		Type string `json:"type"`
 	}{
 		Alias: (*Alias)(r),
 

diff --git a/linebot/messaging_api/model_flex_icon.go b/linebot/messaging_api/model_flex_icon.go
@@ -102,7 +102,7 @@ func (r *FlexIcon) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type FlexComponentType `json:"type"`
+		Type string `json:"type"`
 	}{
 		Alias: (*Alias)(r),
 

diff --git a/linebot/messaging_api/model_flex_image.go b/linebot/messaging_api/model_flex_image.go
@@ -232,7 +232,7 @@ func (r *FlexImage) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type FlexComponentType `json:"type"`
+		Type string `json:"type"`
 	}{
 		Alias: (*Alias)(r),
 

diff --git a/linebot/messaging_api/model_flex_message.go b/linebot/messaging_api/model_flex_message.go
@@ -116,7 +116,7 @@ func (r *FlexMessage) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type MessageType `json:"type"`
+		Type string `json:"type"`
 	}{
 		Alias: (*Alias)(r),
 

diff --git a/linebot/messaging_api/model_flex_separator.go b/linebot/messaging_api/model_flex_separator.go
@@ -56,7 +56,7 @@ func (r *FlexSeparator) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type FlexComponentType `json:"type"`
+		Type string `json:"type"`
 	}{
 		Alias: (*Alias)(r),
 

diff --git a/linebot/messaging_api/model_flex_span.go b/linebot/messaging_api/model_flex_span.go
@@ -76,7 +76,7 @@ func (r *FlexSpan) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type FlexComponentType `json:"type"`
+		Type string `json:"type"`
 	}{
 		Alias: (*Alias)(r),
 

diff --git a/linebot/messaging_api/model_flex_text.go b/linebot/messaging_api/model_flex_text.go
@@ -286,7 +286,7 @@ func (r *FlexText) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type FlexComponentType `json:"type"`
+		Type string `json:"type"`
 	}{
 		Alias: (*Alias)(r),
 

diff --git a/linebot/messaging_api/model_flex_video.go b/linebot/messaging_api/model_flex_video.go
@@ -135,7 +135,7 @@ func (r *FlexVideo) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type FlexComponentType `json:"type"`
+		Type string `json:"type"`
 	}{
 		Alias: (*Alias)(r),
 

diff --git a/linebot/messaging_api/model_gender_demographic_filter.go b/linebot/messaging_api/model_gender_demographic_filter.go
@@ -51,7 +51,7 @@ func (r *GenderDemographicFilter) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type DemographicFilterType `json:"type,omitempty"`
+		Type string `json:"type,omitempty"`
 	}{
 		Alias: (*Alias)(r),
 

diff --git a/linebot/messaging_api/model_image_carousel_template.go b/linebot/messaging_api/model_image_carousel_template.go
@@ -57,7 +57,7 @@ func (r *ImageCarouselTemplate) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type TemplateType `json:"type"`
+		Type string `json:"type"`
 	}{
 		Alias: (*Alias)(r),
 

diff --git a/linebot/messaging_api/model_image_message.go b/linebot/messaging_api/model_image_message.go
@@ -76,7 +76,7 @@ func (r *ImageMessage) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type MessageType `json:"type"`
+		Type string `json:"type"`
 	}{
 		Alias: (*Alias)(r),
 

diff --git a/linebot/messaging_api/model_imagemap_action.go b/linebot/messaging_api/model_imagemap_action.go
@@ -25,15 +25,6 @@ import (
 	"log"
 )
 
-// ImagemapActionType type
-type ImagemapActionType string
-
-// ImagemapActionType constants
-const (
-	ImagemapActionTypeMessage ImagemapActionType = "MessageImagemapAction"
-	ImagemapActionTypeUri     ImagemapActionType = "UriImagemapAction"
-)
-
 type ImagemapActionInterface interface {
 	GetType() string
 }

diff --git a/linebot/messaging_api/model_imagemap_message.go b/linebot/messaging_api/model_imagemap_message.go
@@ -164,7 +164,7 @@ func (r *ImagemapMessage) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type MessageType `json:"type"`
+		Type string `json:"type"`
 
 		Actions []ImagemapActionInterface `json:"actions"`
 	}{

diff --git a/linebot/messaging_api/model_location_action.go b/linebot/messaging_api/model_location_action.go
@@ -51,7 +51,7 @@ func (r *LocationAction) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&struct {
 		*Alias
 
-		Type ActionType `json:"type,omitempty"`
+		Type string `json:"type,omitempty"`
 	}{
 		Alias: (*Alias)(r),