reorganize and refactor modules

Signed-off-by: Mohamed Sylla <[email protected]>

Author: syllamoh

pom.xml

@@ -41,11 +41,13 @@
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-api</artifactId>
                 <version>5.7.2</version>
+                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-engine</artifactId>
                 <version>5.7.2</version>
+                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.lfenergy.compas.core</groupId>

sct-commons/pom.xml

@@ -94,6 +94,12 @@
             <artifactId>jakarta.annotation-api</artifactId>
             <version>1.3.5</version>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>2.3.1</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

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

@@ -11,4 +11,5 @@ public class CommonConstants {
 
     public static final String XML_DEFAULT_NS_PREFIX = "scl";
     public static final String XML_DEFAULT_NS_URI = "http://www.iec.ch/61850/2003/SCL";
+    public static final String XML_DEFAULT_XSD_PATH = "classpath:schema/SCL.xsd";
 }

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/dto/ControlBlock.java

@@ -22,14 +22,13 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 
 @Getter
 @Setter
 @NoArgsConstructor
-public abstract class ControlBlock<T extends ControlBlock> {
+public abstract class ControlBlock<T extends ControlBlock> extends LNodeMetaDataEmbedder {
 
     protected String id; /// appID or smvID
     protected String name;
@@ -38,13 +37,6 @@ public abstract class ControlBlock<T extends ControlBlock> {
     protected long confRev;
     protected List<TControlWithIEDName.IEDName> iedNames = new ArrayList<>();
     protected TPredefinedTypeOfSecurityEnum securityEnable = TPredefinedTypeOfSecurityEnum.NONE;
-    // summarized info about the LN holding this CB
-    protected String iedName;
-    protected String ldInst;
-    protected String prefix;
-    protected String lnClass;
-    protected String lnInst;
-
 
     protected abstract Class<T> getClassType();
     public abstract TServiceType getServiceType();

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/dto/DaTypeName.java

@@ -4,7 +4,9 @@
 
 package org.lfenergy.compas.sct.commons.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.lfenergy.compas.scl2007b4.model.TFCEnum;
 import org.lfenergy.compas.scl2007b4.model.TPredefinedBasicTypeEnum;
@@ -18,6 +20,7 @@
 
 @Getter
 @Setter
+@NoArgsConstructor
 public class DaTypeName extends DataTypeName{
     public static final String VALIDATION_REGEX
             = "[a-zA-Z][a-zA-Z0-9]*(\\([0-9]+\\))?(\\.[a-zA-Z][a-zA-Z0-9]*(\\([0-9]+\\))?)*";
@@ -30,7 +33,6 @@ public class DaTypeName extends DataTypeName{
 
     public DaTypeName(String daName) {
         super(daName);
-        validationPattern = VALIDATION_REGEX;
     }
 
     public static DaTypeName from(DaTypeName dataName){
@@ -49,7 +51,6 @@ public static DaTypeName from(DaTypeName dataName){
 
     public DaTypeName(String name, String names) {
         super(name, names);
-        validationPattern = VALIDATION_REGEX;
     }
 
     public boolean isValImport(){
@@ -70,6 +71,7 @@ public boolean isUpdatable(){
                 );
     }
 
+    @JsonIgnore
     public void setDaiValues(List<TVal> vals) {
         if(vals.size() == 1){
             daiValues.put(0L,vals.get(0).getValue());

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/dto/DataSetInfo.java

@@ -6,26 +6,40 @@
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.lfenergy.compas.scl2007b4.model.TDataSet;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Getter
 @NoArgsConstructor
-public class DataSetInfo {
+public class DataSetInfo extends LNodeMetaDataEmbedder{
     private String name;
     private List<FCDAInfo> fcdaInfos = new ArrayList<>();
 
     public DataSetInfo(String name){
+        super();
         this.name = name;
     }
 
+    public static DataSetInfo from(TDataSet tDataSet) {
+        DataSetInfo dataSetInfo = new DataSetInfo();
+        dataSetInfo.name = tDataSet.getName();
+        dataSetInfo.fcdaInfos.addAll(
+                tDataSet.getFCDA().stream()
+                        .map(tfcda -> new FCDAInfo(dataSetInfo.name, tfcda))
+                        .collect(Collectors.toList())
+        );
+        return dataSetInfo;
+    }
+
     public void addFCDAInfo(FCDAInfo fcdaInfo){
         fcdaInfos.add(fcdaInfo);
     }
 
-    public List<FCDAInfo> getFcdaInfos(){
+    public List<FCDAInfo> getFCDAInfos(){
         return Collections.unmodifiableList(fcdaInfos);
     }
 

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/dto/DataTypeName.java

@@ -4,7 +4,9 @@
 
 package org.lfenergy.compas.sct.commons.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.NonNull;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
@@ -23,9 +25,10 @@
 @Getter
 @Setter
 @Slf4j
+@NoArgsConstructor
 public class DataTypeName {
     protected String name = ""; // dataName or DataAttributeName
-    protected String validationPattern = "";
+
     private List<String> structNames = new ArrayList<>(); // [.DataName[…]] or [.DAComponentName[ ….]]
 
     public DataTypeName(String dataName){
@@ -83,9 +86,4 @@ public int hashCode() {
     public void addStructName(String structName) {
         structNames.add(structName);
     }
-
-    public String getLastName() {
-        int sz = structNames.size();
-        return sz == 0 ? name : structNames.get(sz - 1);
-    }
 }

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/dto/DoTypeName.java

@@ -5,6 +5,7 @@
 package org.lfenergy.compas.sct.commons.dto;
 
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.lfenergy.compas.scl2007b4.model.TPredefinedCDCEnum;
 
@@ -14,18 +15,17 @@
 
 @Getter
 @Setter
+@NoArgsConstructor
 public class DoTypeName extends DataTypeName {
     public static final String VALIDATION_REGEX = "[A-Z][0-9A-Za-z]{0,11}(\\.[a-z][0-9A-Za-z]*(\\([0-9]+\\))?)?";
     private TPredefinedCDCEnum cdc;
 
     public DoTypeName(String doName) {
         super(doName);
-        validationPattern = VALIDATION_REGEX;
     }
 
     public DoTypeName(String ppDoName, String sdoNames) {
         super(ppDoName, sdoNames);
-        validationPattern = VALIDATION_REGEX;
     }
 
     public static DoTypeName from(DoTypeName dataName){

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/dto/ExtRefInfo.java

@@ -21,23 +21,31 @@
 @Getter
 @Setter
 @NoArgsConstructor
-public class ExtRefInfo {
-    private String holderIedName;
-    private String holderLdInst;
-    private String holderPrefix = "";
-    private String holderLnClass;
-    private String holderLnInst = "";
+public class ExtRefInfo extends LNodeMetaDataEmbedder{
 
     private ExtRefSignalInfo signalInfo;
     private ExtRefBindingInfo bindingInfo;
     private ExtRefSourceInfo sourceInfo;
 
     public ExtRefInfo(TExtRef tExtRef) {
+        super();
         bindingInfo = new ExtRefBindingInfo(tExtRef);
         sourceInfo = new ExtRefSourceInfo(tExtRef);
         signalInfo = new ExtRefSignalInfo(tExtRef);
     }
 
+    public static ExtRefInfo from(TExtRef tExtRef, String iedName, String ldInst,
+                                  String lnClass, String lnInst, String prefix){
+        ExtRefInfo extRefInfo = new ExtRefInfo(tExtRef);
+        extRefInfo.setHolderLDInst(ldInst);
+        extRefInfo.setHolderIEDName(iedName);
+        extRefInfo.setHolderLnInst(lnInst);
+        extRefInfo.setHolderLnClass(lnClass);
+        extRefInfo.setHolderLnPrefix(prefix);
+
+        return extRefInfo;
+    }
+
     public boolean matchFCDA(@NonNull TFCDA tfcda){
         if(AbstractLNAdapter.isNull(tfcda)) {
             return false;

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/dto/ExtRefSourceInfo.java

@@ -5,9 +5,11 @@
 package org.lfenergy.compas.sct.commons.dto;
 
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
 import org.lfenergy.compas.scl2007b4.model.TExtRef;
 
 import java.util.Objects;
@@ -32,6 +34,7 @@ public ExtRefSourceInfo(TExtRef tExtRef){
         srcCBName = tExtRef.getSrcCBName();
     }
 
+
     @Override
     public boolean equals(Object o) {
         if (o == null) return false;
@@ -59,7 +62,6 @@ public boolean isNull(){
     }
 
     public boolean isValid() {
-
-        return true;
+        return !StringUtils.isBlank(srcCBName);
     }
 }