Merge pull request #645 from catenax-ng/bug/963-fix-contract-agreemen…

…ts-in-edc-version-0.7.0 Bug/963 fix contract agreements in edc version 0.7.0
catenax-ng · May 15, 2024 · 6dfc3b1 · 6dfc3b1
2 parents e6fce5e + db56d62
commit 6dfc3b1
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,8 @@ _**For better traceability add the corresponding GitHub issue number in each cha
 - Improved policy store API input validation. #528
 - Extended datamodel of EdcPolicyPermissionConstraint to include andConstraints
 - Marked createAccessPolicy requests with deprecation mark.
+- remove edc namespace from EdcContractAgreementNegotiationResponse and
+  EdcContractAgreementsResponse eclipse-tractusx/traceability-foss#963
 
 
 ## Added

diff --git a/DEPENDENCIES b/DEPENDENCIES
@@ -303,12 +303,12 @@ maven/mavencentral/org.eclipse.tractusx.edc/core-spi/0.6.0, Apache-2.0, approved
 maven/mavencentral/org.eclipse.tractusx.edc/edr-api/0.6.0, Apache-2.0, approved, automotive.tractusx
 maven/mavencentral/org.eclipse.tractusx.edc/edr-spi/0.6.0, Apache-2.0, approved, automotive.tractusx
 maven/mavencentral/org.eclipse.tractusx.irs/irs-api/0.0.2-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.irs/irs-common/2.0.3, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.irs/irs-edc-client/2.0.3, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.irs/irs-models/2.0.3, Apache-2.0, approved, automotive.tractusx
+maven/mavencentral/org.eclipse.tractusx.irs/irs-common/2.0.4-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
+maven/mavencentral/org.eclipse.tractusx.irs/irs-edc-client/2.0.4-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
+maven/mavencentral/org.eclipse.tractusx.irs/irs-models/2.0.4-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
 maven/mavencentral/org.eclipse.tractusx.irs/irs-policy-store/0.0.2-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/2.0.3, Apache-2.0, approved, automotive.tractusx
-maven/mavencentral/org.eclipse.tractusx.irs/irs-testing/2.0.3, Apache-2.0, approved, automotive.tractusx
+maven/mavencentral/org.eclipse.tractusx.irs/irs-registry-client/2.0.4-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
+maven/mavencentral/org.eclipse.tractusx.irs/irs-testing/2.0.4-SNAPSHOT, Apache-2.0, approved, automotive.tractusx
 maven/mavencentral/org.glassfish/jakarta.json/2.0.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jsonp
 maven/mavencentral/org.hamcrest/hamcrest-core/2.2, BSD-3-Clause, approved, clearlydefined
 maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-3-Clause, approved, clearlydefined

diff --git a/...lipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementNegotiationResponse.java b/...lipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementNegotiationResponse.java
@@ -31,10 +31,10 @@
 @Builder
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record EdcContractAgreementNegotiationResponse(@JsonProperty("@id") String correlationId,
-                                                      @JsonProperty("edc:counterPartyId") String counterPartyId,
+                                                      @JsonProperty("counterPartyId") String counterPartyId,
                                                       @JsonProperty(
-                                                              "edc:counterPartyAddress") String counterPartyAddress,
-                                                      @JsonProperty("edc:protocol") String protocol,
-                                                      @JsonProperty("edc:state") String state,
-                                                      @JsonProperty("edc:type") String type) {
+                                                              "counterPartyAddress") String counterPartyAddress,
+                                                      @JsonProperty("protocol") String protocol,
+                                                      @JsonProperty("state") String state,
+                                                      @JsonProperty("type") String type) {
 }
diff --git a/...ava/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementsResponse.java b/...ava/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementsResponse.java
@@ -32,10 +32,10 @@
 @Builder
 @JsonIgnoreProperties(ignoreUnknown = true)
 public record EdcContractAgreementsResponse(@JsonProperty("@id") String contractAgreementId,
-                                            @JsonProperty("edc:providerId") String providerId,
-                                            @JsonProperty("edc:consumerId") String consumerId,
-                                            @JsonProperty("edc:contractSigningDate") long contractSigningDate,
-                                            @JsonProperty("edc:assetId") String assetId,
+                                            @JsonProperty("providerId") String providerId,
+                                            @JsonProperty("consumerId") String consumerId,
+                                            @JsonProperty("contractSigningDate") long contractSigningDate,
+                                            @JsonProperty("assetId") String assetId,
                                             @JsonProperty("@type") String type,
-                                            @JsonProperty("edc:policy") Object policy) {
+                                            @JsonProperty("policy") Object policy) {
 }
diff --git a/pom.xml b/pom.xml
@@ -73,7 +73,7 @@
         </sonar.coverage.jacoco.xmlReportPaths>
 
         <!-- IRS Registry Client Library -->
-        <irs-registry-client.version>2.0.3</irs-registry-client.version>
+        <irs-registry-client.version>2.0.4-SNAPSHOT</irs-registry-client.version>
 
         <!-- Dependencies -->
         <springboot.version>3.1.11</springboot.version>