Merge pull request #590 from com-pas/feat/RSR-1521_update_xsd

feat(RSR-1541): updating compas-core version

Author: redaneuhaus

pom.xml

@@ -31,7 +31,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- compas -->
-        <compas-core.version>0.22.0</compas-core.version>
+        <compas-core.version>0.23.0</compas-core.version>
         <compas-scl-xsd.version>0.0.4</compas-scl-xsd.version>
 
         <!-- xml -->

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/ControlBlockEditorService.java

@@ -395,7 +395,7 @@ public CriteriaOrError getCriteria(TIED tied, TCBType cbType, String cbName) {
         return new CriteriaOrError(
                 new Criteria(cbType,
                         systemVersionWithoutV,
-                        TIEDType.fromValue(compasICDHeader.get().getIEDType().value()),
+                        TIEDType.fromValue(compasICDHeader.get().getIEDType()),
                         TIEDRedundancy.fromValue(compasICDHeader.get().getIEDredundancy().value()),
                         compasICDHeader.get().getIEDSystemVersioninstance(),
                         bayIntOrExt), null);

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/icd/IcdHeader.java

@@ -7,7 +7,6 @@
 import lombok.Getter;
 import org.lfenergy.compas.scl2007b4.model.TCompasICDHeader;
 import org.lfenergy.compas.scl2007b4.model.TCompasIEDRedundancy;
-import org.lfenergy.compas.scl2007b4.model.TCompasIEDType;
 import org.lfenergy.compas.sct.commons.exception.ScdException;
 
 import java.math.BigInteger;
@@ -24,7 +23,7 @@
 public class IcdHeader {
 
     private final String icdSystemVersionUUID;
-    private final TCompasIEDType iedType;
+    private final String iedType;
     @EqualsAndHashCode.Exclude
     private final BigInteger iedSubstationinstance;
     @EqualsAndHashCode.Exclude

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/util/PrivateEnum.java

@@ -20,14 +20,12 @@
 public enum PrivateEnum {
 
     COMPAS_BAY("COMPAS-Bay", TCompasBay.class),
-    COMPAS_CRITERIA("COMPAS-Criteria", TCompasCriteria.class),
     COMPAS_FUNCTION("COMPAS-Function", TCompasFunction.class),
     COMPAS_ICDHEADER("COMPAS-ICDHeader", TCompasICDHeader.class),
     COMPAS_LDEVICE("COMPAS-LDevice", TCompasLDevice.class),
     COMPAS_SCL_FILE_TYPE("COMPAS-SclFileType", TCompasSclFileType.class),
     COMPAS_SYSTEM_VERSION("COMPAS-SystemVersion", TCompasSystemVersion.class),
-    COMPAS_TOPO("COMPAS-Topo", TCompasTopo.class),
-    COMPAS_IED_TYPE("COMPAS-IEDType", TCompasIEDType.class);
+    COMPAS_TOPO("COMPAS-Topo", TCompasTopo.class);
 
     private static final Map<Class<?>, PrivateEnum> classToEnum = Arrays.stream(PrivateEnum.values()).collect(Collectors.toMap(
         compasPrivateEnum -> compasPrivateEnum.compasClass,

sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/icd/IcdHeaderTest.java

@@ -9,7 +9,6 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.lfenergy.compas.scl2007b4.model.TCompasICDHeader;
 import org.lfenergy.compas.scl2007b4.model.TCompasIEDRedundancy;
-import org.lfenergy.compas.scl2007b4.model.TCompasIEDType;
 
 import java.math.BigInteger;
 import java.util.stream.Stream;
@@ -92,7 +91,7 @@ private static Stream<Arguments> provideIcdHeaderForNotEquals() {
         TCompasICDHeader tCompasICDHeaderModifiedicdSystemVersionUUID = createHeader();
         tCompasICDHeaderModifiedicdSystemVersionUUID.setICDSystemVersionUUID("patate");
         TCompasICDHeader tCompasICDHeaderModifiediedType = createHeader();
-        tCompasICDHeaderModifiediedType.setIEDType(TCompasIEDType.AUT);
+        tCompasICDHeaderModifiediedType.setIEDType("AUT");
         TCompasICDHeader tCompasICDHeaderModifiedvendorName = createHeader();
         tCompasICDHeaderModifiedvendorName.setVendorName("patate");
         TCompasICDHeader tCompasICDHeaderModifiediedModel = createHeader();
@@ -148,7 +147,7 @@ void testHashCode_should_not_equals() {
     private static TCompasICDHeader createHeader() {
         TCompasICDHeader tCompasICDHeader = new TCompasICDHeader();
         tCompasICDHeader.setICDSystemVersionUUID("icdSystemVersionUUID");
-        tCompasICDHeader.setIEDType(TCompasIEDType.SCU);
+        tCompasICDHeader.setIEDType("SCU");
         tCompasICDHeader.setIEDSubstationinstance(BigInteger.ONE);
         tCompasICDHeader.setIEDSystemVersioninstance(BigInteger.ONE);
         tCompasICDHeader.setIEDName("iedName");

sct-commons/src/test/java/org/lfenergy/compas/sct/commons/util/PrivateUtilsTest.java

@@ -596,7 +596,7 @@ void getCompasICDHeaders_should_return_ICDHeaders() {
                 )
                 .containsExactly(
                         "IED4d4fe1a8cda64cf88a5ee4176a1a0eef",
-                        TCompasIEDType.SCU,
+                        "SCU",
                         BigInteger.ONE,
                         BigInteger.ONE,
                         null,