Moce new endpoints into separate controller

Author: Tristan-WorkGH

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

@@ -0,0 +1,68 @@
+package org.gridsuite.shortcircuit.server;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.gridsuite.shortcircuit.server.dto.ShortCircuitParametersInfos;
+import org.gridsuite.shortcircuit.server.service.ShortCircuitService;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.UUID;
+
+import static org.gridsuite.shortcircuit.server.util.Utils.APPLICATION_JSON_PATCH_VALUE;
+import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+import static org.springframework.http.MediaType.TEXT_PLAIN_VALUE;
+
+@RestController
+@RequestMapping(value = "/" + 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;
+
+    public ParametersController(ShortCircuitService shortCircuitService) {
+        this.shortCircuitService = shortCircuitService;
+    }
+
+    @GetMapping(value = "/{parametersUuid}")
+    @Operation(summary = "Get the parameters for an analysis")
+    @ApiResponse(responseCode = "200", description = "The parameters asked")
+    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, APPLICATION_JSON_PATCH_VALUE})
+    @Operation(summary = "Create a new set of parameters for an analysis using default parameters as base")
+    public ResponseEntity<UUID> createParameters(@RequestHeader(value = CONTENT_TYPE, required = false) MediaType contentType,
+                                                 @RequestBody(required = false) String parametersPatch) {
+        return ResponseEntity.ok(shortCircuitService.createParameters(contentType, parametersPatch));
+    }
+
+    @PostMapping(value = "/parameters", produces = TEXT_PLAIN_VALUE)
+    @Operation(summary = "Duplicate the parameters of an analysis")
+    public ResponseEntity<UUID> duplicateParameters(@Parameter(description = "UUID of parameters to duplicate") @RequestParam(name = "duplicateFrom") UUID sourceParametersUuid) {
+        return ResponseEntity.of(shortCircuitService.duplicateParameters(sourceParametersUuid));
+    }
+
+    @DeleteMapping(value = "/parameters/{parametersUuid}")
+    @Operation(summary = "Delete a set of parameters")
+    public ResponseEntity<Void> deleteParameters(@Parameter(description = "UUID of parameters") @PathVariable("parametersUuid") UUID parametersUuid) {
+        shortCircuitService.deleteParameters(parametersUuid);
+        return ResponseEntity.ok().build();
+    }
+
+    @PutMapping(value = "/parameters/{parametersUuid}", consumes = {APPLICATION_JSON_VALUE, APPLICATION_JSON_PATCH_VALUE})
+    @Operation(summary = "Update a set of parameters for an analysis or reset them to default ones")
+    public ResponseEntity<Void> updateParameters(@Parameter(description = "UUID of parameters") @PathVariable("parametersUuid") UUID parametersUuid,
+                                                 @RequestHeader(value = CONTENT_TYPE, required = false) MediaType contentType, @RequestBody(required = false) String parametersPatch) throws JsonProcessingException {
+        if (shortCircuitService.updateParameters(parametersUuid, contentType, parametersPatch)) {
+            return ResponseEntity.noContent().build();
+        } else {
+            return ResponseEntity.notFound().build();
+        }
+    }
+}

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

@@ -31,9 +31,8 @@
 
 import static com.powsybl.shortcircuit.Fault.FaultType;
 import static org.gridsuite.shortcircuit.server.service.NotificationService.HEADER_USER_ID;
-import static org.gridsuite.shortcircuit.server.util.Utils.APPLICATION_JSON_PATCH_VALUE;
-import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
-import static org.springframework.http.MediaType.*;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+import static org.springframework.http.MediaType.APPLICATION_OCTET_STREAM_VALUE;
 
 /**
  * @author Etienne Homer <etienne.homer at rte-france.com>
@@ -177,42 +176,4 @@ public ResponseEntity<List<FaultType>> getFaultTypes(@Parameter(description = "R
     public ResponseEntity<List<LimitViolationType>> getLimitTypes(@Parameter(description = "Result UUID") @PathVariable("resultUuid") UUID resultUuid) {
         return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(shortCircuitService.getLimitTypes(resultUuid));
     }
-
-    @GetMapping(value = "/parameters/{parametersUuid}", produces = APPLICATION_JSON_VALUE)
-    @Operation(summary = "Get the parameters for an analysis")
-    @ApiResponse(responseCode = "200", description = "The parameters asked")
-    public ResponseEntity<ShortCircuitParametersInfos> getParameters(@Parameter(description = "UUID of parameters") @PathVariable("parametersUuid") UUID parametersUuid) {
-        return ResponseEntity.of(shortCircuitService.getParameters(parametersUuid));
-    }
-
-    @PostMapping(value = "/parameters", produces = TEXT_PLAIN_VALUE, consumes = {APPLICATION_JSON_VALUE, APPLICATION_JSON_PATCH_VALUE})
-    @Operation(summary = "Create a new set of parameters for an analysis using default parameters as base")
-    public ResponseEntity<UUID> createParameters(@RequestHeader(value = CONTENT_TYPE, required = false) MediaType contentType,
-                                                 @RequestBody(required = false) String parametersPatch) {
-        return ResponseEntity.ok(shortCircuitService.createParameters(contentType, parametersPatch));
-    }
-
-    @PostMapping(value = "/parameters", produces = TEXT_PLAIN_VALUE)
-    @Operation(summary = "Duplicate the parameters of an analysis")
-    public ResponseEntity<UUID> duplicateParameters(@Parameter(description = "UUID of parameters to duplicate") @RequestParam(name = "duplicateFrom") UUID sourceParametersUuid) {
-        return ResponseEntity.of(shortCircuitService.duplicateParameters(sourceParametersUuid));
-    }
-
-    @DeleteMapping(value = "/parameters/{parametersUuid}")
-    @Operation(summary = "Delete a set of parameters")
-    public ResponseEntity<Void> deleteParameters(@Parameter(description = "UUID of parameters") @PathVariable("parametersUuid") UUID parametersUuid) {
-        shortCircuitService.deleteParameters(parametersUuid);
-        return ResponseEntity.ok().build();
-    }
-
-    @PutMapping(value = "/parameters/{parametersUuid}", consumes = {APPLICATION_JSON_VALUE, APPLICATION_JSON_PATCH_VALUE})
-    @Operation(summary = "Update a set of parameters for an analysis or reset them to default ones")
-    public ResponseEntity<Void> updateParameters(@Parameter(description = "UUID of parameters") @PathVariable("parametersUuid") UUID parametersUuid,
-                                                 @RequestHeader(value = CONTENT_TYPE, required = false) MediaType contentType, @RequestBody(required = false) String parametersPatch) throws JsonProcessingException {
-        if (shortCircuitService.updateParameters(parametersUuid, contentType, parametersPatch)) {
-            return ResponseEntity.noContent().build();
-        } else {
-            return ResponseEntity.notFound().build();
-        }
-    }
 }