Merge pull request #123 from com-pas/sonar-issues

Dennis Labordus · web-flow · commit 2123525ba5d3 · 2022-08-11T16:01:55.000+02:00
Fixed sonar code smells
diff --git a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/common/CommonUtil.java b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/common/CommonUtil.java
@@ -6,7 +6,6 @@
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
 
-import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 import static org.lfenergy.compas.scl.auto.alignment.SclAutoAlignmentConstants.SCLXY_NS_URI;
@@ -34,7 +33,7 @@ public static void cleanSXYDeclarationAndAttributes(Element element) {
                 .filter(Attr.class::isInstance)
                 .map(Attr.class::cast)
                 .filter(attr -> SCLXY_NS_URI.equals(attr.getNamespaceURI()))
-                .collect(Collectors.toList());
+                .toList();
         // Remove the attribute from the element.
         attributesToRemove.forEach(element::removeAttributeNode);
 
diff --git a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/model/GenericBay.java b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/model/GenericBay.java
@@ -6,7 +6,6 @@
 import org.w3c.dom.Element;
 
 import java.util.List;
-import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 public class GenericBay extends AbstractGenericNameEntity<GenericVoltageLevel> {
@@ -33,7 +32,7 @@ public List<GenericConnectivityNode> getConnectivityNodes() {
         if (connectivityNodes == null) {
             connectivityNodes = getElementsStream("ConnectivityNode")
                     .map(element -> new GenericConnectivityNode(this, element))
-                    .collect(Collectors.toList());
+                    .toList();
         }
         return connectivityNodes;
     }
@@ -42,7 +41,7 @@ public List<GenericConductingEquipment> getConductingEquipments() {
         if (conductingEquipments == null) {
             conductingEquipments = getElementsStream("ConductingEquipment")
                     .map(element -> new GenericConductingEquipment(this, element))
-                    .collect(Collectors.toList());
+                    .toList();
         }
         return conductingEquipments;
     }
diff --git a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/model/GenericConductingEquipment.java b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/model/GenericConductingEquipment.java
@@ -6,11 +6,10 @@
 import org.w3c.dom.Element;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 public class GenericConductingEquipment extends AbstractGenericNameEntity<GenericBay> {
     private List<GenericTerminal> terminals;
-    
+
     public GenericConductingEquipment(GenericBay parent, Element element) {
         super(parent, element);
     }
@@ -23,7 +22,7 @@ public List<GenericTerminal> getTerminals() {
         if (terminals == null) {
             terminals = getElementsStream("Terminal")
                     .map(element -> new GenericTerminal(this, element))
-                    .collect(Collectors.toList());
+                    .toList();
         }
         return terminals;
     }
diff --git a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/model/GenericPowerTransformer.java b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/model/GenericPowerTransformer.java
@@ -8,7 +8,6 @@
 
 import java.util.Collection;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public class GenericPowerTransformer extends AbstractGenericNameEntity<GenericSubstation> {
     private List<GenericTransformerWinding> transformerWindings;
@@ -21,7 +20,7 @@ public List<GenericTransformerWinding> getTransformerWindings() {
         if (transformerWindings == null) {
             transformerWindings = getElementsStream("TransformerWinding")
                     .map(element -> new GenericTransformerWinding(this, element))
-                    .collect(Collectors.toList());
+                    .toList();
         }
         return transformerWindings;
     }
diff --git a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/model/GenericSCL.java b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/model/GenericSCL.java
@@ -9,7 +9,6 @@
 
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import static org.lfenergy.compas.scl.auto.alignment.SclAutoAlignmentConstants.*;
 
@@ -39,7 +38,7 @@ public List<GenericSubstation> getSubstations() {
         if (substations == null) {
             substations = ElementUtil.getElementsStream(element, "Substation")
                     .map(substationElement -> new GenericSubstation(this, substationElement))
-                    .collect(Collectors.toList());
+                    .toList();
         }
         return substations;
     }
diff --git a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/model/GenericSubstation.java b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/model/GenericSubstation.java
@@ -9,7 +9,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 public class GenericSubstation extends AbstractGenericNameEntity<GenericSCL> {
     private List<GenericPowerTransformer> powerTransformers;
@@ -28,7 +27,7 @@ public List<GenericPowerTransformer> getPowerTransformers() {
         if (powerTransformers == null) {
             powerTransformers = getElementsStream("PowerTransformer")
                     .map(element -> new GenericPowerTransformer(this, element))
-                    .collect(Collectors.toList());
+                    .toList();
         }
         return powerTransformers;
     }
@@ -51,7 +50,7 @@ public List<GenericVoltageLevel> getVoltageLevels() {
         if (voltageLevels == null) {
             voltageLevels = getElementsStream("VoltageLevel")
                     .map(element -> new GenericVoltageLevel(this, element))
-                    .collect(Collectors.toList());
+                    .toList();
         }
         return voltageLevels;
     }
diff --git a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/model/GenericTransformerWinding.java b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/model/GenericTransformerWinding.java
@@ -6,7 +6,6 @@
 import org.w3c.dom.Element;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 public class GenericTransformerWinding extends AbstractGenericNameEntity<GenericPowerTransformer> {
     private List<GenericTerminal> terminals;
@@ -19,7 +18,7 @@ public List<GenericTerminal> getTerminals() {
         if (terminals == null) {
             terminals = getElementsStream("Terminal")
                     .map(element -> new GenericTerminal(this, element))
-                    .collect(Collectors.toList());
+                    .toList();
         }
         return terminals;
     }
diff --git a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/model/GenericVoltageLevel.java b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/model/GenericVoltageLevel.java
@@ -7,7 +7,6 @@
 import org.w3c.dom.Element;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import static org.lfenergy.compas.scl.auto.alignment.exception.SclAutoAlignmentErrorCode.NO_VOLTAGE_FOUND_ERROR_CODE;
 
@@ -30,7 +29,7 @@ public List<GenericBay> getBays() {
         if (bays == null) {
             bays = getElementsStream("Bay")
                     .map(element -> new GenericBay(this, element))
-                    .collect(Collectors.toList());
+                    .toList();
         }
         return bays;
     }
diff --git a/service/src/test/java/org/lfenergy/compas/scl/auto/alignment/model/AbstractGenericEntityTest.java b/service/src/test/java/org/lfenergy/compas/scl/auto/alignment/model/AbstractGenericEntityTest.java
@@ -7,7 +7,6 @@
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
-import java.util.stream.Collectors;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.lfenergy.compas.scl.auto.alignment.SclAutoAlignmentConstants.SCLXY_NS_URI;
@@ -35,15 +34,15 @@ void constructor_WhenCreated_ThenElementSet() {
     @Test
     void getElementsStream_WhenCallingForKnownElement_ThenReturnElements() {
         var result = entity.getElementsStream("Bay")
-                .collect(Collectors.toList());
+                .toList();
 
         assertEquals(8, result.size());
     }
 
     @Test
     void getElementsStream_WhenCallingForUnknownElement_ThenReturnEmptyList() {
         var result = entity.getElementsStream("Unknown")
-                .collect(Collectors.toList());
+                .toList();
 
         assertTrue(result.isEmpty());
     }
diff --git a/service/src/test/java/org/lfenergy/compas/scl/auto/alignment/model/GenericHeaderTest.java b/service/src/test/java/org/lfenergy/compas/scl/auto/alignment/model/GenericHeaderTest.java
@@ -9,7 +9,6 @@
 import org.lfenergy.compas.scl.auto.alignment.common.ElementUtil;
 
 import java.io.IOException;
-import java.util.stream.Collectors;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -52,7 +51,7 @@ void addHistoryItem_WhenCalled_ThenAllElementsAreCreated() {
 
         var history = ElementUtil.getElementsStream(header.getElement(), "History").findFirst().orElse(null);
         assertNotNull(history);
-        var historyItems = ElementUtil.getElementsStream(header.getElement(), "Hitem").collect(Collectors.toList());
+        var historyItems = ElementUtil.getElementsStream(header.getElement(), "Hitem").toList();
         var historyItem = historyItems.get(historyItems.size() - 1);
         assertNotNull(historyItem);
         assertNotNull(historyItem.getAttribute("revision"));

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`import org.w3c.dom.Element;`
`7`	`7`
`8`	`8`	`import java.util.List;`
`9`		`-import java.util.stream.Collectors;`
`10`	`9`	`import java.util.stream.IntStream;`
`11`	`10`
`12`	`11`	`public class GenericBay extends AbstractGenericNameEntity<GenericVoltageLevel> {`
`@@ -33,7 +32,7 @@ public List<GenericConnectivityNode> getConnectivityNodes() {`
`33`	`32`	`if (connectivityNodes == null) {`
`34`	`33`	`connectivityNodes = getElementsStream("ConnectivityNode")`
`35`	`34`	`.map(element -> new GenericConnectivityNode(this, element))`
`36`		`- .collect(Collectors.toList());`
	`35`	`+ .toList();`
`37`	`36`	`}`
`38`	`37`	`return connectivityNodes;`
`39`	`38`	`}`
`@@ -42,7 +41,7 @@ public List<GenericConductingEquipment> getConductingEquipments() {`
`42`	`41`	`if (conductingEquipments == null) {`
`43`	`42`	`conductingEquipments = getElementsStream("ConductingEquipment")`
`44`	`43`	`.map(element -> new GenericConductingEquipment(this, element))`
`45`		`- .collect(Collectors.toList());`
	`44`	`+ .toList();`
`46`	`45`	`}`
`47`	`46`	`return conductingEquipments;`
`48`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,10 @@`
`6`	`6`	`import org.w3c.dom.Element;`
`7`	`7`
`8`	`8`	`import java.util.List;`
`9`		`-import java.util.stream.Collectors;`
`10`	`9`
`11`	`10`	`public class GenericConductingEquipment extends AbstractGenericNameEntity<GenericBay> {`
`12`	`11`	`private List<GenericTerminal> terminals;`
`13`		`-`
	`12`	`+`
`14`	`13`	`public GenericConductingEquipment(GenericBay parent, Element element) {`
`15`	`14`	`super(parent, element);`
`16`	`15`	`}`
`@@ -23,7 +22,7 @@ public List<GenericTerminal> getTerminals() {`
`23`	`22`	`if (terminals == null) {`
`24`	`23`	`terminals = getElementsStream("Terminal")`
`25`	`24`	`.map(element -> new GenericTerminal(this, element))`
`26`		`- .collect(Collectors.toList());`
	`25`	`+ .toList();`
`27`	`26`	`}`
`28`	`27`	`return terminals;`
`29`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`
`9`	`9`	`import java.util.Collection;`
`10`	`10`	`import java.util.List;`
`11`		`-import java.util.stream.Collectors;`
`12`	`11`
`13`	`12`	`public class GenericPowerTransformer extends AbstractGenericNameEntity<GenericSubstation> {`
`14`	`13`	`private List<GenericTransformerWinding> transformerWindings;`
`@@ -21,7 +20,7 @@ public List<GenericTransformerWinding> getTransformerWindings() {`
`21`	`20`	`if (transformerWindings == null) {`
`22`	`21`	`transformerWindings = getElementsStream("TransformerWinding")`
`23`	`22`	`.map(element -> new GenericTransformerWinding(this, element))`
`24`		`- .collect(Collectors.toList());`
	`23`	`+ .toList();`
`25`	`24`	`}`
`26`	`25`	`return transformerWindings;`
`27`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`
`10`	`10`	`import java.util.List;`
`11`	`11`	`import java.util.Optional;`
`12`		`-import java.util.stream.Collectors;`
`13`	`12`
`14`	`13`	`import static org.lfenergy.compas.scl.auto.alignment.SclAutoAlignmentConstants.*;`
`15`	`14`
`@@ -39,7 +38,7 @@ public List<GenericSubstation> getSubstations() {`
`39`	`38`	`if (substations == null) {`
`40`	`39`	`substations = ElementUtil.getElementsStream(element, "Substation")`
`41`	`40`	`.map(substationElement -> new GenericSubstation(this, substationElement))`
`42`		`- .collect(Collectors.toList());`
	`41`	`+ .toList();`
`43`	`42`	`}`
`44`	`43`	`return substations;`
`45`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`import org.w3c.dom.Element;`
`8`	`8`
`9`	`9`	`import java.util.List;`
`10`		`-import java.util.stream.Collectors;`
`11`	`10`
`12`	`11`	`import static org.lfenergy.compas.scl.auto.alignment.exception.SclAutoAlignmentErrorCode.NO_VOLTAGE_FOUND_ERROR_CODE;`
`13`	`12`
`@@ -30,7 +29,7 @@ public List<GenericBay> getBays() {`
`30`	`29`	`if (bays == null) {`
`31`	`30`	`bays = getElementsStream("Bay")`
`32`	`31`	`.map(element -> new GenericBay(this, element))`
`33`		`- .collect(Collectors.toList());`
	`32`	`+ .toList();`
`34`	`33`	`}`
`35`	`34`	`return bays;`
`36`	`35`	`}`