Skip to content

Commit 58d0137

Browse files
authored
Merge pull request #561 from com-pas/feat/560-rsr-1494-remove-managebindingforldepf
feat(#560): RSR-1494 - Remove managebindingforldepf and epfPostProcessing
2 parents 4552229 + d94b6e0 commit 58d0137

21 files changed

+51
-3482
lines changed

sct-commons/pom.xml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -180,23 +180,6 @@
180180
<clearOutputDir>false</clearOutputDir>
181181
</configuration>
182182
</execution>
183-
<execution>
184-
<id>epf</id>
185-
<goals>
186-
<goal>xjc</goal>
187-
</goals>
188-
<configuration>
189-
<sources>
190-
<source>${project.basedir}/src/main/resources/xsd/LDEPF.xsd</source>
191-
</sources>
192-
<xjbSources>
193-
<xjbSource>${project.basedir}/src/main/resources/binding_configuration.xjb</xjbSource>
194-
</xjbSources>
195-
<packageName>org.lfenergy.compas.sct.commons.model.epf</packageName>
196-
<noPackageLevelAnnotations>true</noPackageLevelAnnotations>
197-
<clearOutputDir>false</clearOutputDir>
198-
</configuration>
199-
</execution>
200183
<execution>
201184
<id>cbcom</id>
202185
<goals>

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

Lines changed: 7 additions & 329 deletions
Large diffs are not rendered by default.

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,8 @@ public Optional<TLDevice> findLdevice(TIED tied, String ldInst) {
4848
public Optional<ActiveStatus> getLdeviceStatus(TLDevice tlDevice) {
4949
return lnService.getPrivateCompasLNodeStatus(tlDevice.getLN0());
5050
}
51+
52+
public boolean isActive(TLDevice tlDevice) {
53+
return getLdeviceStatus(tlDevice).filter(ActiveStatus.ON::equals).isPresent();
54+
}
5155
}

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
@@ -7,11 +7,7 @@
77
import org.lfenergy.compas.scl2007b4.model.SCL;
88
import org.lfenergy.compas.scl2007b4.model.TExtRef;
99
import org.lfenergy.compas.sct.commons.dto.ExtRefInfo;
10-
import org.lfenergy.compas.sct.commons.dto.SclReportItem;
1110
import org.lfenergy.compas.sct.commons.exception.ScdException;
12-
import org.lfenergy.compas.sct.commons.model.epf.EPF;
13-
14-
import java.util.List;
1511

1612
/**
1713
* Service class that will be used to create, update or delete elements related to the {@link TExtRef <em>TExtRef</em>} object.
@@ -21,7 +17,6 @@
2117
* <ol>
2218
* <li>{@link ExtRefEditor#updateExtRefBinders <em>Update the <b>TExtRef </b> reference object for given <b>ExtRefBindingInfo </b> model</em>}</li>
2319
* <li>{@link ExtRefEditor#updateExtRefSource <em>Update the <b>TExtRef </b> reference object for given <b>ExtRefSourceInfo </b> model</em>}</li>
24-
* <li>{@link ExtRefEditor#manageBindingForLDEPF <em>Manage <b>TExtRef</b> Binding For LDevice (inst=LDEPF) within LDEPF configuration</em>}</li>
2520
* </ol>
2621
* </ul>
2722
*/
@@ -46,21 +41,4 @@ public interface ExtRefEditor {
4641
*/
4742
TExtRef updateExtRefSource(SCL scd, ExtRefInfo extRefInfo) throws ScdException;
4843

49-
/**
50-
* ExtRef Binding For LDevice (inst=LDEPF) that matching EPF configuration
51-
*
52-
* @param scd SCL
53-
* @param epf EPF
54-
* @return list of encountered errors
55-
*/
56-
List<SclReportItem> manageBindingForLDEPF(SCL scd, EPF epf);
57-
58-
/**
59-
* Pointing an unused channel to an existing object LPHD0.Proxy of the concerned IED.
60-
* An unused channel is characterized by the value DAI name ="setSrcRef"/Val (should be empty) in InRef**
61-
* that have a purpose beginning by DYN_LDEPF_DIGITAL CHANNEL or DYN_LDEPF_ANALOG CHANNEL
62-
* @param scd SCL
63-
*/
64-
void epfPostProcessing(SCL scd);
65-
6644
}

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77

88
import lombok.*;
9-
import org.lfenergy.compas.scl2007b4.model.TCompasBay;
109
import org.lfenergy.compas.scl2007b4.model.TExtRef;
1110
import org.lfenergy.compas.scl2007b4.model.TFCDA;
1211

@@ -93,12 +92,4 @@ && trimToEmpty(tfcda.getLnInst()).equals(trimToEmpty(bindingInfo.getLnInst()))
9392
&& Objects.equals(tfcda.getDaName(), signalInfo.getPDA());
9493
}
9594

96-
/**
97-
* ExtRef and related Bay model
98-
* @param iedName The name of the IED containing bay
99-
* @param compasBay The Bay object
100-
* @param extRef The ExtRef object
101-
*/
102-
public record ExtRefWithBayReference(String iedName, TCompasBay compasBay, TExtRef extRef){ }
103-
10495
}

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,18 @@ public final class CommonConstants {
1515
public static final String HEADER_ID = "headerId";
1616
public static final String HEADER_VERSION = "headerVersion";
1717
public static final String HEADER_REVISION = "headerRevision";
18-
public static final String BEHAVIOUR_DO_NAME = "Beh";
1918
public static final String MOD_DO_NAME = "Mod";
2019
public static final String STVAL_DA_NAME = "stVal";
2120
public static final String ATTRIBUTE_VALUE_SEPARATOR = "_";
2221
public static final String CONTROLBLOCK_NAME_PREFIX = "CB" + ATTRIBUTE_VALUE_SEPARATOR;
2322
public static final String DATASET_NAME_PREFIX = "DS" + ATTRIBUTE_VALUE_SEPARATOR;
2423

25-
public static final String LN_RADR = "RADR";
26-
public static final String LN_RBDR = "RBDR";
27-
public static final String LN_PREFIX_A = "a";
28-
public static final String LN_PREFIX_B = "b";
29-
public static final String LDEVICE_LDEPF = "LDEPF";
3024
public static final String LDEVICE_LDSUIED = "LDSUIED";
31-
public static final String CHNUM1_DO_NAME = "ChNum1";
32-
public static final String LEVMOD_DO_NAME = "LevMod";
33-
public static final String SRCREF_DO_NAME = "SrcRef";
34-
public static final String DU_DA_NAME = "dU";
35-
public static final String SETVAL_DA_NAME = "setVal";
3625
public static final String SETSRCREF_DA_NAME = "setSrcRef";
3726
public static final String SETSRCCB_DA_NAME = "setSrcCB";
3827
public static final String SETTSTREF_DA_NAME = "setTstRef";
3928
public static final String SETTSTCB_DA_NAME = "setTstCB";
4029
public static final String PURPOSE_DA_NAME = "purpose";
41-
public static final String Q_DA_NAME = "q";
4230
public static final String IED_TEST_NAME = "IEDTEST";
4331
public static final String INREF_PREFIX = "InRef";
4432

sct-commons/src/main/resources/xsd/LDEPF.xsd

Lines changed: 0 additions & 147 deletions
This file was deleted.

0 commit comments

Comments
 (0)