Skip to content

Commit ab7a9d6

Browse files
AliouDIAITEAliouDIAITE
authored
Merge pull request #129 from com-pas/develop
Merge develop branch into main branch for Release 0.1.0
2 parents 9fc367c + 488cb22 commit ab7a9d6

File tree

70 files changed

+2055
-684
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+2055
-684
lines changed

‎pom.xml‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
<sonar.coverage.exclusions>sct-coverage/**</sonar.coverage.exclusions>
3737
<aggregate.report.dir>../sct-coverage/target/site/jacoco-aggregate/jacoco.xml</aggregate.report.dir>
3838
<sonar.coverage.jacoco.xmlReportPaths>${basedir}/${aggregate.report.dir}</sonar.coverage.jacoco.xmlReportPaths>
39+
<scl-extension.version>0.9.1</scl-extension.version>
40+
<compas-scl-xsd.version>0.0.4</compas-scl-xsd.version>
3941
</properties>
4042

4143
<dependencyManagement>
@@ -71,7 +73,12 @@
7173
<dependency>
7274
<groupId>org.lfenergy.compas.core</groupId>
7375
<artifactId>scl-extension</artifactId>
74-
<version>0.8.0</version>
76+
<version>${scl-extension.version}</version>
77+
</dependency>
78+
<dependency>
79+
<groupId>org.lfenergy.compas.xsd</groupId>
80+
<artifactId>compas-scl-xsd</artifactId>
81+
<version>${compas-scl-xsd.version}</version>
7582
</dependency>
7683
<dependency>
7784
<groupId>ch.qos.logback</groupId>
@@ -104,6 +111,16 @@
104111
<build>
105112
<pluginManagement>
106113
<plugins>
114+
<plugin>
115+
<groupId>org.lfenergy.compas.xsd</groupId>
116+
<artifactId>compas-scl-xsd</artifactId>
117+
<version>${compas-scl-xsd.version}</version>
118+
</plugin>
119+
<plugin>
120+
<groupId>org.lfenergy.compas.core</groupId>
121+
<artifactId>scl-extension</artifactId>
122+
<version>${scl-extension.version}</version>
123+
</plugin>
107124
<plugin>
108125
<groupId>org.apache.maven.plugins</groupId>
109126
<artifactId>maven-compiler-plugin</artifactId>
@@ -119,6 +136,11 @@
119136
<artifactId>maven-surefire-plugin</artifactId>
120137
<version>2.22.2</version>
121138
</plugin>
139+
<plugin>
140+
<groupId>org.apache.maven.plugins</groupId>
141+
<artifactId>maven-jar-plugin</artifactId>
142+
<version>3.2.2</version>
143+
</plugin>
122144
</plugins>
123145
</pluginManagement>
124146

‎sct-app/pom.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<version>local-SNAPSHOT</version>
1414
</parent>
1515

16-
<groupId>org.lfenergy.compas</groupId>
1716
<artifactId>sct-app</artifactId>
1817
<version>local-SNAPSHOT</version>
1918
<name>SCT-APP</name>
@@ -112,7 +111,10 @@
112111
<artifactItem>
113112
<groupId>org.lfenergy.compas.xsd</groupId>
114113
<artifactId>compas-scl-xsd</artifactId>
115-
<version>0.0.4</version>
114+
</artifactItem>
115+
<artifactItem>
116+
<groupId>org.lfenergy.compas.core</groupId>
117+
<artifactId>scl-extension</artifactId>
116118
</artifactItem>
117119
<artifactItem>
118120
<groupId>org.lfenergy.compas.core</groupId>

‎sct-app/src/main/java/org/lfenergy/compas/sct/app/SclAutomationService.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.lfenergy.compas.sct.commons.exception.ScdException;
1414
import org.lfenergy.compas.sct.commons.scl.SclRootAdapter;
1515
import org.lfenergy.compas.sct.commons.scl.SclService;
16+
import org.lfenergy.compas.sct.commons.scl.SubstationService;
1617

1718
import java.util.*;
1819

@@ -32,7 +33,7 @@ public static SclRootAdapter createSCD(@NonNull SCL ssd, @NonNull HeaderDTO head
3233
HeaderDTO.HistoryItem hItem = headerDTO.getHistoryItems().get(0);
3334
SclService.addHistoryItem(scdAdapter.getCurrentElem(), hItem.getWho(), hItem.getWhat(), hItem.getWhy());
3435
}
35-
SclService.addSubstation(scdAdapter.getCurrentElem(), ssd);
36+
SubstationService.addSubstation(scdAdapter.getCurrentElem(), ssd);
3637
SclService.importSTDElementsInSCD(scdAdapter, stds, comMap);
3738
return scdAdapter;
3839
}

‎sct-app/src/test/java/org.lfenergy.compas.sct.app/SclAutomationServiceTest.java‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import java.util.Set;
1818

1919
import static org.junit.jupiter.api.Assertions.*;
20+
import static org.lfenergy.compas.sct.commons.testhelpers.SclTestMarshaller.assertIsMarshallable;
2021

2122
class SclAutomationServiceTest {
2223

@@ -30,20 +31,25 @@ void init(){
3031
}
3132

3233
@Test
33-
void createSCD() throws Exception {
34+
void createSCD_should_return_generatedSCD() throws Exception {
35+
// Given
3436
SCL ssd = SclTestMarshaller.getSCLFromFile("/scd-ied-dtt-com-import-stds/scd.xml");
3537
SCL std = SclTestMarshaller.getSCLFromFile("/scd-ied-dtt-com-import-stds/std.xml");
38+
// When
3639
SclRootAdapter expectedSCD = SclAutomationService.createSCD(ssd, headerDTO, Set.of(std));
40+
// Then
3741
assertNotNull(expectedSCD.getCurrentElem().getHeader().getId());
3842
assertNull(expectedSCD.getCurrentElem().getHeader().getHistory());
3943
assertEquals(1, expectedSCD.getCurrentElem().getSubstation().size());
4044
assertEquals(1, expectedSCD.getCurrentElem().getIED().size());
4145
assertNotNull(expectedSCD.getCurrentElem().getDataTypeTemplates());
4246
assertEquals(2, expectedSCD.getCurrentElem().getCommunication().getSubNetwork().size());
47+
assertIsMarshallable(expectedSCD.getCurrentElem());
4348
}
4449

4550
@Test
4651
void createSCD_With_HItem() throws Exception {
52+
// Given
4753
HeaderDTO.HistoryItem historyItem = new HeaderDTO.HistoryItem();
4854
historyItem.setWhat("what");
4955
historyItem.setWho("me");
@@ -53,14 +59,18 @@ void createSCD_With_HItem() throws Exception {
5359
SCL std1 = SclTestMarshaller.getSCLFromFile("/std_1.xml");
5460
SCL std2 = SclTestMarshaller.getSCLFromFile("/std_2.xml");
5561
SCL std3 = SclTestMarshaller.getSCLFromFile("/std_3.xml");
62+
// When
5663
SclRootAdapter expectedSCD = SclAutomationService.createSCD(ssd, headerDTO, Set.of(std1, std2, std3));
64+
// Then
5765
assertNotNull(expectedSCD.getCurrentElem().getHeader().getId());
5866
assertEquals(1 ,expectedSCD.getCurrentElem().getHeader().getHistory().getHitem().size());
5967
assertEquals(1, expectedSCD.getCurrentElem().getSubstation().size());
68+
assertIsMarshallable(expectedSCD.getCurrentElem());
6069
}
6170

6271
@Test
6372
void createSCD_With_HItems() throws Exception {
73+
// Given
6474
HeaderDTO.HistoryItem historyItem = new HeaderDTO.HistoryItem();
6575
historyItem.setWhat("what");
6676
historyItem.setWho("me");
@@ -74,17 +84,22 @@ void createSCD_With_HItems() throws Exception {
7484
SCL std1 = SclTestMarshaller.getSCLFromFile("/std_1.xml");
7585
SCL std2 = SclTestMarshaller.getSCLFromFile("/std_2.xml");
7686
SCL std3 = SclTestMarshaller.getSCLFromFile("/std_3.xml");
87+
// When
7788
SclRootAdapter expectedSCD = SclAutomationService.createSCD(ssd, headerDTO,Set.of(std1, std2, std3));
89+
// Then
7890
assertNotNull(expectedSCD.getCurrentElem().getHeader().getId());
7991
assertEquals(1, expectedSCD.getCurrentElem().getHeader().getHistory().getHitem().size());
8092
assertEquals("what", expectedSCD.getCurrentElem().getHeader().getHistory().getHitem().get(0).getWhat());
93+
assertIsMarshallable(expectedSCD.getCurrentElem());
8194
}
8295

8396
@Test
8497
void createSCD_SSD_Without_Substation() throws Exception {
98+
// Given
8599
SCL ssd = SclTestMarshaller.getSCLFromFile("/scd-substation-import-ssd/ssd_without_substations.xml");
100+
// When & Then
86101
assertThrows(ScdException.class,
87102
() -> SclAutomationService.createSCD(ssd, headerDTO, new HashSet<>()) );
88103
}
89104

90-
}
105+
}

‎sct-commons/pom.xml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>org.apache.commons</groupId>
3434
<artifactId>commons-lang3</artifactId>
35-
<version>3.11</version>
35+
<version>3.12.0</version>
3636
</dependency>
3737
<dependency>
3838
<groupId>jakarta.xml.bind</groupId>
@@ -112,6 +112,7 @@
112112
<scope>test</scope>
113113
</dependency>
114114
</dependencies>
115+
115116
<build>
116117
<plugins>
117118
<plugin>
@@ -166,7 +167,10 @@
166167
<artifactItem>
167168
<groupId>org.lfenergy.compas.xsd</groupId>
168169
<artifactId>compas-scl-xsd</artifactId>
169-
<version>0.0.4</version>
170+
</artifactItem>
171+
<artifactItem>
172+
<groupId>org.lfenergy.compas.core</groupId>
173+
<artifactId>scl-extension</artifactId>
170174
</artifactItem>
171175
<artifactItem>
172176
<groupId>org.lfenergy.compas.core</groupId>
@@ -196,6 +200,9 @@
196200
<source>${project.build.directory}/xsd/SCL2007B4/SCL.xsd</source>
197201
<source>${project.build.directory}/xsd/SCL_CoMPAS.xsd</source>
198202
</sources>
203+
<xjbSources>
204+
<xjbSource>${project.basedir}/src/main/resources/binding_configuration.xjb</xjbSource>
205+
</xjbSources>
199206
<packageName>org.lfenergy.compas.scl2007b4.model</packageName>
200207
<noPackageLevelAnnotations>true</noPackageLevelAnnotations>
201208
</configuration>
@@ -214,4 +221,4 @@
214221

215222
</plugins>
216223
</build>
217-
</project>
224+
</project>

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

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

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

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

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

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,7 @@
77
import lombok.Getter;
88
import lombok.NoArgsConstructor;
99
import lombok.Setter;
10-
import org.lfenergy.compas.scl2007b4.model.TClientLN;
11-
import org.lfenergy.compas.scl2007b4.model.TControl;
12-
import org.lfenergy.compas.scl2007b4.model.TControlWithIEDName;
13-
import org.lfenergy.compas.scl2007b4.model.TPredefinedTypeOfSecurityEnum;
14-
import org.lfenergy.compas.scl2007b4.model.TServiceSettingsNoDynEnum;
15-
import org.lfenergy.compas.scl2007b4.model.TServiceType;
16-
import org.lfenergy.compas.scl2007b4.model.TServices;
17-
import org.lfenergy.compas.sct.commons.Utils;
10+
import org.lfenergy.compas.scl2007b4.model.*;
1811
import org.lfenergy.compas.sct.commons.exception.ScdException;
1912
import org.lfenergy.compas.sct.commons.scl.SclRootAdapter;
2013
import org.lfenergy.compas.sct.commons.scl.ied.IEDAdapter;
@@ -79,14 +72,12 @@ public void validateDestination(SclRootAdapter sclRootAdapter) throws ScdExcepti
7972
)
8073
)
8174
);
82-
if(!iedName.getLnClass().isEmpty()) {
75+
if (iedName.isSetLnClass()) {
8376
try {
8477
lDeviceAdapter.getLNAdapter(iedName.getLnClass().get(0), iedName.getLnInst(), iedName.getPrefix());
85-
} catch (ScdException e){
78+
} catch (ScdException e) {
8679
throw new ScdException("Control block destination: " + e.getMessage());
8780
}
88-
} else {
89-
Utils.setField(iedName,"lnClass",null);
9081
}
9182
}
9283
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void addDaiValues(List<TVal> vals) {
7575
}
7676

7777
public void addDaiValue(TVal val) {
78-
if(val.getSGroup() == null){
78+
if(!val.isSetSGroup()){
7979
daiValues.put(0L,val.getValue());
8080
} else {
8181
daiValues.put(val.getSGroup(), val.getValue());

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,9 @@ public FCDAInfo(String dataSet, TFCDA tfcda) {
3939
lnInst = tfcda.getLnInst();
4040
doName = new DoTypeName(tfcda.getDoName());
4141
daName = new DaTypeName(tfcda.getDaName());
42-
ix = tfcda.getIx();
42+
ix = tfcda.isSetIx() ? tfcda.getIx() : null;
4343
}
4444

45-
4645
@JsonIgnore
4746
public TFCDA getFCDA(){
4847
TFCDA tfcda = new TFCDA();
@@ -75,4 +74,4 @@ public TFCDA getFCDA(){
7574
public boolean isValid() {
7675
return doName != null && doName.isDefined();
7776
}
78-
}
77+
}

0 commit comments

Comments
 (0)