Fix openpai generation bug when api has only one exception

babyfish-ct · Jan 9, 2024 · ab36bab · ab36bab
1 parent 9571cf2
commit ab36bab
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 4 deletions.
diff --git a/project/build.gradle.kts b/project/build.gradle.kts
@@ -1,4 +1,4 @@
 allprojects {
     group = "org.babyfish.jimmer"
-    version = "0.8.76"
+    version = "0.8.77"
 }
diff --git a/...r-client/src/main/java/org/babyfish/jimmer/client/generator/openapi/OpenApiGenerator.java b/...r-client/src/main/java/org/babyfish/jimmer/client/generator/openapi/OpenApiGenerator.java
@@ -282,7 +282,7 @@ private void generateResponses(Operation operation, YmlWriter writer) {
                         writer.object("application/json", () -> {
                             writer.object("schema", () -> {
                                 if (exceptionTypes.size() == 1) {
-                                    generateType(operation.getReturnType(), writer);
+                                    generateType(exceptionTypes.get(0), writer);
                                 } else {
                                     writer.list("oneOf", () -> {
                                         for (ObjectType exceptionType : exceptionTypes) {

diff --git a/...er-client/src/test/java/org/babyfish/jimmer/client/java/openapi/OpenApiGeneratorTest.java b/...er-client/src/test/java/org/babyfish/jimmer/client/java/openapi/OpenApiGeneratorTest.java
@@ -942,8 +942,29 @@ public void testTreeService() {
                         "            application/json:\n" +
                         "              schema:\n" +
                         "                $ref: '#/components/schemas/Tree_String'\n" +
+                        "        500:\n" +
+                        "          description: ERROR\n" +
+                        "          content:\n" +
+                        "            application/json:\n" +
+                        "              schema:\n" +
+                        "                $ref: '#/components/schemas/DepthTooBigException'\n" +
                         "components:\n" +
                         "  schemas:\n" +
+                        "    DepthTooBigException:\n" +
+                        "      type: object\n" +
+                        "      properties:\n" +
+                        "        family:\n" +
+                        "          type: string\n" +
+                        "          enum: [DEFAULT]\n" +
+                        "        code:\n" +
+                        "          type: string\n" +
+                        "          enum: [DEPTH_TOO_BIG]\n" +
+                        "        maxDepth:\n" +
+                        "          type: integer\n" +
+                        "          format: int32\n" +
+                        "        currentDepth:\n" +
+                        "          type: integer\n" +
+                        "          format: int32\n" +
                         "    SimpleTreeNodeView:\n" +
                         "      type: object\n" +
                         "      description: The tree node input defined by DTO language\n" +

diff --git a/...er-client/src/test/java/org/babyfish/jimmer/client/java/service/DepthTooBigException.java b/...er-client/src/test/java/org/babyfish/jimmer/client/java/service/DepthTooBigException.java
@@ -0,0 +1,25 @@
+package org.babyfish.jimmer.client.java.service;
+
+import org.babyfish.jimmer.error.CodeBasedException;
+import org.babyfish.jimmer.internal.ClientException;
+
+@ClientException(code = "DEPTH_TOO_BIG")
+public class DepthTooBigException extends CodeBasedException {
+
+    private final int maxDepth;
+
+    private final int currentDepth;
+
+    public DepthTooBigException(int maxDepth, int currentDepth) {
+        this.maxDepth = maxDepth;
+        this.currentDepth = currentDepth;
+    }
+
+    public int getMaxDepth() {
+        return maxDepth;
+    }
+
+    public int getCurrentDepth() {
+        return currentDepth;
+    }
+}
diff --git a/project/jimmer-client/src/test/java/org/babyfish/jimmer/client/java/service/TreeService.java b/project/jimmer-client/src/test/java/org/babyfish/jimmer/client/java/service/TreeService.java
@@ -64,7 +64,7 @@ Tree<Integer> getNumberTree(
     Tree<String> getStringTree(
             @RequestParam Integer depth,
             @RequestParam Integer breadth
-    );
+    ) throws DepthTooBigException;
 
     /**
      * Create query recursive tree roots by optional node name.

diff --git a/project/jimmer-client/src/test/java/org/babyfish/jimmer/client/java/ts/ApiErrorsTest.java b/project/jimmer-client/src/test/java/org/babyfish/jimmer/client/java/ts/ApiErrorsTest.java
@@ -100,6 +100,11 @@ public void testApiErrors() {
                         "        family: 'SAVE_COMMAND', \n" +
                         "        code: 'UNSTRUCTURED_ASSOCIATION', \n" +
                         "        exportedPath: ExportedSavePath\n" +
+                        "    } | {\n" +
+                        "        family: 'DEFAULT', \n" +
+                        "        code: 'DEPTH_TOO_BIG', \n" +
+                        "        maxDepth: number, \n" +
+                        "        currentDepth: number\n" +
                         "    };\n" +
                         "export type ApiErrors = {\n" +
                         "    'bookService': {\n" +
@@ -243,6 +248,11 @@ public void testApiErrors() {
                         "            })\n" +
                         "    }, \n" +
                         "    'treeService': {\n" +
+                        "        'getStringTree': AllErrors & ({\n" +
+                        "                family: 'DEFAULT', \n" +
+                        "                code: 'DEPTH_TOO_BIG', \n" +
+                        "                readonly [key:string]: any\n" +
+                        "            })\n" +
                         "    }\n" +
                         "};\n",
                 writer.toString()

diff --git a/project/jimmer-core/src/main/java/org/babyfish/jimmer/JimmerVersion.java b/project/jimmer-core/src/main/java/org/babyfish/jimmer/JimmerVersion.java
@@ -5,7 +5,7 @@
 public class JimmerVersion {
 
     public static final JimmerVersion CURRENT =
-            new JimmerVersion(0, 8, 76);
+            new JimmerVersion(0, 8, 77);
 
     private final int major;