Upgrade Rest Controller template

entando · Feb 14, 2019 · 4dab60a · 4dab60a
1 parent 7c0c4ae
commit 4dab60a
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/src/main/resources/templates/java/aps/web/controller_java.vm b/src/main/resources/templates/java/aps/web/controller_java.vm
@@ -19,9 +19,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import org.entando.entando.web.common.annotation.RestAccessControl;
 import org.entando.entando.web.common.exceptions.ValidationConflictException;
 import org.entando.entando.web.common.exceptions.ValidationGenericException;
-import org.entando.entando.web.common.model.PagedMetadata;
-import org.entando.entando.web.common.model.RestListRequest;
-import org.entando.entando.web.common.model.RestResponse;
+import org.entando.entando.web.common.model.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -70,12 +68,12 @@ public class ${beanClass}Controller {
 
     @RestAccessControl(permission = "$builder.permission")
     @RequestMapping(method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<RestResponse> get${beanClass}s(RestListRequest requestList) throws JsonProcessingException {
+    public ResponseEntity<PagedRestResponse<${beanClass}Dto>> get${beanClass}s(RestListRequest requestList) throws JsonProcessingException {
         this.get${beanClass}Validator().validateRestListRequest(requestList, ${beanClass}Dto.class);
         PagedMetadata<${beanClass}Dto> result = this.get${beanClass}Service().get${beanClass}s(requestList);
         this.get${beanClass}Validator().validateRestListResult(requestList, result);
         logger.debug("Main Response -> {}", result);
-        return new ResponseEntity<>(new RestResponse(result.getBody(), null, result), HttpStatus.OK);
+        return new ResponseEntity<>(new PagedRestResponse<>(result), HttpStatus.OK);
     }
 
     @RestAccessControl(permission = "$builder.permission")
@@ -91,7 +89,7 @@ public class ${beanClass}Controller {
 
     @RestAccessControl(permission = "$builder.permission")
     @RequestMapping(value = "/{${beanVar}${pk_varName}}", method = RequestMethod.PUT, produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<RestResponse> update${beanClass}(@PathVariable String ${beanVar}${pk_varName}, @Valid @RequestBody ${beanClass}Request ${beanVar}Request, BindingResult bindingResult) {
+    public ResponseEntity<SimpleRestResponse<${beanClass}Dto>> update${beanClass}(@PathVariable String ${beanVar}${pk_varName}, @Valid @RequestBody ${beanClass}Request ${beanVar}Request, BindingResult bindingResult) {
         //field validations
         if (bindingResult.hasErrors()) {
             throw new ValidationGenericException(bindingResult);
@@ -102,12 +100,12 @@ public class ${beanClass}Controller {
         }
 
         ${beanClass}Dto ${beanVar} = this.get${beanClass}Service().update${beanClass}(${beanVar}Request);
-        return new ResponseEntity<>(new RestResponse(${beanVar}), HttpStatus.OK);
+        return new ResponseEntity<>(new SimpleRestResponse<>(${beanVar}), HttpStatus.OK);
     }
 
     @RestAccessControl(permission = "$builder.permission")
     @RequestMapping(method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<RestResponse> add${beanClass}(@Valid @RequestBody ${beanClass}Request ${beanVar}Request, BindingResult bindingResult) {
+    public ResponseEntity<SimpleRestResponse<${beanClass}Dto>> add${beanClass}(@Valid @RequestBody ${beanClass}Request ${beanVar}Request, BindingResult bindingResult) {
         //field validations
         if (bindingResult.hasErrors()) {
             throw new ValidationGenericException(bindingResult);
@@ -118,12 +116,12 @@ public class ${beanClass}Controller {
             throw new ValidationConflictException(bindingResult);
         }
         ${beanClass}Dto dto = this.get${beanClass}Service().add${beanClass}(${beanVar}Request);
-        return new ResponseEntity<>(new RestResponse(dto), HttpStatus.OK);
+        return new ResponseEntity<>(new SimpleRestResponse<>(dto), HttpStatus.OK);
     }
 
     @RestAccessControl(permission = "$builder.permission")
     @RequestMapping(value = "/{${beanVar}${pk_varName}}", method = RequestMethod.DELETE, produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<RestResponse> delete${beanClass}(@PathVariable String ${beanVar}${pk_varName}) {
+    public ResponseEntity<SimpleRestResponse<Map>> delete${beanClass}(@PathVariable String ${beanVar}${pk_varName}) {
         logger.info("deleting {}", ${beanVar}${pk_varName});
 #if($pk_type_gen == "String")
         this.get${beanClass}Service().remove${beanClass}(${beanVar}${pk_varName});
@@ -135,7 +133,7 @@ public class ${beanClass}Controller {
         Map<String, Integer> result = new HashMap<>();
         result.put("${pk_var}", Integer.valueOf(${beanVar}${pk_varName}));
 #end
-        return new ResponseEntity<>(new RestResponse(result), HttpStatus.OK);
+        return new ResponseEntity<>(new SimpleRestResponse<>(result), HttpStatus.OK);
     }
 
 }