Skip to content

Commit 357d5f4

Browse files
committed
feat(#343): Update compas-core SCL_CoMPAS.xsd
Signed-off-by: gleizesDor <[email protected]>
1 parent 654f32d commit 357d5f4

File tree

4 files changed

+2
-11
lines changed

4 files changed

+2
-11
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
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-
<compas-core.version>0.15.0</compas-core.version>
39+
<compas-core.version>0.17.0</compas-core.version>
4040
<compas-scl-xsd.version>0.0.4</compas-scl-xsd.version>
4141
<maven.plugin.javadoc>3.4.1</maven.plugin.javadoc>
4242
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/icd/IcdHeader.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
@EqualsAndHashCode
2424
public class IcdHeader {
2525

26-
@EqualsAndHashCode.Exclude
27-
private final String content;
2826
private final String icdSystemVersionUUID;
2927
private final TCompasIEDType iedType;
3028
@EqualsAndHashCode.Exclude
@@ -45,7 +43,6 @@ public class IcdHeader {
4543
private final String headerRevision;
4644

4745
public IcdHeader(TCompasICDHeader compasICDHeader) {
48-
this.content = compasICDHeader.getContent();
4946
this.icdSystemVersionUUID = compasICDHeader.getICDSystemVersionUUID();
5047
this.iedType = compasICDHeader.getIEDType();
5148
this.iedSubstationinstance = compasICDHeader.getIEDSubstationinstance();
@@ -64,7 +61,6 @@ public IcdHeader(TCompasICDHeader compasICDHeader) {
6461

6562
public TCompasICDHeader toTCompasICDHeader() {
6663
TCompasICDHeader tCompasICDHeader = new TCompasICDHeader();
67-
tCompasICDHeader.setContent(content);
6864
tCompasICDHeader.setICDSystemVersionUUID(icdSystemVersionUUID);
6965
tCompasICDHeader.setIEDType(iedType);
7066
tCompasICDHeader.setIEDSubstationinstance(iedSubstationinstance);

sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/icd/IcdHeaderTest.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ void testEquals(IcdHeader icdHeader2) {
6262
}
6363

6464
private static Stream<Arguments> provideIcdHeaderForEquals() {
65-
TCompasICDHeader tCompasICDHeaderModifiedContent = createHeader();
66-
tCompasICDHeaderModifiedContent.setContent("patate");
6765
TCompasICDHeader tCompasICDHeaderModifiedIedSubstationinstance = createHeader();
6866
tCompasICDHeaderModifiedIedSubstationinstance.setIEDSubstationinstance(BigInteger.TEN);
6967
TCompasICDHeader tCompasICDHeaderModifiediedSystemVersioninstance = createHeader();
@@ -73,7 +71,6 @@ private static Stream<Arguments> provideIcdHeaderForEquals() {
7371
TCompasICDHeader tCompasICDHeaderModifiedbayLabel = createHeader();
7472
tCompasICDHeaderModifiedbayLabel.setBayLabel("patate");
7573
return Stream.of(
76-
Arguments.of(new IcdHeader(tCompasICDHeaderModifiedContent)),
7774
Arguments.of(new IcdHeader(tCompasICDHeaderModifiedIedSubstationinstance)),
7875
Arguments.of(new IcdHeader(tCompasICDHeaderModifiediedSystemVersioninstance)),
7976
Arguments.of(new IcdHeader(tCompasICDHeaderModifiediedName)),
@@ -150,7 +147,6 @@ void testHashCode_should_not_equals() {
150147

151148
private static TCompasICDHeader createHeader() {
152149
TCompasICDHeader tCompasICDHeader = new TCompasICDHeader();
153-
tCompasICDHeader.setContent("content");
154150
tCompasICDHeader.setICDSystemVersionUUID("icdSystemVersionUUID");
155151
tCompasICDHeader.setIEDType(TCompasIEDType.SCU);
156152
tCompasICDHeader.setIEDSubstationinstance(BigInteger.ONE);

sct-commons/src/test/java/org/lfenergy/compas/sct/commons/util/PrivateUtilsTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,6 @@ void getCompasICDHeaders_should_return_ICDHeaders() {
566566
//Then
567567
assertThat(tCompasICDHeader)
568568
.extracting(
569-
TCompasICDHeader::getContent,
570569
TCompasICDHeader::getICDSystemVersionUUID,
571570
TCompasICDHeader::getIEDType,
572571
TCompasICDHeader::getIEDSubstationinstance,
@@ -582,7 +581,7 @@ void getCompasICDHeaders_should_return_ICDHeaders() {
582581
TCompasICDHeader::getHeaderVersion,
583582
TCompasICDHeader::getHeaderRevision
584583
)
585-
.containsExactly("",
584+
.containsExactly(
586585
"IED4d4fe1a8cda64cf88a5ee4176a1a0eef",
587586
TCompasIEDType.SCU,
588587
BigInteger.ONE,

0 commit comments

Comments
 (0)