diff --git a/src/main/java/org/gridsuite/study/server/dto/RootNetworkInfos.java b/src/main/java/org/gridsuite/study/server/dto/RootNetworkInfos.java index 6e4d65ff9..ac57e9ccb 100644 --- a/src/main/java/org/gridsuite/study/server/dto/RootNetworkInfos.java +++ b/src/main/java/org/gridsuite/study/server/dto/RootNetworkInfos.java @@ -9,6 +9,8 @@ import java.util.Map; import java.util.UUID; +import static org.gridsuite.study.server.utils.JsonUtils.serializeImportParameters; + @Builder @Getter @Setter @@ -28,7 +30,7 @@ public class RootNetworkInfos { // reportUuid of network import, root node one private UUID reportUuid; - private Map importParameters; + private Map importParameters; private Map importParametersRaw; @@ -46,7 +48,7 @@ public RootNetworkEntity toEntity() { .caseName(caseInfos.getCaseName()) .caseFormat(caseInfos.getCaseFormat()) .reportUuid(reportUuid) - .importParameters(importParameters) + .importParameters(serializeImportParameters(importParameters)) .tag(tag); if (rootNetworkNodeInfos != null) { diff --git a/src/main/java/org/gridsuite/study/server/error/StudyBusinessErrorCode.java b/src/main/java/org/gridsuite/study/server/error/StudyBusinessErrorCode.java index 25c649a1c..099ed6f23 100644 --- a/src/main/java/org/gridsuite/study/server/error/StudyBusinessErrorCode.java +++ b/src/main/java/org/gridsuite/study/server/error/StudyBusinessErrorCode.java @@ -30,7 +30,8 @@ public enum StudyBusinessErrorCode implements BusinessErrorCode { NETWORK_EXPORT_FAILED("study.networkExportFailed"), TOO_MANY_NAD_CONFIGS("study.tooManyNadConfigs"), TOO_MANY_MAP_CARDS("study.tooManyMapCards"), - ELEMENT_ALREADY_EXISTS("study.elementAlreadyExists"); + ELEMENT_ALREADY_EXISTS("study.elementAlreadyExists"), + UNPROCESSABLE_IMPORT_PARAMETER("study.unprocessableImportParameter"); private final String value; diff --git a/src/main/java/org/gridsuite/study/server/repository/rootnetwork/RootNetworkEntity.java b/src/main/java/org/gridsuite/study/server/repository/rootnetwork/RootNetworkEntity.java index afb547510..96b5dddf4 100644 --- a/src/main/java/org/gridsuite/study/server/repository/rootnetwork/RootNetworkEntity.java +++ b/src/main/java/org/gridsuite/study/server/repository/rootnetwork/RootNetworkEntity.java @@ -12,12 +12,11 @@ import org.gridsuite.study.server.networkmodificationtree.entities.RootNetworkNodeInfoEntity; import org.gridsuite.study.server.repository.StudyEntity; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import java.util.*; import java.util.stream.Collectors; +import static org.gridsuite.study.server.utils.JsonUtils.deserializeImportParameters; + /** * @author Le Saulnier Kevin */ @@ -93,7 +92,7 @@ public RootNetworkInfos toDto() { rootNetworkInfosBuilder.id(this.id) .name(this.name) .networkInfos(new NetworkInfos(this.networkUuid, this.networkId)) - .importParameters(this.importParameters) + .importParameters(deserializeImportParameters(this.importParameters)) .caseInfos(new CaseInfos(this.caseUuid, this.originalCaseUuid, this.caseName, this.caseFormat)) .reportUuid(this.reportUuid) .tag(tag) diff --git a/src/main/java/org/gridsuite/study/server/service/ConsumerService.java b/src/main/java/org/gridsuite/study/server/service/ConsumerService.java index 8091b8aea..445521049 100644 --- a/src/main/java/org/gridsuite/study/server/service/ConsumerService.java +++ b/src/main/java/org/gridsuite/study/server/service/ConsumerService.java @@ -222,11 +222,6 @@ public Consumer> consumeCaseImportSucceeded() { String caseFormat = message.getHeaders().get(HEADER_CASE_FORMAT, String.class); String caseName = message.getHeaders().get(HEADER_CASE_NAME, String.class); Map rawParameters = message.getHeaders().get(HEADER_IMPORT_PARAMETERS, Map.class); - // String longer than 1024 bytes are converted to com.rabbitmq.client.LongString (https://docs.spring.io/spring-amqp/docs/3.0.0/reference/html/#message-properties-converters) - Map importParameters = new HashMap<>(); - if (rawParameters != null) { - rawParameters.forEach((key, value) -> importParameters.put(key, value.toString())); - } if (receiverString != null) { CaseImportReceiver receiver; @@ -237,12 +232,12 @@ public Consumer> consumeCaseImportSucceeded() { return; } - handleConsumeCaseImportSucceeded(receiver, networkUuid, networkId, caseName, caseFormat, importParameters); + handleConsumeCaseImportSucceeded(receiver, networkUuid, networkId, caseName, caseFormat, rawParameters); } }; } - private void handleConsumeCaseImportSucceeded(CaseImportReceiver receiver, UUID networkUuid, String networkId, String caseName, String caseFormat, Map importParameters) { + private void handleConsumeCaseImportSucceeded(CaseImportReceiver receiver, UUID networkUuid, String networkId, String caseName, String caseFormat, Map importParameters) { UUID caseUuid = receiver.getCaseUuid(); UUID studyUuid = receiver.getStudyUuid(); String userId = receiver.getUserId(); @@ -291,7 +286,7 @@ private void handleConsumeCaseImportSucceeded(CaseImportReceiver receiver, UUID } private void insertStudy(UUID studyUuid, String userId, NetworkInfos networkInfos, CaseInfos caseInfos, - Map importParameters, UUID importReportUuid) { + Map importParameters, UUID importReportUuid) { UserProfileInfos userProfileInfos = studyService.getUserProfile(userId); UUID loadFlowParametersUuid = createDefaultLoadFlowParameters(userId, userProfileInfos); diff --git a/src/main/java/org/gridsuite/study/server/service/NetworkModificationService.java b/src/main/java/org/gridsuite/study/server/service/NetworkModificationService.java index ddb37da6f..523ef23aa 100644 --- a/src/main/java/org/gridsuite/study/server/service/NetworkModificationService.java +++ b/src/main/java/org/gridsuite/study/server/service/NetworkModificationService.java @@ -149,7 +149,7 @@ public NetworkModificationsResult createModification(UUID groupUuid, HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON); - HttpEntity httpEntity = new HttpEntity<>(getModificationContextJsonString(objectMapper, modificationContextInfos), headers); + HttpEntity httpEntity = new HttpEntity<>(getModificationContextJsonString(modificationContextInfos), headers); return restTemplate.exchange(path, HttpMethod.POST, httpEntity, NetworkModificationsResult.class).getBody(); } diff --git a/src/main/java/org/gridsuite/study/server/service/RootNetworkService.java b/src/main/java/org/gridsuite/study/server/service/RootNetworkService.java index 3c1e7b84a..5facc277c 100644 --- a/src/main/java/org/gridsuite/study/server/service/RootNetworkService.java +++ b/src/main/java/org/gridsuite/study/server/service/RootNetworkService.java @@ -21,6 +21,7 @@ import org.gridsuite.study.server.repository.rootnetwork.RootNetworkRequestRepository; import org.gridsuite.study.server.repository.rootnetwork.RootNetworkEntity; import org.gridsuite.study.server.repository.rootnetwork.RootNetworkRepository; +import org.gridsuite.study.server.utils.JsonUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -114,7 +115,7 @@ private void updateRootNetworkInfos(RootNetworkEntity rootNetworkEntity, RootNet updateCaseInfos(rootNetworkEntity, rootNetworkInfos.getCaseInfos()); updateNetworkInfos(rootNetworkEntity, rootNetworkInfos.getNetworkInfos()); - rootNetworkEntity.setImportParameters(rootNetworkInfos.getImportParameters()); + rootNetworkEntity.setImportParameters(JsonUtils.serializeImportParameters(rootNetworkInfos.getImportParameters())); rootNetworkEntity.setReportUuid(rootNetworkInfos.getReportUuid()); } @@ -164,8 +165,8 @@ public String getCaseName(UUID rootNetworkUuid) { return getRootNetwork(rootNetworkUuid).map(RootNetworkEntity::getCaseName).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found")); } - public Map getImportParameters(UUID rootNetworkUuid) { - return rootNetworkRepository.findWithImportParametersById(rootNetworkUuid).map(RootNetworkEntity::getImportParameters).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found")); + public Map getImportParameters(UUID rootNetworkUuid) { + return rootNetworkRepository.findWithImportParametersById(rootNetworkUuid).map(RootNetworkEntity::getImportParameters).map(JsonUtils::deserializeImportParameters).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found")); } public List getRootNetworkInfosWithLinksInfos(UUID studyUuid) { @@ -183,7 +184,7 @@ public void duplicateStudyRootNetworks(StudyEntity newStudyEntity, StudyEntity s UUID clonedNetworkUuid = networkService.getNetworkUuid(clonedNetwork); UUID clonedCaseUuid = caseService.duplicateCase(rootNetworkEntityToDuplicate.getCaseUuid(), false); - Map newImportParameters = Map.copyOf(rootNetworkEntityToDuplicate.getImportParameters()); + Map newImportParameters = JsonUtils.deserializeImportParameters(rootNetworkEntityToDuplicate.getImportParameters()); UUID clonedRootNodeReportUuid = reportService.duplicateReport(rootNetworkEntityToDuplicate.getReportUuid()); diff --git a/src/main/java/org/gridsuite/study/server/service/StudyService.java b/src/main/java/org/gridsuite/study/server/service/StudyService.java index 7f1002192..a33fe7cd9 100644 --- a/src/main/java/org/gridsuite/study/server/service/StudyService.java +++ b/src/main/java/org/gridsuite/study/server/service/StudyService.java @@ -628,7 +628,7 @@ public CreatedStudyBasicInfos insertStudy(UUID studyUuid, String userId, Network UUID voltageInitParametersUuid, UUID securityAnalysisParametersUuid, UUID sensitivityAnalysisParametersUuid, UUID networkVisualizationParametersUuid, UUID dynamicSecurityAnalysisParametersUuid, UUID dynamicMarginCalculationParametersUuid, UUID stateEstimationParametersUuid, UUID pccMinParametersUuid, - UUID spreadsheetConfigCollectionUuid, UUID workspacesConfigUuid, Map importParameters, UUID importReportUuid) { + UUID spreadsheetConfigCollectionUuid, UUID workspacesConfigUuid, Map importParameters, UUID importReportUuid) { Objects.requireNonNull(studyUuid); Objects.requireNonNull(userId); Objects.requireNonNull(networkInfos.getNetworkUuid()); @@ -1544,7 +1544,7 @@ private StudyEntity saveStudyThenCreateBasicTree(UUID studyUuid, NetworkInfos ne UUID voltageInitParametersUuid, UUID securityAnalysisParametersUuid, UUID sensitivityAnalysisParametersUuid, UUID networkVisualizationParametersUuid, UUID dynamicSecurityAnalysisParametersUuid, UUID dynamicMarginCalculationParametersUuid, UUID stateEstimationParametersUuid, UUID pccMinParametersUuid, - UUID spreadsheetConfigCollectionUuid, UUID workspacesConfigUuid, Map importParameters, UUID importReportUuid) { + UUID spreadsheetConfigCollectionUuid, UUID workspacesConfigUuid, Map importParameters, UUID importReportUuid) { StudyEntity studyEntity = StudyEntity.builder() .id(studyUuid) diff --git a/src/main/java/org/gridsuite/study/server/utils/JsonUtils.java b/src/main/java/org/gridsuite/study/server/utils/JsonUtils.java index 7fbe37c16..380da6899 100644 --- a/src/main/java/org/gridsuite/study/server/utils/JsonUtils.java +++ b/src/main/java/org/gridsuite/study/server/utils/JsonUtils.java @@ -14,12 +14,19 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.NonNull; import org.gridsuite.study.server.dto.modification.ModificationApplicationContext; +import org.gridsuite.study.server.error.StudyException; import org.springframework.data.util.Pair; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.function.Predicate; +import static org.gridsuite.study.server.error.StudyBusinessErrorCode.UNPROCESSABLE_IMPORT_PARAMETER; + public final class JsonUtils { + private static final ObjectMapper MAPPER = new ObjectMapper(); + private JsonUtils() { throw new UnsupportedOperationException("This is a utility class and cannot be instantiated"); } @@ -55,14 +62,50 @@ public static JsonNode nodeAt(@NonNull final JsonNode node, @NonNull final JsonP return nodeAt(node, jsonNode -> !jsonNode.isMissingNode(), pointers); } - public static String getModificationContextJsonString(ObjectMapper objectMapper, Pair> modificationContextInfos) { + public static String getModificationContextJsonString(Pair> modificationContextInfos) { try { - ObjectNode modificationJson = (ObjectNode) objectMapper.readTree(modificationContextInfos.getFirst()); - ObjectNode modificationContextJson = objectMapper.valueToTree(modificationContextInfos); + ObjectNode modificationJson = (ObjectNode) MAPPER.readTree(modificationContextInfos.getFirst()); + ObjectNode modificationContextJson = MAPPER.valueToTree(modificationContextInfos); modificationContextJson.set(Pair.class.getDeclaredField("first").getName(), modificationJson); return modificationContextJson.toString(); } catch (JsonProcessingException | NoSuchFieldException e) { throw new IllegalStateException("Impossible to parse modification context", e); } } + + public static Map deserializeImportParameters(Map rawParams) { + Map result = new HashMap<>(); + if (rawParams == null) { + return result; + } + + rawParams.forEach((key, value) -> { + if (value == null) { + result.put(key, null); + return; + } + try { + result.put(key, MAPPER.readValue(value, Object.class)); + } catch (JsonProcessingException e) { + throw new StudyException(UNPROCESSABLE_IMPORT_PARAMETER, "Import parameter '" + key + " => " + value + "' is not valid JSON: " + e.getMessage()); + } + }); + return result; + } + + public static Map serializeImportParameters(Map params) { + Map result = new HashMap<>(); + if (params == null) { + return result; + } + + params.forEach((key, value) -> { + try { + result.put(key, MAPPER.writeValueAsString(value)); + } catch (JsonProcessingException e) { + throw new StudyException(UNPROCESSABLE_IMPORT_PARAMETER, "Import parameter '" + key + " => " + value + "' is not serializable: " + e.getMessage()); + } + }); + return result; + } } diff --git a/src/main/resources/db/changelog/changesets/changelog_20260519T112945Z.xml b/src/main/resources/db/changelog/changesets/changelog_20260519T112945Z.xml new file mode 100644 index 000000000..68c43e101 --- /dev/null +++ b/src/main/resources/db/changelog/changesets/changelog_20260519T112945Z.xml @@ -0,0 +1,11 @@ + + + + + + import_parameters='' + + + diff --git a/src/test/java/org/gridsuite/study/server/JsonUtilsTest.java b/src/test/java/org/gridsuite/study/server/JsonUtilsTest.java new file mode 100644 index 000000000..4e5d18651 --- /dev/null +++ b/src/test/java/org/gridsuite/study/server/JsonUtilsTest.java @@ -0,0 +1,88 @@ +/** + * 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.study.server; + +import org.gridsuite.study.server.error.StudyBusinessErrorCode; +import org.gridsuite.study.server.error.StudyException; +import org.gridsuite.study.server.utils.JsonUtils; +import org.junit.jupiter.api.Test; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.*; + +/** + * @author Etienne HOMER + */ +class JsonUtilsTest { + + @Test + void shouldSerializeImportParameters() { + Map params = new HashMap<>(); + params.put("string", "value"); + params.put("int", 123); + params.put("bool", true); + params.put("list", List.of("a", "b")); + params.put("map", Map.of("k", "v")); + params.put("null", null); + + Map result = JsonUtils.serializeImportParameters(params); + + assertEquals("\"value\"", result.get("string")); + assertEquals("123", result.get("int")); + assertEquals("true", result.get("bool")); + assertEquals("[\"a\",\"b\"]", result.get("list")); + assertEquals("{\"k\":\"v\"}", result.get("map")); + assertEquals("null", result.get("null")); + } + + @Test + void shouldReturnEmptyMapWhenSerializeNull() { + Map result = JsonUtils.serializeImportParameters(null); + assertNotNull(result); + assertTrue(result.isEmpty()); + } + + @Test + void shouldDeserializeImportParameters() { + Map rawParams = new HashMap<>(); + rawParams.put("string", "\"value\""); + rawParams.put("int", "123"); + rawParams.put("bool", "true"); + rawParams.put("list", "[\"a\",\"b\"]"); + rawParams.put("map", "{\"k\":\"v\"}"); + rawParams.put("null", "null"); + rawParams.put("realNull", null); + + Map result = JsonUtils.deserializeImportParameters(rawParams); + + assertEquals("value", result.get("string")); + assertEquals(123, result.get("int")); + assertEquals(true, result.get("bool")); + assertEquals(List.of("a", "b"), result.get("list")); + assertEquals(Map.of("k", "v"), result.get("map")); + assertNull(result.get("null")); + assertNull(result.get("realNull")); + } + + @Test + void shouldReturnEmptyMapWhenDeserializeNull() { + Map result = JsonUtils.deserializeImportParameters(null); + assertNotNull(result); + assertTrue(result.isEmpty()); + } + + @Test + void shouldThrowExceptionWhenDeserializeInvalidJson() { + Map rawParams = Map.of("invalid", "{notJson}"); + StudyException exception = assertThrows(StudyException.class, () -> JsonUtils.deserializeImportParameters(rawParams)); + assertEquals(StudyBusinessErrorCode.UNPROCESSABLE_IMPORT_PARAMETER, exception.getBusinessErrorCode()); + assertTrue(exception.getMessage().contains("Import parameter 'invalid => {notJson}' is not valid JSON")); + } +} diff --git a/src/test/java/org/gridsuite/study/server/NetworkModificationTest.java b/src/test/java/org/gridsuite/study/server/NetworkModificationTest.java index e1c911055..ab4711293 100644 --- a/src/test/java/org/gridsuite/study/server/NetworkModificationTest.java +++ b/src/test/java/org/gridsuite/study/server/NetworkModificationTest.java @@ -538,7 +538,7 @@ void testLocalBuildValue() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid); assertEquals(BuildStatus.BUILT_WITH_ERROR, networkModificationTreeService.getNodeBuildStatus(modificationNodeUuid, rootNetworkUuid).getGlobalBuildStatus()); Pair> modificationBody = Pair.of(jsonCreateLoadInfos, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // Build second node is OK networkModificationResult.get().setApplicationStatus(NetworkModificationResult.ApplicationStatus.ALL_OK); @@ -556,7 +556,7 @@ void testLocalBuildValue() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode2Uuid); assertEquals(BuildStatus.BUILT_WITH_ERROR, networkModificationTreeService.getNodeBuildStatus(modificationNode2Uuid, rootNetworkUuid).getGlobalBuildStatus()); modificationBody = Pair.of(jsonCreateLoadInfos, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode2Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); //Build modification node 2, local status should be BUILT and computed one should be BUILT_WITH_ERRORS assertEquals(BuildStatus.BUILT, networkModificationTreeService.getNodeBuildStatus(modificationNode2Uuid, rootNetworkUuid).getLocalBuildStatus()); @@ -700,7 +700,7 @@ void testNetworkModificationSwitch() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); Pair> modificationBody = Pair.of(bodyJson, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); List csbiListResult = studyService.getStudies(); @@ -716,7 +716,7 @@ void testNetworkModificationSwitch() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode2Uuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); modificationBody = Pair.of(bodyJson, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode2Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // test build status on switch modification RootNetworkNodeInfoEntity rootNetworkNodeInfo1Entity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode1.getId(), studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found")); @@ -744,7 +744,7 @@ void testNetworkModificationSwitch() throws Exception { checkEquipmentMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid, expectedPayload); checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid); modificationBody = Pair.of(bodyJson, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); reportServerStubs.verifyDeleteReport(); @@ -791,7 +791,7 @@ void testNetworkModificationEquipment() throws Exception { checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNodeUuid); checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid); Pair> modificationBody = Pair.of(bodyJson, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); List csbiListResponse = studyService.getStudies(); @@ -807,7 +807,7 @@ void testNetworkModificationEquipment() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid2); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); modificationBody = Pair.of(bodyJson, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid2, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); } @Test @@ -857,7 +857,7 @@ void testCreateGenerator() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); Pair> modificationBody = Pair.of(bodyJsonCreate, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // create generator on second modification node mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNode2Uuid) @@ -869,7 +869,7 @@ void testCreateGenerator() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode2Uuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); modificationBody = Pair.of(bodyJsonCreate, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode2Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // update generator creation body.replace("generatorId", "generatorId2"); @@ -933,7 +933,7 @@ void testCreateShuntsCompensator() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); Pair> modificationBody = Pair.of(createShuntCompensatorAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // update shunt compensator creation UUID stubPutId = wireMockStubs.stubNetworkModificationPut(MODIFICATION_UUID); @@ -997,7 +997,7 @@ void testCreateLine() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); Pair> modificationBody = Pair.of(createLineAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // create line on second modification node mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNode2Uuid) @@ -1008,7 +1008,7 @@ void testCreateLine() throws Exception { checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNode2Uuid); checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode2Uuid); modificationBody = Pair.of(createLineAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode2Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // update line creation String lineAttributesUpdated = "{\"type\":\"" + ModificationType.LINE_CREATION @@ -1080,7 +1080,7 @@ void testCreateTwoWindingsTransformer() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); Pair> modificationBody = Pair.of(createTwoWindingsTransformerAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // create 2WT on second modification node mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNode2Uuid) @@ -1092,7 +1092,7 @@ void testCreateTwoWindingsTransformer() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode2Uuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); modificationBody = Pair.of(createTwoWindingsTransformerAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode2Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // update Two Windings Transformer creation String twoWindingsTransformerAttributesUpdated = "{\"type\":\"" + ModificationType.TWO_WINDINGS_TRANSFORMER_CREATION + "\",\"equipmentId\":\"2wtId\",\"equipmentName\":\"2wtName\",\"seriesResistance\":\"10\",\"seriesReactance\":\"10\",\"magnetizingConductance\":\"100\",\"magnetizingSusceptance\":\"100\",\"ratedVoltage1\":\"480\",\"ratedVoltage2\":\"380\",\"voltageLevelId1\":\"CHOO5P6\",\"busOrBusbarSectionId1\":\"CHOO5P6_1\",\"voltageLevelId2\":\"CHOO5P6\",\"busOrBusbarSectionId2\":\"CHOO5P6_1\"}"; @@ -1202,11 +1202,11 @@ void testUpdateLines() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); Pair> modificationBody = Pair.of(bodyJsonCreate1, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); bodyLineInfos.put("equipmentId", "lineFailedId"); String bodyJsonCreate2 = mapper.writeValueAsString(bodyLineInfos); - String modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(bodyJsonCreate2, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID)))); + String modificationBodyJson = getModificationContextJsonString(Pair.of(bodyJsonCreate2, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID)))); wireMockStubs.stubNetworkModificationPostWithError(modificationBodyJson); mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNode1Uuid) .content(bodyJsonCreate2).contentType(MediaType.APPLICATION_JSON) @@ -1231,11 +1231,11 @@ void testUpdateLines() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); modificationBody = Pair.of(bodyJsonCreate3, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); bodyLineInfos.put("equipmentId", "lineFailedId"); String bodyJsonCreate4 = mapper.writeValueAsString(bodyLineInfos); - modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(bodyJsonCreate4, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID)))); + modificationBodyJson = getModificationContextJsonString(Pair.of(bodyJsonCreate4, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID)))); wireMockStubs.stubNetworkModificationPostWithError(modificationBodyJson); mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNode1Uuid) .content(bodyJsonCreate4).contentType(MediaType.APPLICATION_JSON) @@ -1260,11 +1260,11 @@ void testUpdateLines() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); modificationBody = Pair.of(bodyJsonCreate5, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); bodyLineInfos.put("equipmentId", "lineFailedId"); String bodyJsonCreate6 = mapper.writeValueAsString(bodyLineInfos); - modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(bodyJsonCreate6, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID)))); + modificationBodyJson = getModificationContextJsonString(Pair.of(bodyJsonCreate6, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID)))); wireMockStubs.stubNetworkModificationPostWithError(modificationBodyJson); mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNode1Uuid) .content(bodyJsonCreate6).contentType(MediaType.APPLICATION_JSON) @@ -1289,11 +1289,11 @@ void testUpdateLines() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); modificationBody = Pair.of(bodyJsonCreate7, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); bodyLineInfos.put("equipmentId", "lineFailedId"); String bodyJsonCreate8 = mapper.writeValueAsString(bodyLineInfos); - modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(bodyJsonCreate8, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID)))); + modificationBodyJson = getModificationContextJsonString(Pair.of(bodyJsonCreate8, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID)))); wireMockStubs.stubNetworkModificationPostWithError(modificationBodyJson); mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNode1Uuid) .content(bodyJsonCreate8).contentType(MediaType.APPLICATION_JSON) @@ -1316,7 +1316,7 @@ void testUpdateLines() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode2Uuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); modificationBody = Pair.of(bodyJsonCreate9, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode2Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); } @Test @@ -1355,7 +1355,7 @@ void testCreateLoad() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); Pair> modificationBody = Pair.of(createLoadAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // create load on second modification node mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNode2Uuid) @@ -1367,7 +1367,7 @@ void testCreateLoad() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode2Uuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); modificationBody = Pair.of(createLoadAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode2Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // update load creation String loadAttributesUpdated = "{\"type\":\"" + ModificationType.LOAD_CREATION + "\",\"loadId\":\"loadId2\",\"loadName\":\"loadName2\",\"loadType\":\"UNDEFINED\",\"activePower\":\"50.0\",\"reactivePower\":\"25.0\",\"voltageLevelId\":\"idVL2\",\"busId\":\"idBus2\"}"; @@ -1428,7 +1428,7 @@ void testModifyLoad() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); Pair> modificationBody = Pair.of(loadModificationAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // modify load on second modification node mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNodeUuid2) @@ -1440,7 +1440,7 @@ void testModifyLoad() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid2); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); modificationBody = Pair.of(loadModificationAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid2, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // update load modification UUID stubPutId = wireMockStubs.stubNetworkModificationPut(MODIFICATION_UUID); @@ -1486,7 +1486,7 @@ void testModifyEquipment() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); Pair> modificationBody = Pair.of(equipmentModificationAttribute, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // modify generator on second modification node mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNodeUuid2) @@ -1498,7 +1498,7 @@ void testModifyEquipment() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid2); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); modificationBody = Pair.of(equipmentModificationAttribute, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid2, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // update generator modification String generatorAttributesUpdated = "{\"type\":\"" + ModificationType.GENERATOR_MODIFICATION + "\",\"generatorId\":\"generatorId1\",\"generatorType\":\"FICTITIOUS\",\"activePower\":\"70.0\"}"; @@ -1547,7 +1547,7 @@ void testCreateSubstation() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); Pair> modificationBody = Pair.of(createSubstationAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // create substation on second modification node mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNode2Uuid) @@ -1559,7 +1559,7 @@ void testCreateSubstation() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode2Uuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); modificationBody = Pair.of(createSubstationAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode2Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // update substation creation UUID stubPutId = wireMockStubs.stubNetworkModificationPut(MODIFICATION_UUID); @@ -1619,7 +1619,7 @@ void testCreateVoltageLevel() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); Pair> modificationBody = Pair.of(createVoltageLevelAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // create voltage level on second modification node mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNode2Uuid) @@ -1631,7 +1631,7 @@ void testCreateVoltageLevel() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode2Uuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); modificationBody = Pair.of(createVoltageLevelAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode2Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // update voltage level creation UUID stubPutId = wireMockStubs.stubNetworkModificationPut(MODIFICATION_UUID); @@ -1693,7 +1693,7 @@ void testLineSplitWithVoltageLevel() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); Pair> modificationBody = Pair.of(lineSplitWoVLasJSON, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); UUID stubPutId = wireMockStubs.stubNetworkModificationPutWithBody(MODIFICATION_UUID, lineSplitWoVLasJSON); mockMvc.perform(put(URI_NETWORK_MODIF_WITH_ID, studyNameUserIdUuid, modificationNodeUuid, MODIFICATION_UUID) @@ -1707,7 +1707,7 @@ void testLineSplitWithVoltageLevel() throws Exception { wireMockStubs.verifyNetworkModificationPut(stubPutId, MODIFICATION_UUID, lineSplitWoVLasJSON); String badBody = "{\"type\":\"" + ModificationType.LINE_SPLIT_WITH_VOLTAGE_LEVEL + "\",\"bogus\":\"bogus\"}"; - String modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(badBody, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)))); + String modificationBodyJson = getModificationContextJsonString(Pair.of(badBody, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)))); wireMockStubs.stubNetworkModificationPostWithBodyAndError(modificationBodyJson); stubPutId = wireMockStubs.stubNetworkModificationPutWithBodyAndError(MODIFICATION_UUID, badBody); mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNodeUuid) @@ -1753,7 +1753,7 @@ void testLineAttachToVoltageLevel() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); Pair> modificationBody = Pair.of(createLineAttachToVoltageLevelAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); UUID stubPutId = wireMockStubs.stubNetworkModificationPutWithBody(MODIFICATION_UUID, createLineAttachToVoltageLevelAttributes); mockMvc.perform(put(URI_NETWORK_MODIF_WITH_ID, studyNameUserIdUuid, modificationNodeUuid, MODIFICATION_UUID) @@ -1788,7 +1788,7 @@ void testLinesAttachToSplitLines() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); Pair> modificationBody = Pair.of(createLinesAttachToSplitLinesAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); UUID stubPutId = wireMockStubs.stubNetworkModificationPutWithBody(MODIFICATION_UUID, createLinesAttachToSplitLinesAttributes); mockMvc.perform(put(URI_NETWORK_MODIF_WITH_ID, studyNameUserIdUuid, modificationNodeUuid, MODIFICATION_UUID) @@ -1802,7 +1802,7 @@ void testLinesAttachToSplitLines() throws Exception { wireMockStubs.verifyNetworkModificationPut(stubPutId, MODIFICATION_UUID, createLinesAttachToSplitLinesAttributes); String badBody = "{\"type\":\"" + ModificationType.LINES_ATTACH_TO_SPLIT_LINES + "\",\"bogus\":\"bogus\"}"; - String modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(badBody, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)))); + String modificationBodyJson = getModificationContextJsonString(Pair.of(badBody, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)))); wireMockStubs.stubNetworkModificationPostWithBodyAndError(modificationBodyJson); stubPutId = wireMockStubs.stubNetworkModificationPutWithBodyAndError(MODIFICATION_UUID, badBody); mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNodeUuid) @@ -1846,7 +1846,7 @@ void testScaling(ModificationType scalingType) throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); Pair> modificationBody = Pair.of(requestBody, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); UUID stubPutId = wireMockStubs.stubNetworkModificationPutWithBody(MODIFICATION_UUID, requestBody); mockMvc.perform(put(URI_NETWORK_MODIF_WITH_ID, studyNameUserIdUuid, modificationNodeUuid, MODIFICATION_UUID) @@ -1860,7 +1860,7 @@ void testScaling(ModificationType scalingType) throws Exception { wireMockStubs.verifyNetworkModificationPut(stubPutId, MODIFICATION_UUID, requestBody); // test with errors - String modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(requestBody, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)))); + String modificationBodyJson = getModificationContextJsonString(Pair.of(requestBody, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)))); wireMockStubs.stubNetworkModificationPostWithBodyAndError(modificationBodyJson); mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNodeUuid) .content(requestBody).contentType(MediaType.APPLICATION_JSON) @@ -1901,7 +1901,7 @@ void testDeleteVoltageLevelOnline() throws Exception { checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNodeUuid); checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid); Pair> modificationBody = Pair.of(createDeleteVoltageLevelOnlineAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); UUID stubIdPut = wireMockStubs.stubNetworkModificationPutWithBody(MODIFICATION_UUID, createDeleteVoltageLevelOnlineAttributes); mockMvc.perform(put(URI_NETWORK_MODIF_WITH_ID, studyNameUserIdUuid, modificationNodeUuid, MODIFICATION_UUID) @@ -1914,7 +1914,7 @@ void testDeleteVoltageLevelOnline() throws Exception { wireMockStubs.verifyNetworkModificationPut(stubIdPut, MODIFICATION_UUID, createDeleteVoltageLevelOnlineAttributes); String badBody = "{\"type\":\"" + ModificationType.DELETE_VOLTAGE_LEVEL_ON_LINE + "\",\"bogus\":\"bogus\"}"; - String modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(badBody, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)))); + String modificationBodyJson = getModificationContextJsonString(Pair.of(badBody, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)))); wireMockStubs.stubNetworkModificationPostWithBodyAndError(modificationBodyJson); UUID stubIdPutErr = wireMockStubs.stubNetworkModificationPutWithBodyAndError(MODIFICATION_UUID, badBody); mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNodeUuid).header(USER_ID_HEADER, userId) @@ -1954,7 +1954,7 @@ void testDeleteAttachingline() throws Exception { checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNodeUuid); checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid); Pair> modificationBody = Pair.of(createDeleteAttachingLineAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); UUID stubIdPut = wireMockStubs.stubNetworkModificationPutWithBody(MODIFICATION_UUID, createDeleteAttachingLineAttributes); mockMvc.perform(put(URI_NETWORK_MODIF_WITH_ID, studyNameUserIdUuid, modificationNodeUuid, MODIFICATION_UUID) @@ -1967,7 +1967,7 @@ void testDeleteAttachingline() throws Exception { wireMockStubs.verifyNetworkModificationPut(stubIdPut, MODIFICATION_UUID, createDeleteAttachingLineAttributes); String badBody = "{\"type\":\"" + ModificationType.DELETE_ATTACHING_LINE + "\",\"bogus\":\"bogus\"}"; - String modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(badBody, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)))); + String modificationBodyJson = getModificationContextJsonString(Pair.of(badBody, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)))); wireMockStubs.stubNetworkModificationPostWithBodyAndError(modificationBodyJson); UUID stubIdPutErr = wireMockStubs.stubNetworkModificationPutWithBodyAndError(MODIFICATION_UUID, badBody); mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNodeUuid) @@ -2496,7 +2496,7 @@ void testDeleteEquipment() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); Pair> modificationBody = Pair.of(bodyJson, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // delete equipment on second modification node mockMvc.perform(post(URI_NETWORK_MODIF, studyNameUserIdUuid, modificationNode2Uuid) @@ -2508,7 +2508,7 @@ void testDeleteEquipment() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode2Uuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); modificationBody = Pair.of(bodyJson, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode2Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // update equipment deletion UUID stubPutId = wireMockStubs.stubNetworkModificationPut(MODIFICATION_UUID); @@ -2612,7 +2612,7 @@ void testNodesInvalidation() throws Exception { checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); assertEquals(BuildStatus.NOT_BUILT, networkModificationTreeService.getNodeBuildStatus(modificationNode3Uuid, firstRootNetworkUuid).getGlobalBuildStatus()); Pair> modificationBody = Pair.of(jsonCreateLoadInfos, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode2Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); } @Test @@ -2668,7 +2668,7 @@ void testRemoveLoadFlowComputationReport() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNode1Uuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); Pair> modificationBody = Pair.of(bodyJson, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNode1Uuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); wireMockStubs.verifyNetworkModificationDeleteIndex(deleteModificationIndexStub); // 1 status LF + 2 x 10 computations + 1 report @@ -2719,7 +2719,7 @@ void testUpdateOfBuildStatus() throws Exception { checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); assertEquals(BuildStatus.NOT_BUILT, networkModificationTreeService.getNodeBuildStatus(modificationNodeUuid, firstRootNetworkUuid).getGlobalBuildStatus()); Pair> modificationBody = Pair.of(jsonCreateLoadInfos, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // Mark the node status as built RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity = rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(modificationNode.getId(), studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid)).orElseThrow(() -> new StudyException(NOT_FOUND, "Root network not found")); @@ -2742,7 +2742,7 @@ void testUpdateOfBuildStatus() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid); assertEquals(BuildStatus.BUILT, networkModificationTreeService.getNodeBuildStatus(modificationNodeUuid, firstRootNetworkUuid).getGlobalBuildStatus()); modificationBody = Pair.of(jsonCreateLoadInfos, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // Built with warnings networkModificationResult.get().setApplicationStatus(NetworkModificationResult.ApplicationStatus.WITH_WARNINGS); @@ -2759,7 +2759,7 @@ void testUpdateOfBuildStatus() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid); assertEquals(BuildStatus.BUILT_WITH_WARNING, networkModificationTreeService.getNodeBuildStatus(modificationNodeUuid, firstRootNetworkUuid).getGlobalBuildStatus()); modificationBody = Pair.of(jsonCreateLoadInfos, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // Built with errors networkModificationResult.get().setApplicationStatus(NetworkModificationResult.ApplicationStatus.WITH_ERRORS); @@ -2776,7 +2776,7 @@ void testUpdateOfBuildStatus() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid); assertEquals(BuildStatus.BUILT_WITH_ERROR, networkModificationTreeService.getNodeBuildStatus(modificationNodeUuid, firstRootNetworkUuid).getGlobalBuildStatus()); modificationBody = Pair.of(jsonCreateLoadInfos, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); } private void testBuildWithNodeUuid(UUID studyUuid, UUID nodeUuid, UUID rootNetworkUuid, String userId, UUID profileStubId) throws Exception { @@ -3115,7 +3115,7 @@ void testCreateModificationWithErrors() throws Exception { checkEquipmentCreatingMessagesReceived(studyNameUserIdUuid, modificationNodeUuid); checkEquipmentUpdatingFinishedMessagesReceived(studyNameUserIdUuid, modificationNodeUuid); checkElementUpdatedMessageSent(studyNameUserIdUuid, userId); - String modificationBodyJson = getModificationContextJsonString(mapper, Pair.of(jsonCreateLoadInfos, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)))); + String modificationBodyJson = getModificationContextJsonString(Pair.of(jsonCreateLoadInfos, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, modificationNodeUuid, NETWORK_UUID)))); wireMockStubs.verifyNetworkModificationPostWithVariant(modificationBodyJson); // String message error diff --git a/src/test/java/org/gridsuite/study/server/NetworkModificationUnitTest.java b/src/test/java/org/gridsuite/study/server/NetworkModificationUnitTest.java index 338247b5e..9a70890ec 100644 --- a/src/test/java/org/gridsuite/study/server/NetworkModificationUnitTest.java +++ b/src/test/java/org/gridsuite/study/server/NetworkModificationUnitTest.java @@ -12,7 +12,6 @@ import org.gridsuite.study.server.dto.BuildInfos; import org.gridsuite.study.server.dto.InvalidateNodeTreeParameters; import org.gridsuite.study.server.dto.RootNetworkIndexationStatus; -import org.gridsuite.study.server.dto.RootNetworkInfos; import org.gridsuite.study.server.dto.modification.NetworkModificationMetadata; import org.gridsuite.study.server.dto.workflow.RerunLoadFlowInfos; import org.gridsuite.study.server.error.StudyException; @@ -272,7 +271,7 @@ void buildNodeWithWorkflowInfos() throws JsonProcessingException { void unbuildAllNodes() { setupWithTwoRootNetwork(); UUID rootNodeUuid = networkModificationTreeService.getStudyRootNodeUuid(studyUuid); - List rootNetworkUuids = rootNetworkService.getRootNetworkInfosWithLinksInfos(studyUuid).stream().map(RootNetworkInfos::getId).toList(); + List rootNetworkUuids = rootNetworkRepository.findAllWithInfosByStudyId(studyUuid).stream().map(RootNetworkEntity::getId).toList(); studyController.unbuildAllNodes(studyUuid, USER_ID_HEADER); diff --git a/src/test/java/org/gridsuite/study/server/rootnetworks/RootNetworkTest.java b/src/test/java/org/gridsuite/study/server/rootnetworks/RootNetworkTest.java index a2fe0ff19..7f001868c 100644 --- a/src/test/java/org/gridsuite/study/server/rootnetworks/RootNetworkTest.java +++ b/src/test/java/org/gridsuite/study/server/rootnetworks/RootNetworkTest.java @@ -384,9 +384,10 @@ void testCreateRootNetworkConsumer() throws Exception { // prepare all headers that will be sent to consumer supposed to receive "caseImportSucceeded" message Consumer> messageConsumer = consumerService.consumeCaseImportSucceeded(); CaseImportReceiver caseImportReceiver = new CaseImportReceiver(studyEntity.getId(), newRootNetworkUuid, CASE_UUID2, CASE_UUID, REPORT_UUID2, USER_ID, 0L, CaseImportAction.ROOT_NETWORK_CREATION); - Map importParameters = new HashMap<>(); + Map importParameters = new HashMap<>(); importParameters.put("param1", "value1"); - importParameters.put("param2", "value2"); + importParameters.put("param2", true); + importParameters.put("param3", null); Map headers = createConsumeCaseImportSucceededHeaders(NETWORK_UUID2.toString(), NETWORK_ID2, CASE_FORMAT2, CASE_NAME2, caseImportReceiver, importParameters); // send message to consumer @@ -863,7 +864,7 @@ void getOrderedRootNetworksFromService() { assertEquals("dummyRootNetwork3", resultAfterCreation.get(2).name()); } - private Map createConsumeCaseImportSucceededHeaders(String networkUuid, String networkId, String caseFormat, String caseName, CaseImportReceiver caseImportReceiver, Map importParameters) throws JsonProcessingException { + private Map createConsumeCaseImportSucceededHeaders(String networkUuid, String networkId, String caseFormat, String caseName, CaseImportReceiver caseImportReceiver, Map importParameters) throws JsonProcessingException { Map headers = new HashMap<>(); headers.put("networkUuid", networkUuid); headers.put("networkId", networkId); diff --git a/src/test/java/org/gridsuite/study/server/studycontroller/NodeControllerTest.java b/src/test/java/org/gridsuite/study/server/studycontroller/NodeControllerTest.java index b0744d095..f9dbe400c 100644 --- a/src/test/java/org/gridsuite/study/server/studycontroller/NodeControllerTest.java +++ b/src/test/java/org/gridsuite/study/server/studycontroller/NodeControllerTest.java @@ -77,7 +77,7 @@ void testCutAndPasteNode() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(study1Uuid, node1.getId()); checkElementUpdatedMessageSent(study1Uuid, userId); Pair> modificationBody = Pair.of(createTwoWindingsTransformerAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, node1.getId(), NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // add modification on node "node2" String createLoadAttributes = "{\"type\":\"" + ModificationType.LOAD_CREATION + "\",\"loadId\":\"loadId1\",\"loadName\":\"loadName1\",\"loadType\":\"UNDEFINED\",\"activePower\":\"100.0\",\"reactivePower\":\"50.0\",\"voltageLevelId\":\"idVL1\",\"busId\":\"idBus1\"}"; @@ -92,7 +92,7 @@ void testCutAndPasteNode() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(study1Uuid, node2.getId()); checkElementUpdatedMessageSent(study1Uuid, userId); modificationBody = Pair.of(createLoadAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, node2.getId(), NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); rootNetworkNodeInfoService.updateRootNetworkNode(node2.getId(), studyTestUtils.getOneRootNetworkUuid(study1Uuid), RootNetworkNodeInfo.builder() @@ -491,7 +491,7 @@ void testDuplicateNode() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(study1Uuid, node1.getId()); checkElementUpdatedMessageSent(study1Uuid, userId); Pair> modificationBody = Pair.of(createTwoWindingsTransformerAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, node1.getId(), NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // add modification on node "node2" String createLoadAttributes = "{\"type\":\"" + ModificationType.LOAD_CREATION + "\",\"loadId\":\"loadId1\",\"loadName\":\"loadName1\",\"loadType\":\"UNDEFINED\",\"activePower\":\"100.0\",\"reactivePower\":\"50.0\",\"voltageLevelId\":\"idVL1\",\"busId\":\"idBus1\"}"; @@ -506,7 +506,7 @@ void testDuplicateNode() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(study1Uuid, node2.getId()); checkElementUpdatedMessageSent(study1Uuid, userId); modificationBody = Pair.of(createLoadAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, node2.getId(), NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); rootNetworkNodeInfoService.updateRootNetworkNode(node2.getId(), studyTestUtils.getOneRootNetworkUuid(study1Uuid), RootNetworkNodeInfo.builder() @@ -621,7 +621,7 @@ void testDuplicateSubtree() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(study1Uuid, node1.getId()); checkElementUpdatedMessageSent(study1Uuid, userId); Pair> modificationBody = Pair.of(createTwoWindingsTransformerAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, node1.getId(), NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); wireMockStubs.verifyNetworkModificationDeleteIndex(deleteModificationIndexStub); // Invalidation node 3 @@ -642,7 +642,7 @@ void testDuplicateSubtree() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(study1Uuid, node2.getId()); checkElementUpdatedMessageSent(study1Uuid, userId); modificationBody = Pair.of(createLoadAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, node2.getId(), NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); rootNetworkNodeInfoService.updateRootNetworkNode(node2.getId(), firstRootNetworkUuid, RootNetworkNodeInfo.builder() @@ -762,7 +762,7 @@ void testDuplicateNodeBetweenStudies() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(study1Uuid, node1.getId()); checkElementUpdatedMessageSent(study1Uuid, userId); Pair> modificationBody = Pair.of(createTwoWindingsTransformerAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, node1.getId(), NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // add modification on node "node2" wireMockStubs.stubNetworkModificationPost(mapper.writeValueAsString(new NetworkModificationsResult(List.of(UUID.randomUUID()), List.of(Optional.empty())))); @@ -777,7 +777,7 @@ void testDuplicateNodeBetweenStudies() throws Exception { checkEquipmentUpdatingFinishedMessagesReceived(study1Uuid, node2.getId()); checkElementUpdatedMessageSent(study1Uuid, userId); modificationBody = Pair.of(createLoadAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(firstRootNetworkUuid, node2.getId(), NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); //study 2 node2 should not have any child List allNodes = networkModificationTreeService.getAllNodes(study2Uuid); diff --git a/src/test/java/org/gridsuite/study/server/studycontroller/StudyControllerCreationTest.java b/src/test/java/org/gridsuite/study/server/studycontroller/StudyControllerCreationTest.java index 36f9aacef..0e58fd678 100644 --- a/src/test/java/org/gridsuite/study/server/studycontroller/StudyControllerCreationTest.java +++ b/src/test/java/org/gridsuite/study/server/studycontroller/StudyControllerCreationTest.java @@ -207,8 +207,8 @@ void testConsumeCaseImportSucceededWithParameters() throws JsonProcessingExcepti StudyEntity studyEntity = studyRepository.findById(studyUuid).orElseThrow(); UUID rootNetworkUUID = testUtils.getOneRootNetworkUuid(studyEntity.getId()); - Map expectedImportParameters = new HashMap<>(); - importParameters.forEach((key, value) -> expectedImportParameters.put(key, value.toString())); + Map expectedImportParameters = new HashMap<>(); + importParameters.forEach(expectedImportParameters::put); assertThat(rootNetworkService.getImportParameters(rootNetworkUUID)).usingRecursiveComparison().isEqualTo(expectedImportParameters); assertStudyCreationFinishedMessageReceived(studyUuid, userId); diff --git a/src/test/java/org/gridsuite/study/server/studycontroller/StudyTest.java b/src/test/java/org/gridsuite/study/server/studycontroller/StudyTest.java index d8e80caf0..f3db9d958 100644 --- a/src/test/java/org/gridsuite/study/server/studycontroller/StudyTest.java +++ b/src/test/java/org/gridsuite/study/server/studycontroller/StudyTest.java @@ -933,7 +933,7 @@ private void testDuplicateStudy(UUID study1Uuid, UUID rootNetworkUuid, String us checkEquipmentUpdatingFinishedMessagesReceived(study1Uuid, node1.getId()); checkElementUpdatedMessageSent(study1Uuid, userId); Pair> modificationBody = Pair.of(createTwoWindingsTransformerAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(rootNetworkUuid, node1.getId(), NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); // add modification on node "node2" String createLoadAttributes = "{\"type\":\"" + ModificationType.LOAD_CREATION + "\",\"loadId\":\"loadId1\",\"loadName\":\"loadName1\",\"loadType\":\"UNDEFINED\",\"activePower\":\"100.0\",\"reactivePower\":\"50.0\",\"voltageLevelId\":\"idVL1\",\"busId\":\"idBus1\"}"; @@ -949,7 +949,7 @@ private void testDuplicateStudy(UUID study1Uuid, UUID rootNetworkUuid, String us checkEquipmentUpdatingFinishedMessagesReceived(study1Uuid, node2.getId()); checkElementUpdatedMessageSent(study1Uuid, userId); modificationBody = Pair.of(createLoadAttributes, List.of(rootNetworkNodeInfoService.getNetworkModificationApplicationContext(rootNetworkUuid, node2.getId(), NETWORK_UUID))); - wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(mapper, modificationBody)); + wireMockStubs.verifyNetworkModificationPostWithVariant(getModificationContextJsonString(modificationBody)); rootNetworkNodeInfoService.updateRootNetworkNode(node2.getId(), studyTestUtils.getOneRootNetworkUuid(study1Uuid), RootNetworkNodeInfo.builder()