fix(deps): update dependency org.openapitools:openapi-generator to v7 (…

…#510)

* fix(deps): update dependency org.openapitools:openapi-generator to v7

* Tweaks for openapi-generator v7 (#512)

* fix(deps): update dependency org.openapitools:openapi-generator to v7

* Tweaks for openapi-generator v7

- `getAdditionalProperties()` method was moved to `ModelUtils`.
  - OpenAPITools/openapi-generator#16065
- update `tools/openapi-generator-cli.jar`
  - `wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.0.0/openapi-generator-cli-7.0.0.jar -O tools/openapi-generator-cli.jar`

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Tokuhiro Matsuno <tokuhirom@gmail.com>

generator/pom.xml

@@ -126,7 +126,7 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <openapi-generator-version>6.6.0</openapi-generator-version>
+        <openapi-generator-version>7.0.0</openapi-generator-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.13.2</junit-version>
     </properties>

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

@@ -406,7 +406,7 @@ public String getTypeDeclaration(Schema p) {
             Schema inner = ap.getItems();
             return getSchemaType(p) + "[" + getTypeDeclaration(inner) + "]";
         } else if (ModelUtils.isMapSchema(p)) {
-            Schema inner = getAdditionalProperties(p);
+            Schema inner = ModelUtils.getAdditionalProperties(p);
 
             return getSchemaType(p) + "[str, " + getTypeDeclaration(inner) + "]";
         }
@@ -1549,7 +1549,7 @@ public String generatorLanguageVersion() {
 
     @Override
     protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel, Schema schema) {
-        final Schema additionalProperties = getAdditionalProperties(schema);
+        final Schema additionalProperties = ModelUtils.getAdditionalProperties(schema);
 
         if (additionalProperties != null) {
             codegenModel.additionalPropertiesType = getSchemaType(additionalProperties);

linebot/v3/audience/api/async_manage_audience.py

@@ -1397,7 +1397,7 @@ def get_audience_groups_with_http_info(self, page : Annotated[conint(strict=True
             _query_params.append(('description', _params['description']))
 
         if _params.get('status') is not None:  # noqa: E501
-            _query_params.append(('status', _params['status']))
+            _query_params.append(('status', _params['status'].value))
 
         if _params.get('size') is not None:  # noqa: E501
             _query_params.append(('size', _params['size']))
@@ -1406,7 +1406,7 @@ def get_audience_groups_with_http_info(self, page : Annotated[conint(strict=True
             _query_params.append(('includesExternalPublicGroups', _params['includes_external_public_groups']))
 
         if _params.get('create_route') is not None:  # noqa: E501
-            _query_params.append(('createRoute', _params['create_route']))
+            _query_params.append(('createRoute', _params['create_route'].value))
 
         # process the header parameters
         _header_params = dict(_params.get('_headers', {}))

linebot/v3/audience/api/manage_audience.py

@@ -1305,7 +1305,7 @@ def get_audience_groups_with_http_info(self, page : Annotated[conint(strict=True
             _query_params.append(('description', _params['description']))
 
         if _params.get('status') is not None:  # noqa: E501
-            _query_params.append(('status', _params['status']))
+            _query_params.append(('status', _params['status'].value))
 
         if _params.get('size') is not None:  # noqa: E501
             _query_params.append(('size', _params['size']))
@@ -1314,7 +1314,7 @@ def get_audience_groups_with_http_info(self, page : Annotated[conint(strict=True
             _query_params.append(('includesExternalPublicGroups', _params['includes_external_public_groups']))
 
         if _params.get('create_route') is not None:  # noqa: E501
-            _query_params.append(('createRoute', _params['create_route']))
+            _query_params.append(('createRoute', _params['create_route'].value))
 
         # process the header parameters
         _header_params = dict(_params.get('_headers', {}))

linebot/v3/messaging/models/action.py

@@ -19,7 +19,7 @@
 import linebot.v3.messaging.models
 
 
-from typing import Optional
+from typing import Optional, Union
 from pydantic.v1 import BaseModel, Field, StrictStr
 
 class Action(BaseModel):

linebot/v3/messaging/models/age_demographic_filter.py

@@ -19,7 +19,7 @@
 
 
 from typing import Optional
-from pydantic.v1 import BaseModel
+
 from linebot.v3.messaging.models.age_demographic import AgeDemographic
 from linebot.v3.messaging.models.demographic_filter import DemographicFilter
 

linebot/v3/messaging/models/app_type_demographic_filter.py

@@ -19,7 +19,7 @@
 
 
 from typing import List, Optional
-from pydantic.v1 import BaseModel, Field, conlist
+from pydantic.v1 import Field, conlist
 from linebot.v3.messaging.models.app_type_demographic import AppTypeDemographic
 from linebot.v3.messaging.models.demographic_filter import DemographicFilter
 

linebot/v3/messaging/models/area_demographic_filter.py

@@ -19,7 +19,7 @@
 
 
 from typing import List, Optional
-from pydantic.v1 import BaseModel, Field, conlist
+from pydantic.v1 import Field, conlist
 from linebot.v3.messaging.models.area_demographic import AreaDemographic
 from linebot.v3.messaging.models.demographic_filter import DemographicFilter
 

linebot/v3/messaging/models/audience_recipient.py

@@ -19,7 +19,7 @@
 
 
 from typing import Optional
-from pydantic.v1 import BaseModel, Field, StrictInt
+from pydantic.v1 import Field, StrictInt
 from linebot.v3.messaging.models.recipient import Recipient
 
 class AudienceRecipient(Recipient):

linebot/v3/messaging/models/audio_message.py

@@ -19,7 +19,7 @@
 
 
 from typing import Optional
-from pydantic.v1 import BaseModel, Field, StrictInt, StrictStr
+from pydantic.v1 import Field, StrictInt, StrictStr
 from linebot.v3.messaging.models.message import Message
 from linebot.v3.messaging.models.quick_reply import QuickReply
 from linebot.v3.messaging.models.sender import Sender

linebot/v3/messaging/models/buttons_template.py

@@ -19,7 +19,7 @@
 
 
 from typing import List, Optional
-from pydantic.v1 import BaseModel, Field, StrictStr, conlist
+from pydantic.v1 import Field, StrictStr, conlist
 from linebot.v3.messaging.models.action import Action
 from linebot.v3.messaging.models.template import Template
 

linebot/v3/messaging/models/camera_action.py

@@ -19,7 +19,7 @@
 
 
 
-from pydantic.v1 import BaseModel
+
 from linebot.v3.messaging.models.action import Action
 
 class CameraAction(Action):

linebot/v3/messaging/models/camera_roll_action.py

@@ -19,7 +19,7 @@
 
 
 
-from pydantic.v1 import BaseModel
+
 from linebot.v3.messaging.models.action import Action
 
 class CameraRollAction(Action):

linebot/v3/messaging/models/carousel_template.py

@@ -19,7 +19,7 @@
 
 
 from typing import List, Optional
-from pydantic.v1 import BaseModel, Field, StrictStr, conlist
+from pydantic.v1 import Field, StrictStr, conlist
 from linebot.v3.messaging.models.carousel_column import CarouselColumn
 from linebot.v3.messaging.models.template import Template
 

linebot/v3/messaging/models/confirm_template.py

@@ -19,7 +19,7 @@
 
 
 from typing import List, Optional
-from pydantic.v1 import BaseModel, StrictStr, conlist
+from pydantic.v1 import StrictStr, conlist
 from linebot.v3.messaging.models.action import Action
 from linebot.v3.messaging.models.template import Template
 

linebot/v3/messaging/models/datetime_picker_action.py

@@ -19,7 +19,7 @@
 
 
 from typing import Optional
-from pydantic.v1 import BaseModel, StrictStr, constr, validator
+from pydantic.v1 import StrictStr, constr, validator
 from linebot.v3.messaging.models.action import Action
 
 class DatetimePickerAction(Action):

linebot/v3/messaging/models/demographic_filter.py

@@ -19,7 +19,7 @@
 import linebot.v3.messaging.models
 
 
-from typing import Optional
+from typing import Optional, Union
 from pydantic.v1 import BaseModel, Field, StrictStr
 
 class DemographicFilter(BaseModel):

linebot/v3/messaging/models/flex_box.py

@@ -19,7 +19,7 @@
 
 
 from typing import List, Optional
-from pydantic.v1 import BaseModel, Field, StrictInt, StrictStr, conlist, validator
+from pydantic.v1 import Field, StrictInt, StrictStr, conlist, validator
 from linebot.v3.messaging.models.action import Action
 from linebot.v3.messaging.models.flex_box_background import FlexBoxBackground
 from linebot.v3.messaging.models.flex_component import FlexComponent

linebot/v3/messaging/models/flex_box_background.py

@@ -19,7 +19,7 @@
 import linebot.v3.messaging.models
 
 
-
+from typing import Union
 from pydantic.v1 import BaseModel, Field, StrictStr
 
 class FlexBoxBackground(BaseModel):

linebot/v3/messaging/models/flex_box_linear_gradient.py

@@ -19,7 +19,7 @@
 
 
 from typing import Optional
-from pydantic.v1 import BaseModel, Field, StrictStr
+from pydantic.v1 import Field, StrictStr
 from linebot.v3.messaging.models.flex_box_background import FlexBoxBackground
 
 class FlexBoxLinearGradient(FlexBoxBackground):

linebot/v3/messaging/models/flex_bubble.py

@@ -19,7 +19,7 @@
 
 
 from typing import Optional
-from pydantic.v1 import BaseModel, StrictStr, validator
+from pydantic.v1 import StrictStr, validator
 from linebot.v3.messaging.models.action import Action
 from linebot.v3.messaging.models.flex_box import FlexBox
 from linebot.v3.messaging.models.flex_bubble_styles import FlexBubbleStyles

linebot/v3/messaging/models/flex_button.py

@@ -19,7 +19,7 @@
 
 
 from typing import Optional
-from pydantic.v1 import BaseModel, Field, StrictBool, StrictInt, StrictStr, validator
+from pydantic.v1 import Field, StrictBool, StrictInt, StrictStr, validator
 from linebot.v3.messaging.models.action import Action
 from linebot.v3.messaging.models.flex_component import FlexComponent
 

linebot/v3/messaging/models/flex_carousel.py

@@ -19,7 +19,7 @@
 
 
 from typing import List, Optional
-from pydantic.v1 import BaseModel, conlist
+from pydantic.v1 import conlist
 from linebot.v3.messaging.models.flex_bubble import FlexBubble
 from linebot.v3.messaging.models.flex_container import FlexContainer
 

linebot/v3/messaging/models/flex_component.py

@@ -19,7 +19,7 @@
 import linebot.v3.messaging.models
 
 
-
+from typing import Union
 from pydantic.v1 import BaseModel, Field, StrictStr
 
 class FlexComponent(BaseModel):

linebot/v3/messaging/models/flex_container.py

@@ -19,7 +19,7 @@
 import linebot.v3.messaging.models
 
 
-
+from typing import Union
 from pydantic.v1 import BaseModel, Field, StrictStr
 
 class FlexContainer(BaseModel):

linebot/v3/messaging/models/flex_filler.py

@@ -19,7 +19,7 @@
 
 
 from typing import Optional
-from pydantic.v1 import BaseModel, StrictInt
+from pydantic.v1 import StrictInt
 from linebot.v3.messaging.models.flex_component import FlexComponent
 
 class FlexFiller(FlexComponent):

linebot/v3/messaging/models/flex_icon.py

@@ -19,7 +19,7 @@
 
 
 from typing import Optional
-from pydantic.v1 import BaseModel, Field, StrictBool, StrictStr, validator
+from pydantic.v1 import Field, StrictBool, StrictStr, validator
 from linebot.v3.messaging.models.flex_component import FlexComponent
 
 class FlexIcon(FlexComponent):

linebot/v3/messaging/models/flex_image.py

@@ -19,7 +19,7 @@
 
 
 from typing import Optional
-from pydantic.v1 import BaseModel, Field, StrictBool, StrictInt, StrictStr, validator
+from pydantic.v1 import Field, StrictBool, StrictInt, StrictStr, validator
 from linebot.v3.messaging.models.action import Action
 from linebot.v3.messaging.models.flex_component import FlexComponent
 

linebot/v3/messaging/models/flex_message.py

@@ -19,7 +19,7 @@
 
 
 from typing import Optional
-from pydantic.v1 import BaseModel, Field, StrictStr
+from pydantic.v1 import Field, StrictStr
 from linebot.v3.messaging.models.flex_container import FlexContainer
 from linebot.v3.messaging.models.message import Message
 from linebot.v3.messaging.models.quick_reply import QuickReply

linebot/v3/messaging/models/flex_separator.py

@@ -19,7 +19,7 @@
 
 
 from typing import Optional
-from pydantic.v1 import BaseModel, StrictStr
+from pydantic.v1 import StrictStr
 from linebot.v3.messaging.models.flex_component import FlexComponent
 
 class FlexSeparator(FlexComponent):

linebot/v3/messaging/models/flex_span.py

@@ -19,7 +19,7 @@
 
 
 from typing import Optional
-from pydantic.v1 import BaseModel, StrictStr, validator
+from pydantic.v1 import StrictStr, validator
 from linebot.v3.messaging.models.flex_component import FlexComponent
 
 class FlexSpan(FlexComponent):

linebot/v3/messaging/models/flex_text.py

@@ -19,7 +19,7 @@
 
 
 from typing import List, Optional
-from pydantic.v1 import BaseModel, Field, StrictBool, StrictInt, StrictStr, conlist, validator
+from pydantic.v1 import Field, StrictBool, StrictInt, StrictStr, conlist, validator
 from linebot.v3.messaging.models.action import Action
 from linebot.v3.messaging.models.flex_component import FlexComponent
 from linebot.v3.messaging.models.flex_span import FlexSpan

linebot/v3/messaging/models/flex_video.py

@@ -19,7 +19,7 @@
 
 
 from typing import Optional
-from pydantic.v1 import BaseModel, Field, StrictStr
+from pydantic.v1 import Field, StrictStr
 from linebot.v3.messaging.models.action import Action
 from linebot.v3.messaging.models.flex_component import FlexComponent
 

linebot/v3/messaging/models/gender_demographic_filter.py

@@ -19,7 +19,7 @@
 
 
 from typing import List, Optional
-from pydantic.v1 import BaseModel, Field, conlist
+from pydantic.v1 import Field, conlist
 from linebot.v3.messaging.models.demographic_filter import DemographicFilter
 from linebot.v3.messaging.models.gender_demographic import GenderDemographic
 

linebot/v3/messaging/models/image_carousel_template.py

@@ -19,7 +19,7 @@
 
 
 from typing import List, Optional
-from pydantic.v1 import BaseModel, conlist
+from pydantic.v1 import conlist
 from linebot.v3.messaging.models.image_carousel_column import ImageCarouselColumn
 from linebot.v3.messaging.models.template import Template
 

linebot/v3/messaging/models/image_message.py

@@ -19,7 +19,7 @@
 
 
 from typing import Optional
-from pydantic.v1 import BaseModel, Field, StrictStr
+from pydantic.v1 import Field, StrictStr
 from linebot.v3.messaging.models.message import Message
 from linebot.v3.messaging.models.quick_reply import QuickReply
 from linebot.v3.messaging.models.sender import Sender

linebot/v3/messaging/models/imagemap_action.py

@@ -19,7 +19,7 @@
 import linebot.v3.messaging.models
 
 
-from typing import Optional
+from typing import Optional, Union
 from pydantic.v1 import BaseModel, Field, StrictStr
 from linebot.v3.messaging.models.imagemap_area import ImagemapArea
 

linebot/v3/messaging/models/imagemap_message.py

@@ -19,7 +19,7 @@
 
 
 from typing import List, Optional
-from pydantic.v1 import BaseModel, Field, StrictStr, conlist
+from pydantic.v1 import Field, StrictStr, conlist
 from linebot.v3.messaging.models.imagemap_action import ImagemapAction
 from linebot.v3.messaging.models.imagemap_base_size import ImagemapBaseSize
 from linebot.v3.messaging.models.imagemap_video import ImagemapVideo

linebot/v3/messaging/models/location_action.py

@@ -19,7 +19,7 @@
 
 
 
-from pydantic.v1 import BaseModel
+
 from linebot.v3.messaging.models.action import Action
 
 class LocationAction(Action):

linebot/v3/messaging/models/location_message.py

@@ -19,7 +19,7 @@
 
 
 from typing import Optional, Union
-from pydantic.v1 import BaseModel, StrictFloat, StrictInt, StrictStr
+from pydantic.v1 import StrictFloat, StrictInt, StrictStr
 from linebot.v3.messaging.models.message import Message
 from linebot.v3.messaging.models.quick_reply import QuickReply
 from linebot.v3.messaging.models.sender import Sender

linebot/v3/messaging/models/message.py

@@ -19,7 +19,7 @@
 import linebot.v3.messaging.models
 
 
-from typing import Optional
+from typing import Optional, Union
 from pydantic.v1 import BaseModel, Field, StrictStr
 from linebot.v3.messaging.models.quick_reply import QuickReply
 from linebot.v3.messaging.models.sender import Sender