Merge pull request #90 from com-pas/feat/75-create-private-section-scd

[#75] : add methode for private add on each node
com-pas · Apr 14, 2022 · 0d284c7 · 0d284c7
2 parents dde7338 + d5f3a82
commit 0d284c7
Show file tree

Hide file tree

Showing 45 changed files with 463 additions and 144 deletions.
diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/SclElementAdapter.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/SclElementAdapter.java
@@ -5,7 +5,7 @@
 package org.lfenergy.compas.sct.commons.scl;
 
 import lombok.Getter;
-
+import org.lfenergy.compas.scl2007b4.model.TPrivate;
 
 
 @Getter
@@ -43,5 +43,7 @@ public final void setCurrentElem(T currentElem){
 
     protected abstract boolean amChildElementRef();
 
+    protected abstract void addPrivate(TPrivate tPrivate);
+
 }
 
diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/SclRootAdapter.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/SclRootAdapter.java
@@ -53,6 +53,11 @@ protected boolean amChildElementRef() {
         return true;
     }
 
+    @Override
+    protected void addPrivate(TPrivate tPrivate) {
+        currentElem.getPrivate().add(tPrivate);
+    }
+
     public Short getSclRelease(){
         return currentElem.getRelease();
     }

diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/com/CommunicationAdapter.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/com/CommunicationAdapter.java
@@ -7,7 +7,7 @@
 
 
 import org.lfenergy.compas.scl2007b4.model.TCommunication;
-
+import org.lfenergy.compas.scl2007b4.model.TPrivate;
 import org.lfenergy.compas.scl2007b4.model.TSubNetwork;
 import org.lfenergy.compas.sct.commons.exception.ScdException;
 import org.lfenergy.compas.sct.commons.scl.SclElementAdapter;
@@ -34,6 +34,11 @@ public boolean amChildElementRef() {
         return currentElem == parentAdapter.getCurrentElem().getCommunication();
     }
 
+    @Override
+    protected void addPrivate(TPrivate tPrivate) {
+        currentElem.getPrivate().add(tPrivate);
+    }
+
     public SubNetworkAdapter addSubnetwork(String snName, String snType,
                                            String iedName, String apName) throws ScdException {
 

diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/com/ConnectedAPAdapter.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/com/ConnectedAPAdapter.java
@@ -5,6 +5,7 @@
 package org.lfenergy.compas.sct.commons.scl.com;
 
 import org.lfenergy.compas.scl2007b4.model.TConnectedAP;
+import org.lfenergy.compas.scl2007b4.model.TPrivate;
 import org.lfenergy.compas.sct.commons.scl.SclElementAdapter;
 
 public class ConnectedAPAdapter extends SclElementAdapter<SubNetworkAdapter, TConnectedAP> {
@@ -18,6 +19,11 @@ protected boolean amChildElementRef() {
         return parentAdapter.getCurrentElem().getConnectedAP().contains(currentElem);
     }
 
+    @Override
+    protected void addPrivate(TPrivate tPrivate) {
+        currentElem.getPrivate().add(tPrivate);
+    }
+
     public String getIedName() {
         return currentElem.getIedName();
     }

diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/com/SubNetworkAdapter.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/com/SubNetworkAdapter.java
@@ -6,6 +6,7 @@
 
 import lombok.NonNull;
 import org.lfenergy.compas.scl2007b4.model.TConnectedAP;
+import org.lfenergy.compas.scl2007b4.model.TPrivate;
 import org.lfenergy.compas.scl2007b4.model.TSubNetwork;
 import org.lfenergy.compas.sct.commons.exception.ScdException;
 import org.lfenergy.compas.sct.commons.scl.SclElementAdapter;
@@ -25,6 +26,11 @@ protected boolean amChildElementRef() {
         return parentAdapter.getCurrentElem().getSubNetwork().contains(currentElem);
     }
 
+    @Override
+    protected void addPrivate(TPrivate tPrivate) {
+        currentElem.getPrivate().add(tPrivate);
+    }
+
     /**
      * Create a Connected Access Point for this subnetwork.
      * Note : this method doesn't check the validity on neither the IED name nor the access point name.

diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/dtt/DAAdapter.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/dtt/DAAdapter.java
@@ -6,6 +6,7 @@
 
 import lombok.Getter;
 import org.lfenergy.compas.scl2007b4.model.TDA;
+import org.lfenergy.compas.scl2007b4.model.TPrivate;
 import org.lfenergy.compas.sct.commons.dto.DaTypeName;
 import org.lfenergy.compas.sct.commons.exception.ScdException;
 
@@ -27,4 +28,9 @@ public void check(DaTypeName daTypeName) throws ScdException {
         super.check(daTypeName);
         daTypeName.setFc(currentElem.getFc());
     }
+
+    @Override
+    protected void addPrivate(TPrivate tPrivate) {
+        currentElem.getPrivate().add(tPrivate);
+    }
 }
diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/dtt/DATypeAdapter.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/dtt/DATypeAdapter.java
@@ -7,21 +7,12 @@
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.lfenergy.compas.scl2007b4.model.TBDA;
-
-import org.lfenergy.compas.scl2007b4.model.TDAType;
-import org.lfenergy.compas.scl2007b4.model.TPredefinedBasicTypeEnum;
-import org.lfenergy.compas.scl2007b4.model.TProtNs;
-
+import org.lfenergy.compas.scl2007b4.model.*;
 import org.lfenergy.compas.sct.commons.dto.DaTypeName;
 import org.lfenergy.compas.sct.commons.dto.ResumedDataTemplate;
 import org.lfenergy.compas.sct.commons.exception.ScdException;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -261,6 +252,10 @@ public DataTypeTemplateAdapter getDataTypeTemplateAdapter() {
         return parentAdapter;
     }
 
+    @Override
+    protected void addPrivate(TPrivate tPrivate) {
+        currentElem.getPrivate().add(tPrivate);
+    }
 
     public Optional<BDAAdapter> getBdaAdapterByName(String name) {
         Optional<TBDA> opBda = getBDAByName(name);
@@ -283,5 +278,10 @@ protected BDAAdapter(DATypeAdapter parentAdapter, TBDA currentElem) {
         protected boolean amChildElementRef() {
             return parentAdapter.getCurrentElem().getBDA().contains(currentElem);
         }
+
+        @Override
+        protected void addPrivate(TPrivate tPrivate) {
+            currentElem.getPrivate().add(tPrivate);
+        }
     }
 }
diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/dtt/DOAdapter.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/dtt/DOAdapter.java
@@ -5,6 +5,7 @@
 package org.lfenergy.compas.sct.commons.scl.dtt;
 
 import org.lfenergy.compas.scl2007b4.model.TDO;
+import org.lfenergy.compas.scl2007b4.model.TPrivate;
 import org.lfenergy.compas.sct.commons.scl.SclElementAdapter;
 
 import java.util.Optional;
@@ -28,6 +29,10 @@ public Optional<DOTypeAdapter> getDoTypeAdapter() {
         return getDataTypeTemplateAdapter().getDOTypeAdapterById(currentElem.getType());
     }
 
+    @Override
+    protected void addPrivate(TPrivate tPrivate) {
+        currentElem.getPrivate().add(tPrivate);
+    }
 
     public String getType() {
         return currentElem.getType();

diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/dtt/DOTypeAdapter.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/dtt/DOTypeAdapter.java
@@ -12,14 +12,7 @@
 import org.lfenergy.compas.sct.commons.dto.ResumedDataTemplate;
 import org.lfenergy.compas.sct.commons.exception.ScdException;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Queue;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -132,6 +125,10 @@ protected boolean amChildElementRef() {
         return parentAdapter.getCurrentElem().getDOType().contains(currentElem);
     }
 
+    @Override
+    protected void addPrivate(TPrivate tPrivate) {
+        currentElem.getPrivate().add(tPrivate);
+    }
 
     public boolean containsDAWithDAName(String da){
         return currentElem.getSDOOrDA()

diff --git a/...ommons/src/main/java/org/lfenergy/compas/sct/commons/scl/dtt/DataTypeTemplateAdapter.java b/...ommons/src/main/java/org/lfenergy/compas/sct/commons/scl/dtt/DataTypeTemplateAdapter.java
@@ -31,6 +31,11 @@ protected boolean amChildElementRef() {
         return currentElem == parentAdapter.getCurrentElem().getDataTypeTemplates();
     }
 
+    @Override
+    protected void addPrivate(TPrivate tPrivate) {
+        throw new IllegalArgumentException("Private is not Allowed here");
+    }
+
     public Optional<LNodeTypeAdapter> getLNodeTypeAdapterById(String id) {
         for(TLNodeType tlNodeType : currentElem.getLNodeType()){
             if(tlNodeType.getId().equals(id)) {

diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/dtt/EnumTypeAdapter.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/dtt/EnumTypeAdapter.java
@@ -7,6 +7,7 @@
 
 import org.lfenergy.compas.scl2007b4.model.TEnumType;
 import org.lfenergy.compas.scl2007b4.model.TEnumVal;
+import org.lfenergy.compas.scl2007b4.model.TPrivate;
 
 import java.util.List;
 import java.util.Objects;
@@ -52,4 +53,9 @@ public boolean hasValue(String val) {
     public DataTypeTemplateAdapter getDataTypeTemplateAdapter() {
         return parentAdapter;
     }
+
+    @Override
+    protected void addPrivate(TPrivate tPrivate) {
+        currentElem.getPrivate().add(tPrivate);
+    }
 }
diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/dtt/LNodeTypeAdapter.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/dtt/LNodeTypeAdapter.java
@@ -10,17 +10,14 @@
 import org.lfenergy.compas.scl2007b4.model.TDO;
 import org.lfenergy.compas.scl2007b4.model.TLNodeType;
 import org.lfenergy.compas.scl2007b4.model.TPredefinedBasicTypeEnum;
+import org.lfenergy.compas.scl2007b4.model.TPrivate;
 import org.lfenergy.compas.sct.commons.dto.DaTypeName;
 import org.lfenergy.compas.sct.commons.dto.DoTypeName;
 import org.lfenergy.compas.sct.commons.dto.ResumedDataTemplate;
 import org.lfenergy.compas.sct.commons.exception.ScdException;
 import org.lfenergy.compas.sct.commons.scl.SclElementAdapter;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 
 @Slf4j
 public class LNodeTypeAdapter
@@ -69,6 +66,11 @@ public boolean hasSameContentAs(TLNodeType tlNodeType) {
         return true;
     }
 
+    @Override
+    protected void addPrivate(TPrivate tPrivate) {
+        currentElem.getPrivate().add(tPrivate);
+    }
+
     public boolean containsDOWithDOTypeId(String doTypeId) {
         return currentElem.getDO().stream()
                 .anyMatch(tdo -> tdo.getType().equals(doTypeId));

diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/header/HeaderAdapter.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/header/HeaderAdapter.java
@@ -7,10 +7,10 @@
 
 import org.lfenergy.compas.scl2007b4.model.THeader;
 import org.lfenergy.compas.scl2007b4.model.THitem;
+import org.lfenergy.compas.scl2007b4.model.TPrivate;
 import org.lfenergy.compas.sct.commons.scl.SclElementAdapter;
 import org.lfenergy.compas.sct.commons.scl.SclRootAdapter;
 
-
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -46,6 +46,11 @@ public HeaderAdapter addHistoryItem(String who, String what, String why){
         return this;
     }
 
+    @Override
+    protected void addPrivate(TPrivate tPrivate) {
+        throw new IllegalArgumentException("Private is not Allowed here");
+    }
+
     public String getHeaderId() {
         return currentElem.getId();
     }

diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ied/DOIAdapter.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ied/DOIAdapter.java
@@ -4,10 +4,7 @@
 
 package org.lfenergy.compas.sct.commons.scl.ied;
 
-import org.lfenergy.compas.scl2007b4.model.TAnyLN;
-import org.lfenergy.compas.scl2007b4.model.TDAI;
-import org.lfenergy.compas.scl2007b4.model.TDOI;
-import org.lfenergy.compas.scl2007b4.model.TSDI;
+import org.lfenergy.compas.scl2007b4.model.*;
 import org.lfenergy.compas.sct.commons.exception.ScdException;
 import org.lfenergy.compas.sct.commons.scl.SclElementAdapter;
 
@@ -39,6 +36,11 @@ public RootSDIAdapter getStructuredDataAdapterByName(String sName) throws ScdExc
                 );
     }
 
+    @Override
+    protected void addPrivate(TPrivate tPrivate) {
+        currentElem.getPrivate().add(tPrivate);
+    }
+
     @Override
     public DAIAdapter getDataAdapterByName(String daName) throws ScdException {
         return  currentElem.getSDIOrDAI()
@@ -82,5 +84,10 @@ protected DAIAdapter(DOIAdapter parentAdapter, TDAI currentElem) {
         protected boolean amChildElementRef() {
             return parentAdapter.getCurrentElem().getSDIOrDAI().contains(currentElem);
         }
+
+        @Override
+        protected void addPrivate(TPrivate tPrivate) {
+            currentElem.getPrivate().add(tPrivate);
+        }
     }
 }
diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ied/IEDAdapter.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ied/IEDAdapter.java
@@ -6,28 +6,17 @@
 
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
-import org.lfenergy.compas.scl2007b4.model.TAccessPoint;
-import org.lfenergy.compas.scl2007b4.model.TIED;
-import org.lfenergy.compas.scl2007b4.model.TLDevice;
-import org.lfenergy.compas.scl2007b4.model.TLLN0Enum;
-import org.lfenergy.compas.scl2007b4.model.TServiceSettingsEnum;
-import org.lfenergy.compas.scl2007b4.model.TServiceSettingsNoDynEnum;
-import org.lfenergy.compas.scl2007b4.model.TServices;
+import org.lfenergy.compas.scl2007b4.model.*;
 import org.lfenergy.compas.sct.commons.dto.ControlBlock;
 import org.lfenergy.compas.sct.commons.dto.DataSetInfo;
 import org.lfenergy.compas.sct.commons.dto.ExtRefBindingInfo;
 import org.lfenergy.compas.sct.commons.dto.ExtRefSignalInfo;
+import org.lfenergy.compas.sct.commons.exception.ScdException;
 import org.lfenergy.compas.sct.commons.scl.ObjectReference;
 import org.lfenergy.compas.sct.commons.scl.SclElementAdapter;
 import org.lfenergy.compas.sct.commons.scl.SclRootAdapter;
-import org.lfenergy.compas.sct.commons.exception.ScdException;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -139,6 +128,11 @@ public boolean findAccessPointByName(String apName) {
                 .anyMatch(tAccessPoint -> tAccessPoint.getName().equals(apName));
     }
 
+    @Override
+    protected void addPrivate(TPrivate tPrivate) {
+        currentElem.getPrivate().add(tPrivate);
+    }
+
     public List<ExtRefBindingInfo> getExtRefBinders(@NonNull ExtRefSignalInfo signalInfo) throws ScdException {
         if(!signalInfo.isValid()){
             throw new ScdException("Invalid ExtRef signal (pDO,pDA or intAddr))");