Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug/963 fix contract agreements in edc version 0.7.0 #643

Closed
wants to merge 4 commits into from
Closed

Bug/963 fix contract agreements in edc version 0.7.0 #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1db553c
Merge pull request #935 from eclipse-tractusx/main
ds-jhartmann May 14, 2024
35ae705
Merge pull request #936 from eclipse-tractusx/main
ds-jhartmann May 14, 2024
0dc1647
bug: #963 remove edc namespace from contract agreement response
ds-lcapellino May 15, 2024
29760ec
Merge remote-tracking branch 'eclipse/main' into bug/963-fix-contract…
ds-lcapellino May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions ...lipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementNegotiationResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
}
10 changes: 5 additions & 5 deletions ...ava/org/eclipse/tractusx/irs/edc/client/contract/model/EdcContractAgreementsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
}
Loading