diff --git a/pom.xml b/pom.xml index 17e482332..93499459c 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ sct-coverage/** ../sct-coverage/target/site/jacoco-aggregate/jacoco.xml ${basedir}/${aggregate.report.dir} - 0.15.0 + 0.17.0 0.0.4 3.4.1 3.2.1 diff --git a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/icd/IcdHeader.java b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/icd/IcdHeader.java index d6f7a9d46..32cadbfe9 100644 --- a/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/icd/IcdHeader.java +++ b/sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/icd/IcdHeader.java @@ -23,8 +23,6 @@ @EqualsAndHashCode public class IcdHeader { - @EqualsAndHashCode.Exclude - private final String content; private final String icdSystemVersionUUID; private final TCompasIEDType iedType; @EqualsAndHashCode.Exclude @@ -45,7 +43,6 @@ public class IcdHeader { private final String headerRevision; public IcdHeader(TCompasICDHeader compasICDHeader) { - this.content = compasICDHeader.getContent(); this.icdSystemVersionUUID = compasICDHeader.getICDSystemVersionUUID(); this.iedType = compasICDHeader.getIEDType(); this.iedSubstationinstance = compasICDHeader.getIEDSubstationinstance(); @@ -64,7 +61,6 @@ public IcdHeader(TCompasICDHeader compasICDHeader) { public TCompasICDHeader toTCompasICDHeader() { TCompasICDHeader tCompasICDHeader = new TCompasICDHeader(); - tCompasICDHeader.setContent(content); tCompasICDHeader.setICDSystemVersionUUID(icdSystemVersionUUID); tCompasICDHeader.setIEDType(iedType); tCompasICDHeader.setIEDSubstationinstance(iedSubstationinstance); diff --git a/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/icd/IcdHeaderTest.java b/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/icd/IcdHeaderTest.java index bc117fe4a..19f7c105e 100644 --- a/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/icd/IcdHeaderTest.java +++ b/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/icd/IcdHeaderTest.java @@ -62,8 +62,6 @@ void testEquals(IcdHeader icdHeader2) { } private static Stream provideIcdHeaderForEquals() { - TCompasICDHeader tCompasICDHeaderModifiedContent = createHeader(); - tCompasICDHeaderModifiedContent.setContent("patate"); TCompasICDHeader tCompasICDHeaderModifiedIedSubstationinstance = createHeader(); tCompasICDHeaderModifiedIedSubstationinstance.setIEDSubstationinstance(BigInteger.TEN); TCompasICDHeader tCompasICDHeaderModifiediedSystemVersioninstance = createHeader(); @@ -73,7 +71,6 @@ private static Stream provideIcdHeaderForEquals() { TCompasICDHeader tCompasICDHeaderModifiedbayLabel = createHeader(); tCompasICDHeaderModifiedbayLabel.setBayLabel("patate"); return Stream.of( - Arguments.of(new IcdHeader(tCompasICDHeaderModifiedContent)), Arguments.of(new IcdHeader(tCompasICDHeaderModifiedIedSubstationinstance)), Arguments.of(new IcdHeader(tCompasICDHeaderModifiediedSystemVersioninstance)), Arguments.of(new IcdHeader(tCompasICDHeaderModifiediedName)), @@ -150,7 +147,6 @@ void testHashCode_should_not_equals() { private static TCompasICDHeader createHeader() { TCompasICDHeader tCompasICDHeader = new TCompasICDHeader(); - tCompasICDHeader.setContent("content"); tCompasICDHeader.setICDSystemVersionUUID("icdSystemVersionUUID"); tCompasICDHeader.setIEDType(TCompasIEDType.SCU); tCompasICDHeader.setIEDSubstationinstance(BigInteger.ONE); diff --git a/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/util/PrivateUtilsTest.java b/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/util/PrivateUtilsTest.java index d2efb9f62..4a36049fd 100644 --- a/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/util/PrivateUtilsTest.java +++ b/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/util/PrivateUtilsTest.java @@ -566,7 +566,6 @@ void getCompasICDHeaders_should_return_ICDHeaders() { //Then assertThat(tCompasICDHeader) .extracting( - TCompasICDHeader::getContent, TCompasICDHeader::getICDSystemVersionUUID, TCompasICDHeader::getIEDType, TCompasICDHeader::getIEDSubstationinstance, @@ -582,7 +581,7 @@ void getCompasICDHeaders_should_return_ICDHeaders() { TCompasICDHeader::getHeaderVersion, TCompasICDHeader::getHeaderRevision ) - .containsExactly("", + .containsExactly( "IED4d4fe1a8cda64cf88a5ee4176a1a0eef", TCompasIEDType.SCU, BigInteger.ONE,