feat(#362): RSR-812 - Use generated JAXB class for configuration of C…

…ommunication of Control Blocks

Signed-off-by: massifben <105049157+massifben@users.noreply.github.com>

sct-commons/pom.xml

@@ -195,6 +195,23 @@
                             <clearOutputDir>false</clearOutputDir>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>cbcom</id>
+                        <goals>
+                            <goal>xjc</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${project.basedir}/src/main/resources/xsd/RCONF_CB_COM_Config_file_v1.xsd</source>
+                            </sources>
+                            <xjbSources>
+                                <xjbSource>${project.basedir}/src/main/resources/binding_configuration.xjb</xjbSource>
+                            </xjbSources>
+                            <packageName>org.lfenergy.compas.sct.commons.model.cbcom</packageName>
+                            <noPackageLevelAnnotations>true</noPackageLevelAnnotations>
+                            <clearOutputDir>false</clearOutputDir>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>

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

@@ -6,9 +6,9 @@
 
 import org.lfenergy.compas.scl2007b4.model.SCL;
 import org.lfenergy.compas.scl2007b4.model.TExtRef;
-import org.lfenergy.compas.sct.commons.dto.ControlBlockNetworkSettings;
 import org.lfenergy.compas.sct.commons.dto.FcdaForDataSetsCreation;
 import org.lfenergy.compas.sct.commons.dto.SclReportItem;
+import org.lfenergy.compas.sct.commons.model.cbcom.CBCom;
 import org.lfenergy.compas.sct.commons.util.Utils;
 
 import java.util.List;
@@ -22,7 +22,7 @@
  *   <ol>
  *      <li>{@link ControlBlockEditor#createDataSetAndControlBlocks(SCL, Set) <em>Create DataSet and ControlBlock based on the <b>TExtRef</b></em>}</li>
  *      <li>{@link ControlBlockEditor#createDataSetAndControlBlocks(SCL, String, Set) <em>Create DataSet and ControlBlock based on the <b>TExtRef</b> in given <b>IED</b></em>}</li>
- *      <li>{@link ControlBlockEditor#createDataSetAndControlBlocks(SCL, String,String, Set) <em>Create DataSet and ControlBlock based on the <b>TExtRef</b> in given <b>IED</b> and <b>LDevice</b></em>}</li>
+ *      <li>{@link ControlBlockEditor#createDataSetAndControlBlocks(SCL, String, String, Set) <em>Create DataSet and ControlBlock based on the <b>TExtRef</b> in given <b>IED</b> and <b>LDevice</b></em>}</li>
  *      <li>{@link ControlBlockEditor#configureNetworkForAllControlBlocks <em>Configure the network for the <b>ControlBlocks</b></em>}</li>
  *      <li>{@link ControlBlockEditor#removeAllControlBlocksAndDatasetsAndExtRefSrcBindings <em>Removes all ControlBlocks and DataSets for all LNs in <b>SCL</b></em>}</li>
  *      <li>{@link ControlBlockEditor#analyzeDataGroups(SCL)} <em>Checks Control Blocks, DataSets and FCDA number limitation into Access Points </em>}</li>
@@ -85,17 +85,11 @@ public interface ControlBlockEditor {
      * - the Communication/SubNetwork/ConnectedAP/GSE element, for the GSEControl blocks
      * - the Communication/SubNetwork/ConnectedAP/SMV element, for the SampledValueControl blocks
      *
-     * @param scd                         input SCD object. The object will be modified with the new DataGSESet and SMV elements
-     * @param controlBlockNetworkSettings a method tha gives the network configuration information for a given ControlBlock
-     * @param rangesPerCbType             provide NetworkRanges for GSEControl and SampledValueControl. NetworkRanges contains :
-     *                                    start-end app APPID range (long value), start-end MAC-Addresses (Mac-Addresses values: Ex: "01-0C-CD-01-01-FF")
+     * @param scd   input SCD object. The object will be modified with the new GSE and SMV elements
+     * @param cbCom communication settings to configure Control Block Communication
      * @return list of encountered errors
      * @see Utils#macAddressToLong(String) for the expected MAC address format
-     * @see ControlBlockNetworkSettings
-     * @see ControlBlockNetworkSettings.RangesPerCbType
-     * @see ControlBlockNetworkSettings.NetworkRanges
      */
-    List<SclReportItem> configureNetworkForAllControlBlocks(SCL scd, ControlBlockNetworkSettings controlBlockNetworkSettings,
-                                                            ControlBlockNetworkSettings.RangesPerCbType rangesPerCbType);
+    List<SclReportItem> configureNetworkForAllControlBlocks(SCL scd, CBCom cbCom);
 
 }

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

@@ -6,6 +6,7 @@
 
 import lombok.Getter;
 import org.lfenergy.compas.scl2007b4.model.*;
+import org.lfenergy.compas.sct.commons.model.cbcom.TCBType;
 
 import java.util.Arrays;
 import java.util.Objects;
@@ -40,4 +41,20 @@ public static ControlBlockEnum from(Class<? extends TControl> tControlClass) {
             .orElseThrow(() -> new IllegalArgumentException("Unsupported TControl class : " + tControlClass.getSimpleName()));
     }
 
+    public static ControlBlockEnum from(TCBType tcbType) {
+        return switch (tcbType){
+            case GOOSE -> GSE;
+            case SV -> SAMPLED_VALUE;
+            default -> throw new IllegalArgumentException("Unsupported TCBType: " + tcbType);
+        };
+    }
+
+    public TCBType toTCBType(){
+        return switch (this){
+            case GSE -> TCBType.GOOSE;
+            case SAMPLED_VALUE -> TCBType.SV;
+            default -> throw new IllegalArgumentException("Cannot convert ControlBlockEnum " + this + " to TCBType");
+        };
+    }
+
 }