Skip to content

Commit 80235f3

Browse files
samirromdhanisamirromdhani
authored
Merge pull request #443 from com-pas/develop
Release 0.2.33
2 parents a1aa57b + e411dcb commit 80235f3

20 files changed

+24
-1805
lines changed

‎sct-commons/src/main/java/org/lfenergy/compas/sct/commons/ExtRefEditorService.java‎

Lines changed: 3 additions & 187 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-FileCopyrightText: 2023 RTE FRANCE
1+
// SPDX-FileCopyrightText: 2023 2024 RTE FRANCE
22
//
33
// SPDX-License-Identifier: Apache-2.0
44

@@ -15,41 +15,26 @@
1515
import org.lfenergy.compas.sct.commons.model.epf.TCBScopeType;
1616
import org.lfenergy.compas.sct.commons.model.epf.TChannel;
1717
import org.lfenergy.compas.sct.commons.model.epf.TChannelType;
18-
import org.lfenergy.compas.sct.commons.scl.ExtRefService;
1918
import org.lfenergy.compas.sct.commons.scl.SclRootAdapter;
2019
import org.lfenergy.compas.sct.commons.scl.ied.IEDAdapter;
2120
import org.lfenergy.compas.sct.commons.scl.ldevice.LDeviceAdapter;
2221
import org.lfenergy.compas.sct.commons.scl.ln.AbstractLNAdapter;
23-
import org.lfenergy.compas.sct.commons.scl.ln.LN0Adapter;
2422
import org.lfenergy.compas.sct.commons.util.ActiveStatus;
25-
import org.lfenergy.compas.sct.commons.util.PrivateEnum;
2623
import org.lfenergy.compas.sct.commons.util.PrivateUtils;
2724
import org.lfenergy.compas.sct.commons.util.Utils;
2825

29-
import java.math.BigInteger;
3026
import java.util.*;
31-
import java.util.function.BinaryOperator;
32-
import java.util.function.Function;
33-
import java.util.stream.Collectors;
3427

3528
import static org.apache.commons.lang3.StringUtils.*;
3629
import static org.lfenergy.compas.sct.commons.util.CommonConstants.*;
3730

3831
@RequiredArgsConstructor
3932
public class ExtRefEditorService implements ExtRefEditor {
4033
private static final String INVALID_OR_MISSING_ATTRIBUTES_IN_EXT_REF_BINDING_INFO = "Invalid or missing attributes in ExtRef binding info";
41-
private static final Map<String, String> voltageCodification = Map.of(
42-
"3", "HT",
43-
"4", "HT",
44-
"5", "THT",
45-
"6", "THT",
46-
"7", "THT"
47-
);
4834

4935
private final IedService iedService;
5036
private final LdeviceService ldeviceService;
5137
private final LnEditor lnEditor;
52-
private final ExtRefService extRefService;
5338
private final DataTypeTemplatesService dataTypeTemplatesService;
5439

5540
/**
@@ -274,31 +259,6 @@ public TExtRef updateExtRefSource(SCL scd, ExtRefInfo extRefInfo) throws ScdExce
274259
return anLNAdapter.updateExtRefSource(extRefInfo);
275260
}
276261

277-
@Override
278-
public List<SclReportItem> updateAllExtRefIedNames(SCL scd) {
279-
SclRootAdapter sclRootAdapter = new SclRootAdapter(scd);
280-
List<SclReportItem> iedErrors = validateIed(sclRootAdapter);
281-
if (!iedErrors.isEmpty()) {
282-
return iedErrors;
283-
}
284-
Map<String, IEDAdapter> icdSystemVersionToIed = sclRootAdapter.streamIEDAdapters()
285-
.collect(Collectors.toMap(
286-
iedAdapter -> iedAdapter.getCompasICDHeader()
287-
.map(TCompasICDHeader::getICDSystemVersionUUID)
288-
.orElseThrow(), // Value presence is checked by method validateIed called above
289-
Function.identity()
290-
));
291-
292-
return sclRootAdapter.streamIEDAdapters()
293-
.flatMap(IEDAdapter::streamLDeviceAdapters)
294-
.filter(LDeviceAdapter::hasLN0)
295-
.map(LDeviceAdapter::getLN0Adapter)
296-
.filter(LN0Adapter::hasInputs)
297-
.map(LN0Adapter::getInputsAdapter)
298-
.map(inputsAdapter -> inputsAdapter.updateAllExtRefIedNames(icdSystemVersionToIed))
299-
.flatMap(List::stream).toList();
300-
}
301-
302262
@Override
303263
public List<SclReportItem> manageBindingForLDEPF(SCL scd, EPF epf) {
304264
List<SclReportItem> sclReportItems = new ArrayList<>();
@@ -361,48 +321,6 @@ public void epfPostProcessing(SCL scd) {
361321
})));
362322
}
363323

364-
private List<SclReportItem> validateIed(SclRootAdapter sclRootAdapter) {
365-
List<SclReportItem> iedErrors = new ArrayList<>(checkIedCompasIcdHeaderAttributes(sclRootAdapter));
366-
iedErrors.addAll(checkIedUnityOfIcdSystemVersionUuid(sclRootAdapter));
367-
return iedErrors;
368-
}
369-
370-
private List<SclReportItem> checkIedCompasIcdHeaderAttributes(SclRootAdapter sclRootAdapter) {
371-
return sclRootAdapter.streamIEDAdapters()
372-
.map(iedAdapter -> {
373-
Optional<TCompasICDHeader> compasPrivate = iedAdapter.getCompasICDHeader();
374-
if (compasPrivate.isEmpty()) {
375-
return iedAdapter.buildFatalReportItem(String.format("IED has no Private %s element", PrivateEnum.COMPAS_ICDHEADER.getPrivateType()));
376-
}
377-
if (isBlank(compasPrivate.get().getICDSystemVersionUUID())
378-
|| isBlank(compasPrivate.get().getIEDName())) {
379-
return iedAdapter.buildFatalReportItem(String.format("IED private %s as no icdSystemVersionUUID or iedName attribute",
380-
PrivateEnum.COMPAS_ICDHEADER.getPrivateType()));
381-
}
382-
return null;
383-
}
384-
).filter(Objects::nonNull)
385-
.toList();
386-
}
387-
388-
private List<SclReportItem> checkIedUnityOfIcdSystemVersionUuid(SclRootAdapter sclRootAdapter) {
389-
Map<String, List<TIED>> systemVersionToIedList = sclRootAdapter.getCurrentElem().getIED().stream()
390-
.collect(Collectors.groupingBy(ied -> PrivateUtils.extractCompasPrivate(ied, TCompasICDHeader.class)
391-
.map(TCompasICDHeader::getICDSystemVersionUUID)
392-
.orElse("")));
393-
394-
return systemVersionToIedList.entrySet().stream()
395-
.filter(entry -> isNotBlank(entry.getKey()))
396-
.filter(entry -> entry.getValue().size() > 1)
397-
.map(entry -> SclReportItem.error(entry.getValue().stream()
398-
.map(tied -> new IEDAdapter(sclRootAdapter, tied))
399-
.map(IEDAdapter::getXPath)
400-
.collect(Collectors.joining(", ")),
401-
"/IED/Private/compas:ICDHeader[@ICDSystemVersionUUID] must be unique" +
402-
" but the same ICDSystemVersionUUID was found on several IED."))
403-
.toList();
404-
}
405-
406324
private void updateLDEPFExtRefBinding(TExtRef extRef, TIED iedSource, TChannel setting) {
407325
extRef.setIedName(iedSource.getName());
408326
extRef.setLdInst(setting.getLDInst());
@@ -456,122 +374,20 @@ private String computeDaiValue(AbstractLNAdapter<?> lnAdapter, TExtRef extRef, S
456374
return extRef.getIedName() +
457375
extRef.getLdInst() + "/" +
458376
trimToEmpty(extRef.getPrefix()) +
459-
extRef.getLnClass().get(0) +
377+
extRef.getLnClass().getFirst() +
460378
trimToEmpty(extRef.getLnInst()) + "." +
461379
extRef.getDoName() + "." + Q_DA_NAME;
462380
} else {
463381
return extRef.getIedName() +
464382
extRef.getLdInst() + "/" +
465383
trimToEmpty(extRef.getPrefix()) +
466-
extRef.getLnClass().get(0) +
384+
extRef.getLnClass().getFirst() +
467385
trimToEmpty(extRef.getLnInst()) + "." +
468386
extRef.getDoName() + "." +
469387
daName;
470388
}
471389
}
472390

473-
@Override
474-
public void debindCompasFlowsAndExtRefsBasedOnVoltageLevel(SCL scd) {
475-
scd.getSubstation()
476-
.stream()
477-
.flatMap(tSubstation -> tSubstation.getVoltageLevel().stream())
478-
.map(TVoltageLevel::getName)
479-
.filter(tVoltageLevelName -> !"0".equals(tVoltageLevelName))
480-
.forEach(tVoltageLevelName -> scd.getIED().stream()
481-
.flatMap(ldeviceService::getLdevices)
482-
.filter(TLDevice::isSetLN0)
483-
.filter(tlDevice -> tlDevice.getLN0().isSetInputs())
484-
.forEach(tlDevice -> {
485-
String flowSource = voltageCodification.get(tVoltageLevelName);
486-
extRefService.getCompasFlows(tlDevice)
487-
.filter(TCompasFlow::isSetFlowSourceVoltageLevel)
488-
.filter(TCompasFlow::isSetExtRefiedName)
489-
.forEach(tCompasFlow -> {
490-
if (!tCompasFlow.getFlowSourceVoltageLevel().equals(flowSource)) {
491-
//debind extRefs correspondind to compas flow
492-
extRefService.getMatchingExtRefs(tlDevice, tCompasFlow)
493-
.forEach(extRefService::clearExtRefBinding);
494-
//debind all compas flow
495-
extRefService.clearCompasFlowBinding(tCompasFlow);
496-
}
497-
});
498-
})
499-
);
500-
}
501-
502-
503-
@Override
504-
public List<SclReportItem> updateIedNameBasedOnLnode(SCL scl) {
505-
Map<TopoKey, TBay> bayByTopoKey = scl.getSubstation().stream()
506-
.flatMap(tSubstation -> tSubstation.getVoltageLevel().stream())
507-
.flatMap(tVoltageLevel -> tVoltageLevel.getBay().stream())
508-
.map(tBay -> PrivateUtils.extractCompasPrivate(tBay, TCompasTopo.class)
509-
.filter(tCompasTopo -> isNotBlank(tCompasTopo.getNode()) && Objects.nonNull(tCompasTopo.getNodeOrder()))
510-
.map(tCompasTopo -> new BayTopoKey(tBay, new TopoKey(tCompasTopo.getNode(), tCompasTopo.getNodeOrder())))
511-
)
512-
.flatMap(Optional::stream)
513-
.collect(Collectors.toMap(BayTopoKey::topoKey, BayTopoKey::bay));
514-
515-
List<SclReportItem> sclReportItems = new ArrayList<>();
516-
scl.getIED().stream()
517-
.flatMap(ldeviceService::getLdevices)
518-
.forEach(tlDevice ->
519-
extRefService.getCompasFlows(tlDevice)
520-
.filter(tCompasFlow -> Objects.nonNull(tCompasFlow.getFlowSourceBayNode()) && Objects.nonNull(tCompasFlow.getFlowSourceBayNodeOrder()))
521-
.forEach(tCompasFlow ->
522-
Optional.ofNullable(bayByTopoKey.get(new TopoKey(tCompasFlow.getFlowSourceBayNode().toString(), tCompasFlow.getFlowSourceBayNodeOrder())))
523-
.flatMap(tBay -> tBay.getFunction().stream()
524-
.flatMap(tFunction -> tFunction.getLNode().stream())
525-
.filter(tlNode -> Objects.equals(tlNode.getLdInst(), tCompasFlow.getExtRefldinst())
526-
&& Objects.equals(tlNode.getLnInst(), tCompasFlow.getExtReflnInst())
527-
&& Utils.lnClassEquals(tlNode.getLnClass(), tCompasFlow.getExtReflnClass())
528-
&& Objects.equals(tlNode.getPrefix(), tCompasFlow.getExtRefprefix()))
529-
.filter(tlNode -> {
530-
Optional<TCompasICDHeader> tCompasICDHeader = PrivateUtils.extractCompasPrivate(tlNode, TCompasICDHeader.class);
531-
if (tCompasICDHeader.isPresent()) {
532-
return Objects.equals(tCompasFlow.getFlowSourceIEDType(), tCompasICDHeader.get().getIEDType())
533-
&& Objects.equals(tCompasFlow.getFlowIEDSystemVersioninstance(), tCompasICDHeader.get().getIEDSystemVersioninstance())
534-
&& Objects.equals(tCompasFlow.getFlowSourceIEDredundancy(), tCompasICDHeader.get().getIEDredundancy());
535-
} else {
536-
sclReportItems.add(SclReportItem.error("", ("The substation LNode with following attributes : IedName:%s / LdInst:%s / LnClass:%s / LnInst:%s " +
537-
"does not contain the needed (COMPAS - ICDHeader) private")
538-
.formatted(tlNode.getIedName(), tlNode.getLdInst(), tlNode.getLnClass().getFirst(), tlNode.getLnInst())));
539-
return false;
540-
}
541-
})
542-
.map(TLNode::getIedName)
543-
.reduce(checkOnlyOneIed(tCompasFlow, tBay, sclReportItems))
544-
)
545-
.ifPresentOrElse(iedName -> {
546-
extRefService.getMatchingExtRefs(tlDevice, tCompasFlow).forEach(tExtRef -> tExtRef.setIedName(iedName));
547-
tCompasFlow.setExtRefiedName(iedName);
548-
},
549-
() -> {
550-
extRefService.getMatchingExtRefs(tlDevice, tCompasFlow).forEach(extRefService::clearExtRefBinding);
551-
extRefService.clearCompasFlowBinding(tCompasFlow);
552-
}
553-
)
554-
)
555-
);
556-
return sclReportItems;
557-
}
558-
559-
private static BinaryOperator<String> checkOnlyOneIed(TCompasFlow tCompasFlow, TBay tBay, List<SclReportItem> sclReportItems) {
560-
return (iedName1, iedName2) -> {
561-
sclReportItems.add(SclReportItem.error("",
562-
("Several LNode@IedName ('%s', '%s') are found in the bay '%s' for the following compas-flow attributes :" +
563-
" @FlowSourceIEDType '%s' @FlowSourceIEDredundancy '%s' @FlowIEDSystemVersioninstance '%s'").
564-
formatted(iedName1, iedName2, tBay.getName(), tCompasFlow.getFlowSourceIEDType(), tCompasFlow.getFlowSourceIEDredundancy(), tCompasFlow.getFlowIEDSystemVersioninstance())));
565-
return iedName1;
566-
};
567-
}
568-
569-
record TopoKey(String FlowNode, BigInteger FlowNodeOrder) {
570-
}
571-
572-
record BayTopoKey(TBay bay, TopoKey topoKey) {
573-
}
574-
575391
private record DoNameAndDaName(String doName, String daName) {
576392
}
577393

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

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
* <ol>
2222
* <li>{@link ExtRefEditor#updateExtRefBinders <em>Update the <b>TExtRef </b> reference object for given <b>ExtRefBindingInfo </b> model</em>}</li>
2323
* <li>{@link ExtRefEditor#updateExtRefSource <em>Update the <b>TExtRef </b> reference object for given <b>ExtRefSourceInfo </b> model</em>}</li>
24-
* <li>{@link ExtRefEditor#updateAllExtRefIedNames <em>Update the iedName attribute in all <b>TExtRef</b></em>}</li>
2524
* <li>{@link ExtRefEditor#manageBindingForLDEPF <em>Manage <b>TExtRef</b> Binding For LDevice (inst=LDEPF) within LDEPF configuration</em>}</li>
2625
* </ol>
2726
* </ul>
@@ -47,13 +46,6 @@ public interface ExtRefEditor {
4746
*/
4847
TExtRef updateExtRefSource(SCL scd, ExtRefInfo extRefInfo) throws ScdException;
4948

50-
/**
51-
* Updates iedName attribute of all ExtRefs in the Scd.
52-
*
53-
* @return list of encountered errors
54-
*/
55-
List<SclReportItem> updateAllExtRefIedNames(SCL scd);
56-
5749
/**
5850
* ExtRef Binding For LDevice (inst=LDEPF) that matching EPF configuration
5951
*
@@ -71,18 +63,4 @@ public interface ExtRefEditor {
7163
*/
7264
void epfPostProcessing(SCL scd);
7365

74-
/**
75-
* Debinding of Private CompasFlows and ExtRef signals based on voltageLevel
76-
*
77-
* @param scd SCL file in which ExtRef and Private CompasFlow should be debind
78-
*/
79-
void debindCompasFlowsAndExtRefsBasedOnVoltageLevel(SCL scd);
80-
81-
/**
82-
* Update compas:Flow.ExtRefiedName and ExtRef.iedName, based on Substation LNode iedName
83-
* @param scd SCL
84-
* @return list of encoutered errors
85-
*/
86-
List<SclReportItem> updateIedNameBasedOnLnode(SCL scd);
87-
8866
}

‎sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ExtRefService.java‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* // SPDX-FileCopyrightText: 2023 RTE FRANCE
2+
* // SPDX-FileCopyrightText: 2023 2024 RTE FRANCE
33
* //
44
* // SPDX-License-Identifier: Apache-2.0
55
*/
@@ -52,18 +52,6 @@ public Stream<TCompasFlow> getMatchingCompasFlows(TInputs inputs, TExtRef tExtRe
5252
.filter(compasFlow -> isMatchingExtRef(compasFlow, tExtRef));
5353
}
5454

55-
/**
56-
* Retrieves ExtRefs corresponding to given CompasFlow
57-
*
58-
* @param tlDevice LDevice containing CompasFlows and ExtRefs
59-
* @param tCompasFlow corresponding to Extrefs we are searching
60-
* @return stream of matching ExtRefs
61-
*/
62-
public Stream<TExtRef> getMatchingExtRefs(TLDevice tlDevice, TCompasFlow tCompasFlow) {
63-
return getExtRefs(tlDevice)
64-
.filter(tExtRef -> isMatchingExtRef(tCompasFlow, tExtRef));
65-
}
66-
6755
/**
6856
* Debind ExtRef
6957
*
@@ -85,18 +73,6 @@ public void clearExtRefBinding(TExtRef extRef) {
8573
extRef.unsetSrcLNClass();
8674
}
8775

88-
/**
89-
* Debind CompasFlow
90-
*
91-
* @param tCompasFlow to debind
92-
*/
93-
public void clearCompasFlowBinding(TCompasFlow tCompasFlow) {
94-
tCompasFlow.setExtRefiedName(null);
95-
tCompasFlow.setExtRefldinst(null);
96-
tCompasFlow.setExtReflnClass(null);
97-
tCompasFlow.setExtReflnInst(null);
98-
tCompasFlow.setExtRefprefix(null);
99-
}
10076

10177
/**
10278
* Check if extRef matches CompasFlow

0 commit comments

Comments
 (0)