com-pas · massifben · Jan 22, 2025 · Jan 21, 2025
diff --git a/sct-app/src/test/java/org.lfenergy.compas.sct.app/SclAutomationServiceIntegrationTest.java b/sct-app/src/test/java/org.lfenergy.compas.sct.app/SclAutomationServiceIntegrationTest.java
@@ -32,7 +32,7 @@ class SclAutomationServiceIntegrationTest {
     private SclAutomationService sclAutomationService ;
     private static final SclEditor sclEditor = new SclService() ;
     private static final SubstationEditor substationEditor = new SubstationService(new VoltageLevelService()) ;
-    private static final ControlBlockEditor controlBlockEditor = new ControlBlockEditorService(new ControlService(), new LdeviceService()) ;
+    private static final ControlBlockEditor controlBlockEditor = new ControlBlockEditorService(new ControlService(), new LdeviceService(new LnService()));
 
     private HeaderDTO headerDTO;
 

diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/ExtRefEditorService.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/ExtRefEditorService.java
@@ -54,7 +54,7 @@ public class ExtRefEditorService implements ExtRefEditor {
      * @param channel        TChannel represent parameters
      * @return the IED sources matching the LDEPF parameters
      */
-    private static List<TIED> getIedSources(SclRootAdapter sclRootAdapter, TCompasBay compasBay, TChannel channel) {
+    private List<TIED> getIedSources(SclRootAdapter sclRootAdapter, TCompasBay compasBay, TChannel channel) {
         return sclRootAdapter.streamIEDAdapters()
                 .filter(iedAdapter -> (channel.getBayScope().equals(TCBScopeType.BAY_EXTERNAL)
                         && iedAdapter.getPrivateCompasBay().stream().noneMatch(bay -> bay.getUUID().equals(compasBay.getUUID())))
@@ -143,8 +143,7 @@ private static boolean doesIcdHeaderMatchLDEPFChannel(IEDAdapter iedAdapter, TCh
      * @param channel    TChannel
      * @return LDeviceAdapter object that matches the EPF channel
      */
-    private static Optional<LDeviceAdapter> getActiveSourceLDeviceByLDEPFChannel(IEDAdapter iedAdapter, TChannel channel) {
-        LdeviceService ldeviceService = new LdeviceService();
+    private Optional<LDeviceAdapter> getActiveSourceLDeviceByLDEPFChannel(IEDAdapter iedAdapter, TChannel channel) {
         return ldeviceService.findLdevice(iedAdapter.getCurrentElem(), tlDevice -> tlDevice.getInst().equals(channel.getLDInst()))
                 .filter(tlDevice -> ldeviceService.getLdeviceStatus(tlDevice).map(ActiveStatus.ON::equals).orElse(false))
                 .map(tlDevice -> new LDeviceAdapter(iedAdapter, tlDevice));

diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/LdeviceService.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/LdeviceService.java
@@ -4,16 +4,23 @@
 
 package org.lfenergy.compas.sct.commons;
 
-import org.lfenergy.compas.scl2007b4.model.*;
+import lombok.RequiredArgsConstructor;
+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.TServer;
 import org.lfenergy.compas.sct.commons.util.ActiveStatus;
 
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
+@RequiredArgsConstructor
 public class LdeviceService {
 
+    private final LnService lnService;
+
     public Stream<TLDevice> getLdevices(TIED tied) {
         if (!tied.isSetAccessPoint()) {
             return Stream.empty();
@@ -40,7 +47,6 @@ public Optional<TLDevice> findLdevice(TIED tied, Predicate<TLDevice> ldevicePred
     }
 
     public Optional<ActiveStatus> getLdeviceStatus(TLDevice tlDevice) {
-        LnService lnService = new LnService();
-        return lnService.getDaiModStval(tlDevice.getLN0());
+        return lnService.getDaiModStValValue(tlDevice.getLN0());
     }
 }
diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/LnService.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/LnService.java
@@ -12,7 +12,6 @@
 import org.lfenergy.compas.sct.commons.util.ActiveStatus;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Predicate;
@@ -25,6 +24,8 @@
 @Slf4j
 public class LnService implements LnEditor {
 
+    private static final DoLinkedToDaFilter DAI_FILTER_MOD_STVAL = DoLinkedToDaFilter.from(MOD_DO_NAME, STVAL_DA_NAME);
+
     public Stream<TAnyLN> getAnylns(TLDevice tlDevice) {
         return Stream.concat(Stream.of(tlDevice.getLN0()), tlDevice.getLN().stream());
     }
@@ -60,33 +61,29 @@ public Optional<TLN> findLn(TLDevice tlDevice, Predicate<TLN> lnPredicate) {
      * @return the Lnode Status
      */
     public ActiveStatus getLnStatus(TAnyLN tAnyLN, LN0 ln0) {
-        Optional<ActiveStatus> ln0Status = getDaiModStval(ln0);
-        return getDaiModStval(tAnyLN).filter(ActiveStatus.OFF::equals).orElseGet(() -> ln0Status.orElse(ActiveStatus.OFF));
+        Optional<ActiveStatus> ln0Status = getDaiModStValValue(ln0);
+        return getDaiModStValValue(tAnyLN).filter(ActiveStatus.OFF::equals).orElseGet(() -> ln0Status.orElse(ActiveStatus.OFF));
     }
 
-    public Optional<ActiveStatus> getDaiModStval(TAnyLN tAnyLN) {
-        return tAnyLN
-                .getDOI()
+    public Optional<ActiveStatus> getDaiModStValValue(TAnyLN tAnyLN) {
+        return getDaiModStVal(tAnyLN)
                 .stream()
-                .filter(tdoi -> MOD_DO_NAME.equals(tdoi.getName()))
+                .flatMap(tdai -> tdai.getVal().stream())
+                .map(TVal::getValue)
                 .findFirst()
-                .flatMap(tdoi -> tdoi.getSDIOrDAI()
-                        .stream()
-                        .filter(dai -> dai.getClass().equals(TDAI.class))
-                        .map(TDAI.class::cast)
-                        .filter(tdai -> STVAL_DA_NAME.equals(tdai.getName()))
-                        .map(TDAI::getVal)
-                        .flatMap(Collection::stream)
-                        .findFirst()
-                        .map(TVal::getValue))
                 .map(ActiveStatus::fromValue);
     }
+
+    public Optional<TDAI> getDaiModStVal(TAnyLN tAnyLN) {
+        return getDOAndDAInstances(tAnyLN, DAI_FILTER_MOD_STVAL);
+    }
+
     public Stream<TAnyLN> getActiveLns(TLDevice tlDevice) {
         LN0 ln0 = tlDevice.getLN0();
         Stream<TLN> tlnStream = tlDevice.getLN()
                 .stream()
                 .filter(tln -> ActiveStatus.ON.equals(getLnStatus(tln, ln0)));
-        Stream<LN0> ln0Stream = Stream.of(ln0).filter(ln02 -> getDaiModStval(ln02).map(ActiveStatus.ON::equals).orElse(false));
+        Stream<LN0> ln0Stream = Stream.of(ln0).filter(ln02 -> getDaiModStValValue(ln02).map(ActiveStatus.ON::equals).orElse(false));
         return Stream.concat(ln0Stream, tlnStream);
     }
 
@@ -99,7 +96,7 @@ public Optional<TDAI> getDOAndDAInstances(TAnyLN tAnyLN, DoLinkedToDaFilter doLi
         return tAnyLN.getDOI().stream().filter(doi -> doi.getName().equals(doLinkedToDaFilter.doName()))
                 .findFirst()
                 .flatMap(doi -> {
-                    if(structNamesList.size() > 1) {
+                    if (structNamesList.size() > 1) {
                         String firstSDIName = structNamesList.removeFirst();
                         return this.getSdiByName(doi, firstSDIName)
                                 .map(intermediateSdi -> findSDIByStructName(intermediateSdi, structNamesList))
@@ -116,7 +113,7 @@ public Optional<TDAI> getDOAndDAInstances(TAnyLN tAnyLN, DoLinkedToDaFilter doLi
                                     return Optional.empty();
                                 })
                                 .stream().findFirst();
-                    } else if(structNamesList.size() == 1){
+                    } else if (structNamesList.size() == 1) {
                         return doi.getSDIOrDAI().stream()
                                 .filter(unNaming -> unNaming.getClass().equals(TDAI.class))
                                 .map(TDAI.class::cast)
@@ -138,7 +135,7 @@ public void updateOrCreateDOAndDAInstances(TAnyLN tAnyLN, DoLinkedToDa doLinkedT
                                 .ifPresentOrElse(tVal -> tVal.setValue(value),
                                         () -> tdai.getVal().add(newVal(value)));
                     } else {
-                        for (DaVal daVal: daiVals) {
+                        for (DaVal daVal : daiVals) {
                             tdai.getVal().stream()
                                     .filter(tValElem -> tValElem.isSetSGroup() && tValElem.getSGroup() == daVal.settingGroup())
                                     .findFirst()
@@ -198,22 +195,22 @@ private Optional<TDAI> createDoiSdiDaiChainIfNotExists(TAnyLN tAnyLN, DataObject
 
         TDOI doi = tAnyLN.getDOI().stream().filter(doi1 -> doi1.getName().equals(dataObject.getDoName()))
                 .findFirst()
-                .orElseGet(()-> {
+                .orElseGet(() -> {
                     TDOI newDOI = new TDOI();
                     newDOI.setName(dataObject.getDoName());
                     tAnyLN.getDOI().add(newDOI);
                     return newDOI;
                 });
-        if(structInstances.size() > 1){
+        if (structInstances.size() > 1) {
             TSDI firstSDI = findOrCreateSDIFromDOI(doi, structInstances.getFirst());
             TSDI lastSDI = findOrCreateSDIByStructName(firstSDI, structInstances);
-            if(structInstances.size() == 1){
+            if (structInstances.size() == 1) {
                 return lastSDI.getSDIOrDAI().stream()
                         .filter(tUnNaming -> tUnNaming.getClass().equals(TDAI.class))
                         .map(TDAI.class::cast)
                         .filter(tdai -> tdai.getName().equals(structInstances.getFirst()))
                         .map(tdai -> {
-                            if(tdai.isSetValImport()) {
+                            if (tdai.isSetValImport()) {
                                 tdai.setValImport(dataAttribute.isValImport());
                             }
                             return tdai;
@@ -226,13 +223,13 @@ private Optional<TDAI> createDoiSdiDaiChainIfNotExists(TAnyLN tAnyLN, DataObject
                             return Optional.of(newDAI);
                         });
             }
-        } else if(structInstances.size() == 1){
+        } else if (structInstances.size() == 1) {
             return doi.getSDIOrDAI().stream()
                     .filter(tUnNaming -> tUnNaming.getClass().equals(TDAI.class))
                     .map(TDAI.class::cast)
                     .filter(tdai -> tdai.getName().equals(structInstances.getFirst()))
                     .map(tdai -> {
-                        if(tdai.isSetValImport()) tdai.setValImport(dataAttribute.isValImport());
+                        if (tdai.isSetValImport()) tdai.setValImport(dataAttribute.isValImport());
                         return tdai;
                     })
                     .findFirst()
@@ -247,7 +244,7 @@ private Optional<TDAI> createDoiSdiDaiChainIfNotExists(TAnyLN tAnyLN, DataObject
     }
 
     private TSDI findSDIByStructName(TSDI tsdi, List<String> sdiNames) {
-        if(sdiNames.isEmpty()) return tsdi;
+        if (sdiNames.isEmpty()) return tsdi;
         return this.getSdiByName(tsdi, sdiNames.getFirst())
                 .map(sdi1 -> {
                     sdiNames.removeFirst();
@@ -294,14 +291,13 @@ private Optional<TSDI> getSdiByName(TSDI sdi, String sdiName) {
     }
 
     /**
-     *
-     * @param sdi TSDI
+     * @param sdi        TSDI
      * @param structName list start with sdi name
      * @return already existing TSDI or newly created TSDI from given TSDI
      */
     private TSDI findOrCreateSDIByStructName(TSDI sdi, List<String> structName) {
         structName.removeFirst();
-        if(structName.isEmpty() || structName.size() == 1) return sdi;
+        if (structName.isEmpty() || structName.size() == 1) return sdi;
         return findOrCreateSDIByStructName(findOrCreateSDIFromSDI(sdi, structName.getFirst()), structName);
     }
 

diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/api/LnEditor.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/api/LnEditor.java
@@ -8,11 +8,16 @@
 import org.lfenergy.compas.scl2007b4.model.TDAI;
 import org.lfenergy.compas.sct.commons.domain.DoLinkedToDa;
 import org.lfenergy.compas.sct.commons.domain.DoLinkedToDaFilter;
+import org.lfenergy.compas.sct.commons.util.ActiveStatus;
 
 import java.util.Optional;
 
 public interface LnEditor {
 
+    Optional<ActiveStatus> getDaiModStValValue(TAnyLN tAnyLN);
+
+    Optional<TDAI> getDaiModStVal(TAnyLN tAnyLN);
+
     Optional<TDAI> getDOAndDAInstances(TAnyLN tAnyLN, DoLinkedToDaFilter doLinkedToDaFilter);
 
     void updateOrCreateDOAndDAInstances(TAnyLN tAnyLN, DoLinkedToDa doLinkedToDa);

diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/dto/LNodeDTO.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/dto/LNodeDTO.java
@@ -8,17 +8,20 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.lfenergy.compas.scl2007b4.model.*;
+import org.lfenergy.compas.scl2007b4.model.SCL;
+import org.lfenergy.compas.scl2007b4.model.TAnyLN;
+import org.lfenergy.compas.scl2007b4.model.TExtRef;
+import org.lfenergy.compas.scl2007b4.model.TLNodeType;
 import org.lfenergy.compas.sct.commons.DataSetService;
 import org.lfenergy.compas.sct.commons.ExtRefReaderService;
 import org.lfenergy.compas.sct.commons.LnodeTypeService;
 import org.lfenergy.compas.sct.commons.scl.SclRootAdapter;
 import org.lfenergy.compas.sct.commons.scl.dtt.DataTypeTemplateAdapter;
 import org.lfenergy.compas.sct.commons.scl.dtt.LNodeTypeAdapter;
-import org.lfenergy.compas.sct.commons.scl.ln.AbstractLNAdapter;
 import org.lfenergy.compas.sct.commons.scl.ldevice.LDeviceAdapter;
+import org.lfenergy.compas.sct.commons.scl.ln.AbstractLNAdapter;
 import org.lfenergy.compas.sct.commons.scl.ln.LNAdapter;
-import org.lfenergy.compas.sct.commons.scl.ln.LnKey;
+import org.lfenergy.compas.sct.commons.scl.ln.LnId;
 import org.lfenergy.compas.sct.commons.util.Utils;
 
 import java.util.HashSet;
@@ -152,14 +155,10 @@ public static <T extends TAnyLN> LNodeDTO from(AbstractLNAdapter<T> nodeAdapter,
 
     public static LNodeDTO from(TAnyLN tAnyLN, LogicalNodeOptions options, String iedName, String ldInst, SCL scl) {
         log.info(Utils.entering());
-        LnKey lnKey = switch (tAnyLN) {
-            case LN0 ln0 -> new LnKey(ln0);
-            case TLN tln -> new LnKey(tln);
-            default -> throw new IllegalStateException("Unexpected value: " + tAnyLN);
-        };
-        String inst = lnKey.getInst();
-        String lnClass = lnKey.getLnClass();
-        String prefix = lnKey.getPrefix();
+        LnId lnId = LnId.from(tAnyLN);
+        String inst = lnId.lnInst();
+        String lnClass = lnId.lnClass();
+        String prefix = lnId.prefix();
         String lnType = tAnyLN.getLnType();
         LNodeDTO lNodeDTO = new LNodeDTO(inst, lnClass, prefix, lnType);
         if (options.isWithExtRef()) {

diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ln/LnId.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ln/LnId.java
@@ -0,0 +1,81 @@
+// SPDX-FileCopyrightText: 2025 RTE FRANCE
+//
+// SPDX-License-Identifier: Apache-2.0
+package org.lfenergy.compas.sct.commons.scl.ln;
+
+import org.apache.commons.lang3.StringUtils;
+import org.lfenergy.compas.scl2007b4.model.*;
+import org.lfenergy.compas.sct.commons.exception.ScdException;
+
+import java.util.List;
+import java.util.Objects;
+
+public record LnId(String lnClass, String lnInst, String prefix) {
+    private static final String LN0_LNCLASS = TLLN0Enum.LLN_0.value();
+
+    /**
+     * Id of LN0. All LN0 have the same lnClass, lnInst and prefix in SCD
+     */
+    public static final LnId LN0_ID = new LnId(LN0_LNCLASS, "", "");
+
+    /**
+     * Constructor
+     *
+     * @param lnClass always required
+     * @param lnInst  optional. It should be empty for LN0, and should be filled for LN. No verification is done because some Lnode GAPC do not have a lninst.
+     * @param prefix  optional. Is set to empty if null because empty is the default value on LN and the majority of the JAXB Element (LN, LNode, FCDA, ClientLN, but not on ExtRef and IEDName unfortunately)
+     */
+    public LnId(String lnClass, String lnInst, String prefix) {
+        if (StringUtils.isBlank(lnClass)) {
+            throw new ScdException("lnClass is required");
+        }
+        this.lnClass = lnClass;
+        this.lnInst = Objects.requireNonNullElse(lnInst, "");
+        this.prefix = Objects.requireNonNullElse(prefix, "");
+    }
+
+    /**
+     * Alternative constructor with lnClass as a List instead of a String.
+     * JAXB classes lnClass attribute are List, even though it can only contain one element.
+     * This constructor makes it easier to create LnId from JAXB classes
+     *
+     * @param lnClass one element list containing the lnClass value of the LN
+     * @param lnInst  LN lnInst
+     * @param prefix  LN prefix
+     */
+    public LnId(List<String> lnClass, String lnInst, String prefix) {
+        this(lnClass == null || lnClass.isEmpty() ? null : lnClass.getFirst(), lnInst, prefix);
+    }
+
+    /**
+     * Extract id from LN element
+     *
+     * @param tAnyLN LN element
+     * @return id
+     */
+    public static LnId from(TAnyLN tAnyLN) {
+        if (tAnyLN instanceof TLN0) {
+            return LN0_ID;
+        } else if (tAnyLN instanceof TLN tln) {
+            return new LnId(tln.getLnClass(), tln.getInst(), tln.getPrefix());
+        } else {
+            throw new ScdException("Unexpected class : " + (tAnyLN != null ? tAnyLN.getClass() : null));
+        }
+    }
+
+    /**
+     * Extract id from LNode element
+     *
+     * @param tlNode LNode element
+     * @return id
+     */
+    public static LnId from(TLNode tlNode) {
+        if (tlNode.getLnClass().contains(LN0_LNCLASS)) {
+            return LN0_ID;
+        } else {
+            return new LnId(tlNode.getLnClass(), tlNode.getLnInst(), tlNode.getPrefix());
+        }
+    }
+
+
+}