review

Author: Tristan-WorkGH

src/main/java/org/gridsuite/shortcircuit/server/ParametersController.java

@@ -22,7 +22,7 @@
 import static org.springframework.http.MediaType.TEXT_PLAIN_VALUE;
 
 @RestController
-@RequestMapping(path = "/" + ShortCircuitApi.API_VERSION + "/parameters")
+@RequestMapping(path = "/" + ShortCircuitApi.API_VERSION + "/parameters", produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 @Tag(name = "Short circuit server analysis parameters")
 public class ParametersController {
     private final ShortCircuitService shortCircuitService;
@@ -31,23 +31,29 @@ public ParametersController(ShortCircuitService shortCircuitService) {
         this.shortCircuitService = shortCircuitService;
     }
 
-    @GetMapping(path = "/{parametersUuid}", produces = APPLICATION_JSON_VALUE)
+    @GetMapping(path = "/{parametersUuid}")
     @Operation(summary = "Get the parameters for an analysis")
     @ApiResponse(responseCode = "200", description = "The parameters asked")
     @ApiResponse(responseCode = "404", description = "The parameters don't exists")
     public ResponseEntity<ShortCircuitParametersInfos> getParameters(@Parameter(description = "UUID of parameters") @PathVariable("parametersUuid") UUID parametersUuid) {
         return ResponseEntity.of(shortCircuitService.getParameters(parametersUuid));
     }
 
-    @PostMapping(produces = TEXT_PLAIN_VALUE, consumes = APPLICATION_JSON_VALUE)
-    @Operation(summary = "Create a new set of parameters for an analysis using default parameters if none given")
+    @PostMapping
+    @Operation(summary = "Create a new set of parameters for an analysis using given parameters")
     @ApiResponse(responseCode = "200", description = "The new parameters entity ID")
-    public ResponseEntity<UUID> createParameters(@Parameter(description = "Parameters to save instead of default ones", schema = @Schema(implementation = ShortCircuitParametersInfos.class))
-                                                 @RequestBody(required = false) ShortCircuitParametersInfos parameters) {
+    public ResponseEntity<UUID> createParameters(@Parameter(description = "Parameters to save") @RequestBody(required = false) ShortCircuitParametersInfos parameters) {
         return ResponseEntity.ok(shortCircuitService.createParameters(parameters));
     }
 
-    @PostMapping(params = { "duplicateFrom" }, produces = TEXT_PLAIN_VALUE)
+    @PostMapping(path = "/default")
+    @Operation(summary = "Create a new set of parameters for an analysis using default parameters")
+    @ApiResponse(responseCode = "200", description = "The new parameters entity ID")
+    public ResponseEntity<UUID> createDefaultParameters() {
+        return ResponseEntity.ok(shortCircuitService.createParameters(null));
+    }
+
+    @PostMapping(params = { "duplicateFrom" })
     @Operation(summary = "Duplicate the parameters of an analysis")
     @ApiResponse(responseCode = "200", description = "The new parameters ID")
     @ApiResponse(responseCode = "404", description = "The parameters don't exist")
@@ -63,7 +69,7 @@ public ResponseEntity<Void> deleteParameters(@Parameter(description = "UUID of p
         return shortCircuitService.deleteParameters(parametersUuid) ? ResponseEntity.noContent().build() : ResponseEntity.notFound().build();
     }
 
-    @PutMapping(path = "/{parametersUuid}", consumes = APPLICATION_JSON_VALUE)
+    @PutMapping(path = "/{parametersUuid}")
     @Operation(summary = "Update a set of parameters for an analysis or reset them to default ones")
     @ApiResponse(responseCode = "204", description = "The parameters are successfully updated")
     @ApiResponse(responseCode = "404", description = "The parameters don't exists")

src/main/java/org/gridsuite/shortcircuit/server/ShortCircuitController.java

@@ -44,7 +44,7 @@ public ShortCircuitController(ShortCircuitService shortCircuitService) {
         this.shortCircuitService = shortCircuitService;
     }
 
-    @PostMapping(value = "/networks/{networkUuid}/run-and-save", produces = TEXT_PLAIN_VALUE, consumes = APPLICATION_JSON_VALUE)
+    @PostMapping(value = "/networks/{networkUuid}/run-and-save", produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
     @Operation(summary = "Run a short circuit analysis on a network")
     @ApiResponse(responseCode = "200", description = "The short circuit analysis has been performed")
     public ResponseEntity<UUID> runAndSave(@Parameter(description = "Network UUID") @PathVariable("networkUuid") UUID networkUuid,
@@ -58,7 +58,7 @@ public ResponseEntity<UUID> runAndSave(@Parameter(description = "Network UUID")
                                            @Parameter(description = "Parameters (full or partial) to use on top of the ones designed by parametersUuid", schema = @Schema(implementation = ShortCircuitParameters.class))
                                            @RequestBody(required = false) Optional<ShortCircuitParametersInfos> parameters,
                                            @RequestHeader(HEADER_USER_ID) String userId) {
-        return ResponseEntity.ok().contentType(TEXT_PLAIN).body(shortCircuitService.runAndSaveResult(networkUuid, variantId, receiver, reportUuid, reporterId, reportType, userId, busId, parametersUuid, parameters));
+        return ResponseEntity.ok().contentType(APPLICATION_JSON).body(shortCircuitService.runAndSaveResult(networkUuid, variantId, receiver, reportUuid, reporterId, reportType, userId, busId, parametersUuid, parameters));
     }
 
     @GetMapping(value = "/results/{resultUuid}", produces = APPLICATION_JSON_VALUE)