reorganize modules

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

Author: syllamoh

doc/drawio/compas-sct.drawio

@@ -1 +1 @@
-<mxfile host="app.diagrams.net" modified="2021-08-23T14:01:51.473Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.107 Safari/537.36 Edg/92.0.902.55" etag="uZeMYTGyEtbajDSc3TgE" version="14.9.8" type="device"><diagram id="3wWlgGhNNHLo4Hu9hpyk" name="Page-1">7Vtbd5s4EP41Pmf3wT1I4vqYOHa3Z3vJ1t2z7VMPBtnmFBALcu30168Ekg0IfEkwdjbJS9BIyNJ83wwzIxigUbR5m7rJ8gPxcTiAmr8ZoLsBhADYkP3jkodCYiEhWKSBLwbtBNPgFxZCTUhXgY+zykBKSEiDpCr0SBxjj1ZkbpqSdXXYnITVX03cBVYEU88NVek/gU+XhdSG1k7+Bw4WS/nLwHSKnsiVg8VOsqXrk3VJhMYDNEoJocVVtBnhkCtP6qW4b9LSu11YimN6zA1ROLbej79P3iXfI+Pj57dr8vbdEInF/XTDldjx6NOH+5upWDN9kIpgy0/45SoKJ6kbscvb9TKgeJq4HpevGf5MtqRRyFqAXc6DMByRkKT5BMjXPIzZrm8zmpIfuNRjmAaw+ITZOohCN8aT6p13+hhMDNYv1opTijetWgBb3TJSYhJhmj6wIfIGXexY8FE21ztwTUvIliVgDd0QpBKEWmyn3umcXQi1nwIBaIFgOB196QAGuTPA+ME65J6QpkI0n8+h5zVB5Jsz0zDbIZrnfx1BZFUhclSIdK0BIt3QzgURbINo9OnzuEuMUAWjHLEWjY/BnTG2VAwdZzSaTLpBwoRVJKChQgHMBiigdTYokAJF5tGhR6KIxFkrFNzv45Rri8R0Kvq55jOGSRAvvpCEC7i+qTuTnl4X7a2HB3ohuCdZQAMSM1GI53S/3zOw7etNRmXDGTLNbqDSTaMCFQLwjaGA5TR5trNBpTdC5bvUfbk4QbtqUshUTarx+XM2lIxWlIbJ4uUCBRy9Gig0+L5+gTLbgZptrgKoLvwYMK9M7Vaj2jOc/gzY0/wa1H4ZR2aab6qPHHBxqOxGqNwkGUAz5Eqbpexqwa9+c1eUsByN65QtJUl+f7lQ6vAwkAD2iqSjIPl3phobjv0bnuOzFkkw0+gtk4gaAuCppu9mS+wL3ZbUjDcB/cqutTeGaH0r9dxxvWiy8VBq3OM0YDvkbChkMdvt13LjW7mRTwR3zYdyZ32uYnfYV+oRNRiZBsgq9fARPou66QLTgyGaSoym+D7FITOXn9XVNSEvprsnAVt3a+K9zS3kFMWuxF3lOkZtIqQdmKjYtTJRTsTtHh/PTbmPV24+jpv2sdxEr9w8mZtqLek83CwxU2tlJoJPoKZVpWYx19Vw03rl5sncVIto+4g5C4n3o05F1s/LYFuyVEhb5umWYIUTlRQDFYod6fw4tWTYR1K6JAsSu+F4Jz2Bgtf0RN6esdRTrb6YxaB2H0rDEj4gO33BbetSxuv7xyNg7BvPLooVd2sWakFzn1nEJMZPcdDwqNihS59qHiS0sSe16Np71gvTR3O8hUtdc1xHZuPvtK7LOpHjxt7xZ+K4WgmWGTnPqQf8+FZmtua/K34iyiiIWGLqQFwWaZk8IJYyUO4uUns5NUvP44odyYH8N4drQbYbNiQ/Tip4r+UnNcOsOKrhnTFJIzfc9uc3F8vgvQAmG3UJmRdCTbNmulwLU1uxnOoSmbhQgBRfQQli8PSCglkvcl+6MqSrRe5+42Knu8D4EnExOjJ60S9YTwBdRS/1ic4dF++p6w+s281mM7DursIzXKbO7NSCsgZfYht9+hL1QOApAdtFqjSHDfmiUVtbIH6ybQPnwratnki4Mdejt8ooidjFXftDPyaUM+fAqyMiIsoNmBta4LnhTRgsuAlTbvy3rmgJg644hmFHVopq3thoeK8KgAbG1FPF7sxUPULoxEw7KCh0+GTWj61YXdaglYe1+UwNWurjYoGkdVwg2SHFeqxIGfLlWfm+mWM9jiZKAuLAfmnyv63D58+Zq8k3+uSmVeUm0h7JTauWb+haz9yEF+bmcSXIaz2+PPZo/SWlwicX8m278jsA7S9amrUi56HxdROrjT9PkdPot5APYP+RgH2Q0s8hhlTYIb9R6ssBq9XwJgfMkrFa/aVaZxEEKhdlhEgmfB5DOK8N1fPCKPD9sC23TMkq9nNK7ujztGpw7egEmOqL6XqfqaGhVoMV7e+0AA7n4ISn1DQ3w4avajr9fMmuHQ8hNc+GmqMq0zmbMtXy5XNRpl6PxBqU2fh5y/mU2VRbPHxQprG/+Vw9hpr+9X74/t2f40FRZzruzOk6/M6OBUZHbmjr5iXaQEXbsvt0Q2px8ClgfySvcO95qbkJbgAaDg4egTdr7r7jLcKE3dfQaPwf</diagram></mxfile>
+<mxfile host="app.diagrams.net" modified="2022-01-11T09:05:14.268Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36 Edg/96.0.1054.57" etag="oE0U5b2gp_jQ03X_KlPB" version="15.9.4" type="device"><diagram id="3wWlgGhNNHLo4Hu9hpyk" name="Page-1">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</diagram></mxfile>

pom.xml

@@ -73,8 +73,6 @@
         <module>sct-commons</module>
         <module>sct-coverage</module>
         <module>sct-data</module>
-        <module>sct-data-pg</module>
-        <module>sct-service</module>
     </modules>
 
     <build>

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

@@ -11,5 +11,4 @@ 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";
 }

…/lfenergy/compas/service/SclManager.java …y/compas/sct/commons/scl/SclService.javasct-service/src/main/java/org/lfenergy/compas/service/SclManager.java renamed to sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/SclService.java sct-service/src/main/java/org/lfenergy/compas/service/SclManager.java renamed to sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/SclService.java

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package org.lfenergy.compas.service;
+package org.lfenergy.compas.sct.commons.scl;
 
 import org.lfenergy.compas.scl2007b4.model.SCL;
 import org.lfenergy.compas.scl2007b4.model.TExtRef;
@@ -17,7 +17,6 @@
 import org.lfenergy.compas.sct.commons.dto.ResumedDataTemplate;
 import org.lfenergy.compas.sct.commons.dto.SubNetworkDTO;
 import org.lfenergy.compas.sct.commons.exception.ScdException;
-import org.lfenergy.compas.sct.commons.scl.SclRootAdapter;
 import org.lfenergy.compas.sct.commons.scl.com.CommunicationAdapter;
 import org.lfenergy.compas.sct.commons.scl.dtt.DataTypeTemplateAdapter;
 import org.lfenergy.compas.sct.commons.scl.dtt.LNodeTypeAdapter;
@@ -33,22 +32,22 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-public class SclManager {
+public class SclService {
 
 
-    public SclRootAdapter addHistoryItem(SCL scd, String who, String what, String why){
+    public static SclRootAdapter addHistoryItem(SCL scd, String who, String what, String why){
         SclRootAdapter sclRootAdapter = new SclRootAdapter(scd);
         HeaderAdapter headerAdapter = sclRootAdapter.getHeaderAdapter();
         headerAdapter.addHistoryItem(who,what,why);
         return sclRootAdapter;
     }
 
-    public IEDAdapter addIED(SCL scd, String iedName, SCL icd) throws ScdException {
+    public static IEDAdapter addIED(SCL scd, String iedName, SCL icd) throws ScdException {
         SclRootAdapter sclRootAdapter = new SclRootAdapter(scd);
         return sclRootAdapter.addIED(icd,iedName);
     }
 
-    public CommunicationAdapter addSubnetworks(SCL scd, Set<SubNetworkDTO> subNetworks) throws ScdException {
+    public static CommunicationAdapter addSubnetworks(SCL scd, Set<SubNetworkDTO> subNetworks) throws ScdException {
         SclRootAdapter sclRootAdapter = new SclRootAdapter(scd);
         CommunicationAdapter communicationAdapter = sclRootAdapter.getCommunicationAdapter(true);
         for(SubNetworkDTO subNetworkDTO : subNetworks){
@@ -62,7 +61,7 @@ public CommunicationAdapter addSubnetworks(SCL scd, Set<SubNetworkDTO> subNetwor
         return communicationAdapter;
     }
 
-    public List<SubNetworkDTO> getSubnetwork(SCL scd) throws ScdException {
+    public static List<SubNetworkDTO> getSubnetwork(SCL scd) throws ScdException {
         SclRootAdapter sclRootAdapter = new SclRootAdapter(scd);
         CommunicationAdapter communicationAdapter = sclRootAdapter.getCommunicationAdapter(false);
         return communicationAdapter.getSubNetworkAdapters()
@@ -71,7 +70,7 @@ public List<SubNetworkDTO> getSubnetwork(SCL scd) throws ScdException {
                 .collect(Collectors.toList());
     }
 
-    public List<ExtRefInfo> getExtRefInfo(SCL scd, String iedName, String ldInst) throws ScdException {
+    public static List<ExtRefInfo> getExtRefInfo(SCL scd, String iedName, String ldInst) throws ScdException {
 
         SclRootAdapter sclRootAdapter = new SclRootAdapter(scd);
         IEDAdapter iedAdapter = sclRootAdapter.getIEDAdapter(iedName);
@@ -83,7 +82,7 @@ public List<ExtRefInfo> getExtRefInfo(SCL scd, String iedName, String ldInst) th
     }
 
 
-    public List<ExtRefBindingInfo> getExtRefBinders(SCL scd, String iedName, String ldInst,
+    public static List<ExtRefBindingInfo> getExtRefBinders(SCL scd, String iedName, String ldInst,
                                    String lnClass, String lnInst, ExtRefSignalInfo signalInfo) throws ScdException {
         SclRootAdapter sclRootAdapter = new SclRootAdapter(scd);
         IEDAdapter iedAdapter = sclRootAdapter.getIEDAdapter(iedName);
@@ -109,7 +108,7 @@ public List<ExtRefBindingInfo> getExtRefBinders(SCL scd, String iedName, String
         return potentialBinders;
     }
 
-    public void updateExtRefBinders(SCL scd, String iedName, String ldInst, LNodeDTO lNodeDTO) throws ScdException {
+    public static void updateExtRefBinders(SCL scd, String iedName, String ldInst, LNodeDTO lNodeDTO) throws ScdException {
         SclRootAdapter sclRootAdapter = new SclRootAdapter(scd);
         IEDAdapter iedAdapter = new IEDAdapter(sclRootAdapter,iedName);
         LDeviceAdapter lDeviceAdapter = iedAdapter.getLDeviceAdapterByLdInst(ldInst)
@@ -128,7 +127,7 @@ public void updateExtRefBinders(SCL scd, String iedName, String ldInst, LNodeDTO
     }
 
 
-    public List<ControlBlock<?>> getExtRefSourceInfo(SCL scd, ExtRefInfo extRefInfo) throws ScdException {
+    public static List<ControlBlock<?>> getExtRefSourceInfo(SCL scd, ExtRefInfo extRefInfo) throws ScdException {
 
 
         ExtRefSignalInfo signalInfo = extRefInfo.getSignalInfo();
@@ -168,7 +167,7 @@ public List<ControlBlock<?>> getExtRefSourceInfo(SCL scd, ExtRefInfo extRefInfo)
         return srcIEDAdapter.getControlBlocksByBindingInfo(extRefInfo);
     }
 
-    public TExtRef updateExtRefSource(SCL scd, ExtRefInfo extRefInfo) throws ScdException {
+    public static TExtRef updateExtRefSource(SCL scd, ExtRefInfo extRefInfo) throws ScdException {
         String iedName = extRefInfo.getHolderIedName();
         String ldInst = extRefInfo.getHolderLdInst();
         String lnClass = extRefInfo.getHolderLnClass();
@@ -204,7 +203,7 @@ public TExtRef updateExtRefSource(SCL scd, ExtRefInfo extRefInfo) throws ScdExce
         return anLNAdapter.updateExtRefSource(extRefInfo);
     }
 
-    public Set<LNodeDTO> getDAI(SCL scd, String iedName, String ldInst,
+    public static Set<LNodeDTO> getDAI(SCL scd, String iedName, String ldInst,
                                 ResumedDataTemplate rDtt, boolean updatable) throws ScdException {
         SclRootAdapter sclRootAdapter = new SclRootAdapter(scd);
         IEDAdapter iedAdapter = new IEDAdapter(sclRootAdapter,iedName);
@@ -234,7 +233,7 @@ public Set<LNodeDTO> getDAI(SCL scd, String iedName, String ldInst,
         return nodeDTOS;
     }
 
-    public void updateDAI(SCL scd, String iedName, String ldInst, ResumedDataTemplate rDtt) throws ScdException {
+    public static void updateDAI(SCL scd, String iedName, String ldInst, ResumedDataTemplate rDtt) throws ScdException {
 
         SclRootAdapter sclRootAdapter = new SclRootAdapter(scd);
         //check(rtt)

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/dtt/DOAdapter.java

@@ -28,7 +28,6 @@ public Optional<DOTypeAdapter> getDoTypeAdapter() {
         return getDataTypeTemplateAdapter().getDOTypeAdapterById(currentElem.getType());
     }
 
-
     public String getType() {
         return currentElem.getType();
     }

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/dtt/LNodeTypeAdapter.java

@@ -137,8 +137,8 @@ public Optional<DOAdapter> getDOAdapterByName(String name) {
     Pair<String,DOTypeAdapter> findPathFromDo2DA(String doName, String daName) throws ScdException {
         DOAdapter doAdapter = getDOAdapterByName(doName).orElseThrow();
         DOTypeAdapter doTypeAdapter = doAdapter.getDoTypeAdapter().orElseThrow();
-        if(doTypeAdapter.containsDAWithDAName(doName)){
-            return Pair.of(doName,doTypeAdapter);
+        if(doTypeAdapter.containsDAWithDAName(daName)){
+            return Pair.of(daName,doTypeAdapter);
         }
         return doTypeAdapter.findPathDoType2DA(daName);
     }

sct-commons/src/main/resources/jaxb-marshaller-config.yml

@@ -12,7 +12,7 @@
         </layout>
     </appender>
 
-    <logger name="org.lfenergy.compas.sct.commons" level="debug" additivity="false">
+    <logger name="org.lfenergy.compas.sct.commons" level="info" additivity="false">
         <appender-ref ref="CONSOLE"/>
     </logger>