Support for dynamic initialization of nested classes (#461)

When classes are nested, child classes were not initialized.
This caused the following problems
- Need to write webhook parser by hand with detailed conditionals
#404
- Responses could not be parsed correctly
#440

This PR resolves those problems.
This also adds support for `MembershipEvent`, which was not supported by
the webhook parser. 61c4a5a

Author: mokuzon

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

@@ -2,8 +2,10 @@
 
 import java.io.File;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import org.openapitools.codegen.CodegenDiscriminator;
 import org.openapitools.codegen.CodegenModel;
@@ -79,19 +81,42 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
         for (ModelsMap entry : result.values()) {
             for (ModelMap mo : entry.getModels()) {
                 CodegenModel cm = mo.getModel();
+                final Map<String, Object> selector = new HashMap<>();
 
                 if (cm.getParentModel() != null) {
                     final CodegenDiscriminator discriminator = cm.getParentModel().getDiscriminator();
                     final Optional<String> mappingNameOptional = discriminator.getMappedModels().stream().filter(
                             it -> it.getModelName().equals(cm.name)
                     ).map(CodegenDiscriminator.MappedModel::getMappingName).findFirst();
                     mappingNameOptional.ifPresent(mappingName -> {
-                        final Map<String, Object> selector = new HashMap<>();
                         selector.put("propertyName", discriminator.getPropertyName());
                         selector.put("mappingName", mappingName);
                         cm.getVendorExtensions().put("x-selector", selector);
                     });
                 }
+
+                if (cm.getChildren() != null && cm.getDiscriminator() != null) {
+                    final List<Map<String, String>> childMappings =
+                        cm.getChildren().stream()
+                            .map(child -> {
+                                Map<String, String> childInfo = new HashMap<>();
+                                childInfo.put("className", child.name);
+
+                                final CodegenDiscriminator discriminator = cm.getDiscriminator();
+                                if (discriminator != null) {
+                                    discriminator.getMappedModels().stream()
+                                                 .filter(mappedModel -> mappedModel.getModelName().equals(child.name))
+                                                 .findFirst()
+                                                 .ifPresent(mappedModel -> childInfo.put("typeName", mappedModel.getMappingName()));
+                                }
+
+                                return childInfo;
+                            })
+                            .collect(Collectors.toList());
+
+                    cm.getVendorExtensions().put("x-children", childMappings);
+                    cm.getVendorExtensions().put("x-discriminator-property", cm.getDiscriminator().getPropertyName());
+                }
             }
         }
         return result;

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

@@ -2,8 +2,10 @@
 
 import java.io.File;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import org.openapitools.codegen.CodegenDiscriminator;
 import org.openapitools.codegen.CodegenModel;
@@ -80,19 +82,42 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
         for (ModelsMap entry : result.values()) {
             for (ModelMap mo : entry.getModels()) {
                 CodegenModel cm = mo.getModel();
+                final Map<String, Object> selector = new HashMap<>();
 
                 if (cm.getParentModel() != null) {
                     final CodegenDiscriminator discriminator = cm.getParentModel().getDiscriminator();
                     final Optional<String> mappingNameOptional = discriminator.getMappedModels().stream().filter(
                             it -> it.getModelName().equals(cm.name)
                     ).map(CodegenDiscriminator.MappedModel::getMappingName).findFirst();
                     mappingNameOptional.ifPresent(mappingName -> {
-                        final Map<String, Object> selector = new HashMap<>();
                         selector.put("propertyName", discriminator.getPropertyName());
                         selector.put("mappingName", mappingName);
                         cm.getVendorExtensions().put("x-selector", selector);
                     });
                 }
+
+                if (cm.getChildren() != null && cm.getDiscriminator() != null) {
+                    final List<Map<String, String>> childMappings =
+                            cm.getChildren().stream()
+                              .map(child -> {
+                                  Map<String, String> childInfo = new HashMap<>();
+                                  childInfo.put("className", child.name);
+
+                                  final CodegenDiscriminator discriminator = cm.getDiscriminator();
+                                  if (discriminator != null) {
+                                      discriminator.getMappedModels().stream()
+                                                   .filter(mappedModel -> mappedModel.getModelName().equals(child.name))
+                                                   .findFirst()
+                                                   .ifPresent(mappedModel -> childInfo.put("typeName", mappedModel.getMappingName()));
+                                  }
+
+                                  return childInfo;
+                              })
+                              .collect(Collectors.toList());
+
+                    cm.getVendorExtensions().put("x-children", childMappings);
+                    cm.getVendorExtensions().put("x-discriminator-property", cm.getDiscriminator().getPropertyName());
+                }
             }
         }
         return result;

generator/src/main/resources/line-bot-sdk-ruby-generator/model.pebble

@@ -25,20 +25,57 @@ module Line
           {% if model.model.vendorExtensions.get("x-selector").propertyName != property.name %}attr_accessor{% else %}attr_reader{% endif %} :{{ property.name }}{% if property.description != null %} # {{ property.description }}{% endif %}
           {%- endfor %}
 
-          def initialize({% for property in model.model.vars %}{% if model.model.vendorExtensions.get("x-selector").propertyName != property.name or packageName == 'webhook' %}
+          def initialize({% for property in model.model.vars %}{% if model.model.vendorExtensions.get("x-selector").propertyName != property.name %}
             {{ property.name }}:{% if property.defaultValue == null %}{{ property.required ? '' : ' nil'  }}{% else %}{{ ' ' + property.defaultValue }}{% endif %},{% endif %}{% endfor %}
             **dynamic_attributes
           )
-            {% if model.model.vendorExtensions.get("x-selector") != null %}@{{model.model.vendorExtensions.get("x-selector").propertyName}} = "{{model.model.vendorExtensions.get("x-selector").mappingName}}"{% endif -%}
+            {% if model.model.vendorExtensions.get("x-selector") != null %}@{{model.model.vendorExtensions.get("x-selector").propertyName}} = "{{model.model.vendorExtensions.get("x-selector").mappingName}}"{%- endif -%}
             {%- for property in model.model.vars %}
-            {% if model.model.vendorExtensions.get("x-selector").propertyName != property.name %}@{{ property.name }} = {{ property.name }}{% endif -%}
-            {% endfor %}
+            {% if property.isArray -%}
+            @{{ property.name }} = {{ property.name }}{{ property.required ? '' : '&'  }}.map do |item|
+              if item.is_a?(Hash)
+                Line::Bot::V2::{{ packageName | camelize }}::{{ property.complexType }}.create(**item)
+              else
+                item
+              end
+            end
+            {%- elseif property.isModel -%}
+            @{{ property.name }} = {{ property.name }}.is_a?(Line::Bot::V2::{{ packageName | camelize }}::{{ property.baseType }}){% if not property.required %} || {{ property.name }}.nil?{% endif %} ? {{ property.name }} : Line::Bot::V2::{{ packageName | camelize }}::{{ property.baseType }}.create(**{{ property.name }})
+            {%- elseif model.model.vendorExtensions.get("x-selector").propertyName != property.name -%}
+            @{{ property.name }} = {{ property.name }}
+            {%- endif -%}
+            {%- endfor %}
 
             dynamic_attributes.each do |key, value|
               self.class.attr_accessor key
-              instance_variable_set("@#{key}", value)
+
+              if value.is_a?(Hash)
+                struct_klass = Struct.new(*value.keys.map(&:to_sym))
+                struct_values = value.map { |_k, v| v.is_a?(Hash) ? Line::Bot::V2::Utils.hash_to_struct(v) : v }
+                instance_variable_set("@#{key}", struct_klass.new(*struct_values))
+              else
+                instance_variable_set("@#{key}", value)
+              end
             end
           end
+
+          def self.create(args){% if model.model.vendorExtensions.get("x-children") != null and model.model.vendorExtensions.get("x-discriminator-property") != null %}
+            klass = detect_class(args[:{{ model.model.vendorExtensions.get("x-discriminator-property") }}])
+            return klass.new(**args) if klass
+            {% endif %}
+            return new(**args)
+          end
+          {%- if model.model.vendorExtensions.get("x-children") != null %}
+
+          private
+
+          def self.detect_class(type)
+            {
+              {%- for child in model.model.vendorExtensions.get("x-children") %}
+              {{ child.typeName }}: Line::Bot::V2::{{ packageName | camelize }}::{{ child.className }},
+              {%- endfor %}
+            }[type.to_sym]
+          end{% endif %}
         end
       end
     end

generator/src/main/resources/line-bot-sdk-ruby-rbs-generator/model.pebble

@@ -58,6 +58,14 @@ module Line
             {% endif %}{{ loop.last ? '' : ",
             " }}{% endif %}{% endfor %}
           ) -> void
+
+          def self.create: (args: Hash[Symbol, untyped]) -> {{ model.model.classname }}
+          {%- if model.model.vendorExtensions.get("x-children") != null %}
+
+          private
+
+          def self.detect_class: (type: String) -> Class
+          {%- endif %}
           {%- endif %}
         end
       end

lib/line/bot/v2/channel_access_token/model/channel_access_token_key_ids_response.rb

@@ -21,13 +21,30 @@ def initialize(
             **dynamic_attributes
           )
 
-            @kids = kids
+            @kids = kids.map do |item|
+              if item.is_a?(Hash)
+                Line::Bot::V2::ChannelAccessToken::string.create(**item)
+              else
+                item
+              end
+            end
 
             dynamic_attributes.each do |key, value|
               self.class.attr_accessor key
-              instance_variable_set("@#{key}", value)
+
+              if value.is_a?(Hash)
+                struct_klass = Struct.new(*value.keys.map(&:to_sym))
+                struct_values = value.map { |_k, v| v.is_a?(Hash) ? Line::Bot::V2::Utils.hash_to_struct(v) : v }
+                instance_variable_set("@#{key}", struct_klass.new(*struct_values))
+              else
+                instance_variable_set("@#{key}", value)
+              end
             end
           end
+
+          def self.create(args)
+            return new(**args)
+          end
         end
       end
     end

lib/line/bot/v2/channel_access_token/model/error_response.rb

@@ -27,9 +27,20 @@ def initialize(
 
             dynamic_attributes.each do |key, value|
               self.class.attr_accessor key
-              instance_variable_set("@#{key}", value)
+
+              if value.is_a?(Hash)
+                struct_klass = Struct.new(*value.keys.map(&:to_sym))
+                struct_values = value.map { |_k, v| v.is_a?(Hash) ? Line::Bot::V2::Utils.hash_to_struct(v) : v }
+                instance_variable_set("@#{key}", struct_klass.new(*struct_values))
+              else
+                instance_variable_set("@#{key}", value)
+              end
             end
           end
+
+          def self.create(args)
+            return new(**args)
+          end
         end
       end
     end

lib/line/bot/v2/channel_access_token/model/issue_channel_access_token_response.rb

@@ -34,9 +34,20 @@ def initialize(
 
             dynamic_attributes.each do |key, value|
               self.class.attr_accessor key
-              instance_variable_set("@#{key}", value)
+
+              if value.is_a?(Hash)
+                struct_klass = Struct.new(*value.keys.map(&:to_sym))
+                struct_values = value.map { |_k, v| v.is_a?(Hash) ? Line::Bot::V2::Utils.hash_to_struct(v) : v }
+                instance_variable_set("@#{key}", struct_klass.new(*struct_values))
+              else
+                instance_variable_set("@#{key}", value)
+              end
             end
           end
+
+          def self.create(args)
+            return new(**args)
+          end
         end
       end
     end

lib/line/bot/v2/channel_access_token/model/issue_short_lived_channel_access_token_response.rb

@@ -31,9 +31,20 @@ def initialize(
 
             dynamic_attributes.each do |key, value|
               self.class.attr_accessor key
-              instance_variable_set("@#{key}", value)
+
+              if value.is_a?(Hash)
+                struct_klass = Struct.new(*value.keys.map(&:to_sym))
+                struct_values = value.map { |_k, v| v.is_a?(Hash) ? Line::Bot::V2::Utils.hash_to_struct(v) : v }
+                instance_variable_set("@#{key}", struct_klass.new(*struct_values))
+              else
+                instance_variable_set("@#{key}", value)
+              end
             end
           end
+
+          def self.create(args)
+            return new(**args)
+          end
         end
       end
     end

lib/line/bot/v2/channel_access_token/model/issue_stateless_channel_access_token_response.rb

@@ -31,9 +31,20 @@ def initialize(
 
             dynamic_attributes.each do |key, value|
               self.class.attr_accessor key
-              instance_variable_set("@#{key}", value)
+
+              if value.is_a?(Hash)
+                struct_klass = Struct.new(*value.keys.map(&:to_sym))
+                struct_values = value.map { |_k, v| v.is_a?(Hash) ? Line::Bot::V2::Utils.hash_to_struct(v) : v }
+                instance_variable_set("@#{key}", struct_klass.new(*struct_values))
+              else
+                instance_variable_set("@#{key}", value)
+              end
             end
           end
+
+          def self.create(args)
+            return new(**args)
+          end
         end
       end
     end

lib/line/bot/v2/channel_access_token/model/verify_channel_access_token_response.rb

@@ -30,9 +30,20 @@ def initialize(
 
             dynamic_attributes.each do |key, value|
               self.class.attr_accessor key
-              instance_variable_set("@#{key}", value)
+
+              if value.is_a?(Hash)
+                struct_klass = Struct.new(*value.keys.map(&:to_sym))
+                struct_values = value.map { |_k, v| v.is_a?(Hash) ? Line::Bot::V2::Utils.hash_to_struct(v) : v }
+                instance_variable_set("@#{key}", struct_klass.new(*struct_values))
+              else
+                instance_variable_set("@#{key}", value)
+              end
             end
           end
+
+          def self.create(args)
+            return new(**args)
+          end
         end
       end
     end