From fc4d7627303e1ca541917a22494049c5a5587214 Mon Sep 17 00:00:00 2001 From: ds-jhartmann <57985712+ds-jhartmann@users.noreply.github.com> Date: Tue, 18 Feb 2025 08:40:42 +0100 Subject: [PATCH 1/2] feat(tx-backend): update EDC management paths to /v3/ --- charts/traceability-foss/Chart.yaml | 2 +- tx-backend/src/main/resources/application.yml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/traceability-foss/Chart.yaml b/charts/traceability-foss/Chart.yaml index 2b6fe93b05..1790c97e37 100644 --- a/charts/traceability-foss/Chart.yaml +++ b/charts/traceability-foss/Chart.yaml @@ -46,7 +46,7 @@ dependencies: condition: item-relationship-service.enabled - name: tractusx-connector repository: https://eclipse-tractusx.github.io/tractusx-edc - version: 0.7.7 + version: 0.9.0-rc2 condition: tractusx-connector.enabled - name: postgresql alias: edc-postgresql diff --git a/tx-backend/src/main/resources/application.yml b/tx-backend/src/main/resources/application.yml index a79ef283ab..b4ea232930 100644 --- a/tx-backend/src/main/resources/application.yml +++ b/tx-backend/src/main/resources/application.yml @@ -82,13 +82,13 @@ irs-edc-client: endpoint: data: ${EDC_DATA_ENDPOINT_URL} asset: /management/v3/assets - contract-definition: /management/v2/contractdefinitions - policy-definition: /management/v2/policydefinitions - catalog: /v2/catalog/request # EDC consumer controlplane catalog path - contract-negotiation: /v2/contractnegotiations # EDC consumer controlplane contract negotiation path - transfer-process: /v2/transferprocesses # EDC consumer controlplane transfer process path + contract-definition: /management/v3/contractdefinitions + policy-definition: /management/v3/policydefinitions + catalog: /v3/catalog/request # EDC consumer controlplane catalog path + contract-negotiation: /v3/contractnegotiations # EDC consumer controlplane contract negotiation path + transfer-process: /v3/transferprocesses # EDC consumer controlplane transfer process path state-suffix: /state # Path of the state suffix for contract negotiation and transfer process - contract-agreements: /v2/contractagreements # EDC consumer controlplane contract agreements path + contract-agreements: /v3/contractagreements # EDC consumer controlplane contract agreements path provider-suffix: /api/v1/dsp # Suffix to add to data requests to the EDC provider controlplane catalog-limit: 1000 # Max number of items to fetch from the EDC provider catalog catalog-page-size: 50 # Number of items to fetch at one page from the EDC provider catalog when using pagination From cf76437eeda6a38c1b4fd4b404d2bf11f959063d Mon Sep 17 00:00:00 2001 From: ds-jhartmann <57985712+ds-jhartmann@users.noreply.github.com> Date: Tue, 18 Feb 2025 11:29:24 +0100 Subject: [PATCH 2/2] feat(tx-backend): update EDC management paths to /v3/ --- tx-backend/collection/tracex.json | 38 +++++++------- ...management_v2_assets__DELETE__SUCCESS.json | 2 +- ...c_management_v2_assets__POST__SUCCESS.json | 2 +- ...nitions__POST__CONFLICT__ObjectExists.json | 2 +- ...v2_contractdefinitions__POST__SUCCESS.json | 2 +- ...ment_v2_policydefinitions_GET_SUCCESS.json | 2 +- ...v2_policydefinitions__DELETE__SUCCESS.json | 2 +- ...nitions__POST__CONFLICT__ObjectExists.json | 2 +- ...t_v2_policydefinitions__POST__SUCCESS.json | 2 +- .../common/support/EdcSupport.java | 52 +++++++++---------- 10 files changed, 53 insertions(+), 53 deletions(-) diff --git a/tx-backend/collection/tracex.json b/tx-backend/collection/tracex.json index b7db7216c0..4345ba04d8 100644 --- a/tx-backend/collection/tracex.json +++ b/tx-backend/collection/tracex.json @@ -2787,7 +2787,7 @@ "parentId" : "fld_7c71498799ca4fbfb6a6b5c11fce20e7", "modified" : 1715859902452, "created" : 1715077835400, - "url" : "{{ _.edc_provider_own }}/management/v2/policydefinitions/request", + "url" : "{{ _.edc_provider_own }}/management/v3/policydefinitions/request", "name" : "GetPolicyDefinitions", "description" : "", "method" : "POST", @@ -2833,7 +2833,7 @@ "parentId" : "fld_7c71498799ca4fbfb6a6b5c11fce20e7", "modified" : 1721663452956, "created" : 1715717035169, - "url" : "{{ _.edc_provider_own }}/management/v2/policydefinitions/testandor", + "url" : "{{ _.edc_provider_own }}/management/v3/policydefinitions/testandor", "name" : "GetPolicyDefinitionsById", "description" : "", "method" : "GET", @@ -2880,7 +2880,7 @@ "parentId" : "fld_7c71498799ca4fbfb6a6b5c11fce20e7", "modified" : 1715859913363, "created" : 1688117338685, - "url" : "{{ _.edc_provider_own }}/management/v2/contractdefinitions/request", + "url" : "{{ _.edc_provider_own }}/management/v3/contractdefinitions/request", "name" : "GetContractDefinitions", "description" : "", "method" : "POST", @@ -2972,7 +2972,7 @@ "parentId" : "fld_7c71498799ca4fbfb6a6b5c11fce20e7", "modified" : 1715859942287, "created" : 1688111070053, - "url" : "{{ _.edc_consumer_own }}/management/v2/contractdefinitions", + "url" : "{{ _.edc_consumer_own }}/management/v3/contractdefinitions", "name" : "CreateContractDefinition_Notification", "description" : "", "method" : "POST", @@ -3018,7 +3018,7 @@ "parentId" : "fld_7c71498799ca4fbfb6a6b5c11fce20e7", "modified" : 1715859947805, "created" : 1688584566632, - "url" : "{{ _.edc_provider_own }}/management/v2/contractdefinitions/CONTRACT_DEFINITION_NO_POLICY", + "url" : "{{ _.edc_provider_own }}/management/v3/contractdefinitions/CONTRACT_DEFINITION_NO_POLICY", "name" : "DeleteContractDefinition", "description" : "", "method" : "DELETE", @@ -3064,7 +3064,7 @@ "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2", "modified" : 1715860385314, "created" : 1688482638565, - "url" : "{{ _.edc_consumer_own }}/management/v2/transferprocesses/aaf0f231-a111-4b59-8829-7ec7218c84e3", + "url" : "{{ _.edc_consumer_own }}/management/v3/transferprocesses/aaf0f231-a111-4b59-8829-7ec7218c84e3", "name" : "TransferProcessesGetById", "description" : "", "method" : "GET", @@ -3122,7 +3122,7 @@ "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2", "modified" : 1715860383886, "created" : 1688482543409, - "url" : "{{ _.edc_consumer_own }}/management/v2/transferprocesses/", + "url" : "{{ _.edc_consumer_own }}/management/v3/transferprocesses/", "name" : "TransferProcesses", "description" : "", "method" : "POST", @@ -3168,7 +3168,7 @@ "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2", "modified" : 1715860382234, "created" : 1688539872765, - "url" : "{{ _.edc_consumer_own }}/management/v2/contractnegotiations/61ebead5-8ad5-475b-a96a-72ab450e612c", + "url" : "{{ _.edc_consumer_own }}/management/v3/contractnegotiations/61ebead5-8ad5-475b-a96a-72ab450e612c", "name" : "NegotiationState", "description" : "", "method" : "GET", @@ -3214,7 +3214,7 @@ "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2", "modified" : 1715860380790, "created" : 1688547509998, - "url" : "{{ _.edc_consumer_own }}/management/v2/contractnegotiations", + "url" : "{{ _.edc_consumer_own }}/management/v3/contractnegotiations", "name" : "InitiateNegotiation", "description" : "", "method" : "POST", @@ -3260,7 +3260,7 @@ "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2", "modified" : 1721976407101, "created" : 1694772093336, - "url" : "{{ _.edc_consumer_own }}/management/v2/catalog/request", + "url" : "{{ _.edc_consumer_own }}/management/v3/catalog/request", "name" : "GetCatalog_Provider_Notifications", "description" : "", "method" : "POST", @@ -3305,7 +3305,7 @@ "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2", "modified" : 1722838408748, "created" : 1721663626744, - "url" : "{{ _.edc_consumer_own }}/management/v2/catalog/request", + "url" : "{{ _.edc_consumer_own }}/management/v3/catalog/request", "name" : "GetCatalog_Provider_Notifications_test", "description" : "", "method" : "POST", @@ -3351,7 +3351,7 @@ "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2", "modified" : 1722339226384, "created" : 1721291787921, - "url" : "{{ _.edc_consumer_own }}/management/v2/catalog/request", + "url" : "{{ _.edc_consumer_own }}/management/v3/catalog/request", "name" : "GetCatalog_Provider_Notifications2", "description" : "", "method" : "POST", @@ -3396,7 +3396,7 @@ "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2", "modified" : 1715860377621, "created" : 1696919016531, - "url" : "{{ _.edc_consumer_own }}/management/v2/catalog/request", + "url" : "{{ _.edc_consumer_own }}/management/v3/catalog/request", "name" : "GetCatalog_Provider_RegistryAsset", "description" : "", "method" : "POST", @@ -3441,7 +3441,7 @@ "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2", "modified" : 1719300613804, "created" : 1719300602911, - "url" : "{{ _.edc_consumer_own }}/management/v2/catalog/request", + "url" : "{{ _.edc_consumer_own }}/management/v3/catalog/request", "name" : "GetCatalog_Provider_RegistryAssetById", "description" : "", "method" : "POST", @@ -3486,7 +3486,7 @@ "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2", "modified" : 1722838418077, "created" : 1716910154202, - "url" : "{{ _.edc_consumer_own }}/management/v2/catalog/request", + "url" : "{{ _.edc_consumer_own }}/management/v3/catalog/request", "name" : "GetCatalog_Provider_RegistryAsset_GEC", "description" : "", "method" : "POST", @@ -3531,7 +3531,7 @@ "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2", "modified" : 1715860376148, "created" : 1715768647024, - "url" : "{{ _.edc_consumer_own }}/management/v2/catalog/request", + "url" : "{{ _.edc_consumer_own }}/management/v3/catalog/request", "name" : "GetCatalog_Provider", "description" : "", "method" : "POST", @@ -3576,7 +3576,7 @@ "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2", "modified" : 1715860374537, "created" : 1708933609478, - "url" : "{{ _.edc_consumer_own }}/management/v2/contractagreements/ODA3MmUyNTQtOGNlZi00YzQ2LTljNGYtNGYzNjE2YjQ5NTZl:cmVnaXN0cnktYXNzZXQ=:MDljNDMzY2EtODI5OS00OGE3LWI0MjYtNzZmZjJmODE1ZWE2/negotiation", + "url" : "{{ _.edc_consumer_own }}/management/v3/contractagreements/ODA3MmUyNTQtOGNlZi00YzQ2LTljNGYtNGYzNjE2YjQ5NTZl:cmVnaXN0cnktYXNzZXQ=:MDljNDMzY2EtODI5OS00OGE3LWI0MjYtNzZmZjJmODE1ZWE2/negotiation", "name" : "GetContractAgreementNegotiation", "description" : "", "method" : "GET", @@ -3622,7 +3622,7 @@ "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2", "modified" : 1715860373162, "created" : 1708933018506, - "url" : "{{ _.edc_consumer_own }}/management/v2/contractagreements/request", + "url" : "{{ _.edc_consumer_own }}/management/v3/contractagreements/request", "name" : "GetContractAgreement", "description" : "", "method" : "POST", @@ -3668,7 +3668,7 @@ "parentId" : "fld_667a891d1c05443eaed7f10eb82108b2", "modified" : 1722838427159, "created" : 1688067318173, - "url" : "{{ _.edc_provider_own }}/management/v2/policydefinitions", + "url" : "{{ _.edc_provider_own }}/management/v3/policydefinitions", "name" : "CreatePolicyDefinition_Notification", "description" : "", "method" : "POST", diff --git a/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_assets__DELETE__SUCCESS.json b/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_assets__DELETE__SUCCESS.json index 3b62b2a6c1..9d1079dc91 100644 --- a/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_assets__DELETE__SUCCESS.json +++ b/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_assets__DELETE__SUCCESS.json @@ -2,7 +2,7 @@ "priority": 1, "request": { "method": "DELETE", - "urlPathPattern": "/edc/management/v2/assets/.*" + "urlPathPattern": "/edc/management/v3/assets/.*" }, "response": { "status": 200 diff --git a/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_assets__POST__SUCCESS.json b/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_assets__POST__SUCCESS.json index 3be6081c33..810c46a71b 100644 --- a/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_assets__POST__SUCCESS.json +++ b/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_assets__POST__SUCCESS.json @@ -2,7 +2,7 @@ "priority": 10, "request": { "method": "POST", - "urlPath": "/edc/management/v2/assets" + "urlPath": "/edc/management/v3/assets" }, "response": { "status": 200 diff --git a/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_contractdefinitions__POST__CONFLICT__ObjectExists.json b/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_contractdefinitions__POST__CONFLICT__ObjectExists.json index dbf0b76aa3..94323533ab 100644 --- a/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_contractdefinitions__POST__CONFLICT__ObjectExists.json +++ b/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_contractdefinitions__POST__CONFLICT__ObjectExists.json @@ -2,7 +2,7 @@ "priority": 1, "request": { "method": "POST", - "urlPath": "/edc/management/v2/contractdefinitions", + "urlPath": "/edc/management/v3/contractdefinitions", "bodyPatterns": [ { "matchesJsonPath": "$.[?(@.@id == 'definition-id-already-exists')]" diff --git a/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_contractdefinitions__POST__SUCCESS.json b/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_contractdefinitions__POST__SUCCESS.json index 35d92858ba..6498124ecd 100644 --- a/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_contractdefinitions__POST__SUCCESS.json +++ b/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_contractdefinitions__POST__SUCCESS.json @@ -2,7 +2,7 @@ "priority": 10, "request": { "method": "POST", - "urlPath": "/edc/management/v2/contractdefinitions"}, + "urlPath": "/edc/management/v3/contractdefinitions"}, "response": { "status": 200, "jsonBody": { diff --git a/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_policydefinitions_GET_SUCCESS.json b/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_policydefinitions_GET_SUCCESS.json index 5584c3bcb5..dc7628b3d4 100644 --- a/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_policydefinitions_GET_SUCCESS.json +++ b/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_policydefinitions_GET_SUCCESS.json @@ -1,7 +1,7 @@ { "request": { "method": "GET", - "urlPath": "/edc/management/v2/policydefinitions/default-policy" + "urlPath": "/edc/management/v3/policydefinitions/default-policy" }, "response": { "status": 200, diff --git a/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_policydefinitions__DELETE__SUCCESS.json b/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_policydefinitions__DELETE__SUCCESS.json index 8d8f7f568d..41bf871f57 100644 --- a/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_policydefinitions__DELETE__SUCCESS.json +++ b/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_policydefinitions__DELETE__SUCCESS.json @@ -2,7 +2,7 @@ "priority": 1, "request": { "method": "DELETE", - "urlPathPattern": "/edc/management/v2/policydefinitions/.*" + "urlPathPattern": "/edc/management/v3/policydefinitions/.*" }, "response": { "status": 200 diff --git a/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_policydefinitions__POST__CONFLICT__ObjectExists.json b/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_policydefinitions__POST__CONFLICT__ObjectExists.json index 9fdfc2a0f6..49843eba62 100644 --- a/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_policydefinitions__POST__CONFLICT__ObjectExists.json +++ b/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_policydefinitions__POST__CONFLICT__ObjectExists.json @@ -2,7 +2,7 @@ "priority": 1, "request": { "method": "POST", - "urlPath": "/edc/management/v2/policydefinitions", + "urlPath": "/edc/management/v3/policydefinitions", "bodyPatterns": [ { "matchesJsonPath": "$.[?(@.@id == 'definition-id-already-exists')]" diff --git a/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_policydefinitions__POST__SUCCESS.json b/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_policydefinitions__POST__SUCCESS.json index 6e44f9fdd8..8e254a45e8 100644 --- a/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_policydefinitions__POST__SUCCESS.json +++ b/tx-backend/docker/wiremock/mappings/edc/edc_management_v2_policydefinitions__POST__SUCCESS.json @@ -2,7 +2,7 @@ "priority": 10, "request": { "method": "POST", - "urlPath": "/edc/management/v2/policydefinitions" + "urlPath": "/edc/management/v3/policydefinitions" }, "response": { "status": 200, diff --git a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/EdcSupport.java b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/EdcSupport.java index ec0200e2fd..583c65619a 100644 --- a/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/EdcSupport.java +++ b/tx-backend/src/test/java/org/eclipse/tractusx/traceability/integration/common/support/EdcSupport.java @@ -98,7 +98,7 @@ public void edcWillCallCallbackController() { } public void edcWillCreateNotificationAsset() { whenHttp(restitoProvider.stubServer()).match( - post("/management/v2/assets"), + post("/management/v3/assets"), EDC_API_KEY_HEADER ).then( status(HttpStatus.OK_200) @@ -136,7 +136,7 @@ public void edcWillRemoveNotificationAsset() { public void edcWillRemoveContractDefinition() { whenHttp(restitoProvider.stubServer()).match( method(DELETE), - startsWithUri("/management/v2/contractdefinitions"), + startsWithUri("/management/v3/contractdefinitions"), EDC_API_KEY_HEADER ).then( ok() @@ -145,7 +145,7 @@ public void edcWillRemoveContractDefinition() { public void edcWillReturnCatalog() { whenHttp(restitoProvider.stubServer()).match( - post("/management/v2/catalog/request"), + post("/management/v3/catalog/request"), EDC_API_KEY_HEADER ).then( status(HttpStatus.OK_200), @@ -155,7 +155,7 @@ public void edcWillReturnCatalog() { public void edcWillReturnCatalogForBpdmGoldenRecord() { whenHttp(restitoProvider.stubServer()).match( - post("/management/v2/catalog/request"), + post("/management/v3/catalog/request"), EDC_API_KEY_HEADER ).then( status(HttpStatus.OK_200), @@ -165,7 +165,7 @@ public void edcWillReturnCatalogForBpdmGoldenRecord() { public void edcWillReturnOnlyOneContractAgreement() { whenHttp(restitoProvider.stubServer()).match( - post("/management/v2/contractagreements/request"), + post("/management/v3/contractagreements/request"), EDC_API_KEY_HEADER ).then( status(HttpStatus.OK_200), @@ -175,7 +175,7 @@ public void edcWillReturnOnlyOneContractAgreement() { public void edcWillReturnContractAgreementNegotiation() { whenHttp(restitoProvider.stubServer()).match( - matchesUri(Pattern.compile("/management/v2/contractagreements/[\\w]+/negotiation")), + matchesUri(Pattern.compile("/management/v3/contractagreements/[\\w]+/negotiation")), EDC_API_KEY_HEADER ).then( status(HttpStatus.OK_200), @@ -185,7 +185,7 @@ public void edcWillReturnContractAgreementNegotiation() { public void edcWillReturnContractDefinitions() { whenHttp(restitoProvider.stubServer()).match( - post("/management/v2/contractdefinitions/request"), + post("/management/v3/contractdefinitions/request"), EDC_API_KEY_HEADER ).then( status(HttpStatus.OK_200), @@ -195,7 +195,7 @@ public void edcWillReturnContractDefinitions() { public void edcWillFailToCreateNotificationAsset() { whenHttp(restitoProvider.stubServer()).match( - post("/management/v2/assets"), + post("/management/v3/assets"), EDC_API_KEY_HEADER ).then( status(HttpStatus.INTERNAL_SERVER_ERROR_500) @@ -204,7 +204,7 @@ public void edcWillFailToCreateNotificationAsset() { public void edcWillCreatePolicyDefinition() { whenHttp(restitoProvider.stubServer()).match( - post("/management/v2/policydefinitions"), + post("/management/v3/policydefinitions"), EDC_API_KEY_HEADER ).then( status(HttpStatus.OK_200) @@ -213,7 +213,7 @@ public void edcWillCreatePolicyDefinition() { public void edcWillReturnConflictWhenCreatePolicyDefinition() { whenHttp(restitoProvider.stubServer()).match( - post("/management/v2/policydefinitions"), + post("/management/v3/policydefinitions"), EDC_API_KEY_HEADER ).then( status(HttpStatus.CONFLICT_409) @@ -224,7 +224,7 @@ public void edcWillRemovePolicyDefinition() { whenHttp(restitoProvider.stubServer()).match( composite( method(DELETE), - startsWithUri("/management/v2/policydefinitions/") + startsWithUri("/management/v3/policydefinitions/") ), EDC_API_KEY_HEADER ).then( @@ -234,7 +234,7 @@ public void edcWillRemovePolicyDefinition() { public void edcWillFailToCreatePolicyDefinition() { whenHttp(restitoProvider.stubServer()).match( - post("/management/v2/policydefinitions"), + post("/management/v3/policydefinitions"), EDC_API_KEY_HEADER ).then( status(HttpStatus.SERVICE_UNAVAILABLE_503) @@ -243,7 +243,7 @@ public void edcWillFailToCreatePolicyDefinition() { public void edcWillCreateContractDefinition() { whenHttp(restitoProvider.stubServer()).match( - post("/management/v2/contractdefinitions"), + post("/management/v3/contractdefinitions"), EDC_API_KEY_HEADER ).then( status(HttpStatus.OK_200) @@ -252,7 +252,7 @@ public void edcWillCreateContractDefinition() { public void edcWillFailToCreateContractDefinition() { whenHttp(restitoProvider.stubServer()).match( - post("/management/v2/contractdefinitions"), + post("/management/v3/contractdefinitions"), EDC_API_KEY_HEADER ).then( status(HttpStatus.INTERNAL_SERVER_ERROR_500) @@ -261,7 +261,7 @@ public void edcWillFailToCreateContractDefinition() { public void edcWillCreateContractNegotiation() { whenHttp(restitoProvider.stubServer()).match( - post("/management/v2/contractnegotiations"), + post("/management/v3/contractnegotiations"), EDC_API_KEY_HEADER ).then( status(HttpStatus.OK_200), @@ -271,7 +271,7 @@ public void edcWillCreateContractNegotiation() { public void edcWillReturnContractNegotiationOnlyState() { whenHttp(restitoProvider.stubServer()).match( - matchesUri(Pattern.compile("/management/v2/contractnegotiations/" + uuidRegex + "/state")), + matchesUri(Pattern.compile("/management/v3/contractnegotiations/" + uuidRegex + "/state")), EDC_API_KEY_HEADER ).then( status(HttpStatus.OK_200), @@ -281,7 +281,7 @@ public void edcWillReturnContractNegotiationOnlyState() { public void edcWillReturnContractNegotiationState() { whenHttp(restitoProvider.stubServer()).match( - matchesUri(Pattern.compile("/management/v2/contractnegotiations/" + uuidRegex)), + matchesUri(Pattern.compile("/management/v3/contractnegotiations/" + uuidRegex)), EDC_API_KEY_HEADER ).then( status(HttpStatus.OK_200), @@ -291,7 +291,7 @@ public void edcWillReturnContractNegotiationState() { public void edcWillCreateTransferprocesses() { whenHttp(restitoProvider.stubServer()).match( - post("/management/v2/transferprocesses"), + post("/management/v3/transferprocesses"), EDC_API_KEY_HEADER ).then( status(HttpStatus.OK_200), @@ -301,7 +301,7 @@ public void edcWillCreateTransferprocesses() { public void edcWillReturnTransferprocessesOnlyState() { whenHttp(restitoProvider.stubServer()).match( - matchesUri(Pattern.compile("/management/v2/transferprocesses/" + uuidRegex + "/state")), + matchesUri(Pattern.compile("/management/v3/transferprocesses/" + uuidRegex + "/state")), EDC_API_KEY_HEADER ).then( status(HttpStatus.OK_200), @@ -311,7 +311,7 @@ public void edcWillReturnTransferprocessesOnlyState() { public void edcWillReturnTransferprocessesState() { whenHttp(restitoProvider.stubServer()).match( - matchesUri(Pattern.compile("/management/v2/transferprocesses/" + uuidRegex)), + matchesUri(Pattern.compile("/management/v3/transferprocesses/" + uuidRegex)), EDC_API_KEY_HEADER ).then( @@ -340,40 +340,40 @@ public void edcWillSendRequestAndReturnBpdmResponse() { public void verifyCreateNotificationAssetEndpointCalledTimes(int times) { verifyHttp(restitoProvider.stubServer()).times(times, - post("/management/v2/assets") + post("/management/v3/assets") ); } public void verifyDeleteNotificationAssetEndpointCalledTimes(int times) { verifyHttp(restitoProvider.stubServer()).times(times, method(DELETE), - startsWithUri("/management/v2/assets") + startsWithUri("/management/v3/assets") ); } public void verifyCreatePolicyDefinitionEndpointCalledTimes(int times) { verifyHttp(restitoProvider.stubServer()).times(times, - post("/management/v2/policydefinitions") + post("/management/v3/policydefinitions") ); } public void verifyDeletePolicyDefinitionEndpointCalledTimes(int times) { verifyHttp(restitoProvider.stubServer()).times(times, method(DELETE), - startsWithUri("/management/v2/policydefinitions") + startsWithUri("/management/v3/policydefinitions") ); } public void verifyCreateContractDefinitionEndpointCalledTimes(int times) { verifyHttp(restitoProvider.stubServer()).times(times, - post("/management/v2/contractdefinitions") + post("/management/v3/contractdefinitions") ); } public void verifyDeleteContractDefinitionEndpointCalledTimes(int times) { verifyHttp(restitoProvider.stubServer()).times(times, method(DELETE), - startsWithUri("/management/v2/contractdefinitions") + startsWithUri("/management/v3/contractdefinitions") ); }