Rest data with panache: add the parameter names in resources

Fix quarkusio#29047
pedroh-pereira · Nov 14, 2022 · 52538d5 · 52538d5
1 parent bb2d0ac
commit 52538d5
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 4 deletions.
diff --git a/...t/src/main/java/io/quarkus/rest/data/panache/deployment/methods/AddMethodImplementor.java b/...t/src/main/java/io/quarkus/rest/data/panache/deployment/methods/AddMethodImplementor.java
@@ -103,6 +103,7 @@ protected void implementInternal(ClassCreator classCreator, ResourceMetadata res
         MethodCreator methodCreator = SignatureMethodCreator.getMethodCreator(METHOD_NAME, classCreator,
                 isNotReactivePanache() ? ofType(Response.class) : ofType(Uni.class, resourceMetadata.getEntityType()),
                 resourceMetadata.getEntityType());
+        methodCreator.setParameterNames(new String[] { "entity" });
 
         // Add method annotations
         addPathAnnotation(methodCreator, resourceProperties.getPath(RESOURCE_METHOD_NAME));

diff --git a/...rc/main/java/io/quarkus/rest/data/panache/deployment/methods/DeleteMethodImplementor.java b/...rc/main/java/io/quarkus/rest/data/panache/deployment/methods/DeleteMethodImplementor.java
@@ -84,6 +84,7 @@ protected void implementInternal(ClassCreator classCreator, ResourceMetadata res
         MethodCreator methodCreator = SignatureMethodCreator.getMethodCreator(METHOD_NAME, classCreator,
                 isNotReactivePanache() ? ofType(Response.class) : ofType(Uni.class, resourceMetadata.getEntityType()),
                 resourceMetadata.getIdType());
+        methodCreator.setParameterNames(new String[] { "id" });
 
         // Add method annotations
         addPathAnnotation(methodCreator, appendToPath(resourceProperties.getPath(RESOURCE_METHOD_NAME), "{id}"));

diff --git a/...t/src/main/java/io/quarkus/rest/data/panache/deployment/methods/GetMethodImplementor.java b/...t/src/main/java/io/quarkus/rest/data/panache/deployment/methods/GetMethodImplementor.java
@@ -86,6 +86,7 @@ protected void implementInternal(ClassCreator classCreator, ResourceMetadata res
         MethodCreator methodCreator = SignatureMethodCreator.getMethodCreator(METHOD_NAME, classCreator,
                 isNotReactivePanache() ? ofType(Response.class) : ofType(Uni.class, resourceMetadata.getEntityType()),
                 resourceMetadata.getIdType());
+        methodCreator.setParameterNames(new String[] { "id" });
 
         // Add method annotations
         addPathAnnotation(methodCreator, appendToPath(resourceProperties.getPath(RESOURCE_METHOD_NAME), "{id}"));

diff --git a/.../src/main/java/io/quarkus/rest/data/panache/deployment/methods/ListMethodImplementor.java b/.../src/main/java/io/quarkus/rest/data/panache/deployment/methods/ListMethodImplementor.java
@@ -137,6 +137,7 @@ private void implementPaged(ClassCreator classCreator, ResourceMetadata resource
         MethodCreator methodCreator = SignatureMethodCreator.getMethodCreator(METHOD_NAME, classCreator,
                 isNotReactivePanache() ? ofType(Response.class) : ofType(Uni.class, resourceMetadata.getEntityType()),
                 List.class, int.class, int.class, UriInfo.class);
+        methodCreator.setParameterNames(new String[] { "sort", "page", "size", "uriInfo" });
 
         // Add method annotations
         addGetAnnotation(methodCreator);
@@ -205,6 +206,7 @@ private void implementNotPaged(ClassCreator classCreator, ResourceMetadata resou
         MethodCreator methodCreator = SignatureMethodCreator.getMethodCreator(METHOD_NAME, classCreator,
                 isNotReactivePanache() ? ofType(Response.class) : ofType(Uni.class, resourceMetadata.getEntityType()),
                 List.class);
+        methodCreator.setParameterNames(new String[] { "sort" });
 
         // Add method annotations
         addGetAnnotation(methodCreator);

diff --git a/...rc/main/java/io/quarkus/rest/data/panache/deployment/methods/UpdateMethodImplementor.java b/...rc/main/java/io/quarkus/rest/data/panache/deployment/methods/UpdateMethodImplementor.java
@@ -135,6 +135,7 @@ protected void implementInternal(ClassCreator classCreator, ResourceMetadata res
         MethodCreator methodCreator = SignatureMethodCreator.getMethodCreator(METHOD_NAME, classCreator,
                 isNotReactivePanache() ? ofType(Response.class) : ofType(Uni.class, resourceMetadata.getEntityType()),
                 resourceMetadata.getIdType(), resourceMetadata.getEntityType());
+        methodCreator.setParameterNames(new String[] { "id", "entity" });
 
         // Add method annotations
         addPathAnnotation(methodCreator, appendToPath(resourceProperties.getPath(RESOURCE_UPDATE_METHOD_NAME), "{id}"));

diff --git a/...in/java/io/quarkus/rest/data/panache/deployment/methods/hal/ListHalMethodImplementor.java b/...in/java/io/quarkus/rest/data/panache/deployment/methods/hal/ListHalMethodImplementor.java
@@ -129,6 +129,7 @@ private void implementPaged(ClassCreator classCreator, ResourceMetadata resource
         MethodCreator methodCreator = SignatureMethodCreator.getMethodCreator(METHOD_NAME, classCreator,
                 isNotReactivePanache() ? ofType(Response.class) : ofType(Uni.class, resourceMetadata.getEntityType()),
                 List.class, int.class, int.class, UriInfo.class);
+        methodCreator.setParameterNames(new String[] { "sort", "page", "size", "uriInfo" });
 
         // Add method annotations
         addPathAnnotation(methodCreator, resourceProperties.getPath(RESOURCE_METHOD_NAME));
@@ -205,6 +206,7 @@ private void implementNotPaged(ClassCreator classCreator, ResourceMetadata resou
         MethodCreator methodCreator = SignatureMethodCreator.getMethodCreator(METHOD_NAME, classCreator,
                 isNotReactivePanache() ? ofType(Response.class) : ofType(Uni.class, resourceMetadata.getEntityType()),
                 List.class);
+        methodCreator.setParameterNames(new String[] { "sort" });
 
         // Add method annotations
         addPathAnnotation(methodCreator, resourceProperties.getPath(RESOURCE_METHOD_NAME));

diff --git a/...t/java/io/quarkus/it/hibernate/orm/rest/data/panache/HibernateOrmRestDataPanacheTest.java b/...t/java/io/quarkus/it/hibernate/orm/rest/data/panache/HibernateOrmRestDataPanacheTest.java
@@ -237,7 +237,7 @@ void shouldNotCreateBookWithBlankTitle() {
                 .and().body(book.toString())
                 .when().post("/books")
                 .then().statusCode(400)
-                .and().body("parameterViolations[0].path", equalTo("add.arg0.title"))
+                .and().body("parameterViolations[0].path", equalTo("add.entity.title"))
                 .and().body("parameterViolations[0].message", equalTo("must not be blank"));
     }
 
@@ -307,7 +307,7 @@ void shouldNotUpdateBookWithBlankTitle() {
                 .and().body(book.toString())
                 .when().put("/books/" + CRIME_AND_PUNISHMENT_ID)
                 .then().statusCode(400)
-                .and().body("parameterViolations[0].path", equalTo("update.arg1.title"))
+                .and().body("parameterViolations[0].path", equalTo("update.entity.title"))
                 .and().body("parameterViolations[0].message", equalTo("must not be blank"));
     }
 }
diff --git a/...sts/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestTest.java b/...sts/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestTest.java
@@ -172,7 +172,7 @@ void shouldNotCreateBookWithBlankTitle() {
                 .and().body(book.toString())
                 .when().post("/books")
                 .then().statusCode(400)
-                .and().body("parameterViolations[0].path", equalTo("add.arg0.title"))
+                .and().body("parameterViolations[0].path", equalTo("add.entity.title"))
                 .and().body("parameterViolations[0].message", equalTo("must not be blank"));
     }
 
@@ -242,7 +242,7 @@ void shouldNotUpdateBookWithBlankTitle() {
                 .and().body(book.toString())
                 .when().put("/books/" + CRIME_AND_PUNISHMENT_ID)
                 .then().statusCode(400)
-                .and().body("parameterViolations[0].path", equalTo("update.arg1.title"))
+                .and().body("parameterViolations[0].path", equalTo("update.entity.title"))
                 .and().body("parameterViolations[0].message", equalTo("must not be blank"));
     }
 }