diff --git a/src/main/java/org/gridsuite/explore/server/ExploreController.java b/src/main/java/org/gridsuite/explore/server/ExploreController.java index f4b1b39..64e6427 100644 --- a/src/main/java/org/gridsuite/explore/server/ExploreController.java +++ b/src/main/java/org/gridsuite/explore/server/ExploreController.java @@ -304,12 +304,12 @@ public ResponseEntity duplicateParameters(@RequestParam("duplicateFrom") U @PostMapping(value = "/explore/modifications") @Operation(summary = "create some modification elements from existing network modifications") @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Modifications have been duplicated and corresponding elements created in the directory")}) - public ResponseEntity createNetworkModifications(@RequestBody String modificationAttributes, - @RequestParam(QUERY_PARAM_NAME) String name, - @RequestParam(QUERY_PARAM_DESCRIPTION) String description, - @RequestParam(QUERY_PARAM_PARENT_DIRECTORY_ID) UUID parentDirectoryUuid, - @RequestHeader(QUERY_PARAM_USER_ID) String userId) { - exploreService.createCompositeModification(modificationAttributes, userId, name, description, parentDirectoryUuid); + public ResponseEntity createNetworkCompositeModification(@RequestBody String modificationAttributes, + @RequestParam(QUERY_PARAM_NAME) String name, + @RequestParam(QUERY_PARAM_DESCRIPTION) String description, + @RequestParam(QUERY_PARAM_PARENT_DIRECTORY_ID) UUID parentDirectoryUuid, + @RequestHeader(QUERY_PARAM_USER_ID) String userId) { + exploreService.createNetworkCompositeModification(modificationAttributes, userId, name, description, parentDirectoryUuid); return ResponseEntity.ok().build(); } diff --git a/src/main/java/org/gridsuite/explore/server/services/ExploreService.java b/src/main/java/org/gridsuite/explore/server/services/ExploreService.java index b5eb0ee..345c554 100644 --- a/src/main/java/org/gridsuite/explore/server/services/ExploreService.java +++ b/src/main/java/org/gridsuite/explore/server/services/ExploreService.java @@ -249,11 +249,11 @@ public void duplicateParameters(UUID sourceId, UUID targetDirectoryId, Parameter directoryService.duplicateElement(sourceId, newParametersUuid, targetDirectoryId, userId); } - public void createCompositeModification(String modificationAttributesList, String userId, String name, - String description, UUID parentDirectoryUuid) { + public void createNetworkCompositeModification(String modificationAttributes, String userId, String name, + String description, UUID parentDirectoryUuid) { // create modifications group - UUID modificationsUuid = networkModificationService.createModification(modificationAttributesList); + UUID modificationsUuid = networkModificationService.createNetworkCompositeModification(modificationAttributes); ElementAttributes elementAttributes = new ElementAttributes(modificationsUuid, name, MODIFICATION, userId, 0L, description); directoryService.createElementWithNewName(elementAttributes, parentDirectoryUuid, userId, true); diff --git a/src/main/java/org/gridsuite/explore/server/services/NetworkModificationService.java b/src/main/java/org/gridsuite/explore/server/services/NetworkModificationService.java index 2b9b0fc..203fbda 100644 --- a/src/main/java/org/gridsuite/explore/server/services/NetworkModificationService.java +++ b/src/main/java/org/gridsuite/explore/server/services/NetworkModificationService.java @@ -56,13 +56,13 @@ public Map duplicateModifications(List modificationUuids) { .getBody(); } - public UUID createModification(String modificationsUuid) { + public UUID createNetworkCompositeModification(String modificationAttributes) { String path = UriComponentsBuilder.fromPath(DELIMITER + NETWORK_MODIFICATION_API_VERSION + DELIMITER + COMPOSITE + DELIMITER + NETWORK_MODIFICATIONS_PATH) .buildAndExpand() .toUriString(); HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON); - return restTemplate.exchange(networkModificationServerBaseUri + path, HttpMethod.POST, new HttpEntity<>(modificationsUuid, headers), new ParameterizedTypeReference() { }) + return restTemplate.exchange(networkModificationServerBaseUri + path, HttpMethod.POST, new HttpEntity<>(modificationAttributes, headers), new ParameterizedTypeReference() { }) .getBody(); }