From 0dc1647a68f64f407100ba7362bcfe35ea033cb0 Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Wed, 15 May 2024 09:30:51 +0200 Subject: [PATCH] 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) { }