From fc9d6331f106623d592a623619a7f98a899c8f2e Mon Sep 17 00:00:00 2001 From: "SOUISSI Maissa (Externe)" Date: Wed, 2 Sep 2026 14:02:55 +0200 Subject: [PATCH 1/3] keep description for saved modificatiosn Signed-off-by: SOUISSI Maissa (Externe) --- .../server/controller/ExploreController.java | 8 +++---- .../CompositeModificationContentInfos.java | 21 +++++++++++++++++++ .../server/services/ExploreService.java | 9 ++++---- .../services/NetworkModificationService.java | 9 ++++---- .../server/ExploreServiceExceptionTest.java | 5 +++-- 5 files changed, 38 insertions(+), 14 deletions(-) create mode 100644 src/main/java/org/gridsuite/explore/server/dto/CompositeModificationContentInfos.java diff --git a/src/main/java/org/gridsuite/explore/server/controller/ExploreController.java b/src/main/java/org/gridsuite/explore/server/controller/ExploreController.java index 3c4d47e6..524b162b 100644 --- a/src/main/java/org/gridsuite/explore/server/controller/ExploreController.java +++ b/src/main/java/org/gridsuite/explore/server/controller/ExploreController.java @@ -490,12 +490,12 @@ public ResponseEntity duplicateSpreadsheetConfigCollection(@PathVariable(" @Operation(summary = "Create composite modification element from existing network modifications") @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Modifications have been created and composite modification element created in the directory")}) @PreAuthorize("@authorizationService.isAuthorized(#userId, #parentDirectoryUuid, null, T(org.gridsuite.explore.server.dto.PermissionType).WRITE)") - public ResponseEntity createCompositeModification(@RequestBody List modificationAttributes, + public ResponseEntity createCompositeModification(@RequestBody List contents, @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); + exploreService.createCompositeModification(contents, userId, name, description, parentDirectoryUuid); return ResponseEntity.ok().build(); } @@ -504,11 +504,11 @@ public ResponseEntity createCompositeModification(@RequestBody List @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The composite modification has been modified successfully")}) @PreAuthorize("@authorizationService.isAuthorized(#userId, #id, null, T(org.gridsuite.explore.server.dto.PermissionType).WRITE)") public ResponseEntity updateCompositeNetworkModification(@PathVariable UUID id, - @RequestBody List modificationUuids, + @RequestBody List contents, @RequestHeader(QUERY_PARAM_USER_ID) String userId, @RequestParam(QUERY_PARAM_NAME) String name, @RequestParam(QUERY_PARAM_DESCRIPTION) String description) { - exploreService.updateCompositeModification(id, modificationUuids, userId, name, description); + exploreService.updateCompositeModification(id, contents, userId, name, description); return ResponseEntity.ok().build(); } diff --git a/src/main/java/org/gridsuite/explore/server/dto/CompositeModificationContentInfos.java b/src/main/java/org/gridsuite/explore/server/dto/CompositeModificationContentInfos.java new file mode 100644 index 00000000..71bd79b9 --- /dev/null +++ b/src/main/java/org/gridsuite/explore/server/dto/CompositeModificationContentInfos.java @@ -0,0 +1,21 @@ +/** + * Copyright (c) 2026, RTE (http://www.rte-france.com) + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ +package org.gridsuite.explore.server.dto; + +import java.util.UUID; + +/** + * One element to put inside a composite modification when creating / updating a composite modification element. + * + * @param modificationUuid the modification to store inside the composite. A selected shared modification is + * resolved by the caller to the composite it points to, so it is stored as a plain copy. + * @param description description to apply to the stored copy, or {@code null} to keep the source's own + * description. Carries a selected reference's description onto the resolved composite copy. + @author Maissa Souissi + */ + +public record CompositeModificationContentInfos(UUID modificationUuid, String description) { } 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 1566857f..a9682eea 100644 --- a/src/main/java/org/gridsuite/explore/server/services/ExploreService.java +++ b/src/main/java/org/gridsuite/explore/server/services/ExploreService.java @@ -10,6 +10,7 @@ import org.apache.commons.lang3.StringUtils; import org.gridsuite.explore.server.dto.CaseAlertThresholdMessage; import org.gridsuite.explore.server.dto.CaseInfo; +import org.gridsuite.explore.server.dto.CompositeModificationContentInfos; import org.gridsuite.explore.server.dto.DirectoryElementStatus; import org.gridsuite.explore.server.dto.ElementAttributes; import org.gridsuite.explore.server.dto.NodeInfos; @@ -261,8 +262,8 @@ public void updateContingencyList(UUID id, String content, String userId, String directoryService.updateElement(id, elementAttributes, userId); } - public void updateCompositeModification(UUID id, List modificationUuids, String userId, String name, String description) { - networkModificationService.replaceCompositeModification(id, name, modificationUuids); + public void updateCompositeModification(UUID id, List contents, String userId, String name, String description) { + networkModificationService.replaceCompositeModification(id, name, contents); updateElementNameAndDescription(id, name, description, userId); } @@ -385,11 +386,11 @@ public void duplicateWorkspace(UUID sourceId, UUID targetDirectoryId, String use duplicateDirectoryElementOrDeleteElement(sourceId, newWorkspaceId, targetDirectoryId, userId, workspaceService::delete); } - public void createCompositeModification(List modificationUuids, String userId, String name, + public void createCompositeModification(List contents, String userId, String name, String description, UUID parentDirectoryUuid) { // create composite modifications - UUID modificationsUuid = networkModificationService.createCompositeModification(modificationUuids, name); + UUID modificationsUuid = networkModificationService.createCompositeModification(contents, name); ElementAttributes elementAttributes = new ElementAttributes(modificationsUuid, name, MODIFICATION, userId, 0L, description); createDirectoryElementWithNewNameOrDeleteElement(elementAttributes, parentDirectoryUuid, userId, networkModificationService::delete); 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 6eca9d13..a63cc3f9 100644 --- a/src/main/java/org/gridsuite/explore/server/services/NetworkModificationService.java +++ b/src/main/java/org/gridsuite/explore/server/services/NetworkModificationService.java @@ -7,6 +7,7 @@ package org.gridsuite.explore.server.services; import lombok.Setter; +import org.gridsuite.explore.server.dto.CompositeModificationContentInfos; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; @@ -52,25 +53,25 @@ public Map duplicateCompositeModifications(List modificationUu .getBody(); } - public UUID createCompositeModification(List modificationUuids, String compositeModificationName) { + public UUID createCompositeModification(List contents, String compositeModificationName) { String path = UriComponentsBuilder.fromPath(DELIMITER + NETWORK_MODIFICATION_API_VERSION + DELIMITER + NETWORK_COMPOSITE_MODIFICATIONS_PATH) .queryParam(NAME, compositeModificationName) .buildAndExpand() .toUriString(); HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON); - return restTemplate.exchange(networkModificationServerBaseUri + path, HttpMethod.POST, new HttpEntity<>(modificationUuids, headers), new ParameterizedTypeReference() { }) + return restTemplate.exchange(networkModificationServerBaseUri + path, HttpMethod.POST, new HttpEntity<>(contents, headers), new ParameterizedTypeReference() { }) .getBody(); } - public void replaceCompositeModification(UUID compositeModificationId, String newName, List modificationUuids) { + public void replaceCompositeModification(UUID compositeModificationId, String newName, List contents) { String path = UriComponentsBuilder.fromPath(DELIMITER + NETWORK_MODIFICATION_API_VERSION + DELIMITER + NETWORK_COMPOSITE_MODIFICATIONS_PATH + DELIMITER + compositeModificationId + "/replace") .queryParam(NAME, newName) .buildAndExpand() .toUriString(); HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON); - restTemplate.exchange(networkModificationServerBaseUri + path, HttpMethod.PUT, new HttpEntity<>(modificationUuids, headers), Void.class); + restTemplate.exchange(networkModificationServerBaseUri + path, HttpMethod.PUT, new HttpEntity<>(contents, headers), Void.class); } /** diff --git a/src/test/java/org/gridsuite/explore/server/ExploreServiceExceptionTest.java b/src/test/java/org/gridsuite/explore/server/ExploreServiceExceptionTest.java index c10886ed..55db4806 100644 --- a/src/test/java/org/gridsuite/explore/server/ExploreServiceExceptionTest.java +++ b/src/test/java/org/gridsuite/explore/server/ExploreServiceExceptionTest.java @@ -6,6 +6,7 @@ */ package org.gridsuite.explore.server; +import org.gridsuite.explore.server.dto.CompositeModificationContentInfos; import org.gridsuite.explore.server.services.DirectoryService; import org.gridsuite.explore.server.services.ExploreService; import org.gridsuite.explore.server.services.FilterService; @@ -82,9 +83,9 @@ void testDirectoryServerCrashesWithNetworkModification() { UUID createdCompositeModificationId = UUID.randomUUID(); when(networkModificationService.createCompositeModification(anyList(), any())).thenReturn(createdCompositeModificationId); - List modificationUuids = List.of(UUID.randomUUID()); + List contents = List.of(new CompositeModificationContentInfos(UUID.randomUUID(), null)); UUID parentDirectoryUuid = UUID.randomUUID(); - String message = assertThrows(RuntimeException.class, () -> exploreService.createCompositeModification(modificationUuids, + String message = assertThrows(RuntimeException.class, () -> exploreService.createCompositeModification(contents, "userId", "name", "description", parentDirectoryUuid)) .getMessage(); verify(networkModificationService, times(1)).createCompositeModification(any(), any()); From 4f2d5c86f2b83df06f82cddff32a86858002757b Mon Sep 17 00:00:00 2001 From: "SOUISSI Maissa (Externe)" Date: Wed, 2 Sep 2026 15:11:54 +0200 Subject: [PATCH 2/3] fix tu Signed-off-by: SOUISSI Maissa (Externe) --- .../explore/server/controller/ExploreController.java | 6 +----- .../java/org/gridsuite/explore/server/ExploreTest.java | 10 +++++++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/gridsuite/explore/server/controller/ExploreController.java b/src/main/java/org/gridsuite/explore/server/controller/ExploreController.java index 524b162b..1c5a9033 100644 --- a/src/main/java/org/gridsuite/explore/server/controller/ExploreController.java +++ b/src/main/java/org/gridsuite/explore/server/controller/ExploreController.java @@ -12,11 +12,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.tags.Tag; import org.gridsuite.explore.server.ExploreApi; -import org.gridsuite.explore.server.dto.CaseInfo; -import org.gridsuite.explore.server.dto.ElementAttributes; -import org.gridsuite.explore.server.dto.PermissionDTO; -import org.gridsuite.explore.server.dto.PermissionType; -import org.gridsuite.explore.server.dto.ReferencingElementInfos; +import org.gridsuite.explore.server.dto.*; import org.gridsuite.explore.server.services.DirectoryService; import org.gridsuite.explore.server.services.ExploreService; import org.gridsuite.explore.server.utils.ContingencyListType; diff --git a/src/test/java/org/gridsuite/explore/server/ExploreTest.java b/src/test/java/org/gridsuite/explore/server/ExploreTest.java index 7c1c9abe..266def24 100644 --- a/src/test/java/org/gridsuite/explore/server/ExploreTest.java +++ b/src/test/java/org/gridsuite/explore/server/ExploreTest.java @@ -977,12 +977,14 @@ void testGetElementsName() throws Exception { @Test void testCreateNetworkCompositeModifications() throws Exception { - List modificationUuids = Arrays.asList(MODIFICATION_UUID, UUID.randomUUID()); + List contents = Arrays.asList( + new CompositeModificationContentInfos(MODIFICATION_UUID, "kept description"), + new CompositeModificationContentInfos(UUID.randomUUID(), null)); mockMvc.perform(post("/v1/explore/composite-modifications?name={name}&description={description}&parentDirectoryUuid={parentDirectoryUuid}", "nameModif", "descModif", PARENT_DIRECTORY_UUID) .header("userId", USER1) .contentType(MediaType.APPLICATION_JSON) - .content(mapper.writeValueAsString(modificationUuids)) + .content(mapper.writeValueAsString(contents)) ).andExpect(status().isOk()); } @@ -992,7 +994,9 @@ void testModifyCompositeModifications(final MockWebServer server) throws Excepti mockMvc.perform( put("/v1/explore/composite-modifications/{id}", COMPOSITE_MODIFICATION_UUID) .contentType(APPLICATION_JSON) - .content(mapper.writeValueAsString(List.of(MODIFICATION_UUID, UUID.randomUUID()))) + .content(mapper.writeValueAsString(List.of( + new CompositeModificationContentInfos(MODIFICATION_UUID, null), + new CompositeModificationContentInfos(UUID.randomUUID(), null)))) .param("name", name) .param("description", "description") .header("userId", USER1) From 714fc9d5de14758e0f173521a8e075c5971c3538 Mon Sep 17 00:00:00 2001 From: "SOUISSI Maissa (Externe)" Date: Fri, 4 Sep 2026 21:04:06 +0200 Subject: [PATCH 3/3] fixes Signed-off-by: SOUISSI Maissa (Externe) --- .../server/controller/ExploreController.java | 8 +++---- .../CompositeModificationContentInfos.java | 21 ------------------- .../server/services/ExploreService.java | 9 ++++---- .../services/NetworkModificationService.java | 9 ++++---- .../server/ExploreServiceExceptionTest.java | 5 ++--- .../gridsuite/explore/server/ExploreTest.java | 10 +++------ 6 files changed, 17 insertions(+), 45 deletions(-) delete mode 100644 src/main/java/org/gridsuite/explore/server/dto/CompositeModificationContentInfos.java diff --git a/src/main/java/org/gridsuite/explore/server/controller/ExploreController.java b/src/main/java/org/gridsuite/explore/server/controller/ExploreController.java index 1c5a9033..3c5e991c 100644 --- a/src/main/java/org/gridsuite/explore/server/controller/ExploreController.java +++ b/src/main/java/org/gridsuite/explore/server/controller/ExploreController.java @@ -486,12 +486,12 @@ public ResponseEntity duplicateSpreadsheetConfigCollection(@PathVariable(" @Operation(summary = "Create composite modification element from existing network modifications") @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Modifications have been created and composite modification element created in the directory")}) @PreAuthorize("@authorizationService.isAuthorized(#userId, #parentDirectoryUuid, null, T(org.gridsuite.explore.server.dto.PermissionType).WRITE)") - public ResponseEntity createCompositeModification(@RequestBody List contents, + public ResponseEntity createCompositeModification(@RequestBody List modificationUuids, @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(contents, userId, name, description, parentDirectoryUuid); + exploreService.createCompositeModification(modificationUuids, userId, name, description, parentDirectoryUuid); return ResponseEntity.ok().build(); } @@ -500,11 +500,11 @@ public ResponseEntity createCompositeModification(@RequestBody List updateCompositeNetworkModification(@PathVariable UUID id, - @RequestBody List contents, + @RequestBody List modificationUuids, @RequestHeader(QUERY_PARAM_USER_ID) String userId, @RequestParam(QUERY_PARAM_NAME) String name, @RequestParam(QUERY_PARAM_DESCRIPTION) String description) { - exploreService.updateCompositeModification(id, contents, userId, name, description); + exploreService.updateCompositeModification(id, modificationUuids, userId, name, description); return ResponseEntity.ok().build(); } diff --git a/src/main/java/org/gridsuite/explore/server/dto/CompositeModificationContentInfos.java b/src/main/java/org/gridsuite/explore/server/dto/CompositeModificationContentInfos.java deleted file mode 100644 index 71bd79b9..00000000 --- a/src/main/java/org/gridsuite/explore/server/dto/CompositeModificationContentInfos.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Copyright (c) 2026, RTE (http://www.rte-france.com) - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ -package org.gridsuite.explore.server.dto; - -import java.util.UUID; - -/** - * One element to put inside a composite modification when creating / updating a composite modification element. - * - * @param modificationUuid the modification to store inside the composite. A selected shared modification is - * resolved by the caller to the composite it points to, so it is stored as a plain copy. - * @param description description to apply to the stored copy, or {@code null} to keep the source's own - * description. Carries a selected reference's description onto the resolved composite copy. - @author Maissa Souissi - */ - -public record CompositeModificationContentInfos(UUID modificationUuid, String description) { } 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 a9682eea..1566857f 100644 --- a/src/main/java/org/gridsuite/explore/server/services/ExploreService.java +++ b/src/main/java/org/gridsuite/explore/server/services/ExploreService.java @@ -10,7 +10,6 @@ import org.apache.commons.lang3.StringUtils; import org.gridsuite.explore.server.dto.CaseAlertThresholdMessage; import org.gridsuite.explore.server.dto.CaseInfo; -import org.gridsuite.explore.server.dto.CompositeModificationContentInfos; import org.gridsuite.explore.server.dto.DirectoryElementStatus; import org.gridsuite.explore.server.dto.ElementAttributes; import org.gridsuite.explore.server.dto.NodeInfos; @@ -262,8 +261,8 @@ public void updateContingencyList(UUID id, String content, String userId, String directoryService.updateElement(id, elementAttributes, userId); } - public void updateCompositeModification(UUID id, List contents, String userId, String name, String description) { - networkModificationService.replaceCompositeModification(id, name, contents); + public void updateCompositeModification(UUID id, List modificationUuids, String userId, String name, String description) { + networkModificationService.replaceCompositeModification(id, name, modificationUuids); updateElementNameAndDescription(id, name, description, userId); } @@ -386,11 +385,11 @@ public void duplicateWorkspace(UUID sourceId, UUID targetDirectoryId, String use duplicateDirectoryElementOrDeleteElement(sourceId, newWorkspaceId, targetDirectoryId, userId, workspaceService::delete); } - public void createCompositeModification(List contents, String userId, String name, + public void createCompositeModification(List modificationUuids, String userId, String name, String description, UUID parentDirectoryUuid) { // create composite modifications - UUID modificationsUuid = networkModificationService.createCompositeModification(contents, name); + UUID modificationsUuid = networkModificationService.createCompositeModification(modificationUuids, name); ElementAttributes elementAttributes = new ElementAttributes(modificationsUuid, name, MODIFICATION, userId, 0L, description); createDirectoryElementWithNewNameOrDeleteElement(elementAttributes, parentDirectoryUuid, userId, networkModificationService::delete); 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 a63cc3f9..6eca9d13 100644 --- a/src/main/java/org/gridsuite/explore/server/services/NetworkModificationService.java +++ b/src/main/java/org/gridsuite/explore/server/services/NetworkModificationService.java @@ -7,7 +7,6 @@ package org.gridsuite.explore.server.services; import lombok.Setter; -import org.gridsuite.explore.server.dto.CompositeModificationContentInfos; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; @@ -53,25 +52,25 @@ public Map duplicateCompositeModifications(List modificationUu .getBody(); } - public UUID createCompositeModification(List contents, String compositeModificationName) { + public UUID createCompositeModification(List modificationUuids, String compositeModificationName) { String path = UriComponentsBuilder.fromPath(DELIMITER + NETWORK_MODIFICATION_API_VERSION + DELIMITER + NETWORK_COMPOSITE_MODIFICATIONS_PATH) .queryParam(NAME, compositeModificationName) .buildAndExpand() .toUriString(); HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON); - return restTemplate.exchange(networkModificationServerBaseUri + path, HttpMethod.POST, new HttpEntity<>(contents, headers), new ParameterizedTypeReference() { }) + return restTemplate.exchange(networkModificationServerBaseUri + path, HttpMethod.POST, new HttpEntity<>(modificationUuids, headers), new ParameterizedTypeReference() { }) .getBody(); } - public void replaceCompositeModification(UUID compositeModificationId, String newName, List contents) { + public void replaceCompositeModification(UUID compositeModificationId, String newName, List modificationUuids) { String path = UriComponentsBuilder.fromPath(DELIMITER + NETWORK_MODIFICATION_API_VERSION + DELIMITER + NETWORK_COMPOSITE_MODIFICATIONS_PATH + DELIMITER + compositeModificationId + "/replace") .queryParam(NAME, newName) .buildAndExpand() .toUriString(); HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON); - restTemplate.exchange(networkModificationServerBaseUri + path, HttpMethod.PUT, new HttpEntity<>(contents, headers), Void.class); + restTemplate.exchange(networkModificationServerBaseUri + path, HttpMethod.PUT, new HttpEntity<>(modificationUuids, headers), Void.class); } /** diff --git a/src/test/java/org/gridsuite/explore/server/ExploreServiceExceptionTest.java b/src/test/java/org/gridsuite/explore/server/ExploreServiceExceptionTest.java index 55db4806..c10886ed 100644 --- a/src/test/java/org/gridsuite/explore/server/ExploreServiceExceptionTest.java +++ b/src/test/java/org/gridsuite/explore/server/ExploreServiceExceptionTest.java @@ -6,7 +6,6 @@ */ package org.gridsuite.explore.server; -import org.gridsuite.explore.server.dto.CompositeModificationContentInfos; import org.gridsuite.explore.server.services.DirectoryService; import org.gridsuite.explore.server.services.ExploreService; import org.gridsuite.explore.server.services.FilterService; @@ -83,9 +82,9 @@ void testDirectoryServerCrashesWithNetworkModification() { UUID createdCompositeModificationId = UUID.randomUUID(); when(networkModificationService.createCompositeModification(anyList(), any())).thenReturn(createdCompositeModificationId); - List contents = List.of(new CompositeModificationContentInfos(UUID.randomUUID(), null)); + List modificationUuids = List.of(UUID.randomUUID()); UUID parentDirectoryUuid = UUID.randomUUID(); - String message = assertThrows(RuntimeException.class, () -> exploreService.createCompositeModification(contents, + String message = assertThrows(RuntimeException.class, () -> exploreService.createCompositeModification(modificationUuids, "userId", "name", "description", parentDirectoryUuid)) .getMessage(); verify(networkModificationService, times(1)).createCompositeModification(any(), any()); diff --git a/src/test/java/org/gridsuite/explore/server/ExploreTest.java b/src/test/java/org/gridsuite/explore/server/ExploreTest.java index 266def24..7c1c9abe 100644 --- a/src/test/java/org/gridsuite/explore/server/ExploreTest.java +++ b/src/test/java/org/gridsuite/explore/server/ExploreTest.java @@ -977,14 +977,12 @@ void testGetElementsName() throws Exception { @Test void testCreateNetworkCompositeModifications() throws Exception { - List contents = Arrays.asList( - new CompositeModificationContentInfos(MODIFICATION_UUID, "kept description"), - new CompositeModificationContentInfos(UUID.randomUUID(), null)); + List modificationUuids = Arrays.asList(MODIFICATION_UUID, UUID.randomUUID()); mockMvc.perform(post("/v1/explore/composite-modifications?name={name}&description={description}&parentDirectoryUuid={parentDirectoryUuid}", "nameModif", "descModif", PARENT_DIRECTORY_UUID) .header("userId", USER1) .contentType(MediaType.APPLICATION_JSON) - .content(mapper.writeValueAsString(contents)) + .content(mapper.writeValueAsString(modificationUuids)) ).andExpect(status().isOk()); } @@ -994,9 +992,7 @@ void testModifyCompositeModifications(final MockWebServer server) throws Excepti mockMvc.perform( put("/v1/explore/composite-modifications/{id}", COMPOSITE_MODIFICATION_UUID) .contentType(APPLICATION_JSON) - .content(mapper.writeValueAsString(List.of( - new CompositeModificationContentInfos(MODIFICATION_UUID, null), - new CompositeModificationContentInfos(UUID.randomUUID(), null)))) + .content(mapper.writeValueAsString(List.of(MODIFICATION_UUID, UUID.randomUUID()))) .param("name", name) .param("description", "description") .header("userId", USER1)