refactor(#110): sonar review

Signed-off-by: Samir Romdhani <[email protected]>
com-pas · Aug 28, 2023 · 9fe0f18 · 9fe0f18
1 parent 343295f
commit 9fe0f18
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/util/PrivateUtils.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/util/PrivateUtils.java
@@ -197,8 +197,8 @@ public static Map<String, PrivateLinkedToStds> createMapICDSystemVersionUuidAndS
                                 PrivateUtils.extractCompasICDHeader(tp)
                                         .map(TCompasICDHeader::getICDSystemVersionUUID)
                                         .ifPresent(icdSysVer -> {
-                                            PrivateLinkedToStds PrivateLinkedToStds = icdSysVerToPrivateStdsMap.get(icdSysVer);
-                                            List<SCL> list = PrivateLinkedToStds != null ? PrivateLinkedToStds.stdList() : new ArrayList<>();
+                                            PrivateLinkedToStds privateLinkedToStds = icdSysVerToPrivateStdsMap.get(icdSysVer);
+                                            List<SCL> list = privateLinkedToStds != null ? privateLinkedToStds.stdList() : new ArrayList<>();
                                             list.add(std);
                                             icdSysVerToPrivateStdsMap.put(icdSysVer, new PrivateLinkedToStds(tp, list));
                                         })
@@ -216,7 +216,7 @@ public static Map<String, PrivateLinkedToStds> createMapICDSystemVersionUuidAndS
      */
     public static void checkSTDCorrespondanceWithLNodeCompasICDHeader(Map<String, PrivateLinkedToStds> mapICDSystemVersionUuidAndSTDFile) throws ScdException {
         mapICDSystemVersionUuidAndSTDFile.values().stream()
-                .filter(PrivateLinkedToStds -> PrivateLinkedToStds.stdList().size() != 1)
+                .filter(privateLinkedToStds -> privateLinkedToStds.stdList().size() != 1)
                 .findFirst()
                 .ifPresent(pToStd -> {
                     throw new ScdException("There are several STD files corresponding to " + stdCheckFormatExceptionMessage(pToStd.tPrivate()));

diff --git a/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/SclEditorServiceTest.java b/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/SclEditorServiceTest.java
@@ -228,7 +228,6 @@ void testImportSTDElementsInSCD_with_Multiple_STD() {
         SCL std0 = SclTestMarshaller.getSCLFromFile("/scd-ied-dtt-com-import-stds/std.xml");
         SCL std1 = SclTestMarshaller.getSCLFromFile("/scd-ied-dtt-com-import-stds/std_SITESITE1SCU1.xml");
         SCL std2 = SclTestMarshaller.getSCLFromFile("/scd-ied-dtt-com-import-stds/std_SITESITE1SCU2.xml");
-        SclRootAdapter scdRootAdapter = new SclRootAdapter(scd);
 
         assertDoesNotThrow(() -> sclEditorService.importSTDElementsInSCD(scd, List.of(std0, std1, std2), DTO.SUB_NETWORK_TYPES));
         assertThat(scd.getIED()).hasSize(3);
@@ -266,20 +265,19 @@ void testImportSTDElementsInSCD_Compas_ICDHeader_Not_Match() {
         //Given
         SCL scd = SclTestMarshaller.getSCLFromFile("/scd-ied-dtt-com-import-stds/scd.xml");
         SCL std = SclTestMarshaller.getSCLFromFile("/scd-ied-dtt-com-import-stds/std_with_same_ICDSystemVersionUUID.xml");
-        SclRootAdapter scdRootAdapter = new SclRootAdapter(scd);
+        List<SCL> stdList = List.of(std);
         //When Then
-        assertThrows(ScdException.class, () -> sclEditorService.importSTDElementsInSCD(scd, List.of(std), DTO.SUB_NETWORK_TYPES));
+        assertThrows(ScdException.class, () -> sclEditorService.importSTDElementsInSCD(scd, stdList, DTO.SUB_NETWORK_TYPES));
         assertIsMarshallable(scd);
     }
 
     @Test
     void testImportSTDElementsInSCD_No_STD_Match() {
         //Given
         SCL scd = SclTestMarshaller.getSCLFromFile("/scd-ied-dtt-com-import-stds/ssd.xml");
-        SclRootAdapter scdRootAdapter = new SclRootAdapter(scd);
+        List<SCL> stdList = List.of();
         //When Then
-        Set<SCL> stds = new HashSet<>();
-        assertThrows(ScdException.class, () -> sclEditorService.importSTDElementsInSCD(scd, List.of(), DTO.SUB_NETWORK_TYPES));
+        assertThrows(ScdException.class, () -> sclEditorService.importSTDElementsInSCD(scd, stdList, DTO.SUB_NETWORK_TYPES));
         assertIsMarshallable(scd);
     }
 

diff --git a/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/SubstationServiceTest.java b/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/SubstationServiceTest.java
@@ -29,7 +29,7 @@ void addSubstation_when_SCD_has_no_substation_should_succeed() {
         // Given
         SCL scd = SclTestMarshaller.getSCLFromFile("/scl-root-test-schema-conf/add_ied_test.xml");
         SCL ssd = SclTestMarshaller.getSCLFromFile("/scd-substation-import-ssd/ssd.xml");
-        assertThat(scd.getSubstation().size()).isZero();
+        assertThat(scd.getSubstation()).asList().isEmpty();
         // When
         substationService.addSubstation(scd, ssd);
         // Then
@@ -51,7 +51,7 @@ void addSubstation_when_SCD_has_a_substation_should_succeed() {
         // Then
         assertIsMarshallable(scd);
         assertThat(scdSubstation.getName()).isEqualTo(ssdSubstation.getName());
-        assertThat(scd.getSubstation().size()).isEqualTo(ssd.getSubstation().size());
+        assertThat(scd.getSubstation()).asList().hasSameSizeAs(ssd.getSubstation());
         assertThat(scdSubstation.getVoltageLevel().stream().map(TVoltageLevel::getBay).count()).isEqualTo(2);
     }