Merge pull request #346 from com-pas/feat/345-rsr-886-ldepf-service-uses-the-xml-settings-file

feat(EPF): Change setting file from CSV to XML

Author: samirromdhani

sct-commons/pom.xml

@@ -161,23 +161,41 @@
                 <version>3.1.0</version>
                 <executions>
                     <execution>
-                        <id>xjc</id>
+                        <id>scl</id>
                         <goals>
                             <goal>xjc</goal>
                         </goals>
+                        <configuration>
+                            <sources>
+                                <source>${project.build.outputDirectory}/xsd/SCL2007B4/SCL.xsd</source>
+                                <source>${project.build.outputDirectory}/xsd/SCL_CoMPAS.xsd</source>
+                            </sources>
+                            <xjbSources>
+                                <xjbSource>${project.basedir}/src/main/resources/binding_configuration.xjb</xjbSource>
+                            </xjbSources>
+                            <packageName>org.lfenergy.compas.scl2007b4.model</packageName>
+                            <noPackageLevelAnnotations>true</noPackageLevelAnnotations>
+                            <clearOutputDir>false</clearOutputDir>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>epf</id>
+                        <goals>
+                            <goal>xjc</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${project.basedir}/src/main/resources/xsd/LDEPF_Config_file_v2.xsd</source>
+                            </sources>
+                            <xjbSources>
+                                <xjbSource>${project.basedir}/src/main/resources/binding_configuration.xjb</xjbSource>
+                            </xjbSources>
+                            <packageName>org.lfenergy.compas.sct.commons.model.epf</packageName>
+                            <noPackageLevelAnnotations>true</noPackageLevelAnnotations>
+                            <clearOutputDir>false</clearOutputDir>
+                        </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <sources>
-                        <source>${project.build.outputDirectory}/xsd/SCL2007B4/SCL.xsd</source>
-                        <source>${project.build.outputDirectory}/xsd/SCL_CoMPAS.xsd</source>
-                    </sources>
-                    <xjbSources>
-                        <xjbSource>${project.basedir}/src/main/resources/binding_configuration.xjb</xjbSource>
-                    </xjbSources>
-                    <packageName>org.lfenergy.compas.scl2007b4.model</packageName>
-                    <noPackageLevelAnnotations>true</noPackageLevelAnnotations>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

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

@@ -9,7 +9,7 @@
 import org.lfenergy.compas.sct.commons.dto.ExtRefInfo;
 import org.lfenergy.compas.sct.commons.dto.SclReportItem;
 import org.lfenergy.compas.sct.commons.exception.ScdException;
-import org.lfenergy.compas.sct.commons.util.ILDEPFSettings;
+import org.lfenergy.compas.sct.commons.model.epf.EPF;
 
 import java.util.List;
 
@@ -55,11 +55,11 @@ public interface ExtRefEditor {
     List<SclReportItem> updateAllExtRefIedNames(SCL scd);
 
     /**
-     * ExtRef Binding For LDevice (inst=LDEPF) that matching LDEPF configuration
+     * ExtRef Binding For LDevice (inst=LDEPF) that matching EPF configuration
      * @param scd SCL
-     * @param settings ILDEPFSettings
+     * @param epf EPF
      * @return list of encountered errors
      */
-    List<SclReportItem> manageBindingForLDEPF(SCL scd, ILDEPFSettings settings);
+    List<SclReportItem> manageBindingForLDEPF(SCL scd, EPF epf);
 
 }

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/api/ExtRefEditor.java

@@ -5,7 +5,6 @@
 package org.lfenergy.compas.sct.commons.scl.ied;
 
 import lombok.NonNull;
-import org.apache.commons.lang3.StringUtils;
 import org.lfenergy.compas.scl2007b4.model.*;
 import org.lfenergy.compas.sct.commons.dto.ExtRefBindingInfo;
 import org.lfenergy.compas.sct.commons.dto.ExtRefSignalInfo;
@@ -23,6 +22,8 @@
 import java.util.function.Function;
 import java.util.stream.Stream;
 
+import static org.apache.commons.lang3.StringUtils.isBlank;
+
 /**
  * A representation of the model object
  * <em><b>{@link org.lfenergy.compas.scl2007b4.model.TIED IED}</b></em>.
@@ -169,7 +170,7 @@ public LDeviceAdapter getLDeviceAdapterByLdInst(String ldInst) throws ScdExcepti
      * @return optional of <em>LDeviceAdapter</em>  object
      */
     public Optional<LDeviceAdapter> findLDeviceAdapterByLdInst(String ldInst) {
-        if (StringUtils.isBlank(ldInst)) {
+        if (isBlank(ldInst)) {
             return Optional.empty();
         }
         return streamLDevices()
@@ -230,7 +231,7 @@ public String getName() {
      * @return <em>Boolean</em> value of check result
      */
     public boolean matches(ObjectReference objRef) {
-        if (StringUtils.isBlank(getName())
+        if (isBlank(getName())
                 || !objRef.getLdName().startsWith(getName())) {
             return false;
         }