#701,#725

babyfish-ct · Oct 26, 2024 · 0165d61 · 0165d61
1 parent 5f07e6d
commit 0165d61
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/project/gradle.properties b/project/gradle.properties
@@ -1,2 +1,2 @@
 group=org.babyfish.jimmer
-version=0.9.2
+version=0.9.3
diff --git a/.../jimmer-client/src/main/java/org/babyfish/jimmer/client/runtime/impl/MetadataBuilder.java b/.../jimmer-client/src/main/java/org/babyfish/jimmer/client/runtime/impl/MetadataBuilder.java
@@ -373,6 +373,15 @@ private ParameterImpl parameter(ApiParameter apiParameter, Parameter javaParamet
                             "path variable nor request body"
             );
         }
+        if (pathVariable != null && apiParameter.getType().isNullable()) {
+            throw new IllegalApiException(
+                    "Illegal API method \"" +
+                            method +
+                            "\", its parameter \"" +
+                            apiParameter.getName() +
+                            "\" cannot be nullable type because it is path variable"
+            );
+        }
 
         String defaultValue = parameterParser.defaultValue(javaParameter);
         parameter.setDefaultValue(defaultValue);

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
@@ -1113,6 +1113,7 @@ public void testTreeService() {
                         "      parameters:\n" +
                         "        - name: id\n" +
                         "          in: path\n" +
+                        "          required: true\n" +
                         "          schema:\n" +
                         "            type: integer\n" +
                         "            format: int64\n" +

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
@@ -81,7 +81,7 @@ Tree<String> getStringTree(
     @Api
     @GetMapping("/treeNode/{id}")
     @FetchBy("TREE_NODE_DETAIL_FETCHER") TreeNode getTreeNodeById(
-        @PathVariable("id") Long id
+        @PathVariable("id") long id
     );
 
     @Api

diff --git a/project/jimmer-client/src/test/java/org/babyfish/jimmer/client/java/ts/TreeServiceTest.java b/project/jimmer-client/src/test/java/org/babyfish/jimmer/client/java/ts/TreeServiceTest.java
@@ -248,7 +248,7 @@ public void testService() {
                         "        readonly name?: string | undefined\n" +
                         "    }, \n" +
                         "    'getTreeNodeById': {\n" +
-                        "        readonly id?: number | undefined\n" +
+                        "        readonly id: number\n" +
                         "    }, \n" +
                         "    'getSimpleRootNodes': {}\n" +
                         "}\n",