From 6ef51ac1d95c953642e4957fd65975f41bf5d69f Mon Sep 17 00:00:00 2001 From: Julia Pampus <72392527+juliapampus@users.noreply.github.com> Date: Wed, 17 May 2023 10:32:49 +0200 Subject: [PATCH] refactor: move constants to :dsp-core (#3027) * refactor: move constants to :dsp-core * refactor(dsp): remove error constant from controllers * fix(dsp): change wrong properties and imports in catalog modules * chore(dsp-catalog-api): add missing test dependency * chore(dsp): rename :dsp-core to :dsp-spi --- .../dsp-catalog-api/build.gradle.kts | 5 +- .../controller/DspCatalogApiController.java | 10 +-- ...spCatalogApiControllerIntegrationTest.java | 12 ++- .../DspCatalogApiControllerTest.java | 16 ++-- .../dsp-catalog-transform/build.gradle.kts | 1 + ...tFromCatalogRequestMessageTransformer.java | 8 +- ...ectToCatalogRequestMessageTransformer.java | 4 +- ...mCatalogRequestMessageTransformerTest.java | 8 +- ...oCatalogRequestMessageTransformerTest.java | 8 +- .../dsp-negotiation-api/build.gradle.kts | 7 +- .../DspNegotiationApiController.java | 60 ++++++++------- .../DspNegotiationApiControllerTest.java | 74 +++++++++---------- ...ontractRequestMessageHttpDelegateTest.java | 14 ++-- .../build.gradle.kts | 1 + .../DspNegotiationPropertyAndTypeNames.java | 65 ---------------- ...omContractAgreementMessageTransformer.java | 24 +++--- ...reementVerificationMessageTransformer.java | 8 +- ...actNegotiationEventMessageTransformer.java | 20 ++--- ...otiationTerminationMessageTransformer.java | 16 ++-- ...ectFromContractNegotiationTransformer.java | 42 +++++------ ...FromContractRequestMessageTransformer.java | 26 +++---- ...ToContractAgreementMessageTransformer.java | 50 ++++++------- ...reementVerificationMessageTransformer.java | 10 +-- ...actNegotiationEventMessageTransformer.java | 30 ++++---- ...otiationTerminationMessageTransformer.java | 18 ++--- ...ctToContractRequestMessageTransformer.java | 36 ++++----- ...ntractAgreementMessageTransformerTest.java | 24 +++--- ...entVerificationMessageTransformerTest.java | 8 +- ...egotiationEventMessageTransformerTest.java | 14 ++-- ...tionTerminationMessageTransformerTest.java | 20 ++--- ...romContractNegotiationTransformerTest.java | 54 +++++++------- ...ContractRequestMessageTransformerTest.java | 34 ++++----- ...ntractAgreementMessageTransformerTest.java | 58 +++++++-------- ...entVerificationMessageTransformerTest.java | 12 +-- ...egotiationEventMessageTransformerTest.java | 34 ++++----- ...tionTerminationMessageTransformerTest.java | 20 ++--- ...ContractRequestMessageTransformerTest.java | 54 +++++++------- .../{dsp-core => dsp-spi}/build.gradle.kts | 0 .../eclipse/edc/protocol/dsp/DspError.java | 4 +- .../edc/protocol/dsp/DspErrorDetails.java | 0 .../type}/DspCatalogPropertyAndTypeNames.java | 10 ++- .../DspNegotiationPropertyAndTypeNames.java | 61 +++++++++++++++ .../dsp/type/DspPropertyAndTypeNames.java | 4 +- ...spTransferProcessPropertyAndTypeNames.java | 34 +++++++++ .../dsp-transfer-process-api/build.gradle.kts | 6 +- .../DspTransferProcessApiController.java | 30 ++++---- .../DspTransferProcessApiControllerTest.java | 42 +++++------ .../build.gradle.kts | 1 + ...spTransferProcessPropertyAndTypeNames.java | 49 ------------ ...mTransferCompletionMessageTransformer.java | 8 +- ...nObjectFromTransferProcessTransformer.java | 12 +-- ...FromTransferRequestMessageTransformer.java | 20 ++--- ...ctFromTransferStartMessageTransformer.java | 12 +-- ...TransferTerminationMessageTransformer.java | 16 ++-- ...oTransferCompletionMessageTransformer.java | 10 +-- ...ctToTransferRequestMessageTransformer.java | 16 ++-- ...jectToTransferStartMessageTransformer.java | 14 ++-- ...TransferTerminationMessageTransformer.java | 20 ++--- ...nsferCompletionMessageTransformerTest.java | 8 +- ...ectFromTransferProcessTransformerTest.java | 12 +-- ...TransferRequestMessageTransformerTest.java | 30 ++++---- ...omTransferStartMessageTransformerTest.java | 12 +-- ...sferTerminationMessageTransformerTest.java | 16 ++-- ...nsferCompletionMessageTransformerTest.java | 8 +- ...TransferRequestMessageTransformerTest.java | 30 ++++---- ...ToTransferStartMessageTransformerTest.java | 22 +++--- ...sferTerminationMessageTransformerTest.java | 16 ++-- settings.gradle.kts | 2 +- 68 files changed, 700 insertions(+), 730 deletions(-) delete mode 100644 data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/DspNegotiationPropertyAndTypeNames.java rename data-protocols/dsp/{dsp-core => dsp-spi}/build.gradle.kts (100%) rename data-protocols/dsp/{dsp-core => dsp-spi}/src/main/java/org/eclipse/edc/protocol/dsp/DspError.java (96%) rename data-protocols/dsp/{dsp-core => dsp-spi}/src/main/java/org/eclipse/edc/protocol/dsp/DspErrorDetails.java (100%) rename data-protocols/dsp/{dsp-catalog/dsp-catalog-transform/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform => dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/type}/DspCatalogPropertyAndTypeNames.java (63%) create mode 100644 data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/type/DspNegotiationPropertyAndTypeNames.java rename data-protocols/dsp/{dsp-core => dsp-spi}/src/main/java/org/eclipse/edc/protocol/dsp/type/DspPropertyAndTypeNames.java (79%) create mode 100644 data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/type/DspTransferProcessPropertyAndTypeNames.java delete mode 100644 data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/DspTransferProcessPropertyAndTypeNames.java diff --git a/data-protocols/dsp/dsp-catalog/dsp-catalog-api/build.gradle.kts b/data-protocols/dsp/dsp-catalog/dsp-catalog-api/build.gradle.kts index 49eb13b4dd6..594adb2596e 100644 --- a/data-protocols/dsp/dsp-catalog/dsp-catalog-api/build.gradle.kts +++ b/data-protocols/dsp/dsp-catalog/dsp-catalog-api/build.gradle.kts @@ -18,8 +18,8 @@ plugins { dependencies { api(project(":data-protocols:dsp:dsp-api-configuration")) - api(project(":data-protocols:dsp:dsp-catalog:dsp-catalog-transform")) - api(project(":data-protocols:dsp:dsp-core")) + api(project(":data-protocols:dsp:dsp-spi")) + api(project(":data-protocols:dsp:dsp-http-spi")) api(project(":data-protocols:dsp:dsp-transform")) api(project(":spi:common:core-spi")) @@ -30,5 +30,6 @@ dependencies { implementation(libs.jakarta.rsApi) testImplementation(project(":core:common:junit")) + testImplementation(project(":data-protocols:dsp:dsp-catalog:dsp-catalog-transform")) testImplementation(libs.restAssured) } diff --git a/data-protocols/dsp/dsp-catalog/dsp-catalog-api/src/main/java/org/eclipse/edc/protocol/dsp/catalog/api/controller/DspCatalogApiController.java b/data-protocols/dsp/dsp-catalog/dsp-catalog-api/src/main/java/org/eclipse/edc/protocol/dsp/catalog/api/controller/DspCatalogApiController.java index 37c17acd341..042fc476596 100644 --- a/data-protocols/dsp/dsp-catalog/dsp-catalog-api/src/main/java/org/eclipse/edc/protocol/dsp/catalog/api/controller/DspCatalogApiController.java +++ b/data-protocols/dsp/dsp-catalog/dsp-catalog-api/src/main/java/org/eclipse/edc/protocol/dsp/catalog/api/controller/DspCatalogApiController.java @@ -25,7 +25,6 @@ import org.eclipse.edc.catalog.spi.CatalogRequestMessage; import org.eclipse.edc.connector.spi.catalog.CatalogProtocolService; import org.eclipse.edc.jsonld.spi.JsonLd; -import org.eclipse.edc.jsonld.spi.Namespaces; import org.eclipse.edc.protocol.dsp.DspError; import org.eclipse.edc.spi.iam.IdentityService; import org.eclipse.edc.spi.iam.TokenRepresentation; @@ -41,8 +40,9 @@ import static org.eclipse.edc.protocol.dsp.DspErrorDetails.UNAUTHORIZED; import static org.eclipse.edc.protocol.dsp.catalog.api.CatalogApiPaths.BASE_PATH; import static org.eclipse.edc.protocol.dsp.catalog.api.CatalogApiPaths.CATALOG_REQUEST; -import static org.eclipse.edc.protocol.dsp.catalog.transform.DspCatalogPropertyAndTypeNames.DSPACE_CATALOG_REQUEST_TYPE; import static org.eclipse.edc.protocol.dsp.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP; +import static org.eclipse.edc.protocol.dsp.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_ERROR; +import static org.eclipse.edc.protocol.dsp.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_REQUEST_MESSAGE; /** * Provides the HTTP endpoint for receiving catalog requests. @@ -52,8 +52,6 @@ @Path(BASE_PATH) public class DspCatalogApiController { - private static final String DSPACE_CATALOG_ERROR = Namespaces.DSPACE_SCHEMA + "CatalogError"; // TODO move to :dsp-core https://github.com/eclipse-edc/Connector/issues/3014 - private final Monitor monitor; private final IdentityService identityService; private final TypeTransformerRegistry transformerRegistry; @@ -94,7 +92,7 @@ public Response getCatalog(JsonObject jsonObject, @HeaderParam(AUTHORIZATION) St } var expandedJson = expanded.getContent(); - if (!isOfExpectedType(expandedJson, DSPACE_CATALOG_REQUEST_TYPE)) { + if (!isOfExpectedType(expandedJson, DSPACE_TYPE_CATALOG_REQUEST_MESSAGE)) { monitor.debug(String.format("%s, %s", BAD_REQUEST, verificationResult.getFailureMessages())); return errorResponse(Response.Status.BAD_REQUEST, BAD_REQUEST); } @@ -138,7 +136,7 @@ public Response getCatalog(JsonObject jsonObject, @HeaderParam(AUTHORIZATION) St private Response errorResponse(Response.Status code, String message) { return Response.status(code).type(MediaType.APPLICATION_JSON) .entity(DspError.Builder.newInstance() - .type(DSPACE_CATALOG_ERROR) + .type(DSPACE_TYPE_CATALOG_ERROR) .code(Integer.toString(code.getStatusCode())) .messages(List.of(message)) .build().toJson()) diff --git a/data-protocols/dsp/dsp-catalog/dsp-catalog-api/src/test/java/org/eclipse/edc/protocol/dsp/catalog/api/controller/DspCatalogApiControllerIntegrationTest.java b/data-protocols/dsp/dsp-catalog/dsp-catalog-api/src/test/java/org/eclipse/edc/protocol/dsp/catalog/api/controller/DspCatalogApiControllerIntegrationTest.java index f7e8ca23942..4cb30e46713 100644 --- a/data-protocols/dsp/dsp-catalog/dsp-catalog-api/src/test/java/org/eclipse/edc/protocol/dsp/catalog/api/controller/DspCatalogApiControllerIntegrationTest.java +++ b/data-protocols/dsp/dsp-catalog/dsp-catalog-api/src/test/java/org/eclipse/edc/protocol/dsp/catalog/api/controller/DspCatalogApiControllerIntegrationTest.java @@ -23,7 +23,6 @@ import org.eclipse.edc.catalog.spi.DataServiceRegistry; import org.eclipse.edc.connector.spi.catalog.CatalogProtocolService; import org.eclipse.edc.jsonld.spi.JsonLdKeywords; -import org.eclipse.edc.jsonld.spi.Namespaces; import org.eclipse.edc.junit.annotations.ApiTest; import org.eclipse.edc.junit.extensions.EdcExtension; import org.eclipse.edc.service.spi.result.ServiceResult; @@ -47,7 +46,8 @@ import static org.eclipse.edc.junit.testfixtures.TestUtils.getFreePort; import static org.eclipse.edc.protocol.dsp.catalog.api.CatalogApiPaths.BASE_PATH; import static org.eclipse.edc.protocol.dsp.catalog.api.CatalogApiPaths.CATALOG_REQUEST; -import static org.eclipse.edc.protocol.dsp.catalog.transform.DspCatalogPropertyAndTypeNames.DSPACE_CATALOG_REQUEST_TYPE; +import static org.eclipse.edc.protocol.dsp.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_ERROR; +import static org.eclipse.edc.protocol.dsp.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_REQUEST_MESSAGE; import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE; import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON; import static org.hamcrest.CoreMatchers.is; @@ -60,8 +60,6 @@ @ExtendWith(EdcExtension.class) class DspCatalogApiControllerIntegrationTest { - private static final String DSPACE_CATALOG_ERROR = Namespaces.DSPACE_SCHEMA + "CatalogError"; - private final int dspApiPort = getFreePort(); private final String dspApiPath = "/api/v1/dsp"; private final String callbackAddress = "http://callback"; @@ -90,7 +88,7 @@ void setUp(EdcExtension extension) { .add(CONTEXT, Json.createObjectBuilder() .add(DSPACE_PREFIX, DSPACE_SCHEMA) .build()) - .add(TYPE, DSPACE_CATALOG_REQUEST_TYPE) + .add(TYPE, DSPACE_TYPE_CATALOG_REQUEST_MESSAGE) .build(); } @@ -121,7 +119,7 @@ void catalogRequest_authenticationFailed_returnUnauthorized() { .statusCode(401) .extract().as(Map.class); - assertThat(result.get(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_CATALOG_ERROR); + assertThat(result.get(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_TYPE_CATALOG_ERROR); assertThat(result.get(DSPACE_PROPERTY_CODE)).isEqualTo("401"); assertThat(result.get(DSPACE_PROPERTY_REASON)).isNotNull(); } @@ -146,7 +144,7 @@ void catalogRequest_requestTransformationFailed_returnBadRequest() { .statusCode(400) .extract().as(Map.class); - assertThat(result.get(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_CATALOG_ERROR); + assertThat(result.get(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_TYPE_CATALOG_ERROR); assertThat(result.get(DSPACE_PROPERTY_CODE)).isEqualTo("400"); assertThat(result.get(DSPACE_PROPERTY_REASON)).isNotNull(); } diff --git a/data-protocols/dsp/dsp-catalog/dsp-catalog-api/src/test/java/org/eclipse/edc/protocol/dsp/catalog/api/controller/DspCatalogApiControllerTest.java b/data-protocols/dsp/dsp-catalog/dsp-catalog-api/src/test/java/org/eclipse/edc/protocol/dsp/catalog/api/controller/DspCatalogApiControllerTest.java index 8fbeda7ce09..ccf8b6a3e5d 100644 --- a/data-protocols/dsp/dsp-catalog/dsp-catalog-api/src/test/java/org/eclipse/edc/protocol/dsp/catalog/api/controller/DspCatalogApiControllerTest.java +++ b/data-protocols/dsp/dsp-catalog/dsp-catalog-api/src/test/java/org/eclipse/edc/protocol/dsp/catalog/api/controller/DspCatalogApiControllerTest.java @@ -22,7 +22,6 @@ import org.eclipse.edc.jsonld.TitaniumJsonLd; import org.eclipse.edc.jsonld.spi.JsonLd; import org.eclipse.edc.jsonld.spi.JsonLdKeywords; -import org.eclipse.edc.jsonld.spi.Namespaces; import org.eclipse.edc.service.spi.result.ServiceResult; import org.eclipse.edc.spi.iam.ClaimToken; import org.eclipse.edc.spi.iam.IdentityService; @@ -43,8 +42,9 @@ import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_SCHEMA; import static org.eclipse.edc.jsonld.spi.Namespaces.ODRL_PREFIX; import static org.eclipse.edc.jsonld.spi.Namespaces.ODRL_SCHEMA; -import static org.eclipse.edc.protocol.dsp.catalog.transform.DspCatalogPropertyAndTypeNames.DSPACE_CATALOG_REQUEST_TYPE; import static org.eclipse.edc.protocol.dsp.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP; +import static org.eclipse.edc.protocol.dsp.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_ERROR; +import static org.eclipse.edc.protocol.dsp.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_REQUEST_MESSAGE; import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE; import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON; import static org.eclipse.edc.service.spi.result.ServiceResult.badRequest; @@ -57,8 +57,6 @@ class DspCatalogApiControllerTest { - private static final String DSPACE_CATALOG_ERROR = Namespaces.DSPACE_SCHEMA + "CatalogError"; - private final Monitor monitor = mock(Monitor.class); private final IdentityService identityService = mock(IdentityService.class); private final TypeTransformerRegistry transformerRegistry = mock(TypeTransformerRegistry.class); @@ -83,7 +81,7 @@ void setUp() { controller = new DspCatalogApiController(monitor, identityService, transformerRegistry, callbackAddress, service, jsonLdService); request = Json.createObjectBuilder() - .add(TYPE, DSPACE_CATALOG_REQUEST_TYPE) + .add(TYPE, DSPACE_TYPE_CATALOG_REQUEST_MESSAGE) .build(); requestMessage = CatalogRequestMessage.Builder.newInstance().protocol("protocol").build(); } @@ -124,7 +122,7 @@ void getCatalog_invalidTypeInRequest_throwException() { var errorObject = (JsonObject) response.getEntity(); - assertThat(errorObject.getJsonString(TYPE).getString()).isEqualTo(DSPACE_CATALOG_ERROR); + assertThat(errorObject.getJsonString(TYPE).getString()).isEqualTo(DSPACE_TYPE_CATALOG_ERROR); assertThat(errorObject.getJsonString(DSPACE_PROPERTY_CODE).getString()).isEqualTo("400"); assertThat(errorObject.get(DSPACE_PROPERTY_REASON)).isNotNull(); @@ -143,7 +141,7 @@ void getCatalog_transformingRequestFails_throwException() { var errorObject = (JsonObject) response.getEntity(); - assertThat(errorObject.getJsonString(TYPE).getString()).isEqualTo(DSPACE_CATALOG_ERROR); + assertThat(errorObject.getJsonString(TYPE).getString()).isEqualTo(DSPACE_TYPE_CATALOG_ERROR); assertThat(errorObject.getJsonString(DSPACE_PROPERTY_CODE).getString()).isEqualTo("400"); assertThat(errorObject.get(DSPACE_PROPERTY_REASON)).isNotNull(); } @@ -159,7 +157,7 @@ void getCatalog_authenticationFails_throwException() { var errorObject = (JsonObject) response.getEntity(); - assertThat(errorObject.getJsonString(TYPE).getString()).isEqualTo(DSPACE_CATALOG_ERROR); + assertThat(errorObject.getJsonString(TYPE).getString()).isEqualTo(DSPACE_TYPE_CATALOG_ERROR); assertThat(errorObject.getJsonString(DSPACE_PROPERTY_CODE).getString()).isEqualTo("401"); assertThat(errorObject.get(DSPACE_PROPERTY_REASON)).isNotNull(); } @@ -178,7 +176,7 @@ void getCatalog_shouldThrowException_whenServiceCallFails() { var errorObject = (JsonObject) response.getEntity(); - assertThat(errorObject.getJsonString(TYPE).getString()).isEqualTo(DSPACE_CATALOG_ERROR); + assertThat(errorObject.getJsonString(TYPE).getString()).isEqualTo(DSPACE_TYPE_CATALOG_ERROR); assertThat(errorObject.getJsonString(DSPACE_PROPERTY_CODE).getString()).isNotNull(); assertThat(errorObject.get(DSPACE_PROPERTY_REASON)).isNotNull(); diff --git a/data-protocols/dsp/dsp-catalog/dsp-catalog-transform/build.gradle.kts b/data-protocols/dsp/dsp-catalog/dsp-catalog-transform/build.gradle.kts index 6142f547d0e..6b6f9419ddc 100644 --- a/data-protocols/dsp/dsp-catalog/dsp-catalog-transform/build.gradle.kts +++ b/data-protocols/dsp/dsp-catalog/dsp-catalog-transform/build.gradle.kts @@ -20,5 +20,6 @@ dependencies { api(project(":spi:common:catalog-spi")) api(project(":spi:common:json-ld-spi")) api(project(":extensions:common:json-ld")) + api(project(":data-protocols:dsp:dsp-spi")) api(project(":data-protocols:dsp:dsp-http-spi")) } diff --git a/data-protocols/dsp/dsp-catalog/dsp-catalog-transform/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogRequestMessageTransformer.java b/data-protocols/dsp/dsp-catalog/dsp-catalog-transform/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogRequestMessageTransformer.java index e3f49fa6510..63a41d72eaf 100644 --- a/data-protocols/dsp/dsp-catalog/dsp-catalog-transform/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogRequestMessageTransformer.java +++ b/data-protocols/dsp/dsp-catalog/dsp-catalog-transform/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogRequestMessageTransformer.java @@ -23,8 +23,8 @@ import org.jetbrains.annotations.Nullable; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.protocol.dsp.catalog.transform.DspCatalogPropertyAndTypeNames.DSPACE_CATALOG_REQUEST_TYPE; -import static org.eclipse.edc.protocol.dsp.catalog.transform.DspCatalogPropertyAndTypeNames.DSPACE_FILTER_PROPERTY; +import static org.eclipse.edc.protocol.dsp.type.DspCatalogPropertyAndTypeNames.DSPACE_PROPERTY_FILTER; +import static org.eclipse.edc.protocol.dsp.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_REQUEST_MESSAGE; /** * Transforms a {@link CatalogRequestMessage} to a {@link JsonObject} in JSON-LD expanded form. @@ -41,10 +41,10 @@ public JsonObjectFromCatalogRequestMessageTransformer(JsonBuilderFactory jsonFac @Override public @Nullable JsonObject transform(@NotNull CatalogRequestMessage message, @NotNull TransformerContext context) { var builder = jsonFactory.createObjectBuilder(); - builder.add(TYPE, DSPACE_CATALOG_REQUEST_TYPE); + builder.add(TYPE, DSPACE_TYPE_CATALOG_REQUEST_MESSAGE); if (message.getQuerySpec() != null) { - builder.add(DSPACE_FILTER_PROPERTY, context.transform(message.getQuerySpec(), JsonObject.class)); + builder.add(DSPACE_PROPERTY_FILTER, context.transform(message.getQuerySpec(), JsonObject.class)); } return builder.build(); diff --git a/data-protocols/dsp/dsp-catalog/dsp-catalog-transform/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/to/JsonObjectToCatalogRequestMessageTransformer.java b/data-protocols/dsp/dsp-catalog/dsp-catalog-transform/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/to/JsonObjectToCatalogRequestMessageTransformer.java index f01d93e53df..4083c210bb9 100644 --- a/data-protocols/dsp/dsp-catalog/dsp-catalog-transform/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/to/JsonObjectToCatalogRequestMessageTransformer.java +++ b/data-protocols/dsp/dsp-catalog/dsp-catalog-transform/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/to/JsonObjectToCatalogRequestMessageTransformer.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static org.eclipse.edc.protocol.dsp.catalog.transform.DspCatalogPropertyAndTypeNames.DSPACE_FILTER_PROPERTY; +import static org.eclipse.edc.protocol.dsp.type.DspCatalogPropertyAndTypeNames.DSPACE_PROPERTY_FILTER; /** * Transforms a {@link JsonObject} in JSON-LD expanded form to a {@link CatalogRequestMessage}. @@ -51,7 +51,7 @@ public JsonObjectToCatalogRequestMessageTransformer(ObjectMapper mapper) { @Nullable private QuerySpec transformQuerySpec(JsonObject object, TransformerContext context) { - var value = object.get(DSPACE_FILTER_PROPERTY); + var value = object.get(DSPACE_PROPERTY_FILTER); if (value == null) { return null; } diff --git a/data-protocols/dsp/dsp-catalog/dsp-catalog-transform/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogRequestMessageTransformerTest.java b/data-protocols/dsp/dsp-catalog/dsp-catalog-transform/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogRequestMessageTransformerTest.java index 0172ea52843..9139ebece59 100644 --- a/data-protocols/dsp/dsp-catalog/dsp-catalog-transform/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogRequestMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-catalog/dsp-catalog-transform/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogRequestMessageTransformerTest.java @@ -27,8 +27,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.protocol.dsp.catalog.transform.DspCatalogPropertyAndTypeNames.DSPACE_CATALOG_REQUEST_TYPE; -import static org.eclipse.edc.protocol.dsp.catalog.transform.DspCatalogPropertyAndTypeNames.DSPACE_FILTER_PROPERTY; +import static org.eclipse.edc.protocol.dsp.type.DspCatalogPropertyAndTypeNames.DSPACE_PROPERTY_FILTER; +import static org.eclipse.edc.protocol.dsp.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_REQUEST_MESSAGE; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -61,8 +61,8 @@ void transform_returnJsonObject() { var result = transformer.transform(message, context); assertThat(result).isNotNull(); - assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_CATALOG_REQUEST_TYPE); - assertThat(result.get(DSPACE_FILTER_PROPERTY)).isEqualTo(querySpecJson); + assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_TYPE_CATALOG_REQUEST_MESSAGE); + assertThat(result.get(DSPACE_PROPERTY_FILTER)).isEqualTo(querySpecJson); verify(context, never()).reportProblem(anyString()); } } diff --git a/data-protocols/dsp/dsp-catalog/dsp-catalog-transform/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/to/JsonObjectToCatalogRequestMessageTransformerTest.java b/data-protocols/dsp/dsp-catalog/dsp-catalog-transform/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/to/JsonObjectToCatalogRequestMessageTransformerTest.java index e2a3f4a0bdd..28d34f15790 100644 --- a/data-protocols/dsp/dsp-catalog/dsp-catalog-transform/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/to/JsonObjectToCatalogRequestMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-catalog/dsp-catalog-transform/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/to/JsonObjectToCatalogRequestMessageTransformerTest.java @@ -26,8 +26,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.protocol.dsp.catalog.transform.DspCatalogPropertyAndTypeNames.DSPACE_CATALOG_REQUEST_TYPE; -import static org.eclipse.edc.protocol.dsp.catalog.transform.DspCatalogPropertyAndTypeNames.DSPACE_FILTER_PROPERTY; +import static org.eclipse.edc.protocol.dsp.type.DspCatalogPropertyAndTypeNames.DSPACE_PROPERTY_FILTER; +import static org.eclipse.edc.protocol.dsp.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_REQUEST_MESSAGE; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -54,8 +54,8 @@ void transform_returnCatalogRequestMessage() { when(context.transform(querySpecJson, QuerySpec.class)).thenReturn(querySpec); var message = jsonFactory.createObjectBuilder() - .add(TYPE, DSPACE_CATALOG_REQUEST_TYPE) - .add(DSPACE_FILTER_PROPERTY, querySpecJson) + .add(TYPE, DSPACE_TYPE_CATALOG_REQUEST_MESSAGE) + .add(DSPACE_PROPERTY_FILTER, querySpecJson) .build(); var result = transformer.transform(message, context); diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-api/build.gradle.kts b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-api/build.gradle.kts index fd1820566f8..a17f54df051 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-api/build.gradle.kts +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-api/build.gradle.kts @@ -19,11 +19,8 @@ plugins { dependencies { api(project(":data-protocols:dsp:dsp-api-configuration")) - api(project(":data-protocols:dsp:dsp-core")) - api(project(":data-protocols:dsp:dsp-http-core")) - - // TODO remove this dependency by moving type constants to another module https://github.com/eclipse-edc/Connector/issues/3014 - api(project(":data-protocols:dsp:dsp-negotiation:dsp-negotiation-transform")) + api(project(":data-protocols:dsp:dsp-spi")) + api(project(":data-protocols:dsp:dsp-http-spi")) api(project(":spi:common:core-spi")) api(project(":spi:control-plane:control-plane-spi")) diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-api/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/api/controller/DspNegotiationApiController.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-api/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/api/controller/DspNegotiationApiController.java index 3fd388a6ed6..7022639bd53 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-api/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/api/controller/DspNegotiationApiController.java +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-api/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/api/controller/DspNegotiationApiController.java @@ -52,7 +52,6 @@ import static jakarta.ws.rs.core.HttpHeaders.AUTHORIZATION; import static java.lang.String.format; -import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_SCHEMA; import static org.eclipse.edc.jsonld.spi.TypeUtil.isOfExpectedType; import static org.eclipse.edc.protocol.dsp.DspErrorDetails.BAD_REQUEST; import static org.eclipse.edc.protocol.dsp.DspErrorDetails.NOT_IMPLEMENTED; @@ -65,14 +64,15 @@ import static org.eclipse.edc.protocol.dsp.negotiation.api.NegotiationApiPaths.INITIAL_CONTRACT_REQUEST; import static org.eclipse.edc.protocol.dsp.negotiation.api.NegotiationApiPaths.TERMINATION; import static org.eclipse.edc.protocol.dsp.negotiation.api.NegotiationApiPaths.VERIFICATION; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_AGREEMENT_MESSAGE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_AGREEMENT_VERIFICATION_MESSAGE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_CONTRACT_OFFER_MESSAGE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_EVENT_MESSAGE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_CALLBACK_ADDRESS; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_TERMINATION_MESSAGE; import static org.eclipse.edc.protocol.dsp.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_ERROR; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_OFFER_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS; import static org.eclipse.edc.web.spi.exception.ServiceResultHandler.exceptionMapper; /** @@ -84,8 +84,6 @@ @Path(BASE_PATH) public class DspNegotiationApiController { - private static final String DSPACE_CONTRACT_NEGOTIATION_ERROR = DSPACE_SCHEMA + "ContractNegotiationError"; // TODO move to :dsp-core https://github.com/eclipse-edc/Connector/issues/3014 - private final IdentityService identityService; private final TypeTransformerRegistry transformerRegistry; private final String callbackAddress; @@ -129,13 +127,13 @@ public Response getNegotiation(@PathParam("id") String id, @HeaderParam(AUTHORIZ */ @POST @Path(INITIAL_CONTRACT_REQUEST) - public Response initiateNegotiation(@RequestBody(description = DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE, required = true) + public Response initiateNegotiation(@RequestBody(description = DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE, required = true) JsonObject jsonObject, @HeaderParam(AUTHORIZATION) String token) { ContractNegotiation negotiation; try { negotiation = handleMessage(MessageSpec.Builder.newInstance(ContractRequestMessage.class) - .expectedMessageType(DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE) + .expectedMessageType(DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE) .message(jsonObject) .token(token) .serviceCall(this::validateAndProcessRequest) @@ -146,7 +144,7 @@ public Response initiateNegotiation(@RequestBody(description = DSPACE_NEGOTIATIO monitor.debug(String.format(BAD_REQUEST + ": %s", exception.getMessages())); return errorResponse(Optional.empty(), Response.Status.BAD_REQUEST, BAD_REQUEST); } catch (Exception exception) { - monitor.warning(String.format("Error processing %s. %s", DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE, exception)); + monitor.warning(String.format("Error processing %s. %s", DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE, exception)); throw exception; } @@ -171,12 +169,12 @@ public Response initiateNegotiation(@RequestBody(description = DSPACE_NEGOTIATIO @POST @Path("{id}" + CONTRACT_REQUEST) public Response consumerOffer(@PathParam("id") String id, - @RequestBody(description = DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE, required = true) + @RequestBody(description = DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE, required = true) JsonObject jsonObject, @HeaderParam(AUTHORIZATION) String token) { try { handleMessage(MessageSpec.Builder.newInstance(ContractRequestMessage.class) - .expectedMessageType(DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE) + .expectedMessageType(DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE) .processId(id) .message(jsonObject) .token(token) @@ -189,7 +187,7 @@ public Response consumerOffer(@PathParam("id") String id, monitor.debug(String.format(BAD_REQUEST + "Requested process id %s: %s", id, exception.getMessages())); return errorResponse(Optional.of(id), Response.Status.BAD_REQUEST, BAD_REQUEST); } catch (Exception exception) { - monitor.warning(String.format("Error processing %s. %s", DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE, exception)); + monitor.warning(String.format("Error processing %s. %s", DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE, exception)); throw exception; } @@ -207,12 +205,12 @@ public Response consumerOffer(@PathParam("id") String id, @POST @Path("{id}" + EVENT) public Response createEvent(@PathParam("id") String id, - @RequestBody(description = DSPACE_NEGOTIATION_EVENT_MESSAGE, required = true) + @RequestBody(description = DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE, required = true) JsonObject jsonObject, @HeaderParam(AUTHORIZATION) String token) { try { handleMessage(MessageSpec.Builder.newInstance(ContractNegotiationEventMessage.class) - .expectedMessageType(DSPACE_NEGOTIATION_EVENT_MESSAGE) + .expectedMessageType(DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE) .processId(id) .message(jsonObject) .token(token) @@ -225,7 +223,7 @@ public Response createEvent(@PathParam("id") String id, monitor.debug(String.format(BAD_REQUEST + "Requested process id %s: %s", id, exception.getMessages())); return errorResponse(Optional.of(id), Response.Status.BAD_REQUEST, BAD_REQUEST); } catch (Exception exception) { - monitor.warning(String.format("Error processing %s. %s", DSPACE_NEGOTIATION_EVENT_MESSAGE, exception)); + monitor.warning(String.format("Error processing %s. %s", DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE, exception)); throw exception; } @@ -243,12 +241,12 @@ public Response createEvent(@PathParam("id") String id, @POST @Path("{id}" + AGREEMENT + VERIFICATION) public Response verifyAgreement(@PathParam("id") String id, - @RequestBody(description = DSPACE_NEGOTIATION_AGREEMENT_VERIFICATION_MESSAGE, required = true) + @RequestBody(description = DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE, required = true) JsonObject jsonObject, @HeaderParam(AUTHORIZATION) String token) { try { handleMessage(MessageSpec.Builder.newInstance(ContractAgreementVerificationMessage.class) - .expectedMessageType(DSPACE_NEGOTIATION_AGREEMENT_VERIFICATION_MESSAGE) + .expectedMessageType(DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE) .processId(id) .message(jsonObject) .token(token) @@ -261,7 +259,7 @@ public Response verifyAgreement(@PathParam("id") String id, monitor.debug(String.format(BAD_REQUEST + "Requested process id %s: %s", id, exception.getMessages())); return errorResponse(Optional.of(id), Response.Status.BAD_REQUEST, BAD_REQUEST); } catch (Exception exception) { - monitor.warning(String.format("Error processing %s. %s", DSPACE_NEGOTIATION_AGREEMENT_VERIFICATION_MESSAGE, exception)); + monitor.warning(String.format("Error processing %s. %s", DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE, exception)); throw exception; } @@ -279,12 +277,12 @@ public Response verifyAgreement(@PathParam("id") String id, @POST @Path("{id}" + TERMINATION) public Response terminateNegotiation(@PathParam("id") String id, - @RequestBody(description = DSPACE_NEGOTIATION_TERMINATION_MESSAGE, required = true) + @RequestBody(description = DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE, required = true) JsonObject jsonObject, @HeaderParam(AUTHORIZATION) String token) { try { handleMessage(MessageSpec.Builder.newInstance(ContractNegotiationTerminationMessage.class) - .expectedMessageType(DSPACE_NEGOTIATION_TERMINATION_MESSAGE) + .expectedMessageType(DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE) .processId(id) .message(jsonObject) .token(token) @@ -297,7 +295,7 @@ public Response terminateNegotiation(@PathParam("id") String id, monitor.debug(String.format(BAD_REQUEST + "Requested process id %s: %s", id, exception.getMessages())); return errorResponse(Optional.of(id), Response.Status.BAD_REQUEST, BAD_REQUEST); } catch (Exception exception) { - monitor.warning(String.format("Error processing %s. %s", DSPACE_NEGOTIATION_TERMINATION_MESSAGE, exception)); + monitor.warning(String.format("Error processing %s. %s", DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE, exception)); throw exception; } @@ -315,7 +313,7 @@ public Response terminateNegotiation(@PathParam("id") String id, @POST @Path("{id}" + CONTRACT_OFFER) public Response providerOffer(@PathParam("id") String id, - @RequestBody(description = DSPACE_NEGOTIATION_CONTRACT_OFFER_MESSAGE, required = true) + @RequestBody(description = DSPACE_TYPE_CONTRACT_OFFER_MESSAGE, required = true) JsonObject body, @HeaderParam(AUTHORIZATION) String token) { return errorResponse(Optional.of(id), Response.Status.NOT_IMPLEMENTED, NOT_IMPLEMENTED); @@ -332,12 +330,12 @@ public Response providerOffer(@PathParam("id") String id, @POST @Path("{id}" + AGREEMENT) public Response createAgreement(@PathParam("id") String id, - @RequestBody(description = DSPACE_NEGOTIATION_AGREEMENT_MESSAGE, required = true) + @RequestBody(description = DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE, required = true) JsonObject jsonObject, @HeaderParam(AUTHORIZATION) String token) { try { handleMessage(MessageSpec.Builder.newInstance(ContractAgreementMessage.class) - .expectedMessageType(DSPACE_NEGOTIATION_AGREEMENT_MESSAGE) + .expectedMessageType(DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE) .processId(id) .message(jsonObject) .token(token) @@ -350,7 +348,7 @@ public Response createAgreement(@PathParam("id") String id, monitor.debug(String.format(BAD_REQUEST + "Requested process id %s: %s", id, exception.getMessages())); return errorResponse(Optional.of(id), Response.Status.BAD_REQUEST, BAD_REQUEST); } catch (Exception exception) { - monitor.warning(String.format("Error processing %s. %s", DSPACE_NEGOTIATION_AGREEMENT_MESSAGE, exception)); + monitor.warning(String.format("Error processing %s. %s", DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE, exception)); throw exception; } @@ -382,7 +380,7 @@ private ContractNegotiation handleMessage(Mess @NotNull private ServiceResult validateAndProcessRequest(ContractRequestMessage message, ClaimToken claimToken) { if (message.getCallbackAddress() == null) { - throw new InvalidRequestException(format("ContractRequestMessage must contain a '%s' property", DSPACE_NEGOTIATION_PROPERTY_CALLBACK_ADDRESS)); + throw new InvalidRequestException(format("ContractRequestMessage must contain a '%s' property", DSPACE_PROPERTY_CALLBACK_ADDRESS)); } return protocolService.notifyRequested(message, claimToken); } @@ -422,7 +420,7 @@ private void validateProcessId(@Nullable String expected, String actual) { private Response errorResponse(Optional processId, Response.Status code, String message) { var builder = DspError.Builder.newInstance() - .type(DSPACE_CONTRACT_NEGOTIATION_ERROR) + .type(DSPACE_TYPE_CONTRACT_NEGOTIATION_ERROR) .code(Integer.toString(code.getStatusCode())) .messages(List.of(message)); diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-api/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/api/controller/DspNegotiationApiControllerTest.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-api/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/api/controller/DspNegotiationApiControllerTest.java index bb574fcf254..343c9a247a4 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-api/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/api/controller/DspNegotiationApiControllerTest.java +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-api/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/api/controller/DspNegotiationApiControllerTest.java @@ -63,7 +63,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.connector.contract.spi.types.agreement.ContractNegotiationEventMessage.Type.ACCEPTED; import static org.eclipse.edc.connector.contract.spi.types.agreement.ContractNegotiationEventMessage.Type.FINALIZED; -import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_SCHEMA; import static org.eclipse.edc.protocol.dsp.negotiation.api.NegotiationApiPaths.AGREEMENT; import static org.eclipse.edc.protocol.dsp.negotiation.api.NegotiationApiPaths.BASE_PATH; import static org.eclipse.edc.protocol.dsp.negotiation.api.NegotiationApiPaths.CONTRACT_OFFER; @@ -72,14 +71,15 @@ import static org.eclipse.edc.protocol.dsp.negotiation.api.NegotiationApiPaths.INITIAL_CONTRACT_REQUEST; import static org.eclipse.edc.protocol.dsp.negotiation.api.NegotiationApiPaths.TERMINATION; import static org.eclipse.edc.protocol.dsp.negotiation.api.NegotiationApiPaths.VERIFICATION; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_AGREEMENT_MESSAGE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_AGREEMENT_VERIFICATION_MESSAGE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_EVENT_MESSAGE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_TERMINATION_MESSAGE; import static org.eclipse.edc.protocol.dsp.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP; -import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_ERROR; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE; import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; @@ -92,8 +92,6 @@ @ApiTest public class DspNegotiationApiControllerTest extends RestControllerTestBase { - private static final String DSPACE_CONTRACT_NEGOTIATION_ERROR = DSPACE_SCHEMA + "ContractNegotiationError"; - private final IdentityService identityService = mock(IdentityService.class); private final TypeTransformerRegistry registry = mock(TypeTransformerRegistry.class); private final ContractNegotiationProtocolService protocolService = mock(ContractNegotiationProtocolService.class); @@ -206,9 +204,9 @@ void getNegotiation_shouldReturnNotImplemented_whenOperationNotSupported() { .extract().as(JsonObject.class); assertThat(result).isNotNull(); - assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_CONTRACT_NEGOTIATION_ERROR); + assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_TYPE_CONTRACT_NEGOTIATION_ERROR); assertThat(result.getString(DSPACE_PROPERTY_CODE)).isEqualTo("501"); - assertThat(result.get(DSPACE_PROCESS_ID)).isNotNull(); + assertThat(result.get(DSPACE_PROPERTY_PROCESS_ID)).isNotNull(); assertThat(result.get(DSPACE_PROPERTY_REASON)).isNotNull(); } @@ -219,7 +217,7 @@ void initiateNegotiation_shouldReturnContractNegotiation_whenValidRequest() { var process = contractNegotiation(); var json = Json.createObjectBuilder().build(); var map = Map.of("key", "value"); - var request = Json.createObjectBuilder().add("@type", DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE).build(); + var request = Json.createObjectBuilder().add("@type", DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE).build(); when(identityService.verifyJwtToken(any(TokenRepresentation.class), eq(callbackAddress))).thenReturn(Result.success(token)); when(registry.transform(any(JsonObject.class), eq(ContractRequestMessage.class))).thenReturn(Result.success(message)); @@ -244,7 +242,7 @@ void initiateNegotiation_shouldReturnInternalServerError_whenContractNegotiation var token = token(); var message = contractRequestMessage(); var process = contractNegotiation(); - var request = Json.createObjectBuilder().add("@type", DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE).build(); + var request = Json.createObjectBuilder().add("@type", DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE).build(); when(identityService.verifyJwtToken(any(TokenRepresentation.class), eq(callbackAddress))).thenReturn(Result.success(token)); when(registry.transform(any(JsonObject.class), eq(ContractRequestMessage.class))).thenReturn(Result.success(message)); @@ -261,9 +259,9 @@ void initiateNegotiation_shouldReturnInternalServerError_whenContractNegotiation .extract().as(JsonObject.class); assertThat(result).isNotNull(); - assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_CONTRACT_NEGOTIATION_ERROR); + assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_TYPE_CONTRACT_NEGOTIATION_ERROR); assertThat(result.getString(DSPACE_PROPERTY_CODE)).isEqualTo("500"); - assertThat(result.get(DSPACE_PROCESS_ID)).isNotNull(); + assertThat(result.get(DSPACE_PROPERTY_PROCESS_ID)).isNotNull(); assertThat(result.get(DSPACE_PROPERTY_REASON)).isNotNull(); } @@ -283,9 +281,9 @@ void providerOffer_shouldReturnNotImplemented_whenOperationNotSupported() { .extract().as(JsonObject.class); assertThat(result).isNotNull(); - assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_CONTRACT_NEGOTIATION_ERROR); + assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_TYPE_CONTRACT_NEGOTIATION_ERROR); assertThat(result.getString(DSPACE_PROPERTY_CODE)).isEqualTo("501"); - assertThat(result.get(DSPACE_PROCESS_ID)).isNotNull(); + assertThat(result.get(DSPACE_PROPERTY_PROCESS_ID)).isNotNull(); assertThat(result.get(DSPACE_PROPERTY_REASON)).isNotNull(); } @@ -309,12 +307,12 @@ void callEndpoint_shouldReturnUnauthorized_whenNotAuthorized(String path) { .extract().as(JsonObject.class); assertThat(result).isNotNull(); - assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_CONTRACT_NEGOTIATION_ERROR); + assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_TYPE_CONTRACT_NEGOTIATION_ERROR); assertThat(result.getString(DSPACE_PROPERTY_CODE)).isEqualTo("401"); assertThat(result.get(DSPACE_PROPERTY_REASON)).isNotNull(); if (!path.equals(BASE_PATH + INITIAL_CONTRACT_REQUEST)) { - assertThat(result.get(DSPACE_PROCESS_ID)).isNotNull(); + assertThat(result.get(DSPACE_PROPERTY_PROCESS_ID)).isNotNull(); } } @@ -340,12 +338,12 @@ void callEndpoint_shouldReturnBadRequest_whenRequestTransformationFails(String p .extract().as(JsonObject.class); assertThat(result).isNotNull(); - assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_CONTRACT_NEGOTIATION_ERROR); + assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_TYPE_CONTRACT_NEGOTIATION_ERROR); assertThat(result.getString(DSPACE_PROPERTY_CODE)).isEqualTo("400"); assertThat(result.get(DSPACE_PROPERTY_REASON)).isNotNull(); if (!path.equals(BASE_PATH + INITIAL_CONTRACT_REQUEST)) { - assertThat(result.get(DSPACE_PROCESS_ID)).isNotNull(); + assertThat(result.get(DSPACE_PROPERTY_PROCESS_ID)).isNotNull(); } } @@ -456,9 +454,9 @@ void callEndpoint_shouldReturnBadRequest_whenValidationFails(String path, Contra .extract().as(JsonObject.class); assertThat(result).isNotNull(); - assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_CONTRACT_NEGOTIATION_ERROR); + assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_TYPE_CONTRACT_NEGOTIATION_ERROR); assertThat(result.getString(DSPACE_PROPERTY_CODE)).isEqualTo("400"); - assertThat(result.get(DSPACE_PROCESS_ID)).isNotNull(); + assertThat(result.get(DSPACE_PROPERTY_PROCESS_ID)).isNotNull(); assertThat(result.get(DSPACE_PROPERTY_REASON)).isNotNull(); // verify that the message protocol was set to the DSP protocol by the controller @@ -507,11 +505,11 @@ public Stream provideArguments(ExtensionContext context) { } private static class ControllerMethodArgumentsForServiceCall implements ArgumentsProvider { - JsonObject contractRequest = Json.createObjectBuilder().add("@type", DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE).build(); - JsonObject negotiationEvent = Json.createObjectBuilder().add("@type", DSPACE_NEGOTIATION_EVENT_MESSAGE).build(); - JsonObject agreementVerification = Json.createObjectBuilder().add("@type", DSPACE_NEGOTIATION_AGREEMENT_VERIFICATION_MESSAGE).build(); - JsonObject negotiationTermination = Json.createObjectBuilder().add("@type", DSPACE_NEGOTIATION_TERMINATION_MESSAGE).build(); - JsonObject contractAgreement = Json.createObjectBuilder().add("@type", DSPACE_NEGOTIATION_AGREEMENT_MESSAGE).build(); + JsonObject contractRequest = Json.createObjectBuilder().add("@type", DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE).build(); + JsonObject negotiationEvent = Json.createObjectBuilder().add("@type", DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE).build(); + JsonObject agreementVerification = Json.createObjectBuilder().add("@type", DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE).build(); + JsonObject negotiationTermination = Json.createObjectBuilder().add("@type", DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE).build(); + JsonObject contractAgreement = Json.createObjectBuilder().add("@type", DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE).build(); @Override public Stream provideArguments(ExtensionContext context) throws Exception { @@ -533,11 +531,11 @@ public Stream provideArguments(ExtensionContext context) th } private static class ControllerMethodArgumentsForServiceError implements ArgumentsProvider { - JsonObject contractRequest = Json.createObjectBuilder().add("@type", DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE).build(); - JsonObject negotiationEvent = Json.createObjectBuilder().add("@type", DSPACE_NEGOTIATION_EVENT_MESSAGE).build(); - JsonObject agreementVerification = Json.createObjectBuilder().add("@type", DSPACE_NEGOTIATION_AGREEMENT_VERIFICATION_MESSAGE).build(); - JsonObject negotiationTermination = Json.createObjectBuilder().add("@type", DSPACE_NEGOTIATION_TERMINATION_MESSAGE).build(); - JsonObject contractAgreement = Json.createObjectBuilder().add("@type", DSPACE_NEGOTIATION_AGREEMENT_MESSAGE).build(); + JsonObject contractRequest = Json.createObjectBuilder().add("@type", DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE).build(); + JsonObject negotiationEvent = Json.createObjectBuilder().add("@type", DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE).build(); + JsonObject agreementVerification = Json.createObjectBuilder().add("@type", DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE).build(); + JsonObject negotiationTermination = Json.createObjectBuilder().add("@type", DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE).build(); + JsonObject contractAgreement = Json.createObjectBuilder().add("@type", DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE).build(); @Override public Stream provideArguments(ExtensionContext context) throws Exception { @@ -561,11 +559,11 @@ public Stream provideArguments(ExtensionContext context) th } private static class ControllerMethodArgumentsForIdValidationFails implements ArgumentsProvider { - JsonObject contractRequest = Json.createObjectBuilder().add("@type", DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE).build(); - JsonObject negotiationEvent = Json.createObjectBuilder().add("@type", DSPACE_NEGOTIATION_EVENT_MESSAGE).build(); - JsonObject agreementVerification = Json.createObjectBuilder().add("@type", DSPACE_NEGOTIATION_AGREEMENT_VERIFICATION_MESSAGE).build(); - JsonObject negotiationTermination = Json.createObjectBuilder().add("@type", DSPACE_NEGOTIATION_TERMINATION_MESSAGE).build(); - JsonObject contractAgreement = Json.createObjectBuilder().add("@type", DSPACE_NEGOTIATION_AGREEMENT_MESSAGE).build(); + JsonObject contractRequest = Json.createObjectBuilder().add("@type", DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE).build(); + JsonObject negotiationEvent = Json.createObjectBuilder().add("@type", DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE).build(); + JsonObject agreementVerification = Json.createObjectBuilder().add("@type", DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE).build(); + JsonObject negotiationTermination = Json.createObjectBuilder().add("@type", DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE).build(); + JsonObject contractAgreement = Json.createObjectBuilder().add("@type", DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE).build(); @Override public Stream provideArguments(ExtensionContext context) throws Exception { diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-http-dispatcher/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/dispatcher/delegate/ContractRequestMessageHttpDelegateTest.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-http-dispatcher/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/dispatcher/delegate/ContractRequestMessageHttpDelegateTest.java index 5b89926ab98..2582dd0b2d0 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-http-dispatcher/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/dispatcher/delegate/ContractRequestMessageHttpDelegateTest.java +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-http-dispatcher/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/dispatcher/delegate/ContractRequestMessageHttpDelegateTest.java @@ -40,10 +40,10 @@ import static org.eclipse.edc.protocol.dsp.negotiation.dispatcher.NegotiationApiPaths.BASE_PATH; import static org.eclipse.edc.protocol.dsp.negotiation.dispatcher.NegotiationApiPaths.CONTRACT_REQUEST; import static org.eclipse.edc.protocol.dsp.negotiation.dispatcher.NegotiationApiPaths.INITIAL_CONTRACT_REQUEST; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_CONTRACT_NEGOTIATION; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_STATE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_STATE_REQUESTED; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_REQUESTED; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_STATE; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -162,10 +162,10 @@ private Policy policy() { private JsonObject negotiation() { var builder = Json.createObjectBuilder(); builder.add(JsonLdKeywords.ID, "id1"); - builder.add(JsonLdKeywords.TYPE, DSPACE_CONTRACT_NEGOTIATION); + builder.add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_NEGOTIATION); - builder.add(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID, PROCESS_ID); - builder.add(DSPACE_NEGOTIATION_PROPERTY_STATE, DSPACE_NEGOTIATION_STATE_REQUESTED); + builder.add(DSPACE_PROPERTY_PROCESS_ID, PROCESS_ID); + builder.add(DSPACE_PROPERTY_STATE, DSPACE_VALUE_NEGOTIATION_STATE_REQUESTED); return builder.build(); } diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/build.gradle.kts b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/build.gradle.kts index dd1a376085f..28b42812503 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/build.gradle.kts +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/build.gradle.kts @@ -17,6 +17,7 @@ plugins { } dependencies { + api(project(":data-protocols:dsp:dsp-spi")) api(project(":data-protocols:dsp:dsp-http-spi")) api(project(":data-protocols:dsp:dsp-transform")) api(project(":extensions:common:json-ld")) diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/DspNegotiationPropertyAndTypeNames.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/DspNegotiationPropertyAndTypeNames.java deleted file mode 100644 index 78c5d433823..00000000000 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/DspNegotiationPropertyAndTypeNames.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2023 Fraunhofer Institute for Software and Systems Engineering - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0 - * - * SPDX-License-Identifier: Apache-2.0 - * - * Contributors: - * Fraunhofer Institute for Software and Systems Engineering - initial API and implementation - * - */ - -package org.eclipse.edc.protocol.dsp.negotiation.transform; - -import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_SCHEMA; - -public interface DspNegotiationPropertyAndTypeNames { - - // types - - String DSPACE_CONTRACT_NEGOTIATION = DSPACE_SCHEMA + "ContractNegotiation"; - - // messages - - String DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE = DSPACE_SCHEMA + "ContractRequestMessage"; - String DSPACE_NEGOTIATION_CONTRACT_OFFER_MESSAGE = DSPACE_SCHEMA + "ContractOfferMessage"; - String DSPACE_NEGOTIATION_EVENT_MESSAGE = DSPACE_SCHEMA + "ContractNegotiationEventMessage"; - String DSPACE_NEGOTIATION_AGREEMENT_MESSAGE = DSPACE_SCHEMA + "ContractAgreementMessage"; - String DSPACE_NEGOTIATION_AGREEMENT_VERIFICATION_MESSAGE = DSPACE_SCHEMA + "ContractAgreementVerificationMessage"; - String DSPACE_NEGOTIATION_TERMINATION_MESSAGE = DSPACE_SCHEMA + "ContractNegotiationTerminationMessage"; - - // properties - - String DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID = DSPACE_SCHEMA + "processId"; - String DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE = DSPACE_SCHEMA + "eventType"; - String DSPACE_NEGOTIATION_PROPERTY_CODE = DSPACE_SCHEMA + "code"; - String DSPACE_NEGOTIATION_PROPERTY_REASON = DSPACE_SCHEMA + "reason"; - String DSPACE_NEGOTIATION_PROPERTY_CALLBACK_ADDRESS = DSPACE_SCHEMA + "callbackAddress"; - String DSPACE_NEGOTIATION_PROPERTY_STATE = DSPACE_SCHEMA + "state"; - String DSPACE_NEGOTIATION_PROPERTY_AGREEMENT = DSPACE_SCHEMA + "agreement"; - String DSPACE_NEGOTIATION_PROPERTY_OFFER = DSPACE_SCHEMA + "offer"; - String DSPACE_NEGOTIATION_PROPERTY_OFFER_ID = DSPACE_SCHEMA + "offerId"; - String DSPACE_NEGOTIATION_PROPERTY_DATASET = DSPACE_SCHEMA + "dataSet"; - String DSPACE_NEGOTIATION_PROPERTY_TIMESTAMP = DSPACE_SCHEMA + "timestamp"; - String DSPACE_NEGOTIATION_PROPERTY_CONSUMER_ID = DSPACE_SCHEMA + "consumerId"; - String DSPACE_NEGOTIATION_PROPERTY_PROVIDER_ID = DSPACE_SCHEMA + "providerId"; - - // event types - - String DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE_ACCEPTED = DSPACE_SCHEMA + "ACCEPTED"; - String DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE_FINALIZED = DSPACE_SCHEMA + "FINALIZED"; - - // negotiation states - - String DSPACE_NEGOTIATION_STATE_REQUESTED = DSPACE_SCHEMA + "REQUESTED"; - String DSPACE_NEGOTIATION_STATE_OFFERED = DSPACE_SCHEMA + "OFFERED"; - String DSPACE_NEGOTIATION_STATE_ACCEPTED = DSPACE_SCHEMA + "ACCEPTED"; - String DSPACE_NEGOTIATION_STATE_AGREED = DSPACE_SCHEMA + "AGREED"; - String DSPACE_NEGOTIATION_STATE_VERIFIED = DSPACE_SCHEMA + "VERIFIED"; - String DSPACE_NEGOTIATION_STATE_FINALIZED = DSPACE_SCHEMA + "FINALIZED"; - String DSPACE_NEGOTIATION_STATE_TERMINATED = DSPACE_SCHEMA + "TERMINATED"; - -} diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementMessageTransformer.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementMessageTransformer.java index ac1ce0e00a1..d4106854525 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementMessageTransformer.java +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementMessageTransformer.java @@ -26,12 +26,12 @@ import static java.time.Instant.ofEpochSecond; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_AGREEMENT_MESSAGE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_AGREEMENT; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_CONSUMER_ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROVIDER_ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_TIMESTAMP; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_AGREEMENT; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_ID; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_ID; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_TIMESTAMP; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; /** @@ -50,9 +50,9 @@ public JsonObjectFromContractAgreementMessageTransformer(JsonBuilderFactory json public @Nullable JsonObject transform(@NotNull ContractAgreementMessage agreementMessage, @NotNull TransformerContext context) { var builder = jsonFactory.createObjectBuilder(); builder.add(JsonLdKeywords.ID, agreementMessage.getId()); - builder.add(JsonLdKeywords.TYPE, DSPACE_NEGOTIATION_AGREEMENT_MESSAGE); + builder.add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE); - builder.add(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID, agreementMessage.getProcessId()); + builder.add(DSPACE_PROPERTY_PROCESS_ID, agreementMessage.getProcessId()); var agreement = agreementMessage.getContractAgreement(); @@ -71,12 +71,12 @@ public JsonObjectFromContractAgreementMessageTransformer(JsonBuilderFactory json var copiedPolicy = Json.createObjectBuilder(policy) .add(ID, agreement.getId()) - .add(DSPACE_NEGOTIATION_PROPERTY_CONSUMER_ID, agreement.getConsumerId()) - .add(DSPACE_NEGOTIATION_PROPERTY_PROVIDER_ID, agreement.getProviderId()) - .add(DSPACE_NEGOTIATION_PROPERTY_TIMESTAMP, signing) + .add(DSPACE_PROPERTY_CONSUMER_ID, agreement.getConsumerId()) + .add(DSPACE_PROPERTY_PROVIDER_ID, agreement.getProviderId()) + .add(DSPACE_PROPERTY_TIMESTAMP, signing) .build(); - builder.add(DSPACE_NEGOTIATION_PROPERTY_AGREEMENT, copiedPolicy); + builder.add(DSPACE_PROPERTY_AGREEMENT, copiedPolicy); return builder.build(); } diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementVerificationMessageTransformer.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementVerificationMessageTransformer.java index bb8e247a1fd..ac6401bc9d1 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementVerificationMessageTransformer.java +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementVerificationMessageTransformer.java @@ -23,8 +23,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_AGREEMENT_VERIFICATION_MESSAGE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; /** * Creates a {@link JsonObject} from a {@link ContractAgreementVerificationMessage}. @@ -42,9 +42,9 @@ public JsonObjectFromContractAgreementVerificationMessageTransformer(JsonBuilder public @Nullable JsonObject transform(@NotNull ContractAgreementVerificationMessage verificationMessage, @NotNull TransformerContext context) { var builder = jsonFactory.createObjectBuilder(); builder.add(JsonLdKeywords.ID, verificationMessage.getId()); - builder.add(JsonLdKeywords.TYPE, DSPACE_NEGOTIATION_AGREEMENT_VERIFICATION_MESSAGE); + builder.add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE); - builder.add(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID, verificationMessage.getProcessId()); + builder.add(DSPACE_PROPERTY_PROCESS_ID, verificationMessage.getProcessId()); return builder.build(); } } diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationEventMessageTransformer.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationEventMessageTransformer.java index 3b3471c29a7..ead968c0155 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationEventMessageTransformer.java +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationEventMessageTransformer.java @@ -25,11 +25,11 @@ import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_EVENT_MESSAGE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE_ACCEPTED; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE_FINALIZED; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_EVENT_TYPE; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_FINALIZED; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; /** @@ -48,11 +48,11 @@ public JsonObjectFromContractNegotiationEventMessageTransformer(JsonBuilderFacto public @Nullable JsonObject transform(@NotNull ContractNegotiationEventMessage eventMessage, @NotNull TransformerContext context) { var builder = jsonFactory.createObjectBuilder(); builder.add(ID, eventMessage.getId()); - builder.add(TYPE, DSPACE_NEGOTIATION_EVENT_MESSAGE); + builder.add(TYPE, DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE); - builder.add(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID, eventMessage.getProcessId()); + builder.add(DSPACE_PROPERTY_PROCESS_ID, eventMessage.getProcessId()); - builder.add(DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE, eventType(eventMessage)); + builder.add(DSPACE_PROPERTY_EVENT_TYPE, eventType(eventMessage)); return builder.build(); } @@ -61,9 +61,9 @@ public JsonObjectFromContractNegotiationEventMessageTransformer(JsonBuilderFacto private String eventType(ContractNegotiationEventMessage message) { switch (message.getType()) { case ACCEPTED: - return DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE_ACCEPTED; + return DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED; case FINALIZED: - return DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE_FINALIZED; + return DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_FINALIZED; default: // this cannot happen throw new EdcException("Unknown event type: " + message.getType()); diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTerminationMessageTransformer.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTerminationMessageTransformer.java index ea9c893ad40..9b243be52d7 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTerminationMessageTransformer.java +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTerminationMessageTransformer.java @@ -24,10 +24,10 @@ import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_CODE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_REASON; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_TERMINATION_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON; /** * Creates a {@link JsonObject} from a {@link ContractNegotiationTerminationMessage}. @@ -45,18 +45,18 @@ public JsonObjectFromContractNegotiationTerminationMessageTransformer(JsonBuilde public @Nullable JsonObject transform(@NotNull ContractNegotiationTerminationMessage terminationMessage, @NotNull TransformerContext context) { var builder = jsonFactory.createObjectBuilder(); builder.add(ID, terminationMessage.getId()); - builder.add(TYPE, DSPACE_NEGOTIATION_TERMINATION_MESSAGE); + builder.add(TYPE, DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE); - builder.add(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID, terminationMessage.getProcessId()); + builder.add(DSPACE_PROPERTY_PROCESS_ID, terminationMessage.getProcessId()); var rejectionReason = terminationMessage.getRejectionReason(); if (rejectionReason != null) { - builder.add(DSPACE_NEGOTIATION_PROPERTY_REASON, rejectionReason); + builder.add(DSPACE_PROPERTY_REASON, rejectionReason); } var code = terminationMessage.getCode(); if (code != null) { - builder.add(DSPACE_NEGOTIATION_PROPERTY_CODE, code); + builder.add(DSPACE_PROPERTY_CODE, code); } return builder.build(); diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTransformer.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTransformer.java index 3c52f84cb62..8b26b6fb202 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTransformer.java +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTransformer.java @@ -25,16 +25,16 @@ import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_CONTRACT_NEGOTIATION; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_STATE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_STATE_ACCEPTED; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_STATE_AGREED; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_STATE_FINALIZED; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_STATE_OFFERED; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_STATE_REQUESTED; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_STATE_TERMINATED; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_STATE_VERIFIED; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_ACCEPTED; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_AGREED; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_FINALIZED; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_OFFERED; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_REQUESTED; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_TERMINATED; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_VERIFIED; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_STATE; /** @@ -53,9 +53,9 @@ public JsonObjectFromContractNegotiationTransformer(JsonBuilderFactory jsonFacto public @Nullable JsonObject transform(@NotNull ContractNegotiation contractNegotiation, @NotNull TransformerContext context) { return jsonFactory.createObjectBuilder() .add(ID, contractNegotiation.getCorrelationId()) - .add(TYPE, DSPACE_CONTRACT_NEGOTIATION) - .add(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID, contractNegotiation.getCorrelationId()) - .add(DSPACE_NEGOTIATION_PROPERTY_STATE, state(contractNegotiation.getState(), context)) + .add(TYPE, DSPACE_TYPE_CONTRACT_NEGOTIATION) + .add(DSPACE_PROPERTY_PROCESS_ID, contractNegotiation.getCorrelationId()) + .add(DSPACE_PROPERTY_STATE, state(contractNegotiation.getState(), context)) .build(); } @@ -65,32 +65,32 @@ private String state(Integer state, TransformerContext context) { context.problem() .nullProperty() .type(ContractNegotiation.class) - .property(DSPACE_NEGOTIATION_PROPERTY_STATE) + .property(DSPACE_PROPERTY_STATE) .report(); return null; } switch (negotiationState) { case REQUESTING: case REQUESTED: - return DSPACE_NEGOTIATION_STATE_REQUESTED; + return DSPACE_VALUE_NEGOTIATION_STATE_REQUESTED; case OFFERING: case OFFERED: - return DSPACE_NEGOTIATION_STATE_OFFERED; + return DSPACE_VALUE_NEGOTIATION_STATE_OFFERED; case ACCEPTING: case ACCEPTED: - return DSPACE_NEGOTIATION_STATE_ACCEPTED; + return DSPACE_VALUE_NEGOTIATION_STATE_ACCEPTED; case AGREEING: case AGREED: - return DSPACE_NEGOTIATION_STATE_AGREED; + return DSPACE_VALUE_NEGOTIATION_STATE_AGREED; case VERIFYING: case VERIFIED: - return DSPACE_NEGOTIATION_STATE_VERIFIED; + return DSPACE_VALUE_NEGOTIATION_STATE_VERIFIED; case FINALIZING: case FINALIZED: - return DSPACE_NEGOTIATION_STATE_FINALIZED; + return DSPACE_VALUE_NEGOTIATION_STATE_FINALIZED; case TERMINATING: case TERMINATED: - return DSPACE_NEGOTIATION_STATE_TERMINATED; + return DSPACE_VALUE_NEGOTIATION_STATE_TERMINATED; default: context.problem() .unexpectedType() diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractRequestMessageTransformer.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractRequestMessageTransformer.java index 53c10ee9bc1..9a0b707580e 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractRequestMessageTransformer.java +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractRequestMessageTransformer.java @@ -25,12 +25,12 @@ import org.jetbrains.annotations.Nullable; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_CALLBACK_ADDRESS; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_DATASET; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_OFFER; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_OFFER_ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_DATA_SET; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_ID; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; /** @@ -49,16 +49,16 @@ public JsonObjectFromContractRequestMessageTransformer(JsonBuilderFactory jsonFa public @Nullable JsonObject transform(@NotNull ContractRequestMessage requestMessage, @NotNull TransformerContext context) { var builder = jsonFactory.createObjectBuilder(); builder.add(JsonLdKeywords.ID, requestMessage.getId()); - builder.add(JsonLdKeywords.TYPE, DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE); + builder.add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE); - builder.add(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID, requestMessage.getProcessId()); + builder.add(DSPACE_PROPERTY_PROCESS_ID, requestMessage.getProcessId()); if (requestMessage.getCallbackAddress() != null) { - builder.add(DSPACE_NEGOTIATION_PROPERTY_CALLBACK_ADDRESS, requestMessage.getCallbackAddress()); + builder.add(DSPACE_PROPERTY_CALLBACK_ADDRESS, requestMessage.getCallbackAddress()); } if (requestMessage.getContractOffer() != null) { - builder.add(DSPACE_NEGOTIATION_PROPERTY_DATASET, requestMessage.getContractOffer().getAssetId()); + builder.add(DSPACE_PROPERTY_DATA_SET, requestMessage.getContractOffer().getAssetId()); var policy = context.transform(requestMessage.getContractOffer().getPolicy(), JsonObject.class); if (policy == null) { context.problem() @@ -72,12 +72,12 @@ public JsonObjectFromContractRequestMessageTransformer(JsonBuilderFactory jsonFa var enrichedPolicy = Json.createObjectBuilder(policy) .add(ID, requestMessage.getContractOffer().getId()) .build(); - builder.add(DSPACE_NEGOTIATION_PROPERTY_OFFER, enrichedPolicy); + builder.add(DSPACE_PROPERTY_OFFER, enrichedPolicy); } else { - builder.add(DSPACE_NEGOTIATION_PROPERTY_OFFER_ID, requestMessage.getContractOfferId()); + builder.add(DSPACE_PROPERTY_OFFER_ID, requestMessage.getContractOfferId()); if (requestMessage.getDataSet() != null) { - builder.add(DSPACE_NEGOTIATION_PROPERTY_DATASET, requestMessage.getDataSet()); + builder.add(DSPACE_PROPERTY_DATA_SET, requestMessage.getDataSet()); } } diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementMessageTransformer.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementMessageTransformer.java index 84fe6620c56..00d989df084 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementMessageTransformer.java +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementMessageTransformer.java @@ -29,19 +29,19 @@ import java.util.Set; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_AGREEMENT_MESSAGE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_AGREEMENT; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_CONSUMER_ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROVIDER_ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_TIMESTAMP; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_AGREEMENT; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_ID; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_ID; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_TIMESTAMP; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; /** * Creates a {@link ContractAgreementMessage} from a {@link JsonObject}. */ public class JsonObjectToContractAgreementMessageTransformer extends AbstractJsonLdTransformer { private static final Set EXCLUDED_POLICY_KEYWORDS = - Set.of(DSPACE_NEGOTIATION_PROPERTY_CONSUMER_ID, DSPACE_NEGOTIATION_PROPERTY_PROVIDER_ID, DSPACE_NEGOTIATION_PROPERTY_TIMESTAMP); + Set.of(DSPACE_PROPERTY_CONSUMER_ID, DSPACE_PROPERTY_PROVIDER_ID, DSPACE_PROPERTY_TIMESTAMP); public JsonObjectToContractAgreementMessageTransformer() { super(JsonObject.class, ContractAgreementMessage.class); @@ -50,16 +50,16 @@ public JsonObjectToContractAgreementMessageTransformer() { @Override public @Nullable ContractAgreementMessage transform(@NotNull JsonObject object, @NotNull TransformerContext context) { var messageBuilder = ContractAgreementMessage.Builder.newInstance(); - if (!transformMandatoryString(object.get(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID), messageBuilder::processId, context)) { + if (!transformMandatoryString(object.get(DSPACE_PROPERTY_PROCESS_ID), messageBuilder::processId, context)) { context.problem() .missingProperty() - .type(DSPACE_NEGOTIATION_AGREEMENT_MESSAGE) - .property(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID) + .type(DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE) + .property(DSPACE_PROPERTY_PROCESS_ID) .report(); return null; } - var jsonAgreement = returnMandatoryJsonObject(object.get(DSPACE_NEGOTIATION_PROPERTY_AGREEMENT), context, DSPACE_NEGOTIATION_PROPERTY_AGREEMENT); + var jsonAgreement = returnMandatoryJsonObject(object.get(DSPACE_PROPERTY_AGREEMENT), context, DSPACE_PROPERTY_AGREEMENT); if (jsonAgreement == null) { return null; } @@ -70,8 +70,8 @@ public JsonObjectToContractAgreementMessageTransformer() { if (policy == null) { context.problem() .invalidProperty() - .type(DSPACE_NEGOTIATION_AGREEMENT_MESSAGE) - .property(DSPACE_NEGOTIATION_PROPERTY_AGREEMENT) + .type(DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE) + .property(DSPACE_PROPERTY_AGREEMENT) .report(); return null; } @@ -102,27 +102,27 @@ private ContractAgreement contractAgreement(JsonObject jsonAgreement, Policy pol if (agreementId == null) { context.problem() .missingProperty() - .type(DSPACE_NEGOTIATION_AGREEMENT_MESSAGE) + .type(DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE) .property(ID) .report(); return null; } builder.id(agreementId); - if (!transformMandatoryString(jsonAgreement.get(DSPACE_NEGOTIATION_PROPERTY_CONSUMER_ID), builder::consumerId, context)) { + if (!transformMandatoryString(jsonAgreement.get(DSPACE_PROPERTY_CONSUMER_ID), builder::consumerId, context)) { context.problem() .missingProperty() - .type(DSPACE_NEGOTIATION_AGREEMENT_MESSAGE) - .property(DSPACE_NEGOTIATION_PROPERTY_CONSUMER_ID) + .type(DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE) + .property(DSPACE_PROPERTY_CONSUMER_ID) .report(); return null; } - if (!transformMandatoryString(jsonAgreement.get(DSPACE_NEGOTIATION_PROPERTY_PROVIDER_ID), builder::providerId, context)) { + if (!transformMandatoryString(jsonAgreement.get(DSPACE_PROPERTY_PROVIDER_ID), builder::providerId, context)) { context.problem() .missingProperty() - .type(DSPACE_NEGOTIATION_AGREEMENT_MESSAGE) - .property(DSPACE_NEGOTIATION_PROPERTY_PROVIDER_ID) + .type(DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE) + .property(DSPACE_PROPERTY_PROVIDER_ID) .report(); return null; } @@ -130,12 +130,12 @@ private ContractAgreement contractAgreement(JsonObject jsonAgreement, Policy pol builder.policy(policy); builder.assetId(policy.getTarget()); - var timestamp = transformString(jsonAgreement.get(DSPACE_NEGOTIATION_PROPERTY_TIMESTAMP), context); + var timestamp = transformString(jsonAgreement.get(DSPACE_PROPERTY_TIMESTAMP), context); if (timestamp == null) { context.problem() .missingProperty() - .type(DSPACE_NEGOTIATION_AGREEMENT_MESSAGE) - .property(DSPACE_NEGOTIATION_PROPERTY_TIMESTAMP) + .type(DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE) + .property(DSPACE_PROPERTY_TIMESTAMP) .report(); return null; } @@ -144,8 +144,8 @@ private ContractAgreement contractAgreement(JsonObject jsonAgreement, Policy pol } catch (DateTimeParseException e) { context.problem() .invalidProperty() - .type(DSPACE_NEGOTIATION_AGREEMENT_MESSAGE) - .property(DSPACE_NEGOTIATION_PROPERTY_TIMESTAMP) + .type(DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE) + .property(DSPACE_PROPERTY_TIMESTAMP) .value(timestamp) .error(e.getMessage()) .report(); diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementVerificationMessageTransformer.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementVerificationMessageTransformer.java index a7cea69adb1..59eb9645863 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementVerificationMessageTransformer.java +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementVerificationMessageTransformer.java @@ -21,8 +21,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_AGREEMENT_VERIFICATION_MESSAGE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; /** * Creates a {@link ContractAgreementVerificationMessage} from a {@link JsonObject}. @@ -36,11 +36,11 @@ public JsonObjectToContractAgreementVerificationMessageTransformer() { @Override public @Nullable ContractAgreementVerificationMessage transform(@NotNull JsonObject object, @NotNull TransformerContext context) { var builder = ContractAgreementVerificationMessage.Builder.newInstance(); - if (!transformMandatoryString(object.get(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID), builder::processId, context)) { + if (!transformMandatoryString(object.get(DSPACE_PROPERTY_PROCESS_ID), builder::processId, context)) { context.problem() .missingProperty() - .type(DSPACE_NEGOTIATION_AGREEMENT_VERIFICATION_MESSAGE) - .property(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID) + .type(DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE) + .property(DSPACE_PROPERTY_PROCESS_ID) .report(); return null; } diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationEventMessageTransformer.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationEventMessageTransformer.java index 8b4b714108e..e3f1bd1b4a9 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationEventMessageTransformer.java +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationEventMessageTransformer.java @@ -23,11 +23,11 @@ import static org.eclipse.edc.connector.contract.spi.types.agreement.ContractNegotiationEventMessage.Type.ACCEPTED; import static org.eclipse.edc.connector.contract.spi.types.agreement.ContractNegotiationEventMessage.Type.FINALIZED; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_EVENT_MESSAGE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE_ACCEPTED; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE_FINALIZED; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_EVENT_TYPE; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_FINALIZED; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; /** * Creates a {@link ContractNegotiationEventMessage} from a {@link JsonObject}. @@ -43,27 +43,27 @@ public JsonObjectToContractNegotiationEventMessageTransformer() { var builder = ContractNegotiationEventMessage.Builder.newInstance(); - if (!transformMandatoryString(object.get(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID), builder::processId, context)) { + if (!transformMandatoryString(object.get(DSPACE_PROPERTY_PROCESS_ID), builder::processId, context)) { context.problem() .missingProperty() - .type(DSPACE_NEGOTIATION_EVENT_MESSAGE) - .property(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID) + .type(DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE) + .property(DSPACE_PROPERTY_PROCESS_ID) .report(); return null; } - var eventType = transformString(object.get(DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE), context); - if (DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE_ACCEPTED.equals(eventType)) { + var eventType = transformString(object.get(DSPACE_PROPERTY_EVENT_TYPE), context); + if (DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED.equals(eventType)) { builder.type(ACCEPTED); - } else if (DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE_FINALIZED.equals(eventType)) { + } else if (DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_FINALIZED.equals(eventType)) { builder.type(FINALIZED); } else { context.problem() .unexpectedType() - .type(DSPACE_NEGOTIATION_EVENT_MESSAGE) - .property(DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE) - .expected(DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE_ACCEPTED) - .expected(DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE_FINALIZED) + .type(DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE) + .property(DSPACE_PROPERTY_EVENT_TYPE) + .expected(DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED) + .expected(DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_FINALIZED) .report(); return null; } diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationTerminationMessageTransformer.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationTerminationMessageTransformer.java index 1d829cfaba7..7b4eab618b1 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationTerminationMessageTransformer.java +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationTerminationMessageTransformer.java @@ -23,10 +23,10 @@ import org.jetbrains.annotations.Nullable; import static jakarta.json.JsonValue.ValueType.ARRAY; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_CODE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_REASON; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_TERMINATION_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON; /** * Creates a {@link ContractNegotiationTerminationMessage} from a {@link JsonObject}. @@ -41,16 +41,16 @@ public JsonObjectToContractNegotiationTerminationMessageTransformer() { public @Nullable ContractNegotiationTerminationMessage transform(@NotNull JsonObject object, @NotNull TransformerContext context) { var builder = ContractNegotiationTerminationMessage.Builder.newInstance(); - if (!transformMandatoryString(object.get(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID), builder::processId, context)) { + if (!transformMandatoryString(object.get(DSPACE_PROPERTY_PROCESS_ID), builder::processId, context)) { return null; } - var code = object.get(DSPACE_NEGOTIATION_PROPERTY_CODE); + var code = object.get(DSPACE_PROPERTY_CODE); if (code != null) { // optional property transformString(code, builder::code, context); } - var reasons = object.get(DSPACE_NEGOTIATION_PROPERTY_REASON); + var reasons = object.get(DSPACE_PROPERTY_REASON); if (reasons != null) { // optional property if (reasons instanceof JsonArray) { var array = (JsonArray) reasons; @@ -60,8 +60,8 @@ public JsonObjectToContractNegotiationTerminationMessageTransformer() { } else { context.problem() .unexpectedType() - .type(DSPACE_NEGOTIATION_TERMINATION_MESSAGE) - .property(DSPACE_NEGOTIATION_PROPERTY_REASON) + .type(DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE) + .property(DSPACE_PROPERTY_REASON) .actual(reasons.getValueType().toString()) .expected(ARRAY) .report(); diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractRequestMessageTransformer.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractRequestMessageTransformer.java index f93dc1c014f..70b4e9dc487 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractRequestMessageTransformer.java +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractRequestMessageTransformer.java @@ -24,12 +24,12 @@ import org.jetbrains.annotations.Nullable; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_CALLBACK_ADDRESS; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_DATASET; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_OFFER; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_OFFER_ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_DATA_SET; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_ID; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; /** * Creates a {@link ContractRequestMessage} from a {@link JsonObject}. @@ -43,33 +43,33 @@ public JsonObjectToContractRequestMessageTransformer() { @Override public @Nullable ContractRequestMessage transform(@NotNull JsonObject requestObject, @NotNull TransformerContext context) { var builder = ContractRequestMessage.Builder.newInstance(); - if (!transformMandatoryString(requestObject.get(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID), builder::processId, context)) { + if (!transformMandatoryString(requestObject.get(DSPACE_PROPERTY_PROCESS_ID), builder::processId, context)) { context.problem() .missingProperty() - .type(DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE) - .property(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID) + .type(DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE) + .property(DSPACE_PROPERTY_PROCESS_ID) .report(); return null; } - var callback = requestObject.get(DSPACE_NEGOTIATION_PROPERTY_CALLBACK_ADDRESS); + var callback = requestObject.get(DSPACE_PROPERTY_CALLBACK_ADDRESS); if (callback != null) { builder.callbackAddress(transformString(callback, context)); } - var dataset = requestObject.get(DSPACE_NEGOTIATION_PROPERTY_DATASET); + var dataset = requestObject.get(DSPACE_PROPERTY_DATA_SET); if (dataset != null) { builder.dataSet(transformString(dataset, context)); } - var contractOffer = returnJsonObject(requestObject.get(DSPACE_NEGOTIATION_PROPERTY_OFFER), context, DSPACE_NEGOTIATION_PROPERTY_OFFER, false); + var contractOffer = returnJsonObject(requestObject.get(DSPACE_PROPERTY_OFFER), context, DSPACE_PROPERTY_OFFER, false); if (contractOffer != null) { var policy = transformObject(contractOffer, Policy.class, context); if (policy == null) { context.problem() .missingProperty() - .type(DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE) - .property(DSPACE_NEGOTIATION_PROPERTY_OFFER) + .type(DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE) + .property(DSPACE_PROPERTY_OFFER) .report(); return null; } @@ -77,7 +77,7 @@ public JsonObjectToContractRequestMessageTransformer() { if (id == null) { context.problem() .missingProperty() - .type(DSPACE_NEGOTIATION_PROPERTY_OFFER) + .type(DSPACE_PROPERTY_OFFER) .property(ID) .report(); return null; @@ -87,11 +87,11 @@ public JsonObjectToContractRequestMessageTransformer() { } else if (context.hasProblems()) { return null; } else { - if (!transformMandatoryString(requestObject.get(DSPACE_NEGOTIATION_PROPERTY_OFFER_ID), builder::contractOfferId, context)) { + if (!transformMandatoryString(requestObject.get(DSPACE_PROPERTY_OFFER_ID), builder::contractOfferId, context)) { context.problem() .missingProperty() - .type(DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE) - .property(DSPACE_NEGOTIATION_PROPERTY_OFFER) + .type(DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE) + .property(DSPACE_PROPERTY_OFFER) .report(); return null; } diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementMessageTransformerTest.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementMessageTransformerTest.java index bc9e6b4a019..b2e492e4ae8 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementMessageTransformerTest.java @@ -35,12 +35,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_AGREEMENT_MESSAGE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_AGREEMENT; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_CONSUMER_ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROVIDER_ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_TIMESTAMP; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_AGREEMENT; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_ID; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_ID; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_TIMESTAMP; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; @@ -82,15 +82,15 @@ void transform() { assertThat(result).isNotNull(); assertThat(result.getJsonString(ID).getString()).isNotNull(); assertThat(result.getJsonString(ID).getString()).isNotEmpty(); - assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_NEGOTIATION_AGREEMENT_MESSAGE); - assertThat(result.getJsonString(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID).getString()).isEqualTo(PROCESS_ID); + assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE); + assertThat(result.getJsonString(DSPACE_PROPERTY_PROCESS_ID).getString()).isEqualTo(PROCESS_ID); - var jsonAgreement = result.getJsonObject(DSPACE_NEGOTIATION_PROPERTY_AGREEMENT); + var jsonAgreement = result.getJsonObject(DSPACE_PROPERTY_AGREEMENT); assertThat(jsonAgreement).isNotNull(); assertThat(jsonAgreement.getJsonString(ID).getString()).isEqualTo(AGREEMENT_ID); - assertThat(jsonAgreement.getJsonString(DSPACE_NEGOTIATION_PROPERTY_TIMESTAMP).getString()).isEqualTo(TIMESTAMP); - assertThat(jsonAgreement.getJsonString(DSPACE_NEGOTIATION_PROPERTY_CONSUMER_ID).getString()).isEqualTo(CONSUMER_ID); - assertThat(jsonAgreement.getJsonString(DSPACE_NEGOTIATION_PROPERTY_PROVIDER_ID).getString()).isEqualTo(PROVIDER_ID); + assertThat(jsonAgreement.getJsonString(DSPACE_PROPERTY_TIMESTAMP).getString()).isEqualTo(TIMESTAMP); + assertThat(jsonAgreement.getJsonString(DSPACE_PROPERTY_CONSUMER_ID).getString()).isEqualTo(CONSUMER_ID); + assertThat(jsonAgreement.getJsonString(DSPACE_PROPERTY_PROVIDER_ID).getString()).isEqualTo(PROVIDER_ID); verify(context, never()).reportProblem(anyString()); } diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementVerificationMessageTransformerTest.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementVerificationMessageTransformerTest.java index 730b5dd2469..ce77ea30e82 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementVerificationMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementVerificationMessageTransformerTest.java @@ -26,8 +26,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_AGREEMENT_VERIFICATION_MESSAGE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -58,8 +58,8 @@ void transform() { assertThat(result).isNotNull(); assertThat(result.getJsonString(ID).getString()).isNotEmpty(); - assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_NEGOTIATION_AGREEMENT_VERIFICATION_MESSAGE); - assertThat(result.getJsonString(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID).getString()).isEqualTo(value); + assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE); + assertThat(result.getJsonString(DSPACE_PROPERTY_PROCESS_ID).getString()).isEqualTo(value); verify(context, never()).reportProblem(anyString()); } diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationEventMessageTransformerTest.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationEventMessageTransformerTest.java index 7dcafd078ca..d4eb14b791b 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationEventMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationEventMessageTransformerTest.java @@ -27,10 +27,10 @@ import static org.eclipse.edc.connector.contract.spi.types.agreement.ContractNegotiationEventMessage.Type.ACCEPTED; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_EVENT_MESSAGE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE_ACCEPTED; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_EVENT_TYPE; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -63,9 +63,9 @@ void transform() { assertThat(result).isNotNull(); assertThat(result.getJsonString(ID).getString()).isNotEmpty(); - assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_NEGOTIATION_EVENT_MESSAGE); - assertThat(result.getJsonString(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID).getString()).isEqualTo(PROCESS_ID); - assertThat(result.getJsonString(DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE).getString()).isEqualTo(DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE_ACCEPTED); + assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE); + assertThat(result.getJsonString(DSPACE_PROPERTY_PROCESS_ID).getString()).isEqualTo(PROCESS_ID); + assertThat(result.getJsonString(DSPACE_PROPERTY_EVENT_TYPE).getString()).isEqualTo(DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED); verify(context, never()).reportProblem(anyString()); } diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTerminationMessageTransformerTest.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTerminationMessageTransformerTest.java index a13ad0dcdfa..d7033eb3437 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTerminationMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTerminationMessageTransformerTest.java @@ -26,10 +26,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_CODE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_REASON; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_TERMINATION_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -65,10 +65,10 @@ void transform() { assertThat(result).isNotNull(); assertThat(result.getJsonString(ID).getString()).isNotEmpty(); - assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_NEGOTIATION_TERMINATION_MESSAGE); - assertThat(result.getJsonString(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID).getString()).isEqualTo(PROCESS_ID); - assertThat(result.getJsonString(DSPACE_NEGOTIATION_PROPERTY_CODE).getString()).isEqualTo(REJECTION_CODE); - assertThat(result.getJsonString(DSPACE_NEGOTIATION_PROPERTY_REASON).getString()).isEqualTo(REJECTION_REASON); + assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE); + assertThat(result.getJsonString(DSPACE_PROPERTY_PROCESS_ID).getString()).isEqualTo(PROCESS_ID); + assertThat(result.getJsonString(DSPACE_PROPERTY_CODE).getString()).isEqualTo(REJECTION_CODE); + assertThat(result.getJsonString(DSPACE_PROPERTY_REASON).getString()).isEqualTo(REJECTION_REASON); verify(context, never()).reportProblem(anyString()); } @@ -85,8 +85,8 @@ void verify_noReasonNoCode() { assertThat(result).isNotNull(); assertThat(result.getJsonString(ID).getString()).isNotEmpty(); - assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_NEGOTIATION_TERMINATION_MESSAGE); - assertThat(result.getJsonString(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID).getString()).isEqualTo(PROCESS_ID); + assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE); + assertThat(result.getJsonString(DSPACE_PROPERTY_PROCESS_ID).getString()).isEqualTo(PROCESS_ID); verify(context, never()).reportProblem(anyString()); } diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTransformerTest.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTransformerTest.java index 7a4c548f23d..c8ed5b2df6d 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTransformerTest.java +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTransformerTest.java @@ -47,16 +47,16 @@ import static org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiationStates.VERIFYING; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_CONTRACT_NEGOTIATION; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_STATE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_STATE_ACCEPTED; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_STATE_AGREED; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_STATE_FINALIZED; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_STATE_OFFERED; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_STATE_REQUESTED; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_STATE_TERMINATED; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_STATE_VERIFIED; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_ACCEPTED; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_AGREED; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_FINALIZED; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_OFFERED; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_REQUESTED; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_TERMINATED; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_VERIFIED; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_STATE; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -90,8 +90,8 @@ void transform() { assertThat(result).isNotNull(); assertThat(result.getString(ID)).isEqualTo(value); - assertThat(result.getString(TYPE)).isEqualTo(DSPACE_CONTRACT_NEGOTIATION); - assertThat(result.getString(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID)).isEqualTo(value); + assertThat(result.getString(TYPE)).isEqualTo(DSPACE_TYPE_CONTRACT_NEGOTIATION); + assertThat(result.getString(DSPACE_PROPERTY_PROCESS_ID)).isEqualTo(value); verify(context, never()).reportProblem(anyString()); } @@ -112,7 +112,7 @@ void transform_status(ContractNegotiationStates inputState, String expectedDspSt var result = transformer.transform(negotiation, context); assertThat(result).isNotNull(); - assertThat(result.getString(DSPACE_NEGOTIATION_PROPERTY_STATE)).isEqualTo(expectedDspState); + assertThat(result.getString(DSPACE_PROPERTY_STATE)).isEqualTo(expectedDspState); verify(context, never()).reportProblem(anyString()); } @@ -122,20 +122,20 @@ public static class Status implements ArgumentsProvider { @Override public Stream provideArguments(ExtensionContext context) { return Stream.of( - Arguments.arguments(REQUESTING, DSPACE_NEGOTIATION_STATE_REQUESTED), - Arguments.arguments(REQUESTED, DSPACE_NEGOTIATION_STATE_REQUESTED), - Arguments.arguments(OFFERING, DSPACE_NEGOTIATION_STATE_OFFERED), - Arguments.arguments(OFFERED, DSPACE_NEGOTIATION_STATE_OFFERED), - Arguments.arguments(ACCEPTING, DSPACE_NEGOTIATION_STATE_ACCEPTED), - Arguments.arguments(ACCEPTED, DSPACE_NEGOTIATION_STATE_ACCEPTED), - Arguments.arguments(AGREEING, DSPACE_NEGOTIATION_STATE_AGREED), - Arguments.arguments(AGREED, DSPACE_NEGOTIATION_STATE_AGREED), - Arguments.arguments(VERIFYING, DSPACE_NEGOTIATION_STATE_VERIFIED), - Arguments.arguments(VERIFIED, DSPACE_NEGOTIATION_STATE_VERIFIED), - Arguments.arguments(FINALIZING, DSPACE_NEGOTIATION_STATE_FINALIZED), - Arguments.arguments(FINALIZED, DSPACE_NEGOTIATION_STATE_FINALIZED), - Arguments.arguments(TERMINATING, DSPACE_NEGOTIATION_STATE_TERMINATED), - Arguments.arguments(TERMINATED, DSPACE_NEGOTIATION_STATE_TERMINATED) + Arguments.arguments(REQUESTING, DSPACE_VALUE_NEGOTIATION_STATE_REQUESTED), + Arguments.arguments(REQUESTED, DSPACE_VALUE_NEGOTIATION_STATE_REQUESTED), + Arguments.arguments(OFFERING, DSPACE_VALUE_NEGOTIATION_STATE_OFFERED), + Arguments.arguments(OFFERED, DSPACE_VALUE_NEGOTIATION_STATE_OFFERED), + Arguments.arguments(ACCEPTING, DSPACE_VALUE_NEGOTIATION_STATE_ACCEPTED), + Arguments.arguments(ACCEPTED, DSPACE_VALUE_NEGOTIATION_STATE_ACCEPTED), + Arguments.arguments(AGREEING, DSPACE_VALUE_NEGOTIATION_STATE_AGREED), + Arguments.arguments(AGREED, DSPACE_VALUE_NEGOTIATION_STATE_AGREED), + Arguments.arguments(VERIFYING, DSPACE_VALUE_NEGOTIATION_STATE_VERIFIED), + Arguments.arguments(VERIFIED, DSPACE_VALUE_NEGOTIATION_STATE_VERIFIED), + Arguments.arguments(FINALIZING, DSPACE_VALUE_NEGOTIATION_STATE_FINALIZED), + Arguments.arguments(FINALIZED, DSPACE_VALUE_NEGOTIATION_STATE_FINALIZED), + Arguments.arguments(TERMINATING, DSPACE_VALUE_NEGOTIATION_STATE_TERMINATED), + Arguments.arguments(TERMINATED, DSPACE_VALUE_NEGOTIATION_STATE_TERMINATED) ); } } diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractRequestMessageTransformerTest.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractRequestMessageTransformerTest.java index 1b1e2715b19..86d27ee948a 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractRequestMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractRequestMessageTransformerTest.java @@ -30,12 +30,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_CALLBACK_ADDRESS; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_DATASET; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_OFFER; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_OFFER_ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_DATA_SET; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_ID; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; @@ -74,12 +74,12 @@ void verify_contractOffer() { assertThat(result).isNotNull(); assertThat(result.getJsonString(ID).getString()).isNotEmpty(); - assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE); - assertThat(result.getJsonString(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID).getString()).isEqualTo(PROCESS_ID); - assertThat(result.getJsonString(DSPACE_NEGOTIATION_PROPERTY_DATASET).getString()).isEqualTo(DATASET_ID); - assertThat(result.getJsonString(DSPACE_NEGOTIATION_PROPERTY_CALLBACK_ADDRESS).getString()).isEqualTo(CALLBACK_ADDRESS); - assertThat(result.getJsonObject(DSPACE_NEGOTIATION_PROPERTY_OFFER)).isNotNull(); - assertThat(result.getJsonObject(DSPACE_NEGOTIATION_PROPERTY_OFFER).getString(ID)).isEqualTo(CONTRACT_OFFER_ID); + assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE); + assertThat(result.getJsonString(DSPACE_PROPERTY_PROCESS_ID).getString()).isEqualTo(PROCESS_ID); + assertThat(result.getJsonString(DSPACE_PROPERTY_DATA_SET).getString()).isEqualTo(DATASET_ID); + assertThat(result.getJsonString(DSPACE_PROPERTY_CALLBACK_ADDRESS).getString()).isEqualTo(CALLBACK_ADDRESS); + assertThat(result.getJsonObject(DSPACE_PROPERTY_OFFER)).isNotNull(); + assertThat(result.getJsonObject(DSPACE_PROPERTY_OFFER).getString(ID)).isEqualTo(CONTRACT_OFFER_ID); verify(context, never()).reportProblem(anyString()); } @@ -98,11 +98,11 @@ void verify_contractOfferId() { assertThat(result).isNotNull(); assertThat(result.getJsonString(ID).getString()).isNotEmpty(); - assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE); - assertThat(result.getJsonString(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID).getString()).isEqualTo(PROCESS_ID); - assertThat(result.getJsonString(DSPACE_NEGOTIATION_PROPERTY_DATASET).getString()).isEqualTo(DATASET_ID); - assertThat(result.getJsonString(DSPACE_NEGOTIATION_PROPERTY_CALLBACK_ADDRESS).getString()).isEqualTo(CALLBACK_ADDRESS); - assertThat(result.getJsonString(DSPACE_NEGOTIATION_PROPERTY_OFFER_ID)).isNotNull(); + assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE); + assertThat(result.getJsonString(DSPACE_PROPERTY_PROCESS_ID).getString()).isEqualTo(PROCESS_ID); + assertThat(result.getJsonString(DSPACE_PROPERTY_DATA_SET).getString()).isEqualTo(DATASET_ID); + assertThat(result.getJsonString(DSPACE_PROPERTY_CALLBACK_ADDRESS).getString()).isEqualTo(CALLBACK_ADDRESS); + assertThat(result.getJsonString(DSPACE_PROPERTY_OFFER_ID)).isNotNull(); verify(context, never()).reportProblem(anyString()); } diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementMessageTransformerTest.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementMessageTransformerTest.java index 7247925c85a..454919ec503 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementMessageTransformerTest.java @@ -35,13 +35,13 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_POLICY_TYPE_AGREEMENT; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_AGREEMENT_MESSAGE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_AGREEMENT; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_CONSUMER_ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROVIDER_ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_TIMESTAMP; import static org.eclipse.edc.protocol.dsp.negotiation.transform.to.TestInput.getExpanded; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_AGREEMENT; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_ID; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_ID; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_TIMESTAMP; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.contains; @@ -76,9 +76,9 @@ void setUp() { void transform() { var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, MESSAGE_ID) - .add(JsonLdKeywords.TYPE, DSPACE_NEGOTIATION_AGREEMENT_MESSAGE) - .add(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID, PROCESS_ID) - .add(DSPACE_NEGOTIATION_PROPERTY_AGREEMENT, contractAgreement()) + .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE) + .add(DSPACE_PROPERTY_PROCESS_ID, PROCESS_ID) + .add(DSPACE_PROPERTY_AGREEMENT, contractAgreement()) .build(); when(context.transform(any(JsonObject.class), eq(Policy.class))).thenReturn(policy()); @@ -107,10 +107,10 @@ void transform_nullPolicy() { var value = "example"; var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, value) - .add(JsonLdKeywords.TYPE, DSPACE_NEGOTIATION_AGREEMENT_MESSAGE) - .add(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID, value) - .add(DSPACE_NEGOTIATION_PROPERTY_AGREEMENT, contractAgreement()) - .add(DSPACE_NEGOTIATION_PROPERTY_TIMESTAMP, "123") + .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE) + .add(DSPACE_PROPERTY_PROCESS_ID, value) + .add(DSPACE_PROPERTY_AGREEMENT, contractAgreement()) + .add(DSPACE_PROPERTY_TIMESTAMP, "123") .build(); when(context.transform(any(JsonObject.class), eq(Policy.class))).thenReturn(null); @@ -125,23 +125,23 @@ void transform_invalidTimestamp() { var agreement = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, AGREEMENT_ID) .add(JsonLdKeywords.TYPE, ODRL_POLICY_TYPE_AGREEMENT) - .add(DSPACE_NEGOTIATION_PROPERTY_CONSUMER_ID, CONSUMER_ID) - .add(DSPACE_NEGOTIATION_PROPERTY_PROVIDER_ID, PROVIDER_ID) - .add(DSPACE_NEGOTIATION_PROPERTY_TIMESTAMP, "Invalid Timestamp") + .add(DSPACE_PROPERTY_CONSUMER_ID, CONSUMER_ID) + .add(DSPACE_PROPERTY_PROVIDER_ID, PROVIDER_ID) + .add(DSPACE_PROPERTY_TIMESTAMP, "Invalid Timestamp") .build(); var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, "messageId") - .add(JsonLdKeywords.TYPE, DSPACE_NEGOTIATION_AGREEMENT_MESSAGE) - .add(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID, "processId") - .add(DSPACE_NEGOTIATION_PROPERTY_AGREEMENT, agreement) + .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE) + .add(DSPACE_PROPERTY_PROCESS_ID, "processId") + .add(DSPACE_PROPERTY_AGREEMENT, agreement) .build(); when(context.transform(any(JsonObject.class), eq(Policy.class))).thenReturn(policy()); assertThat(transformer.transform(getExpanded(message), context)).isNull(); - verify(context, times(1)).reportProblem(contains(DSPACE_NEGOTIATION_PROPERTY_TIMESTAMP)); + verify(context, times(1)).reportProblem(contains(DSPACE_PROPERTY_TIMESTAMP)); } @Test @@ -149,31 +149,31 @@ void transform_missingTimestamp() { var agreement = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, AGREEMENT_ID) .add(JsonLdKeywords.TYPE, ODRL_POLICY_TYPE_AGREEMENT) - .add(DSPACE_NEGOTIATION_PROPERTY_CONSUMER_ID, CONSUMER_ID) - .add(DSPACE_NEGOTIATION_PROPERTY_PROVIDER_ID, PROVIDER_ID) + .add(DSPACE_PROPERTY_CONSUMER_ID, CONSUMER_ID) + .add(DSPACE_PROPERTY_PROVIDER_ID, PROVIDER_ID) .build(); var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, "messageId") - .add(JsonLdKeywords.TYPE, DSPACE_NEGOTIATION_AGREEMENT_MESSAGE) - .add(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID, "processId") - .add(DSPACE_NEGOTIATION_PROPERTY_AGREEMENT, agreement) + .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE) + .add(DSPACE_PROPERTY_PROCESS_ID, "processId") + .add(DSPACE_PROPERTY_AGREEMENT, agreement) .build(); when(context.transform(any(JsonObject.class), eq(Policy.class))).thenReturn(policy()); assertThat(transformer.transform(getExpanded(message), context)).isNull(); - verify(context, times(1)).reportProblem(contains(DSPACE_NEGOTIATION_PROPERTY_TIMESTAMP)); + verify(context, times(1)).reportProblem(contains(DSPACE_PROPERTY_TIMESTAMP)); } private JsonObject contractAgreement() { return jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, AGREEMENT_ID) .add(JsonLdKeywords.TYPE, ODRL_POLICY_TYPE_AGREEMENT) - .add(DSPACE_NEGOTIATION_PROPERTY_CONSUMER_ID, CONSUMER_ID) - .add(DSPACE_NEGOTIATION_PROPERTY_PROVIDER_ID, PROVIDER_ID) - .add(DSPACE_NEGOTIATION_PROPERTY_TIMESTAMP, TIMESTAMP) + .add(DSPACE_PROPERTY_CONSUMER_ID, CONSUMER_ID) + .add(DSPACE_PROPERTY_PROVIDER_ID, PROVIDER_ID) + .add(DSPACE_PROPERTY_TIMESTAMP, TIMESTAMP) .build(); } diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementVerificationMessageTransformerTest.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementVerificationMessageTransformerTest.java index dd414da41ff..17835c77cec 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementVerificationMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementVerificationMessageTransformerTest.java @@ -26,9 +26,9 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_AGREEMENT_VERIFICATION_MESSAGE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID; import static org.eclipse.edc.protocol.dsp.negotiation.transform.to.TestInput.getExpanded; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.contains; import static org.mockito.Mockito.mock; @@ -55,8 +55,8 @@ void setUp() { void transform() { var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, "messageId") - .add(JsonLdKeywords.TYPE, DSPACE_NEGOTIATION_AGREEMENT_VERIFICATION_MESSAGE) - .add(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID, PROCESS_ID) + .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE) + .add(DSPACE_PROPERTY_PROCESS_ID, PROCESS_ID) .build(); var result = transformer.transform(getExpanded(message), context); @@ -73,13 +73,13 @@ void transform() { void verify_failTransformWhenProcessIdMissing() { var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, "messageId") - .add(JsonLdKeywords.TYPE, DSPACE_NEGOTIATION_AGREEMENT_VERIFICATION_MESSAGE) + .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE) .build(); var result = transformer.transform(getExpanded(message), context); assertThat(result).isNull(); - verify(context, times(1)).reportProblem(contains(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID)); + verify(context, times(1)).reportProblem(contains(DSPACE_PROPERTY_PROCESS_ID)); } } diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationEventMessageTransformerTest.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationEventMessageTransformerTest.java index df8c443374d..a202b85956f 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationEventMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationEventMessageTransformerTest.java @@ -26,11 +26,11 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_EVENT_MESSAGE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE_ACCEPTED; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID; import static org.eclipse.edc.protocol.dsp.negotiation.transform.to.TestInput.getExpanded; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_EVENT_TYPE; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.contains; import static org.mockito.Mockito.mock; @@ -57,9 +57,9 @@ void setUp() { void transform() { var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, "id1") - .add(JsonLdKeywords.TYPE, DSPACE_NEGOTIATION_EVENT_MESSAGE) - .add(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID, PROCESS_ID) - .add(DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE, DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE_ACCEPTED) + .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE) + .add(DSPACE_PROPERTY_PROCESS_ID, PROCESS_ID) + .add(DSPACE_PROPERTY_EVENT_TYPE, DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED) .build(); var result = transformer.transform(getExpanded(message), context); @@ -77,45 +77,45 @@ void transform() { void verify_failTransformWhenProcessIdMissing() { var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, "id1") - .add(JsonLdKeywords.TYPE, DSPACE_NEGOTIATION_EVENT_MESSAGE) - .add(DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE, DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE_ACCEPTED) + .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE) + .add(DSPACE_PROPERTY_EVENT_TYPE, DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED) .build(); var result = transformer.transform(getExpanded(message), context); assertThat(result).isNull(); - verify(context, times(1)).reportProblem(contains(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID)); + verify(context, times(1)).reportProblem(contains(DSPACE_PROPERTY_PROCESS_ID)); } @Test void verify_failTransformWhenEventTypeMissing() { var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, "id1") - .add(JsonLdKeywords.TYPE, DSPACE_NEGOTIATION_EVENT_MESSAGE) - .add(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID, PROCESS_ID) + .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE) + .add(DSPACE_PROPERTY_PROCESS_ID, PROCESS_ID) .build(); var result = transformer.transform(getExpanded(message), context); assertThat(result).isNull(); - verify(context, times(1)).reportProblem(contains(DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE)); + verify(context, times(1)).reportProblem(contains(DSPACE_PROPERTY_EVENT_TYPE)); } @Test void verify_failTransformWhenEventTypeInvalid() { var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, "id1") - .add(JsonLdKeywords.TYPE, DSPACE_NEGOTIATION_EVENT_MESSAGE) - .add(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID, PROCESS_ID) - .add(DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE, "InvalidType") + .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE) + .add(DSPACE_PROPERTY_PROCESS_ID, PROCESS_ID) + .add(DSPACE_PROPERTY_EVENT_TYPE, "InvalidType") .build(); var result = transformer.transform(getExpanded(message), context); assertThat(result).isNull(); - verify(context, times(1)).reportProblem(contains(DSPACE_NEGOTIATION_PROPERTY_EVENT_TYPE)); + verify(context, times(1)).reportProblem(contains(DSPACE_PROPERTY_EVENT_TYPE)); } } diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationTerminationMessageTransformerTest.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationTerminationMessageTransformerTest.java index feedc2dc895..4df88a2d442 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationTerminationMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationTerminationMessageTransformerTest.java @@ -26,11 +26,11 @@ import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_SCHEMA; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_CODE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_REASON; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_TERMINATION_MESSAGE; import static org.eclipse.edc.protocol.dsp.negotiation.transform.to.TestInput.getExpanded; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -57,10 +57,10 @@ void transform() { var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, "id1") - .add(JsonLdKeywords.TYPE, DSPACE_NEGOTIATION_TERMINATION_MESSAGE) - .add(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID, PROCESS_ID) - .add(DSPACE_NEGOTIATION_PROPERTY_CODE, CODE) - .add(DSPACE_NEGOTIATION_PROPERTY_REASON, reasonArray) + .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE) + .add(DSPACE_PROPERTY_PROCESS_ID, PROCESS_ID) + .add(DSPACE_PROPERTY_CODE, CODE) + .add(DSPACE_PROPERTY_REASON, reasonArray) .build(); var result = transformer.transform(getExpanded(message), context); @@ -81,8 +81,8 @@ void transform() { void verify_noCodeNodReason() { var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, "id1") - .add(JsonLdKeywords.TYPE, DSPACE_NEGOTIATION_TERMINATION_MESSAGE) - .add(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID, PROCESS_ID) + .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE) + .add(DSPACE_PROPERTY_PROCESS_ID, PROCESS_ID) .build(); var result = transformer.transform(getExpanded(message), context); diff --git a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractRequestMessageTransformerTest.java b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractRequestMessageTransformerTest.java index a331220698f..98f6ac14500 100644 --- a/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractRequestMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-negotiation/dsp-negotiation-transform/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractRequestMessageTransformerTest.java @@ -32,13 +32,13 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_POLICY_TYPE_OFFER; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_CALLBACK_ADDRESS; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_DATASET; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_OFFER; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_OFFER_ID; -import static org.eclipse.edc.protocol.dsp.negotiation.transform.DspNegotiationPropertyAndTypeNames.DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID; import static org.eclipse.edc.protocol.dsp.negotiation.transform.to.TestInput.getExpanded; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_DATA_SET; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_ID; +import static org.eclipse.edc.protocol.dsp.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; @@ -70,11 +70,11 @@ void setUp() { void verify_usingOffer() { var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, OBJECT_ID) - .add(JsonLdKeywords.TYPE, DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE) - .add(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID, PROCESS_ID) - .add(DSPACE_NEGOTIATION_PROPERTY_DATASET, DATASET_ID) - .add(DSPACE_NEGOTIATION_PROPERTY_CALLBACK_ADDRESS, CALLBACK) - .add(DSPACE_NEGOTIATION_PROPERTY_OFFER, contractOffer()) + .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE) + .add(DSPACE_PROPERTY_PROCESS_ID, PROCESS_ID) + .add(DSPACE_PROPERTY_DATA_SET, DATASET_ID) + .add(DSPACE_PROPERTY_CALLBACK_ADDRESS, CALLBACK) + .add(DSPACE_PROPERTY_OFFER, contractOffer()) .build(); when(context.transform(any(JsonObject.class), eq(Policy.class))).thenReturn(policy()); @@ -100,11 +100,11 @@ void verify_usingOffer() { void verify_usingOfferId() { var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, OBJECT_ID) - .add(JsonLdKeywords.TYPE, DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE) - .add(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID, PROCESS_ID) - .add(DSPACE_NEGOTIATION_PROPERTY_DATASET, DATASET_ID) - .add(DSPACE_NEGOTIATION_PROPERTY_CALLBACK_ADDRESS, CALLBACK) - .add(DSPACE_NEGOTIATION_PROPERTY_OFFER_ID, CONTRACT_OFFER_ID) + .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE) + .add(DSPACE_PROPERTY_PROCESS_ID, PROCESS_ID) + .add(DSPACE_PROPERTY_DATA_SET, DATASET_ID) + .add(DSPACE_PROPERTY_CALLBACK_ADDRESS, CALLBACK) + .add(DSPACE_PROPERTY_OFFER_ID, CONTRACT_OFFER_ID) .build(); var result = transformer.transform(getExpanded(message), context); @@ -124,9 +124,9 @@ void verify_usingOfferId() { void verify_noCallbackOrDatasetOk() { var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, OBJECT_ID) - .add(JsonLdKeywords.TYPE, DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE) - .add(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID, PROCESS_ID) - .add(DSPACE_NEGOTIATION_PROPERTY_OFFER, contractOffer()) + .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE) + .add(DSPACE_PROPERTY_PROCESS_ID, PROCESS_ID) + .add(DSPACE_PROPERTY_OFFER, contractOffer()) .build(); when(context.transform(any(JsonObject.class), eq(Policy.class))).thenReturn(policy()); @@ -145,9 +145,9 @@ void verify_noIdContractOfferFails() { var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, OBJECT_ID) - .add(JsonLdKeywords.TYPE, DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE) - .add(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID, PROCESS_ID) - .add(DSPACE_NEGOTIATION_PROPERTY_OFFER, offer) + .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE) + .add(DSPACE_PROPERTY_PROCESS_ID, PROCESS_ID) + .add(DSPACE_PROPERTY_OFFER, offer) .build(); when(context.transform(any(JsonObject.class), eq(Policy.class))).thenReturn(policy()); @@ -163,11 +163,11 @@ void verify_noIdContractOfferFails() { void transform_nullPolicyFails() { var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, OBJECT_ID) - .add(JsonLdKeywords.TYPE, DSPACE_NEGOTIATION_CONTRACT_REQUEST_MESSAGE) - .add(DSPACE_NEGOTIATION_PROPERTY_PROCESS_ID, PROCESS_ID) - .add(DSPACE_NEGOTIATION_PROPERTY_DATASET, DATASET_ID) - .add(DSPACE_NEGOTIATION_PROPERTY_CALLBACK_ADDRESS, CALLBACK) - .add(DSPACE_NEGOTIATION_PROPERTY_OFFER, contractOffer()) + .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE) + .add(DSPACE_PROPERTY_PROCESS_ID, PROCESS_ID) + .add(DSPACE_PROPERTY_DATA_SET, DATASET_ID) + .add(DSPACE_PROPERTY_CALLBACK_ADDRESS, CALLBACK) + .add(DSPACE_PROPERTY_OFFER, contractOffer()) .build(); when(context.transform(any(JsonObject.class), eq(Policy.class))).thenReturn(null); diff --git a/data-protocols/dsp/dsp-core/build.gradle.kts b/data-protocols/dsp/dsp-spi/build.gradle.kts similarity index 100% rename from data-protocols/dsp/dsp-core/build.gradle.kts rename to data-protocols/dsp/dsp-spi/build.gradle.kts diff --git a/data-protocols/dsp/dsp-core/src/main/java/org/eclipse/edc/protocol/dsp/DspError.java b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/DspError.java similarity index 96% rename from data-protocols/dsp/dsp-core/src/main/java/org/eclipse/edc/protocol/dsp/DspError.java rename to data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/DspError.java index 62090d9610e..68fc772aeb8 100644 --- a/data-protocols/dsp/dsp-core/src/main/java/org/eclipse/edc/protocol/dsp/DspError.java +++ b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/DspError.java @@ -22,8 +22,8 @@ import java.util.Objects; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.VOCAB; -import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROCESS_ID; import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON; import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE; @@ -50,7 +50,7 @@ public JsonObject toJson() { .add(DSPACE_PROPERTY_REASON, arrayBuilder.build()); if (this.processId != null) { - objectBuilder.add(DSPACE_PROCESS_ID, this.processId); + objectBuilder.add(DSPACE_PROPERTY_PROCESS_ID, this.processId); } return objectBuilder.build(); diff --git a/data-protocols/dsp/dsp-core/src/main/java/org/eclipse/edc/protocol/dsp/DspErrorDetails.java b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/DspErrorDetails.java similarity index 100% rename from data-protocols/dsp/dsp-core/src/main/java/org/eclipse/edc/protocol/dsp/DspErrorDetails.java rename to data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/DspErrorDetails.java diff --git a/data-protocols/dsp/dsp-catalog/dsp-catalog-transform/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/DspCatalogPropertyAndTypeNames.java b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/type/DspCatalogPropertyAndTypeNames.java similarity index 63% rename from data-protocols/dsp/dsp-catalog/dsp-catalog-transform/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/DspCatalogPropertyAndTypeNames.java rename to data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/type/DspCatalogPropertyAndTypeNames.java index b3a918eca1b..655f24e6f48 100644 --- a/data-protocols/dsp/dsp-catalog/dsp-catalog-transform/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/DspCatalogPropertyAndTypeNames.java +++ b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/type/DspCatalogPropertyAndTypeNames.java @@ -12,16 +12,18 @@ * */ -package org.eclipse.edc.protocol.dsp.catalog.transform; +package org.eclipse.edc.protocol.dsp.type; -import org.eclipse.edc.jsonld.spi.Namespaces; +import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_SCHEMA; /** * Dataspace protocol types and attributes for catalog request. */ public interface DspCatalogPropertyAndTypeNames { - String DSPACE_CATALOG_REQUEST_TYPE = Namespaces.DSPACE_SCHEMA + "CatalogRequestMessage"; - String DSPACE_FILTER_PROPERTY = Namespaces.DSPACE_SCHEMA + "filter"; + String DSPACE_TYPE_CATALOG_REQUEST_MESSAGE = DSPACE_SCHEMA + "CatalogRequestMessage"; + + String DSPACE_TYPE_CATALOG_ERROR = DSPACE_SCHEMA + "CatalogError"; + String DSPACE_PROPERTY_FILTER = DSPACE_SCHEMA + "filter"; } diff --git a/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/type/DspNegotiationPropertyAndTypeNames.java b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/type/DspNegotiationPropertyAndTypeNames.java new file mode 100644 index 00000000000..5e0f11d0867 --- /dev/null +++ b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/type/DspNegotiationPropertyAndTypeNames.java @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2023 Fraunhofer Institute for Software and Systems Engineering + * + * This program and the accompanying materials are made available under the + * terms of the Apache License, Version 2.0 which is available at + * https://www.apache.org/licenses/LICENSE-2.0 + * + * SPDX-License-Identifier: Apache-2.0 + * + * Contributors: + * Fraunhofer Institute for Software and Systems Engineering - initial API and implementation + * + */ + +package org.eclipse.edc.protocol.dsp.type; + +import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_SCHEMA; + +public interface DspNegotiationPropertyAndTypeNames { + + // types + + String DSPACE_TYPE_CONTRACT_NEGOTIATION = DSPACE_SCHEMA + "ContractNegotiation"; + String DSPACE_TYPE_CONTRACT_NEGOTIATION_ERROR = DSPACE_SCHEMA + "ContractNegotiationError"; + + // messages + + String DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE = DSPACE_SCHEMA + "ContractRequestMessage"; + String DSPACE_TYPE_CONTRACT_OFFER_MESSAGE = DSPACE_SCHEMA + "ContractOfferMessage"; + String DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE = DSPACE_SCHEMA + "ContractNegotiationEventMessage"; + String DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE = DSPACE_SCHEMA + "ContractAgreementMessage"; + String DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE = DSPACE_SCHEMA + "ContractAgreementVerificationMessage"; + String DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE = DSPACE_SCHEMA + "ContractNegotiationTerminationMessage"; + + // properties + + String DSPACE_PROPERTY_EVENT_TYPE = DSPACE_SCHEMA + "eventType"; + String DSPACE_PROPERTY_AGREEMENT = DSPACE_SCHEMA + "agreement"; + String DSPACE_PROPERTY_OFFER = DSPACE_SCHEMA + "offer"; + String DSPACE_PROPERTY_OFFER_ID = DSPACE_SCHEMA + "offerId"; + String DSPACE_PROPERTY_DATA_SET = DSPACE_SCHEMA + "dataSet"; + String DSPACE_PROPERTY_TIMESTAMP = DSPACE_SCHEMA + "timestamp"; + String DSPACE_PROPERTY_CONSUMER_ID = DSPACE_SCHEMA + "consumerId"; + String DSPACE_PROPERTY_PROVIDER_ID = DSPACE_SCHEMA + "providerId"; + + // event types + + String DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED = DSPACE_SCHEMA + "ACCEPTED"; + String DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_FINALIZED = DSPACE_SCHEMA + "FINALIZED"; + + // negotiation states + + String DSPACE_VALUE_NEGOTIATION_STATE_REQUESTED = DSPACE_SCHEMA + "REQUESTED"; + String DSPACE_VALUE_NEGOTIATION_STATE_OFFERED = DSPACE_SCHEMA + "OFFERED"; + String DSPACE_VALUE_NEGOTIATION_STATE_ACCEPTED = DSPACE_SCHEMA + "ACCEPTED"; + String DSPACE_VALUE_NEGOTIATION_STATE_AGREED = DSPACE_SCHEMA + "AGREED"; + String DSPACE_VALUE_NEGOTIATION_STATE_VERIFIED = DSPACE_SCHEMA + "VERIFIED"; + String DSPACE_VALUE_NEGOTIATION_STATE_FINALIZED = DSPACE_SCHEMA + "FINALIZED"; + String DSPACE_VALUE_NEGOTIATION_STATE_TERMINATED = DSPACE_SCHEMA + "TERMINATED"; + +} diff --git a/data-protocols/dsp/dsp-core/src/main/java/org/eclipse/edc/protocol/dsp/type/DspPropertyAndTypeNames.java b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/type/DspPropertyAndTypeNames.java similarity index 79% rename from data-protocols/dsp/dsp-core/src/main/java/org/eclipse/edc/protocol/dsp/type/DspPropertyAndTypeNames.java rename to data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/type/DspPropertyAndTypeNames.java index d4130569246..592891d8205 100644 --- a/data-protocols/dsp/dsp-core/src/main/java/org/eclipse/edc/protocol/dsp/type/DspPropertyAndTypeNames.java +++ b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/type/DspPropertyAndTypeNames.java @@ -23,5 +23,7 @@ public interface DspPropertyAndTypeNames { String DSPACE_PROPERTY_CODE = DSPACE_SCHEMA + "code"; String DSPACE_PROPERTY_REASON = DSPACE_SCHEMA + "reason"; - String DSPACE_PROCESS_ID = DSPACE_SCHEMA + "processId"; + String DSPACE_PROPERTY_PROCESS_ID = DSPACE_SCHEMA + "processId"; + String DSPACE_PROPERTY_CALLBACK_ADDRESS = DSPACE_SCHEMA + "callbackAddress"; + String DSPACE_PROPERTY_STATE = DSPACE_SCHEMA + "state"; } diff --git a/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/type/DspTransferProcessPropertyAndTypeNames.java b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/type/DspTransferProcessPropertyAndTypeNames.java new file mode 100644 index 00000000000..d600f9e5588 --- /dev/null +++ b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/type/DspTransferProcessPropertyAndTypeNames.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2023 Fraunhofer Institute for Software and Systems Engineering + * + * This program and the accompanying materials are made available under the + * terms of the Apache License, Version 2.0 which is available at + * https://www.apache.org/licenses/LICENSE-2.0 + * + * SPDX-License-Identifier: Apache-2.0 + * + * Contributors: + * Fraunhofer Institute for Software and Systems Engineering - initial API and implementation + * + */ + +package org.eclipse.edc.protocol.dsp.type; + +import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_SCHEMA; + +/** + * Dataspace protocol types and attributes for catalog request. + */ +public interface DspTransferProcessPropertyAndTypeNames { + + String DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE = DSPACE_SCHEMA + "TransferRequestMessage"; + String DSPACE_TYPE_TRANSFER_START_MESSAGE = DSPACE_SCHEMA + "TransferStartMessage"; + String DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE = DSPACE_SCHEMA + "TransferCompletionMessage"; + String DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE = DSPACE_SCHEMA + "TransferTerminationMessage"; + String DSPACE_TYPE_TRANSFER_PROCESS = DSPACE_SCHEMA + "TransferProcess"; + String DSPACE_TYPE_TRANSFER_ERROR = DSPACE_SCHEMA + "TransferError"; + + String DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID = DSPACE_SCHEMA + "agreementId"; + String DSPACE_PROPERTY_DATA_ADDRESS = DSPACE_SCHEMA + "dataAddress"; + String DSPACE_PROPERTY_CORRELATION_ID = DSPACE_SCHEMA + "correlationId"; +} diff --git a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-api/build.gradle.kts b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-api/build.gradle.kts index 16be30ab3fc..85be976b6be 100644 --- a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-api/build.gradle.kts +++ b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-api/build.gradle.kts @@ -21,13 +21,11 @@ dependencies { api(project(":spi:control-plane:control-plane-spi")) api(project(":extensions:common:http")) api(project(":data-protocols:dsp:dsp-api-configuration")) - api(project(":data-protocols:dsp:dsp-core")) + api(project(":data-protocols:dsp:dsp-spi")) + api(project(":data-protocols:dsp:dsp-http-spi")) implementation(project(":spi:common:json-ld-spi")) - // TODO remove this dependency by moving type constants to another module https://github.com/eclipse-edc/Connector/issues/3014 - implementation(project(":data-protocols:dsp:dsp-transfer-process:dsp-transfer-process-transform")) - implementation(libs.jakarta.rsApi) testImplementation(project(":core:common:junit")) diff --git a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-api/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/api/controller/DspTransferProcessApiController.java b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-api/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/api/controller/DspTransferProcessApiController.java index 8259ddfe2bf..fff4c15c111 100644 --- a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-api/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/api/controller/DspTransferProcessApiController.java +++ b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-api/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/api/controller/DspTransferProcessApiController.java @@ -47,7 +47,6 @@ import static jakarta.ws.rs.core.HttpHeaders.AUTHORIZATION; import static java.lang.String.format; -import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_SCHEMA; import static org.eclipse.edc.jsonld.spi.TypeUtil.isOfExpectedType; import static org.eclipse.edc.protocol.dsp.DspErrorDetails.BAD_REQUEST; import static org.eclipse.edc.protocol.dsp.DspErrorDetails.NOT_IMPLEMENTED; @@ -59,10 +58,11 @@ import static org.eclipse.edc.protocol.dsp.transferprocess.api.TransferProcessApiPaths.TRANSFER_START; import static org.eclipse.edc.protocol.dsp.transferprocess.api.TransferProcessApiPaths.TRANSFER_SUSPENSION; import static org.eclipse.edc.protocol.dsp.transferprocess.api.TransferProcessApiPaths.TRANSFER_TERMINATION; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_TRANSFER_COMPLETION_TYPE; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_TRANSFER_PROCESS_REQUEST_TYPE; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_TRANSFER_START_TYPE; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_TRANSFER_TERMINATION_TYPE; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_ERROR; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_START_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE; import static org.eclipse.edc.web.spi.exception.ServiceResultHandler.exceptionMapper; /** @@ -74,8 +74,6 @@ @Path(BASE_PATH) public class DspTransferProcessApiController { - private static final String DSPACE_TRANSFER_ERROR = DSPACE_SCHEMA + "TransferError"; // TODO move to :dsp-core https://github.com/eclipse-edc/Connector/issues/3014 - private final Monitor monitor; private final TypeTransformerRegistry registry; private final TransferProcessProtocolService protocolService; @@ -122,7 +120,7 @@ public Response initiateTransferProcess(JsonObject jsonObject, @HeaderParam(AUTH TransferProcess transferProcess; try { transferProcess = handleMessage(MessageSpec.Builder.newInstance(TransferRequestMessage.class) - .expectedMessageType(DSPACE_TRANSFER_PROCESS_REQUEST_TYPE) + .expectedMessageType(DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE) .message(jsonObject) .token(token) .serviceCall(protocolService::notifyRequested) @@ -133,7 +131,7 @@ public Response initiateTransferProcess(JsonObject jsonObject, @HeaderParam(AUTH monitor.debug(String.format(BAD_REQUEST + ": %s", exception.getMessages())); return errorResponse(Optional.empty(), Response.Status.BAD_REQUEST, BAD_REQUEST); } catch (Exception exception) { - monitor.warning(String.format("Error processing %s. %s", DSPACE_TRANSFER_PROCESS_REQUEST_TYPE, exception)); + monitor.warning(String.format("Error processing %s. %s", DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE, exception)); throw exception; } @@ -161,7 +159,7 @@ public Response transferProcessStart(@PathParam("id") String id, JsonObject json try { handleMessage(MessageSpec.Builder.newInstance(TransferStartMessage.class) .processId(id) - .expectedMessageType(DSPACE_TRANSFER_START_TYPE) + .expectedMessageType(DSPACE_TYPE_TRANSFER_START_MESSAGE) .message(jsonObject) .token(token) .serviceCall(protocolService::notifyStarted) @@ -173,7 +171,7 @@ public Response transferProcessStart(@PathParam("id") String id, JsonObject json monitor.debug(String.format(BAD_REQUEST + "Requested process id %s: %s", id, exception.getMessages())); return errorResponse(Optional.of(id), Response.Status.BAD_REQUEST, BAD_REQUEST); } catch (Exception exception) { - monitor.warning(String.format("Error processing %s. %s", DSPACE_TRANSFER_START_TYPE, exception)); + monitor.warning(String.format("Error processing %s. %s", DSPACE_TYPE_TRANSFER_START_MESSAGE, exception)); throw exception; } @@ -194,7 +192,7 @@ public Response transferProcessCompletion(@PathParam("id") String id, JsonObject try { handleMessage(MessageSpec.Builder.newInstance(TransferCompletionMessage.class) .processId(id) - .expectedMessageType(DSPACE_TRANSFER_COMPLETION_TYPE) + .expectedMessageType(DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE) .message(jsonObject) .token(token) .serviceCall(protocolService::notifyCompleted) @@ -206,7 +204,7 @@ public Response transferProcessCompletion(@PathParam("id") String id, JsonObject monitor.debug(String.format(BAD_REQUEST + "Requested process id %s: %s", id, exception.getMessages())); return errorResponse(Optional.of(id), Response.Status.BAD_REQUEST, BAD_REQUEST); } catch (Exception exception) { - monitor.warning(String.format("Error processing %s. %s", DSPACE_TRANSFER_COMPLETION_TYPE, exception)); + monitor.warning(String.format("Error processing %s. %s", DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE, exception)); throw exception; } @@ -227,7 +225,7 @@ public Response transferProcessTermination(@PathParam("id") String id, JsonObjec try { handleMessage(MessageSpec.Builder.newInstance(TransferTerminationMessage.class) .processId(id) - .expectedMessageType(DSPACE_TRANSFER_TERMINATION_TYPE) + .expectedMessageType(DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE) .message(jsonObject) .token(token) .serviceCall(protocolService::notifyTerminated) @@ -239,7 +237,7 @@ public Response transferProcessTermination(@PathParam("id") String id, JsonObjec monitor.debug(String.format(BAD_REQUEST + "Requested process id %s: %s", id, exception.getMessages())); return errorResponse(Optional.of(id), Response.Status.BAD_REQUEST, BAD_REQUEST); } catch (Exception exception) { - monitor.warning(String.format("Error processing %s. %s", DSPACE_TRANSFER_TERMINATION_TYPE, exception)); + monitor.warning(String.format("Error processing %s. %s", DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE, exception)); throw exception; } @@ -317,7 +315,7 @@ private void validateProcessId(MessageSpec messageSpec, TransferRemoteMessage private Response errorResponse(Optional processId, Response.Status code, String message) { var builder = DspError.Builder.newInstance() - .type(DSPACE_TRANSFER_ERROR) + .type(DSPACE_TYPE_TRANSFER_ERROR) .code(Integer.toString(code.getStatusCode())) .messages(List.of(message)); diff --git a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-api/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/api/controller/DspTransferProcessApiControllerTest.java b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-api/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/api/controller/DspTransferProcessApiControllerTest.java index eacad0f8a4d..c3318481e2b 100644 --- a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-api/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/api/controller/DspTransferProcessApiControllerTest.java +++ b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-api/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/api/controller/DspTransferProcessApiControllerTest.java @@ -50,7 +50,6 @@ import static io.restassured.RestAssured.given; import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_SCHEMA; import static org.eclipse.edc.protocol.dsp.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP; import static org.eclipse.edc.protocol.dsp.transferprocess.api.TransferProcessApiPaths.BASE_PATH; import static org.eclipse.edc.protocol.dsp.transferprocess.api.TransferProcessApiPaths.TRANSFER_COMPLETION; @@ -58,13 +57,14 @@ import static org.eclipse.edc.protocol.dsp.transferprocess.api.TransferProcessApiPaths.TRANSFER_START; import static org.eclipse.edc.protocol.dsp.transferprocess.api.TransferProcessApiPaths.TRANSFER_SUSPENSION; import static org.eclipse.edc.protocol.dsp.transferprocess.api.TransferProcessApiPaths.TRANSFER_TERMINATION; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_TRANSFER_COMPLETION_TYPE; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_TRANSFER_PROCESS_REQUEST_TYPE; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_TRANSFER_START_TYPE; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_TRANSFER_TERMINATION_TYPE; -import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROCESS_ID; import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_ERROR; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_START_MESSAGE; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.ArgumentMatchers.eq; @@ -76,8 +76,6 @@ @ApiTest class DspTransferProcessApiControllerTest extends RestControllerTestBase { - private static final String DSPACE_TRANSFER_ERROR = DSPACE_SCHEMA + "TransferError"; - private static final String PROCESS_ID = "testId"; private final IdentityService identityService = mock(IdentityService.class); private final TypeTransformerRegistry registry = mock(TypeTransformerRegistry.class); @@ -90,24 +88,24 @@ private static ClaimToken token() { } private static JsonObject transferRequestJson() { - return Json.createObjectBuilder().add(TYPE, DSPACE_TRANSFER_PROCESS_REQUEST_TYPE).build(); + return Json.createObjectBuilder().add(TYPE, DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE).build(); } private static JsonObject transferStartJson() { return Json.createObjectBuilder() - .add(TYPE, DSPACE_TRANSFER_START_TYPE) + .add(TYPE, DSPACE_TYPE_TRANSFER_START_MESSAGE) .build(); } private static JsonObject transferCompletionJson() { return Json.createObjectBuilder() - .add(TYPE, DSPACE_TRANSFER_COMPLETION_TYPE) + .add(TYPE, DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE) .build(); } private static JsonObject transferTerminationJson() { return Json.createObjectBuilder() - .add(TYPE, DSPACE_TRANSFER_TERMINATION_TYPE) + .add(TYPE, DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE) .build(); } @@ -154,9 +152,9 @@ void getTransferProcess_shouldReturnNotImplemented_whenOperationNotSupported() { .extract().as(JsonObject.class); assertThat(result).isNotNull(); - assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_TRANSFER_ERROR); + assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_TYPE_TRANSFER_ERROR); assertThat(result.getString(DSPACE_PROPERTY_CODE)).isEqualTo("501"); - assertThat(result.get(DSPACE_PROCESS_ID)).isNotNull(); + assertThat(result.get(DSPACE_PROPERTY_PROCESS_ID)).isNotNull(); assertThat(result.get(DSPACE_PROPERTY_REASON)).isNotNull(); } @@ -217,9 +215,9 @@ void consumerTransferProcessSuspension_shouldReturnNotImplemented_whenOperationN .extract().as(JsonObject.class); assertThat(result).isNotNull(); - assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_TRANSFER_ERROR); + assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_TYPE_TRANSFER_ERROR); assertThat(result.getString(DSPACE_PROPERTY_CODE)).isEqualTo("501"); - assertThat(result.get(DSPACE_PROCESS_ID)).isNotNull(); + assertThat(result.get(DSPACE_PROPERTY_PROCESS_ID)).isNotNull(); assertThat(result.get(DSPACE_PROPERTY_REASON)).isNotNull(); } @@ -244,12 +242,12 @@ void callEndpoint_shouldReturnUnauthorized_whenNotAuthorized(String path, JsonOb .extract().as(JsonObject.class); assertThat(result).isNotNull(); - assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_TRANSFER_ERROR); + assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_TYPE_TRANSFER_ERROR); assertThat(result.getString(DSPACE_PROPERTY_CODE)).isEqualTo("401"); assertThat(result.get(DSPACE_PROPERTY_REASON)).isNotNull(); if (!path.equals(BASE_PATH + TRANSFER_INITIAL_REQUEST)) { - assertThat(result.get(DSPACE_PROCESS_ID)).isNotNull(); + assertThat(result.get(DSPACE_PROPERTY_PROCESS_ID)).isNotNull(); } } @@ -278,12 +276,12 @@ void callEndpoint_shouldReturnBadRequest_whenRequestTransformationFails(String p .extract().as(JsonObject.class); assertThat(result).isNotNull(); - assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_TRANSFER_ERROR); + assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_TYPE_TRANSFER_ERROR); assertThat(result.getString(DSPACE_PROPERTY_CODE)).isEqualTo("400"); assertThat(result.get(DSPACE_PROPERTY_REASON)).isNotNull(); if (!path.equals(BASE_PATH + TRANSFER_INITIAL_REQUEST)) { - assertThat(result.get(DSPACE_PROCESS_ID)).isNotNull(); + assertThat(result.get(DSPACE_PROPERTY_PROCESS_ID)).isNotNull(); } } @@ -314,9 +312,9 @@ void callEndpoint_shouldReturnBadRequest_whenIdValidationFails(String path, Json .extract().as(JsonObject.class); assertThat(result).isNotNull(); - assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_TRANSFER_ERROR); + assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_TYPE_TRANSFER_ERROR); assertThat(result.getString(DSPACE_PROPERTY_CODE)).isEqualTo("400"); - assertThat(result.get(DSPACE_PROCESS_ID)).isNotNull(); + assertThat(result.get(DSPACE_PROPERTY_PROCESS_ID)).isNotNull(); assertThat(result.get(DSPACE_PROPERTY_REASON)).isNotNull(); // verify that the message protocol was set to the DSP protocol by the controller diff --git a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/build.gradle.kts b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/build.gradle.kts index eb4e23fc78c..2a498171458 100644 --- a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/build.gradle.kts +++ b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/build.gradle.kts @@ -20,6 +20,7 @@ dependencies { api(project(":spi:control-plane:transfer-spi")) api(project(":spi:common:transform-spi")) api(project(":extensions:common:json-ld")) + api(project(":data-protocols:dsp:dsp-spi")) api(project(":data-protocols:dsp:dsp-http-spi")) api(project(":data-protocols:dsp:dsp-transform")) diff --git a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/DspTransferProcessPropertyAndTypeNames.java b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/DspTransferProcessPropertyAndTypeNames.java deleted file mode 100644 index 08fd13ccf1a..00000000000 --- a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/DspTransferProcessPropertyAndTypeNames.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2023 Fraunhofer Institute for Software and Systems Engineering - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0 - * - * SPDX-License-Identifier: Apache-2.0 - * - * Contributors: - * Fraunhofer Institute for Software and Systems Engineering - initial API and implementation - * - */ - -package org.eclipse.edc.protocol.dsp.transferprocess.transformer; - -import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_SCHEMA; - -/** - * Dataspace protocol types and attributes for catalog request. - */ -public interface DspTransferProcessPropertyAndTypeNames { - - String DSPACE_TRANSFER_PROCESS_REQUEST_TYPE = DSPACE_SCHEMA + "TransferRequestMessage"; - - String DSPACE_TRANSFER_START_TYPE = DSPACE_SCHEMA + "TransferStartMessage"; - - String DSPACE_TRANSFER_COMPLETION_TYPE = DSPACE_SCHEMA + "TransferCompletionMessage"; - - String DSPACE_TRANSFER_TERMINATION_TYPE = DSPACE_SCHEMA + "TransferTerminationMessage"; - - String DSPACE_TRANSFER_PROCESS_TYPE = DSPACE_SCHEMA + "TransferProcess"; - - String DSPACE_CONTRACT_AGREEMENT_ID = DSPACE_SCHEMA + "agreementId"; - - String DSPACE_CALLBACK_ADDRESS = DSPACE_SCHEMA + "callbackAddress"; - - String DSPACE_PROCESS_ID = DSPACE_SCHEMA + "processId"; - - String DSPACE_DATA_ADDRESS = DSPACE_SCHEMA + "dataAddress"; - - String DSPACE_CORRELATION_ID = DSPACE_SCHEMA + "correlationId"; - - String DSPACE_STATE = DSPACE_SCHEMA + "state"; - - String DSPACE_REASON = DSPACE_SCHEMA + "reason"; - - String DSPACE_CODE = DSPACE_SCHEMA + "code"; -} diff --git a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/from/JsonObjectFromTransferCompletionMessageTransformer.java b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/from/JsonObjectFromTransferCompletionMessageTransformer.java index f0b514f613f..a23d3e2bc39 100644 --- a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/from/JsonObjectFromTransferCompletionMessageTransformer.java +++ b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/from/JsonObjectFromTransferCompletionMessageTransformer.java @@ -24,8 +24,8 @@ import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_TRANSFER_COMPLETION_TYPE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE; public class JsonObjectFromTransferCompletionMessageTransformer extends AbstractJsonLdTransformer { @@ -42,8 +42,8 @@ public JsonObjectFromTransferCompletionMessageTransformer(JsonBuilderFactory jso var builder = jsonBuilderFactory.createObjectBuilder(); builder.add(ID, transferCompletionMessage.getId()); - builder.add(TYPE, DSPACE_TRANSFER_COMPLETION_TYPE); - builder.add(DSPACE_PROCESS_ID, transferCompletionMessage.getProcessId()); + builder.add(TYPE, DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE); + builder.add(DSPACE_PROPERTY_PROCESS_ID, transferCompletionMessage.getProcessId()); return builder.build(); } diff --git a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/from/JsonObjectFromTransferProcessTransformer.java b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/from/JsonObjectFromTransferProcessTransformer.java index 8105618d68f..937e4bdc0d7 100644 --- a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/from/JsonObjectFromTransferProcessTransformer.java +++ b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/from/JsonObjectFromTransferProcessTransformer.java @@ -25,9 +25,9 @@ import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_CORRELATION_ID; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_STATE; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_TRANSFER_PROCESS_TYPE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_STATE; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_CORRELATION_ID; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_PROCESS; public class JsonObjectFromTransferProcessTransformer extends AbstractJsonLdTransformer { @@ -43,9 +43,9 @@ public JsonObjectFromTransferProcessTransformer(JsonBuilderFactory jsonBuilderFa var builder = jsonBuilderFactory.createObjectBuilder(); builder.add(ID, transferProcess.getId()); - builder.add(TYPE, DSPACE_TRANSFER_PROCESS_TYPE); - builder.add(DSPACE_CORRELATION_ID, transferProcess.getCorrelationId()); - builder.add(DSPACE_STATE, TransferProcessStates.from(transferProcess.getState()).name()); + builder.add(TYPE, DSPACE_TYPE_TRANSFER_PROCESS); + builder.add(DSPACE_PROPERTY_CORRELATION_ID, transferProcess.getCorrelationId()); + builder.add(DSPACE_PROPERTY_STATE, TransferProcessStates.from(transferProcess.getState()).name()); return builder.build(); } diff --git a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/from/JsonObjectFromTransferRequestMessageTransformer.java b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/from/JsonObjectFromTransferRequestMessageTransformer.java index 389283ca407..b16247d9a05 100644 --- a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/from/JsonObjectFromTransferRequestMessageTransformer.java +++ b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/from/JsonObjectFromTransferRequestMessageTransformer.java @@ -24,11 +24,11 @@ import org.jetbrains.annotations.Nullable; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCT_FORMAT_ATTRIBUTE; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_CALLBACK_ADDRESS; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_CONTRACT_AGREEMENT_ID; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_DATA_ADDRESS; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_TRANSFER_PROCESS_REQUEST_TYPE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_DATA_ADDRESS; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE; public class JsonObjectFromTransferRequestMessageTransformer extends AbstractJsonLdTransformer { @@ -46,15 +46,15 @@ public JsonObjectFromTransferRequestMessageTransformer(JsonBuilderFactory jsonBu var builder = jsonBuilderFactory.createObjectBuilder(); builder.add(JsonLdKeywords.ID, transferRequestMessage.getId()); - builder.add(JsonLdKeywords.TYPE, DSPACE_TRANSFER_PROCESS_REQUEST_TYPE); + builder.add(JsonLdKeywords.TYPE, DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE); - builder.add(DSPACE_CONTRACT_AGREEMENT_ID, transferRequestMessage.getContractId()); + builder.add(DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID, transferRequestMessage.getContractId()); builder.add(DCT_FORMAT_ATTRIBUTE, transferRequestMessage.getDataDestination().getType()); - builder.add(DSPACE_CALLBACK_ADDRESS, transferRequestMessage.getCallbackAddress()); - builder.add(DSPACE_PROCESS_ID, transferRequestMessage.getProcessId()); + builder.add(DSPACE_PROPERTY_CALLBACK_ADDRESS, transferRequestMessage.getCallbackAddress()); + builder.add(DSPACE_PROPERTY_PROCESS_ID, transferRequestMessage.getProcessId()); if (transferRequestMessage.getDataDestination().getProperties().size() > 1) { - builder.add(DSPACE_DATA_ADDRESS, context.transform(transferRequestMessage.getDataDestination(), JsonObject.class)); + builder.add(DSPACE_PROPERTY_DATA_ADDRESS, context.transform(transferRequestMessage.getDataDestination(), JsonObject.class)); } return builder.build(); } diff --git a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/from/JsonObjectFromTransferStartMessageTransformer.java b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/from/JsonObjectFromTransferStartMessageTransformer.java index 5911f01a442..49502ddb49c 100644 --- a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/from/JsonObjectFromTransferStartMessageTransformer.java +++ b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/from/JsonObjectFromTransferStartMessageTransformer.java @@ -24,9 +24,9 @@ import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_DATA_ADDRESS; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_TRANSFER_START_TYPE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_DATA_ADDRESS; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_START_MESSAGE; public class JsonObjectFromTransferStartMessageTransformer extends AbstractJsonLdTransformer { @@ -42,10 +42,10 @@ public JsonObjectFromTransferStartMessageTransformer(JsonBuilderFactory jsonBuil var builder = jsonBuilderFactory.createObjectBuilder(); builder.add(ID, transferStartMessage.getId()); - builder.add(TYPE, DSPACE_TRANSFER_START_TYPE); - builder.add(DSPACE_PROCESS_ID, transferStartMessage.getProcessId()); + builder.add(TYPE, DSPACE_TYPE_TRANSFER_START_MESSAGE); + builder.add(DSPACE_PROPERTY_PROCESS_ID, transferStartMessage.getProcessId()); if (transferStartMessage.getDataAddress() != null) { - builder.add(DSPACE_DATA_ADDRESS, context.transform(transferStartMessage.getDataAddress(), JsonObject.class)); + builder.add(DSPACE_PROPERTY_DATA_ADDRESS, context.transform(transferStartMessage.getDataAddress(), JsonObject.class)); } return builder.build(); diff --git a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/from/JsonObjectFromTransferTerminationMessageTransformer.java b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/from/JsonObjectFromTransferTerminationMessageTransformer.java index b2d0ccad722..a648b3e7711 100644 --- a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/from/JsonObjectFromTransferTerminationMessageTransformer.java +++ b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/from/JsonObjectFromTransferTerminationMessageTransformer.java @@ -24,10 +24,10 @@ import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_CODE; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_REASON; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_TRANSFER_TERMINATION_TYPE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE; public class JsonObjectFromTransferTerminationMessageTransformer extends AbstractJsonLdTransformer { @@ -43,13 +43,13 @@ public JsonObjectFromTransferTerminationMessageTransformer(JsonBuilderFactory js var builder = jsonBuilderFactory.createObjectBuilder(); builder.add(ID, transferTerminationMessage.getId()); - builder.add(TYPE, DSPACE_TRANSFER_TERMINATION_TYPE); - builder.add(DSPACE_PROCESS_ID, transferTerminationMessage.getProcessId()); + builder.add(TYPE, DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE); + builder.add(DSPACE_PROPERTY_PROCESS_ID, transferTerminationMessage.getProcessId()); if (transferTerminationMessage.getCode() != null) { - builder.add(DSPACE_CODE, transferTerminationMessage.getCode()); + builder.add(DSPACE_PROPERTY_CODE, transferTerminationMessage.getCode()); } if (transferTerminationMessage.getReason() != null) { - builder.add(DSPACE_REASON, transferTerminationMessage.getReason()); + builder.add(DSPACE_PROPERTY_REASON, transferTerminationMessage.getReason()); } return builder.build(); diff --git a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/to/JsonObjectToTransferCompletionMessageTransformer.java b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/to/JsonObjectToTransferCompletionMessageTransformer.java index baf729f7913..726a56e02e2 100644 --- a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/to/JsonObjectToTransferCompletionMessageTransformer.java +++ b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/to/JsonObjectToTransferCompletionMessageTransformer.java @@ -21,8 +21,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_TRANSFER_COMPLETION_TYPE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE; public class JsonObjectToTransferCompletionMessageTransformer extends AbstractJsonLdTransformer { @@ -34,11 +34,11 @@ public JsonObjectToTransferCompletionMessageTransformer() { public @Nullable TransferCompletionMessage transform(@NotNull JsonObject messageObject, @NotNull TransformerContext context) { var transferCompletionMessageBuilder = TransferCompletionMessage.Builder.newInstance(); - if (!transformMandatoryString(messageObject.get(DSPACE_PROCESS_ID), transferCompletionMessageBuilder::processId, context)) { + if (!transformMandatoryString(messageObject.get(DSPACE_PROPERTY_PROCESS_ID), transferCompletionMessageBuilder::processId, context)) { context.problem() .missingProperty() - .type(DSPACE_TRANSFER_COMPLETION_TYPE) - .property(DSPACE_PROCESS_ID) + .type(DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE) + .property(DSPACE_PROPERTY_PROCESS_ID) .report(); return null; } diff --git a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/to/JsonObjectToTransferRequestMessageTransformer.java b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/to/JsonObjectToTransferRequestMessageTransformer.java index 3b2c00692fe..9e33ca03477 100644 --- a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/to/JsonObjectToTransferRequestMessageTransformer.java +++ b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/to/JsonObjectToTransferRequestMessageTransformer.java @@ -23,10 +23,10 @@ import org.jetbrains.annotations.Nullable; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCT_FORMAT_ATTRIBUTE; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_CALLBACK_ADDRESS; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_CONTRACT_AGREEMENT_ID; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_DATA_ADDRESS; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_DATA_ADDRESS; public class JsonObjectToTransferRequestMessageTransformer extends AbstractJsonLdTransformer { @@ -40,11 +40,11 @@ public JsonObjectToTransferRequestMessageTransformer() { visitProperties(messageObject, k -> { switch (k) { - case DSPACE_PROCESS_ID: + case DSPACE_PROPERTY_PROCESS_ID: return v -> transferRequestMessageBuilder.processId(transformString(v, context)); - case DSPACE_CONTRACT_AGREEMENT_ID: + case DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID: return v -> transferRequestMessageBuilder.contractId(transformString(v, context)); - case DSPACE_CALLBACK_ADDRESS: + case DSPACE_PROPERTY_CALLBACK_ADDRESS: return v -> transferRequestMessageBuilder.callbackAddress(transformString(v, context)); default: return doNothing(); @@ -62,7 +62,7 @@ private DataAddress createDataAddress(@NotNull JsonObject requestObject, @NotNul transformString(requestObject.get(DCT_FORMAT_ATTRIBUTE), dataAddressBuilder::type, context); - var dataAddressObject = returnJsonObject(requestObject.get(DSPACE_DATA_ADDRESS), context, DSPACE_DATA_ADDRESS, false); + var dataAddressObject = returnJsonObject(requestObject.get(DSPACE_PROPERTY_DATA_ADDRESS), context, DSPACE_PROPERTY_DATA_ADDRESS, false); if (dataAddressObject != null) { dataAddressObject.forEach((key, value) -> transformString(value, v -> dataAddressBuilder.property(key, v), context)); } diff --git a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/to/JsonObjectToTransferStartMessageTransformer.java b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/to/JsonObjectToTransferStartMessageTransformer.java index 49a2d653065..0437c97a3ec 100644 --- a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/to/JsonObjectToTransferStartMessageTransformer.java +++ b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/to/JsonObjectToTransferStartMessageTransformer.java @@ -22,9 +22,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_DATA_ADDRESS; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_TRANSFER_START_TYPE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_DATA_ADDRESS; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_START_MESSAGE; public class JsonObjectToTransferStartMessageTransformer extends AbstractJsonLdTransformer { @@ -36,16 +36,16 @@ public JsonObjectToTransferStartMessageTransformer() { public @Nullable TransferStartMessage transform(@NotNull JsonObject messageObject, @NotNull TransformerContext context) { var transferStartMessageBuilder = TransferStartMessage.Builder.newInstance(); - if (!transformMandatoryString(messageObject.get(DSPACE_PROCESS_ID), transferStartMessageBuilder::processId, context)) { + if (!transformMandatoryString(messageObject.get(DSPACE_PROPERTY_PROCESS_ID), transferStartMessageBuilder::processId, context)) { context.problem() .missingProperty() - .type(DSPACE_TRANSFER_START_TYPE) - .property(DSPACE_PROCESS_ID) + .type(DSPACE_TYPE_TRANSFER_START_MESSAGE) + .property(DSPACE_PROPERTY_PROCESS_ID) .report(); return null; } - var dataAddressObject = returnJsonObject(messageObject.get(DSPACE_DATA_ADDRESS), context, DSPACE_DATA_ADDRESS, false); + var dataAddressObject = returnJsonObject(messageObject.get(DSPACE_PROPERTY_DATA_ADDRESS), context, DSPACE_PROPERTY_DATA_ADDRESS, false); if (dataAddressObject != null) { transferStartMessageBuilder.dataAddress(context.transform(dataAddressObject, DataAddress.class)); } diff --git a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/to/JsonObjectToTransferTerminationMessageTransformer.java b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/to/JsonObjectToTransferTerminationMessageTransformer.java index 9a6466940f2..a737b95e953 100644 --- a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/to/JsonObjectToTransferTerminationMessageTransformer.java +++ b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/type/to/JsonObjectToTransferTerminationMessageTransformer.java @@ -23,10 +23,10 @@ import org.jetbrains.annotations.Nullable; import static jakarta.json.JsonValue.ValueType.ARRAY; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_CODE; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_REASON; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_TRANSFER_TERMINATION_TYPE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE; public class JsonObjectToTransferTerminationMessageTransformer extends AbstractJsonLdTransformer { @@ -38,21 +38,21 @@ public JsonObjectToTransferTerminationMessageTransformer() { public @Nullable TransferTerminationMessage transform(@NotNull JsonObject messageObject, @NotNull TransformerContext context) { var transferTerminationMessageBuilder = TransferTerminationMessage.Builder.newInstance(); - if (!transformMandatoryString(messageObject.get(DSPACE_PROCESS_ID), transferTerminationMessageBuilder::processId, context)) { + if (!transformMandatoryString(messageObject.get(DSPACE_PROPERTY_PROCESS_ID), transferTerminationMessageBuilder::processId, context)) { return null; } - if (messageObject.containsKey(DSPACE_CODE)) { - transformString(messageObject.get(DSPACE_CODE), transferTerminationMessageBuilder::code, context); + if (messageObject.containsKey(DSPACE_PROPERTY_CODE)) { + transformString(messageObject.get(DSPACE_PROPERTY_CODE), transferTerminationMessageBuilder::code, context); } - var reasons = messageObject.get(DSPACE_REASON); + var reasons = messageObject.get(DSPACE_PROPERTY_REASON); if (reasons != null) { // optional property if (!(reasons instanceof JsonArray)) { context.problem() .unexpectedType() - .type(DSPACE_TRANSFER_TERMINATION_TYPE) - .property(DSPACE_REASON) + .type(DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE) + .property(DSPACE_PROPERTY_REASON) .actual(reasons.getValueType()) .expected(ARRAY) .report(); diff --git a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/from/JsonObjectFromTransferCompletionMessageTransformerTest.java b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/from/JsonObjectFromTransferCompletionMessageTransformerTest.java index 4033001fac3..06e7612370b 100644 --- a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/from/JsonObjectFromTransferCompletionMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/from/JsonObjectFromTransferCompletionMessageTransformerTest.java @@ -26,8 +26,8 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_TRANSFER_COMPLETION_TYPE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -56,8 +56,8 @@ void transformTransferCompletionMessage() { var result = transformer.transform(message, context); assertThat(result).isNotNull(); - assertThat(result.getJsonString(JsonLdKeywords.TYPE).getString()).isEqualTo(DSPACE_TRANSFER_COMPLETION_TYPE); - assertThat(result.getJsonString(DSPACE_PROCESS_ID).getString()).isEqualTo("TestID"); + assertThat(result.getJsonString(JsonLdKeywords.TYPE).getString()).isEqualTo(DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE); + assertThat(result.getJsonString(DSPACE_PROPERTY_PROCESS_ID).getString()).isEqualTo("TestID"); verify(context, never()).reportProblem(anyString()); } diff --git a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/from/JsonObjectFromTransferProcessTransformerTest.java b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/from/JsonObjectFromTransferProcessTransformerTest.java index 2ab2571bc28..569c4f52528 100644 --- a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/from/JsonObjectFromTransferProcessTransformerTest.java +++ b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/from/JsonObjectFromTransferProcessTransformerTest.java @@ -29,9 +29,9 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_CORRELATION_ID; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_STATE; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_TRANSFER_PROCESS_TYPE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_STATE; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_CORRELATION_ID; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_PROCESS; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -73,10 +73,10 @@ void transformTransferProcess() { var result = transformer.transform(transferProcess, context); assertThat(result).isNotNull(); - assertThat(result.getJsonString(JsonLdKeywords.TYPE).getString()).isEqualTo(DSPACE_TRANSFER_PROCESS_TYPE); + assertThat(result.getJsonString(JsonLdKeywords.TYPE).getString()).isEqualTo(DSPACE_TYPE_TRANSFER_PROCESS); assertThat(result.getJsonString(JsonLdKeywords.ID).getString()).isEqualTo("transferProcessID"); - assertThat(result.getJsonString(DSPACE_STATE).getString()).isEqualTo("INITIAL"); - assertThat(result.getJsonString(DSPACE_CORRELATION_ID).getString()).isEqualTo("dataRequestID"); + assertThat(result.getJsonString(DSPACE_PROPERTY_STATE).getString()).isEqualTo("INITIAL"); + assertThat(result.getJsonString(DSPACE_PROPERTY_CORRELATION_ID).getString()).isEqualTo("dataRequestID"); verify(context, never()).reportProblem(anyString()); } diff --git a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/from/JsonObjectFromTransferRequestMessageTransformerTest.java b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/from/JsonObjectFromTransferRequestMessageTransformerTest.java index ac89559ebbe..9b83c6402cf 100644 --- a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/from/JsonObjectFromTransferRequestMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/from/JsonObjectFromTransferRequestMessageTransformerTest.java @@ -31,11 +31,11 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCT_FORMAT_ATTRIBUTE; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_CALLBACK_ADDRESS; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_CONTRACT_AGREEMENT_ID; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_DATA_ADDRESS; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_TRANSFER_PROCESS_REQUEST_TYPE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_DATA_ADDRESS; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isA; @@ -95,12 +95,12 @@ void transformTransferRequestMessageWithDataAddress() { var result = transformer.transform(message, context); Assertions.assertNotNull(result); - assertThat(result.getJsonString(JsonLdKeywords.TYPE).getString()).isEqualTo(DSPACE_TRANSFER_PROCESS_REQUEST_TYPE); - assertThat(result.getJsonString(DSPACE_CONTRACT_AGREEMENT_ID).getString()).isEqualTo(contractId); + assertThat(result.getJsonString(JsonLdKeywords.TYPE).getString()).isEqualTo(DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE); + assertThat(result.getJsonString(DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID).getString()).isEqualTo(contractId); assertThat(result.getJsonString(DCT_FORMAT_ATTRIBUTE).getString()).isEqualTo(dataAddressType); - assertThat(result.getJsonString(DSPACE_CALLBACK_ADDRESS).getString()).isEqualTo(callbackAddress); - assertThat(result.getJsonString(DSPACE_PROCESS_ID).getString()).isEqualTo(id); - assertThat(result.getJsonObject(DSPACE_DATA_ADDRESS).getString("keyName")).isEqualTo(dataAddressKey); + assertThat(result.getJsonString(DSPACE_PROPERTY_CALLBACK_ADDRESS).getString()).isEqualTo(callbackAddress); + assertThat(result.getJsonString(DSPACE_PROPERTY_PROCESS_ID).getString()).isEqualTo(id); + assertThat(result.getJsonObject(DSPACE_PROPERTY_DATA_ADDRESS).getString("keyName")).isEqualTo(dataAddressKey); verify(context, never()).reportProblem(anyString()); } @@ -122,12 +122,12 @@ void transformTransferRequestMessageWithoutDataAddress() { var result = transformer.transform(message, context); assertThat(result).isNotNull(); - assertThat(result.getJsonString(JsonLdKeywords.TYPE).getString()).isEqualTo(DSPACE_TRANSFER_PROCESS_REQUEST_TYPE); - assertThat(result.getJsonString(DSPACE_CONTRACT_AGREEMENT_ID).getString()).isEqualTo(contractId); + assertThat(result.getJsonString(JsonLdKeywords.TYPE).getString()).isEqualTo(DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE); + assertThat(result.getJsonString(DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID).getString()).isEqualTo(contractId); assertThat(result.getJsonString(DCT_FORMAT_ATTRIBUTE).getString()).isEqualTo(dataAddressType); - assertThat(result.getJsonString(DSPACE_CALLBACK_ADDRESS).getString()).isEqualTo(callbackAddress); - assertThat(result.getJsonString(DSPACE_PROCESS_ID).getString()).isEqualTo(id); - assertThat(result.getJsonObject(DSPACE_DATA_ADDRESS)).isEqualTo(null); + assertThat(result.getJsonString(DSPACE_PROPERTY_CALLBACK_ADDRESS).getString()).isEqualTo(callbackAddress); + assertThat(result.getJsonString(DSPACE_PROPERTY_PROCESS_ID).getString()).isEqualTo(id); + assertThat(result.getJsonObject(DSPACE_PROPERTY_DATA_ADDRESS)).isEqualTo(null); verify(context, never()).reportProblem(anyString()); } diff --git a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/from/JsonObjectFromTransferStartMessageTransformerTest.java b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/from/JsonObjectFromTransferStartMessageTransformerTest.java index 576c0b0e920..c3c48c2f11f 100644 --- a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/from/JsonObjectFromTransferStartMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/from/JsonObjectFromTransferStartMessageTransformerTest.java @@ -28,9 +28,9 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_DATA_ADDRESS; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_TRANSFER_START_TYPE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_DATA_ADDRESS; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_START_MESSAGE; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -69,9 +69,9 @@ void transformTransferStartMessage() { var result = transformer.transform(message, context); assertThat(result).isNotNull(); - assertThat(result.getJsonString(JsonLdKeywords.TYPE).getString()).isEqualTo(DSPACE_TRANSFER_START_TYPE); - assertThat(result.getJsonString(DSPACE_PROCESS_ID).getString()).isEqualTo(processId); - assertThat(result.getJsonObject(DSPACE_DATA_ADDRESS)).isEqualTo(dataAddressJson); + assertThat(result.getJsonString(JsonLdKeywords.TYPE).getString()).isEqualTo(DSPACE_TYPE_TRANSFER_START_MESSAGE); + assertThat(result.getJsonString(DSPACE_PROPERTY_PROCESS_ID).getString()).isEqualTo(processId); + assertThat(result.getJsonObject(DSPACE_PROPERTY_DATA_ADDRESS)).isEqualTo(dataAddressJson); verify(context, times(1)).transform(dataAddress, JsonObject.class); verify(context, never()).reportProblem(anyString()); diff --git a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/from/JsonObjectFromTransferTerminationMessageTransformerTest.java b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/from/JsonObjectFromTransferTerminationMessageTransformerTest.java index 5c5ee6c10f4..d91ff228f87 100644 --- a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/from/JsonObjectFromTransferTerminationMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/from/JsonObjectFromTransferTerminationMessageTransformerTest.java @@ -26,10 +26,10 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_CODE; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_REASON; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_TRANSFER_TERMINATION_TYPE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -60,10 +60,10 @@ void transformTransferTerminationMessage() { var result = transformer.transform(message, context); assertThat(result).isNotNull(); - assertThat(result.getJsonString(JsonLdKeywords.TYPE).getString()).isEqualTo(DSPACE_TRANSFER_TERMINATION_TYPE); - assertThat(result.getJsonString(DSPACE_PROCESS_ID).getString()).isEqualTo("TestID"); - assertThat(result.getJsonString(DSPACE_CODE).getString()).isEqualTo("testCode"); - assertThat(result.getJsonString(DSPACE_REASON).getString()).isEqualTo("testReason"); + assertThat(result.getJsonString(JsonLdKeywords.TYPE).getString()).isEqualTo(DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE); + assertThat(result.getJsonString(DSPACE_PROPERTY_PROCESS_ID).getString()).isEqualTo("TestID"); + assertThat(result.getJsonString(DSPACE_PROPERTY_CODE).getString()).isEqualTo("testCode"); + assertThat(result.getJsonString(DSPACE_PROPERTY_REASON).getString()).isEqualTo("testReason"); verify(context, never()).reportProblem(anyString()); } diff --git a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/to/JsonObjectToTransferCompletionMessageTransformerTest.java b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/to/JsonObjectToTransferCompletionMessageTransformerTest.java index 153911a00df..361d76630c9 100644 --- a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/to/JsonObjectToTransferCompletionMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/to/JsonObjectToTransferCompletionMessageTransformerTest.java @@ -22,9 +22,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_TRANSFER_COMPLETION_TYPE; import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.to.TestInput.getExpanded; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -47,8 +47,8 @@ void setUp() { void jsonObjectToTransferCompletionMessage() { var json = Json.createObjectBuilder() - .add(TYPE, DSPACE_TRANSFER_COMPLETION_TYPE) - .add(DSPACE_PROCESS_ID, processId) + .add(TYPE, DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE) + .add(DSPACE_PROPERTY_PROCESS_ID, processId) .build(); var result = transformer.transform(getExpanded(json), context); diff --git a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/to/JsonObjectToTransferRequestMessageTransformerTest.java b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/to/JsonObjectToTransferRequestMessageTransformerTest.java index a94d8e5a1e7..21b85daa35c 100644 --- a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/to/JsonObjectToTransferRequestMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/to/JsonObjectToTransferRequestMessageTransformerTest.java @@ -24,12 +24,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCT_FORMAT_ATTRIBUTE; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_CALLBACK_ADDRESS; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_CONTRACT_AGREEMENT_ID; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_DATA_ADDRESS; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_TRANSFER_PROCESS_REQUEST_TYPE; import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.to.TestInput.getExpanded; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_DATA_ADDRESS; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE; import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; @@ -54,12 +54,12 @@ void setUp() { @Test void jsonObjectToTransferRequestWithoutDataAddress() { var json = Json.createObjectBuilder() - .add(TYPE, DSPACE_TRANSFER_PROCESS_REQUEST_TYPE) - .add(DSPACE_CONTRACT_AGREEMENT_ID, contractId) + .add(TYPE, DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE) + .add(DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID, contractId) .add(DCT_FORMAT_ATTRIBUTE, destinationType) - .add(DSPACE_DATA_ADDRESS, Json.createObjectBuilder().build()) - .add(DSPACE_CALLBACK_ADDRESS, callbackAddress) - .add(DSPACE_PROCESS_ID, "processId") + .add(DSPACE_PROPERTY_DATA_ADDRESS, Json.createObjectBuilder().build()) + .add(DSPACE_PROPERTY_CALLBACK_ADDRESS, callbackAddress) + .add(DSPACE_PROPERTY_PROCESS_ID, "processId") .build(); var result = transformer.transform(getExpanded(json), context); @@ -76,12 +76,12 @@ void jsonObjectToTransferRequestWithoutDataAddress() { @Test void jsonObjectToTransferRequestWithDataAddress() { var json = Json.createObjectBuilder() - .add(TYPE, DSPACE_TRANSFER_PROCESS_REQUEST_TYPE) - .add(DSPACE_CONTRACT_AGREEMENT_ID, contractId) + .add(TYPE, DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE) + .add(DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID, contractId) .add(DCT_FORMAT_ATTRIBUTE, destinationType) - .add(DSPACE_DATA_ADDRESS, createDataAddress()) - .add(DSPACE_CALLBACK_ADDRESS, callbackAddress) - .add(DSPACE_PROCESS_ID, "processId") + .add(DSPACE_PROPERTY_DATA_ADDRESS, createDataAddress()) + .add(DSPACE_PROPERTY_CALLBACK_ADDRESS, callbackAddress) + .add(DSPACE_PROPERTY_PROCESS_ID, "processId") .build(); var result = transformer.transform(getExpanded(json), context); diff --git a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/to/JsonObjectToTransferStartMessageTransformerTest.java b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/to/JsonObjectToTransferStartMessageTransformerTest.java index 8763fd549c8..fab880a304e 100644 --- a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/to/JsonObjectToTransferStartMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/to/JsonObjectToTransferStartMessageTransformerTest.java @@ -24,10 +24,10 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_DATA_ADDRESS; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_TRANSFER_START_TYPE; import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.to.TestInput.getExpanded; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_DATA_ADDRESS; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_START_MESSAGE; import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; @@ -53,8 +53,8 @@ void setUp() { @Test void jsonObjectToTransferStartMessage() { var json = Json.createObjectBuilder() - .add(TYPE, DSPACE_TRANSFER_START_TYPE) - .add(DSPACE_PROCESS_ID, processId) + .add(TYPE, DSPACE_TYPE_TRANSFER_START_MESSAGE) + .add(DSPACE_PROPERTY_PROCESS_ID, processId) .build(); var result = transformer.transform(getExpanded(json), context); @@ -70,9 +70,9 @@ void jsonObjectToTransferStartMessage() { void jsonObjectToTransferStartMessageWithDataAddress() { var dataAddressObject = Json.createObjectBuilder().add(EDC_NAMESPACE + "type", "AWS").build(); var json = Json.createObjectBuilder() - .add(TYPE, DSPACE_TRANSFER_START_TYPE) - .add(DSPACE_PROCESS_ID, processId) - .add(DSPACE_DATA_ADDRESS, dataAddressObject) + .add(TYPE, DSPACE_TYPE_TRANSFER_START_MESSAGE) + .add(DSPACE_PROPERTY_PROCESS_ID, processId) + .add(DSPACE_PROPERTY_DATA_ADDRESS, dataAddressObject) .build(); var dataAddress = DataAddress.Builder.newInstance().type("AWS").build(); @@ -92,9 +92,9 @@ void jsonObjectToTransferStartMessageWithDataAddress() { @Test void jsonObjectToTransferStartMessageWithEmptyDataAddress() { var json = Json.createObjectBuilder() - .add(TYPE, DSPACE_TRANSFER_START_TYPE) - .add(DSPACE_PROCESS_ID, processId) - .add(DSPACE_DATA_ADDRESS, Json.createObjectBuilder().build()) + .add(TYPE, DSPACE_TYPE_TRANSFER_START_MESSAGE) + .add(DSPACE_PROPERTY_PROCESS_ID, processId) + .add(DSPACE_PROPERTY_DATA_ADDRESS, Json.createObjectBuilder().build()) .build(); var result = transformer.transform(getExpanded(json), context); diff --git a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/to/JsonObjectToTransferTerminationMessageTransformerTest.java b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/to/JsonObjectToTransferTerminationMessageTransformerTest.java index a9f71291922..d6403677980 100644 --- a/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/to/JsonObjectToTransferTerminationMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-transfer-process/dsp-transfer-process-transform/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transformer/to/JsonObjectToTransferTerminationMessageTransformerTest.java @@ -26,11 +26,11 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_SCHEMA; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_CODE; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_PROCESS_ID; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_REASON; -import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.DspTransferProcessPropertyAndTypeNames.DSPACE_TRANSFER_TERMINATION_TYPE; import static org.eclipse.edc.protocol.dsp.transferprocess.transformer.to.TestInput.getExpanded; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROCESS_ID; +import static org.eclipse.edc.protocol.dsp.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON; +import static org.eclipse.edc.protocol.dsp.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -57,10 +57,10 @@ void jsonObjectToTransferTerminationMessage() { var reasonArray = Json.createBuilderFactory(Map.of()).createArrayBuilder().add(reason).build(); var json = Json.createObjectBuilder() - .add(TYPE, DSPACE_TRANSFER_TERMINATION_TYPE) - .add(DSPACE_PROCESS_ID, "TestProcessId") - .add(DSPACE_CODE, "testCode") - .add(DSPACE_REASON, Json.createBuilderFactory(Map.of()).createArrayBuilder().add(reasonArray).build()) + .add(TYPE, DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE) + .add(DSPACE_PROPERTY_PROCESS_ID, "TestProcessId") + .add(DSPACE_PROPERTY_CODE, "testCode") + .add(DSPACE_PROPERTY_REASON, Json.createBuilderFactory(Map.of()).createArrayBuilder().add(reasonArray).build()) .build(); var result = transformer.transform(getExpanded(json), context); diff --git a/settings.gradle.kts b/settings.gradle.kts index 6e5b1c824e8..91bbf0636fb 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -67,7 +67,7 @@ include(":data-protocols:dsp:dsp-catalog") include(":data-protocols:dsp:dsp-catalog:dsp-catalog-api") include(":data-protocols:dsp:dsp-catalog:dsp-catalog-http-dispatcher") include(":data-protocols:dsp:dsp-catalog:dsp-catalog-transform") -include(":data-protocols:dsp:dsp-core") +include(":data-protocols:dsp:dsp-spi") include(":data-protocols:dsp:dsp-negotiation") include(":data-protocols:dsp:dsp-negotiation:dsp-negotiation-api") include(":data-protocols:dsp:dsp-negotiation:dsp-negotiation-http-dispatcher")