From 0dc1647a68f64f407100ba7362bcfe35ea033cb0 Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Wed, 15 May 2024 09:30:51 +0200 Subject: [PATCH 1/2] bug: #963 remove edc namespace from contract agreement response --- CHANGELOG.md | 3 ++- .../model/EdcContractAgreementNegotiationResponse.java | 10 +++++----- .../contract/model/EdcContractAgreementsResponse.java | 10 +++++----- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 369e1741da..511ba6e77e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,8 @@ _**For better traceability add the corresponding GitHub issue number in each cha ### Changed - Improved policy store API input validation. #528 - +- eclipse-tractusx/traceability-foss#963 remove edc namespace from EdcContractAgreementNegotiationResponse and + EdcContractAgreementsResponse ## Added diff --git a/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementNegotiationResponse.java b/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementNegotiationResponse.java index e16d2e9836..76a6481dae 100644 --- a/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementNegotiationResponse.java +++ b/irs-edc-client/src/main/java/org/eclipse/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/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementsResponse.java b/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementsResponse.java index 0f31f088eb..d3397f1eb4 100644 --- a/irs-edc-client/src/main/java/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementsResponse.java +++ b/irs-edc-client/src/main/java/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) { } From db56d62ce6c02d9c2d1cab257ec1ebb7576c9ef0 Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Wed, 15 May 2024 11:26:23 +0200 Subject: [PATCH 2/2] bug: #963 update irs-registry-client.version and DEPENDENCIES file --- DEPENDENCIES | 10 +++++----- pom.xml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DEPENDENCIES b/DEPENDENCIES index 694a68d234..b37c118dc0 100644 --- 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/pom.xml b/pom.xml index e09b140d12..272ac7a36f 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ - 2.0.3 + 2.0.4-SNAPSHOT 3.1.11