From 28b4dbcaf5127182efd98d3ce55286ff083d246f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=B5=E3=81=81?= <yuki@yuki0311.com>
Date: Thu, 7 Nov 2024 01:17:14 +0900
Subject: [PATCH] remove removeLegacyDiscriminatorBehavior

---
 test/python/test_serialize.py |  2 +-
 tools/build_config.py         | 18 +-----------------
 tools/hooks.py                | 20 ++++++++++----------
 3 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/test/python/test_serialize.py b/test/python/test_serialize.py
index 69f5b93..03bf55b 100644
--- a/test/python/test_serialize.py
+++ b/test/python/test_serialize.py
@@ -238,7 +238,7 @@ if __name__ == "__main__":
             data = json.load(f)
 
         try:
-            _ = pt.Errors.from_dict(data)
+            _ = pt.TweetDetailResponse.from_dict(data)
         except Exception as e:
             error_dump(e)
     access_token = "AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA"
diff --git a/tools/build_config.py b/tools/build_config.py
index 12d9a84..f41be08 100644
--- a/tools/build_config.py
+++ b/tools/build_config.py
@@ -3,7 +3,6 @@ from hooks import (
     AddParametersOnContent,
     AddParametersOnParameters,
     AddPathQueryIdOnParameters,
-    RemoveErrorHandle,
     SetResponsesHeader,
 )
 
@@ -12,11 +11,7 @@ class Config:
     OUTPUT_DIR = "dist/{0}"
     INPUT_DIR = "src/openapi"
 
-    def hooks_generator(
-        self,
-        queryParameterJson=True,
-        removeLegacyDiscriminatorBehavior=False,
-    ):
+    def hooks_generator(self, queryParameterJson=True):
         # https://stackoverflow.com/questions/34820064/defining-an-api-with-swagger-get-call-that-uses-json-in-parameters/45223964
         if queryParameterJson:
             # ["parameters"][0]["content"]["application/json"]["schema"]
@@ -33,11 +28,6 @@ class Config:
                 ignoreKeys=["queryId"],
             )
 
-        # https://github.com/OpenAPITools/openapi-generator/issues/15373
-        additionalHooks = []
-        if removeLegacyDiscriminatorBehavior:
-            additionalHooks.append(RemoveErrorHandle())
-
         return {
             "openapi": [],
             "schemas": [],
@@ -47,7 +37,6 @@ class Config:
                     SetResponsesHeader(),
                     AddPathQueryIdOnParameters(split=-1),
                     getParamHook,
-                    *additionalHooks,
                 ]
                 for key in ["default", "user", "users", "user-list", "tweet"]
             }
@@ -60,7 +49,6 @@ class Config:
                         schemaType=None,
                         contentType="application/json",
                     ),
-                    *additionalHooks,
                 ]
                 for key in ["post"]
             }
@@ -91,8 +79,4 @@ class Config:
             "compatible": self.hooks_generator(
                 queryParameterJson=False,
             ),
-            "compatible_discriminator": self.hooks_generator(
-                queryParameterJson=False,
-                removeLegacyDiscriminatorBehavior=True,
-            ),
         }
diff --git a/tools/hooks.py b/tools/hooks.py
index 8f25df6..944dcad 100644
--- a/tools/hooks.py
+++ b/tools/hooks.py
@@ -125,11 +125,11 @@ class RequestHookBase(HookBase):
 # SchemasHookBase extends
 
 
-class RemoveDiscriminator(SchemasHookBase):
-    def hook(self, value: dict):
-        if value.get("discriminator") is not None:
-            del value["discriminator"]
-        return value
+# class RemoveDiscriminator(SchemasHookBase):
+#     def hook(self, value: dict):
+#         if value.get("discriminator") is not None:
+#             del value["discriminator"]
+#         return value
 
 
 class SchemasCheck(SchemasHookBase):
@@ -218,11 +218,11 @@ class AddPathQueryIdOnParameters(RequestHookBase):
         return path, value
 
 
-class RemoveErrorHandle(RequestHookBase):
-    def hook(self, path: str, value: dict):
-        content = value["responses"]["200"]["content"]["application/json"]
-        content["schema"] = content["schema"]["oneOf"][0]
-        return path, value
+# class RemoveErrorHandle(RequestHookBase):
+#     def hook(self, path: str, value: dict):
+#         content = value["responses"]["200"]["content"]["application/json"]
+#         content["schema"] = content["schema"]["oneOf"][0]
+#         return path, value
 
 
 # OnParameters