diff --git a/src/main/java/org/gridsuite/study/server/dto/dynamicsimulation/curve/CurveInfos.java b/src/main/java/org/gridsuite/study/server/dto/dynamicsimulation/curve/CurveInfos.java index b7930deca..52a52b559 100644 --- a/src/main/java/org/gridsuite/study/server/dto/dynamicsimulation/curve/CurveInfos.java +++ b/src/main/java/org/gridsuite/study/server/dto/dynamicsimulation/curve/CurveInfos.java @@ -37,11 +37,10 @@ public class CurveInfos { public static List parseJson(String json, ObjectMapper objectMapper) { List curves; try { - curves = objectMapper.readValue(json, new TypeReference>() { }); + curves = objectMapper.readValue(json, new TypeReference<>() { }); } catch (JsonProcessingException e) { throw new UncheckedIOException(e); } - return curves; } diff --git a/src/main/java/org/gridsuite/study/server/dto/dynamicsimulation/solver/SolverInfos.java b/src/main/java/org/gridsuite/study/server/dto/dynamicsimulation/solver/SolverInfos.java index b1bb5d1fc..c0bddf78c 100644 --- a/src/main/java/org/gridsuite/study/server/dto/dynamicsimulation/solver/SolverInfos.java +++ b/src/main/java/org/gridsuite/study/server/dto/dynamicsimulation/solver/SolverInfos.java @@ -37,11 +37,10 @@ public interface SolverInfos { static List parseJson(String json, ObjectMapper objectMapper) { List solvers; try { - solvers = objectMapper.readValue(json, new TypeReference>() { }); + solvers = objectMapper.readValue(json, new TypeReference<>() { }); } catch (JsonProcessingException e) { throw new UncheckedIOException(e); } - return solvers; } diff --git a/src/test/java/org/gridsuite/study/server/LoadFlowTest.java b/src/test/java/org/gridsuite/study/server/LoadFlowTest.java index e5f7e8bf0..9995ea3a2 100644 --- a/src/test/java/org/gridsuite/study/server/LoadFlowTest.java +++ b/src/test/java/org/gridsuite/study/server/LoadFlowTest.java @@ -803,8 +803,7 @@ private RootNode getRootNode(UUID study) throws Exception { .andExpect(status().isOk()) .andReturn() .getResponse() - .getContentAsString(), new TypeReference<>() { - }); + .getContentAsString(), new TypeReference<>() { }); } private NetworkModificationNode createNetworkModificationNode(UUID studyUuid, UUID parentNodeUuid, diff --git a/src/test/java/org/gridsuite/study/server/NetworkMapTest.java b/src/test/java/org/gridsuite/study/server/NetworkMapTest.java index 895a6db3a..fdc7ad836 100644 --- a/src/test/java/org/gridsuite/study/server/NetworkMapTest.java +++ b/src/test/java/org/gridsuite/study/server/NetworkMapTest.java @@ -474,7 +474,7 @@ public void testGetBusesOrBusbarSections() throws Exception { .andReturn(); resultAsString = mvcResult.getResponse().getContentAsString(); - List iiList = mapper.readValue(resultAsString, new TypeReference>() { }); + List iiList = mapper.readValue(resultAsString, new TypeReference<>() { }); assertThat(iiList, new MatcherJson<>(mapper, List.of(IdentifiableInfos.builder().id("BUS_1").name("BUS_1").build(), IdentifiableInfos.builder().id("BUS_2").name("BUS_2").build()))); @@ -489,7 +489,7 @@ public void testGetBusesOrBusbarSections() throws Exception { .andReturn(); resultAsString = mvcResult.getResponse().getContentAsString(); - iiList = mapper.readValue(resultAsString, new TypeReference>() { }); + iiList = mapper.readValue(resultAsString, new TypeReference<>() { }); assertThat(iiList, new MatcherJson<>(mapper, List.of(IdentifiableInfos.builder().id("BUSBAR_SECTION_1").name("BUSBAR_SECTION_1").build(), diff --git a/src/test/java/org/gridsuite/study/server/NetworkModificationTest.java b/src/test/java/org/gridsuite/study/server/NetworkModificationTest.java index 3c0ccf498..d7c843252 100644 --- a/src/test/java/org/gridsuite/study/server/NetworkModificationTest.java +++ b/src/test/java/org/gridsuite/study/server/NetworkModificationTest.java @@ -591,7 +591,7 @@ public void testNetworkModificationSwitch() throws Exception { content().contentType(MediaType.APPLICATION_JSON)) .andReturn(); resultAsString = mvcResult.getResponse().getContentAsString(); - List csbiListResult = mapper.readValue(resultAsString, new TypeReference>() { }); + List csbiListResult = mapper.readValue(resultAsString, new TypeReference<>() { }); assertThat(csbiListResult.get(0), createMatcherCreatedStudyBasicInfos(studyNameUserIdUuid, "UCTE")); @@ -688,8 +688,7 @@ public void testNetworkModificationEquipment() throws Exception { content().contentType(MediaType.APPLICATION_JSON)) .andReturn(); resultAsString = mvcResult.getResponse().getContentAsString(); - List csbiListResponse = mapper.readValue(resultAsString, new TypeReference>() { - }); + List csbiListResponse = mapper.readValue(resultAsString, new TypeReference<>() { }); assertThat(csbiListResponse.get(0), createMatcherCreatedStudyBasicInfos(studyNameUserIdUuid, "UCTE")); @@ -2693,8 +2692,7 @@ private void checkEquipmentMessagesReceived(UUID studyNameUserIdUuid, List NetworkImpactsInfos expectedPayload) throws Exception { // assert that the broker message has been sent for updating study type Message messageStudyUpdate = output.receive(TIMEOUT, studyUpdateDestination); - NetworkImpactsInfos actualPayload = mapper.readValue(new String(messageStudyUpdate.getPayload()), new TypeReference() { - }); + NetworkImpactsInfos actualPayload = mapper.readValue(new String(messageStudyUpdate.getPayload()), new TypeReference<>() { }); assertThat(expectedPayload, new MatcherJson<>(mapper, actualPayload)); MessageHeaders headersStudyUpdate = messageStudyUpdate.getHeaders(); assertEquals(studyNameUserIdUuid, headersStudyUpdate.get(NotificationService.HEADER_STUDY_UUID)); @@ -2758,8 +2756,7 @@ private void checkEquipmentFinishedMessagesReceived(UUID studyNameUserIdUuid, UU private void checkEquipmentDeletedMessagesReceived(UUID studyNameUserIdUuid, UUID nodeUuid, NetworkImpactsInfos expectedPayload) throws Exception { // assert that the broker message has been sent for updating study type Message messageStudyUpdate = output.receive(TIMEOUT, studyUpdateDestination); - NetworkImpactsInfos actualPayload = mapper.readValue(new String(messageStudyUpdate.getPayload()), new TypeReference() { - }); + NetworkImpactsInfos actualPayload = mapper.readValue(new String(messageStudyUpdate.getPayload()), new TypeReference<>() { }); assertThat(expectedPayload, new MatcherJson<>(mapper, actualPayload)); MessageHeaders headersStudyUpdate = messageStudyUpdate.getHeaders(); assertEquals(studyNameUserIdUuid, headersStudyUpdate.get(NotificationService.HEADER_STUDY_UUID)); diff --git a/src/test/java/org/gridsuite/study/server/SingleLineDiagramTest.java b/src/test/java/org/gridsuite/study/server/SingleLineDiagramTest.java index 3ed1d4c41..b04c6deac 100644 --- a/src/test/java/org/gridsuite/study/server/SingleLineDiagramTest.java +++ b/src/test/java/org/gridsuite/study/server/SingleLineDiagramTest.java @@ -380,8 +380,7 @@ public void testDiagramsAndGraphics() throws Exception { //get voltage levels mvcResult = getNetworkElementsInfos(studyNameUserIdUuid, rootNodeUuid, "VOLTAGE_LEVEL", "MAP", List.of(), TestUtils.resourceToString("/network-voltage-levels-infos.json")); - List vliListResponse = mapper.readValue(mvcResult.getResponse().getContentAsString(), new TypeReference>() { - }); + List vliListResponse = mapper.readValue(mvcResult.getResponse().getContentAsString(), new TypeReference<>() { }); assertThat(vliListResponse, new MatcherJson<>(mapper, List.of( VoltageLevelInfos.builder().id("BBE1AA1").name("BBE1AA1").substationId("BBE1AA").build(), VoltageLevelInfos.builder().id("BBE2AA1").name("BBE2AA1").substationId("BBE2AA").build(), diff --git a/src/test/java/org/gridsuite/study/server/StudyTest.java b/src/test/java/org/gridsuite/study/server/StudyTest.java index 21a90cc04..7a0448ab5 100644 --- a/src/test/java/org/gridsuite/study/server/StudyTest.java +++ b/src/test/java/org/gridsuite/study/server/StudyTest.java @@ -397,8 +397,7 @@ public MockResponse dispatch(RecordedRequest request) { return new MockResponse().setResponseCode(200) .addHeader("Content-Type", "application/json; charset=utf-8"); } else if (path.matches("/v1/network-modifications.*") && POST.equals(request.getMethod())) { - ModificationInfos modificationInfos = mapper.readValue(body.readUtf8(), new TypeReference() { - }); + ModificationInfos modificationInfos = mapper.readValue(body.readUtf8(), new TypeReference<>() { }); modificationInfos.setSubstationIds(Set.of("s2")); return new MockResponse().setResponseCode(200) .setBody("[" + mapper.writeValueAsString(modificationInfos) + "]") @@ -697,9 +696,7 @@ public void testSearch() throws Exception { .perform(get("/v1/search?q={request}", String.format("userId:%s", "userId")).header(USER_ID_HEADER, "userId")) .andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON)).andReturn(); resultAsString = mvcResult.getResponse().getContentAsString(); - List createdStudyBasicInfosList = mapper.readValue(resultAsString, - new TypeReference>() { - }); + List createdStudyBasicInfosList = mapper.readValue(resultAsString, new TypeReference<>() { }); assertThat(createdStudyBasicInfosList, new MatcherJson<>(mapper, studiesInfos)); mvcResult = mockMvc @@ -707,9 +704,7 @@ public void testSearch() throws Exception { studyUuid, rootNodeId, "B").header(USER_ID_HEADER, "userId")) .andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON)).andReturn(); resultAsString = mvcResult.getResponse().getContentAsString(); - List equipmentInfos = mapper.readValue(resultAsString, - new TypeReference>() { - }); + List equipmentInfos = mapper.readValue(resultAsString, new TypeReference<>() { }); assertThat(equipmentInfos, new MatcherJson<>(mapper, linesInfos)); mvcResult = mockMvc @@ -717,8 +712,7 @@ public void testSearch() throws Exception { studyUuid, rootNodeId, "B").header(USER_ID_HEADER, "userId")) .andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON)).andReturn(); resultAsString = mvcResult.getResponse().getContentAsString(); - equipmentInfos = mapper.readValue(resultAsString, new TypeReference>() { - }); + equipmentInfos = mapper.readValue(resultAsString, new TypeReference<>() { }); assertThat(equipmentInfos, new MatcherJson<>(mapper, linesInfos)); mvcResult = mockMvc @@ -726,8 +720,7 @@ public void testSearch() throws Exception { studyUuid, rootNodeId, "B").header(USER_ID_HEADER, "userId")) .andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON)).andReturn(); resultAsString = mvcResult.getResponse().getContentAsString(); - equipmentInfos = mapper.readValue(resultAsString, new TypeReference>() { - }); + equipmentInfos = mapper.readValue(resultAsString, new TypeReference<>() { }); assertThat(equipmentInfos, new MatcherJson<>(mapper, linesInfos)); mockMvc.perform(get("/v1/studies/{studyUuid}/nodes/{nodeUuid}/search?userInput={request}&fieldSelector=bogus", @@ -776,9 +769,7 @@ public void test() throws Exception { .andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON)).andReturn(); resultAsString = result.getResponse().getContentAsString(); - List createdStudyBasicInfosList = mapper.readValue(resultAsString, - new TypeReference>() { - }); + List createdStudyBasicInfosList = mapper.readValue(resultAsString, new TypeReference<>() { }); assertThat(createdStudyBasicInfosList.get(0), createMatcherCreatedStudyBasicInfos(studyUuid, "UCTE")); @@ -789,9 +780,7 @@ public void test() throws Exception { resultAsString = mockMvc.perform(get("/v1/studies").header("userId", "userId2")) .andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON)).andReturn().getResponse().getContentAsString(); - createdStudyBasicInfosList = mapper.readValue(resultAsString, - new TypeReference>() { - }); + createdStudyBasicInfosList = mapper.readValue(resultAsString, new TypeReference<>() { }); assertThat(createdStudyBasicInfosList.get(1), createMatcherCreatedStudyBasicInfos(studyUuid, "UCTE")); @@ -811,9 +800,7 @@ public void test() throws Exception { .andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON)).andReturn(); resultAsString = result.getResponse().getContentAsString(); - createdStudyBasicInfosList = mapper.readValue(resultAsString, - new TypeReference>() { - }); + createdStudyBasicInfosList = mapper.readValue(resultAsString, new TypeReference<>() { }); assertEquals(2, createdStudyBasicInfosList.size()); //get available export format @@ -958,9 +945,7 @@ public void testMetadata() throws Exception { .header(USER_ID_HEADER, "userId")) .andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON)).andReturn(); String resultAsString = mvcResult.getResponse().getContentAsString(); - List createdStudyBasicInfosList = mapper.readValue(resultAsString, - new TypeReference>() { - }); + List createdStudyBasicInfosList = mapper.readValue(resultAsString, new TypeReference<>() { }); assertNotNull(createdStudyBasicInfosList); assertEquals(2, createdStudyBasicInfosList.size()); @@ -994,7 +979,7 @@ public void testLogsReport() throws Exception { MvcResult mvcResult = mockMvc.perform(get("/v1/studies/{studyUuid}/nodes/{nodeUuid}/parent-nodes-report?reportType=NETWORK_MODIFICATION", studyUuid, rootNodeUuid).header(USER_ID_HEADER, "userId")) .andExpect(status().isOk()).andReturn(); String resultAsString = mvcResult.getResponse().getContentAsString(); - List reporterModel = mapper.readValue(resultAsString, new TypeReference>() { }); + List reporterModel = mapper.readValue(resultAsString, new TypeReference<>() { }); assertThat(reporterModel.get(0), new MatcherReport(REPORT_TEST)); assertTrue(TestUtils.getRequestsDone(1, server).stream().anyMatch(r -> r.matches("/v1/reports/.*"))); @@ -1171,7 +1156,7 @@ public void testCreateStudyWithErrorDuringCaseImport() throws Exception { .andReturn(); String resultAsString = mvcResult.getResponse().getContentAsString(); - List bsiListResult = mapper.readValue(resultAsString, new TypeReference>() { }); + List bsiListResult = mapper.readValue(resultAsString, new TypeReference<>() { }); assertEquals(List.of(), bsiListResult); @@ -1241,7 +1226,7 @@ public void testGetStudyCreationRequests() throws Exception { content().contentType(MediaType.APPLICATION_JSON)) .andReturn(); resultAsString = mvcResult.getResponse().getContentAsString(); - List bsiListResult = mapper.readValue(resultAsString, new TypeReference>() { }); + List bsiListResult = mapper.readValue(resultAsString, new TypeReference<>() { }); // once we checked study creation requests, we can countDown latch to trigger study creation request countDownLatch.countDown(); @@ -1261,7 +1246,7 @@ public void testGetStudyCreationRequests() throws Exception { .andReturn(); resultAsString = mvcResult.getResponse().getContentAsString(); - bsiListResult = mapper.readValue(resultAsString, new TypeReference>() { }); + bsiListResult = mapper.readValue(resultAsString, new TypeReference<>() { }); assertEquals(List.of(), bsiListResult); @@ -1271,7 +1256,7 @@ public void testGetStudyCreationRequests() throws Exception { .andReturn(); resultAsString = mvcResult.getResponse().getContentAsString(); - List csbiListResponse = mapper.readValue(resultAsString, new TypeReference>() { }); + List csbiListResponse = mapper.readValue(resultAsString, new TypeReference<>() { }); countDownLatch = new CountDownLatch(1); @@ -1294,7 +1279,7 @@ public void testGetStudyCreationRequests() throws Exception { .andReturn(); resultAsString = mvcResult.getResponse().getContentAsString(); - bsiListResult = mapper.readValue(resultAsString, new TypeReference>() { }); + bsiListResult = mapper.readValue(resultAsString, new TypeReference<>() { }); countDownLatch.countDown(); @@ -1314,7 +1299,7 @@ public void testGetStudyCreationRequests() throws Exception { .andReturn(); resultAsString = mvcResult.getResponse().getContentAsString(); - bsiListResult = mapper.readValue(resultAsString, new TypeReference>() { }); + bsiListResult = mapper.readValue(resultAsString, new TypeReference<>() { }); assertEquals(List.of(), bsiListResult); @@ -1324,7 +1309,7 @@ public void testGetStudyCreationRequests() throws Exception { content().contentType(MediaType.APPLICATION_JSON)) .andReturn(); resultAsString = mvcResult.getResponse().getContentAsString(); - csbiListResponse = mapper.readValue(resultAsString, new TypeReference>() { }); + csbiListResponse = mapper.readValue(resultAsString, new TypeReference<>() { }); // assert that all http requests have been sent to remote services var requests = TestUtils.getRequestsDone(7, server); @@ -1370,8 +1355,7 @@ private void checkNodeBuildStatusUpdatedMessageReceived(UUID studyUuid, List messageStudyUpdate = output.receive(TIMEOUT, studyUpdateDestination); - NetworkImpactsInfos actualPayload = mapper.readValue(new String(messageStudyUpdate.getPayload()), new TypeReference() { - }); + NetworkImpactsInfos actualPayload = mapper.readValue(new String(messageStudyUpdate.getPayload()), new TypeReference<>() { }); assertThat(expectedPayload, new MatcherJson<>(mapper, actualPayload)); MessageHeaders headersStudyUpdate = messageStudyUpdate.getHeaders(); assertEquals(studyNameUserIdUuid, headersStudyUpdate.get(NotificationService.HEADER_STUDY_UUID)); @@ -1534,7 +1518,6 @@ public void testDuplicateStudyWithErrorDuringCaseDuplication() throws Exception .header(USER_ID_HEADER, "userId")) .andExpect(status().isOk()).andReturn().getResponse().getContentAsString(); - ObjectMapper mapper = new ObjectMapper(); String duplicatedStudyUuid = mapper.readValue(response, String.class); assertNotNull(output.receive(TIMEOUT, studyUpdateDestination)); @@ -1546,7 +1529,6 @@ private StudyEntity duplicateStudy(UUID studyUuid, String userId, String caseFor String response = mockMvc.perform(post(STUDIES_URL + "?duplicateFrom={studyUuid}", studyUuid) .header(USER_ID_HEADER, "userId")) .andExpect(status().isOk()).andReturn().getResponse().getContentAsString(); - ObjectMapper mapper = new ObjectMapper(); String newUuid = mapper.readValue(response, String.class); StudyEntity sourceStudy = studyRepository.findById(studyUuid).orElseThrow(); assertNotNull(output.receive(TIMEOUT, studyUpdateDestination)); diff --git a/src/test/java/org/gridsuite/study/server/service/ReportServiceTest.java b/src/test/java/org/gridsuite/study/server/service/ReportServiceTest.java index c4790d986..d235c0f45 100644 --- a/src/test/java/org/gridsuite/study/server/service/ReportServiceTest.java +++ b/src/test/java/org/gridsuite/study/server/service/ReportServiceTest.java @@ -179,16 +179,14 @@ public void testReport() { MvcResult mvcResult = mockMvc.perform(get("/v1/studies/{studyUuid}/nodes/{nodeUuid}/parent-nodes-report?nodeOnlyReport=true&reportType=NETWORK_MODIFICATION", rootNode.getStudyId(), rootNode.getId())) .andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON)) .andReturn(); - List reports = mapper.readValue(mvcResult.getResponse().getContentAsString(), new TypeReference<>() { - }); + List reports = mapper.readValue(mvcResult.getResponse().getContentAsString(), new TypeReference<>() { }); checkReportNodes(reports, expectedRootReporter.getChildren()); assertTrue(TestUtils.getRequestsDone(1, server).stream().anyMatch(r -> r.matches("/v1/reports/.*"))); mvcResult = mockMvc.perform(get("/v1/studies/{studyUuid}/nodes/{nodeUuid}/parent-nodes-report?nodeOnlyReport=false&reportType=NETWORK_MODIFICATION", rootNode.getStudyId(), rootNode.getId())) .andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON)) .andReturn(); - reports = mapper.readValue(mvcResult.getResponse().getContentAsString(), new TypeReference<>() { - }); + reports = mapper.readValue(mvcResult.getResponse().getContentAsString(), new TypeReference<>() { }); checkReportNodes(reports, expectedRootReporter.getChildren()); assertTrue(TestUtils.getRequestsDone(1, server).stream().anyMatch(r -> r.matches("/v1/reports/.*"))); @@ -199,16 +197,14 @@ public void testReport() { mvcResult = mockMvc.perform(get("/v1/studies/{studyUuid}/nodes/{nodeUuid}/parent-nodes-report?nodeOnlyReport=true&reportType=NETWORK_MODIFICATION", rootNode.getStudyId(), node.getId())) .andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON)) .andReturn(); - reports = mapper.readValue(mvcResult.getResponse().getContentAsString(), new TypeReference<>() { - }); + reports = mapper.readValue(mvcResult.getResponse().getContentAsString(), new TypeReference<>() { }); checkReportNodes(reports, expectedNodeReporter.getChildren()); assertTrue(TestUtils.getRequestsDone(1, server).stream().anyMatch(r -> r.matches("/v1/reports/.*"))); mvcResult = mockMvc.perform(get("/v1/studies/{studyUuid}/nodes/{nodeUuid}/parent-nodes-report?nodeOnlyReport=false&reportType=NETWORK_MODIFICATION", rootNode.getStudyId(), node.getId())) .andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON)) .andReturn(); - reports = mapper.readValue(mvcResult.getResponse().getContentAsString(), new TypeReference<>() { - }); + reports = mapper.readValue(mvcResult.getResponse().getContentAsString(), new TypeReference<>() { }); final List expectedReports = Stream.concat(expectedRootReporter.getChildren().stream(), expectedNodeReporter.getChildren().stream()).toList(); checkReportNodes(reports, expectedReports); assertTrue(TestUtils.getRequestsDone(2, server).stream().anyMatch(r -> r.matches("/v1/reports/.*"))); @@ -236,24 +232,21 @@ public void testMultipleReport() { MvcResult mvcResult = mockMvc.perform(get("/v1/studies/{studyUuid}/nodes/{nodeUuid}/parent-nodes-report?nodeOnlyReport=true&reportType=NETWORK_MODIFICATION", rootNode.getStudyId(), child1.getId())) .andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON)) .andReturn(); - List reports = mapper.readValue(mvcResult.getResponse().getContentAsString(), new TypeReference<>() { - }); + List reports = mapper.readValue(mvcResult.getResponse().getContentAsString(), new TypeReference<>() { }); checkReportNodes(reports, List.of(expectedChild1Reporter.getChildren().get(1))); assertTrue(TestUtils.getRequestsDone(1, server).stream().anyMatch(r -> r.matches("/v1/reports/.*"))); mvcResult = mockMvc.perform(get("/v1/studies/{studyUuid}/nodes/{nodeUuid}/parent-nodes-report?nodeOnlyReport=false&reportType=NETWORK_MODIFICATION", rootNode.getStudyId(), child1.getId())) .andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON)) .andReturn(); - List reportsNode1 = mapper.readValue(mvcResult.getResponse().getContentAsString(), new TypeReference<>() { - }); + List reportsNode1 = mapper.readValue(mvcResult.getResponse().getContentAsString(), new TypeReference<>() { }); checkReportNodes(reportsNode1, Stream.concat(expectedRootReporter.getChildren().stream(), expectedChild1Reporter.getChildren().stream()).toList()); assertTrue(TestUtils.getRequestsDone(2, server).stream().anyMatch(r -> r.matches("/v1/reports/.*"))); mvcResult = mockMvc.perform(get("/v1/studies/{studyUuid}/nodes/{nodeUuid}/parent-nodes-report?nodeOnlyReport=false&reportType=NETWORK_MODIFICATION", rootNode.getStudyId(), child2.getId())) .andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON)) .andReturn(); - List reportsNode2 = mapper.readValue(mvcResult.getResponse().getContentAsString(), new TypeReference<>() { - }); + List reportsNode2 = mapper.readValue(mvcResult.getResponse().getContentAsString(), new TypeReference<>() { }); checkReportNodes(reportsNode2, Stream.concat(expectedRootReporter.getChildren().stream(), expectedChild2Reporter.getChildren().stream()).toList()); assertTrue(TestUtils.getRequestsDone(2, server).stream().anyMatch(r -> r.matches("/v1/reports/.*"))); @@ -271,8 +264,7 @@ public void testSubReport() { rootNode.getStudyId(), rootNode.getId(), ROOT_NODE_REPORT_UUID.toString())) .andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON)) .andReturn(); - ReportNode report = mapper.readValue(mvcResult.getResponse().getContentAsString(), new TypeReference<>() { - }); + ReportNode report = mapper.readValue(mvcResult.getResponse().getContentAsString(), new TypeReference<>() { }); checkReportNodes(List.of(report), List.of(expectedRootReporter)); assertTrue(TestUtils.getRequestsDone(1, server).stream().anyMatch(r -> r.matches("/v1/subreports/.*"))); } @@ -287,8 +279,7 @@ public void testNodeReport() { rootNode.getStudyId(), rootNode.getId(), ROOT_NODE_REPORT_UUID.toString())) .andExpectAll(status().isOk(), content().contentType(MediaType.APPLICATION_JSON)) .andReturn(); - List reports = mapper.readValue(mvcResult.getResponse().getContentAsString(), new TypeReference<>() { - }); + List reports = mapper.readValue(mvcResult.getResponse().getContentAsString(), new TypeReference<>() { }); reports.forEach(r -> assertThat(r, new MatcherReport(expectedRootReporter.getChildren().get(reports.indexOf(r))))); assertTrue(TestUtils.getRequestsDone(1, server).stream().anyMatch(r -> r.matches("/v1/reports/.*"))); }