From f54301f051b248986777133d60664371e20bbb2c Mon Sep 17 00:00:00 2001 From: Enrico Risa Date: Fri, 20 Jun 2025 12:06:47 +0200 Subject: [PATCH 1/4] wip: 08 refactor --- .../protocol/ProtocolVersionRegistryImpl.java | 12 ++- data-protocols/dsp/dsp-08/build.gradle.kts | 2 +- .../dsp-catalog-http-api-08/build.gradle.kts | 1 + .../http/api/DspCatalogApiV08Extension.java | 12 +-- .../controller/DspCatalogApiController08.java | 8 +- .../api/DspCatalogApiV08ExtensionTest.java | 9 ++- .../DspCatalogApiController08Test.java | 8 +- .../dsp-catalog-transform-08/build.gradle.kts | 3 +- .../DspCatalogTransformV08Extension.java | 6 +- .../build.gradle.kts | 1 + .../DspApiConfigurationV08Extension.java | 8 +- .../DspApiConfigurationV08ExtensionTest.java | 6 +- .../build.gradle.kts | 1 + .../api/DspNegotiationApiV08Extension.java | 10 +-- .../DspNegotiationApiController08.java | 6 +- .../DspNegotiationApiV08ExtensionTest.java | 25 +++--- .../DspNegotiationApiController08Test.java | 8 +- .../build.gradle.kts | 1 + .../DspNegotiationTransformV08Extension.java | 20 ++--- .../dsp/dsp-08/dsp-spi-08/build.gradle.kts | 22 +++++ .../protocol/dsp/spi/type/Dsp08Constants.java | 36 +++++++++ .../build.gradle.kts | 1 + .../DspTransferProcessApiV08Extension.java | 10 +-- .../DspTransferProcessApiController08.java | 6 +- ...DspTransferProcessApiV08ExtensionTest.java | 17 ++-- ...DspTransferProcessApiController08Test.java | 8 +- .../build.gradle.kts | 1 + ...pTransferProcessTransformV08Extension.java | 18 ++--- .../http/protocol/DspProtocolParserImpl.java | 3 +- .../edc/protocol/dsp/http/TestFixtures.java | 28 +++++++ .../protocol/DspProtocolParserImplTest.java | 8 +- ...JsonLdRemoteMessageSerializerImplTest.java | 11 +-- ...otocolTypeTransformerRegistryImplTest.java | 8 +- .../ContinuationTokenManagerImplTest.java | 9 ++- ...JsonObjectFromCatalogErrorTransformer.java | 5 -- ...tFromCatalogRequestMessageTransformer.java | 5 -- .../JsonObjectFromCatalogTransformer.java | 5 -- ...ectToCatalogRequestMessageTransformer.java | 5 -- ...ObjectFromCatalogErrorTransformerTest.java | 17 ++-- ...mCatalogRequestMessageTransformerTest.java | 13 +-- .../JsonObjectFromCatalogTransformerTest.java | 12 +-- ...oCatalogRequestMessageTransformerTest.java | 13 +-- .../build.gradle.kts | 1 + .../CatalogRequestMessageValidator.java | 4 - .../CatalogRequestMessageValidatorTest.java | 9 ++- ...omContractAgreementMessageTransformer.java | 5 -- ...reementVerificationMessageTransformer.java | 5 -- ...omContractNegotiationErrorTransformer.java | 5 -- ...actNegotiationEventMessageTransformer.java | 5 -- ...otiationTerminationMessageTransformer.java | 5 -- ...ectFromContractNegotiationTransformer.java | 5 -- ...ctFromContractOfferMessageTransformer.java | 5 -- ...FromContractRequestMessageTransformer.java | 5 -- ...ToContractAgreementMessageTransformer.java | 7 +- ...reementVerificationMessageTransformer.java | 5 -- ...ctToContractNegotiationAckTransformer.java | 5 -- ...actNegotiationEventMessageTransformer.java | 5 -- ...otiationTerminationMessageTransformer.java | 5 -- ...jectToContractOfferMessageTransformer.java | 5 -- ...ctToContractRequestMessageTransformer.java | 5 -- ...ntractAgreementMessageTransformerTest.java | 25 +++--- ...entVerificationMessageTransformerTest.java | 17 ++-- ...ntractNegotiationErrorTransformerTest.java | 17 ++-- ...egotiationEventMessageTransformerTest.java | 23 +++--- ...tionTerminationMessageTransformerTest.java | 28 ++++--- ...romContractNegotiationTransformerTest.java | 69 ++++++++-------- ...omContractOfferMessageTransformerTest.java | 27 ++++--- ...ContractRequestMessageTransformerTest.java | 26 +++--- ...ntractAgreementMessageTransformerTest.java | 80 ++++++++++--------- ...entVerificationMessageTransformerTest.java | 21 ++--- ...ContractNegotiationAckTransformerTest.java | 21 ++--- ...egotiationEventMessageTransformerTest.java | 47 +++++------ ...tionTerminationMessageTransformerTest.java | 36 ++++----- ...ToContractOfferMessageTransformerTest.java | 58 +++++++------- ...ContractRequestMessageTransformerTest.java | 50 ++++++------ .../ContractAgreementMessageValidator.java | 5 -- ...AgreementVerificationMessageValidator.java | 4 - ...tractNegotiationEventMessageValidator.java | 4 - ...egotiationTerminationMessageValidator.java | 4 - .../ContractOfferMessageValidator.java | 4 - .../ContractRequestMessageValidator.java | 4 - ...ContractAgreementMessageValidatorTest.java | 10 ++- ...ementVerificationMessageValidatorTest.java | 8 +- ...tNegotiationEventMessageValidatorTest.java | 8 +- ...iationTerminationMessageValidatorTest.java | 8 +- .../ContractOfferMessageValidatorTest.java | 26 +++--- .../ContractRequestMessageValidatorTest.java | 26 +++--- ...mTransferCompletionMessageTransformer.java | 5 -- ...sonObjectFromTransferErrorTransformer.java | 5 -- ...nObjectFromTransferProcessTransformer.java | 5 -- ...FromTransferRequestMessageTransformer.java | 5 -- ...ctFromTransferStartMessageTransformer.java | 5 -- ...mTransferSuspensionMessageTransformer.java | 5 -- ...TransferTerminationMessageTransformer.java | 5 -- ...oTransferCompletionMessageTransformer.java | 5 -- ...ObjectToTransferProcessAckTransformer.java | 5 -- ...ctToTransferRequestMessageTransformer.java | 5 -- ...jectToTransferStartMessageTransformer.java | 5 -- ...oTransferSuspensionMessageTransformer.java | 5 -- ...TransferTerminationMessageTransformer.java | 5 -- ...nsferCompletionMessageTransformerTest.java | 17 ++-- ...bjectFromTransferErrorTransformerTest.java | 16 ++-- ...ectFromTransferProcessTransformerTest.java | 28 ++++--- ...TransferRequestMessageTransformerTest.java | 40 +++++----- ...omTransferStartMessageTransformerTest.java | 20 ++--- ...nsferSuspensionMessageTransformerTest.java | 24 +++--- ...sferTerminationMessageTransformerTest.java | 24 +++--- ...nsferCompletionMessageTransformerTest.java | 18 +++-- ...ctToTransferProcessAckTransformerTest.java | 20 ++--- ...TransferRequestMessageTransformerTest.java | 40 +++++----- ...ToTransferStartMessageTransformerTest.java | 36 +++++---- ...nsferSuspensionMessageTransformerTest.java | 37 ++++----- ...sferTerminationMessageTransformerTest.java | 37 ++++----- .../TransferCompletionMessageValidator.java | 5 -- .../TransferRequestMessageValidator.java | 5 -- .../TransferStartMessageValidator.java | 5 -- .../TransferTerminationMessageValidator.java | 5 -- ...ransferCompletionMessageValidatorTest.java | 8 +- .../TransferRequestMessageValidatorTest.java | 8 +- .../TransferStartMessageValidatorTest.java | 8 +- ...ansferTerminationMessageValidatorTest.java | 8 +- .../type/DspCatalogPropertyAndTypeNames.java | 3 + .../protocol/dsp/spi/type/DspConstants.java | 5 -- .../DspNegotiationPropertyAndTypeNames.java | 23 ++++++ .../dsp/spi/type/DspPropertyAndTypeNames.java | 7 ++ ...spTransferProcessPropertyAndTypeNames.java | 9 +++ .../protocol/dsp/spi/version/DspVersions.java | 7 +- .../http/api/DspVersionApiController.java | 54 +++++++++---- .../http/api/DspVersionApiExtension.java | 8 +- .../http/api/DspVersionApiControllerTest.java | 51 ++++-------- settings.gradle.kts | 1 + .../eclipse/edc/jsonld/spi/Namespaces.java | 1 + .../edc/jsonld/spi/PropertyAndTypeNames.java | 1 + .../spi/protocol/ProtocolVersionRegistry.java | 21 ++++- system-tests/protocol-test/build.gradle.kts | 1 + .../e2e/protocol/ProtocolVersionProvider.java | 3 +- 136 files changed, 930 insertions(+), 894 deletions(-) create mode 100644 data-protocols/dsp/dsp-08/dsp-spi-08/build.gradle.kts create mode 100644 data-protocols/dsp/dsp-08/dsp-spi-08/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/Dsp08Constants.java create mode 100644 data-protocols/dsp/dsp-core/dsp-http-core/src/test/java/org/eclipse/edc/protocol/dsp/http/TestFixtures.java diff --git a/core/control-plane/control-plane-core/src/main/java/org/eclipse/edc/connector/controlplane/defaults/protocol/ProtocolVersionRegistryImpl.java b/core/control-plane/control-plane-core/src/main/java/org/eclipse/edc/connector/controlplane/defaults/protocol/ProtocolVersionRegistryImpl.java index a6f4b840ac7..c23a5013aed 100644 --- a/core/control-plane/control-plane-core/src/main/java/org/eclipse/edc/connector/controlplane/defaults/protocol/ProtocolVersionRegistryImpl.java +++ b/core/control-plane/control-plane-core/src/main/java/org/eclipse/edc/connector/controlplane/defaults/protocol/ProtocolVersionRegistryImpl.java @@ -25,13 +25,23 @@ public class ProtocolVersionRegistryImpl implements ProtocolVersionRegistry { private final List versions = new ArrayList<>(); + private ProtocolVersion defaultVersion; + @Override - public void register(ProtocolVersion protocolVersion) { + public void register(ProtocolVersion protocolVersion, boolean isDefault) { versions.add(protocolVersion); + if (isDefault) { + defaultVersion = protocolVersion; + } } @Override public ProtocolVersions getAll() { return new ProtocolVersions(versions.stream().distinct().toList()); } + + @Override + public ProtocolVersion getDefaultVersion() { + return defaultVersion; + } } diff --git a/data-protocols/dsp/dsp-08/build.gradle.kts b/data-protocols/dsp/dsp-08/build.gradle.kts index 2995055d2c3..2cbdd116a88 100644 --- a/data-protocols/dsp/dsp-08/build.gradle.kts +++ b/data-protocols/dsp/dsp-08/build.gradle.kts @@ -18,7 +18,7 @@ plugins { dependencies { api(project(":data-protocols:dsp:dsp-core")) - + api(project(":data-protocols:dsp:dsp-08:dsp-spi-08")) api(project(":data-protocols:dsp:dsp-08:dsp-http-api-configuration-08")) api(project(":data-protocols:dsp:dsp-08:dsp-http-dispatcher-08")) api(project(":data-protocols:dsp:dsp-08:dsp-catalog-08")) diff --git a/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-http-api-08/build.gradle.kts b/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-http-api-08/build.gradle.kts index 397e3d73a0b..8d40cd3e2f1 100644 --- a/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-http-api-08/build.gradle.kts +++ b/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-http-api-08/build.gradle.kts @@ -20,6 +20,7 @@ plugins { dependencies { api(project(":data-protocols:dsp:dsp-spi")) + api(project(":data-protocols:dsp:dsp-08:dsp-spi-08")) api(project(":data-protocols:dsp:dsp-http-spi")) api(project(":spi:common:core-spi")) api(project(":spi:common:web-spi")) diff --git a/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-http-api-08/src/main/java/org/eclipse/edc/protocol/dsp/catalog/http/api/DspCatalogApiV08Extension.java b/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-http-api-08/src/main/java/org/eclipse/edc/protocol/dsp/catalog/http/api/DspCatalogApiV08Extension.java index bf6d5b1acf3..29ec14ad9e1 100644 --- a/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-http-api-08/src/main/java/org/eclipse/edc/protocol/dsp/catalog/http/api/DspCatalogApiV08Extension.java +++ b/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-http-api-08/src/main/java/org/eclipse/edc/protocol/dsp/catalog/http/api/DspCatalogApiV08Extension.java @@ -40,11 +40,11 @@ import org.eclipse.edc.web.spi.configuration.ApiContext; import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_NAMESPACE_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_SCOPE_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_TRANSFORMER_CONTEXT_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_REQUEST_MESSAGE_TERM; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_SCOPE_V_08; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_TRANSFORMER_CONTEXT_V_08; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_08; import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD; /** @@ -91,8 +91,8 @@ public void initialize(ServiceExtensionContext context) { webService.registerResource(ApiContext.PROTOCOL, new DspCatalogApiController08(service, dspRequestHandler, continuationTokenManager(monitor))); webService.registerDynamicResource(ApiContext.PROTOCOL, DspCatalogApiController08.class, new JerseyJsonLdInterceptor(jsonLd, typeManager, JSON_LD, DSP_SCOPE_V_08)); - - versionRegistry.register(V_08); + + versionRegistry.register(V_08, true); } @Override diff --git a/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-http-api-08/src/main/java/org/eclipse/edc/protocol/dsp/catalog/http/api/controller/DspCatalogApiController08.java b/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-http-api-08/src/main/java/org/eclipse/edc/protocol/dsp/catalog/http/api/controller/DspCatalogApiController08.java index 36606c8465b..321c95c90e7 100644 --- a/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-http-api-08/src/main/java/org/eclipse/edc/protocol/dsp/catalog/http/api/controller/DspCatalogApiController08.java +++ b/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-http-api-08/src/main/java/org/eclipse/edc/protocol/dsp/catalog/http/api/controller/DspCatalogApiController08.java @@ -24,16 +24,16 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.eclipse.edc.protocol.dsp.catalog.http.api.CatalogApiPaths.BASE_PATH; import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_NAMESPACE_V_08; /** * Provides the HTTP endpoint for receiving catalog requests. */ -@Consumes({ APPLICATION_JSON }) -@Produces({ APPLICATION_JSON }) +@Consumes({APPLICATION_JSON}) +@Produces({APPLICATION_JSON}) @Path(BASE_PATH) public class DspCatalogApiController08 extends BaseDspCatalogApiController { - + public DspCatalogApiController08(CatalogProtocolService service, DspRequestHandler dspRequestHandler, ContinuationTokenManager continuationTokenManager) { super(service, dspRequestHandler, continuationTokenManager, DATASPACE_PROTOCOL_HTTP, DSP_NAMESPACE_V_08); } diff --git a/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-http-api-08/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/DspCatalogApiV08ExtensionTest.java b/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-http-api-08/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/DspCatalogApiV08ExtensionTest.java index d45d029203b..27454e059b5 100644 --- a/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-http-api-08/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/DspCatalogApiV08ExtensionTest.java +++ b/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-http-api-08/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/DspCatalogApiV08ExtensionTest.java @@ -24,8 +24,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import static org.eclipse.edc.protocol.dsp.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_REQUEST_MESSAGE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_NAMESPACE_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_REQUEST_MESSAGE_TERM; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -52,13 +53,13 @@ void setUp(ServiceExtensionContext context) { void shouldRegisterMessageValidator(DspCatalogApiV08Extension extension, ServiceExtensionContext context) { extension.initialize(context); - verify(validatorRegistry).register(eq(DSPACE_TYPE_CATALOG_REQUEST_MESSAGE_IRI), any()); + verify(validatorRegistry).register(eq(DSP_NAMESPACE_V_08.toIri(DSPACE_TYPE_CATALOG_REQUEST_MESSAGE_TERM)), any()); } @Test void shouldRegisterDspVersion(DspCatalogApiV08Extension extension, ServiceExtensionContext context) { extension.initialize(context); - verify(versionRegistry).register(V_08); + verify(versionRegistry).register(V_08, true); } } diff --git a/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-http-api-08/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/controller/DspCatalogApiController08Test.java b/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-http-api-08/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/controller/DspCatalogApiController08Test.java index 18627abb425..cb1ce25c264 100644 --- a/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-http-api-08/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/controller/DspCatalogApiController08Test.java +++ b/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-http-api-08/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/controller/DspCatalogApiController08Test.java @@ -18,21 +18,21 @@ import org.eclipse.edc.junit.annotations.ApiTest; import static org.eclipse.edc.protocol.dsp.catalog.http.api.CatalogApiPaths.BASE_PATH; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_NAMESPACE_V_08; @ApiTest class DspCatalogApiController08Test extends DspCatalogApiControllerTestBase { - + @Override protected String basePath() { return BASE_PATH; } - + @Override protected JsonLdNamespace namespace() { return DSP_NAMESPACE_V_08; } - + @Override protected Object controller() { return new DspCatalogApiController08(service, dspRequestHandler, continuationTokenManager); diff --git a/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-transform-08/build.gradle.kts b/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-transform-08/build.gradle.kts index 01c4389da33..d20eb485627 100644 --- a/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-transform-08/build.gradle.kts +++ b/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-transform-08/build.gradle.kts @@ -19,7 +19,8 @@ plugins { dependencies { api(project(":spi:common:core-spi")) - + api(project(":data-protocols:dsp:dsp-08:dsp-spi-08")) + implementation(project(":core:common:lib:transform-lib")) implementation(project(":data-protocols:dsp:dsp-lib:dsp-catalog-lib:dsp-catalog-transform-lib")) } diff --git a/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-transform-08/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/DspCatalogTransformV08Extension.java b/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-transform-08/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/DspCatalogTransformV08Extension.java index 631547f02ae..1278b2c99f6 100644 --- a/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-transform-08/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/DspCatalogTransformV08Extension.java +++ b/data-protocols/dsp/dsp-08/dsp-catalog-08/dsp-catalog-transform-08/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/DspCatalogTransformV08Extension.java @@ -33,8 +33,8 @@ import java.util.Map; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_TRANSFORMER_CONTEXT_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_NAMESPACE_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_TRANSFORMER_CONTEXT_V_08; import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD; /** @@ -70,7 +70,7 @@ private void registerTransformers() { var dspApiTransformerRegistry = registry.forContext(DSP_TRANSFORMER_CONTEXT_V_08); dspApiTransformerRegistry.register(new JsonObjectFromCatalogRequestMessageTransformer(jsonFactory, DSP_NAMESPACE_V_08)); dspApiTransformerRegistry.register(new JsonObjectToCatalogRequestMessageTransformer(DSP_NAMESPACE_V_08)); - + dspApiTransformerRegistry.register(new JsonObjectFromCatalogTransformer(jsonFactory, typeManager, JSON_LD, participantIdMapper, DSP_NAMESPACE_V_08)); dspApiTransformerRegistry.register(new JsonObjectFromDatasetTransformer(jsonFactory, typeManager, JSON_LD)); dspApiTransformerRegistry.register(new JsonObjectFromDistributionTransformer(jsonFactory)); diff --git a/data-protocols/dsp/dsp-08/dsp-http-api-configuration-08/build.gradle.kts b/data-protocols/dsp/dsp-08/dsp-http-api-configuration-08/build.gradle.kts index 3d78d5f9e18..6c49f105182 100644 --- a/data-protocols/dsp/dsp-08/dsp-http-api-configuration-08/build.gradle.kts +++ b/data-protocols/dsp/dsp-08/dsp-http-api-configuration-08/build.gradle.kts @@ -20,6 +20,7 @@ dependencies { api(project(":spi:control-plane:catalog-spi")) api(project(":spi:common:core-spi")) api(project(":data-protocols:dsp:dsp-spi")) + api(project(":data-protocols:dsp:dsp-08:dsp-spi-08")) api(project(":data-protocols:dsp:dsp-http-spi")) implementation(project(":core:common:lib:transform-lib")) diff --git a/data-protocols/dsp/dsp-08/dsp-http-api-configuration-08/src/main/java/org/eclipse/edc/protocol/dsp/http/api/configuration/DspApiConfigurationV08Extension.java b/data-protocols/dsp/dsp-08/dsp-http-api-configuration-08/src/main/java/org/eclipse/edc/protocol/dsp/http/api/configuration/DspApiConfigurationV08Extension.java index acba19b91fa..a16bf0091ea 100644 --- a/data-protocols/dsp/dsp-08/dsp-http-api-configuration-08/src/main/java/org/eclipse/edc/protocol/dsp/http/api/configuration/DspApiConfigurationV08Extension.java +++ b/data-protocols/dsp/dsp-08/dsp-http-api-configuration-08/src/main/java/org/eclipse/edc/protocol/dsp/http/api/configuration/DspApiConfigurationV08Extension.java @@ -48,9 +48,9 @@ import static org.eclipse.edc.policy.model.OdrlNamespace.ODRL_PREFIX; import static org.eclipse.edc.policy.model.OdrlNamespace.ODRL_SCHEMA; import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_SCOPE_V_08; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_TRANSFORMER_CONTEXT_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_NAMESPACE_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_SCOPE_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_TRANSFORMER_CONTEXT_V_08; import static org.eclipse.edc.spi.constants.CoreConstants.EDC_NAMESPACE; import static org.eclipse.edc.spi.constants.CoreConstants.EDC_PREFIX; import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD; @@ -117,7 +117,7 @@ private void registerTransformers() { dspApiTransformerRegistry.register(new JsonObjectToQuerySpecTransformer()); dspApiTransformerRegistry.register(new JsonObjectToCriterionTransformer()); dspApiTransformerRegistry.register(new JsonObjectToDataAddressDspaceTransformer(DSP_NAMESPACE_V_08)); - + dspApiTransformerRegistry.register(new JsonObjectFromPolicyTransformer(jsonBuilderFactory, participantIdMapper)); dspApiTransformerRegistry.register(new JsonObjectFromDataAddressDspaceTransformer(jsonBuilderFactory, typeManager, JSON_LD)); } diff --git a/data-protocols/dsp/dsp-08/dsp-http-api-configuration-08/src/test/java/org/eclipse/edc/protocol/dsp/http/api/configuration/DspApiConfigurationV08ExtensionTest.java b/data-protocols/dsp/dsp-08/dsp-http-api-configuration-08/src/test/java/org/eclipse/edc/protocol/dsp/http/api/configuration/DspApiConfigurationV08ExtensionTest.java index e97342b4859..d5c2fae345c 100644 --- a/data-protocols/dsp/dsp-08/dsp-http-api-configuration-08/src/test/java/org/eclipse/edc/protocol/dsp/http/api/configuration/DspApiConfigurationV08ExtensionTest.java +++ b/data-protocols/dsp/dsp-08/dsp-http-api-configuration-08/src/test/java/org/eclipse/edc/protocol/dsp/http/api/configuration/DspApiConfigurationV08ExtensionTest.java @@ -38,7 +38,7 @@ import static org.eclipse.edc.policy.model.OdrlNamespace.ODRL_PREFIX; import static org.eclipse.edc.policy.model.OdrlNamespace.ODRL_SCHEMA; import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_SCOPE_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_SCOPE_V_08; import static org.eclipse.edc.spi.constants.CoreConstants.EDC_NAMESPACE; import static org.eclipse.edc.spi.constants.CoreConstants.EDC_PREFIX; import static org.mockito.ArgumentMatchers.any; @@ -50,9 +50,9 @@ @ExtendWith(DependencyInjectionExtension.class) class DspApiConfigurationV08ExtensionTest { - + private final String webhookUrl = "http://webhook"; - + private final TypeManager typeManager = mock(); private final JsonLd jsonLd = mock(); private final ProtocolWebhookRegistry protocolWebhookRegistry = mock(); diff --git a/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-http-api-08/build.gradle.kts b/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-http-api-08/build.gradle.kts index 638be7e3668..7a22871ab49 100644 --- a/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-http-api-08/build.gradle.kts +++ b/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-http-api-08/build.gradle.kts @@ -20,6 +20,7 @@ plugins { dependencies { api(project(":data-protocols:dsp:dsp-spi")) + api(project(":data-protocols:dsp:dsp-08:dsp-spi-08")) api(project(":data-protocols:dsp:dsp-http-spi")) api(project(":spi:common:core-spi")) api(project(":spi:common:web-spi")) diff --git a/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-http-api-08/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/DspNegotiationApiV08Extension.java b/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-http-api-08/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/DspNegotiationApiV08Extension.java index 51a2b21d002..61a738c6a1a 100644 --- a/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-http-api-08/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/DspNegotiationApiV08Extension.java +++ b/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-http-api-08/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/DspNegotiationApiV08Extension.java @@ -35,15 +35,15 @@ import org.eclipse.edc.web.spi.WebService; import org.eclipse.edc.web.spi.configuration.ApiContext; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_SCOPE_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_NAMESPACE_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_SCOPE_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_TERM; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_08; import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD; /** @@ -82,8 +82,8 @@ public void initialize(ServiceExtensionContext context) { webService.registerResource(ApiContext.PROTOCOL, new DspNegotiationApiController08(protocolService, dspRequestHandler)); webService.registerDynamicResource(ApiContext.PROTOCOL, DspNegotiationApiController08.class, new JerseyJsonLdInterceptor(jsonLd, typeManager, JSON_LD, DSP_SCOPE_V_08)); - - versionRegistry.register(V_08); + + versionRegistry.register(V_08, true); } diff --git a/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-http-api-08/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/controller/DspNegotiationApiController08.java b/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-http-api-08/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/controller/DspNegotiationApiController08.java index d4539b93c95..ce936f2201e 100644 --- a/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-http-api-08/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/controller/DspNegotiationApiController08.java +++ b/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-http-api-08/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/controller/DspNegotiationApiController08.java @@ -23,14 +23,14 @@ import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP; import static org.eclipse.edc.protocol.dsp.negotiation.http.api.NegotiationApiPaths.BASE_PATH; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_NAMESPACE_V_08; /** * Provides consumer and provider endpoints for the contract negotiation according to the http binding * of the dataspace protocol. */ -@Consumes({ MediaType.APPLICATION_JSON }) -@Produces({ MediaType.APPLICATION_JSON }) +@Consumes({MediaType.APPLICATION_JSON}) +@Produces({MediaType.APPLICATION_JSON}) @Path(BASE_PATH) public class DspNegotiationApiController08 extends BaseDspNegotiationApiController { diff --git a/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-http-api-08/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/DspNegotiationApiV08ExtensionTest.java b/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-http-api-08/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/DspNegotiationApiV08ExtensionTest.java index 0d28fa9ea1c..0611d183000 100644 --- a/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-http-api-08/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/DspNegotiationApiV08ExtensionTest.java +++ b/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-http-api-08/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/DspNegotiationApiV08ExtensionTest.java @@ -21,12 +21,13 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_NAMESPACE_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_TERM; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -46,11 +47,11 @@ void setUp(ServiceExtensionContext context) { void shouldRegisterMessageValidators(DspNegotiationApiV08Extension extension, ServiceExtensionContext context) { extension.initialize(context); - verify(validatorRegistry).register(eq(DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_IRI), any()); - verify(validatorRegistry).register(eq(DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_IRI), any()); - verify(validatorRegistry).register(eq(DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_IRI), any()); - verify(validatorRegistry).register(eq(DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_IRI), any()); - verify(validatorRegistry).register(eq(DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_IRI), any()); - verify(validatorRegistry).register(eq(DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_IRI), any()); + verify(validatorRegistry).register(eq(DSP_NAMESPACE_V_08.toIri(DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_TERM)), any()); + verify(validatorRegistry).register(eq(DSP_NAMESPACE_V_08.toIri(DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_TERM)), any()); + verify(validatorRegistry).register(eq(DSP_NAMESPACE_V_08.toIri(DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_TERM)), any()); + verify(validatorRegistry).register(eq(DSP_NAMESPACE_V_08.toIri(DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_TERM)), any()); + verify(validatorRegistry).register(eq(DSP_NAMESPACE_V_08.toIri(DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_TERM)), any()); + verify(validatorRegistry).register(eq(DSP_NAMESPACE_V_08.toIri(DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_TERM)), any()); } } diff --git a/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-http-api-08/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/controller/DspNegotiationApiController08Test.java b/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-http-api-08/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/controller/DspNegotiationApiController08Test.java index 884d28b5a63..e0ae33d15b4 100644 --- a/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-http-api-08/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/controller/DspNegotiationApiController08Test.java +++ b/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-http-api-08/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/controller/DspNegotiationApiController08Test.java @@ -18,21 +18,21 @@ import org.eclipse.edc.junit.annotations.ApiTest; import static org.eclipse.edc.protocol.dsp.negotiation.http.api.NegotiationApiPaths.BASE_PATH; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_NAMESPACE_V_08; @ApiTest class DspNegotiationApiController08Test extends DspNegotiationApiControllerTestBase { - + @Override protected String basePath() { return BASE_PATH; } - + @Override protected JsonLdNamespace namespace() { return DSP_NAMESPACE_V_08; } - + @Override protected Object controller() { return new DspNegotiationApiController08(protocolService, dspRequestHandler); diff --git a/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-transform-08/build.gradle.kts b/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-transform-08/build.gradle.kts index 721ad55acf8..a29183fbd05 100644 --- a/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-transform-08/build.gradle.kts +++ b/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-transform-08/build.gradle.kts @@ -20,6 +20,7 @@ plugins { dependencies { api(project(":spi:common:core-spi")) api(project(":spi:common:transform-spi")) + api(project(":data-protocols:dsp:dsp-08:dsp-spi-08")) implementation(project(":data-protocols:dsp:dsp-lib:dsp-negotiation-lib:dsp-negotiation-transform-lib")) } diff --git a/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-transform-08/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/DspNegotiationTransformV08Extension.java b/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-transform-08/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/DspNegotiationTransformV08Extension.java index 917cc63a4c0..59bf542076a 100644 --- a/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-transform-08/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/DspNegotiationTransformV08Extension.java +++ b/data-protocols/dsp/dsp-08/dsp-negotiation-08/dsp-negotiation-transform-08/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/DspNegotiationTransformV08Extension.java @@ -39,8 +39,8 @@ import java.util.Map; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_TRANSFORMER_CONTEXT_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_NAMESPACE_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_TRANSFORMER_CONTEXT_V_08; /** * Provides the transformers for DSP v0.8 negotiation message types via the {@link TypeTransformerRegistry}. @@ -76,13 +76,13 @@ private void registerTransformers() { dspApiTransformerRegistry.register(new JsonObjectToContractNegotiationTerminationMessageTransformer(DSP_NAMESPACE_V_08)); dspApiTransformerRegistry.register(new JsonObjectToContractOfferMessageTransformer(DSP_NAMESPACE_V_08)); dspApiTransformerRegistry.register(new JsonObjectToContractNegotiationAckTransformer(DSP_NAMESPACE_V_08)); - - dspApiTransformerRegistry.register(new JsonObjectFromContractNegotiationTransformer(builderFactory)); - dspApiTransformerRegistry.register(new JsonObjectFromContractRequestMessageTransformer(builderFactory)); - dspApiTransformerRegistry.register(new JsonObjectFromContractOfferMessageTransformer(builderFactory)); - dspApiTransformerRegistry.register(new JsonObjectFromContractAgreementMessageTransformer(builderFactory)); - dspApiTransformerRegistry.register(new JsonObjectFromContractAgreementVerificationMessageTransformer(builderFactory)); - dspApiTransformerRegistry.register(new JsonObjectFromContractNegotiationEventMessageTransformer(builderFactory)); - dspApiTransformerRegistry.register(new JsonObjectFromContractNegotiationTerminationMessageTransformer(builderFactory)); + + dspApiTransformerRegistry.register(new JsonObjectFromContractNegotiationTransformer(builderFactory, DSP_NAMESPACE_V_08)); + dspApiTransformerRegistry.register(new JsonObjectFromContractRequestMessageTransformer(builderFactory, DSP_NAMESPACE_V_08)); + dspApiTransformerRegistry.register(new JsonObjectFromContractOfferMessageTransformer(builderFactory, DSP_NAMESPACE_V_08)); + dspApiTransformerRegistry.register(new JsonObjectFromContractAgreementMessageTransformer(builderFactory, DSP_NAMESPACE_V_08)); + dspApiTransformerRegistry.register(new JsonObjectFromContractAgreementVerificationMessageTransformer(builderFactory, DSP_NAMESPACE_V_08)); + dspApiTransformerRegistry.register(new JsonObjectFromContractNegotiationEventMessageTransformer(builderFactory, DSP_NAMESPACE_V_08)); + dspApiTransformerRegistry.register(new JsonObjectFromContractNegotiationTerminationMessageTransformer(builderFactory, DSP_NAMESPACE_V_08)); } } \ No newline at end of file diff --git a/data-protocols/dsp/dsp-08/dsp-spi-08/build.gradle.kts b/data-protocols/dsp/dsp-08/dsp-spi-08/build.gradle.kts new file mode 100644 index 00000000000..0bf08784434 --- /dev/null +++ b/data-protocols/dsp/dsp-08/dsp-spi-08/build.gradle.kts @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2025 Metaform Systems, Inc. + * + * 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: + * Metaform Systems, Inc. - initial API and implementation + * + */ + +plugins { + `java-library` +} + +dependencies { + api(project(":data-protocols:dsp:dsp-spi")) + implementation(project(":extensions:common:json-ld")) +} \ No newline at end of file diff --git a/data-protocols/dsp/dsp-08/dsp-spi-08/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/Dsp08Constants.java b/data-protocols/dsp/dsp-08/dsp-spi-08/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/Dsp08Constants.java new file mode 100644 index 00000000000..c4cd064fcaa --- /dev/null +++ b/data-protocols/dsp/dsp-08/dsp-spi-08/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/Dsp08Constants.java @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2025 Metaform Systems, Inc. + * + * 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: + * Metaform Systems, Inc. - initial API and implementation + * + */ + +package org.eclipse.edc.protocol.dsp.spi.type; + +import org.eclipse.edc.connector.controlplane.services.spi.protocol.ProtocolVersion; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; + +import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_SCHEMA; +import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_CONTEXT_SEPARATOR; +import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_SCOPE; +import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_TRANSFORMER_CONTEXT; + +public interface Dsp08Constants { + + String V_08_VERSION = "v0.8"; + String V_08_PATH = "/"; + ProtocolVersion V_08 = new ProtocolVersion(V_08_VERSION, V_08_PATH); + + String DSP_SCOPE_V_08 = DSP_SCOPE + DSP_CONTEXT_SEPARATOR + V_08_VERSION; + + String DSP_TRANSFORMER_CONTEXT_V_08 = DSP_TRANSFORMER_CONTEXT + DSP_CONTEXT_SEPARATOR + V_08_VERSION; + + JsonLdNamespace DSP_NAMESPACE_V_08 = new JsonLdNamespace(DSPACE_SCHEMA); +} diff --git a/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-http-api-08/build.gradle.kts b/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-http-api-08/build.gradle.kts index d89ed9e548a..1fca6a20219 100644 --- a/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-http-api-08/build.gradle.kts +++ b/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-http-api-08/build.gradle.kts @@ -23,6 +23,7 @@ dependencies { api(project(":spi:control-plane:transfer-spi")) api(project(":spi:control-plane:control-plane-spi")) api(project(":data-protocols:dsp:dsp-spi")) + api(project(":data-protocols:dsp:dsp-08:dsp-spi-08")) api(project(":data-protocols:dsp:dsp-http-spi")) implementation(project(":spi:common:json-ld-spi")) diff --git a/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-http-api-08/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/DspTransferProcessApiV08Extension.java b/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-http-api-08/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/DspTransferProcessApiV08Extension.java index 62308d5bac6..39b288aab54 100644 --- a/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-http-api-08/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/DspTransferProcessApiV08Extension.java +++ b/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-http-api-08/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/DspTransferProcessApiV08Extension.java @@ -33,13 +33,13 @@ import org.eclipse.edc.web.spi.WebService; import org.eclipse.edc.web.spi.configuration.ApiContext; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_SCOPE_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_NAMESPACE_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_SCOPE_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_START_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_TERM; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_08; import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD; /** @@ -70,8 +70,8 @@ public void initialize(ServiceExtensionContext context) { webService.registerResource(ApiContext.PROTOCOL, new DspTransferProcessApiController08(transferProcessProtocolService, dspRequestHandler)); webService.registerDynamicResource(ApiContext.PROTOCOL, DspTransferProcessApiController08.class, new JerseyJsonLdInterceptor(jsonLd, typeManager, JSON_LD, DSP_SCOPE_V_08)); - - versionRegistry.register(V_08); + + versionRegistry.register(V_08, true); } private void registerValidators() { diff --git a/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-http-api-08/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/controller/DspTransferProcessApiController08.java b/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-http-api-08/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/controller/DspTransferProcessApiController08.java index a8960cb1105..6b030d1fec6 100644 --- a/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-http-api-08/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/controller/DspTransferProcessApiController08.java +++ b/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-http-api-08/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/controller/DspTransferProcessApiController08.java @@ -22,15 +22,15 @@ import org.eclipse.edc.protocol.dsp.http.spi.message.DspRequestHandler; import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.transferprocess.http.api.TransferProcessApiPaths.BASE_PATH; /** * Provides the endpoints for receiving messages regarding transfers, like initiating, completing * and terminating a transfer process. */ -@Consumes({ MediaType.APPLICATION_JSON }) -@Produces({ MediaType.APPLICATION_JSON }) +@Consumes({MediaType.APPLICATION_JSON}) +@Produces({MediaType.APPLICATION_JSON}) @Path(BASE_PATH) public class DspTransferProcessApiController08 extends BaseDspTransferProcessApiController { diff --git a/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-http-api-08/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/DspTransferProcessApiV08ExtensionTest.java b/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-http-api-08/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/DspTransferProcessApiV08ExtensionTest.java index bfdcb869d04..35715f704a8 100644 --- a/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-http-api-08/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/DspTransferProcessApiV08ExtensionTest.java +++ b/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-http-api-08/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/DspTransferProcessApiV08ExtensionTest.java @@ -21,10 +21,11 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_START_MESSAGE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_NAMESPACE_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_START_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_TERM; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -44,10 +45,10 @@ void setUp(ServiceExtensionContext context) { void shouldRegisterMessageValidators(DspTransferProcessApiV08Extension extension, ServiceExtensionContext context) { extension.initialize(context); - verify(validatorRegistry).register(eq(DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_IRI), any()); - verify(validatorRegistry).register(eq(DSPACE_TYPE_TRANSFER_START_MESSAGE_IRI), any()); - verify(validatorRegistry).register(eq(DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_IRI), any()); - verify(validatorRegistry).register(eq(DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_IRI), any()); + verify(validatorRegistry).register(eq(DSP_NAMESPACE_V_08.toIri(DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_TERM)), any()); + verify(validatorRegistry).register(eq(DSP_NAMESPACE_V_08.toIri(DSPACE_TYPE_TRANSFER_START_MESSAGE_TERM)), any()); + verify(validatorRegistry).register(eq(DSP_NAMESPACE_V_08.toIri(DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_TERM)), any()); + verify(validatorRegistry).register(eq(DSP_NAMESPACE_V_08.toIri(DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_TERM)), any()); } } diff --git a/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-http-api-08/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/controller/DspTransferProcessApiController08Test.java b/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-http-api-08/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/controller/DspTransferProcessApiController08Test.java index 21b88a9b598..dd4b2de9303 100644 --- a/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-http-api-08/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/controller/DspTransferProcessApiController08Test.java +++ b/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-http-api-08/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/controller/DspTransferProcessApiController08Test.java @@ -17,22 +17,22 @@ import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.junit.annotations.ApiTest; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.transferprocess.http.api.TransferProcessApiPaths.BASE_PATH; @ApiTest class DspTransferProcessApiController08Test extends DspTransferProcessApiControllerBaseTest { - + @Override protected String basePath() { return BASE_PATH; } - + @Override protected JsonLdNamespace namespace() { return DSP_NAMESPACE_V_08; } - + @Override protected Object controller() { return new DspTransferProcessApiController08(protocolService, dspRequestHandler); diff --git a/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-transform-08/build.gradle.kts b/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-transform-08/build.gradle.kts index e4e7e4cedb3..873d8699669 100644 --- a/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-transform-08/build.gradle.kts +++ b/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-transform-08/build.gradle.kts @@ -22,6 +22,7 @@ dependencies { 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-08:dsp-spi-08")) api(project(":data-protocols:dsp:dsp-http-spi")) implementation(project(":core:common:lib:transform-lib")) implementation(project(":data-protocols:dsp:dsp-lib:dsp-transfer-process-lib:dsp-transfer-process-transform-lib")) diff --git a/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-transform-08/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/DspTransferProcessTransformV08Extension.java b/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-transform-08/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/DspTransferProcessTransformV08Extension.java index 2f5cfcdae25..8f759c0ea2c 100644 --- a/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-transform-08/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/DspTransferProcessTransformV08Extension.java +++ b/data-protocols/dsp/dsp-08/dsp-transfer-process-08/dsp-transfer-process-transform-08/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/DspTransferProcessTransformV08Extension.java @@ -38,8 +38,8 @@ import java.util.Map; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_TRANSFORMER_CONTEXT_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_NAMESPACE_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_TRANSFORMER_CONTEXT_V_08; import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD; /** @@ -79,12 +79,12 @@ private void registerTransformers() { dspRegistry.register(new JsonObjectToTransferTerminationMessageTransformer(DSP_NAMESPACE_V_08)); dspRegistry.register(new JsonObjectToTransferProcessAckTransformer(DSP_NAMESPACE_V_08)); dspRegistry.register(new JsonObjectToTransferSuspensionMessageTransformer(typeManager, JSON_LD, DSP_NAMESPACE_V_08)); - - dspRegistry.register(new JsonObjectFromTransferProcessTransformer(builderFactory)); - dspRegistry.register(new JsonObjectFromTransferRequestMessageTransformer(builderFactory)); - dspRegistry.register(new JsonObjectFromTransferStartMessageTransformer(builderFactory)); - dspRegistry.register(new JsonObjectFromTransferCompletionMessageTransformer(builderFactory)); - dspRegistry.register(new JsonObjectFromTransferTerminationMessageTransformer(builderFactory)); - dspRegistry.register(new JsonObjectFromTransferSuspensionMessageTransformer(builderFactory)); + + dspRegistry.register(new JsonObjectFromTransferProcessTransformer(builderFactory, DSP_NAMESPACE_V_08)); + dspRegistry.register(new JsonObjectFromTransferRequestMessageTransformer(builderFactory, DSP_NAMESPACE_V_08)); + dspRegistry.register(new JsonObjectFromTransferStartMessageTransformer(builderFactory, DSP_NAMESPACE_V_08)); + dspRegistry.register(new JsonObjectFromTransferCompletionMessageTransformer(builderFactory, DSP_NAMESPACE_V_08)); + dspRegistry.register(new JsonObjectFromTransferTerminationMessageTransformer(builderFactory, DSP_NAMESPACE_V_08)); + dspRegistry.register(new JsonObjectFromTransferSuspensionMessageTransformer(builderFactory, DSP_NAMESPACE_V_08)); } } \ No newline at end of file diff --git a/data-protocols/dsp/dsp-core/dsp-http-core/src/main/java/org/eclipse/edc/protocol/dsp/http/protocol/DspProtocolParserImpl.java b/data-protocols/dsp/dsp-core/dsp-http-core/src/main/java/org/eclipse/edc/protocol/dsp/http/protocol/DspProtocolParserImpl.java index 3ae5fc20ca2..1e7b14ef986 100644 --- a/data-protocols/dsp/dsp-core/dsp-http-core/src/main/java/org/eclipse/edc/protocol/dsp/http/protocol/DspProtocolParserImpl.java +++ b/data-protocols/dsp/dsp-core/dsp-http-core/src/main/java/org/eclipse/edc/protocol/dsp/http/protocol/DspProtocolParserImpl.java @@ -21,7 +21,6 @@ import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP; import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP_SEPARATOR; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_08; public class DspProtocolParserImpl implements DspProtocolParser { @@ -41,7 +40,7 @@ public Result parse(String protocol) { } if (protocolWithVersion.length == 1) { - return Result.success(V_08); + return Result.success(versionRegistry.getDefaultVersion()); } var protocolVersion = protocolWithVersion[1]; diff --git a/data-protocols/dsp/dsp-core/dsp-http-core/src/test/java/org/eclipse/edc/protocol/dsp/http/TestFixtures.java b/data-protocols/dsp/dsp-core/dsp-http-core/src/test/java/org/eclipse/edc/protocol/dsp/http/TestFixtures.java new file mode 100644 index 00000000000..4a239619608 --- /dev/null +++ b/data-protocols/dsp/dsp-core/dsp-http-core/src/test/java/org/eclipse/edc/protocol/dsp/http/TestFixtures.java @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2025 Metaform Systems, Inc. + * + * 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: + * Metaform Systems, Inc. - initial API and implementation + * + */ + +package org.eclipse.edc.protocol.dsp.http; + +import org.eclipse.edc.connector.controlplane.services.spi.protocol.ProtocolVersion; + +import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_CONTEXT_SEPARATOR; +import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_TRANSFORMER_CONTEXT; + +public interface TestFixtures { + + String V_MOCK_VERSION = "vX.X"; + String V_MOCK_PATH = "/"; + ProtocolVersion V_MOCK = new ProtocolVersion(V_MOCK_VERSION, V_MOCK_PATH); + String DSP_TRANSFORMER_CONTEXT_V_MOCK = DSP_TRANSFORMER_CONTEXT + DSP_CONTEXT_SEPARATOR + V_MOCK_VERSION; +} diff --git a/data-protocols/dsp/dsp-core/dsp-http-core/src/test/java/org/eclipse/edc/protocol/dsp/http/protocol/DspProtocolParserImplTest.java b/data-protocols/dsp/dsp-core/dsp-http-core/src/test/java/org/eclipse/edc/protocol/dsp/http/protocol/DspProtocolParserImplTest.java index 2f8af96b993..4c0736c02d4 100644 --- a/data-protocols/dsp/dsp-core/dsp-http-core/src/test/java/org/eclipse/edc/protocol/dsp/http/protocol/DspProtocolParserImplTest.java +++ b/data-protocols/dsp/dsp-core/dsp-http-core/src/test/java/org/eclipse/edc/protocol/dsp/http/protocol/DspProtocolParserImplTest.java @@ -14,6 +14,7 @@ package org.eclipse.edc.protocol.dsp.http.protocol; +import org.eclipse.edc.connector.controlplane.services.spi.protocol.ProtocolVersion; import org.eclipse.edc.connector.controlplane.services.spi.protocol.ProtocolVersionRegistry; import org.eclipse.edc.connector.controlplane.services.spi.protocol.ProtocolVersions; import org.eclipse.edc.protocol.dsp.spi.version.DspVersions; @@ -23,6 +24,7 @@ import java.util.List; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; +import static org.eclipse.edc.protocol.dsp.http.TestFixtures.V_MOCK; import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP; import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP_V_2024_1; import static org.mockito.Mockito.mock; @@ -30,19 +32,21 @@ public class DspProtocolParserImplTest { + private static final ProtocolVersion V_MOCK_NEW = new ProtocolVersion("2024/1", "/2024/1"); private final ProtocolVersionRegistry protocolVersionRegistry = mock(); private final DspProtocolParserImpl parser = new DspProtocolParserImpl(protocolVersionRegistry); - private final ProtocolVersions protocolVersions = new ProtocolVersions(List.of(DspVersions.V_08, DspVersions.V_2024_1)); + private final ProtocolVersions protocolVersions = new ProtocolVersions(List.of(V_MOCK, V_MOCK_NEW)); @BeforeEach void beforeEach() { + when((protocolVersionRegistry.getDefaultVersion())).thenReturn(V_MOCK); when(protocolVersionRegistry.getAll()).thenReturn(protocolVersions); } @Test void shouldParseProtocol() { assertThat(parser.parse(DATASPACE_PROTOCOL_HTTP)).isSucceeded() - .isEqualTo(DspVersions.V_08); + .isEqualTo(V_MOCK); } @Test diff --git a/data-protocols/dsp/dsp-core/dsp-http-core/src/test/java/org/eclipse/edc/protocol/dsp/http/serialization/JsonLdRemoteMessageSerializerImplTest.java b/data-protocols/dsp/dsp-core/dsp-http-core/src/test/java/org/eclipse/edc/protocol/dsp/http/serialization/JsonLdRemoteMessageSerializerImplTest.java index 95fe9b3a702..6177ae57fd5 100644 --- a/data-protocols/dsp/dsp-core/dsp-http-core/src/test/java/org/eclipse/edc/protocol/dsp/http/serialization/JsonLdRemoteMessageSerializerImplTest.java +++ b/data-protocols/dsp/dsp-core/dsp-http-core/src/test/java/org/eclipse/edc/protocol/dsp/http/serialization/JsonLdRemoteMessageSerializerImplTest.java @@ -32,9 +32,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.eclipse.edc.protocol.dsp.http.TestFixtures.DSP_TRANSFORMER_CONTEXT_V_MOCK; +import static org.eclipse.edc.protocol.dsp.http.TestFixtures.V_MOCK; import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_TRANSFORMER_CONTEXT_V_08; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_08; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.mock; @@ -44,6 +44,7 @@ class JsonLdRemoteMessageSerializerImplTest { + private final TypeTransformerRegistry registry = mock(TypeTransformerRegistry.class); private final DspProtocolTypeTransformerRegistry dspTransformerRegistry = mock(); private final DspProtocolParser protocolParser = mock(); @@ -57,7 +58,7 @@ class JsonLdRemoteMessageSerializerImplTest { void setUp() { var jsonLdService = new TitaniumJsonLd(mock(Monitor.class)); jsonLdService.registerNamespace("schema", "http://schema/"); //needed for compaction - when(registry.forContext(DSP_TRANSFORMER_CONTEXT_V_08)).thenReturn(registry); + when(registry.forContext(DSP_TRANSFORMER_CONTEXT_V_MOCK)).thenReturn(registry); serializer = new JsonLdRemoteMessageSerializerImpl(dspTransformerRegistry, typeManager, "test", jsonLdService, protocolParser, "scope"); when(message.getProtocol()).thenReturn(DATASPACE_PROTOCOL_HTTP); when(typeManager.getMapper("test")).thenReturn(mapper); @@ -71,7 +72,7 @@ void serialize_shouldReturnString_whenValidMessage() throws JsonProcessingExcept when(dspTransformerRegistry.forProtocol(DATASPACE_PROTOCOL_HTTP)).thenReturn(Result.success(registry)); when(registry.transform(message, JsonObject.class)) .thenReturn(Result.success(json)); - when(protocolParser.parse(DATASPACE_PROTOCOL_HTTP)).thenReturn(Result.success(V_08)); + when(protocolParser.parse(DATASPACE_PROTOCOL_HTTP)).thenReturn(Result.success(V_MOCK)); when(mapper.writeValueAsString(any(JsonObject.class))).thenReturn(serialized); var result = serializer.serialize(message); @@ -98,7 +99,7 @@ void serialize_shouldThrowException_whenSerializationFails() throws JsonProcessi var json = messageJson(); when(dspTransformerRegistry.forProtocol(DATASPACE_PROTOCOL_HTTP)).thenReturn(Result.success(registry)); - when(protocolParser.parse(DATASPACE_PROTOCOL_HTTP)).thenReturn(Result.success(V_08)); + when(protocolParser.parse(DATASPACE_PROTOCOL_HTTP)).thenReturn(Result.success(V_MOCK)); when(registry.transform(message, JsonObject.class)) .thenReturn(Result.success(json)); when(mapper.writeValueAsString(any(JsonObject.class))).thenThrow(JsonProcessingException.class); diff --git a/data-protocols/dsp/dsp-core/dsp-http-core/src/test/java/org/eclipse/edc/protocol/dsp/http/transform/DspProtocolTypeTransformerRegistryImplTest.java b/data-protocols/dsp/dsp-core/dsp-http-core/src/test/java/org/eclipse/edc/protocol/dsp/http/transform/DspProtocolTypeTransformerRegistryImplTest.java index 7c43fb0baf7..8373a688ddc 100644 --- a/data-protocols/dsp/dsp-core/dsp-http-core/src/test/java/org/eclipse/edc/protocol/dsp/http/transform/DspProtocolTypeTransformerRegistryImplTest.java +++ b/data-protocols/dsp/dsp-core/dsp-http-core/src/test/java/org/eclipse/edc/protocol/dsp/http/transform/DspProtocolTypeTransformerRegistryImplTest.java @@ -15,15 +15,15 @@ package org.eclipse.edc.protocol.dsp.http.transform; import org.eclipse.edc.protocol.dsp.http.spi.DspProtocolParser; -import org.eclipse.edc.protocol.dsp.spi.version.DspVersions; import org.eclipse.edc.spi.result.Result; import org.eclipse.edc.transform.spi.TypeTransformerRegistry; import org.junit.jupiter.api.Test; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; +import static org.eclipse.edc.protocol.dsp.http.TestFixtures.DSP_TRANSFORMER_CONTEXT_V_MOCK; +import static org.eclipse.edc.protocol.dsp.http.TestFixtures.V_MOCK; import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP; import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_TRANSFORMER_CONTEXT; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_TRANSFORMER_CONTEXT_V_08; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -35,8 +35,8 @@ public class DspProtocolTypeTransformerRegistryImplTest { @Test void forProtocol() { - when(protocolParser.parse(DATASPACE_PROTOCOL_HTTP)).thenReturn(Result.success(DspVersions.V_08)); - when(transformerRegistry.forContext(DSP_TRANSFORMER_CONTEXT_V_08)).thenReturn(transformerRegistry); + when(protocolParser.parse(DATASPACE_PROTOCOL_HTTP)).thenReturn(Result.success(V_MOCK)); + when(transformerRegistry.forContext(DSP_TRANSFORMER_CONTEXT_V_MOCK)).thenReturn(transformerRegistry); assertThat(dspTransformerRegistry.forProtocol(DATASPACE_PROTOCOL_HTTP)).isSucceeded() .isEqualTo(transformerRegistry); } diff --git a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-http-api-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/decorator/ContinuationTokenManagerImplTest.java b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-http-api-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/decorator/ContinuationTokenManagerImplTest.java index 83e6ec250cd..94a9b28354e 100644 --- a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-http-api-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/decorator/ContinuationTokenManagerImplTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-http-api-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/decorator/ContinuationTokenManagerImplTest.java @@ -15,21 +15,22 @@ package org.eclipse.edc.protocol.dsp.catalog.http.api.decorator; import jakarta.json.Json; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.spi.result.Result; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; -import static org.eclipse.edc.protocol.dsp.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_PROPERTY_FILTER_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; +import static org.eclipse.edc.protocol.dsp.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_PROPERTY_FILTER_TERM; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; class ContinuationTokenManagerImplTest { + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final Base64continuationTokenSerDes serDes = mock(); - private final ContinuationTokenManagerImpl continuationTokenManager = new ContinuationTokenManagerImpl(serDes, DSP_NAMESPACE_V_08, mock()); + private final ContinuationTokenManagerImpl continuationTokenManager = new ContinuationTokenManagerImpl(serDes, DSP_NAMESPACE, mock()); @Test void apply_shouldReplaceQueryWithTheOnePassedInTheToken() { @@ -39,7 +40,7 @@ void apply_shouldReplaceQueryWithTheOnePassedInTheToken() { var result = continuationTokenManager.applyQueryFromToken(Json.createObjectBuilder().build(), "token"); assertThat(result).isSucceeded().satisfies(jsonObject -> { - assertThat(jsonObject.getJsonArray(DSPACE_PROPERTY_FILTER_IRI)).hasSize(1).first().isEqualTo(filter); + assertThat(jsonObject.getJsonArray(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_FILTER_TERM))).hasSize(1).first().isEqualTo(filter); }); } diff --git a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogErrorTransformer.java b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogErrorTransformer.java index 8468c3fb3e0..20f9eb67c95 100644 --- a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogErrorTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogErrorTransformer.java @@ -25,7 +25,6 @@ import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; import static org.eclipse.edc.protocol.dsp.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_ERROR_TERM; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON_TERM; @@ -36,10 +35,6 @@ public class JsonObjectFromCatalogErrorTransformer extends AbstractNamespaceAwar private final JsonBuilderFactory jsonFactory; - public JsonObjectFromCatalogErrorTransformer(JsonBuilderFactory jsonFactory) { - this(jsonFactory, DSP_NAMESPACE_V_08); - } - public JsonObjectFromCatalogErrorTransformer(JsonBuilderFactory jsonFactory, JsonLdNamespace namespace) { super(CatalogError.class, JsonObject.class, namespace); this.jsonFactory = jsonFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogRequestMessageTransformer.java b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogRequestMessageTransformer.java index 5e4d329fbc5..2f68499c13f 100644 --- a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogRequestMessageTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogRequestMessageTransformer.java @@ -26,7 +26,6 @@ import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; import static org.eclipse.edc.protocol.dsp.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_PROPERTY_FILTER_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_REQUEST_MESSAGE_TERM; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; /** * Transforms a {@link CatalogRequestMessage} to a {@link JsonObject} in JSON-LD expanded form. @@ -35,10 +34,6 @@ public class JsonObjectFromCatalogRequestMessageTransformer extends AbstractName private final JsonBuilderFactory jsonFactory; - public JsonObjectFromCatalogRequestMessageTransformer(JsonBuilderFactory jsonFactory) { - this(jsonFactory, DSP_NAMESPACE_V_08); - } - public JsonObjectFromCatalogRequestMessageTransformer(JsonBuilderFactory jsonFactory, JsonLdNamespace namespace) { super(CatalogRequestMessage.class, JsonObject.class, namespace); this.jsonFactory = jsonFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogTransformer.java b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogTransformer.java index ac0987b6146..66ab45d52ad 100644 --- a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogTransformer.java @@ -39,7 +39,6 @@ import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_DATA_SERVICE_ATTRIBUTE; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_DISTRIBUTION_ATTRIBUTE; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DSPACE_PROPERTY_PARTICIPANT_ID_TERM; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; /** * Converts from a {@link Catalog} to a DCAT catalog as a {@link JsonObject} in JSON-LD expanded form. @@ -50,10 +49,6 @@ public class JsonObjectFromCatalogTransformer extends AbstractNamespaceAwareJson private final String typeContext; private final ParticipantIdMapper participantIdMapper; - public JsonObjectFromCatalogTransformer(JsonBuilderFactory jsonFactory, TypeManager typeManager, String typeContext, ParticipantIdMapper participantIdMapper) { - this(jsonFactory, typeManager, typeContext, participantIdMapper, DSP_NAMESPACE_V_08); - } - public JsonObjectFromCatalogTransformer(JsonBuilderFactory jsonFactory, TypeManager typeManager, String typeContext, ParticipantIdMapper participantIdMapper, JsonLdNamespace namespace) { super(Catalog.class, JsonObject.class, namespace); this.jsonFactory = jsonFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/to/JsonObjectToCatalogRequestMessageTransformer.java b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/to/JsonObjectToCatalogRequestMessageTransformer.java index 19d7357244d..19425f3db38 100644 --- a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/to/JsonObjectToCatalogRequestMessageTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/to/JsonObjectToCatalogRequestMessageTransformer.java @@ -26,17 +26,12 @@ import java.util.Optional; import static org.eclipse.edc.protocol.dsp.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_PROPERTY_FILTER_TERM; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; /** * Transforms a {@link JsonObject} in JSON-LD expanded form to a {@link CatalogRequestMessage}. */ public class JsonObjectToCatalogRequestMessageTransformer extends AbstractNamespaceAwareJsonLdTransformer { - public JsonObjectToCatalogRequestMessageTransformer() { - this(DSP_NAMESPACE_V_08); - } - public JsonObjectToCatalogRequestMessageTransformer(JsonLdNamespace namespace) { super(JsonObject.class, CatalogRequestMessage.class, namespace); } diff --git a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogErrorTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogErrorTransformerTest.java index 64cf491f1e1..e2cb30fb9ea 100644 --- a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogErrorTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogErrorTransformerTest.java @@ -17,6 +17,7 @@ import jakarta.json.Json; import jakarta.json.JsonBuilderFactory; import org.eclipse.edc.connector.controlplane.catalog.spi.CatalogError; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.transform.spi.TransformerContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -26,21 +27,21 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.protocol.dsp.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_ERROR_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_ERROR_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON_TERM; import static org.mockito.Mockito.mock; class JsonObjectFromCatalogErrorTransformerTest { + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final JsonBuilderFactory jsonFactory = Json.createBuilderFactory(Map.of()); private final TransformerContext context = mock(TransformerContext.class); - private JsonObjectFromCatalogErrorTransformer transformer; @BeforeEach void setUp() { - transformer = new JsonObjectFromCatalogErrorTransformer(jsonFactory); + transformer = new JsonObjectFromCatalogErrorTransformer(jsonFactory, DSP_NAMESPACE); } @Test @@ -54,8 +55,8 @@ void transform_returnJsonObject() { var result = transformer.transform(error, context); assertThat(result).isNotNull(); - assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_TYPE_CATALOG_ERROR_IRI); - assertThat(result.getString(DSPACE_PROPERTY_CODE_IRI)).isEqualTo("code"); - assertThat(result.getJsonArray(DSPACE_PROPERTY_REASON_IRI)).contains(Json.createValue("message")); + assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSP_NAMESPACE.toIri(DSPACE_TYPE_CATALOG_ERROR_TERM)); + assertThat(result.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CODE_TERM))).isEqualTo("code"); + assertThat(result.getJsonArray(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_REASON_TERM))).contains(Json.createValue("message")); } } diff --git a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogRequestMessageTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogRequestMessageTransformerTest.java index 68b69e15a5a..d7734111976 100644 --- a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogRequestMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogRequestMessageTransformerTest.java @@ -18,6 +18,7 @@ import jakarta.json.JsonBuilderFactory; import jakarta.json.JsonObject; import org.eclipse.edc.connector.controlplane.catalog.spi.CatalogRequestMessage; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.spi.query.QuerySpec; import org.eclipse.edc.transform.spi.TransformerContext; import org.junit.jupiter.api.BeforeEach; @@ -27,8 +28,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.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_PROPERTY_FILTER_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_REQUEST_MESSAGE_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_PROPERTY_FILTER_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_REQUEST_MESSAGE_TERM; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -37,14 +38,14 @@ class JsonObjectFromCatalogRequestMessageTransformerTest { + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final JsonBuilderFactory jsonFactory = Json.createBuilderFactory(Map.of()); private final TransformerContext context = mock(TransformerContext.class); - private JsonObjectFromCatalogRequestMessageTransformer transformer; @BeforeEach void setUp() { - transformer = new JsonObjectFromCatalogRequestMessageTransformer(jsonFactory); + transformer = new JsonObjectFromCatalogRequestMessageTransformer(jsonFactory, DSP_NAMESPACE); } @Test @@ -61,8 +62,8 @@ void transform_returnJsonObject() { var result = transformer.transform(message, context); assertThat(result).isNotNull(); - assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_TYPE_CATALOG_REQUEST_MESSAGE_IRI); - assertThat(result.get(DSPACE_PROPERTY_FILTER_IRI)).isEqualTo(querySpecJson); + assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSP_NAMESPACE.toIri(DSPACE_TYPE_CATALOG_REQUEST_MESSAGE_TERM)); + assertThat(result.get(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_FILTER_TERM))).isEqualTo(querySpecJson); verify(context, never()).reportProblem(anyString()); } } diff --git a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogTransformerTest.java index 356f5572284..950045e38bb 100644 --- a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/from/JsonObjectFromCatalogTransformerTest.java @@ -24,6 +24,7 @@ import org.eclipse.edc.connector.controlplane.catalog.spi.DataService; import org.eclipse.edc.connector.controlplane.catalog.spi.Dataset; import org.eclipse.edc.connector.controlplane.catalog.spi.Distribution; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.participant.spi.ParticipantIdMapper; import org.eclipse.edc.policy.model.Policy; import org.eclipse.edc.spi.types.TypeManager; @@ -41,7 +42,7 @@ import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_CATALOG_TYPE; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_DATASET_ATTRIBUTE; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_DATA_SERVICE_ATTRIBUTE; -import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DSPACE_PROPERTY_PARTICIPANT_ID_IRI; +import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DSPACE_PROPERTY_PARTICIPANT_ID_TERM; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; @@ -54,6 +55,7 @@ class JsonObjectFromCatalogTransformerTest { private static final String CATALOG_PROPERTY = "catalog:prop:key"; + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final JsonBuilderFactory jsonFactory = Json.createBuilderFactory(Map.of()); private final ObjectMapper mapper = mock(); @@ -62,7 +64,7 @@ class JsonObjectFromCatalogTransformerTest { private final TypeManager typeManager = mock(); - private final JsonObjectFromCatalogTransformer transformer = new JsonObjectFromCatalogTransformer(jsonFactory, typeManager, "test", participantIdMapper); + private final JsonObjectFromCatalogTransformer transformer = new JsonObjectFromCatalogTransformer(jsonFactory, typeManager, "test", participantIdMapper, DSP_NAMESPACE); private JsonObject datasetJson; private JsonObject catalogJson; @@ -72,7 +74,7 @@ class JsonObjectFromCatalogTransformerTest { void setUp() { when(typeManager.getMapper("test")).thenReturn(mapper); - + datasetJson = getJsonObject("dataset"); catalogJson = getJsonObject("Catalog"); dataServiceJson = getJsonObject("dataService"); @@ -106,7 +108,7 @@ void transform_returnJsonObject() { .isInstanceOf(JsonArray.class) .matches(v -> v.asJsonArray().size() == 1) .matches(v -> v.asJsonArray().get(0).equals(dataServiceJson)); - assertThat(result.getString(DSPACE_PROPERTY_PARTICIPANT_ID_IRI)).isEqualTo("urn:namespace:participantId"); + assertThat(result.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PARTICIPANT_ID_TERM))).isEqualTo("urn:namespace:participantId"); assertThat(result.get(CATALOG_PROPERTY)).isNotNull(); verify(context, times(1)).transform(catalog.getDatasets().get(0), JsonObject.class); @@ -141,7 +143,7 @@ void transform_SubCatalogs_returnJsonObject() { .isInstanceOf(JsonArray.class) .matches(v -> v.asJsonArray().size() == 1) .matches(v -> v.asJsonArray().get(0).equals(dataServiceJson)); - assertThat(result.getString(DSPACE_PROPERTY_PARTICIPANT_ID_IRI)).isEqualTo("urn:namespace:participantId"); + assertThat(result.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PARTICIPANT_ID_TERM))).isEqualTo("urn:namespace:participantId"); assertThat(result.get(CATALOG_PROPERTY)).isNotNull(); verify(context, times(1)).transform(catalog.getDatasets().get(0), JsonObject.class); diff --git a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/to/JsonObjectToCatalogRequestMessageTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/to/JsonObjectToCatalogRequestMessageTransformerTest.java index a61e90255b1..25fcc23b1a6 100644 --- a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/to/JsonObjectToCatalogRequestMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/to/JsonObjectToCatalogRequestMessageTransformerTest.java @@ -16,6 +16,7 @@ import jakarta.json.Json; import jakarta.json.JsonBuilderFactory; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.spi.query.QuerySpec; import org.eclipse.edc.transform.spi.TransformerContext; import org.junit.jupiter.api.BeforeEach; @@ -25,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.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_PROPERTY_FILTER_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_REQUEST_MESSAGE_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_PROPERTY_FILTER_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_REQUEST_MESSAGE_TERM; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -35,6 +36,8 @@ class JsonObjectToCatalogRequestMessageTransformerTest { + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); + private final JsonBuilderFactory jsonFactory = Json.createBuilderFactory(Map.of()); private final TransformerContext context = mock(); @@ -42,7 +45,7 @@ class JsonObjectToCatalogRequestMessageTransformerTest { @BeforeEach void setUp() { - transformer = new JsonObjectToCatalogRequestMessageTransformer(); + transformer = new JsonObjectToCatalogRequestMessageTransformer(DSP_NAMESPACE); } @Test @@ -52,8 +55,8 @@ void transform_returnCatalogRequestMessage() { when(context.transform(querySpecJson, QuerySpec.class)).thenReturn(querySpec); var message = jsonFactory.createObjectBuilder() - .add(TYPE, DSPACE_TYPE_CATALOG_REQUEST_MESSAGE_IRI) - .add(DSPACE_PROPERTY_FILTER_IRI, querySpecJson) + .add(TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_CATALOG_REQUEST_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_FILTER_TERM), querySpecJson) .build(); var result = transformer.transform(message, context); diff --git a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-validation-lib/build.gradle.kts b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-validation-lib/build.gradle.kts index e9e1766c8f0..9e8ef5c955b 100644 --- a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-validation-lib/build.gradle.kts +++ b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-validation-lib/build.gradle.kts @@ -21,4 +21,5 @@ dependencies { implementation(project(":core:common:lib:validator-lib")) testImplementation(project(":core:common:junit")) + testImplementation(project(":data-protocols:dsp:dsp-08:dsp-spi-08")) } \ No newline at end of file diff --git a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/catalog/validation/CatalogRequestMessageValidator.java b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/catalog/validation/CatalogRequestMessageValidator.java index fdedb4d3896..a42462716ad 100644 --- a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/catalog/validation/CatalogRequestMessageValidator.java +++ b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/catalog/validation/CatalogRequestMessageValidator.java @@ -24,15 +24,11 @@ import static org.eclipse.edc.protocol.dsp.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_PROPERTY_FILTER_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_REQUEST_MESSAGE_TERM; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; /** * Validator for {@link CatalogRequestMessageValidator} Json-LD representation */ public class CatalogRequestMessageValidator { - public static Validator instance(CriterionOperatorRegistry criterionOperatorRegistry) { - return instance(criterionOperatorRegistry, DSP_NAMESPACE_V_08); - } public static Validator instance(CriterionOperatorRegistry criterionOperatorRegistry, JsonLdNamespace namespace) { return JsonObjectValidator.newValidator() diff --git a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/validation/CatalogRequestMessageValidatorTest.java b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/validation/CatalogRequestMessageValidatorTest.java index e890c4c4613..ad9830a675c 100644 --- a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/validation/CatalogRequestMessageValidatorTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/validation/CatalogRequestMessageValidatorTest.java @@ -17,7 +17,7 @@ import jakarta.json.Json; import jakarta.json.JsonObject; import org.assertj.core.api.Assertions; -import org.eclipse.edc.protocol.dsp.spi.type.DspCatalogPropertyAndTypeNames; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.validator.spi.ValidationFailure; import org.eclipse.edc.validator.spi.Validator; import org.eclipse.edc.validator.spi.Violation; @@ -26,16 +26,19 @@ import static org.assertj.core.api.InstanceOfAssertFactories.list; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; +import static org.eclipse.edc.protocol.dsp.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_REQUEST_MESSAGE_TERM; import static org.mockito.Mockito.mock; class CatalogRequestMessageValidatorTest { - private final Validator validator = CatalogRequestMessageValidator.instance(mock()); + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); + + private final Validator validator = CatalogRequestMessageValidator.instance(mock(), DSP_NAMESPACE); @Test void shouldSucceed_whenObjectIsValid() { var input = Json.createObjectBuilder() - .add(TYPE, Json.createArrayBuilder().add(DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_REQUEST_MESSAGE_IRI)) + .add(TYPE, Json.createArrayBuilder().add(DSP_NAMESPACE.toIri(DSPACE_TYPE_CATALOG_REQUEST_MESSAGE_TERM))) .build(); var result = validator.validate(input); diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementMessageTransformer.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementMessageTransformer.java index 1d08c202496..c9933193579 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementMessageTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementMessageTransformer.java @@ -29,7 +29,6 @@ import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_ASSIGNEE_ATTRIBUTE; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_ASSIGNER_ATTRIBUTE; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_AGREEMENT_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_TIMESTAMP_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_TERM; @@ -44,10 +43,6 @@ public class JsonObjectFromContractAgreementMessageTransformer extends AbstractN private final JsonBuilderFactory jsonFactory; - public JsonObjectFromContractAgreementMessageTransformer(JsonBuilderFactory jsonFactory) { - this(jsonFactory, DSP_NAMESPACE_V_08); - } - public JsonObjectFromContractAgreementMessageTransformer(JsonBuilderFactory jsonFactory, JsonLdNamespace namespace) { super(ContractAgreementMessage.class, JsonObject.class, namespace); this.jsonFactory = jsonFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementVerificationMessageTransformer.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementVerificationMessageTransformer.java index cd9e24137ca..b309d4d33cb 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementVerificationMessageTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementVerificationMessageTransformer.java @@ -25,7 +25,6 @@ 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.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; @@ -37,10 +36,6 @@ public class JsonObjectFromContractAgreementVerificationMessageTransformer exten private final JsonBuilderFactory jsonFactory; - public JsonObjectFromContractAgreementVerificationMessageTransformer(JsonBuilderFactory jsonFactory) { - this(jsonFactory, DSP_NAMESPACE_V_08); - } - public JsonObjectFromContractAgreementVerificationMessageTransformer(JsonBuilderFactory jsonFactory, JsonLdNamespace namespace) { super(ContractAgreementVerificationMessage.class, JsonObject.class, namespace); this.jsonFactory = jsonFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationErrorTransformer.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationErrorTransformer.java index 5301b4f6689..1aeb91c29d3 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationErrorTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationErrorTransformer.java @@ -24,7 +24,6 @@ import org.jetbrains.annotations.Nullable; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_ERROR_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON_TERM; @@ -36,10 +35,6 @@ public class JsonObjectFromContractNegotiationErrorTransformer extends AbstractN private final JsonBuilderFactory jsonFactory; - public JsonObjectFromContractNegotiationErrorTransformer(JsonBuilderFactory jsonFactory) { - this(jsonFactory, DSP_NAMESPACE_V_08); - } - public JsonObjectFromContractNegotiationErrorTransformer(JsonBuilderFactory jsonFactory, JsonLdNamespace namespace) { super(ContractNegotiationError.class, JsonObject.class, namespace); this.jsonFactory = jsonFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationEventMessageTransformer.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationEventMessageTransformer.java index fd151dc0af2..2ae93f8abc6 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationEventMessageTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationEventMessageTransformer.java @@ -25,7 +25,6 @@ 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.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_EVENT_TYPE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED_TERM; @@ -41,10 +40,6 @@ public class JsonObjectFromContractNegotiationEventMessageTransformer extends Ab private final JsonBuilderFactory jsonFactory; - public JsonObjectFromContractNegotiationEventMessageTransformer(JsonBuilderFactory jsonFactory) { - this(jsonFactory, DSP_NAMESPACE_V_08); - } - public JsonObjectFromContractNegotiationEventMessageTransformer(JsonBuilderFactory jsonFactory, JsonLdNamespace namespace) { super(ContractNegotiationEventMessage.class, JsonObject.class, namespace); this.jsonFactory = jsonFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTerminationMessageTransformer.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTerminationMessageTransformer.java index 134962a35a9..1318ff4a5ab 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTerminationMessageTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTerminationMessageTransformer.java @@ -25,7 +25,6 @@ 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.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; @@ -39,10 +38,6 @@ public class JsonObjectFromContractNegotiationTerminationMessageTransformer exte private final JsonBuilderFactory jsonFactory; - public JsonObjectFromContractNegotiationTerminationMessageTransformer(JsonBuilderFactory jsonFactory) { - this(jsonFactory, DSP_NAMESPACE_V_08); - } - public JsonObjectFromContractNegotiationTerminationMessageTransformer(JsonBuilderFactory jsonFactory, JsonLdNamespace namespace) { super(ContractNegotiationTerminationMessage.class, JsonObject.class, namespace); this.jsonFactory = jsonFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTransformer.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTransformer.java index d4e1a8d3d83..0dee0ab2f06 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTransformer.java @@ -26,7 +26,6 @@ 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.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_ACCEPTED_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_AGREED_TERM; @@ -47,10 +46,6 @@ public class JsonObjectFromContractNegotiationTransformer extends AbstractNamesp private final JsonBuilderFactory jsonFactory; - public JsonObjectFromContractNegotiationTransformer(JsonBuilderFactory jsonFactory) { - this(jsonFactory, DSP_NAMESPACE_V_08); - } - public JsonObjectFromContractNegotiationTransformer(JsonBuilderFactory jsonFactory, JsonLdNamespace namespace) { super(ContractNegotiation.class, JsonObject.class, namespace); this.jsonFactory = jsonFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractOfferMessageTransformer.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractOfferMessageTransformer.java index 8683e8a3266..102d28ce77e 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractOfferMessageTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractOfferMessageTransformer.java @@ -26,7 +26,6 @@ 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.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM; @@ -40,10 +39,6 @@ public class JsonObjectFromContractOfferMessageTransformer extends AbstractNames private final JsonBuilderFactory jsonFactory; - public JsonObjectFromContractOfferMessageTransformer(JsonBuilderFactory jsonFactory) { - this(jsonFactory, DSP_NAMESPACE_V_08); - } - public JsonObjectFromContractOfferMessageTransformer(JsonBuilderFactory jsonFactory, JsonLdNamespace namespace) { super(ContractOfferMessage.class, JsonObject.class, namespace); this.jsonFactory = jsonFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractRequestMessageTransformer.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractRequestMessageTransformer.java index 2393e7a0e20..728478d31de 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractRequestMessageTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractRequestMessageTransformer.java @@ -26,7 +26,6 @@ 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.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM; @@ -41,10 +40,6 @@ public class JsonObjectFromContractRequestMessageTransformer extends AbstractNam private final JsonBuilderFactory jsonFactory; - public JsonObjectFromContractRequestMessageTransformer(JsonBuilderFactory jsonFactory) { - this(jsonFactory, DSP_NAMESPACE_V_08); - } - public JsonObjectFromContractRequestMessageTransformer(JsonBuilderFactory jsonFactory, JsonLdNamespace namespace) { super(ContractRequestMessage.class, JsonObject.class, namespace); this.jsonFactory = jsonFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementMessageTransformer.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementMessageTransformer.java index 2cf9d0eb7ef..5cfce108602 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementMessageTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementMessageTransformer.java @@ -30,7 +30,6 @@ import java.util.Set; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_AGREEMENT_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_ID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_ID_TERM; @@ -46,10 +45,6 @@ public class JsonObjectToContractAgreementMessageTransformer extends AbstractNamespaceAwareJsonLdTransformer { private final Set excludedPolicyKeywords; - public JsonObjectToContractAgreementMessageTransformer() { - this(DSP_NAMESPACE_V_08); - } - public JsonObjectToContractAgreementMessageTransformer(JsonLdNamespace namespace) { super(JsonObject.class, ContractAgreementMessage.class, namespace); excludedPolicyKeywords = Set.of(forNamespace(DSPACE_PROPERTY_TIMESTAMP_TERM), @@ -102,7 +97,7 @@ public JsonObjectToContractAgreementMessageTransformer(JsonLdNamespace namespace var callbackAddress = transformString(jsonAgreement.get(forNamespace(DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM)), context); messageBuilder.callbackAddress(callbackAddress); - + messageBuilder.contractAgreement(agreement); return messageBuilder.build(); diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementVerificationMessageTransformer.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementVerificationMessageTransformer.java index 1105ada2aa7..e3db73d1c78 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementVerificationMessageTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementVerificationMessageTransformer.java @@ -22,7 +22,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; @@ -32,10 +31,6 @@ */ public class JsonObjectToContractAgreementVerificationMessageTransformer extends AbstractNamespaceAwareJsonLdTransformer { - public JsonObjectToContractAgreementVerificationMessageTransformer() { - this(DSP_NAMESPACE_V_08); - } - public JsonObjectToContractAgreementVerificationMessageTransformer(JsonLdNamespace namespace) { super(JsonObject.class, ContractAgreementVerificationMessage.class, namespace); } diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationAckTransformer.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationAckTransformer.java index 4105b6a0c07..7a58697872a 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationAckTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationAckTransformer.java @@ -22,7 +22,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_STATE_TERM; @@ -32,10 +31,6 @@ */ public class JsonObjectToContractNegotiationAckTransformer extends AbstractNamespaceAwareJsonLdTransformer { - public JsonObjectToContractNegotiationAckTransformer() { - this(DSP_NAMESPACE_V_08); - } - public JsonObjectToContractNegotiationAckTransformer(JsonLdNamespace namespace) { super(JsonObject.class, ContractNegotiationAck.class, namespace); } diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationEventMessageTransformer.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationEventMessageTransformer.java index 96136867c0f..83e99b97ae0 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationEventMessageTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationEventMessageTransformer.java @@ -24,7 +24,6 @@ import static org.eclipse.edc.connector.controlplane.contract.spi.types.agreement.ContractNegotiationEventMessage.Type.ACCEPTED; import static org.eclipse.edc.connector.controlplane.contract.spi.types.agreement.ContractNegotiationEventMessage.Type.FINALIZED; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_EVENT_TYPE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED_TERM; @@ -37,10 +36,6 @@ */ public class JsonObjectToContractNegotiationEventMessageTransformer extends AbstractNamespaceAwareJsonLdTransformer { - public JsonObjectToContractNegotiationEventMessageTransformer() { - this(DSP_NAMESPACE_V_08); - } - public JsonObjectToContractNegotiationEventMessageTransformer(JsonLdNamespace namespace) { super(JsonObject.class, ContractNegotiationEventMessage.class, namespace); } diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationTerminationMessageTransformer.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationTerminationMessageTransformer.java index 6ae937667e1..027b5711aec 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationTerminationMessageTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationTerminationMessageTransformer.java @@ -24,7 +24,6 @@ import org.jetbrains.annotations.Nullable; import static jakarta.json.JsonValue.ValueType.ARRAY; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; @@ -36,10 +35,6 @@ */ public class JsonObjectToContractNegotiationTerminationMessageTransformer extends AbstractNamespaceAwareJsonLdTransformer { - public JsonObjectToContractNegotiationTerminationMessageTransformer() { - this(DSP_NAMESPACE_V_08); - } - public JsonObjectToContractNegotiationTerminationMessageTransformer(JsonLdNamespace namespace) { super(JsonObject.class, ContractNegotiationTerminationMessage.class, namespace); } diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractOfferMessageTransformer.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractOfferMessageTransformer.java index 618fd20e218..1600a4838bb 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractOfferMessageTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractOfferMessageTransformer.java @@ -27,7 +27,6 @@ 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.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM; @@ -39,10 +38,6 @@ */ public class JsonObjectToContractOfferMessageTransformer extends AbstractNamespaceAwareJsonLdTransformer { - public JsonObjectToContractOfferMessageTransformer() { - this(DSP_NAMESPACE_V_08); - } - public JsonObjectToContractOfferMessageTransformer(JsonLdNamespace namespace) { super(JsonObject.class, ContractOfferMessage.class, namespace); } diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractRequestMessageTransformer.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractRequestMessageTransformer.java index bcd2ea06d1f..f3cf520b4f2 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractRequestMessageTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractRequestMessageTransformer.java @@ -25,7 +25,6 @@ import org.jetbrains.annotations.Nullable; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM; @@ -37,10 +36,6 @@ */ public class JsonObjectToContractRequestMessageTransformer extends AbstractNamespaceAwareJsonLdTransformer { - public JsonObjectToContractRequestMessageTransformer() { - this(DSP_NAMESPACE_V_08); - } - public JsonObjectToContractRequestMessageTransformer(JsonLdNamespace namespace) { super(JsonObject.class, ContractRequestMessage.class, namespace); } diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementMessageTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementMessageTransformerTest.java index 5af452f59a5..bf99c32659c 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementMessageTransformerTest.java @@ -19,6 +19,7 @@ import jakarta.json.JsonObject; import org.eclipse.edc.connector.controlplane.contract.spi.types.agreement.ContractAgreement; import org.eclipse.edc.connector.controlplane.contract.spi.types.agreement.ContractAgreementMessage; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.policy.model.Action; import org.eclipse.edc.policy.model.Duty; import org.eclipse.edc.policy.model.Permission; @@ -37,11 +38,11 @@ import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_ASSIGNEE_ATTRIBUTE; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_ASSIGNER_ATTRIBUTE; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_AGREEMENT_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_TIMESTAMP_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_AGREEMENT_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_TIMESTAMP_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; @@ -58,11 +59,11 @@ class JsonObjectFromContractAgreementMessageTransformerTest { private static final String CONSUMER_ID = "consumerId"; private static final String TIMESTAMP = "1970-01-01T00:00:00Z"; private static final String DSP = "dsp"; + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final JsonBuilderFactory jsonFactory = Json.createBuilderFactory(Map.of()); private final TransformerContext context = mock(); - private final JsonObjectFromContractAgreementMessageTransformer transformer = - new JsonObjectFromContractAgreementMessageTransformer(jsonFactory); + new JsonObjectFromContractAgreementMessageTransformer(jsonFactory, DSP_NAMESPACE); @BeforeEach void setUp() { @@ -94,14 +95,14 @@ void transform() { assertThat(result).isNotNull(); assertThat(result.getString(ID)).isNotNull(); assertThat(result.getString(ID)).isNotEmpty(); - assertThat(result.getString(TYPE)).isEqualTo(DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_IRI); - assertThat(result.getString(DSPACE_PROPERTY_PROVIDER_PID_IRI)).isEqualTo("providerPid"); - assertThat(result.getString(DSPACE_PROPERTY_CONSUMER_PID_IRI)).isEqualTo("consumerPid"); + assertThat(result.getString(TYPE)).isEqualTo(DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_TERM)); + assertThat(result.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM))).isEqualTo("providerPid"); + assertThat(result.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM))).isEqualTo("consumerPid"); - var jsonAgreement = result.getJsonObject(DSPACE_PROPERTY_AGREEMENT_IRI); + var jsonAgreement = result.getJsonObject(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_AGREEMENT_TERM)); assertThat(jsonAgreement).isNotNull(); assertThat(jsonAgreement.getString(ID)).isEqualTo(AGREEMENT_ID); - assertThat(jsonAgreement.getString(DSPACE_PROPERTY_TIMESTAMP_IRI)).isEqualTo(TIMESTAMP); + assertThat(jsonAgreement.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_TIMESTAMP_TERM))).isEqualTo(TIMESTAMP); assertThat(jsonAgreement.getString(ODRL_ASSIGNEE_ATTRIBUTE)).isEqualTo(CONSUMER_ID); assertThat(jsonAgreement.getString(ODRL_ASSIGNER_ATTRIBUTE)).isEqualTo(PROVIDER_ID); diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementVerificationMessageTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementVerificationMessageTransformerTest.java index b4cd5ec1a3f..69c0ddf4fdf 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementVerificationMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractAgreementVerificationMessageTransformerTest.java @@ -17,6 +17,7 @@ import jakarta.json.Json; import jakarta.json.JsonBuilderFactory; import org.eclipse.edc.connector.controlplane.contract.spi.types.agreement.ContractAgreementVerificationMessage; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.transform.spi.TransformerContext; import org.junit.jupiter.api.Test; @@ -25,9 +26,9 @@ 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.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -35,11 +36,11 @@ class JsonObjectFromContractAgreementVerificationMessageTransformerTest { + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final JsonBuilderFactory jsonFactory = Json.createBuilderFactory(Map.of()); private final TransformerContext context = mock(); - private final JsonObjectFromContractAgreementVerificationMessageTransformer transformer = - new JsonObjectFromContractAgreementVerificationMessageTransformer(jsonFactory); + new JsonObjectFromContractAgreementVerificationMessageTransformer(jsonFactory, DSP_NAMESPACE); @Test void transform() { @@ -55,9 +56,9 @@ void transform() { assertThat(result).isNotNull(); assertThat(result.getJsonString(ID).getString()).isNotEmpty(); - assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_IRI); - assertThat(result.getJsonString(DSPACE_PROPERTY_CONSUMER_PID_IRI).getString()).isEqualTo("consumerPid"); - assertThat(result.getJsonString(DSPACE_PROPERTY_PROVIDER_PID_IRI).getString()).isEqualTo("providerPid"); + assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_TERM)); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM)).getString()).isEqualTo("consumerPid"); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM)).getString()).isEqualTo("providerPid"); verify(context, never()).reportProblem(anyString()); } diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationErrorTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationErrorTransformerTest.java index 686f1d9be83..e8cdf3bfd7a 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationErrorTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationErrorTransformerTest.java @@ -17,6 +17,7 @@ import jakarta.json.Json; import jakarta.json.JsonBuilderFactory; import org.eclipse.edc.connector.controlplane.contract.spi.types.negotiation.ContractNegotiationError; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.transform.spi.TransformerContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -26,21 +27,21 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_ERROR_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_ERROR_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON_TERM; import static org.mockito.Mockito.mock; class JsonObjectFromContractNegotiationErrorTransformerTest { + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final JsonBuilderFactory jsonFactory = Json.createBuilderFactory(Map.of()); private final TransformerContext context = mock(TransformerContext.class); - private JsonObjectFromContractNegotiationErrorTransformer transformer; @BeforeEach void setUp() { - transformer = new JsonObjectFromContractNegotiationErrorTransformer(jsonFactory); + transformer = new JsonObjectFromContractNegotiationErrorTransformer(jsonFactory, DSP_NAMESPACE); } @Test @@ -54,8 +55,8 @@ void transform_returnJsonObject() { var result = transformer.transform(error, context); assertThat(result).isNotNull(); - assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_TYPE_CONTRACT_NEGOTIATION_ERROR_IRI); - assertThat(result.getString(DSPACE_PROPERTY_CODE_IRI)).isEqualTo("code"); - assertThat(result.getJsonArray(DSPACE_PROPERTY_REASON_IRI)).contains(Json.createValue("message")); + assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_NEGOTIATION_ERROR_TERM)); + assertThat(result.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CODE_TERM))).isEqualTo("code"); + assertThat(result.getJsonArray(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_REASON_TERM))).contains(Json.createValue("message")); } } diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationEventMessageTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationEventMessageTransformerTest.java index d3c5c8245a4..a17ae3c720a 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationEventMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationEventMessageTransformerTest.java @@ -17,6 +17,7 @@ import jakarta.json.Json; import jakarta.json.JsonBuilderFactory; import org.eclipse.edc.connector.controlplane.contract.spi.types.agreement.ContractNegotiationEventMessage; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.policy.model.Policy; import org.eclipse.edc.transform.spi.TransformerContext; import org.junit.jupiter.api.Test; @@ -27,11 +28,11 @@ import static org.eclipse.edc.connector.controlplane.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.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_EVENT_TYPE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_EVENT_TYPE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -39,12 +40,13 @@ class JsonObjectFromContractNegotiationEventMessageTransformerTest { private static final String DSP = "DSP"; + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final JsonBuilderFactory jsonFactory = Json.createBuilderFactory(Map.of()); private final TransformerContext context = mock(); private final JsonObjectFromContractNegotiationEventMessageTransformer transformer = - new JsonObjectFromContractNegotiationEventMessageTransformer(jsonFactory); + new JsonObjectFromContractNegotiationEventMessageTransformer(jsonFactory, DSP_NAMESPACE); @Test void transform() { @@ -61,10 +63,11 @@ void transform() { assertThat(result).isNotNull(); assertThat(result.getString(ID)).isNotEmpty(); - assertThat(result.getString(TYPE)).isEqualTo(DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_IRI); - assertThat(result.getString(DSPACE_PROPERTY_PROVIDER_PID_IRI)).isEqualTo("providerPid"); - assertThat(result.getString(DSPACE_PROPERTY_CONSUMER_PID_IRI)).isEqualTo("consumerPid"); - assertThat(result.getString(DSPACE_PROPERTY_EVENT_TYPE_IRI)).isEqualTo(DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED_IRI); + assertThat(result.getString(TYPE)).isEqualTo(DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_TERM)); + assertThat(result.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM))).isEqualTo("providerPid"); + assertThat(result.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM))).isEqualTo("consumerPid"); + assertThat(result.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_EVENT_TYPE_TERM))) + .isEqualTo(DSP_NAMESPACE.toIri(DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED_TERM)); verify(context, never()).reportProblem(anyString()); } diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTerminationMessageTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTerminationMessageTransformerTest.java index 9e5ca4f691c..81d429bd454 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTerminationMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTerminationMessageTransformerTest.java @@ -17,6 +17,7 @@ import jakarta.json.Json; import jakarta.json.JsonBuilderFactory; import org.eclipse.edc.connector.controlplane.contract.spi.types.negotiation.ContractNegotiationTerminationMessage; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.transform.spi.TransformerContext; import org.junit.jupiter.api.Test; @@ -25,11 +26,11 @@ 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.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON_TERM; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -39,12 +40,13 @@ class JsonObjectFromContractNegotiationTerminationMessageTransformerTest { private static final String REJECTION_REASON = "rejection"; private static final String REJECTION_CODE = "1"; private static final String DSP = "DSP"; + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final JsonBuilderFactory jsonFactory = Json.createBuilderFactory(Map.of()); private final TransformerContext context = mock(); private final JsonObjectFromContractNegotiationTerminationMessageTransformer transformer = - new JsonObjectFromContractNegotiationTerminationMessageTransformer(jsonFactory); + new JsonObjectFromContractNegotiationTerminationMessageTransformer(jsonFactory, DSP_NAMESPACE); @Test void transform() { @@ -61,11 +63,11 @@ void transform() { assertThat(result).isNotNull(); assertThat(result.getString(ID)).isNotEmpty(); - assertThat(result.getString(TYPE)).isEqualTo(DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_IRI); - assertThat(result.getString(DSPACE_PROPERTY_CONSUMER_PID_IRI)).isEqualTo("consumerPid"); - assertThat(result.getString(DSPACE_PROPERTY_PROVIDER_PID_IRI)).isEqualTo("providerPid"); - assertThat(result.getString(DSPACE_PROPERTY_CODE_IRI)).isEqualTo(REJECTION_CODE); - assertThat(result.getString(DSPACE_PROPERTY_REASON_IRI)).isEqualTo(REJECTION_REASON); + assertThat(result.getString(TYPE)).isEqualTo(DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_TERM)); + assertThat(result.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM))).isEqualTo("consumerPid"); + assertThat(result.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM))).isEqualTo("providerPid"); + assertThat(result.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CODE_TERM))).isEqualTo(REJECTION_CODE); + assertThat(result.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_REASON_TERM))).isEqualTo(REJECTION_REASON); verify(context, never()).reportProblem(anyString()); } @@ -83,8 +85,8 @@ void verify_noReasonNoCode() { var result = transformer.transform(message, context); assertThat(result).isNotNull(); - assertThat(result.getJsonString(DSPACE_PROPERTY_CODE_IRI)).isNull(); - assertThat(result.getJsonString(DSPACE_PROPERTY_REASON_IRI)).isNull(); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CODE_TERM))).isNull(); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_REASON_TERM))).isNull(); verify(context, never()).reportProblem(anyString()); } diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTransformerTest.java index 2647887d051..bc08a379499 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractNegotiationTransformerTest.java @@ -18,6 +18,7 @@ import jakarta.json.JsonBuilderFactory; import org.eclipse.edc.connector.controlplane.contract.spi.types.negotiation.ContractNegotiation; import org.eclipse.edc.connector.controlplane.contract.spi.types.negotiation.ContractNegotiationStates; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.transform.spi.TransformerContext; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -47,17 +48,17 @@ import static org.eclipse.edc.connector.controlplane.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.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_ACCEPTED_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_AGREED_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_FINALIZED_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_OFFERED_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_REQUESTED_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_TERMINATED_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_VERIFIED_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_STATE_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_ACCEPTED_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_AGREED_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_FINALIZED_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_OFFERED_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_REQUESTED_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_TERMINATED_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_VERIFIED_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_STATE_TERM; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -65,14 +66,14 @@ class JsonObjectFromContractNegotiationTransformerTest { + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final JsonBuilderFactory jsonFactory = Json.createBuilderFactory(Map.of()); private final TransformerContext context = mock(TransformerContext.class); - private JsonObjectFromContractNegotiationTransformer transformer; @BeforeEach void setUp() { - transformer = new JsonObjectFromContractNegotiationTransformer(jsonFactory); + transformer = new JsonObjectFromContractNegotiationTransformer(jsonFactory, DSP_NAMESPACE); } @Test @@ -91,9 +92,9 @@ void transform_consumer() { assertThat(result).isNotNull(); assertThat(result.getString(ID)).isEqualTo("consumerPid"); - assertThat(result.getString(TYPE)).isEqualTo(DSPACE_TYPE_CONTRACT_NEGOTIATION_IRI); - assertThat(result.getString(DSPACE_PROPERTY_CONSUMER_PID_IRI)).isEqualTo("consumerPid"); - assertThat(result.getString(DSPACE_PROPERTY_PROVIDER_PID_IRI)).isEqualTo("providerPid"); + assertThat(result.getString(TYPE)).isEqualTo(DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_NEGOTIATION_TERM)); + assertThat(result.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM))).isEqualTo("consumerPid"); + assertThat(result.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM))).isEqualTo("providerPid"); verify(context, never()).reportProblem(anyString()); } @@ -114,9 +115,9 @@ void transform_provider() { assertThat(result).isNotNull(); assertThat(result.getString(ID)).isEqualTo("providerPid"); - assertThat(result.getString(TYPE)).isEqualTo(DSPACE_TYPE_CONTRACT_NEGOTIATION_IRI); - assertThat(result.getString(DSPACE_PROPERTY_CONSUMER_PID_IRI)).isEqualTo("consumerPid"); - assertThat(result.getString(DSPACE_PROPERTY_PROVIDER_PID_IRI)).isEqualTo("providerPid"); + assertThat(result.getString(TYPE)).isEqualTo(DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_NEGOTIATION_TERM)); + assertThat(result.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM))).isEqualTo("consumerPid"); + assertThat(result.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM))).isEqualTo("providerPid"); verify(context, never()).reportProblem(anyString()); } @@ -137,7 +138,7 @@ void transform_status(ContractNegotiationStates inputState, String expectedDspSt var result = transformer.transform(negotiation, context); assertThat(result).isNotNull(); - assertThat(result.getString(DSPACE_PROPERTY_STATE_IRI)).isEqualTo(expectedDspState); + assertThat(result.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_STATE_TERM))).isEqualTo(expectedDspState); verify(context, never()).reportProblem(anyString()); } @@ -147,20 +148,20 @@ public static class Status implements ArgumentsProvider { @Override public Stream provideArguments(ExtensionContext context) { return Stream.of( - Arguments.arguments(REQUESTING, DSPACE_VALUE_NEGOTIATION_STATE_REQUESTED_IRI), - Arguments.arguments(REQUESTED, DSPACE_VALUE_NEGOTIATION_STATE_REQUESTED_IRI), - Arguments.arguments(OFFERING, DSPACE_VALUE_NEGOTIATION_STATE_OFFERED_IRI), - Arguments.arguments(OFFERED, DSPACE_VALUE_NEGOTIATION_STATE_OFFERED_IRI), - Arguments.arguments(ACCEPTING, DSPACE_VALUE_NEGOTIATION_STATE_ACCEPTED_IRI), - Arguments.arguments(ACCEPTED, DSPACE_VALUE_NEGOTIATION_STATE_ACCEPTED_IRI), - Arguments.arguments(AGREEING, DSPACE_VALUE_NEGOTIATION_STATE_AGREED_IRI), - Arguments.arguments(AGREED, DSPACE_VALUE_NEGOTIATION_STATE_AGREED_IRI), - Arguments.arguments(VERIFYING, DSPACE_VALUE_NEGOTIATION_STATE_VERIFIED_IRI), - Arguments.arguments(VERIFIED, DSPACE_VALUE_NEGOTIATION_STATE_VERIFIED_IRI), - Arguments.arguments(FINALIZING, DSPACE_VALUE_NEGOTIATION_STATE_FINALIZED_IRI), - Arguments.arguments(FINALIZED, DSPACE_VALUE_NEGOTIATION_STATE_FINALIZED_IRI), - Arguments.arguments(TERMINATING, DSPACE_VALUE_NEGOTIATION_STATE_TERMINATED_IRI), - Arguments.arguments(TERMINATED, DSPACE_VALUE_NEGOTIATION_STATE_TERMINATED_IRI) + Arguments.arguments(REQUESTING, DSP_NAMESPACE.toIri(DSPACE_VALUE_NEGOTIATION_STATE_REQUESTED_TERM)), + Arguments.arguments(REQUESTED, DSP_NAMESPACE.toIri(DSPACE_VALUE_NEGOTIATION_STATE_REQUESTED_TERM)), + Arguments.arguments(OFFERING, DSP_NAMESPACE.toIri(DSPACE_VALUE_NEGOTIATION_STATE_OFFERED_TERM)), + Arguments.arguments(OFFERED, DSP_NAMESPACE.toIri(DSPACE_VALUE_NEGOTIATION_STATE_OFFERED_TERM)), + Arguments.arguments(ACCEPTING, DSP_NAMESPACE.toIri(DSPACE_VALUE_NEGOTIATION_STATE_ACCEPTED_TERM)), + Arguments.arguments(ACCEPTED, DSP_NAMESPACE.toIri(DSPACE_VALUE_NEGOTIATION_STATE_ACCEPTED_TERM)), + Arguments.arguments(AGREEING, DSP_NAMESPACE.toIri(DSPACE_VALUE_NEGOTIATION_STATE_AGREED_TERM)), + Arguments.arguments(AGREED, DSP_NAMESPACE.toIri(DSPACE_VALUE_NEGOTIATION_STATE_AGREED_TERM)), + Arguments.arguments(VERIFYING, DSP_NAMESPACE.toIri(DSPACE_VALUE_NEGOTIATION_STATE_VERIFIED_TERM)), + Arguments.arguments(VERIFIED, DSP_NAMESPACE.toIri(DSPACE_VALUE_NEGOTIATION_STATE_VERIFIED_TERM)), + Arguments.arguments(FINALIZING, DSP_NAMESPACE.toIri(DSPACE_VALUE_NEGOTIATION_STATE_FINALIZED_TERM)), + Arguments.arguments(FINALIZED, DSP_NAMESPACE.toIri(DSPACE_VALUE_NEGOTIATION_STATE_FINALIZED_TERM)), + Arguments.arguments(TERMINATING, DSP_NAMESPACE.toIri(DSPACE_VALUE_NEGOTIATION_STATE_TERMINATED_TERM)), + Arguments.arguments(TERMINATED, DSP_NAMESPACE.toIri(DSPACE_VALUE_NEGOTIATION_STATE_TERMINATED_TERM)) ); } } diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractOfferMessageTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractOfferMessageTransformerTest.java index 34450689666..10115ff8eff 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractOfferMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractOfferMessageTransformerTest.java @@ -19,6 +19,7 @@ import jakarta.json.JsonObject; import org.eclipse.edc.connector.controlplane.contract.spi.types.negotiation.ContractOfferMessage; import org.eclipse.edc.connector.controlplane.contract.spi.types.offer.ContractOffer; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.policy.model.Policy; import org.eclipse.edc.transform.spi.ProblemBuilder; import org.eclipse.edc.transform.spi.TransformerContext; @@ -30,11 +31,11 @@ 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.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; @@ -46,6 +47,7 @@ class JsonObjectFromContractOfferMessageTransformerTest { + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private static final String MESSAGE_ID = "messageId"; private static final String CALLBACK_ADDRESS = "https://test.com"; private static final String PROTOCOL = "DSP"; @@ -58,7 +60,7 @@ class JsonObjectFromContractOfferMessageTransformerTest { @BeforeEach void setUp() { - transformer = new JsonObjectFromContractOfferMessageTransformer(jsonFactory); + transformer = new JsonObjectFromContractOfferMessageTransformer(jsonFactory, DSP_NAMESPACE); } @Test @@ -79,13 +81,12 @@ void transform_shouldReturnJsonObject_whenValidMessage() { assertThat(result).isNotNull(); assertThat(result.getJsonString(ID).getString()).isNotEmpty(); - assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_IRI); - assertThat(result.getJsonString(DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI).getString()).isEqualTo(CALLBACK_ADDRESS); - assertThat(result.getJsonObject(DSPACE_PROPERTY_OFFER_IRI)).isNotNull(); - assertThat(result.getJsonObject(DSPACE_PROPERTY_OFFER_IRI)).isNotNull(); - assertThat(result.getJsonObject(DSPACE_PROPERTY_OFFER_IRI).getJsonString(ID).getString()).isEqualTo(CONTRACT_OFFER_ID); - assertThat(result.getString(DSPACE_PROPERTY_PROVIDER_PID_IRI)).isEqualTo("providerPid"); - assertThat(result.getString(DSPACE_PROPERTY_CONSUMER_PID_IRI)).isEqualTo("consumerPid"); + assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_TERM)); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM)).getString()).isEqualTo(CALLBACK_ADDRESS); + assertThat(result.getJsonObject(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_OFFER_TERM))).isNotNull(); + assertThat(result.getJsonObject(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_OFFER_TERM)).getJsonString(ID).getString()).isEqualTo(CONTRACT_OFFER_ID); + assertThat(result.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM))).isEqualTo("providerPid"); + assertThat(result.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM))).isEqualTo("consumerPid"); verify(context, never()).reportProblem(anyString()); } diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractRequestMessageTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractRequestMessageTransformerTest.java index 4996338f145..a44a612f649 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractRequestMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/from/JsonObjectFromContractRequestMessageTransformerTest.java @@ -19,6 +19,7 @@ import jakarta.json.JsonObject; import org.eclipse.edc.connector.controlplane.contract.spi.types.negotiation.ContractRequestMessage; import org.eclipse.edc.connector.controlplane.contract.spi.types.offer.ContractOffer; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.policy.model.Policy; import org.eclipse.edc.transform.spi.ProblemBuilder; import org.eclipse.edc.transform.spi.TransformerContext; @@ -30,11 +31,11 @@ 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.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; @@ -46,6 +47,7 @@ class JsonObjectFromContractRequestMessageTransformerTest { + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private static final String CALLBACK_ADDRESS = "https://test.com"; private static final String CONSUMER_PID = "consumerPid"; private static final String PROTOCOL = "DSP"; @@ -56,7 +58,7 @@ class JsonObjectFromContractRequestMessageTransformerTest { private final TransformerContext context = mock(); private final JsonObjectFromContractRequestMessageTransformer transformer = - new JsonObjectFromContractRequestMessageTransformer(jsonFactory); + new JsonObjectFromContractRequestMessageTransformer(jsonFactory, DSP_NAMESPACE); @BeforeEach void setUp() { @@ -77,12 +79,12 @@ void verify_contractOffer() { assertThat(result).isNotNull(); assertThat(result.getJsonString(ID).getString()).isNotEmpty(); - assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_IRI); - assertThat(result.getJsonString(DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI).getString()).isEqualTo(CALLBACK_ADDRESS); - assertThat(result.getJsonObject(DSPACE_PROPERTY_OFFER_IRI)).isNotNull(); - assertThat(result.getJsonObject(DSPACE_PROPERTY_OFFER_IRI).getString(ID)).isEqualTo(CONTRACT_OFFER_ID); - assertThat(result.getJsonString(DSPACE_PROPERTY_CONSUMER_PID_IRI).getString()).isEqualTo("consumerPid"); - assertThat(result.getJsonString(DSPACE_PROPERTY_PROVIDER_PID_IRI).getString()).isEqualTo("providerPid"); + assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_TERM)); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM)).getString()).isEqualTo(CALLBACK_ADDRESS); + assertThat(result.getJsonObject(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_OFFER_TERM))).isNotNull(); + assertThat(result.getJsonObject(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_OFFER_TERM)).getString(ID)).isEqualTo(CONTRACT_OFFER_ID); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM)).getString()).isEqualTo("consumerPid"); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM)).getString()).isEqualTo("providerPid"); verify(context, never()).reportProblem(anyString()); } diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementMessageTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementMessageTransformerTest.java index ef2349f7a8f..71f86ffe7c8 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementMessageTransformerTest.java @@ -19,6 +19,7 @@ import jakarta.json.JsonObject; import org.eclipse.edc.connector.controlplane.contract.spi.types.agreement.ContractAgreement; import org.eclipse.edc.connector.controlplane.contract.spi.types.agreement.ContractAgreementMessage; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.policy.model.Action; import org.eclipse.edc.policy.model.Duty; import org.eclipse.edc.policy.model.Permission; @@ -40,13 +41,13 @@ import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_ASSIGNER_ATTRIBUTE; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_POLICY_TYPE_AGREEMENT; import static org.eclipse.edc.protocol.dsp.negotiation.transform.to.TestInput.getExpanded; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_AGREEMENT_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_ID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_ID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_TIMESTAMP_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_AGREEMENT_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_ID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_ID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_TIMESTAMP_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.contains; @@ -58,6 +59,7 @@ import static org.mockito.Mockito.when; class JsonObjectToContractAgreementMessageTransformerTest { + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private static final String CONSUMER_ID = "consumerId"; private static final String PROVIDER_ID = "providerId"; private static final String AGREEMENT_ID = "agreementId"; @@ -86,7 +88,7 @@ private static Policy.Builder policyBuilder() { @BeforeEach void setUp() { - transformer = new JsonObjectToContractAgreementMessageTransformer(); + transformer = new JsonObjectToContractAgreementMessageTransformer(DSP_NAMESPACE); when(context.problem()).thenReturn(new ProblemBuilder(context)); } @@ -94,15 +96,15 @@ void setUp() { void transform() { var message = jsonFactory.createObjectBuilder() .add(ID, MESSAGE_ID) - .add(TYPE, DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") - .add(DSPACE_PROPERTY_AGREEMENT_IRI, jsonFactory.createObjectBuilder() + .add(TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_AGREEMENT_TERM), jsonFactory.createObjectBuilder() .add(ID, AGREEMENT_ID) .add(TYPE, ODRL_POLICY_TYPE_AGREEMENT) .add(ODRL_ASSIGNEE_ATTRIBUTE, CONSUMER_ID) .add(ODRL_ASSIGNER_ATTRIBUTE, PROVIDER_ID) - .add(DSPACE_PROPERTY_TIMESTAMP_IRI, TIMESTAMP) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_TIMESTAMP_TERM), TIMESTAMP) .build()) .build(); @@ -133,17 +135,17 @@ void transform_nullPolicy() { var value = "example"; var message = jsonFactory.createObjectBuilder() .add(ID, value) - .add(TYPE, DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") - .add(DSPACE_PROPERTY_AGREEMENT_IRI, jsonFactory.createObjectBuilder() + .add(TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_AGREEMENT_TERM), jsonFactory.createObjectBuilder() .add(ID, AGREEMENT_ID) .add(TYPE, ODRL_POLICY_TYPE_AGREEMENT) .add(ODRL_ASSIGNEE_ATTRIBUTE, CONSUMER_ID) .add(ODRL_ASSIGNER_ATTRIBUTE, PROVIDER_ID) - .add(DSPACE_PROPERTY_TIMESTAMP_IRI, TIMESTAMP) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_TIMESTAMP_TERM), TIMESTAMP) .build()) - .add(DSPACE_PROPERTY_TIMESTAMP_IRI, "123") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_TIMESTAMP_TERM), "123") .build(); when(context.transform(any(JsonObject.class), eq(Policy.class))).thenReturn(null); @@ -160,22 +162,22 @@ void transform_invalidTimestamp() { .add(TYPE, ODRL_POLICY_TYPE_AGREEMENT) .add(ODRL_ASSIGNEE_ATTRIBUTE, CONSUMER_ID) .add(ODRL_ASSIGNER_ATTRIBUTE, PROVIDER_ID) - .add(DSPACE_PROPERTY_TIMESTAMP_IRI, "Invalid Timestamp") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_TIMESTAMP_TERM), "Invalid Timestamp") .build(); var message = jsonFactory.createObjectBuilder() .add(ID, "messageId") - .add(TYPE, DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") - .add(DSPACE_PROPERTY_AGREEMENT_IRI, agreement) + .add(TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_AGREEMENT_TERM), 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_PROPERTY_TIMESTAMP_IRI)); + verify(context, times(1)).reportProblem(contains(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_TIMESTAMP_TERM))); } @Test @@ -189,17 +191,17 @@ void transform_missingTimestamp() { var message = jsonFactory.createObjectBuilder() .add(ID, "messageId") - .add(TYPE, DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") - .add(DSPACE_PROPERTY_AGREEMENT_IRI, agreement) + .add(TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_AGREEMENT_TERM), 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_PROPERTY_TIMESTAMP_IRI)); + verify(context, times(1)).reportProblem(contains(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_TIMESTAMP_TERM))); } @@ -210,17 +212,17 @@ void transform_excludedPolicyKeywords() { .add(TYPE, ODRL_POLICY_TYPE_AGREEMENT) .add(ODRL_ASSIGNEE_ATTRIBUTE, CONSUMER_ID) .add(ODRL_ASSIGNER_ATTRIBUTE, PROVIDER_ID) - .add(DSPACE_PROPERTY_TIMESTAMP_IRI, TIMESTAMP) - .add(DSPACE_PROPERTY_CONSUMER_ID_IRI, CONSUMER_ID) - .add(DSPACE_PROPERTY_PROVIDER_ID_IRI, PROVIDER_ID) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_TIMESTAMP_TERM), TIMESTAMP) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_ID_TERM), CONSUMER_ID) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_ID_TERM), PROVIDER_ID) .build(); var message = jsonFactory.createObjectBuilder() .add(ID, "messageId") - .add(TYPE, DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") - .add(DSPACE_PROPERTY_AGREEMENT_IRI, agreement) + .add(TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_AGREEMENT_TERM), agreement) .build(); when(context.transform(any(JsonObject.class), eq(Policy.class))).thenReturn(policy()); @@ -233,8 +235,8 @@ void transform_excludedPolicyKeywords() { var transformedPolicy = captor.getValue(); - assertThat(transformedPolicy).doesNotContainKeys(DSPACE_PROPERTY_TIMESTAMP_IRI, - DSPACE_PROPERTY_CONSUMER_ID_IRI, DSPACE_PROPERTY_PROVIDER_ID_IRI); + assertThat(transformedPolicy).doesNotContainKeys(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_TIMESTAMP_TERM), + DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_ID_TERM), DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_ID_TERM)); } private Policy policy() { diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementVerificationMessageTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementVerificationMessageTransformerTest.java index d057f801eb8..2431fe7aa35 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementVerificationMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractAgreementVerificationMessageTransformerTest.java @@ -18,6 +18,7 @@ import jakarta.json.JsonBuilderFactory; import org.eclipse.edc.connector.controlplane.contract.spi.types.agreement.ContractAgreementVerificationMessage; import org.eclipse.edc.jsonld.spi.JsonLdKeywords; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.transform.spi.ProblemBuilder; import org.eclipse.edc.transform.spi.TransformerContext; import org.junit.jupiter.api.BeforeEach; @@ -27,9 +28,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.protocol.dsp.negotiation.transform.to.TestInput.getExpanded; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.contains; import static org.mockito.Mockito.mock; @@ -39,12 +40,12 @@ import static org.mockito.Mockito.when; class JsonObjectToContractAgreementVerificationMessageTransformerTest { - + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final JsonBuilderFactory jsonFactory = Json.createBuilderFactory(Map.of()); private final TransformerContext context = mock(); private final JsonObjectToContractAgreementVerificationMessageTransformer transformer = - new JsonObjectToContractAgreementVerificationMessageTransformer(); + new JsonObjectToContractAgreementVerificationMessageTransformer(DSP_NAMESPACE); @BeforeEach void setUp() { @@ -55,9 +56,9 @@ void setUp() { void transform() { var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, "messageId") - .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") + .add(JsonLdKeywords.TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") .build(); var result = transformer.transform(getExpanded(message), context); @@ -75,13 +76,13 @@ void transform() { void verify_failTransformWhenConsumerPidMissing() { var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, "messageId") - .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_IRI) + .add(JsonLdKeywords.TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_TERM)) .build(); var result = transformer.transform(getExpanded(message), context); assertThat(result).isNull(); - verify(context, times(1)).reportProblem(contains(DSPACE_PROPERTY_CONSUMER_PID_IRI)); + verify(context, times(1)).reportProblem(contains(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM))); } } diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationAckTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationAckTransformerTest.java index b136bde9393..d34d7703e6f 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationAckTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationAckTransformerTest.java @@ -17,6 +17,7 @@ import jakarta.json.Json; import jakarta.json.JsonBuilderFactory; import org.eclipse.edc.jsonld.spi.JsonLdKeywords; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.transform.spi.TransformerContext; import org.junit.jupiter.api.Test; @@ -24,26 +25,26 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.protocol.dsp.negotiation.transform.to.TestInput.getExpanded; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_STATE_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_STATE_TERM; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyNoInteractions; class JsonObjectToContractNegotiationAckTransformerTest { - + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final TransformerContext context = mock(); private final JsonBuilderFactory jsonFactory = Json.createBuilderFactory(Map.of()); - private final JsonObjectToContractNegotiationAckTransformer transformer = new JsonObjectToContractNegotiationAckTransformer(); + private final JsonObjectToContractNegotiationAckTransformer transformer = new JsonObjectToContractNegotiationAckTransformer(DSP_NAMESPACE); @Test void shouldTransform() { var message = jsonFactory.createObjectBuilder() - .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_NEGOTIATION_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") - .add(DSPACE_PROPERTY_STATE_IRI, "STATE") + .add(JsonLdKeywords.TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_NEGOTIATION_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_STATE_TERM), "STATE") .build(); var result = transformer.transform(getExpanded(message), context); diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationEventMessageTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationEventMessageTransformerTest.java index 81ebbd9ffc5..f07b604da77 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationEventMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationEventMessageTransformerTest.java @@ -18,6 +18,7 @@ import jakarta.json.JsonBuilderFactory; import org.eclipse.edc.connector.controlplane.contract.spi.types.agreement.ContractNegotiationEventMessage; import org.eclipse.edc.jsonld.spi.JsonLdKeywords; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.transform.spi.ProblemBuilder; import org.eclipse.edc.transform.spi.TransformerContext; import org.junit.jupiter.api.BeforeEach; @@ -27,11 +28,11 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.protocol.dsp.negotiation.transform.to.TestInput.getExpanded; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_EVENT_TYPE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_EVENT_TYPE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.contains; import static org.mockito.Mockito.mock; @@ -41,12 +42,12 @@ import static org.mockito.Mockito.when; class JsonObjectToContractNegotiationEventMessageTransformerTest { - + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final JsonBuilderFactory jsonFactory = Json.createBuilderFactory(Map.of()); private final TransformerContext context = mock(); private final JsonObjectToContractNegotiationEventMessageTransformer transformer = - new JsonObjectToContractNegotiationEventMessageTransformer(); + new JsonObjectToContractNegotiationEventMessageTransformer(DSP_NAMESPACE); @BeforeEach void setUp() { @@ -57,10 +58,10 @@ void setUp() { void transform() { var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, "id1") - .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") - .add(DSPACE_PROPERTY_EVENT_TYPE_IRI, DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED_IRI) + .add(JsonLdKeywords.TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_EVENT_TYPE_TERM), DSP_NAMESPACE.toIri(DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED_TERM)) .build(); var result = transformer.transform(getExpanded(message), context); @@ -79,47 +80,47 @@ void transform() { void verify_failTransformWhenProcessIdMissing() { var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, "id1") - .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_IRI) - .add(DSPACE_PROPERTY_EVENT_TYPE_IRI, DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED_IRI) + .add(JsonLdKeywords.TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_EVENT_TYPE_TERM), DSP_NAMESPACE.toIri(DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED_TERM)) .build(); var result = transformer.transform(getExpanded(message), context); assertThat(result).isNull(); - verify(context, times(1)).reportProblem(contains(DSPACE_PROPERTY_CONSUMER_PID_IRI)); + verify(context, times(1)).reportProblem(contains(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM))); } @Test void verify_failTransformWhenEventTypeMissing() { var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, "id1") - .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") + .add(JsonLdKeywords.TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") .build(); var result = transformer.transform(getExpanded(message), context); assertThat(result).isNull(); - verify(context, times(1)).reportProblem(contains(DSPACE_PROPERTY_EVENT_TYPE_IRI)); + verify(context, times(1)).reportProblem(contains(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_EVENT_TYPE_TERM))); } @Test void verify_failTransformWhenEventTypeInvalid() { var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, "id1") - .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") - .add(DSPACE_PROPERTY_EVENT_TYPE_IRI, "InvalidType") + .add(JsonLdKeywords.TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_EVENT_TYPE_TERM), "InvalidType") .build(); var result = transformer.transform(getExpanded(message), context); assertThat(result).isNull(); - verify(context, times(1)).reportProblem(contains(DSPACE_PROPERTY_EVENT_TYPE_IRI)); + verify(context, times(1)).reportProblem(contains(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_EVENT_TYPE_TERM))); } } diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationTerminationMessageTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationTerminationMessageTransformerTest.java index f3ca6c5ffe5..8785014b109 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationTerminationMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractNegotiationTerminationMessageTransformerTest.java @@ -17,6 +17,7 @@ import jakarta.json.Json; import jakarta.json.JsonBuilderFactory; import org.eclipse.edc.jsonld.spi.JsonLdKeywords; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.transform.spi.TransformerContext; import org.junit.jupiter.api.Test; @@ -24,39 +25,38 @@ 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.to.TestInput.getExpanded; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON_TERM; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; class JsonObjectToContractNegotiationTerminationMessageTransformerTest { - public static final String CODE = "code1"; + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final JsonBuilderFactory jsonFactory = Json.createBuilderFactory(Map.of()); private final TransformerContext context = mock(); private final JsonObjectToContractNegotiationTerminationMessageTransformer transformer = - new JsonObjectToContractNegotiationTerminationMessageTransformer(); + new JsonObjectToContractNegotiationTerminationMessageTransformer(DSP_NAMESPACE); @Test void transform() { - var reason = Json.createBuilderFactory(Map.of()).createObjectBuilder().add(DSPACE_SCHEMA + "foo", "bar"); + var reason = Json.createBuilderFactory(Map.of()).createObjectBuilder().add(DSP_NAMESPACE.toIri("foo"), "bar"); var reasonArray = Json.createBuilderFactory(Map.of()).createArrayBuilder().add(reason).build(); var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, "id1") - .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") - .add(DSPACE_PROPERTY_CODE_IRI, CODE) - .add(DSPACE_PROPERTY_REASON_IRI, reasonArray) + .add(JsonLdKeywords.TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CODE_TERM), CODE) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_REASON_TERM), reasonArray) .build(); var result = transformer.transform(getExpanded(message), context); @@ -69,7 +69,7 @@ void transform() { assertThat(result.getProviderPid()).isEqualTo("providerPid"); assertThat(result.getCode()).isEqualTo(CODE); - assertThat(result.getRejectionReason()).isEqualTo(format("[{\"%sfoo\":[{\"@value\":\"bar\"}]}]", DSPACE_SCHEMA)); + assertThat(result.getRejectionReason()).isEqualTo(format("[{\"%sfoo\":[{\"@value\":\"bar\"}]}]", DSP_NAMESPACE.namespace())); verify(context, never()).reportProblem(anyString()); } @@ -78,9 +78,9 @@ void transform() { void verify_noCodeNodReason() { var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, "id1") - .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") + .add(JsonLdKeywords.TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") .build(); var result = transformer.transform(getExpanded(message), context); diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractOfferMessageTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractOfferMessageTransformerTest.java index e555024b97a..a94fd1f0c2b 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractOfferMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractOfferMessageTransformerTest.java @@ -18,6 +18,7 @@ import jakarta.json.JsonBuilderFactory; import jakarta.json.JsonObject; import org.eclipse.edc.jsonld.spi.JsonLdKeywords; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.policy.model.Policy; import org.eclipse.edc.policy.model.PolicyType; import org.eclipse.edc.transform.spi.ProblemBuilder; @@ -30,11 +31,11 @@ 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.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; @@ -46,6 +47,7 @@ class JsonObjectToContractOfferMessageTransformerTest { + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private static final String CALLBACK_ADDRESS = "https://test.com"; private static final String MESSAGE_ID = "messageId"; private static final String ASSET_ID = "assetId"; @@ -54,7 +56,7 @@ class JsonObjectToContractOfferMessageTransformerTest { private final JsonBuilderFactory jsonFactory = Json.createBuilderFactory(Map.of()); private final TransformerContext context = mock(); - private final JsonObjectToContractOfferMessageTransformer transformer = new JsonObjectToContractOfferMessageTransformer(); + private final JsonObjectToContractOfferMessageTransformer transformer = new JsonObjectToContractOfferMessageTransformer(DSP_NAMESPACE); @BeforeEach void setUp() { @@ -65,11 +67,11 @@ void setUp() { void transform_shouldReturnMessage_whenValidJsonObject() { var message = jsonFactory.createObjectBuilder() .add(ID, MESSAGE_ID) - .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") - .add(DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI, CALLBACK_ADDRESS) - .add(DSPACE_PROPERTY_OFFER_IRI, jsonFactory.createObjectBuilder() + .add(JsonLdKeywords.TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM), CALLBACK_ADDRESS) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_OFFER_TERM), jsonFactory.createObjectBuilder() .add(ID, CONTRACT_OFFER_ID) .build()) .build(); @@ -99,9 +101,9 @@ void transform_shouldReturnMessage_whenValidJsonObject() { void transform_shouldReportProblem_whenMissingProcessId() { var message = jsonFactory.createObjectBuilder() .add(ID, MESSAGE_ID) - .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI, CALLBACK_ADDRESS) - .add(DSPACE_PROPERTY_OFFER_IRI, jsonFactory.createObjectBuilder() + .add(JsonLdKeywords.TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM), CALLBACK_ADDRESS) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_OFFER_TERM), jsonFactory.createObjectBuilder() .add(ID, CONTRACT_OFFER_ID) .build()) .build(); @@ -116,10 +118,10 @@ void transform_shouldReportProblem_whenMissingProcessId() { void transform_shouldReportProblem_whenMissingContractOffer() { var message = jsonFactory.createObjectBuilder() .add(ID, MESSAGE_ID) - .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") - .add(DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI, CALLBACK_ADDRESS) + .add(JsonLdKeywords.TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM), CALLBACK_ADDRESS) .build(); var result = transformer.transform(message, context); @@ -132,11 +134,11 @@ void transform_shouldReportProblem_whenMissingContractOffer() { void transform_shouldReportProblem_whenMissingContractOfferId() { var message = jsonFactory.createObjectBuilder() .add(ID, MESSAGE_ID) - .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") - .add(DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI, CALLBACK_ADDRESS) - .add(DSPACE_PROPERTY_OFFER_IRI, jsonFactory.createObjectBuilder().build()) + .add(JsonLdKeywords.TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM), CALLBACK_ADDRESS) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_OFFER_TERM), jsonFactory.createObjectBuilder().build()) .build(); var policy = policy(); @@ -152,11 +154,11 @@ void transform_shouldReportProblem_whenMissingContractOfferId() { void transform_shouldReportProblem_whenPolicyTransformationFails() { var message = jsonFactory.createObjectBuilder() .add(ID, MESSAGE_ID) - .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") - .add(DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI, CALLBACK_ADDRESS) - .add(DSPACE_PROPERTY_OFFER_IRI, jsonFactory.createObjectBuilder() + .add(JsonLdKeywords.TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM), CALLBACK_ADDRESS) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_OFFER_TERM), jsonFactory.createObjectBuilder() .add(ID, CONTRACT_OFFER_ID) .build()) .build(); diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractRequestMessageTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractRequestMessageTransformerTest.java index d5cf18be5d8..46adabad83d 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractRequestMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/to/JsonObjectToContractRequestMessageTransformerTest.java @@ -18,6 +18,7 @@ import jakarta.json.JsonBuilderFactory; import jakarta.json.JsonObject; import org.eclipse.edc.jsonld.spi.JsonLdKeywords; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.policy.model.Action; import org.eclipse.edc.policy.model.Duty; import org.eclipse.edc.policy.model.Permission; @@ -33,11 +34,11 @@ 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.to.TestInput.getExpanded; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; @@ -52,6 +53,7 @@ class JsonObjectToContractRequestMessageTransformerTest { private static final String CALLBACK = "https://test.com"; private static final String OBJECT_ID = "id1"; private static final String CONTRACT_OFFER_ID = "contractOfferId"; + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final JsonBuilderFactory jsonFactory = Json.createBuilderFactory(Map.of()); private final TransformerContext context = mock(); @@ -60,7 +62,7 @@ class JsonObjectToContractRequestMessageTransformerTest { @BeforeEach void setUp() { - transformer = new JsonObjectToContractRequestMessageTransformer(); + transformer = new JsonObjectToContractRequestMessageTransformer(DSP_NAMESPACE); when(context.problem()).thenReturn(new ProblemBuilder(context)); } @@ -68,11 +70,11 @@ void setUp() { void verify_usingOffer() { var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, OBJECT_ID) - .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") - .add(DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI, CALLBACK) - .add(DSPACE_PROPERTY_OFFER_IRI, contractOffer()) + .add(JsonLdKeywords.TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM), CALLBACK) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_OFFER_TERM), contractOffer()) .build(); when(context.transform(any(JsonObject.class), eq(Policy.class))).thenReturn(policy()); @@ -98,10 +100,10 @@ void verify_usingOffer() { void verify_noCallbackOrDatasetOk() { var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, OBJECT_ID) - .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") - .add(DSPACE_PROPERTY_OFFER_IRI, contractOffer()) + .add(JsonLdKeywords.TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_OFFER_TERM), contractOffer()) .build(); when(context.transform(any(JsonObject.class), eq(Policy.class))).thenReturn(policy()); @@ -120,10 +122,10 @@ void verify_noIdContractOfferFails() { var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, OBJECT_ID) - .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") - .add(DSPACE_PROPERTY_OFFER_IRI, offer) + .add(JsonLdKeywords.TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_OFFER_TERM), offer) .build(); when(context.transform(any(JsonObject.class), eq(Policy.class))).thenReturn(policy()); @@ -139,11 +141,11 @@ void verify_noIdContractOfferFails() { void transform_nullPolicyFails() { var message = jsonFactory.createObjectBuilder() .add(JsonLdKeywords.ID, OBJECT_ID) - .add(JsonLdKeywords.TYPE, DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") - .add(DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI, CALLBACK) - .add(DSPACE_PROPERTY_OFFER_IRI, contractOffer()) + .add(JsonLdKeywords.TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM), CALLBACK) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_OFFER_TERM), contractOffer()) .build(); when(context.transform(any(JsonObject.class), eq(Policy.class))).thenReturn(null); diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractAgreementMessageValidator.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractAgreementMessageValidator.java index c123175a343..fbbc6eb3b88 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractAgreementMessageValidator.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractAgreementMessageValidator.java @@ -21,7 +21,6 @@ import org.eclipse.edc.validator.jsonobject.validators.TypeIs; import org.eclipse.edc.validator.spi.Validator; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_TERM; /** @@ -29,10 +28,6 @@ */ public class ContractAgreementMessageValidator { - public static Validator instance() { - return instance(DSP_NAMESPACE_V_08); - } - public static Validator instance(JsonLdNamespace namespace) { return JsonObjectValidator.newValidator() .verify(path -> new TypeIs(path, namespace.toIri(DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_TERM))) diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractAgreementVerificationMessageValidator.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractAgreementVerificationMessageValidator.java index f6e15b50244..63e21f5f534 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractAgreementVerificationMessageValidator.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractAgreementVerificationMessageValidator.java @@ -21,16 +21,12 @@ import org.eclipse.edc.validator.jsonobject.validators.TypeIs; import org.eclipse.edc.validator.spi.Validator; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_TERM; /** * Validator for {@link ContractAgreementVerificationMessage} Json-LD representation */ public class ContractAgreementVerificationMessageValidator { - public static Validator instance() { - return instance(DSP_NAMESPACE_V_08); - } public static Validator instance(JsonLdNamespace namespace) { return JsonObjectValidator.newValidator() diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractNegotiationEventMessageValidator.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractNegotiationEventMessageValidator.java index 2cee70657e8..13186880496 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractNegotiationEventMessageValidator.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractNegotiationEventMessageValidator.java @@ -21,16 +21,12 @@ import org.eclipse.edc.validator.jsonobject.validators.TypeIs; import org.eclipse.edc.validator.spi.Validator; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_TERM; /** * Validator for {@link ContractNegotiationEventMessage} Json-LD representation */ public class ContractNegotiationEventMessageValidator { - public static Validator instance() { - return instance(DSP_NAMESPACE_V_08); - } public static Validator instance(JsonLdNamespace namespace) { return JsonObjectValidator.newValidator() diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractNegotiationTerminationMessageValidator.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractNegotiationTerminationMessageValidator.java index 203e5ed99d3..092b0827903 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractNegotiationTerminationMessageValidator.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractNegotiationTerminationMessageValidator.java @@ -21,16 +21,12 @@ import org.eclipse.edc.validator.jsonobject.validators.TypeIs; import org.eclipse.edc.validator.spi.Validator; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_TERM; /** * Validator for {@link ContractNegotiationTerminationMessage} Json-LD representation */ public class ContractNegotiationTerminationMessageValidator { - public static Validator instance() { - return instance(DSP_NAMESPACE_V_08); - } public static Validator instance(JsonLdNamespace namespace) { return JsonObjectValidator.newValidator() diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractOfferMessageValidator.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractOfferMessageValidator.java index 91dd98a1a24..136a5235c3e 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractOfferMessageValidator.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractOfferMessageValidator.java @@ -25,7 +25,6 @@ import org.eclipse.edc.validator.spi.Validator; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_TARGET_ATTRIBUTE; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM; @@ -34,9 +33,6 @@ * Validator for {@link ContractOfferMessage} Json-LD representation */ public class ContractOfferMessageValidator { - public static Validator instance() { - return instance(DSP_NAMESPACE_V_08); - } public static Validator instance(JsonLdNamespace namespace) { return JsonObjectValidator.newValidator() diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractRequestMessageValidator.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractRequestMessageValidator.java index cf6e7a1eb91..0d91e08c843 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractRequestMessageValidator.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractRequestMessageValidator.java @@ -25,7 +25,6 @@ import org.eclipse.edc.validator.spi.Validator; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_TARGET_ATTRIBUTE; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM; @@ -34,9 +33,6 @@ * Validator for {@link ContractRequestMessage} Json-LD representation */ public class ContractRequestMessageValidator { - public static Validator instance() { - return instance(DSP_NAMESPACE_V_08); - } public static Validator instance(JsonLdNamespace namespace) { return JsonObjectValidator.newValidator() diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractAgreementMessageValidatorTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractAgreementMessageValidatorTest.java index 4fa925469e5..5d16e501676 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractAgreementMessageValidatorTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractAgreementMessageValidatorTest.java @@ -16,6 +16,7 @@ import jakarta.json.Json; import jakarta.json.JsonObject; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.validator.spi.ValidationFailure; import org.eclipse.edc.validator.spi.Validator; import org.eclipse.edc.validator.spi.Violation; @@ -25,16 +26,17 @@ import static org.assertj.core.api.InstanceOfAssertFactories.list; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_TERM; class ContractAgreementMessageValidatorTest { - - private final Validator validator = ContractAgreementMessageValidator.instance(); + + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); + private final Validator validator = ContractAgreementMessageValidator.instance(DSP_NAMESPACE); @Test void shouldSucceed_whenObjectIsValid() { var input = Json.createObjectBuilder() - .add(TYPE, Json.createArrayBuilder().add(DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_IRI)) + .add(TYPE, Json.createArrayBuilder().add(DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_TERM))) .build(); var result = validator.validate(input); diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractAgreementVerificationMessageValidatorTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractAgreementVerificationMessageValidatorTest.java index abbc5fd05ad..4004bb36a61 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractAgreementVerificationMessageValidatorTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractAgreementVerificationMessageValidatorTest.java @@ -16,6 +16,7 @@ import jakarta.json.Json; import jakarta.json.JsonObject; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.validator.spi.ValidationFailure; import org.eclipse.edc.validator.spi.Validator; import org.eclipse.edc.validator.spi.Violation; @@ -25,16 +26,17 @@ import static org.assertj.core.api.InstanceOfAssertFactories.list; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_TERM; class ContractAgreementVerificationMessageValidatorTest { - private final Validator validator = ContractAgreementVerificationMessageValidator.instance(); + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); + private final Validator validator = ContractAgreementVerificationMessageValidator.instance(DSP_NAMESPACE); @Test void shouldSucceed_whenObjectIsValid() { var input = Json.createObjectBuilder() - .add(TYPE, Json.createArrayBuilder().add(DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_IRI)) + .add(TYPE, Json.createArrayBuilder().add(DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_TERM))) .build(); var result = validator.validate(input); diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractNegotiationEventMessageValidatorTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractNegotiationEventMessageValidatorTest.java index 31b0f6acc6c..9411d2085ac 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractNegotiationEventMessageValidatorTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractNegotiationEventMessageValidatorTest.java @@ -16,6 +16,7 @@ import jakarta.json.Json; import jakarta.json.JsonObject; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.validator.spi.ValidationFailure; import org.eclipse.edc.validator.spi.Validator; import org.eclipse.edc.validator.spi.Violation; @@ -25,16 +26,17 @@ import static org.assertj.core.api.InstanceOfAssertFactories.list; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_TERM; class ContractNegotiationEventMessageValidatorTest { - private final Validator validator = ContractNegotiationEventMessageValidator.instance(); + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); + private final Validator validator = ContractNegotiationEventMessageValidator.instance(DSP_NAMESPACE); @Test void shouldSucceed_whenObjectIsValid() { var input = Json.createObjectBuilder() - .add(TYPE, Json.createArrayBuilder().add(DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_IRI)) + .add(TYPE, Json.createArrayBuilder().add(DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_TERM))) .build(); var result = validator.validate(input); diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractNegotiationTerminationMessageValidatorTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractNegotiationTerminationMessageValidatorTest.java index 3ac9600661b..92989c02635 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractNegotiationTerminationMessageValidatorTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractNegotiationTerminationMessageValidatorTest.java @@ -16,6 +16,7 @@ import jakarta.json.Json; import jakarta.json.JsonObject; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.validator.spi.ValidationFailure; import org.eclipse.edc.validator.spi.Validator; import org.eclipse.edc.validator.spi.Violation; @@ -25,16 +26,17 @@ import static org.assertj.core.api.InstanceOfAssertFactories.list; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_TERM; class ContractNegotiationTerminationMessageValidatorTest { - private final Validator validator = ContractNegotiationTerminationMessageValidator.instance(); + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); + private final Validator validator = ContractNegotiationTerminationMessageValidator.instance(DSP_NAMESPACE); @Test void shouldSucceed_whenObjectIsValid() { var input = Json.createObjectBuilder() - .add(TYPE, Json.createArrayBuilder().add(DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_IRI)) + .add(TYPE, Json.createArrayBuilder().add(DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_TERM))) .build(); var result = validator.validate(input); diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractOfferMessageValidatorTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractOfferMessageValidatorTest.java index 9d586f3d1b8..0cb755ea684 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractOfferMessageValidatorTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractOfferMessageValidatorTest.java @@ -17,6 +17,7 @@ import jakarta.json.Json; import jakarta.json.JsonArrayBuilder; import jakarta.json.JsonObject; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.validator.spi.ValidationFailure; import org.eclipse.edc.validator.spi.Validator; import org.eclipse.edc.validator.spi.Violation; @@ -34,24 +35,25 @@ import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_POLICY_TYPE_OFFER; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_TARGET_ATTRIBUTE; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM; class ContractOfferMessageValidatorTest { - private final Validator validator = ContractOfferMessageValidator.instance(); + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); + private final Validator validator = ContractOfferMessageValidator.instance(DSP_NAMESPACE); @Test void shouldSucceed_whenObjectIsValid() { var input = Json.createObjectBuilder() - .add(TYPE, Json.createArrayBuilder().add(DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_IRI)) - .add(DSPACE_PROPERTY_OFFER_IRI, createArrayBuilder() + .add(TYPE, Json.createArrayBuilder().add(DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_TERM))) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_OFFER_TERM), createArrayBuilder() .add(createObjectBuilder() .add(TYPE, ODRL_POLICY_TYPE_OFFER) .add(ID, UUID.randomUUID().toString()) .add(ODRL_TARGET_ATTRIBUTE, id("target")))) - .add(DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI, value("http://any/address")) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM), value("http://any/address")) .build(); var result = validator.validate(input); @@ -69,22 +71,22 @@ void shouldFail_whenMandatoryFieldsAreMissing() { assertThat(result).isFailed().extracting(ValidationFailure::getViolations).asInstanceOf(list(Violation.class)) .hasSize(2) .anySatisfy(violation -> assertThat(violation.path()).isEqualTo(TYPE)) - .anySatisfy(violation -> assertThat(violation.path()).isEqualTo(DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI)); + .anySatisfy(violation -> assertThat(violation.path()).isEqualTo(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM))); } @Test void shouldFail_whenOfferMissesIdAndTarget() { var input = createObjectBuilder() - .add(TYPE, createArrayBuilder().add(DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_IRI)) - .add(DSPACE_PROPERTY_OFFER_IRI, createArrayBuilder().add(createObjectBuilder())) - .add(DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI, value("http://any/address")) + .add(TYPE, createArrayBuilder().add(DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_TERM))) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_OFFER_TERM), createArrayBuilder().add(createObjectBuilder())) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM), value("http://any/address")) .build(); var result = validator.validate(input); assertThat(result).isFailed().extracting(ValidationFailure::getViolations).asInstanceOf(list(Violation.class)) .hasSize(2) - .allSatisfy(violation -> assertThat(violation.path()).startsWith(DSPACE_PROPERTY_OFFER_IRI)) + .allSatisfy(violation -> assertThat(violation.path()).startsWith(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_OFFER_TERM))) .anySatisfy(violation -> assertThat(violation.path()).endsWith(ID)) .anySatisfy(violation -> assertThat(violation.path()).endsWith(ODRL_TARGET_ATTRIBUTE)); } diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractRequestMessageValidatorTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractRequestMessageValidatorTest.java index c1cf13bd836..909c7e9c81b 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractRequestMessageValidatorTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/validation/ContractRequestMessageValidatorTest.java @@ -16,6 +16,7 @@ import jakarta.json.JsonArrayBuilder; import jakarta.json.JsonObject; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.validator.spi.ValidationFailure; import org.eclipse.edc.validator.spi.Validator; import org.eclipse.edc.validator.spi.Violation; @@ -33,24 +34,25 @@ import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_POLICY_TYPE_OFFER; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_TARGET_ATTRIBUTE; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM; class ContractRequestMessageValidatorTest { - private final Validator validator = ContractRequestMessageValidator.instance(); + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); + private final Validator validator = ContractRequestMessageValidator.instance(DSP_NAMESPACE); @Test void shouldSucceed_whenObjectIsValid() { var input = createObjectBuilder() - .add(TYPE, createArrayBuilder().add(DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_IRI)) - .add(DSPACE_PROPERTY_OFFER_IRI, createArrayBuilder() + .add(TYPE, createArrayBuilder().add(DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_TERM))) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_OFFER_TERM), createArrayBuilder() .add(createObjectBuilder() .add(TYPE, ODRL_POLICY_TYPE_OFFER) .add(ID, UUID.randomUUID().toString()) .add(ODRL_TARGET_ATTRIBUTE, id("target")))) - .add(DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI, value("http://any/address")) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM), value("http://any/address")) .build(); var result = validator.validate(input); @@ -68,22 +70,22 @@ void shouldFail_whenMandatoryFieldsAreMissing() { assertThat(result).isFailed().extracting(ValidationFailure::getViolations).asInstanceOf(list(Violation.class)) .hasSize(2) .anySatisfy(violation -> assertThat(violation.path()).isEqualTo(TYPE)) - .anySatisfy(violation -> assertThat(violation.path()).isEqualTo(DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI)); + .anySatisfy(violation -> assertThat(violation.path()).isEqualTo(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM))); } @Test void shouldFail_whenOfferMissesIdAndTarget() { var input = createObjectBuilder() - .add(TYPE, createArrayBuilder().add(DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_IRI)) - .add(DSPACE_PROPERTY_OFFER_IRI, createArrayBuilder().add(createObjectBuilder())) - .add(DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI, value("http://any/address")) + .add(TYPE, createArrayBuilder().add(DSP_NAMESPACE.toIri(DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_TERM))) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_OFFER_TERM), createArrayBuilder().add(createObjectBuilder())) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM), value("http://any/address")) .build(); var result = validator.validate(input); assertThat(result).isFailed().extracting(ValidationFailure::getViolations).asInstanceOf(list(Violation.class)) .hasSize(2) - .allSatisfy(violation -> assertThat(violation.path()).startsWith(DSPACE_PROPERTY_OFFER_IRI)) + .allSatisfy(violation -> assertThat(violation.path()).startsWith(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_OFFER_TERM))) .anySatisfy(violation -> assertThat(violation.path()).endsWith(ID)) .anySatisfy(violation -> assertThat(violation.path()).endsWith(ODRL_TARGET_ATTRIBUTE)); } diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferCompletionMessageTransformer.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferCompletionMessageTransformer.java index fab17d96e21..f245f7394e3 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferCompletionMessageTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferCompletionMessageTransformer.java @@ -25,7 +25,6 @@ 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.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_TERM; @@ -35,10 +34,6 @@ public class JsonObjectFromTransferCompletionMessageTransformer extends Abstract private final JsonBuilderFactory jsonBuilderFactory; - public JsonObjectFromTransferCompletionMessageTransformer(JsonBuilderFactory jsonBuilderFactory) { - this(jsonBuilderFactory, DSP_NAMESPACE_V_08); - } - public JsonObjectFromTransferCompletionMessageTransformer(JsonBuilderFactory jsonBuilderFactory, JsonLdNamespace namespace) { super(TransferCompletionMessage.class, JsonObject.class, namespace); this.jsonBuilderFactory = jsonBuilderFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferErrorTransformer.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferErrorTransformer.java index 6bc578100cf..31ae65316f5 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferErrorTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferErrorTransformer.java @@ -24,7 +24,6 @@ import org.jetbrains.annotations.Nullable; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_ERROR_TERM; @@ -36,10 +35,6 @@ public class JsonObjectFromTransferErrorTransformer extends AbstractNamespaceAwa private final JsonBuilderFactory jsonFactory; - public JsonObjectFromTransferErrorTransformer(JsonBuilderFactory jsonFactory) { - this(jsonFactory, DSP_NAMESPACE_V_08); - } - public JsonObjectFromTransferErrorTransformer(JsonBuilderFactory jsonFactory, JsonLdNamespace namespace) { super(TransferError.class, JsonObject.class, namespace); this.jsonFactory = jsonFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferProcessTransformer.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferProcessTransformer.java index c2efa055b76..2daada70e23 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferProcessTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferProcessTransformer.java @@ -26,7 +26,6 @@ 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.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_STATE_TERM; @@ -36,10 +35,6 @@ public class JsonObjectFromTransferProcessTransformer extends AbstractNamespaceA private final JsonBuilderFactory jsonBuilderFactory; - public JsonObjectFromTransferProcessTransformer(JsonBuilderFactory jsonBuilderFactory) { - this(jsonBuilderFactory, DSP_NAMESPACE_V_08); - } - public JsonObjectFromTransferProcessTransformer(JsonBuilderFactory jsonBuilderFactory, JsonLdNamespace namespace) { super(TransferProcess.class, JsonObject.class, namespace); this.jsonBuilderFactory = jsonBuilderFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferRequestMessageTransformer.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferRequestMessageTransformer.java index ab880b8983a..1a4f81cae2c 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferRequestMessageTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferRequestMessageTransformer.java @@ -28,7 +28,6 @@ import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID; 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.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID_TERM; @@ -40,10 +39,6 @@ public class JsonObjectFromTransferRequestMessageTransformer extends AbstractNam private final JsonBuilderFactory jsonBuilderFactory; - public JsonObjectFromTransferRequestMessageTransformer(JsonBuilderFactory jsonBuilderFactory) { - this(jsonBuilderFactory, DSP_NAMESPACE_V_08); - } - public JsonObjectFromTransferRequestMessageTransformer(JsonBuilderFactory jsonBuilderFactory, JsonLdNamespace namespace) { super(TransferRequestMessage.class, JsonObject.class, namespace); this.jsonBuilderFactory = jsonBuilderFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferStartMessageTransformer.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferStartMessageTransformer.java index 7456c5ca824..7a8d5281f59 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferStartMessageTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferStartMessageTransformer.java @@ -25,7 +25,6 @@ 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.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_DATA_ADDRESS_TERM; @@ -35,10 +34,6 @@ public class JsonObjectFromTransferStartMessageTransformer extends AbstractNames private final JsonBuilderFactory jsonBuilderFactory; - public JsonObjectFromTransferStartMessageTransformer(JsonBuilderFactory jsonBuilderFactory) { - this(jsonBuilderFactory, DSP_NAMESPACE_V_08); - } - public JsonObjectFromTransferStartMessageTransformer(JsonBuilderFactory jsonBuilderFactory, JsonLdNamespace namespace) { super(TransferStartMessage.class, JsonObject.class, namespace); this.jsonBuilderFactory = jsonBuilderFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferSuspensionMessageTransformer.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferSuspensionMessageTransformer.java index 76c938da54c..a3a61f4c910 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferSuspensionMessageTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferSuspensionMessageTransformer.java @@ -25,7 +25,6 @@ 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.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; @@ -36,10 +35,6 @@ public class JsonObjectFromTransferSuspensionMessageTransformer extends Abstract private final JsonBuilderFactory jsonBuilderFactory; - public JsonObjectFromTransferSuspensionMessageTransformer(JsonBuilderFactory jsonBuilderFactory) { - this(jsonBuilderFactory, DSP_NAMESPACE_V_08); - } - public JsonObjectFromTransferSuspensionMessageTransformer(JsonBuilderFactory jsonBuilderFactory, JsonLdNamespace namespace) { super(TransferSuspensionMessage.class, JsonObject.class, namespace); this.jsonBuilderFactory = jsonBuilderFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferTerminationMessageTransformer.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferTerminationMessageTransformer.java index b767a10597b..ec9ce355efb 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferTerminationMessageTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/from/JsonObjectFromTransferTerminationMessageTransformer.java @@ -25,7 +25,6 @@ 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.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; @@ -36,10 +35,6 @@ public class JsonObjectFromTransferTerminationMessageTransformer extends Abstrac private final JsonBuilderFactory jsonBuilderFactory; - public JsonObjectFromTransferTerminationMessageTransformer(JsonBuilderFactory jsonBuilderFactory) { - this(jsonBuilderFactory, DSP_NAMESPACE_V_08); - } - public JsonObjectFromTransferTerminationMessageTransformer(JsonBuilderFactory jsonBuilderFactory, JsonLdNamespace namespace) { super(TransferTerminationMessage.class, JsonObject.class, namespace); this.jsonBuilderFactory = jsonBuilderFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/to/JsonObjectToTransferCompletionMessageTransformer.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/to/JsonObjectToTransferCompletionMessageTransformer.java index b3f34c76ebe..c2c35fc7110 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/to/JsonObjectToTransferCompletionMessageTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/to/JsonObjectToTransferCompletionMessageTransformer.java @@ -22,17 +22,12 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_TERM; public class JsonObjectToTransferCompletionMessageTransformer extends AbstractNamespaceAwareJsonLdTransformer { - public JsonObjectToTransferCompletionMessageTransformer() { - this(DSP_NAMESPACE_V_08); - } - public JsonObjectToTransferCompletionMessageTransformer(JsonLdNamespace namespace) { super(JsonObject.class, TransferCompletionMessage.class, namespace); } diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/to/JsonObjectToTransferProcessAckTransformer.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/to/JsonObjectToTransferProcessAckTransformer.java index ac8ac20b255..255f8534539 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/to/JsonObjectToTransferProcessAckTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/to/JsonObjectToTransferProcessAckTransformer.java @@ -22,7 +22,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_STATE_TERM; @@ -32,10 +31,6 @@ */ public class JsonObjectToTransferProcessAckTransformer extends AbstractNamespaceAwareJsonLdTransformer { - public JsonObjectToTransferProcessAckTransformer() { - this(DSP_NAMESPACE_V_08); - } - public JsonObjectToTransferProcessAckTransformer(JsonLdNamespace namespace) { super(JsonObject.class, TransferProcessAck.class, namespace); } diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/to/JsonObjectToTransferRequestMessageTransformer.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/to/JsonObjectToTransferRequestMessageTransformer.java index e0fb97c708f..45c0a598814 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/to/JsonObjectToTransferRequestMessageTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/to/JsonObjectToTransferRequestMessageTransformer.java @@ -24,7 +24,6 @@ import org.jetbrains.annotations.Nullable; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCT_FORMAT_ATTRIBUTE; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID_TERM; @@ -33,10 +32,6 @@ public class JsonObjectToTransferRequestMessageTransformer extends AbstractNamespaceAwareJsonLdTransformer { - public JsonObjectToTransferRequestMessageTransformer() { - this(DSP_NAMESPACE_V_08); - } - public JsonObjectToTransferRequestMessageTransformer(JsonLdNamespace namespace) { super(JsonObject.class, TransferRequestMessage.class, namespace); } diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/to/JsonObjectToTransferStartMessageTransformer.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/to/JsonObjectToTransferStartMessageTransformer.java index bcbe2eee0bf..cabb566d280 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/to/JsonObjectToTransferStartMessageTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/to/JsonObjectToTransferStartMessageTransformer.java @@ -23,7 +23,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_DATA_ADDRESS_TERM; @@ -31,10 +30,6 @@ public class JsonObjectToTransferStartMessageTransformer extends AbstractNamespaceAwareJsonLdTransformer { - public JsonObjectToTransferStartMessageTransformer() { - this(DSP_NAMESPACE_V_08); - } - public JsonObjectToTransferStartMessageTransformer(JsonLdNamespace namespace) { super(JsonObject.class, TransferStartMessage.class, namespace); } diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/to/JsonObjectToTransferSuspensionMessageTransformer.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/to/JsonObjectToTransferSuspensionMessageTransformer.java index e3b5d1fcc39..a8a9e24a599 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/to/JsonObjectToTransferSuspensionMessageTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/to/JsonObjectToTransferSuspensionMessageTransformer.java @@ -30,7 +30,6 @@ import java.util.Map; import static jakarta.json.JsonValue.ValueType.ARRAY; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; @@ -43,10 +42,6 @@ public class JsonObjectToTransferSuspensionMessageTransformer extends AbstractNa private final TypeManager typeManager; private final String typeContext; - public JsonObjectToTransferSuspensionMessageTransformer(TypeManager typeManager, String typeContext) { - this(typeManager, typeContext, DSP_NAMESPACE_V_08); - } - public JsonObjectToTransferSuspensionMessageTransformer(TypeManager typeManager, String typeContext, JsonLdNamespace namespace) { super(JsonObject.class, TransferSuspensionMessage.class, namespace); this.typeManager = typeManager; diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/to/JsonObjectToTransferTerminationMessageTransformer.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/to/JsonObjectToTransferTerminationMessageTransformer.java index 154bed376b0..2c9919f868d 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/to/JsonObjectToTransferTerminationMessageTransformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/to/JsonObjectToTransferTerminationMessageTransformer.java @@ -24,7 +24,6 @@ import org.jetbrains.annotations.Nullable; import static jakarta.json.JsonValue.ValueType.ARRAY; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; @@ -33,10 +32,6 @@ public class JsonObjectToTransferTerminationMessageTransformer extends AbstractNamespaceAwareJsonLdTransformer { - public JsonObjectToTransferTerminationMessageTransformer() { - this(DSP_NAMESPACE_V_08); - } - public JsonObjectToTransferTerminationMessageTransformer(JsonLdNamespace namespace) { super(JsonObject.class, TransferTerminationMessage.class, namespace); } diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferCompletionMessageTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferCompletionMessageTransformerTest.java index efea5e53b5b..258910af9fe 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferCompletionMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferCompletionMessageTransformerTest.java @@ -18,6 +18,7 @@ import jakarta.json.JsonBuilderFactory; import org.eclipse.edc.connector.controlplane.transfer.spi.types.protocol.TransferCompletionMessage; import org.eclipse.edc.jsonld.spi.JsonLdKeywords; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.protocol.dsp.transferprocess.transform.type.from.JsonObjectFromTransferCompletionMessageTransformer; import org.eclipse.edc.transform.spi.TransformerContext; import org.junit.jupiter.api.Test; @@ -25,9 +26,9 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_TERM; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -36,11 +37,13 @@ class JsonObjectFromTransferCompletionMessageTransformerTest { + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final JsonBuilderFactory jsonFactory = Json.createBuilderFactory(Map.of()); private final TransformerContext context = mock(); + private final JsonObjectFromTransferCompletionMessageTransformer transformer = - new JsonObjectFromTransferCompletionMessageTransformer(jsonFactory); + new JsonObjectFromTransferCompletionMessageTransformer(jsonFactory, DSP_NAMESPACE); @Test void transformTransferCompletionMessage() { @@ -54,9 +57,9 @@ void transformTransferCompletionMessage() { var result = transformer.transform(message, context); assertThat(result).isNotNull(); - assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_IRI); - assertThat(result.getString(DSPACE_PROPERTY_CONSUMER_PID_IRI)).isEqualTo("consumerPid"); - assertThat(result.getString(DSPACE_PROPERTY_PROVIDER_PID_IRI)).isEqualTo("providerPid"); + assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_TERM)); + assertThat(result.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM))).isEqualTo("consumerPid"); + assertThat(result.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM))).isEqualTo("providerPid"); verify(context, never()).reportProblem(anyString()); } diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferErrorTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferErrorTransformerTest.java index f2105343dbf..4a874cde347 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferErrorTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferErrorTransformerTest.java @@ -17,6 +17,7 @@ import jakarta.json.Json; import jakarta.json.JsonBuilderFactory; import org.eclipse.edc.connector.controlplane.transfer.spi.types.protocol.TransferError; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.protocol.dsp.transferprocess.transform.type.from.JsonObjectFromTransferErrorTransformer; import org.eclipse.edc.transform.spi.TransformerContext; import org.junit.jupiter.api.BeforeEach; @@ -27,13 +28,14 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_ERROR_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_ERROR_TERM; import static org.mockito.Mockito.mock; class JsonObjectFromTransferErrorTransformerTest { + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final JsonBuilderFactory jsonFactory = Json.createBuilderFactory(Map.of()); private final TransformerContext context = mock(TransformerContext.class); @@ -41,7 +43,7 @@ class JsonObjectFromTransferErrorTransformerTest { @BeforeEach void setUp() { - transformer = new JsonObjectFromTransferErrorTransformer(jsonFactory); + transformer = new JsonObjectFromTransferErrorTransformer(jsonFactory, DSP_NAMESPACE); } @Test @@ -55,8 +57,8 @@ void transform_returnJsonObject() { var result = transformer.transform(error, context); assertThat(result).isNotNull(); - assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_TYPE_TRANSFER_ERROR_IRI); - assertThat(result.getString(DSPACE_PROPERTY_CODE_IRI)).isEqualTo("code"); - assertThat(result.getJsonArray(DSPACE_PROPERTY_REASON_IRI)).contains(Json.createValue("message")); + assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_ERROR_TERM)); + assertThat(result.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CODE_TERM))).isEqualTo("code"); + assertThat(result.getJsonArray(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_REASON_TERM))).contains(Json.createValue("message")); } } diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferProcessTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferProcessTransformerTest.java index 6a81208818d..fe8be9dfe5e 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferProcessTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferProcessTransformerTest.java @@ -17,6 +17,7 @@ import jakarta.json.Json; import jakarta.json.JsonBuilderFactory; import org.eclipse.edc.connector.controlplane.transfer.spi.types.TransferProcess; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.protocol.dsp.transferprocess.transform.type.from.JsonObjectFromTransferProcessTransformer; import org.eclipse.edc.spi.types.domain.DataAddress; import org.eclipse.edc.transform.spi.TransformerContext; @@ -28,10 +29,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.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_STATE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_PROCESS_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_STATE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_PROCESS_TERM; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -40,11 +41,12 @@ class JsonObjectFromTransferProcessTransformerTest { + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final JsonBuilderFactory jsonFactory = Json.createBuilderFactory(Map.of()); private final TransformerContext context = mock(); private final JsonObjectFromTransferProcessTransformer transformer = - new JsonObjectFromTransferProcessTransformer(jsonFactory); + new JsonObjectFromTransferProcessTransformer(jsonFactory, DSP_NAMESPACE); @Test void transformTransferProcessProvider() { @@ -65,11 +67,11 @@ void transformTransferProcessProvider() { var result = transformer.transform(transferProcess, context); assertThat(result).isNotNull(); - assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_TYPE_TRANSFER_PROCESS_IRI); + assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_PROCESS_TERM)); assertThat(result.getJsonString(ID).getString()).isEqualTo("providerPid"); - assertThat(result.getJsonString(DSPACE_PROPERTY_STATE_IRI).getString()).isEqualTo("INITIAL"); - assertThat(result.getJsonString(DSPACE_PROPERTY_CONSUMER_PID_IRI).getString()).isEqualTo("consumerPid"); - assertThat(result.getJsonString(DSPACE_PROPERTY_PROVIDER_PID_IRI).getString()).isEqualTo("providerPid"); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_STATE_TERM)).getString()).isEqualTo("INITIAL"); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM)).getString()).isEqualTo("consumerPid"); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM)).getString()).isEqualTo("providerPid"); verify(context, never()).reportProblem(anyString()); } @@ -93,11 +95,11 @@ void transformTransferProcessConsumer() { var result = transformer.transform(transferProcess, context); assertThat(result).isNotNull(); - assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_TYPE_TRANSFER_PROCESS_IRI); + assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_PROCESS_TERM)); assertThat(result.getJsonString(ID).getString()).isEqualTo("consumerPid"); - assertThat(result.getJsonString(DSPACE_PROPERTY_STATE_IRI).getString()).isEqualTo("INITIAL"); - assertThat(result.getJsonString(DSPACE_PROPERTY_CONSUMER_PID_IRI).getString()).isEqualTo("consumerPid"); - assertThat(result.getJsonString(DSPACE_PROPERTY_PROVIDER_PID_IRI).getString()).isEqualTo("providerPid"); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_STATE_TERM)).getString()).isEqualTo("INITIAL"); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM)).getString()).isEqualTo("consumerPid"); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM)).getString()).isEqualTo("providerPid"); verify(context, never()).reportProblem(anyString()); } diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferRequestMessageTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferRequestMessageTransformerTest.java index 2f9d829b57c..dd1de515795 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferRequestMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferRequestMessageTransformerTest.java @@ -19,6 +19,7 @@ import jakarta.json.JsonObject; import org.eclipse.edc.connector.controlplane.transfer.spi.types.protocol.TransferRequestMessage; import org.eclipse.edc.jsonld.spi.JsonLdKeywords; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.protocol.dsp.transferprocess.transform.type.from.JsonObjectFromTransferRequestMessageTransformer; import org.eclipse.edc.spi.types.domain.DataAddress; import org.eclipse.edc.transform.spi.TransformerContext; @@ -29,11 +30,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.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_DATA_ADDRESS_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_DATA_ADDRESS_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_TERM; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isA; @@ -45,6 +46,7 @@ class JsonObjectFromTransferRequestMessageTransformerTest { + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final String dataAddressKey = "testDataAddressKey"; private final String dataAddressType = "testDataAddressType"; private final String protocol = "testProtocol"; @@ -55,7 +57,7 @@ class JsonObjectFromTransferRequestMessageTransformerTest { private final TransformerContext context = mock(); private final JsonObjectFromTransferRequestMessageTransformer transformer = - new JsonObjectFromTransferRequestMessageTransformer(jsonFactory); + new JsonObjectFromTransferRequestMessageTransformer(jsonFactory, DSP_NAMESPACE); @BeforeEach void setUp() { @@ -81,12 +83,12 @@ void transformTransferRequestMessageWithDataAddress() { var result = transformer.transform(message, context); assertThat(result).isNotNull(); - assertThat(result.getJsonString(JsonLdKeywords.TYPE).getString()).isEqualTo(DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_IRI); - assertThat(result.getJsonString(DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID_IRI).getString()).isEqualTo(contractId); + assertThat(result.getJsonString(JsonLdKeywords.TYPE).getString()).isEqualTo(DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_TERM)); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID_TERM)).getString()).isEqualTo(contractId); assertThat(result.getJsonString(DCT_FORMAT_ATTRIBUTE).getString()).isEqualTo(dataAddressType); - assertThat(result.getJsonString(DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI).getString()).isEqualTo(callbackAddress); - assertThat(result.getJsonString(DSPACE_PROPERTY_CONSUMER_PID_IRI).getString()).isEqualTo("consumerPid"); - assertThat(result.getJsonObject(DSPACE_PROPERTY_DATA_ADDRESS_IRI).getString("keyName")).isEqualTo(dataAddressKey); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM)).getString()).isEqualTo(callbackAddress); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM)).getString()).isEqualTo("consumerPid"); + assertThat(result.getJsonObject(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_DATA_ADDRESS_TERM)).getString("keyName")).isEqualTo(dataAddressKey); verify(context, never()).reportProblem(anyString()); } @@ -105,11 +107,11 @@ void transformTransferRequestMessageWithoutDataAddress() { var result = transformer.transform(message, context); assertThat(result).isNotNull(); - assertThat(result.getJsonString(JsonLdKeywords.TYPE).getString()).isEqualTo(DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_IRI); - assertThat(result.getJsonString(DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID_IRI).getString()).isEqualTo(contractId); + assertThat(result.getJsonString(JsonLdKeywords.TYPE).getString()).isEqualTo(DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_TERM)); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID_TERM)).getString()).isEqualTo(contractId); assertThat(result.getJsonString(DCT_FORMAT_ATTRIBUTE).getString()).isEqualTo(dataAddressType); - assertThat(result.getJsonString(DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI).getString()).isEqualTo(callbackAddress); - assertThat(result.getJsonObject(DSPACE_PROPERTY_DATA_ADDRESS_IRI)).isEqualTo(null); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM)).getString()).isEqualTo(callbackAddress); + assertThat(result.getJsonObject(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_DATA_ADDRESS_TERM))).isEqualTo(null); verify(context, never()).reportProblem(anyString()); } @@ -129,11 +131,11 @@ void transformTransferRequestMessageWithTransferType() { var result = transformer.transform(message, context); assertThat(result).isNotNull(); - assertThat(result.getJsonString(JsonLdKeywords.TYPE).getString()).isEqualTo(DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_IRI); - assertThat(result.getJsonString(DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID_IRI).getString()).isEqualTo(contractId); + assertThat(result.getJsonString(JsonLdKeywords.TYPE).getString()).isEqualTo(DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_TERM)); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID_TERM)).getString()).isEqualTo(contractId); assertThat(result.getJsonString(DCT_FORMAT_ATTRIBUTE).getString()).isEqualTo(transferType); - assertThat(result.getJsonString(DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI).getString()).isEqualTo(callbackAddress); - assertThat(result.getJsonObject(DSPACE_PROPERTY_DATA_ADDRESS_IRI)).isEqualTo(null); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM)).getString()).isEqualTo(callbackAddress); + assertThat(result.getJsonObject(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_DATA_ADDRESS_TERM))).isEqualTo(null); verify(context, never()).reportProblem(anyString()); } diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferStartMessageTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferStartMessageTransformerTest.java index 3f00c4150df..8ef3688e5d0 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferStartMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferStartMessageTransformerTest.java @@ -19,6 +19,7 @@ import jakarta.json.JsonObject; import org.eclipse.edc.connector.controlplane.transfer.spi.types.protocol.TransferStartMessage; import org.eclipse.edc.jsonld.spi.JsonLdKeywords; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.protocol.dsp.transferprocess.transform.type.from.JsonObjectFromTransferStartMessageTransformer; import org.eclipse.edc.spi.types.domain.DataAddress; import org.eclipse.edc.transform.spi.TransformerContext; @@ -27,10 +28,10 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_DATA_ADDRESS_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_START_MESSAGE_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_DATA_ADDRESS_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_START_MESSAGE_TERM; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -40,11 +41,12 @@ class JsonObjectFromTransferStartMessageTransformerTest { + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final JsonBuilderFactory jsonFactory = Json.createBuilderFactory(Map.of()); private final TransformerContext context = mock(); private final JsonObjectFromTransferStartMessageTransformer transformer = - new JsonObjectFromTransferStartMessageTransformer(jsonFactory); + new JsonObjectFromTransferStartMessageTransformer(jsonFactory, DSP_NAMESPACE); @Test void transformTransferStartMessage() { @@ -62,10 +64,10 @@ void transformTransferStartMessage() { var result = transformer.transform(message, context); assertThat(result).isNotNull(); - assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSPACE_TYPE_TRANSFER_START_MESSAGE_IRI); - assertThat(result.getString(DSPACE_PROPERTY_PROVIDER_PID_IRI)).isEqualTo("providerPid"); - assertThat(result.getString(DSPACE_PROPERTY_CONSUMER_PID_IRI)).isEqualTo("consumerPid"); - assertThat(result.getJsonObject(DSPACE_PROPERTY_DATA_ADDRESS_IRI)).isEqualTo(dataAddressJson); + assertThat(result.getString(JsonLdKeywords.TYPE)).isEqualTo(DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_START_MESSAGE_TERM)); + assertThat(result.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM))).isEqualTo("providerPid"); + assertThat(result.getString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM))).isEqualTo("consumerPid"); + assertThat(result.getJsonObject(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_DATA_ADDRESS_TERM))).isEqualTo(dataAddressJson); verify(context, times(1)).transform(dataAddress, JsonObject.class); verify(context, never()).reportProblem(anyString()); diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferSuspensionMessageTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferSuspensionMessageTransformerTest.java index c4850d23542..f3ac3697718 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferSuspensionMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferSuspensionMessageTransformerTest.java @@ -18,6 +18,7 @@ import jakarta.json.JsonBuilderFactory; import jakarta.json.JsonString; import org.eclipse.edc.connector.controlplane.transfer.spi.types.protocol.TransferSuspensionMessage; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.protocol.dsp.transferprocess.transform.type.from.JsonObjectFromTransferSuspensionMessageTransformer; import org.eclipse.edc.transform.spi.TransformerContext; import org.junit.jupiter.api.Test; @@ -26,11 +27,11 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_SUSPENSION_MESSAGE_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_SUSPENSION_MESSAGE_TERM; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -39,11 +40,12 @@ class JsonObjectFromTransferSuspensionMessageTransformerTest { + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final JsonBuilderFactory jsonFactory = Json.createBuilderFactory(Map.of()); private final TransformerContext context = mock(); private final JsonObjectFromTransferSuspensionMessageTransformer transformer = - new JsonObjectFromTransferSuspensionMessageTransformer(jsonFactory); + new JsonObjectFromTransferSuspensionMessageTransformer(jsonFactory, DSP_NAMESPACE); @Test void transformTransferSuspensionMessage() { @@ -58,11 +60,11 @@ void transformTransferSuspensionMessage() { var result = transformer.transform(message, context); assertThat(result).isNotNull(); - assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSPACE_TYPE_TRANSFER_SUSPENSION_MESSAGE_IRI); - assertThat(result.getJsonString(DSPACE_PROPERTY_CONSUMER_PID_IRI).getString()).isEqualTo("consumerPid"); - assertThat(result.getJsonString(DSPACE_PROPERTY_PROVIDER_PID_IRI).getString()).isEqualTo("providerPid"); - assertThat(result.getJsonString(DSPACE_PROPERTY_CODE_IRI).getString()).isEqualTo("testCode"); - assertThat(result.getJsonArray(DSPACE_PROPERTY_REASON_IRI)).hasSize(1).first() + assertThat(result.getJsonString(TYPE).getString()).isEqualTo(DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_SUSPENSION_MESSAGE_TERM)); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM)).getString()).isEqualTo("consumerPid"); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM)).getString()).isEqualTo("providerPid"); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CODE_TERM)).getString()).isEqualTo("testCode"); + assertThat(result.getJsonArray(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_REASON_TERM))).hasSize(1).first() .isInstanceOfSatisfying(JsonString.class, reason -> assertThat(reason.getString()).isEqualTo("testReason")); verify(context, never()).reportProblem(anyString()); diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferTerminationMessageTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferTerminationMessageTransformerTest.java index 810f6bc8ec3..8b1a4e52b2c 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferTerminationMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/from/JsonObjectFromTransferTerminationMessageTransformerTest.java @@ -18,6 +18,7 @@ import jakarta.json.JsonBuilderFactory; import org.eclipse.edc.connector.controlplane.transfer.spi.types.protocol.TransferTerminationMessage; import org.eclipse.edc.jsonld.spi.JsonLdKeywords; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.protocol.dsp.transferprocess.transform.type.from.JsonObjectFromTransferTerminationMessageTransformer; import org.eclipse.edc.transform.spi.TransformerContext; import org.junit.jupiter.api.Test; @@ -25,11 +26,11 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_TERM; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -38,11 +39,12 @@ class JsonObjectFromTransferTerminationMessageTransformerTest { + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final JsonBuilderFactory jsonFactory = Json.createBuilderFactory(Map.of()); private final TransformerContext context = mock(); private final JsonObjectFromTransferTerminationMessageTransformer transformer = - new JsonObjectFromTransferTerminationMessageTransformer(jsonFactory); + new JsonObjectFromTransferTerminationMessageTransformer(jsonFactory, DSP_NAMESPACE); @Test void transformTransferTerminationMessage() { @@ -57,11 +59,11 @@ void transformTransferTerminationMessage() { var result = transformer.transform(message, context); assertThat(result).isNotNull(); - assertThat(result.getJsonString(JsonLdKeywords.TYPE).getString()).isEqualTo(DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_IRI); - assertThat(result.getJsonString(DSPACE_PROPERTY_CONSUMER_PID_IRI).getString()).isEqualTo("consumerPid"); - assertThat(result.getJsonString(DSPACE_PROPERTY_PROVIDER_PID_IRI).getString()).isEqualTo("providerPid"); - assertThat(result.getJsonString(DSPACE_PROPERTY_CODE_IRI).getString()).isEqualTo("testCode"); - assertThat(result.getJsonString(DSPACE_PROPERTY_REASON_IRI).getString()).isEqualTo("testReason"); + assertThat(result.getJsonString(JsonLdKeywords.TYPE).getString()).isEqualTo(DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_TERM)); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM)).getString()).isEqualTo("consumerPid"); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM)).getString()).isEqualTo("providerPid"); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CODE_TERM)).getString()).isEqualTo("testCode"); + assertThat(result.getJsonString(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_REASON_TERM)).getString()).isEqualTo("testReason"); verify(context, never()).reportProblem(anyString()); } diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/to/JsonObjectToTransferCompletionMessageTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/to/JsonObjectToTransferCompletionMessageTransformerTest.java index b7f57bb741d..a86eaa53281 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/to/JsonObjectToTransferCompletionMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/to/JsonObjectToTransferCompletionMessageTransformerTest.java @@ -15,6 +15,7 @@ package org.eclipse.edc.protocol.dsp.transferprocess.transform.to; import jakarta.json.Json; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.protocol.dsp.transferprocess.transform.type.to.JsonObjectToTransferCompletionMessageTransformer; import org.eclipse.edc.transform.spi.ProblemBuilder; import org.eclipse.edc.transform.spi.TransformerContext; @@ -22,9 +23,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.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.transferprocess.transform.to.TestInput.getExpanded; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; @@ -34,17 +35,18 @@ class JsonObjectToTransferCompletionMessageTransformerTest { + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final TransformerContext context = mock(); private final JsonObjectToTransferCompletionMessageTransformer transformer = - new JsonObjectToTransferCompletionMessageTransformer(); + new JsonObjectToTransferCompletionMessageTransformer(DSP_NAMESPACE); @Test void shouldTransform() { var json = Json.createObjectBuilder() - .add(TYPE, DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_IRI) - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") + .add(TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") .build(); var result = transformer.transform(getExpanded(json), context); @@ -60,7 +62,7 @@ void shouldTransform() { void shouldReportError_whenConsumerPidAndProviderPidNotSet() { when(context.problem()).thenReturn(new ProblemBuilder(context)); var json = Json.createObjectBuilder() - .add(TYPE, DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_IRI) + .add(TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_TERM)) .build(); var result = transformer.transform(getExpanded(json), context); diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/to/JsonObjectToTransferProcessAckTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/to/JsonObjectToTransferProcessAckTransformerTest.java index 0b00bcbbb68..75812ebf153 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/to/JsonObjectToTransferProcessAckTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/to/JsonObjectToTransferProcessAckTransformerTest.java @@ -16,6 +16,7 @@ import jakarta.json.Json; import jakarta.json.JsonBuilderFactory; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.protocol.dsp.transferprocess.transform.type.to.JsonObjectToTransferProcessAckTransformer; import org.eclipse.edc.transform.spi.TransformerContext; import org.junit.jupiter.api.Test; @@ -24,27 +25,28 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_STATE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_PROCESS_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_STATE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_PROCESS_TERM; import static org.eclipse.edc.protocol.dsp.transferprocess.transform.to.TestInput.getExpanded; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verifyNoInteractions; class JsonObjectToTransferProcessAckTransformerTest { + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final TransformerContext context = mock(); private final JsonBuilderFactory jsonFactory = Json.createBuilderFactory(Map.of()); - private final JsonObjectToTransferProcessAckTransformer transformer = new JsonObjectToTransferProcessAckTransformer(); + private final JsonObjectToTransferProcessAckTransformer transformer = new JsonObjectToTransferProcessAckTransformer(DSP_NAMESPACE); @Test void shouldTransform() { var message = jsonFactory.createObjectBuilder() - .add(TYPE, DSPACE_TYPE_TRANSFER_PROCESS_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") - .add(DSPACE_PROPERTY_STATE_IRI, "STATE") + .add(TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_PROCESS_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_STATE_TERM), "STATE") .build(); var result = transformer.transform(getExpanded(message), context); diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/to/JsonObjectToTransferRequestMessageTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/to/JsonObjectToTransferRequestMessageTransformerTest.java index b82a3853afb..ad25f06a2c5 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/to/JsonObjectToTransferRequestMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/to/JsonObjectToTransferRequestMessageTransformerTest.java @@ -16,6 +16,7 @@ import jakarta.json.Json; import jakarta.json.JsonObject; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.protocol.dsp.transferprocess.transform.type.to.JsonObjectToTransferRequestMessageTransformer; import org.eclipse.edc.spi.types.domain.DataAddress; import org.eclipse.edc.transform.spi.ProblemBuilder; @@ -25,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.PropertyAndTypeNames.DCT_FORMAT_ATTRIBUTE; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_DATA_ADDRESS_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_DATA_ADDRESS_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.transferprocess.transform.to.TestInput.getExpanded; import static org.eclipse.edc.spi.constants.CoreConstants.EDC_NAMESPACE; import static org.mockito.ArgumentMatchers.any; @@ -42,6 +43,7 @@ class JsonObjectToTransferRequestMessageTransformerTest { + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final String callbackAddress = "https://callback.de"; private final String contractId = "TestContreactID"; private final String destinationType = "dspace:s3+push"; @@ -49,16 +51,16 @@ class JsonObjectToTransferRequestMessageTransformerTest { private final TransformerContext context = mock(); private final JsonObjectToTransferRequestMessageTransformer transformer = - new JsonObjectToTransferRequestMessageTransformer(); + new JsonObjectToTransferRequestMessageTransformer(DSP_NAMESPACE); @Test void jsonObjectToTransferRequestWithoutDataAddress() { var json = Json.createObjectBuilder() - .add(TYPE, DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID_IRI, contractId) + .add(TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID_TERM), contractId) .add(DCT_FORMAT_ATTRIBUTE, destinationType) - .add(DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI, callbackAddress) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "processId") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM), callbackAddress) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "processId") .build(); var result = transformer.transform(getExpanded(json), context); @@ -78,12 +80,12 @@ void jsonObjectToTransferRequestWithDataAddress() { var dataDestination = DataAddress.Builder.newInstance().type("any").build(); when(context.transform(any(), eq(DataAddress.class))).thenReturn(dataDestination); var json = Json.createObjectBuilder() - .add(TYPE, DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID_IRI, contractId) + .add(TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID_TERM), contractId) .add(DCT_FORMAT_ATTRIBUTE, destinationType) - .add(DSPACE_PROPERTY_DATA_ADDRESS_IRI, createDataAddress()) - .add(DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI, callbackAddress) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "processId") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_DATA_ADDRESS_TERM), createDataAddress()) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM), callbackAddress) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "processId") .build(); var result = transformer.transform(getExpanded(json), context); @@ -101,11 +103,11 @@ void jsonObjectToTransferRequestWithDataAddress() { void shouldReturnNullAndReportError_whenConsumerPidNotSet() { when(context.problem()).thenReturn(new ProblemBuilder(context)); var json = Json.createObjectBuilder() - .add(TYPE, DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID_IRI, contractId) + .add(TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID_TERM), contractId) .add(DCT_FORMAT_ATTRIBUTE, destinationType) - .add(DSPACE_PROPERTY_DATA_ADDRESS_IRI, Json.createObjectBuilder().build()) - .add(DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI, callbackAddress) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_DATA_ADDRESS_TERM), Json.createObjectBuilder().build()) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM), callbackAddress) .build(); var result = transformer.transform(getExpanded(json), context); diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/to/JsonObjectToTransferStartMessageTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/to/JsonObjectToTransferStartMessageTransformerTest.java index bee4a2853fb..7be7ae69713 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/to/JsonObjectToTransferStartMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/to/JsonObjectToTransferStartMessageTransformerTest.java @@ -16,6 +16,7 @@ import jakarta.json.Json; import jakarta.json.JsonObject; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.protocol.dsp.transferprocess.transform.type.to.JsonObjectToTransferStartMessageTransformer; import org.eclipse.edc.spi.types.domain.DataAddress; import org.eclipse.edc.transform.spi.ProblemBuilder; @@ -24,10 +25,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.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_DATA_ADDRESS_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_START_MESSAGE_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_DATA_ADDRESS_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_START_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.transferprocess.transform.to.TestInput.getExpanded; import static org.eclipse.edc.spi.constants.CoreConstants.EDC_NAMESPACE; import static org.mockito.ArgumentMatchers.anyString; @@ -40,17 +41,18 @@ class JsonObjectToTransferStartMessageTransformerTest { + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final TransformerContext context = mock(); private final JsonObjectToTransferStartMessageTransformer transformer = - new JsonObjectToTransferStartMessageTransformer(); + new JsonObjectToTransferStartMessageTransformer(DSP_NAMESPACE); @Test void jsonObjectToTransferStartMessage() { var json = Json.createObjectBuilder() - .add(TYPE, DSPACE_TYPE_TRANSFER_START_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") + .add(TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_START_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") .build(); var result = transformer.transform(getExpanded(json), context); @@ -66,7 +68,7 @@ void jsonObjectToTransferStartMessage() { void shouldReturnNullAndReportError_whenConsumerAndProviderPidNotValid() { when(context.problem()).thenReturn(new ProblemBuilder(context)); var json = Json.createObjectBuilder() - .add(TYPE, DSPACE_TYPE_TRANSFER_START_MESSAGE_IRI) + .add(TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_START_MESSAGE_TERM)) .build(); var result = transformer.transform(getExpanded(json), context); @@ -79,10 +81,10 @@ void shouldReturnNullAndReportError_whenConsumerAndProviderPidNotValid() { void jsonObjectToTransferStartMessageWithDataAddress() { var dataAddressObject = Json.createObjectBuilder().add(EDC_NAMESPACE + "type", "AWS").build(); var json = Json.createObjectBuilder() - .add(TYPE, DSPACE_TYPE_TRANSFER_START_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") - .add(DSPACE_PROPERTY_DATA_ADDRESS_IRI, dataAddressObject) + .add(TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_START_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_DATA_ADDRESS_TERM), dataAddressObject) .build(); var dataAddress = DataAddress.Builder.newInstance().type("AWS").build(); @@ -100,10 +102,10 @@ void jsonObjectToTransferStartMessageWithDataAddress() { @Test void jsonObjectToTransferStartMessageWithEmptyDataAddress() { var json = Json.createObjectBuilder() - .add(TYPE, DSPACE_TYPE_TRANSFER_START_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") - .add(DSPACE_PROPERTY_DATA_ADDRESS_IRI, Json.createObjectBuilder().build()) + .add(TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_START_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_DATA_ADDRESS_TERM), Json.createObjectBuilder().build()) .build(); var result = transformer.transform(getExpanded(json), context); diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/to/JsonObjectToTransferSuspensionMessageTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/to/JsonObjectToTransferSuspensionMessageTransformerTest.java index 04c6cc03481..3724bab9127 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/to/JsonObjectToTransferSuspensionMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/to/JsonObjectToTransferSuspensionMessageTransformerTest.java @@ -16,6 +16,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.json.Json; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.jsonld.util.JacksonJsonLd; import org.eclipse.edc.protocol.dsp.transferprocess.transform.type.to.JsonObjectToTransferSuspensionMessageTransformer; import org.eclipse.edc.spi.types.TypeManager; @@ -33,12 +34,11 @@ import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.VALUE; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.VOCAB; -import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_SCHEMA; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_SUSPENSION_MESSAGE_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_SUSPENSION_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.transferprocess.transform.to.TestInput.getExpanded; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; @@ -48,11 +48,12 @@ class JsonObjectToTransferSuspensionMessageTransformerTest { + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final TransformerContext context = mock(); private final ObjectMapper objectMapper = JacksonJsonLd.createObjectMapper(); private final TypeManager typeManager = mock(); private final JsonObjectToTransferSuspensionMessageTransformer transformer = - new JsonObjectToTransferSuspensionMessageTransformer(typeManager, "test"); + new JsonObjectToTransferSuspensionMessageTransformer(typeManager, "test", DSP_NAMESPACE); @BeforeEach void setUp() { @@ -62,12 +63,12 @@ void setUp() { @Test void shouldTransform() { var json = createObjectBuilder() - .add(CONTEXT, createObjectBuilder().add(VOCAB, DSPACE_SCHEMA)) - .add(TYPE, DSPACE_TYPE_TRANSFER_SUSPENSION_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") - .add(DSPACE_PROPERTY_CODE_IRI, "testCode") - .add(DSPACE_PROPERTY_REASON_IRI, Json.createArrayBuilder() + .add(CONTEXT, createObjectBuilder().add(VOCAB, DSP_NAMESPACE.namespace())) + .add(TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_SUSPENSION_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CODE_TERM), "testCode") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_REASON_TERM), Json.createArrayBuilder() .add(createObjectBuilder().add("complex", "reason")) .add("reason")) .build(); @@ -79,7 +80,7 @@ void shouldTransform() { assertThat(result.getProviderPid()).isEqualTo("providerPid"); assertThat(result.getConsumerPid()).isEqualTo("consumerPid"); assertThat(result.getReason()).hasSize(2) - .containsOnly(Map.of(DSPACE_SCHEMA + "complex", List.of(Map.of(VALUE, "reason"))), Map.of(VALUE, "reason")); + .containsOnly(Map.of(DSP_NAMESPACE.namespace() + "complex", List.of(Map.of(VALUE, "reason"))), Map.of(VALUE, "reason")); assertThat(result.getCode()).isEqualTo("testCode"); verify(context, never()).reportProblem(anyString()); @@ -88,13 +89,13 @@ void shouldTransform() { @Test void shouldReportError_whenMissingPids() { when(context.problem()).thenReturn(new ProblemBuilder(context)); - var reason = Json.createBuilderFactory(Map.of()).createObjectBuilder().add(DSPACE_SCHEMA + "foo", "bar"); + var reason = Json.createBuilderFactory(Map.of()).createObjectBuilder().add(DSP_NAMESPACE.namespace() + "foo", "bar"); var reasonArray = Json.createBuilderFactory(Map.of()).createArrayBuilder().add(reason).build(); var json = createObjectBuilder() - .add(TYPE, DSPACE_TYPE_TRANSFER_SUSPENSION_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CODE_IRI, "testCode") - .add(DSPACE_PROPERTY_REASON_IRI, Json.createBuilderFactory(Map.of()).createArrayBuilder().add(reasonArray).build()) + .add(TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_SUSPENSION_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CODE_TERM), "testCode") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_REASON_TERM), Json.createBuilderFactory(Map.of()).createArrayBuilder().add(reasonArray).build()) .build(); var result = transformer.transform(getExpanded(json), context); diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/to/JsonObjectToTransferTerminationMessageTransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/to/JsonObjectToTransferTerminationMessageTransformerTest.java index f1c35b09dc6..7b820e93b8a 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/to/JsonObjectToTransferTerminationMessageTransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/to/JsonObjectToTransferTerminationMessageTransformerTest.java @@ -15,6 +15,7 @@ package org.eclipse.edc.protocol.dsp.transferprocess.transform.to; import jakarta.json.Json; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.protocol.dsp.transferprocess.transform.type.to.JsonObjectToTransferTerminationMessageTransformer; import org.eclipse.edc.transform.spi.ProblemBuilder; import org.eclipse.edc.transform.spi.TransformerContext; @@ -25,12 +26,11 @@ import static java.lang.String.format; 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.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON_IRI; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON_TERM; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_TERM; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -39,21 +39,22 @@ class JsonObjectToTransferTerminationMessageTransformerTest { + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final TransformerContext context = mock(); private final JsonObjectToTransferTerminationMessageTransformer transformer = - new JsonObjectToTransferTerminationMessageTransformer(); + new JsonObjectToTransferTerminationMessageTransformer(DSP_NAMESPACE); @Test void shouldTransform() { - var reason = Json.createBuilderFactory(Map.of()).createObjectBuilder().add(DSPACE_SCHEMA + "foo", "bar"); + var reason = Json.createBuilderFactory(Map.of()).createObjectBuilder().add(DSP_NAMESPACE.toIri("foo"), "bar"); var reasonArray = Json.createBuilderFactory(Map.of()).createArrayBuilder().add(reason).build(); var json = Json.createObjectBuilder() - .add(TYPE, DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CONSUMER_PID_IRI, "consumerPid") - .add(DSPACE_PROPERTY_PROVIDER_PID_IRI, "providerPid") - .add(DSPACE_PROPERTY_CODE_IRI, "testCode") - .add(DSPACE_PROPERTY_REASON_IRI, Json.createBuilderFactory(Map.of()).createArrayBuilder().add(reasonArray).build()) + .add(TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CONSUMER_PID_TERM), "consumerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PROVIDER_PID_TERM), "providerPid") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CODE_TERM), "testCode") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_REASON_TERM), Json.createBuilderFactory(Map.of()).createArrayBuilder().add(reasonArray).build()) .build(); var result = transformer.transform(TestInput.getExpanded(json), context); @@ -62,7 +63,7 @@ void shouldTransform() { assertThat(result.getProviderPid()).isEqualTo("providerPid"); assertThat(result.getConsumerPid()).isEqualTo("consumerPid"); - assertThat(result.getReason()).isEqualTo(format("[{\"%sfoo\":[{\"@value\":\"bar\"}]}]", DSPACE_SCHEMA)); + assertThat(result.getReason()).isEqualTo(format("[{\"%sfoo\":[{\"@value\":\"bar\"}]}]", DSP_NAMESPACE.namespace())); assertThat(result.getCode()).isEqualTo("testCode"); verify(context, never()).reportProblem(anyString()); @@ -71,13 +72,13 @@ void shouldTransform() { @Test void shouldReportError_whenMissingPids() { when(context.problem()).thenReturn(new ProblemBuilder(context)); - var reason = Json.createBuilderFactory(Map.of()).createObjectBuilder().add(DSPACE_SCHEMA + "foo", "bar"); + var reason = Json.createBuilderFactory(Map.of()).createObjectBuilder().add(DSP_NAMESPACE.toIri("foo"), "bar"); var reasonArray = Json.createBuilderFactory(Map.of()).createArrayBuilder().add(reason).build(); var json = Json.createObjectBuilder() - .add(TYPE, DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_IRI) - .add(DSPACE_PROPERTY_CODE_IRI, "testCode") - .add(DSPACE_PROPERTY_REASON_IRI, Json.createBuilderFactory(Map.of()).createArrayBuilder().add(reasonArray).build()) + .add(TYPE, DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_TERM)) + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_CODE_TERM), "testCode") + .add(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_REASON_TERM), Json.createBuilderFactory(Map.of()).createArrayBuilder().add(reasonArray).build()) .build(); var result = transformer.transform(TestInput.getExpanded(json), context); diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferCompletionMessageValidator.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferCompletionMessageValidator.java index 172ef89de4c..e387aba145e 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferCompletionMessageValidator.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferCompletionMessageValidator.java @@ -21,7 +21,6 @@ import org.eclipse.edc.validator.jsonobject.validators.TypeIs; import org.eclipse.edc.validator.spi.Validator; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_TERM; /** @@ -29,10 +28,6 @@ */ public class TransferCompletionMessageValidator { - public static Validator instance() { - return instance(DSP_NAMESPACE_V_08); - } - public static Validator instance(JsonLdNamespace namespace) { return JsonObjectValidator.newValidator() .verify(path -> new TypeIs(path, namespace.toIri(DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_TERM))) diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferRequestMessageValidator.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferRequestMessageValidator.java index 6ce098aff9b..a5e9e006423 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferRequestMessageValidator.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferRequestMessageValidator.java @@ -21,7 +21,6 @@ import org.eclipse.edc.validator.jsonobject.validators.TypeIs; import org.eclipse.edc.validator.spi.Validator; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_TERM; /** @@ -29,10 +28,6 @@ */ public class TransferRequestMessageValidator { - public static Validator instance() { - return instance(DSP_NAMESPACE_V_08); - } - public static Validator instance(JsonLdNamespace namespace) { return JsonObjectValidator.newValidator() .verify(path -> new TypeIs(path, namespace.toIri(DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_TERM))) diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferStartMessageValidator.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferStartMessageValidator.java index cb8b2a5dc42..2b5738e66c2 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferStartMessageValidator.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferStartMessageValidator.java @@ -21,7 +21,6 @@ import org.eclipse.edc.validator.jsonobject.validators.TypeIs; import org.eclipse.edc.validator.spi.Validator; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_START_MESSAGE_TERM; /** @@ -29,10 +28,6 @@ */ public class TransferStartMessageValidator { - public static Validator instance() { - return instance(DSP_NAMESPACE_V_08); - } - public static Validator instance(JsonLdNamespace namespace) { return JsonObjectValidator.newValidator() .verify(path -> new TypeIs(path, namespace.toIri(DSPACE_TYPE_TRANSFER_START_MESSAGE_TERM))) diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferTerminationMessageValidator.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferTerminationMessageValidator.java index 9a264e2fb58..e8fd973ccee 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferTerminationMessageValidator.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferTerminationMessageValidator.java @@ -21,7 +21,6 @@ import org.eclipse.edc.validator.jsonobject.validators.TypeIs; import org.eclipse.edc.validator.spi.Validator; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_TERM; /** @@ -29,10 +28,6 @@ */ public class TransferTerminationMessageValidator { - public static Validator instance() { - return instance(DSP_NAMESPACE_V_08); - } - public static Validator instance(JsonLdNamespace namespace) { return JsonObjectValidator.newValidator() .verify(path -> new TypeIs(path, namespace.toIri(DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_TERM))) diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferCompletionMessageValidatorTest.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferCompletionMessageValidatorTest.java index c54844963fd..6f40d832b11 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferCompletionMessageValidatorTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferCompletionMessageValidatorTest.java @@ -16,6 +16,7 @@ import jakarta.json.Json; import jakarta.json.JsonObject; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.validator.spi.ValidationFailure; import org.eclipse.edc.validator.spi.Validator; import org.eclipse.edc.validator.spi.Violation; @@ -25,16 +26,17 @@ import static org.assertj.core.api.InstanceOfAssertFactories.list; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_TERM; class TransferCompletionMessageValidatorTest { - private final Validator validator = TransferCompletionMessageValidator.instance(); + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); + private final Validator validator = TransferCompletionMessageValidator.instance(DSP_NAMESPACE); @Test void shouldSucceed_whenObjectIsValid() { var input = Json.createObjectBuilder() - .add(TYPE, Json.createArrayBuilder().add(DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_IRI)) + .add(TYPE, Json.createArrayBuilder().add(DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_TERM))) .build(); var result = validator.validate(input); diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferRequestMessageValidatorTest.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferRequestMessageValidatorTest.java index dbdb9f4f0d8..d53618f02fe 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferRequestMessageValidatorTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferRequestMessageValidatorTest.java @@ -16,6 +16,7 @@ import jakarta.json.Json; import jakarta.json.JsonObject; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.validator.spi.ValidationFailure; import org.eclipse.edc.validator.spi.Validator; import org.eclipse.edc.validator.spi.Violation; @@ -25,16 +26,17 @@ import static org.assertj.core.api.InstanceOfAssertFactories.list; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_TERM; class TransferRequestMessageValidatorTest { - private final Validator validator = TransferRequestMessageValidator.instance(); + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); + private final Validator validator = TransferRequestMessageValidator.instance(DSP_NAMESPACE); @Test void shouldSucceed_whenObjectIsValid() { var input = Json.createObjectBuilder() - .add(TYPE, Json.createArrayBuilder().add(DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_IRI)) + .add(TYPE, Json.createArrayBuilder().add(DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_TERM))) .build(); var result = validator.validate(input); diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferStartMessageValidatorTest.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferStartMessageValidatorTest.java index 74725635a17..a993fa90130 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferStartMessageValidatorTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferStartMessageValidatorTest.java @@ -16,6 +16,7 @@ import jakarta.json.Json; import jakarta.json.JsonObject; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.validator.spi.ValidationFailure; import org.eclipse.edc.validator.spi.Validator; import org.eclipse.edc.validator.spi.Violation; @@ -25,16 +26,17 @@ import static org.assertj.core.api.InstanceOfAssertFactories.list; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_START_MESSAGE_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_START_MESSAGE_TERM; class TransferStartMessageValidatorTest { - private final Validator validator = TransferStartMessageValidator.instance(); + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); + private final Validator validator = TransferStartMessageValidator.instance(DSP_NAMESPACE); @Test void shouldSucceed_whenObjectIsValid() { var input = Json.createObjectBuilder() - .add(TYPE, Json.createArrayBuilder().add(DSPACE_TYPE_TRANSFER_START_MESSAGE_IRI)) + .add(TYPE, Json.createArrayBuilder().add(DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_START_MESSAGE_TERM))) .build(); var result = validator.validate(input); diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferTerminationMessageValidatorTest.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferTerminationMessageValidatorTest.java index eb469b8c81b..e30685cce35 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferTerminationMessageValidatorTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-validation-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/validation/TransferTerminationMessageValidatorTest.java @@ -16,6 +16,7 @@ import jakarta.json.Json; import jakarta.json.JsonObject; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.validator.spi.ValidationFailure; import org.eclipse.edc.validator.spi.Validator; import org.eclipse.edc.validator.spi.Violation; @@ -25,16 +26,17 @@ import static org.assertj.core.api.InstanceOfAssertFactories.list; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; -import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_IRI; +import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_TERM; class TransferTerminationMessageValidatorTest { - private final Validator validator = TransferTerminationMessageValidator.instance(); + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); + private final Validator validator = TransferTerminationMessageValidator.instance(DSP_NAMESPACE); @Test void shouldSucceed_whenObjectIsValid() { var input = Json.createObjectBuilder() - .add(TYPE, Json.createArrayBuilder().add(DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_IRI)) + .add(TYPE, Json.createArrayBuilder().add(DSP_NAMESPACE.toIri(DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_TERM))) .build(); var result = validator.validate(input); diff --git a/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspCatalogPropertyAndTypeNames.java b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspCatalogPropertyAndTypeNames.java index 81bcf8239f9..df89959cd99 100644 --- a/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspCatalogPropertyAndTypeNames.java +++ b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspCatalogPropertyAndTypeNames.java @@ -22,10 +22,13 @@ public interface DspCatalogPropertyAndTypeNames { String DSPACE_TYPE_CATALOG_REQUEST_MESSAGE_TERM = "CatalogRequestMessage"; + @Deprecated(since = "0.14.0") String DSPACE_TYPE_CATALOG_REQUEST_MESSAGE_IRI = DSPACE_SCHEMA + DSPACE_TYPE_CATALOG_REQUEST_MESSAGE_TERM; String DSPACE_TYPE_CATALOG_ERROR_TERM = "CatalogError"; + @Deprecated(since = "0.14.0") String DSPACE_TYPE_CATALOG_ERROR_IRI = DSPACE_SCHEMA + DSPACE_TYPE_CATALOG_ERROR_TERM; String DSPACE_PROPERTY_FILTER_TERM = "filter"; + @Deprecated(since = "0.14.0") String DSPACE_PROPERTY_FILTER_IRI = DSPACE_SCHEMA + DSPACE_PROPERTY_FILTER_TERM; } diff --git a/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspConstants.java b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspConstants.java index b388c7e1c38..753ae7e6ff5 100644 --- a/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspConstants.java +++ b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspConstants.java @@ -16,10 +16,8 @@ import org.eclipse.edc.jsonld.spi.JsonLdNamespace; -import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_SCHEMA; import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_SCHEMA_2024_1; import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_SCHEMA_2025_1; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_08_VERSION; import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2024_1_VERSION; import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2025_1_VERSION; @@ -30,16 +28,13 @@ public interface DspConstants { String DSP_CONTEXT_SEPARATOR = ":"; String DSP_SCOPE = "DSP"; - String DSP_SCOPE_V_08 = DSP_SCOPE + DSP_CONTEXT_SEPARATOR + V_08_VERSION; String DSP_SCOPE_V_2024_1 = DSP_SCOPE + DSP_CONTEXT_SEPARATOR + V_2024_1_VERSION; String DSP_SCOPE_V_2025_1 = DSP_SCOPE + DSP_CONTEXT_SEPARATOR + V_2025_1_VERSION; String DSP_TRANSFORMER_CONTEXT = "dsp-api"; - String DSP_TRANSFORMER_CONTEXT_V_08 = DSP_TRANSFORMER_CONTEXT + DSP_CONTEXT_SEPARATOR + V_08_VERSION; String DSP_TRANSFORMER_CONTEXT_V_2024_1 = DSP_TRANSFORMER_CONTEXT + DSP_CONTEXT_SEPARATOR + V_2024_1_VERSION; String DSP_TRANSFORMER_CONTEXT_V_2025_1 = DSP_TRANSFORMER_CONTEXT + DSP_CONTEXT_SEPARATOR + V_2025_1_VERSION; - JsonLdNamespace DSP_NAMESPACE_V_08 = new JsonLdNamespace(DSPACE_SCHEMA); JsonLdNamespace DSP_NAMESPACE_V_2024_1 = new JsonLdNamespace(DSPACE_SCHEMA_2024_1); JsonLdNamespace DSP_NAMESPACE_V_2025_1 = new JsonLdNamespace(DSPACE_SCHEMA_2025_1); } diff --git a/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspNegotiationPropertyAndTypeNames.java b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspNegotiationPropertyAndTypeNames.java index 1b904a020cc..62577f9c790 100644 --- a/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspNegotiationPropertyAndTypeNames.java +++ b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspNegotiationPropertyAndTypeNames.java @@ -21,56 +21,79 @@ public interface DspNegotiationPropertyAndTypeNames { // types String DSPACE_TYPE_CONTRACT_NEGOTIATION_TERM = "ContractNegotiation"; + @Deprecated(since = "0.14.0") String DSPACE_TYPE_CONTRACT_NEGOTIATION_IRI = DSPACE_SCHEMA + DSPACE_TYPE_CONTRACT_NEGOTIATION_TERM; String DSPACE_TYPE_CONTRACT_NEGOTIATION_ERROR_TERM = "ContractNegotiationError"; + @Deprecated(since = "0.14.0") String DSPACE_TYPE_CONTRACT_NEGOTIATION_ERROR_IRI = DSPACE_SCHEMA + DSPACE_TYPE_CONTRACT_NEGOTIATION_ERROR_TERM; // messages String DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_TERM = "ContractRequestMessage"; + @Deprecated(since = "0.14.0") String DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_IRI = DSPACE_SCHEMA + DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_TERM; String DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_TERM = "ContractOfferMessage"; + @Deprecated(since = "0.14.0") String DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_IRI = DSPACE_SCHEMA + DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_TERM; String DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_TERM = "ContractNegotiationEventMessage"; + @Deprecated(since = "0.14.0") String DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_IRI = DSPACE_SCHEMA + DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_TERM; String DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_TERM = "ContractAgreementMessage"; + @Deprecated(since = "0.14.0") String DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_IRI = DSPACE_SCHEMA + DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_TERM; String DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_TERM = "ContractAgreementVerificationMessage"; + @Deprecated(since = "0.14.0") String DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_IRI = DSPACE_SCHEMA + DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_TERM; String DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_TERM = "ContractNegotiationTerminationMessage"; + @Deprecated(since = "0.14.0") String DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_IRI = DSPACE_SCHEMA + DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_TERM; // properties String DSPACE_PROPERTY_EVENT_TYPE_TERM = "eventType"; + @Deprecated(since = "0.14.0") String DSPACE_PROPERTY_EVENT_TYPE_IRI = DSPACE_SCHEMA + DSPACE_PROPERTY_EVENT_TYPE_TERM; String DSPACE_PROPERTY_AGREEMENT_TERM = "agreement"; + @Deprecated(since = "0.14.0") String DSPACE_PROPERTY_AGREEMENT_IRI = DSPACE_SCHEMA + DSPACE_PROPERTY_AGREEMENT_TERM; String DSPACE_PROPERTY_OFFER_TERM = "offer"; + @Deprecated(since = "0.14.0") String DSPACE_PROPERTY_OFFER_IRI = DSPACE_SCHEMA + DSPACE_PROPERTY_OFFER_TERM; String DSPACE_PROPERTY_TIMESTAMP_TERM = "timestamp"; + @Deprecated(since = "0.14.0") String DSPACE_PROPERTY_TIMESTAMP_IRI = DSPACE_SCHEMA + DSPACE_PROPERTY_TIMESTAMP_TERM; String DSPACE_PROPERTY_CONSUMER_ID_TERM = "consumerId"; + @Deprecated(since = "0.14.0") String DSPACE_PROPERTY_CONSUMER_ID_IRI = DSPACE_SCHEMA + DSPACE_PROPERTY_CONSUMER_ID_TERM; String DSPACE_PROPERTY_PROVIDER_ID_TERM = "providerId"; + @Deprecated(since = "0.14.0") String DSPACE_PROPERTY_PROVIDER_ID_IRI = DSPACE_SCHEMA + DSPACE_PROPERTY_PROVIDER_ID_TERM; // event types String DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED_TERM = "ACCEPTED"; + @Deprecated(since = "0.14.0") String DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED_IRI = DSPACE_SCHEMA + DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED_TERM; String DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_FINALIZED_TERM = "FINALIZED"; + @Deprecated(since = "0.14.0") String DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_FINALIZED_IRI = DSPACE_SCHEMA + DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_FINALIZED_TERM; // negotiation states String DSPACE_VALUE_NEGOTIATION_STATE_REQUESTED_TERM = "REQUESTED"; + @Deprecated(since = "0.14.0") String DSPACE_VALUE_NEGOTIATION_STATE_REQUESTED_IRI = DSPACE_SCHEMA + DSPACE_VALUE_NEGOTIATION_STATE_REQUESTED_TERM; String DSPACE_VALUE_NEGOTIATION_STATE_OFFERED_TERM = "OFFERED"; + @Deprecated(since = "0.14.0") String DSPACE_VALUE_NEGOTIATION_STATE_OFFERED_IRI = DSPACE_SCHEMA + DSPACE_VALUE_NEGOTIATION_STATE_OFFERED_TERM; String DSPACE_VALUE_NEGOTIATION_STATE_ACCEPTED_TERM = "ACCEPTED"; + @Deprecated(since = "0.14.0") String DSPACE_VALUE_NEGOTIATION_STATE_ACCEPTED_IRI = DSPACE_SCHEMA + DSPACE_VALUE_NEGOTIATION_STATE_ACCEPTED_TERM; String DSPACE_VALUE_NEGOTIATION_STATE_AGREED_TERM = "AGREED"; + @Deprecated(since = "0.14.0") String DSPACE_VALUE_NEGOTIATION_STATE_AGREED_IRI = DSPACE_SCHEMA + DSPACE_VALUE_NEGOTIATION_STATE_AGREED_TERM; String DSPACE_VALUE_NEGOTIATION_STATE_VERIFIED_TERM = "VERIFIED"; + @Deprecated(since = "0.14.0") String DSPACE_VALUE_NEGOTIATION_STATE_VERIFIED_IRI = DSPACE_SCHEMA + DSPACE_VALUE_NEGOTIATION_STATE_VERIFIED_TERM; String DSPACE_VALUE_NEGOTIATION_STATE_FINALIZED_TERM = "FINALIZED"; + @Deprecated(since = "0.14.0") String DSPACE_VALUE_NEGOTIATION_STATE_FINALIZED_IRI = DSPACE_SCHEMA + DSPACE_VALUE_NEGOTIATION_STATE_FINALIZED_TERM; String DSPACE_VALUE_NEGOTIATION_STATE_TERMINATED_TERM = "TERMINATED"; + @Deprecated(since = "0.14.0") String DSPACE_VALUE_NEGOTIATION_STATE_TERMINATED_IRI = DSPACE_SCHEMA + DSPACE_VALUE_NEGOTIATION_STATE_TERMINATED_TERM; } diff --git a/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspPropertyAndTypeNames.java b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspPropertyAndTypeNames.java index cff899af8f5..6d004e90cd0 100644 --- a/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspPropertyAndTypeNames.java +++ b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspPropertyAndTypeNames.java @@ -22,16 +22,23 @@ public interface DspPropertyAndTypeNames { String DSPACE_PROPERTY_CODE_TERM = "code"; + @Deprecated(since = "0.14.0") String DSPACE_PROPERTY_CODE_IRI = DSPACE_SCHEMA + DSPACE_PROPERTY_CODE_TERM; String DSPACE_PROPERTY_REASON_TERM = "reason"; + @Deprecated(since = "0.14.0") String DSPACE_PROPERTY_REASON_IRI = DSPACE_SCHEMA + DSPACE_PROPERTY_REASON_TERM; String DSPACE_PROPERTY_CONSUMER_PID_TERM = "consumerPid"; + @Deprecated(since = "0.14.0") String DSPACE_PROPERTY_CONSUMER_PID_IRI = DSPACE_SCHEMA + DSPACE_PROPERTY_CONSUMER_PID_TERM; String DSPACE_PROPERTY_PROVIDER_PID_TERM = "providerPid"; + @Deprecated(since = "0.14.0") String DSPACE_PROPERTY_PROVIDER_PID_IRI = DSPACE_SCHEMA + DSPACE_PROPERTY_PROVIDER_PID_TERM; + @Deprecated(since = "0.14.0") String DSPACE_PROPERTY_PROCESS_ID = DSPACE_SCHEMA + "processId"; String DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM = "callbackAddress"; + @Deprecated(since = "0.14.0") String DSPACE_PROPERTY_CALLBACK_ADDRESS_IRI = DSPACE_SCHEMA + DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM; String DSPACE_PROPERTY_STATE_TERM = "state"; + @Deprecated(since = "0.14.0") String DSPACE_PROPERTY_STATE_IRI = DSPACE_SCHEMA + DSPACE_PROPERTY_STATE_TERM; } diff --git a/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspTransferProcessPropertyAndTypeNames.java b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspTransferProcessPropertyAndTypeNames.java index 92ca31d02e1..d940c5cd232 100644 --- a/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspTransferProcessPropertyAndTypeNames.java +++ b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspTransferProcessPropertyAndTypeNames.java @@ -22,22 +22,31 @@ public interface DspTransferProcessPropertyAndTypeNames { String DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_TERM = "TransferRequestMessage"; + @Deprecated(since = "0.14.0") String DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_IRI = DSPACE_SCHEMA + DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_TERM; String DSPACE_TYPE_TRANSFER_START_MESSAGE_TERM = "TransferStartMessage"; + @Deprecated(since = "0.14.0") String DSPACE_TYPE_TRANSFER_START_MESSAGE_IRI = DSPACE_SCHEMA + DSPACE_TYPE_TRANSFER_START_MESSAGE_TERM; String DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_TERM = "TransferCompletionMessage"; + @Deprecated(since = "0.14.0") String DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_IRI = DSPACE_SCHEMA + DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_TERM; String DSPACE_TYPE_TRANSFER_SUSPENSION_MESSAGE_TERM = "TransferSuspensionMessage"; + @Deprecated(since = "0.14.0") String DSPACE_TYPE_TRANSFER_SUSPENSION_MESSAGE_IRI = DSPACE_SCHEMA + DSPACE_TYPE_TRANSFER_SUSPENSION_MESSAGE_TERM; String DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_TERM = "TransferTerminationMessage"; + @Deprecated(since = "0.14.0") String DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_IRI = DSPACE_SCHEMA + DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_TERM; String DSPACE_TYPE_TRANSFER_PROCESS_TERM = "TransferProcess"; + @Deprecated(since = "0.14.0") String DSPACE_TYPE_TRANSFER_PROCESS_IRI = DSPACE_SCHEMA + DSPACE_TYPE_TRANSFER_PROCESS_TERM; String DSPACE_TYPE_TRANSFER_ERROR_TERM = "TransferError"; + @Deprecated(since = "0.14.0") String DSPACE_TYPE_TRANSFER_ERROR_IRI = DSPACE_SCHEMA + DSPACE_TYPE_TRANSFER_ERROR_TERM; String DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID_TERM = "agreementId"; + @Deprecated(since = "0.14.0") String DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID_IRI = DSPACE_SCHEMA + DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID_TERM; String DSPACE_PROPERTY_DATA_ADDRESS_TERM = "dataAddress"; + @Deprecated(since = "0.14.0") String DSPACE_PROPERTY_DATA_ADDRESS_IRI = DSPACE_SCHEMA + DSPACE_PROPERTY_DATA_ADDRESS_TERM; diff --git a/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/version/DspVersions.java b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/version/DspVersions.java index eb94aff58ea..44326909006 100644 --- a/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/version/DspVersions.java +++ b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/version/DspVersions.java @@ -21,12 +21,7 @@ public interface DspVersions { String V_2024_1_VERSION = "2024/1"; String V_2024_1_PATH = "/" + V_2024_1_VERSION; ProtocolVersion V_2024_1 = new ProtocolVersion(V_2024_1_VERSION, V_2024_1_PATH); - - String V_08_VERSION = "v0.8"; - String V_08_PATH = "/"; - ProtocolVersion V_08 = new ProtocolVersion(V_08_VERSION, V_08_PATH); - - + String V_2025_1_VERSION = "2025-1"; String V_2025_1_PATH = "/" + V_2025_1_VERSION; ProtocolVersion V_2025_1 = new ProtocolVersion(V_2025_1_VERSION, V_2025_1_PATH); diff --git a/data-protocols/dsp/dsp-version/dsp-version-http-api/src/main/java/org/eclipse/edc/protocol/dsp/version/http/api/DspVersionApiController.java b/data-protocols/dsp/dsp-version/dsp-version-http-api/src/main/java/org/eclipse/edc/protocol/dsp/version/http/api/DspVersionApiController.java index 8749c96d0e2..872708fa1da 100644 --- a/data-protocols/dsp/dsp-version/dsp-version-http-api/src/main/java/org/eclipse/edc/protocol/dsp/version/http/api/DspVersionApiController.java +++ b/data-protocols/dsp/dsp-version/dsp-version-http-api/src/main/java/org/eclipse/edc/protocol/dsp/version/http/api/DspVersionApiController.java @@ -15,42 +15,66 @@ package org.eclipse.edc.protocol.dsp.version.http.api; +import jakarta.json.JsonObject; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.Response; -import org.eclipse.edc.connector.controlplane.services.spi.protocol.ProtocolVersions; import org.eclipse.edc.connector.controlplane.services.spi.protocol.VersionProtocolService; import org.eclipse.edc.connector.controlplane.services.spi.protocol.VersionsError; -import org.eclipse.edc.protocol.dsp.http.spi.message.DspRequestHandler; -import org.eclipse.edc.protocol.dsp.http.spi.message.GetDspRequest; +import org.eclipse.edc.spi.EdcException; +import org.eclipse.edc.transform.spi.TypeTransformerRegistry; + +import java.util.List; import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP; @Produces(APPLICATION_JSON) @Path("/.well-known/dspace-version") public class DspVersionApiController { - private final DspRequestHandler requestHandler; private final VersionProtocolService service; + private final TypeTransformerRegistry transformerRegistry; - public DspVersionApiController(DspRequestHandler requestHandler, VersionProtocolService service) { - this.requestHandler = requestHandler; + public DspVersionApiController(VersionProtocolService service, TypeTransformerRegistry transformerRegistry) { this.service = service; + this.transformerRegistry = transformerRegistry; } - + @GET public Response getProtocolVersions() { - var request = GetDspRequest.Builder.newInstance(ProtocolVersions.class, VersionsError.class) - .token(null) - .authRequired(false) - .serviceCall((id, tokenRepresentation) -> service.getAll()) - .protocol(DATASPACE_PROTOCOL_HTTP) - .errorProvider(VersionsError.Builder::newInstance) + var result = service.getAll(); + if (result.failed()) { + return badRequest(result.getFailureMessages()); + } + var protocolVersions = result.getContent(); + var body = transformerRegistry.transform(protocolVersions, JsonObject.class); + + if (body.failed()) { + return internalServerError(body.getFailureMessages()); + } + return Response.status(Response.Status.OK) + .entity(body.getContent()) .build(); + } + + private Response badRequest(List messages) { + return errorResponse(Response.Status.BAD_REQUEST, messages); + } - return requestHandler.getResource(request); + private Response internalServerError(List messages) { + return errorResponse(Response.Status.INTERNAL_SERVER_ERROR, messages); + } + + + private Response errorResponse(Response.Status status, List messages) { + var error = VersionsError.Builder.newInstance().code(status.toString()).messages(messages).build(); + var body = transformerRegistry.transform(error, JsonObject.class) + .orElseThrow(f -> new EdcException("Error creating response body: " + f.getFailureDetail())); + + return Response.status(status) + .entity(body) + .build(); } } diff --git a/data-protocols/dsp/dsp-version/dsp-version-http-api/src/main/java/org/eclipse/edc/protocol/dsp/version/http/api/DspVersionApiExtension.java b/data-protocols/dsp/dsp-version/dsp-version-http-api/src/main/java/org/eclipse/edc/protocol/dsp/version/http/api/DspVersionApiExtension.java index 14eb29433f2..49c4f46d8c1 100644 --- a/data-protocols/dsp/dsp-version/dsp-version-http-api/src/main/java/org/eclipse/edc/protocol/dsp/version/http/api/DspVersionApiExtension.java +++ b/data-protocols/dsp/dsp-version/dsp-version-http-api/src/main/java/org/eclipse/edc/protocol/dsp/version/http/api/DspVersionApiExtension.java @@ -17,7 +17,6 @@ import jakarta.json.Json; import org.eclipse.edc.connector.controlplane.services.spi.protocol.VersionProtocolService; import org.eclipse.edc.jsonld.spi.JsonLd; -import org.eclipse.edc.protocol.dsp.http.spi.message.DspRequestHandler; import org.eclipse.edc.protocol.dsp.version.http.api.transformer.JsonObjectFromProtocolVersionsTransformer; import org.eclipse.edc.protocol.dsp.version.http.api.transformer.JsonObjectFromVersionsError; import org.eclipse.edc.runtime.metamodel.annotation.Extension; @@ -47,9 +46,6 @@ public class DspVersionApiExtension implements ServiceExtension { @Inject private TypeTransformerRegistry transformerRegistry; - @Inject - private DspRequestHandler requestHandler; - @Inject private VersionProtocolService service; @@ -68,11 +64,11 @@ public String name() { public void initialize(ServiceExtensionContext context) { var jsonFactory = Json.createBuilderFactory(Map.of()); - + transformerRegistry.register(new JsonObjectFromProtocolVersionsTransformer(jsonFactory)); transformerRegistry.register(new JsonObjectFromVersionsError(jsonFactory)); - webService.registerResource(ApiContext.PROTOCOL, new DspVersionApiController(requestHandler, service)); + webService.registerResource(ApiContext.PROTOCOL, new DspVersionApiController(service, transformerRegistry)); } } diff --git a/data-protocols/dsp/dsp-version/dsp-version-http-api/src/test/java/org/eclipse/edc/protocol/dsp/version/http/api/DspVersionApiControllerTest.java b/data-protocols/dsp/dsp-version/dsp-version-http-api/src/test/java/org/eclipse/edc/protocol/dsp/version/http/api/DspVersionApiControllerTest.java index 8b94bc3d526..0cb93c08508 100644 --- a/data-protocols/dsp/dsp-version/dsp-version-http-api/src/test/java/org/eclipse/edc/protocol/dsp/version/http/api/DspVersionApiControllerTest.java +++ b/data-protocols/dsp/dsp-version/dsp-version-http-api/src/test/java/org/eclipse/edc/protocol/dsp/version/http/api/DspVersionApiControllerTest.java @@ -17,73 +17,54 @@ import io.restassured.specification.RequestSpecification; import jakarta.json.Json; -import jakarta.ws.rs.core.Response; +import jakarta.json.JsonObject; +import org.eclipse.edc.connector.controlplane.services.spi.protocol.ProtocolVersion; +import org.eclipse.edc.connector.controlplane.services.spi.protocol.ProtocolVersions; import org.eclipse.edc.connector.controlplane.services.spi.protocol.VersionProtocolService; import org.eclipse.edc.junit.annotations.ApiTest; -import org.eclipse.edc.protocol.dsp.http.spi.message.DspRequestHandler; -import org.eclipse.edc.protocol.dsp.http.spi.message.GetDspRequest; +import org.eclipse.edc.spi.result.Result; +import org.eclipse.edc.spi.result.ServiceResult; +import org.eclipse.edc.transform.spi.TypeTransformerRegistry; import org.eclipse.edc.web.jersey.testfixtures.RestControllerTestBase; import org.junit.jupiter.api.Test; -import org.mockito.ArgumentCaptor; + +import java.util.List; import static io.restassured.RestAssured.given; -import static jakarta.ws.rs.core.HttpHeaders.AUTHORIZATION; import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; -import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.CoreMatchers.is; -import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @ApiTest class DspVersionApiControllerTest extends RestControllerTestBase { private final VersionProtocolService service = mock(); - private final DspRequestHandler requestHandler = mock(); + private final TypeTransformerRegistry transformerRegistry = mock(); @Test void shouldInvokeRequestHandler() { + var versions = new ProtocolVersions(List.of(new ProtocolVersion("version", "1.0"))); var output = Json.createObjectBuilder().add("protocolVersions", Json.createArrayBuilder().add(Json.createObjectBuilder().add("version", "1.0")).build()).build(); - when(requestHandler.getResource(any())).thenReturn(Response.ok(output).build()); - baseRequest() - .get(".well-known/dspace-version") - .then() - .log().ifError() - .statusCode(200) - .contentType(APPLICATION_JSON) - .body("protocolVersions[0].version", is("1.0")); + when(service.getAll()).thenReturn(ServiceResult.success(versions)); + when(transformerRegistry.transform(eq(versions), eq(JsonObject.class))).thenReturn(Result.success(output)); + - var captor = ArgumentCaptor.forClass(GetDspRequest.class); - verify(requestHandler).getResource(captor.capture()); - assertThat(captor.getValue().getToken()).isNull(); - assertThat(captor.getValue().isAuthRequired()).isFalse(); - } - - @Test - void whenAuthorizationHeaderSet_shouldIgnoreToken() { - var output = Json.createObjectBuilder().add("protocolVersions", Json.createArrayBuilder().add(Json.createObjectBuilder().add("version", "1.0")).build()).build(); - when(requestHandler.getResource(any())).thenReturn(Response.ok(output).build()); - baseRequest() - .header(AUTHORIZATION, "token") .get(".well-known/dspace-version") .then() .log().ifError() .statusCode(200) .contentType(APPLICATION_JSON) .body("protocolVersions[0].version", is("1.0")); - - var captor = ArgumentCaptor.forClass(GetDspRequest.class); - verify(requestHandler).getResource(captor.capture()); - assertThat(captor.getValue().getToken()).isNull(); - assertThat(captor.getValue().isAuthRequired()).isFalse(); + } @Override protected Object controller() { - return new DspVersionApiController(requestHandler, service); + return new DspVersionApiController(service, transformerRegistry); } private RequestSpecification baseRequest() { diff --git a/settings.gradle.kts b/settings.gradle.kts index e5139b40139..70f36e54e13 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -101,6 +101,7 @@ include(":data-protocols:dsp:dsp-lib:dsp-transfer-process-lib:dsp-transfer-proce // dsp version 0.8 include(":data-protocols:dsp:dsp-08") +include(":data-protocols:dsp:dsp-08:dsp-spi-08") include(":data-protocols:dsp:dsp-08:dsp-http-api-configuration-08") include(":data-protocols:dsp:dsp-08:dsp-http-dispatcher-08") include(":data-protocols:dsp:dsp-08:dsp-catalog-08") diff --git a/spi/common/json-ld-spi/src/main/java/org/eclipse/edc/jsonld/spi/Namespaces.java b/spi/common/json-ld-spi/src/main/java/org/eclipse/edc/jsonld/spi/Namespaces.java index 63ef8e12e46..870ffd81185 100644 --- a/spi/common/json-ld-spi/src/main/java/org/eclipse/edc/jsonld/spi/Namespaces.java +++ b/spi/common/json-ld-spi/src/main/java/org/eclipse/edc/jsonld/spi/Namespaces.java @@ -28,6 +28,7 @@ public interface Namespaces { String DCT_SCHEMA = "http://purl.org/dc/terms/"; String DSPACE_PREFIX = "dspace"; + @Deprecated(since = "0.14.0") String DSPACE_SCHEMA = "https://w3id.org/dspace/v0.8/"; String DSPACE_SCHEMA_2024_1 = "https://w3id.org/dspace/2024/1/"; diff --git a/spi/common/json-ld-spi/src/main/java/org/eclipse/edc/jsonld/spi/PropertyAndTypeNames.java b/spi/common/json-ld-spi/src/main/java/org/eclipse/edc/jsonld/spi/PropertyAndTypeNames.java index 7cb8043e52b..87df71956a9 100644 --- a/spi/common/json-ld-spi/src/main/java/org/eclipse/edc/jsonld/spi/PropertyAndTypeNames.java +++ b/spi/common/json-ld-spi/src/main/java/org/eclipse/edc/jsonld/spi/PropertyAndTypeNames.java @@ -75,5 +75,6 @@ public interface PropertyAndTypeNames { String ODRL_USE_ACTION_ATTRIBUTE = ODRL_SCHEMA + "use"; String ODRL_PROFILE_ATTRIBUTE = ODRL_SCHEMA + "profile"; String DSPACE_PROPERTY_PARTICIPANT_ID_TERM = "participantId"; + @Deprecated(since = "0.14.0") String DSPACE_PROPERTY_PARTICIPANT_ID_IRI = DSPACE_SCHEMA + DSPACE_PROPERTY_PARTICIPANT_ID_TERM; } diff --git a/spi/control-plane/control-plane-spi/src/main/java/org/eclipse/edc/connector/controlplane/services/spi/protocol/ProtocolVersionRegistry.java b/spi/control-plane/control-plane-spi/src/main/java/org/eclipse/edc/connector/controlplane/services/spi/protocol/ProtocolVersionRegistry.java index 3595b790f05..e0cb2d4ba50 100644 --- a/spi/control-plane/control-plane-spi/src/main/java/org/eclipse/edc/connector/controlplane/services/spi/protocol/ProtocolVersionRegistry.java +++ b/spi/control-plane/control-plane-spi/src/main/java/org/eclipse/edc/connector/controlplane/services/spi/protocol/ProtocolVersionRegistry.java @@ -24,7 +24,18 @@ public interface ProtocolVersionRegistry { * * @param protocolVersion the protocol version. */ - void register(ProtocolVersion protocolVersion); + default void register(ProtocolVersion protocolVersion) { + register(protocolVersion, false); + } + + /** + * Register a protocol version. + * + * @param protocolVersion the protocol version. + * @param isDefault if true, the protocol version will be set as default. + */ + void register(ProtocolVersion protocolVersion, boolean isDefault); + /** * get all the protocol versions. @@ -32,4 +43,12 @@ public interface ProtocolVersionRegistry { * @return the protocol versions. */ ProtocolVersions getAll(); + + + /** + * Get the default protocol version. + * + * @return the default protocol version. + */ + ProtocolVersion getDefaultVersion(); } diff --git a/system-tests/protocol-test/build.gradle.kts b/system-tests/protocol-test/build.gradle.kts index d37b61732b9..3854db721b2 100644 --- a/system-tests/protocol-test/build.gradle.kts +++ b/system-tests/protocol-test/build.gradle.kts @@ -22,6 +22,7 @@ dependencies { testImplementation(project(":spi:common:json-ld-spi")) testImplementation(project(":core:common:lib:json-ld-lib")) testImplementation(project(":extensions:common:json-ld")) + testImplementation(project(":data-protocols:dsp:dsp-08:dsp-spi-08")) testImplementation(libs.restAssured) } diff --git a/system-tests/protocol-test/src/test/java/org/eclipse/edc/test/e2e/protocol/ProtocolVersionProvider.java b/system-tests/protocol-test/src/test/java/org/eclipse/edc/test/e2e/protocol/ProtocolVersionProvider.java index f04ded300ab..f12716fc9cc 100644 --- a/system-tests/protocol-test/src/test/java/org/eclipse/edc/test/e2e/protocol/ProtocolVersionProvider.java +++ b/system-tests/protocol-test/src/test/java/org/eclipse/edc/test/e2e/protocol/ProtocolVersionProvider.java @@ -21,13 +21,14 @@ import java.util.stream.Stream; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_NAMESPACE_V_08; import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2024_1_PATH; public class ProtocolVersionProvider implements ArgumentsProvider { @Override public Stream provideArguments(ExtensionContext context) throws Exception { return Stream.of( - Arguments.of("", DspConstants.DSP_NAMESPACE_V_08), + Arguments.of("", DSP_NAMESPACE_V_08), Arguments.of(V_2024_1_PATH, DspConstants.DSP_NAMESPACE_V_2024_1) ); } From 0de178c150a44710e3d41f23fc5de9f8db6b2662 Mon Sep 17 00:00:00 2001 From: Enrico Risa Date: Fri, 20 Jun 2025 16:47:37 +0200 Subject: [PATCH 2/4] wip: 2024 refactor --- ...tFromDataAddressDspace2024Transformer.java | 5 --- ...mDataAddressDspace2024TransformerTest.java | 32 +++++++-------- .../build.gradle.kts | 1 + .../http/api/DspCatalogApiV2024Extension.java | 10 ++--- .../DspCatalogApiController20241.java | 10 ++--- .../api/DspCatalogApiV2024ExtensionTest.java | 6 +-- .../DspCatalogApiController20241Test.java | 10 ++--- .../build.gradle.kts | 3 +- .../DspCatalogTransformV2024Extension.java | 6 +-- .../build.gradle.kts | 1 + .../DspApiConfigurationV2024Extension.java | 12 +++--- ...DspApiConfigurationV2024ExtensionTest.java | 16 ++++---- .../dsp-http-dispatcher-2024/build.gradle.kts | 1 + .../DspHttpDispatcherV2024Extension.java | 6 +-- .../build.gradle.kts | 1 + .../api/DspNegotiationApiV2024Extension.java | 8 ++-- .../DspNegotiationApiController20241.java | 12 +++--- .../DspNegotiationApiV2024ExtensionTest.java | 2 +- .../DspNegotiationApiController20241Test.java | 10 ++--- .../build.gradle.kts | 1 + ...DspNegotiationTransformV2024Extension.java | 20 ++++----- .../dsp-2024/dsp-spi-2024/build.gradle.kts | 23 +++++++++++ .../dsp/spi/type/Dsp2024Constants.java | 41 +++++++++++++++++++ .../build.gradle.kts | 1 + .../DspTransferProcessApiV2024Extension.java | 8 ++-- .../DspTransferProcessApiController20241.java | 12 +++--- ...pTransferProcessApiV2024ExtensionTest.java | 2 +- ...TransferProcessApiController20241Test.java | 10 ++--- .../build.gradle.kts | 1 + ...ransferProcessTransformV2024Extension.java | 18 ++++---- .../protocol/DspProtocolParserImplTest.java | 7 ++-- .../http/spi/types/HttpMessageProtocol.java | 1 - ...JsonObjectFromCatalogV2024Transformer.java | 5 --- ...ObjectFromCatalogV2024TransformerTest.java | 9 ++-- ...tractAgreementMessageV2024Transformer.java | 5 --- ...ntVerificationMessageV2024Transformer.java | 5 --- ...gotiationEventMessageV2024Transformer.java | 5 --- ...ionTerminationMessageV2024Transformer.java | 5 --- ...omContractNegotiationV2024Transformer.java | 5 --- ...mContractOfferMessageV2024Transformer.java | 7 +--- ...ontractRequestMessageV2024Transformer.java | 5 --- ...tAgreementMessageV2024TransformerTest.java | 4 +- ...rificationMessageV2024TransformerTest.java | 3 +- ...ationEventMessageV2024TransformerTest.java | 3 +- ...erminationMessageV2024TransformerTest.java | 3 +- ...ntractNegotiationV2024TransformerTest.java | 3 +- ...tractOfferMessageV2024TransformerTest.java | 3 +- ...actRequestMessageTransformerV2024Test.java | 3 +- .../v2024/from/TestFunction2024.java | 6 ++- ...sferCompletionMessageV2024Transformer.java | 5 --- ...ctFromTransferProcessV2024Transformer.java | 7 +--- ...ransferRequestMessageV2024Transformer.java | 5 --- ...mTransferStartMessageV2024Transformer.java | 5 --- ...sferSuspensionMessageV2024Transformer.java | 5 --- ...ferTerminationMessageV2024Transformer.java | 5 --- ...CompletionMessageV2024TransformerTest.java | 3 +- ...omTransferProcessV2024TransformerTest.java | 3 +- ...ferRequestMessageV2024TransformerTest.java | 3 +- ...nsferStartMessageV2024TransformerTest.java | 3 +- ...SuspensionMessageV2024TransformerTest.java | 3 +- ...erminationMessageV2024TransformerTest.java | 3 +- .../v2024/from/TestFunctionV2024.java | 5 ++- .../protocol/dsp/spi/type/DspConstants.java | 5 --- .../protocol/dsp/spi/version/DspVersions.java | 4 -- settings.gradle.kts | 1 + .../eclipse/edc/jsonld/spi/Namespaces.java | 1 - system-tests/protocol-test/build.gradle.kts | 1 + .../e2e/protocol/ProtocolVersionProvider.java | 6 +-- 68 files changed, 224 insertions(+), 225 deletions(-) create mode 100644 data-protocols/dsp/dsp-2024/dsp-spi-2024/build.gradle.kts create mode 100644 data-protocols/dsp/dsp-2024/dsp-spi-2024/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/Dsp2024Constants.java diff --git a/core/common/lib/transform-lib/src/main/java/org/eclipse/edc/transform/transformer/dspace/v2024/from/JsonObjectFromDataAddressDspace2024Transformer.java b/core/common/lib/transform-lib/src/main/java/org/eclipse/edc/transform/transformer/dspace/v2024/from/JsonObjectFromDataAddressDspace2024Transformer.java index cdb04191ce9..4d9ae3d5c34 100644 --- a/core/common/lib/transform-lib/src/main/java/org/eclipse/edc/transform/transformer/dspace/v2024/from/JsonObjectFromDataAddressDspace2024Transformer.java +++ b/core/common/lib/transform-lib/src/main/java/org/eclipse/edc/transform/transformer/dspace/v2024/from/JsonObjectFromDataAddressDspace2024Transformer.java @@ -28,7 +28,6 @@ import java.util.Set; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; -import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_SCHEMA_2024_1; import static org.eclipse.edc.spi.types.domain.DataAddress.EDC_DATA_ADDRESS_TYPE_PROPERTY; import static org.eclipse.edc.transform.transformer.dspace.DataAddressDspaceSerialization.DSPACE_DATAADDRESS_TYPE_TERM; import static org.eclipse.edc.transform.transformer.dspace.DataAddressDspaceSerialization.ENDPOINT_PROPERTIES_PROPERTY_TERM; @@ -44,10 +43,6 @@ public class JsonObjectFromDataAddressDspace2024Transformer extends AbstractName private final TypeManager typeManager; private final String typeContext; - public JsonObjectFromDataAddressDspace2024Transformer(JsonBuilderFactory jsonFactory, TypeManager typeManager, String typeContext) { - this(jsonFactory, typeManager, typeContext, new JsonLdNamespace(DSPACE_SCHEMA_2024_1)); - } - public JsonObjectFromDataAddressDspace2024Transformer(JsonBuilderFactory jsonFactory, TypeManager typeManager, String typeContext, JsonLdNamespace namespace) { super(DataAddress.class, JsonObject.class, namespace); this.jsonFactory = jsonFactory; diff --git a/core/common/lib/transform-lib/src/test/java/org/eclipse/edc/transform/transformer/dspace/v2024/from/JsonObjectFromDataAddressDspace2024TransformerTest.java b/core/common/lib/transform-lib/src/test/java/org/eclipse/edc/transform/transformer/dspace/v2024/from/JsonObjectFromDataAddressDspace2024TransformerTest.java index 2ece04a5918..38ff11b4545 100644 --- a/core/common/lib/transform-lib/src/test/java/org/eclipse/edc/transform/transformer/dspace/v2024/from/JsonObjectFromDataAddressDspace2024TransformerTest.java +++ b/core/common/lib/transform-lib/src/test/java/org/eclipse/edc/transform/transformer/dspace/v2024/from/JsonObjectFromDataAddressDspace2024TransformerTest.java @@ -27,7 +27,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID; -import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_SCHEMA_2024_1; import static org.eclipse.edc.transform.transformer.dspace.DataAddressDspaceSerialization.ENDPOINT_PROPERTIES_PROPERTY_TERM; import static org.eclipse.edc.transform.transformer.dspace.DataAddressDspaceSerialization.ENDPOINT_PROPERTY_NAME_PROPERTY_TERM; import static org.eclipse.edc.transform.transformer.dspace.DataAddressDspaceSerialization.ENDPOINT_PROPERTY_TERM; @@ -38,15 +37,12 @@ class JsonObjectFromDataAddressDspace2024TransformerTest { + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final TypeManager typeManager = mock(); - private final JsonObjectFromDataAddressDspace2024Transformer transformer = new JsonObjectFromDataAddressDspace2024Transformer( - Json.createBuilderFactory(Map.of()), typeManager, "test"); + Json.createBuilderFactory(Map.of()), typeManager, "test", DSP_NAMESPACE); private final TransformerContext context = mock(); - - private final JsonLdNamespace namespace = new JsonLdNamespace(DSPACE_SCHEMA_2024_1); - @BeforeEach void setup() { when(typeManager.getMapper("test")).thenReturn(JacksonJsonLd.createObjectMapper()); @@ -64,19 +60,19 @@ void transform() { var jsonObject = transformer.transform(dataAddress, context); assertThat(jsonObject).isNotNull(); - assertThat(jsonObject.getJsonObject(namespace.toIri(ENDPOINT_TYPE_PROPERTY_TERM)).getString(ID)).isEqualTo("https://w3id.org/idsa/v4.1/HTTP"); - assertThat(jsonObject.get(namespace.toIri(ENDPOINT_PROPERTY_TERM))).isEqualTo(null); - assertThat(jsonObject.getJsonArray(namespace.toIri(ENDPOINT_PROPERTIES_PROPERTY_TERM))).hasSize(3) + assertThat(jsonObject.getJsonObject(DSP_NAMESPACE.toIri(ENDPOINT_TYPE_PROPERTY_TERM)).getString(ID)).isEqualTo("https://w3id.org/idsa/v4.1/HTTP"); + assertThat(jsonObject.get(DSP_NAMESPACE.toIri(ENDPOINT_PROPERTY_TERM))).isEqualTo(null); + assertThat(jsonObject.getJsonArray(DSP_NAMESPACE.toIri(ENDPOINT_PROPERTIES_PROPERTY_TERM))).hasSize(3) .anySatisfy(jv -> { - assertThat(jv.asJsonObject().getString(namespace.toIri(ENDPOINT_PROPERTY_NAME_PROPERTY_TERM))).isEqualTo("authorization"); - assertThat(jv.asJsonObject().getString(namespace.toIri(ENDPOINT_PROPERTY_VALUE_PROPERTY_TERM))).isEqualTo("secret-token"); + assertThat(jv.asJsonObject().getString(DSP_NAMESPACE.toIri(ENDPOINT_PROPERTY_NAME_PROPERTY_TERM))).isEqualTo("authorization"); + assertThat(jv.asJsonObject().getString(DSP_NAMESPACE.toIri(ENDPOINT_PROPERTY_VALUE_PROPERTY_TERM))).isEqualTo("secret-token"); }).anySatisfy(jv -> { - assertThat(jv.asJsonObject().getString(namespace.toIri(ENDPOINT_PROPERTY_NAME_PROPERTY_TERM))).isEqualTo("foo"); - assertThat(jv.asJsonObject().getString(namespace.toIri(ENDPOINT_PROPERTY_VALUE_PROPERTY_TERM))).isEqualTo("bar"); + assertThat(jv.asJsonObject().getString(DSP_NAMESPACE.toIri(ENDPOINT_PROPERTY_NAME_PROPERTY_TERM))).isEqualTo("foo"); + assertThat(jv.asJsonObject().getString(DSP_NAMESPACE.toIri(ENDPOINT_PROPERTY_VALUE_PROPERTY_TERM))).isEqualTo("bar"); }) .anySatisfy(jv -> { - assertThat(jv.asJsonObject().getString(namespace.toIri(ENDPOINT_PROPERTY_NAME_PROPERTY_TERM))).isEqualTo("endpoint"); - assertThat(jv.asJsonObject().getString(namespace.toIri(ENDPOINT_PROPERTY_VALUE_PROPERTY_TERM))).isEqualTo("https://example.com"); + assertThat(jv.asJsonObject().getString(DSP_NAMESPACE.toIri(ENDPOINT_PROPERTY_NAME_PROPERTY_TERM))).isEqualTo("endpoint"); + assertThat(jv.asJsonObject().getString(DSP_NAMESPACE.toIri(ENDPOINT_PROPERTY_VALUE_PROPERTY_TERM))).isEqualTo("https://example.com"); }); } @@ -92,10 +88,10 @@ void transform_withComplexProperty() { var jsonObject = transformer.transform(dataAddress, context); assertThat(jsonObject).isNotNull(); - assertThat(jsonObject.getJsonArray(namespace.toIri(ENDPOINT_PROPERTIES_PROPERTY_TERM))) + assertThat(jsonObject.getJsonArray(DSP_NAMESPACE.toIri(ENDPOINT_PROPERTIES_PROPERTY_TERM))) .anySatisfy(jv -> { - assertThat(jv.asJsonObject().getString(namespace.toIri(ENDPOINT_PROPERTY_NAME_PROPERTY_TERM))).isEqualTo("foo"); - assertThat(jv.asJsonObject().getJsonObject(namespace.toIri(ENDPOINT_PROPERTY_VALUE_PROPERTY_TERM))) + assertThat(jv.asJsonObject().getString(DSP_NAMESPACE.toIri(ENDPOINT_PROPERTY_NAME_PROPERTY_TERM))).isEqualTo("foo"); + assertThat(jv.asJsonObject().getJsonObject(DSP_NAMESPACE.toIri(ENDPOINT_PROPERTY_VALUE_PROPERTY_TERM))) .containsKey("complexObj"); }); } diff --git a/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-http-api-2024/build.gradle.kts b/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-http-api-2024/build.gradle.kts index 734e995494b..ae12bac9665 100644 --- a/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-http-api-2024/build.gradle.kts +++ b/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-http-api-2024/build.gradle.kts @@ -19,6 +19,7 @@ plugins { dependencies { api(project(":data-protocols:dsp:dsp-spi")) + api(project(":data-protocols:dsp:dsp-2024:dsp-spi-2024")) api(project(":data-protocols:dsp:dsp-http-spi")) api(project(":spi:common:core-spi")) api(project(":spi:common:web-spi")) diff --git a/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-http-api-2024/src/main/java/org/eclipse/edc/protocol/dsp/catalog/http/api/DspCatalogApiV2024Extension.java b/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-http-api-2024/src/main/java/org/eclipse/edc/protocol/dsp/catalog/http/api/DspCatalogApiV2024Extension.java index e4f367b0655..34a3b0b7200 100644 --- a/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-http-api-2024/src/main/java/org/eclipse/edc/protocol/dsp/catalog/http/api/DspCatalogApiV2024Extension.java +++ b/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-http-api-2024/src/main/java/org/eclipse/edc/protocol/dsp/catalog/http/api/DspCatalogApiV2024Extension.java @@ -40,12 +40,12 @@ import org.eclipse.edc.web.spi.WebService; import org.eclipse.edc.web.spi.configuration.ApiContext; -import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DATASPACE_PROTOCOL_HTTP_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_NAMESPACE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_SCOPE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_TRANSFORMER_CONTEXT_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.V_2024_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_REQUEST_MESSAGE_TERM; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_SCOPE_V_2024_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_TRANSFORMER_CONTEXT_V_2024_1; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2024_1; import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD; /** diff --git a/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-http-api-2024/src/main/java/org/eclipse/edc/protocol/dsp/catalog/http/api/controller/DspCatalogApiController20241.java b/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-http-api-2024/src/main/java/org/eclipse/edc/protocol/dsp/catalog/http/api/controller/DspCatalogApiController20241.java index 2d5426429a1..a2e56b80371 100644 --- a/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-http-api-2024/src/main/java/org/eclipse/edc/protocol/dsp/catalog/http/api/controller/DspCatalogApiController20241.java +++ b/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-http-api-2024/src/main/java/org/eclipse/edc/protocol/dsp/catalog/http/api/controller/DspCatalogApiController20241.java @@ -23,15 +23,15 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.eclipse.edc.protocol.dsp.catalog.http.api.CatalogApiPaths.BASE_PATH; -import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP_V_2024_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2024_1_PATH; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DATASPACE_PROTOCOL_HTTP_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_NAMESPACE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.V_2024_1_PATH; /** * Versioned Catalog endpoint for 2024/1 protocol version */ -@Consumes({ APPLICATION_JSON }) -@Produces({ APPLICATION_JSON }) +@Consumes({APPLICATION_JSON}) +@Produces({APPLICATION_JSON}) @Path(V_2024_1_PATH + BASE_PATH) public class DspCatalogApiController20241 extends BaseDspCatalogApiController { diff --git a/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-http-api-2024/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/DspCatalogApiV2024ExtensionTest.java b/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-http-api-2024/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/DspCatalogApiV2024ExtensionTest.java index ef658c76c59..eaa7a1abee4 100644 --- a/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-http-api-2024/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/DspCatalogApiV2024ExtensionTest.java +++ b/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-http-api-2024/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/DspCatalogApiV2024ExtensionTest.java @@ -24,9 +24,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_NAMESPACE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.V_2024_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_REQUEST_MESSAGE_TERM; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2024_1; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -59,7 +59,7 @@ void shouldRegisterMessageValidator(DspCatalogApiV2024Extension extension, Servi @Test void shouldRegisterDspVersion(DspCatalogApiV2024Extension extension, ServiceExtensionContext context) { extension.initialize(context); - + verify(versionRegistry).register(V_2024_1); } } diff --git a/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-http-api-2024/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/controller/DspCatalogApiController20241Test.java b/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-http-api-2024/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/controller/DspCatalogApiController20241Test.java index 10bd97fffb3..d1abded9e6f 100644 --- a/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-http-api-2024/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/controller/DspCatalogApiController20241Test.java +++ b/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-http-api-2024/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/controller/DspCatalogApiController20241Test.java @@ -18,22 +18,22 @@ import org.eclipse.edc.junit.annotations.ApiTest; import static org.eclipse.edc.protocol.dsp.catalog.http.api.CatalogApiPaths.BASE_PATH; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2024_1_PATH; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_NAMESPACE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.V_2024_1_PATH; @ApiTest class DspCatalogApiController20241Test extends DspCatalogApiControllerTestBase { - + @Override protected String basePath() { return V_2024_1_PATH + BASE_PATH; } - + @Override protected JsonLdNamespace namespace() { return DSP_NAMESPACE_V_2024_1; } - + @Override protected Object controller() { return new DspCatalogApiController20241(service, dspRequestHandler, continuationTokenManager); diff --git a/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-transform-2024/build.gradle.kts b/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-transform-2024/build.gradle.kts index 3da06ca72ff..cfdadcec24d 100644 --- a/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-transform-2024/build.gradle.kts +++ b/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-transform-2024/build.gradle.kts @@ -18,7 +18,8 @@ plugins { dependencies { api(project(":spi:common:core-spi")) - + api(project(":data-protocols:dsp:dsp-2024:dsp-spi-2024")) + implementation(project(":core:common:lib:transform-lib")) implementation(project(":data-protocols:dsp:dsp-lib:dsp-catalog-lib:dsp-catalog-transform-lib")) } diff --git a/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-transform-2024/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/DspCatalogTransformV2024Extension.java b/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-transform-2024/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/DspCatalogTransformV2024Extension.java index d0861d78647..d64f7aaeecf 100644 --- a/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-transform-2024/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/DspCatalogTransformV2024Extension.java +++ b/data-protocols/dsp/dsp-2024/dsp-catalog-2024/dsp-catalog-transform-2024/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/DspCatalogTransformV2024Extension.java @@ -32,8 +32,8 @@ import java.util.Map; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_TRANSFORMER_CONTEXT_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_NAMESPACE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_TRANSFORMER_CONTEXT_V_2024_1; import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD; /** @@ -69,7 +69,7 @@ private void registerTransformers() { var dspApiTransformerRegistry = registry.forContext(DSP_TRANSFORMER_CONTEXT_V_2024_1); dspApiTransformerRegistry.register(new JsonObjectFromCatalogRequestMessageTransformer(jsonFactory, DSP_NAMESPACE_V_2024_1)); dspApiTransformerRegistry.register(new JsonObjectToCatalogRequestMessageTransformer(DSP_NAMESPACE_V_2024_1)); - + dspApiTransformerRegistry.register(new JsonObjectFromCatalogV2024Transformer(jsonFactory, typeManager, JSON_LD, participantIdMapper, DSP_NAMESPACE_V_2024_1)); dspApiTransformerRegistry.register(new JsonObjectFromDatasetTransformer(jsonFactory, typeManager, JSON_LD)); dspApiTransformerRegistry.register(new JsonObjectFromDistributionTransformer(jsonFactory)); diff --git a/data-protocols/dsp/dsp-2024/dsp-http-api-configuration-2024/build.gradle.kts b/data-protocols/dsp/dsp-2024/dsp-http-api-configuration-2024/build.gradle.kts index f193ff8e883..5bf25f198d0 100644 --- a/data-protocols/dsp/dsp-2024/dsp-http-api-configuration-2024/build.gradle.kts +++ b/data-protocols/dsp/dsp-2024/dsp-http-api-configuration-2024/build.gradle.kts @@ -20,6 +20,7 @@ dependencies { api(project(":spi:control-plane:catalog-spi")) api(project(":spi:common:core-spi")) api(project(":data-protocols:dsp:dsp-spi")) + api(project(":data-protocols:dsp:dsp-2024:dsp-spi-2024")) api(project(":data-protocols:dsp:dsp-http-spi")) implementation(project(":core:common:lib:transform-lib")) diff --git a/data-protocols/dsp/dsp-2024/dsp-http-api-configuration-2024/src/main/java/org/eclipse/edc/protocol/dsp/http/api/configuration/DspApiConfigurationV2024Extension.java b/data-protocols/dsp/dsp-2024/dsp-http-api-configuration-2024/src/main/java/org/eclipse/edc/protocol/dsp/http/api/configuration/DspApiConfigurationV2024Extension.java index 676a42b8f7f..72342d847b4 100644 --- a/data-protocols/dsp/dsp-2024/dsp-http-api-configuration-2024/src/main/java/org/eclipse/edc/protocol/dsp/http/api/configuration/DspApiConfigurationV2024Extension.java +++ b/data-protocols/dsp/dsp-2024/dsp-http-api-configuration-2024/src/main/java/org/eclipse/edc/protocol/dsp/http/api/configuration/DspApiConfigurationV2024Extension.java @@ -49,11 +49,11 @@ import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_PREFIX; import static org.eclipse.edc.policy.model.OdrlNamespace.ODRL_PREFIX; import static org.eclipse.edc.policy.model.OdrlNamespace.ODRL_SCHEMA; -import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP_V_2024_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_SCOPE_V_2024_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_TRANSFORMER_CONTEXT_V_2024_1; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2024_1_PATH; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DATASPACE_PROTOCOL_HTTP_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_NAMESPACE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_SCOPE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_TRANSFORMER_CONTEXT_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.V_2024_1_PATH; import static org.eclipse.edc.spi.constants.CoreConstants.EDC_NAMESPACE; import static org.eclipse.edc.spi.constants.CoreConstants.EDC_PREFIX; import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD; @@ -129,6 +129,6 @@ private void registerTransformers() { dspApiTransformerRegistry.register(new JsonObjectToDataAddressDspaceTransformer(DSP_NAMESPACE_V_2024_1)); dspApiTransformerRegistry.register(new JsonObjectFromPolicyTransformer(jsonBuilderFactory, participantIdMapper, new JsonObjectFromPolicyTransformer.TransformerConfig(true, false))); - dspApiTransformerRegistry.register(new JsonObjectFromDataAddressDspace2024Transformer(jsonBuilderFactory, typeManager, JSON_LD)); + dspApiTransformerRegistry.register(new JsonObjectFromDataAddressDspace2024Transformer(jsonBuilderFactory, typeManager, JSON_LD, DSP_NAMESPACE_V_2024_1)); } } diff --git a/data-protocols/dsp/dsp-2024/dsp-http-api-configuration-2024/src/test/java/org/eclipse/edc/protocol/dsp/http/api/configuration/DspApiConfigurationV2024ExtensionTest.java b/data-protocols/dsp/dsp-2024/dsp-http-api-configuration-2024/src/test/java/org/eclipse/edc/protocol/dsp/http/api/configuration/DspApiConfigurationV2024ExtensionTest.java index 1b026df9251..3ee580702a5 100644 --- a/data-protocols/dsp/dsp-2024/dsp-http-api-configuration-2024/src/test/java/org/eclipse/edc/protocol/dsp/http/api/configuration/DspApiConfigurationV2024ExtensionTest.java +++ b/data-protocols/dsp/dsp-2024/dsp-http-api-configuration-2024/src/test/java/org/eclipse/edc/protocol/dsp/http/api/configuration/DspApiConfigurationV2024ExtensionTest.java @@ -36,9 +36,9 @@ import static org.eclipse.edc.jsonld.spi.Namespaces.DCT_SCHEMA; import static org.eclipse.edc.policy.model.OdrlNamespace.ODRL_PREFIX; import static org.eclipse.edc.policy.model.OdrlNamespace.ODRL_SCHEMA; -import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP_V_2024_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_SCOPE_V_2024_1; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2024_1_PATH; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DATASPACE_PROTOCOL_HTTP_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_SCOPE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.V_2024_1_PATH; import static org.eclipse.edc.spi.constants.CoreConstants.EDC_NAMESPACE; import static org.eclipse.edc.spi.constants.CoreConstants.EDC_PREFIX; import static org.mockito.ArgumentMatchers.any; @@ -50,9 +50,9 @@ @ExtendWith(DependencyInjectionExtension.class) class DspApiConfigurationV2024ExtensionTest { - + private final String webhookUrl = "http://webhook"; - + private final TypeManager typeManager = mock(); private final JsonLd jsonLd = mock(); private final ProtocolWebhookRegistry protocolWebhookRegistry = mock(); @@ -75,7 +75,7 @@ void shouldUseInjectedBaseWebhook(DspApiConfigurationV2024Extension extension, S when(context.getConfig()).thenReturn(ConfigFactory.empty()); extension.initialize(context); - + verify(protocolWebhookRegistry).registerWebhook(eq(DATASPACE_PROTOCOL_HTTP_V_2024_1), argThat(webhook -> webhook.url().equals(webhookUrl + V_2024_1_PATH))); } @@ -87,10 +87,10 @@ void shouldRegisterCorrectProtocolWebhooks_whenWellKnownPathsEnabled(ServiceExte var extension = factory.constructInstance(DspApiConfigurationV2024Extension.class); extension.initialize(context); - + verify(protocolWebhookRegistry).registerWebhook(eq(DATASPACE_PROTOCOL_HTTP_V_2024_1), argThat(webhook -> webhook.url().equals(webhookUrl))); } - + @Test void initialize_shouldRegisterNamespaces(DspApiConfigurationV2024Extension extension, ServiceExtensionContext context) { extension.initialize(context); diff --git a/data-protocols/dsp/dsp-2024/dsp-http-dispatcher-2024/build.gradle.kts b/data-protocols/dsp/dsp-2024/dsp-http-dispatcher-2024/build.gradle.kts index 2cfadbb2afa..56e9de58bdd 100644 --- a/data-protocols/dsp/dsp-2024/dsp-http-dispatcher-2024/build.gradle.kts +++ b/data-protocols/dsp/dsp-2024/dsp-http-dispatcher-2024/build.gradle.kts @@ -18,5 +18,6 @@ plugins { dependencies { api(project(":spi:common:core-spi")) + api(project(":data-protocols:dsp:dsp-2024:dsp-spi-2024")) api(project(":data-protocols:dsp:dsp-http-spi")) } diff --git a/data-protocols/dsp/dsp-2024/dsp-http-dispatcher-2024/src/main/java/org/eclipse/edc/protocol/dsp/http/dispatcher/DspHttpDispatcherV2024Extension.java b/data-protocols/dsp/dsp-2024/dsp-http-dispatcher-2024/src/main/java/org/eclipse/edc/protocol/dsp/http/dispatcher/DspHttpDispatcherV2024Extension.java index be32e9b3ce8..2f8cf639d7f 100644 --- a/data-protocols/dsp/dsp-2024/dsp-http-dispatcher-2024/src/main/java/org/eclipse/edc/protocol/dsp/http/dispatcher/DspHttpDispatcherV2024Extension.java +++ b/data-protocols/dsp/dsp-2024/dsp-http-dispatcher-2024/src/main/java/org/eclipse/edc/protocol/dsp/http/dispatcher/DspHttpDispatcherV2024Extension.java @@ -20,18 +20,18 @@ import org.eclipse.edc.spi.system.ServiceExtension; import org.eclipse.edc.spi.system.ServiceExtensionContext; -import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DATASPACE_PROTOCOL_HTTP_V_2024_1; /** * Registers the message dispatcher for DSP v2024/1. */ public class DspHttpDispatcherV2024Extension implements ServiceExtension { - + @Inject private RemoteMessageDispatcherRegistry dispatcherRegistry; @Inject private DspHttpRemoteMessageDispatcher dispatcher; - + @Override public void initialize(ServiceExtensionContext context) { dispatcherRegistry.register(DATASPACE_PROTOCOL_HTTP_V_2024_1, dispatcher); diff --git a/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-http-api-2024/build.gradle.kts b/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-http-api-2024/build.gradle.kts index 0d0fc204b2d..b3b5f80715c 100644 --- a/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-http-api-2024/build.gradle.kts +++ b/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-http-api-2024/build.gradle.kts @@ -19,6 +19,7 @@ plugins { dependencies { api(project(":data-protocols:dsp:dsp-spi")) + api(project(":data-protocols:dsp:dsp-2024:dsp-spi-2024")) api(project(":data-protocols:dsp:dsp-http-spi")) api(project(":spi:common:core-spi")) api(project(":spi:common:web-spi")) diff --git a/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-http-api-2024/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/DspNegotiationApiV2024Extension.java b/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-http-api-2024/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/DspNegotiationApiV2024Extension.java index 401490dbc1c..c4a24033ffc 100644 --- a/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-http-api-2024/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/DspNegotiationApiV2024Extension.java +++ b/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-http-api-2024/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/DspNegotiationApiV2024Extension.java @@ -36,15 +36,15 @@ import org.eclipse.edc.web.spi.WebService; import org.eclipse.edc.web.spi.configuration.ApiContext; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_SCOPE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_NAMESPACE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_SCOPE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.V_2024_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_TERM; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2024_1; import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD; /** @@ -80,7 +80,7 @@ public String name() { @Override public void initialize(ServiceExtensionContext context) { registerValidators(); - + webService.registerResource(ApiContext.PROTOCOL, new DspNegotiationApiController20241(protocolService, dspRequestHandler)); webService.registerDynamicResource(ApiContext.PROTOCOL, DspNegotiationApiController20241.class, new JerseyJsonLdInterceptor(jsonLd, typeManager, JSON_LD, DSP_SCOPE_V_2024_1)); diff --git a/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-http-api-2024/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/controller/DspNegotiationApiController20241.java b/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-http-api-2024/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/controller/DspNegotiationApiController20241.java index fbf075d32b0..0217c43d8e6 100644 --- a/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-http-api-2024/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/controller/DspNegotiationApiController20241.java +++ b/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-http-api-2024/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/controller/DspNegotiationApiController20241.java @@ -20,18 +20,18 @@ import jakarta.ws.rs.core.MediaType; import org.eclipse.edc.connector.controlplane.services.spi.contractnegotiation.ContractNegotiationProtocolService; import org.eclipse.edc.protocol.dsp.http.spi.message.DspRequestHandler; -import org.eclipse.edc.protocol.dsp.spi.version.DspVersions; -import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP_V_2024_1; import static org.eclipse.edc.protocol.dsp.negotiation.http.api.NegotiationApiPaths.BASE_PATH; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DATASPACE_PROTOCOL_HTTP_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_NAMESPACE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.V_2024_1_PATH; /** * Versioned Negotiation endpoint for 2024/1 protocol version */ -@Consumes({ MediaType.APPLICATION_JSON }) -@Produces({ MediaType.APPLICATION_JSON }) -@Path(DspVersions.V_2024_1_PATH + BASE_PATH) +@Consumes({MediaType.APPLICATION_JSON}) +@Produces({MediaType.APPLICATION_JSON}) +@Path(V_2024_1_PATH + BASE_PATH) public class DspNegotiationApiController20241 extends BaseDspNegotiationApiController { public DspNegotiationApiController20241(ContractNegotiationProtocolService protocolService, DspRequestHandler dspRequestHandler) { diff --git a/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-http-api-2024/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/DspNegotiationApiV2024ExtensionTest.java b/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-http-api-2024/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/DspNegotiationApiV2024ExtensionTest.java index 4acba08aefa..4122af64aea 100644 --- a/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-http-api-2024/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/DspNegotiationApiV2024ExtensionTest.java +++ b/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-http-api-2024/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/DspNegotiationApiV2024ExtensionTest.java @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_NAMESPACE_V_2024_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_TERM; diff --git a/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-http-api-2024/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/controller/DspNegotiationApiController20241Test.java b/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-http-api-2024/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/controller/DspNegotiationApiController20241Test.java index e494b72f0c4..518fa6a04c0 100644 --- a/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-http-api-2024/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/controller/DspNegotiationApiController20241Test.java +++ b/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-http-api-2024/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/controller/DspNegotiationApiController20241Test.java @@ -18,22 +18,22 @@ import org.eclipse.edc.junit.annotations.ApiTest; import static org.eclipse.edc.protocol.dsp.negotiation.http.api.NegotiationApiPaths.BASE_PATH; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2024_1_PATH; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_NAMESPACE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.V_2024_1_PATH; @ApiTest class DspNegotiationApiController20241Test extends DspNegotiationApiControllerTestBase { - + @Override protected String basePath() { return V_2024_1_PATH + BASE_PATH; } - + @Override protected JsonLdNamespace namespace() { return DSP_NAMESPACE_V_2024_1; } - + @Override protected Object controller() { return new DspNegotiationApiController20241(protocolService, dspRequestHandler); diff --git a/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-transform-2024/build.gradle.kts b/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-transform-2024/build.gradle.kts index f155ba46028..72ed1af8ff1 100644 --- a/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-transform-2024/build.gradle.kts +++ b/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-transform-2024/build.gradle.kts @@ -19,6 +19,7 @@ plugins { dependencies { api(project(":spi:common:core-spi")) api(project(":spi:common:transform-spi")) + api(project(":data-protocols:dsp:dsp-2024:dsp-spi-2024")) implementation(project(":data-protocols:dsp:dsp-lib:dsp-negotiation-lib:dsp-negotiation-transform-lib")) } diff --git a/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-transform-2024/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/DspNegotiationTransformV2024Extension.java b/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-transform-2024/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/DspNegotiationTransformV2024Extension.java index 9ad36c9f208..bd84407695a 100644 --- a/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-transform-2024/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/DspNegotiationTransformV2024Extension.java +++ b/data-protocols/dsp/dsp-2024/dsp-negotiation-2024/dsp-negotiation-transform-2024/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/DspNegotiationTransformV2024Extension.java @@ -38,8 +38,8 @@ import java.util.Map; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_TRANSFORMER_CONTEXT_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_NAMESPACE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_TRANSFORMER_CONTEXT_V_2024_1; /** * Provides the transformers for DSP v2024/1 negotiation message types via the {@link TypeTransformerRegistry}. @@ -75,13 +75,13 @@ private void registerTransformers() { dspApiTransformerRegistry.register(new JsonObjectToContractNegotiationTerminationMessageTransformer(DSP_NAMESPACE_V_2024_1)); dspApiTransformerRegistry.register(new JsonObjectToContractOfferMessageTransformer(DSP_NAMESPACE_V_2024_1)); dspApiTransformerRegistry.register(new JsonObjectToContractNegotiationAckTransformer(DSP_NAMESPACE_V_2024_1)); - - dspApiTransformerRegistry.register(new JsonObjectFromContractNegotiationV2024Transformer(builderFactory)); - dspApiTransformerRegistry.register(new JsonObjectFromContractRequestMessageV2024Transformer(builderFactory)); - dspApiTransformerRegistry.register(new JsonObjectFromContractOfferMessageV2024Transformer(builderFactory)); - dspApiTransformerRegistry.register(new JsonObjectFromContractAgreementMessageV2024Transformer(builderFactory)); - dspApiTransformerRegistry.register(new JsonObjectFromContractAgreementVerificationMessageV2024Transformer(builderFactory)); - dspApiTransformerRegistry.register(new JsonObjectFromContractNegotiationEventMessageV2024Transformer(builderFactory)); - dspApiTransformerRegistry.register(new JsonObjectFromContractNegotiationTerminationMessageV2024Transformer(builderFactory)); + + dspApiTransformerRegistry.register(new JsonObjectFromContractNegotiationV2024Transformer(builderFactory, DSP_NAMESPACE_V_2024_1)); + dspApiTransformerRegistry.register(new JsonObjectFromContractRequestMessageV2024Transformer(builderFactory, DSP_NAMESPACE_V_2024_1)); + dspApiTransformerRegistry.register(new JsonObjectFromContractOfferMessageV2024Transformer(builderFactory, DSP_NAMESPACE_V_2024_1)); + dspApiTransformerRegistry.register(new JsonObjectFromContractAgreementMessageV2024Transformer(builderFactory, DSP_NAMESPACE_V_2024_1)); + dspApiTransformerRegistry.register(new JsonObjectFromContractAgreementVerificationMessageV2024Transformer(builderFactory, DSP_NAMESPACE_V_2024_1)); + dspApiTransformerRegistry.register(new JsonObjectFromContractNegotiationEventMessageV2024Transformer(builderFactory, DSP_NAMESPACE_V_2024_1)); + dspApiTransformerRegistry.register(new JsonObjectFromContractNegotiationTerminationMessageV2024Transformer(builderFactory, DSP_NAMESPACE_V_2024_1)); } } \ No newline at end of file diff --git a/data-protocols/dsp/dsp-2024/dsp-spi-2024/build.gradle.kts b/data-protocols/dsp/dsp-2024/dsp-spi-2024/build.gradle.kts new file mode 100644 index 00000000000..03a26569fed --- /dev/null +++ b/data-protocols/dsp/dsp-2024/dsp-spi-2024/build.gradle.kts @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2025 Metaform Systems, Inc. + * + * 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: + * Metaform Systems, Inc. - initial API and implementation + * + */ + +plugins { + `java-library` +} + +dependencies { + api(project(":data-protocols:dsp:dsp-spi")) + api(project(":data-protocols:dsp:dsp-http-spi")) + implementation(project(":extensions:common:json-ld")) +} \ No newline at end of file diff --git a/data-protocols/dsp/dsp-2024/dsp-spi-2024/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/Dsp2024Constants.java b/data-protocols/dsp/dsp-2024/dsp-spi-2024/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/Dsp2024Constants.java new file mode 100644 index 00000000000..34933758693 --- /dev/null +++ b/data-protocols/dsp/dsp-2024/dsp-spi-2024/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/Dsp2024Constants.java @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2025 Metaform Systems, Inc. + * + * 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: + * Metaform Systems, Inc. - initial API and implementation + * + */ + +package org.eclipse.edc.protocol.dsp.spi.type; + +import org.eclipse.edc.connector.controlplane.services.spi.protocol.ProtocolVersion; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; + +import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP; +import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP_SEPARATOR; +import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_CONTEXT_SEPARATOR; +import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_SCOPE; +import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_TRANSFORMER_CONTEXT; + +public interface Dsp2024Constants { + + String DSPACE_SCHEMA_2024_1 = "https://w3id.org/dspace/2024/1/"; + + String V_2024_1_VERSION = "2024/1"; + String V_2024_1_PATH = "/" + V_2024_1_VERSION; + + ProtocolVersion V_2024_1 = new ProtocolVersion(V_2024_1_VERSION, V_2024_1_PATH); + + String DSP_SCOPE_V_2024_1 = DSP_SCOPE + DSP_CONTEXT_SEPARATOR + V_2024_1_VERSION; + String DSP_TRANSFORMER_CONTEXT_V_2024_1 = DSP_TRANSFORMER_CONTEXT + DSP_CONTEXT_SEPARATOR + V_2024_1_VERSION; + JsonLdNamespace DSP_NAMESPACE_V_2024_1 = new JsonLdNamespace(DSPACE_SCHEMA_2024_1); + + String DATASPACE_PROTOCOL_HTTP_V_2024_1 = DATASPACE_PROTOCOL_HTTP + DATASPACE_PROTOCOL_HTTP_SEPARATOR + V_2024_1_VERSION; + +} diff --git a/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-http-api-2024/build.gradle.kts b/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-http-api-2024/build.gradle.kts index 6395d31339c..c180afacf4b 100644 --- a/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-http-api-2024/build.gradle.kts +++ b/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-http-api-2024/build.gradle.kts @@ -22,6 +22,7 @@ dependencies { api(project(":spi:control-plane:transfer-spi")) api(project(":spi:control-plane:control-plane-spi")) api(project(":data-protocols:dsp:dsp-spi")) + api(project(":data-protocols:dsp:dsp-2024:dsp-spi-2024")) api(project(":data-protocols:dsp:dsp-http-spi")) implementation(project(":spi:common:json-ld-spi")) diff --git a/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-http-api-2024/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/DspTransferProcessApiV2024Extension.java b/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-http-api-2024/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/DspTransferProcessApiV2024Extension.java index dfd518212a9..19c54d44e4c 100644 --- a/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-http-api-2024/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/DspTransferProcessApiV2024Extension.java +++ b/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-http-api-2024/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/DspTransferProcessApiV2024Extension.java @@ -34,13 +34,13 @@ import org.eclipse.edc.web.spi.WebService; import org.eclipse.edc.web.spi.configuration.ApiContext; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_SCOPE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_NAMESPACE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_SCOPE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.V_2024_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_START_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_TERM; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2024_1; import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD; /** @@ -68,7 +68,7 @@ public class DspTransferProcessApiV2024Extension implements ServiceExtension { @Override public void initialize(ServiceExtensionContext context) { registerValidators(); - + webService.registerResource(ApiContext.PROTOCOL, new DspTransferProcessApiController20241(transferProcessProtocolService, dspRequestHandler)); webService.registerDynamicResource(ApiContext.PROTOCOL, DspTransferProcessApiController20241.class, new JerseyJsonLdInterceptor(jsonLd, typeManager, JSON_LD, DSP_SCOPE_V_2024_1)); diff --git a/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-http-api-2024/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/controller/DspTransferProcessApiController20241.java b/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-http-api-2024/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/controller/DspTransferProcessApiController20241.java index 73fc6b9c04f..210afa78211 100644 --- a/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-http-api-2024/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/controller/DspTransferProcessApiController20241.java +++ b/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-http-api-2024/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/controller/DspTransferProcessApiController20241.java @@ -20,19 +20,19 @@ import jakarta.ws.rs.core.MediaType; import org.eclipse.edc.connector.controlplane.services.spi.transferprocess.TransferProcessProtocolService; import org.eclipse.edc.protocol.dsp.http.spi.message.DspRequestHandler; -import org.eclipse.edc.protocol.dsp.spi.version.DspVersions; -import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP_V_2024_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DATASPACE_PROTOCOL_HTTP_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_NAMESPACE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.V_2024_1_PATH; import static org.eclipse.edc.protocol.dsp.transferprocess.http.api.TransferProcessApiPaths.BASE_PATH; /** * Versioned Transfer endpoint for 2024/1 protocol version */ -@Consumes({ MediaType.APPLICATION_JSON }) -@Produces({ MediaType.APPLICATION_JSON }) -@Path(DspVersions.V_2024_1_PATH + BASE_PATH) +@Consumes({MediaType.APPLICATION_JSON}) +@Produces({MediaType.APPLICATION_JSON}) +@Path(V_2024_1_PATH + BASE_PATH) public class DspTransferProcessApiController20241 extends BaseDspTransferProcessApiController { public DspTransferProcessApiController20241(TransferProcessProtocolService protocolService, DspRequestHandler dspRequestHandler) { diff --git a/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-http-api-2024/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/DspTransferProcessApiV2024ExtensionTest.java b/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-http-api-2024/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/DspTransferProcessApiV2024ExtensionTest.java index 387707b1eb0..2d2feef2241 100644 --- a/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-http-api-2024/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/DspTransferProcessApiV2024ExtensionTest.java +++ b/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-http-api-2024/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/DspTransferProcessApiV2024ExtensionTest.java @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_NAMESPACE_V_2024_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_START_MESSAGE_TERM; diff --git a/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-http-api-2024/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/controller/DspTransferProcessApiController20241Test.java b/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-http-api-2024/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/controller/DspTransferProcessApiController20241Test.java index 0f7a962a5db..308744ef8d6 100644 --- a/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-http-api-2024/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/controller/DspTransferProcessApiController20241Test.java +++ b/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-http-api-2024/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/controller/DspTransferProcessApiController20241Test.java @@ -17,23 +17,23 @@ import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.junit.annotations.ApiTest; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2024_1_PATH; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_NAMESPACE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.V_2024_1_PATH; import static org.eclipse.edc.protocol.dsp.transferprocess.http.api.TransferProcessApiPaths.BASE_PATH; @ApiTest class DspTransferProcessApiController20241Test extends DspTransferProcessApiControllerBaseTest { - + @Override protected String basePath() { return V_2024_1_PATH + BASE_PATH; } - + @Override protected JsonLdNamespace namespace() { return DSP_NAMESPACE_V_2024_1; } - + @Override protected Object controller() { return new DspTransferProcessApiController20241(protocolService, dspRequestHandler); diff --git a/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-transform-2024/build.gradle.kts b/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-transform-2024/build.gradle.kts index 0336d464d7d..59fddaec9f7 100644 --- a/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-transform-2024/build.gradle.kts +++ b/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-transform-2024/build.gradle.kts @@ -21,6 +21,7 @@ dependencies { 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-2024:dsp-spi-2024")) api(project(":data-protocols:dsp:dsp-http-spi")) implementation(project(":core:common:lib:transform-lib")) implementation(project(":data-protocols:dsp:dsp-lib:dsp-transfer-process-lib:dsp-transfer-process-transform-lib")) diff --git a/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-transform-2024/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/DspTransferProcessTransformV2024Extension.java b/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-transform-2024/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/DspTransferProcessTransformV2024Extension.java index 0eb29cc497d..d23a60963cb 100644 --- a/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-transform-2024/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/DspTransferProcessTransformV2024Extension.java +++ b/data-protocols/dsp/dsp-2024/dsp-transfer-process-2024/dsp-transfer-process-transform-2024/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/DspTransferProcessTransformV2024Extension.java @@ -37,8 +37,8 @@ import java.util.Map; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_TRANSFORMER_CONTEXT_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_NAMESPACE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_TRANSFORMER_CONTEXT_V_2024_1; import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD; /** @@ -78,12 +78,12 @@ private void registerTransformers() { dspRegistry.register(new JsonObjectToTransferTerminationMessageTransformer(DSP_NAMESPACE_V_2024_1)); dspRegistry.register(new JsonObjectToTransferProcessAckTransformer(DSP_NAMESPACE_V_2024_1)); dspRegistry.register(new JsonObjectToTransferSuspensionMessageTransformer(typeManager, JSON_LD, DSP_NAMESPACE_V_2024_1)); - - dspRegistry.register(new JsonObjectFromTransferProcessV2024Transformer(builderFactory)); - dspRegistry.register(new JsonObjectFromTransferRequestMessageV2024Transformer(builderFactory)); - dspRegistry.register(new JsonObjectFromTransferStartMessageV2024Transformer(builderFactory)); - dspRegistry.register(new JsonObjectFromTransferCompletionMessageV2024Transformer(builderFactory)); - dspRegistry.register(new JsonObjectFromTransferTerminationMessageV2024Transformer(builderFactory)); - dspRegistry.register(new JsonObjectFromTransferSuspensionMessageV2024Transformer(builderFactory)); + + dspRegistry.register(new JsonObjectFromTransferProcessV2024Transformer(builderFactory, DSP_NAMESPACE_V_2024_1)); + dspRegistry.register(new JsonObjectFromTransferRequestMessageV2024Transformer(builderFactory, DSP_NAMESPACE_V_2024_1)); + dspRegistry.register(new JsonObjectFromTransferStartMessageV2024Transformer(builderFactory, DSP_NAMESPACE_V_2024_1)); + dspRegistry.register(new JsonObjectFromTransferCompletionMessageV2024Transformer(builderFactory, DSP_NAMESPACE_V_2024_1)); + dspRegistry.register(new JsonObjectFromTransferTerminationMessageV2024Transformer(builderFactory, DSP_NAMESPACE_V_2024_1)); + dspRegistry.register(new JsonObjectFromTransferSuspensionMessageV2024Transformer(builderFactory, DSP_NAMESPACE_V_2024_1)); } } \ No newline at end of file diff --git a/data-protocols/dsp/dsp-core/dsp-http-core/src/test/java/org/eclipse/edc/protocol/dsp/http/protocol/DspProtocolParserImplTest.java b/data-protocols/dsp/dsp-core/dsp-http-core/src/test/java/org/eclipse/edc/protocol/dsp/http/protocol/DspProtocolParserImplTest.java index 4c0736c02d4..731ee19bd5e 100644 --- a/data-protocols/dsp/dsp-core/dsp-http-core/src/test/java/org/eclipse/edc/protocol/dsp/http/protocol/DspProtocolParserImplTest.java +++ b/data-protocols/dsp/dsp-core/dsp-http-core/src/test/java/org/eclipse/edc/protocol/dsp/http/protocol/DspProtocolParserImplTest.java @@ -17,7 +17,6 @@ import org.eclipse.edc.connector.controlplane.services.spi.protocol.ProtocolVersion; import org.eclipse.edc.connector.controlplane.services.spi.protocol.ProtocolVersionRegistry; import org.eclipse.edc.connector.controlplane.services.spi.protocol.ProtocolVersions; -import org.eclipse.edc.protocol.dsp.spi.version.DspVersions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -26,13 +25,13 @@ import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat; import static org.eclipse.edc.protocol.dsp.http.TestFixtures.V_MOCK; import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP; -import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP_V_2024_1; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; public class DspProtocolParserImplTest { private static final ProtocolVersion V_MOCK_NEW = new ProtocolVersion("2024/1", "/2024/1"); + private static final String MOCK_PROTOCOL_HTTP = "dataspace-protocol-http:2024/1"; private final ProtocolVersionRegistry protocolVersionRegistry = mock(); private final DspProtocolParserImpl parser = new DspProtocolParserImpl(protocolVersionRegistry); private final ProtocolVersions protocolVersions = new ProtocolVersions(List.of(V_MOCK, V_MOCK_NEW)); @@ -51,8 +50,8 @@ void shouldParseProtocol() { @Test void shouldParseProtocolWithVersion() { - assertThat(parser.parse(DATASPACE_PROTOCOL_HTTP_V_2024_1)).isSucceeded() - .isEqualTo(DspVersions.V_2024_1); + assertThat(parser.parse(MOCK_PROTOCOL_HTTP)).isSucceeded() + .isEqualTo(V_MOCK_NEW); } @Test diff --git a/data-protocols/dsp/dsp-http-spi/src/main/java/org/eclipse/edc/protocol/dsp/http/spi/types/HttpMessageProtocol.java b/data-protocols/dsp/dsp-http-spi/src/main/java/org/eclipse/edc/protocol/dsp/http/spi/types/HttpMessageProtocol.java index 16b4118317d..c63c3997f72 100644 --- a/data-protocols/dsp/dsp-http-spi/src/main/java/org/eclipse/edc/protocol/dsp/http/spi/types/HttpMessageProtocol.java +++ b/data-protocols/dsp/dsp-http-spi/src/main/java/org/eclipse/edc/protocol/dsp/http/spi/types/HttpMessageProtocol.java @@ -24,7 +24,6 @@ public class HttpMessageProtocol { // When not explicit the default will be v0.8 for backward compatibility public static final String DATASPACE_PROTOCOL_HTTP = "dataspace-protocol-http"; public static final String DATASPACE_PROTOCOL_HTTP_SEPARATOR = ":"; - public static final String DATASPACE_PROTOCOL_HTTP_V_2024_1 = DATASPACE_PROTOCOL_HTTP + DATASPACE_PROTOCOL_HTTP_SEPARATOR + DspVersions.V_2024_1_VERSION; public static final String DATASPACE_PROTOCOL_HTTP_V_2025_1 = DATASPACE_PROTOCOL_HTTP + DATASPACE_PROTOCOL_HTTP_SEPARATOR + DspVersions.V_2025_1_VERSION; } \ No newline at end of file diff --git a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/v2024/from/JsonObjectFromCatalogV2024Transformer.java b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/v2024/from/JsonObjectFromCatalogV2024Transformer.java index 2720ba3e3da..b314b25ce5e 100644 --- a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/v2024/from/JsonObjectFromCatalogV2024Transformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/v2024/from/JsonObjectFromCatalogV2024Transformer.java @@ -39,7 +39,6 @@ import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_DATA_SERVICE_ATTRIBUTE; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_DISTRIBUTION_ATTRIBUTE; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DSPACE_PROPERTY_PARTICIPANT_ID_TERM; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; /** * Converts from a {@link Catalog} to a DCAT catalog as a {@link JsonObject} in JSON-LD expanded form. @@ -50,10 +49,6 @@ public class JsonObjectFromCatalogV2024Transformer extends AbstractNamespaceAwar private final String typeContext; private final ParticipantIdMapper participantIdMapper; - public JsonObjectFromCatalogV2024Transformer(JsonBuilderFactory jsonFactory, TypeManager typeManager, String typeContext, ParticipantIdMapper participantIdMapper) { - this(jsonFactory, typeManager, typeContext, participantIdMapper, DSP_NAMESPACE_V_2024_1); - } - public JsonObjectFromCatalogV2024Transformer(JsonBuilderFactory jsonFactory, TypeManager typeManager, String typeContext, ParticipantIdMapper participantIdMapper, JsonLdNamespace namespace) { super(Catalog.class, JsonObject.class, namespace); this.jsonFactory = jsonFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/v2024/from/JsonObjectFromCatalogV2024TransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/v2024/from/JsonObjectFromCatalogV2024TransformerTest.java index 0384cbddfb4..c76f941cdbd 100644 --- a/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/v2024/from/JsonObjectFromCatalogV2024TransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-catalog-lib/dsp-catalog-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/v2024/from/JsonObjectFromCatalogV2024TransformerTest.java @@ -24,6 +24,7 @@ import org.eclipse.edc.connector.controlplane.catalog.spi.DataService; import org.eclipse.edc.connector.controlplane.catalog.spi.Dataset; import org.eclipse.edc.connector.controlplane.catalog.spi.Distribution; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; import org.eclipse.edc.participant.spi.ParticipantIdMapper; import org.eclipse.edc.policy.model.Policy; import org.eclipse.edc.spi.types.TypeManager; @@ -42,7 +43,6 @@ import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_DATASET_ATTRIBUTE; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_DATA_SERVICE_ATTRIBUTE; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DSPACE_PROPERTY_PARTICIPANT_ID_TERM; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; @@ -55,6 +55,7 @@ class JsonObjectFromCatalogV2024TransformerTest { private static final String CATALOG_PROPERTY = "catalog:prop:key"; + private static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); private final JsonBuilderFactory jsonFactory = Json.createBuilderFactory(Map.of()); private final ObjectMapper mapper = mock(); @@ -62,7 +63,7 @@ class JsonObjectFromCatalogV2024TransformerTest { private final ParticipantIdMapper participantIdMapper = mock(); private final TypeManager typeManager = mock(); - private final JsonObjectFromCatalogV2024Transformer transformer = new JsonObjectFromCatalogV2024Transformer(jsonFactory, typeManager, "test", participantIdMapper); + private final JsonObjectFromCatalogV2024Transformer transformer = new JsonObjectFromCatalogV2024Transformer(jsonFactory, typeManager, "test", participantIdMapper, DSP_NAMESPACE); private JsonObject datasetJson; private JsonObject catalogJson; @@ -104,7 +105,7 @@ void transform_returnJsonObject() { .isInstanceOf(JsonArray.class) .matches(v -> v.asJsonArray().size() == 1) .matches(v -> v.asJsonArray().get(0).equals(dataServiceJson)); - assertThat(result.getJsonObject(DSP_NAMESPACE_V_2024_1.toIri(DSPACE_PROPERTY_PARTICIPANT_ID_TERM)).getString(ID)).isEqualTo("urn:namespace:participantId"); + assertThat(result.getJsonObject(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PARTICIPANT_ID_TERM)).getString(ID)).isEqualTo("urn:namespace:participantId"); assertThat(result.get(CATALOG_PROPERTY)).isNotNull(); verify(context, times(1)).transform(catalog.getDatasets().get(0), JsonObject.class); @@ -139,7 +140,7 @@ void transform_SubCatalogs_returnJsonObject() { .isInstanceOf(JsonArray.class) .matches(v -> v.asJsonArray().size() == 1) .matches(v -> v.asJsonArray().get(0).equals(dataServiceJson)); - assertThat(result.getJsonObject(DSP_NAMESPACE_V_2024_1.toIri(DSPACE_PROPERTY_PARTICIPANT_ID_TERM)).getString(ID)).isEqualTo("urn:namespace:participantId"); + assertThat(result.getJsonObject(DSP_NAMESPACE.toIri(DSPACE_PROPERTY_PARTICIPANT_ID_TERM)).getString(ID)).isEqualTo("urn:namespace:participantId"); assertThat(result.get(CATALOG_PROPERTY)).isNotNull(); verify(context, times(1)).transform(catalog.getDatasets().get(0), JsonObject.class); diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractAgreementMessageV2024Transformer.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractAgreementMessageV2024Transformer.java index d6e0f91ffe5..b2f21ae851c 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractAgreementMessageV2024Transformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractAgreementMessageV2024Transformer.java @@ -29,7 +29,6 @@ import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_ASSIGNEE_ATTRIBUTE; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_ASSIGNER_ATTRIBUTE; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_AGREEMENT_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_TIMESTAMP_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_TERM; @@ -45,10 +44,6 @@ public class JsonObjectFromContractAgreementMessageV2024Transformer extends Abst private final JsonBuilderFactory jsonFactory; - public JsonObjectFromContractAgreementMessageV2024Transformer(JsonBuilderFactory jsonFactory) { - this(jsonFactory, DSP_NAMESPACE_V_2024_1); - } - public JsonObjectFromContractAgreementMessageV2024Transformer(JsonBuilderFactory jsonFactory, JsonLdNamespace namespace) { super(ContractAgreementMessage.class, JsonObject.class, namespace); this.jsonFactory = jsonFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractAgreementVerificationMessageV2024Transformer.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractAgreementVerificationMessageV2024Transformer.java index ede020892b2..8e7676258b6 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractAgreementVerificationMessageV2024Transformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractAgreementVerificationMessageV2024Transformer.java @@ -25,7 +25,6 @@ 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.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; @@ -37,10 +36,6 @@ public class JsonObjectFromContractAgreementVerificationMessageV2024Transformer private final JsonBuilderFactory jsonFactory; - public JsonObjectFromContractAgreementVerificationMessageV2024Transformer(JsonBuilderFactory jsonFactory) { - this(jsonFactory, DSP_NAMESPACE_V_2024_1); - } - public JsonObjectFromContractAgreementVerificationMessageV2024Transformer(JsonBuilderFactory jsonFactory, JsonLdNamespace namespace) { super(ContractAgreementVerificationMessage.class, JsonObject.class, namespace); this.jsonFactory = jsonFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractNegotiationEventMessageV2024Transformer.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractNegotiationEventMessageV2024Transformer.java index 4e4ccce87ca..4aec9b61dca 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractNegotiationEventMessageV2024Transformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractNegotiationEventMessageV2024Transformer.java @@ -25,7 +25,6 @@ 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.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_EVENT_TYPE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_EVENT_TYPE_ACCEPTED_TERM; @@ -41,10 +40,6 @@ public class JsonObjectFromContractNegotiationEventMessageV2024Transformer exten private final JsonBuilderFactory jsonFactory; - public JsonObjectFromContractNegotiationEventMessageV2024Transformer(JsonBuilderFactory jsonFactory) { - this(jsonFactory, DSP_NAMESPACE_V_2024_1); - } - public JsonObjectFromContractNegotiationEventMessageV2024Transformer(JsonBuilderFactory jsonFactory, JsonLdNamespace namespace) { super(ContractNegotiationEventMessage.class, JsonObject.class, namespace); this.jsonFactory = jsonFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractNegotiationTerminationMessageV2024Transformer.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractNegotiationTerminationMessageV2024Transformer.java index 4015cfaaa35..d2cdf0db7e9 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractNegotiationTerminationMessageV2024Transformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractNegotiationTerminationMessageV2024Transformer.java @@ -25,7 +25,6 @@ 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.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; @@ -39,10 +38,6 @@ public class JsonObjectFromContractNegotiationTerminationMessageV2024Transformer private final JsonBuilderFactory jsonFactory; - public JsonObjectFromContractNegotiationTerminationMessageV2024Transformer(JsonBuilderFactory jsonFactory) { - this(jsonFactory, DSP_NAMESPACE_V_2024_1); - } - public JsonObjectFromContractNegotiationTerminationMessageV2024Transformer(JsonBuilderFactory jsonFactory, JsonLdNamespace namespace) { super(ContractNegotiationTerminationMessage.class, JsonObject.class, namespace); this.jsonFactory = jsonFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractNegotiationV2024Transformer.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractNegotiationV2024Transformer.java index 386f6d15c73..e4ae412e046 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractNegotiationV2024Transformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractNegotiationV2024Transformer.java @@ -26,7 +26,6 @@ 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.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_ACCEPTED_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_AGREED_TERM; @@ -47,10 +46,6 @@ public class JsonObjectFromContractNegotiationV2024Transformer extends AbstractN private final JsonBuilderFactory jsonFactory; - public JsonObjectFromContractNegotiationV2024Transformer(JsonBuilderFactory jsonFactory) { - this(jsonFactory, DSP_NAMESPACE_V_2024_1); - } - public JsonObjectFromContractNegotiationV2024Transformer(JsonBuilderFactory jsonFactory, JsonLdNamespace namespace) { super(ContractNegotiation.class, JsonObject.class, namespace); this.jsonFactory = jsonFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractOfferMessageV2024Transformer.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractOfferMessageV2024Transformer.java index 2aebc753932..dc920d8cf42 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractOfferMessageV2024Transformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractOfferMessageV2024Transformer.java @@ -26,7 +26,6 @@ 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.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM; @@ -39,11 +38,7 @@ public class JsonObjectFromContractOfferMessageV2024Transformer extends AbstractNamespaceAwareJsonLdTransformer { private final JsonBuilderFactory jsonFactory; - - public JsonObjectFromContractOfferMessageV2024Transformer(JsonBuilderFactory jsonFactory) { - this(jsonFactory, DSP_NAMESPACE_V_2024_1); - } - + public JsonObjectFromContractOfferMessageV2024Transformer(JsonBuilderFactory jsonFactory, JsonLdNamespace namespace) { super(ContractOfferMessage.class, JsonObject.class, namespace); this.jsonFactory = jsonFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractRequestMessageV2024Transformer.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractRequestMessageV2024Transformer.java index 7d09d53a5ae..f0c12f5998f 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractRequestMessageV2024Transformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractRequestMessageV2024Transformer.java @@ -26,7 +26,6 @@ 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.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM; @@ -41,10 +40,6 @@ public class JsonObjectFromContractRequestMessageV2024Transformer extends Abstra private final JsonBuilderFactory jsonFactory; - public JsonObjectFromContractRequestMessageV2024Transformer(JsonBuilderFactory jsonFactory) { - this(jsonFactory, DSP_NAMESPACE_V_2024_1); - } - public JsonObjectFromContractRequestMessageV2024Transformer(JsonBuilderFactory jsonFactory, JsonLdNamespace namespace) { super(ContractRequestMessage.class, JsonObject.class, namespace); this.jsonFactory = jsonFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractAgreementMessageV2024TransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractAgreementMessageV2024TransformerTest.java index 1bfbffbffe7..202ca94ad2a 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractAgreementMessageV2024TransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractAgreementMessageV2024TransformerTest.java @@ -37,6 +37,7 @@ import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_ASSIGNEE_ATTRIBUTE; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_ASSIGNER_ATTRIBUTE; +import static org.eclipse.edc.protocol.dsp.negotiation.transform.v2024.from.TestFunction2024.DSP_NAMESPACE; import static org.eclipse.edc.protocol.dsp.negotiation.transform.v2024.from.TestFunction2024.toIri; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_AGREEMENT_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_TIMESTAMP_TERM; @@ -61,9 +62,8 @@ class JsonObjectFromContractAgreementMessageV2024TransformerTest { private static final String DSP = "dsp"; private final JsonBuilderFactory jsonFactory = Json.createBuilderFactory(Map.of()); private final TransformerContext context = mock(); - private final JsonObjectFromContractAgreementMessageV2024Transformer transformer = - new JsonObjectFromContractAgreementMessageV2024Transformer(jsonFactory); + new JsonObjectFromContractAgreementMessageV2024Transformer(jsonFactory, DSP_NAMESPACE); @BeforeEach void setUp() { diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractAgreementVerificationMessageV2024TransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractAgreementVerificationMessageV2024TransformerTest.java index 8579c3f0059..7e668113289 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractAgreementVerificationMessageV2024TransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractAgreementVerificationMessageV2024TransformerTest.java @@ -25,6 +25,7 @@ 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.v2024.from.TestFunction2024.DSP_NAMESPACE; import static org.eclipse.edc.protocol.dsp.negotiation.transform.v2024.from.TestFunction2024.toIri; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; @@ -40,7 +41,7 @@ class JsonObjectFromContractAgreementVerificationMessageV2024TransformerTest { private final TransformerContext context = mock(); private final JsonObjectFromContractAgreementVerificationMessageV2024Transformer transformer = - new JsonObjectFromContractAgreementVerificationMessageV2024Transformer(jsonFactory); + new JsonObjectFromContractAgreementVerificationMessageV2024Transformer(jsonFactory, DSP_NAMESPACE); @Test void transform() { diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractNegotiationEventMessageV2024TransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractNegotiationEventMessageV2024TransformerTest.java index e3f197da3ed..cb06a98d26b 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractNegotiationEventMessageV2024TransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractNegotiationEventMessageV2024TransformerTest.java @@ -27,6 +27,7 @@ import static org.eclipse.edc.connector.controlplane.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.v2024.from.TestFunction2024.DSP_NAMESPACE; import static org.eclipse.edc.protocol.dsp.negotiation.transform.v2024.from.TestFunction2024.toIri; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_EVENT_TYPE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_TERM; @@ -45,7 +46,7 @@ class JsonObjectFromContractNegotiationEventMessageV2024TransformerTest { private final TransformerContext context = mock(); private final JsonObjectFromContractNegotiationEventMessageV2024Transformer transformer = - new JsonObjectFromContractNegotiationEventMessageV2024Transformer(jsonFactory); + new JsonObjectFromContractNegotiationEventMessageV2024Transformer(jsonFactory, DSP_NAMESPACE); @Test void transform() { diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractNegotiationTerminationMessageV2024TransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractNegotiationTerminationMessageV2024TransformerTest.java index 0e712c6263f..8f26b6d3bbb 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractNegotiationTerminationMessageV2024TransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractNegotiationTerminationMessageV2024TransformerTest.java @@ -25,6 +25,7 @@ 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.v2024.from.TestFunction2024.DSP_NAMESPACE; import static org.eclipse.edc.protocol.dsp.negotiation.transform.v2024.from.TestFunction2024.toIri; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_TERM; @@ -45,7 +46,7 @@ class JsonObjectFromContractNegotiationTerminationMessageV2024TransformerTest { private final TransformerContext context = mock(); private final JsonObjectFromContractNegotiationTerminationMessageV2024Transformer transformer = - new JsonObjectFromContractNegotiationTerminationMessageV2024Transformer(jsonFactory); + new JsonObjectFromContractNegotiationTerminationMessageV2024Transformer(jsonFactory, DSP_NAMESPACE); @Test void transform() { diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractNegotiationV2024TransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractNegotiationV2024TransformerTest.java index 08602ea7d5e..3aea81aa689 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractNegotiationV2024TransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractNegotiationV2024TransformerTest.java @@ -47,6 +47,7 @@ import static org.eclipse.edc.connector.controlplane.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.v2024.from.TestFunction2024.DSP_NAMESPACE; import static org.eclipse.edc.protocol.dsp.negotiation.transform.v2024.from.TestFunction2024.toIri; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_VALUE_NEGOTIATION_STATE_ACCEPTED_TERM; @@ -74,7 +75,7 @@ class JsonObjectFromContractNegotiationV2024TransformerTest { @BeforeEach void setUp() { - transformer = new JsonObjectFromContractNegotiationV2024Transformer(jsonFactory); + transformer = new JsonObjectFromContractNegotiationV2024Transformer(jsonFactory, DSP_NAMESPACE); } @Test diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractOfferMessageV2024TransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractOfferMessageV2024TransformerTest.java index 59765101532..246f953032f 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractOfferMessageV2024TransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractOfferMessageV2024TransformerTest.java @@ -30,6 +30,7 @@ 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.v2024.from.TestFunction2024.DSP_NAMESPACE; import static org.eclipse.edc.protocol.dsp.negotiation.transform.v2024.from.TestFunction2024.toIri; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_TERM; @@ -59,7 +60,7 @@ class JsonObjectFromContractOfferMessageV2024TransformerTest { @BeforeEach void setUp() { - transformer = new JsonObjectFromContractOfferMessageV2024Transformer(jsonFactory); + transformer = new JsonObjectFromContractOfferMessageV2024Transformer(jsonFactory, DSP_NAMESPACE); } @Test diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractRequestMessageTransformerV2024Test.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractRequestMessageTransformerV2024Test.java index d55a750e5c5..82975cf610e 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractRequestMessageTransformerV2024Test.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/JsonObjectFromContractRequestMessageTransformerV2024Test.java @@ -30,6 +30,7 @@ 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.v2024.from.TestFunction2024.DSP_NAMESPACE; import static org.eclipse.edc.protocol.dsp.negotiation.transform.v2024.from.TestFunction2024.toIri; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_OFFER_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_TERM; @@ -57,7 +58,7 @@ class JsonObjectFromContractRequestMessageTransformerV2024Test { private final TransformerContext context = mock(); private final JsonObjectFromContractRequestMessageV2024Transformer transformer = - new JsonObjectFromContractRequestMessageV2024Transformer(jsonFactory); + new JsonObjectFromContractRequestMessageV2024Transformer(jsonFactory, DSP_NAMESPACE); @BeforeEach void setUp() { diff --git a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/TestFunction2024.java b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/TestFunction2024.java index 5864efd621e..360a94f2529 100644 --- a/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/TestFunction2024.java +++ b/data-protocols/dsp/dsp-lib/dsp-negotiation-lib/dsp-negotiation-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2024/from/TestFunction2024.java @@ -14,11 +14,13 @@ package org.eclipse.edc.protocol.dsp.negotiation.transform.v2024.from; -import org.eclipse.edc.protocol.dsp.spi.type.DspConstants; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; public class TestFunction2024 { + public static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); + public static String toIri(String term) { - return DspConstants.DSP_NAMESPACE_V_2024_1.toIri(term); + return DSP_NAMESPACE.toIri(term); } } diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/v2024/from/JsonObjectFromTransferCompletionMessageV2024Transformer.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/v2024/from/JsonObjectFromTransferCompletionMessageV2024Transformer.java index f1937aa78fb..8021f47e594 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/v2024/from/JsonObjectFromTransferCompletionMessageV2024Transformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/v2024/from/JsonObjectFromTransferCompletionMessageV2024Transformer.java @@ -25,7 +25,6 @@ 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.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_TERM; @@ -35,10 +34,6 @@ public class JsonObjectFromTransferCompletionMessageV2024Transformer extends Abs private final JsonBuilderFactory jsonBuilderFactory; - public JsonObjectFromTransferCompletionMessageV2024Transformer(JsonBuilderFactory jsonBuilderFactory) { - this(jsonBuilderFactory, DSP_NAMESPACE_V_2024_1); - } - public JsonObjectFromTransferCompletionMessageV2024Transformer(JsonBuilderFactory jsonBuilderFactory, JsonLdNamespace namespace) { super(TransferCompletionMessage.class, JsonObject.class, namespace); this.jsonBuilderFactory = jsonBuilderFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/v2024/from/JsonObjectFromTransferProcessV2024Transformer.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/v2024/from/JsonObjectFromTransferProcessV2024Transformer.java index ab5f1d3f99b..7eb9f8d81b7 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/v2024/from/JsonObjectFromTransferProcessV2024Transformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/v2024/from/JsonObjectFromTransferProcessV2024Transformer.java @@ -26,7 +26,6 @@ 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.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_STATE_TERM; @@ -40,11 +39,7 @@ public class JsonObjectFromTransferProcessV2024Transformer extends AbstractNamespaceAwareJsonLdTransformer { private final JsonBuilderFactory jsonBuilderFactory; - - public JsonObjectFromTransferProcessV2024Transformer(JsonBuilderFactory jsonBuilderFactory) { - this(jsonBuilderFactory, DSP_NAMESPACE_V_2024_1); - } - + public JsonObjectFromTransferProcessV2024Transformer(JsonBuilderFactory jsonBuilderFactory, JsonLdNamespace namespace) { super(TransferProcess.class, JsonObject.class, namespace); this.jsonBuilderFactory = jsonBuilderFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/v2024/from/JsonObjectFromTransferRequestMessageV2024Transformer.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/v2024/from/JsonObjectFromTransferRequestMessageV2024Transformer.java index c8a9542068e..2a745f04da1 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/v2024/from/JsonObjectFromTransferRequestMessageV2024Transformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/v2024/from/JsonObjectFromTransferRequestMessageV2024Transformer.java @@ -28,7 +28,6 @@ import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID; 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.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CALLBACK_ADDRESS_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID_TERM; @@ -40,10 +39,6 @@ public class JsonObjectFromTransferRequestMessageV2024Transformer extends Abstra private final JsonBuilderFactory jsonBuilderFactory; - public JsonObjectFromTransferRequestMessageV2024Transformer(JsonBuilderFactory jsonBuilderFactory) { - this(jsonBuilderFactory, DSP_NAMESPACE_V_2024_1); - } - public JsonObjectFromTransferRequestMessageV2024Transformer(JsonBuilderFactory jsonBuilderFactory, JsonLdNamespace namespace) { super(TransferRequestMessage.class, JsonObject.class, namespace); this.jsonBuilderFactory = jsonBuilderFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/v2024/from/JsonObjectFromTransferStartMessageV2024Transformer.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/v2024/from/JsonObjectFromTransferStartMessageV2024Transformer.java index ed1511ed7d2..27ea2cc4186 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/v2024/from/JsonObjectFromTransferStartMessageV2024Transformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/v2024/from/JsonObjectFromTransferStartMessageV2024Transformer.java @@ -25,7 +25,6 @@ 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.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_DATA_ADDRESS_TERM; @@ -35,10 +34,6 @@ public class JsonObjectFromTransferStartMessageV2024Transformer extends Abstract private final JsonBuilderFactory jsonBuilderFactory; - public JsonObjectFromTransferStartMessageV2024Transformer(JsonBuilderFactory jsonBuilderFactory) { - this(jsonBuilderFactory, DSP_NAMESPACE_V_2024_1); - } - public JsonObjectFromTransferStartMessageV2024Transformer(JsonBuilderFactory jsonBuilderFactory, JsonLdNamespace namespace) { super(TransferStartMessage.class, JsonObject.class, namespace); this.jsonBuilderFactory = jsonBuilderFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/v2024/from/JsonObjectFromTransferSuspensionMessageV2024Transformer.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/v2024/from/JsonObjectFromTransferSuspensionMessageV2024Transformer.java index 028ca06c6fc..ea57a99c2f8 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/v2024/from/JsonObjectFromTransferSuspensionMessageV2024Transformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/v2024/from/JsonObjectFromTransferSuspensionMessageV2024Transformer.java @@ -25,7 +25,6 @@ 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.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; @@ -36,10 +35,6 @@ public class JsonObjectFromTransferSuspensionMessageV2024Transformer extends Abs private final JsonBuilderFactory jsonBuilderFactory; - public JsonObjectFromTransferSuspensionMessageV2024Transformer(JsonBuilderFactory jsonBuilderFactory) { - this(jsonBuilderFactory, DSP_NAMESPACE_V_2024_1); - } - public JsonObjectFromTransferSuspensionMessageV2024Transformer(JsonBuilderFactory jsonBuilderFactory, JsonLdNamespace namespace) { super(TransferSuspensionMessage.class, JsonObject.class, namespace); this.jsonBuilderFactory = jsonBuilderFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/v2024/from/JsonObjectFromTransferTerminationMessageV2024Transformer.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/v2024/from/JsonObjectFromTransferTerminationMessageV2024Transformer.java index 7780661272c..78181777e7d 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/v2024/from/JsonObjectFromTransferTerminationMessageV2024Transformer.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/type/v2024/from/JsonObjectFromTransferTerminationMessageV2024Transformer.java @@ -25,7 +25,6 @@ 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.spi.type.DspConstants.DSP_NAMESPACE_V_2024_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CODE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; @@ -36,10 +35,6 @@ public class JsonObjectFromTransferTerminationMessageV2024Transformer extends Ab private final JsonBuilderFactory jsonBuilderFactory; - public JsonObjectFromTransferTerminationMessageV2024Transformer(JsonBuilderFactory jsonBuilderFactory) { - this(jsonBuilderFactory, DSP_NAMESPACE_V_2024_1); - } - public JsonObjectFromTransferTerminationMessageV2024Transformer(JsonBuilderFactory jsonBuilderFactory, JsonLdNamespace namespace) { super(TransferTerminationMessage.class, JsonObject.class, namespace); this.jsonBuilderFactory = jsonBuilderFactory; diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/JsonObjectFromTransferCompletionMessageV2024TransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/JsonObjectFromTransferCompletionMessageV2024TransformerTest.java index f8f61239dc3..2376b8f26fc 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/JsonObjectFromTransferCompletionMessageV2024TransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/JsonObjectFromTransferCompletionMessageV2024TransformerTest.java @@ -29,6 +29,7 @@ import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_CONSUMER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.transferprocess.transform.v2024.from.TestFunctionV2024.DSP_NAMESPACE; import static org.eclipse.edc.protocol.dsp.transferprocess.transform.v2024.from.TestFunctionV2024.toIri; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; @@ -42,7 +43,7 @@ class JsonObjectFromTransferCompletionMessageV2024TransformerTest { private final TransformerContext context = mock(); private final JsonObjectFromTransferCompletionMessageV2024Transformer transformer = - new JsonObjectFromTransferCompletionMessageV2024Transformer(jsonFactory); + new JsonObjectFromTransferCompletionMessageV2024Transformer(jsonFactory, DSP_NAMESPACE); @Test void transformTransferCompletionMessage() { diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/JsonObjectFromTransferProcessV2024TransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/JsonObjectFromTransferProcessV2024TransformerTest.java index 9fbce0d251c..52d0df2154c 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/JsonObjectFromTransferProcessV2024TransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/JsonObjectFromTransferProcessV2024TransformerTest.java @@ -62,6 +62,7 @@ import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_VALUE_TRANSFER_STATE_STARTED_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_VALUE_TRANSFER_STATE_SUSPENDED_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_VALUE_TRANSFER_STATE_TERMINATED_TERM; +import static org.eclipse.edc.protocol.dsp.transferprocess.transform.v2024.from.TestFunctionV2024.DSP_NAMESPACE; import static org.eclipse.edc.protocol.dsp.transferprocess.transform.v2024.from.TestFunctionV2024.toIri; import static org.junit.jupiter.params.provider.Arguments.arguments; import static org.mockito.ArgumentMatchers.anyString; @@ -76,7 +77,7 @@ class JsonObjectFromTransferProcessV2024TransformerTest { private final TransformerContext context = mock(); private final JsonObjectFromTransferProcessV2024Transformer transformer = - new JsonObjectFromTransferProcessV2024Transformer(jsonFactory); + new JsonObjectFromTransferProcessV2024Transformer(jsonFactory, DSP_NAMESPACE); @Test diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/JsonObjectFromTransferRequestMessageV2024TransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/JsonObjectFromTransferRequestMessageV2024TransformerTest.java index 28e867e6fb7..aad484f6d42 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/JsonObjectFromTransferRequestMessageV2024TransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/JsonObjectFromTransferRequestMessageV2024TransformerTest.java @@ -35,6 +35,7 @@ import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_CONTRACT_AGREEMENT_ID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_DATA_ADDRESS_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.transferprocess.transform.v2024.from.TestFunctionV2024.DSP_NAMESPACE; import static org.eclipse.edc.protocol.dsp.transferprocess.transform.v2024.from.TestFunctionV2024.toIri; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; @@ -57,7 +58,7 @@ class JsonObjectFromTransferRequestMessageV2024TransformerTest { private final TransformerContext context = mock(); private final JsonObjectFromTransferRequestMessageV2024Transformer transformer = - new JsonObjectFromTransferRequestMessageV2024Transformer(jsonFactory); + new JsonObjectFromTransferRequestMessageV2024Transformer(jsonFactory, DSP_NAMESPACE); @BeforeEach diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/JsonObjectFromTransferStartMessageV2024TransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/JsonObjectFromTransferStartMessageV2024TransformerTest.java index 9837605a235..7605f39255f 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/JsonObjectFromTransferStartMessageV2024TransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/JsonObjectFromTransferStartMessageV2024TransformerTest.java @@ -32,6 +32,7 @@ import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_PROPERTY_DATA_ADDRESS_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_START_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.transferprocess.transform.v2024.from.TestFunctionV2024.DSP_NAMESPACE; import static org.eclipse.edc.protocol.dsp.transferprocess.transform.v2024.from.TestFunctionV2024.toIri; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; @@ -46,7 +47,7 @@ class JsonObjectFromTransferStartMessageV2024TransformerTest { private final TransformerContext context = mock(); private final JsonObjectFromTransferStartMessageV2024Transformer transformer = - new JsonObjectFromTransferStartMessageV2024Transformer(jsonFactory); + new JsonObjectFromTransferStartMessageV2024Transformer(jsonFactory, DSP_NAMESPACE); @Test void transformTransferStartMessage() { diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/JsonObjectFromTransferSuspensionMessageV2024TransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/JsonObjectFromTransferSuspensionMessageV2024TransformerTest.java index 8e26b0ba597..2a5f6c9ecf1 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/JsonObjectFromTransferSuspensionMessageV2024TransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/JsonObjectFromTransferSuspensionMessageV2024TransformerTest.java @@ -32,6 +32,7 @@ import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_SUSPENSION_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.transferprocess.transform.v2024.from.TestFunctionV2024.DSP_NAMESPACE; import static org.eclipse.edc.protocol.dsp.transferprocess.transform.v2024.from.TestFunctionV2024.toIri; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; @@ -45,7 +46,7 @@ class JsonObjectFromTransferSuspensionMessageV2024TransformerTest { private final TransformerContext context = mock(); private final JsonObjectFromTransferSuspensionMessageV2024Transformer transformer = - new JsonObjectFromTransferSuspensionMessageV2024Transformer(jsonFactory); + new JsonObjectFromTransferSuspensionMessageV2024Transformer(jsonFactory, DSP_NAMESPACE); @Test void transformTransferSuspensionMessage() { diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/JsonObjectFromTransferTerminationMessageV2024TransformerTest.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/JsonObjectFromTransferTerminationMessageV2024TransformerTest.java index 05077ca736a..099e5bd119b 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/JsonObjectFromTransferTerminationMessageV2024TransformerTest.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/JsonObjectFromTransferTerminationMessageV2024TransformerTest.java @@ -31,6 +31,7 @@ import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_PROVIDER_PID_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_REASON_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_TERM; +import static org.eclipse.edc.protocol.dsp.transferprocess.transform.v2024.from.TestFunctionV2024.DSP_NAMESPACE; import static org.eclipse.edc.protocol.dsp.transferprocess.transform.v2024.from.TestFunctionV2024.toIri; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; @@ -44,7 +45,7 @@ class JsonObjectFromTransferTerminationMessageV2024TransformerTest { private final TransformerContext context = mock(); private final JsonObjectFromTransferTerminationMessageV2024Transformer transformer = - new JsonObjectFromTransferTerminationMessageV2024Transformer(jsonFactory); + new JsonObjectFromTransferTerminationMessageV2024Transformer(jsonFactory, DSP_NAMESPACE); @Test void transformTransferTerminationMessage() { diff --git a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/TestFunctionV2024.java b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/TestFunctionV2024.java index decd37efd50..eddfada9e07 100644 --- a/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/TestFunctionV2024.java +++ b/data-protocols/dsp/dsp-lib/dsp-transfer-process-lib/dsp-transfer-process-transform-lib/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2024/from/TestFunctionV2024.java @@ -14,11 +14,12 @@ package org.eclipse.edc.protocol.dsp.transferprocess.transform.v2024.from; -import org.eclipse.edc.protocol.dsp.spi.type.DspConstants; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; public class TestFunctionV2024 { + public static final JsonLdNamespace DSP_NAMESPACE = new JsonLdNamespace("http://www.w3.org/ns/dsp#"); public static String toIri(String term) { - return DspConstants.DSP_NAMESPACE_V_2024_1.toIri(term); + return DSP_NAMESPACE.toIri(term); } } diff --git a/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspConstants.java b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspConstants.java index 753ae7e6ff5..bf8040accde 100644 --- a/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspConstants.java +++ b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspConstants.java @@ -16,9 +16,7 @@ import org.eclipse.edc.jsonld.spi.JsonLdNamespace; -import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_SCHEMA_2024_1; import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_SCHEMA_2025_1; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2024_1_VERSION; import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2025_1_VERSION; /** @@ -28,13 +26,10 @@ public interface DspConstants { String DSP_CONTEXT_SEPARATOR = ":"; String DSP_SCOPE = "DSP"; - String DSP_SCOPE_V_2024_1 = DSP_SCOPE + DSP_CONTEXT_SEPARATOR + V_2024_1_VERSION; String DSP_SCOPE_V_2025_1 = DSP_SCOPE + DSP_CONTEXT_SEPARATOR + V_2025_1_VERSION; String DSP_TRANSFORMER_CONTEXT = "dsp-api"; - String DSP_TRANSFORMER_CONTEXT_V_2024_1 = DSP_TRANSFORMER_CONTEXT + DSP_CONTEXT_SEPARATOR + V_2024_1_VERSION; String DSP_TRANSFORMER_CONTEXT_V_2025_1 = DSP_TRANSFORMER_CONTEXT + DSP_CONTEXT_SEPARATOR + V_2025_1_VERSION; - JsonLdNamespace DSP_NAMESPACE_V_2024_1 = new JsonLdNamespace(DSPACE_SCHEMA_2024_1); JsonLdNamespace DSP_NAMESPACE_V_2025_1 = new JsonLdNamespace(DSPACE_SCHEMA_2025_1); } diff --git a/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/version/DspVersions.java b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/version/DspVersions.java index 44326909006..a8607ab29c2 100644 --- a/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/version/DspVersions.java +++ b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/version/DspVersions.java @@ -17,10 +17,6 @@ import org.eclipse.edc.connector.controlplane.services.spi.protocol.ProtocolVersion; public interface DspVersions { - - String V_2024_1_VERSION = "2024/1"; - String V_2024_1_PATH = "/" + V_2024_1_VERSION; - ProtocolVersion V_2024_1 = new ProtocolVersion(V_2024_1_VERSION, V_2024_1_PATH); String V_2025_1_VERSION = "2025-1"; String V_2025_1_PATH = "/" + V_2025_1_VERSION; diff --git a/settings.gradle.kts b/settings.gradle.kts index 70f36e54e13..4bf8461183e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -116,6 +116,7 @@ include(":data-protocols:dsp:dsp-08:dsp-transfer-process-08:dsp-transfer-process // dsp version 2024/1 include(":data-protocols:dsp:dsp-2024") +include(":data-protocols:dsp:dsp-2024:dsp-spi-2024") include(":data-protocols:dsp:dsp-2024:dsp-http-api-configuration-2024") include(":data-protocols:dsp:dsp-2024:dsp-http-dispatcher-2024") include(":data-protocols:dsp:dsp-2024:dsp-catalog-2024") diff --git a/spi/common/json-ld-spi/src/main/java/org/eclipse/edc/jsonld/spi/Namespaces.java b/spi/common/json-ld-spi/src/main/java/org/eclipse/edc/jsonld/spi/Namespaces.java index 870ffd81185..f496d4bcae3 100644 --- a/spi/common/json-ld-spi/src/main/java/org/eclipse/edc/jsonld/spi/Namespaces.java +++ b/spi/common/json-ld-spi/src/main/java/org/eclipse/edc/jsonld/spi/Namespaces.java @@ -30,7 +30,6 @@ public interface Namespaces { String DSPACE_PREFIX = "dspace"; @Deprecated(since = "0.14.0") String DSPACE_SCHEMA = "https://w3id.org/dspace/v0.8/"; - String DSPACE_SCHEMA_2024_1 = "https://w3id.org/dspace/2024/1/"; String DSPACE_SCHEMA_2025_1 = "https://w3id.org/dspace/2025/1/"; String DSPACE_CONTEXT_2025_1 = "https://w3id.org/dspace/2025/1/context.jsonld"; diff --git a/system-tests/protocol-test/build.gradle.kts b/system-tests/protocol-test/build.gradle.kts index 3854db721b2..893aeb17f21 100644 --- a/system-tests/protocol-test/build.gradle.kts +++ b/system-tests/protocol-test/build.gradle.kts @@ -23,6 +23,7 @@ dependencies { testImplementation(project(":core:common:lib:json-ld-lib")) testImplementation(project(":extensions:common:json-ld")) testImplementation(project(":data-protocols:dsp:dsp-08:dsp-spi-08")) + testImplementation(project(":data-protocols:dsp:dsp-2024:dsp-spi-2024")) testImplementation(libs.restAssured) } diff --git a/system-tests/protocol-test/src/test/java/org/eclipse/edc/test/e2e/protocol/ProtocolVersionProvider.java b/system-tests/protocol-test/src/test/java/org/eclipse/edc/test/e2e/protocol/ProtocolVersionProvider.java index f12716fc9cc..83a81652b27 100644 --- a/system-tests/protocol-test/src/test/java/org/eclipse/edc/test/e2e/protocol/ProtocolVersionProvider.java +++ b/system-tests/protocol-test/src/test/java/org/eclipse/edc/test/e2e/protocol/ProtocolVersionProvider.java @@ -14,7 +14,6 @@ package org.eclipse.edc.test.e2e.protocol; -import org.eclipse.edc.protocol.dsp.spi.type.DspConstants; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.ArgumentsProvider; @@ -22,14 +21,15 @@ import java.util.stream.Stream; import static org.eclipse.edc.protocol.dsp.spi.type.Dsp08Constants.DSP_NAMESPACE_V_08; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2024_1_PATH; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.DSP_NAMESPACE_V_2024_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2024Constants.V_2024_1_PATH; public class ProtocolVersionProvider implements ArgumentsProvider { @Override public Stream provideArguments(ExtensionContext context) throws Exception { return Stream.of( Arguments.of("", DSP_NAMESPACE_V_08), - Arguments.of(V_2024_1_PATH, DspConstants.DSP_NAMESPACE_V_2024_1) + Arguments.of(V_2024_1_PATH, DSP_NAMESPACE_V_2024_1) ); } } From 501f7d417f4913c3d16f4d185fcbfc9d8ae5a489 Mon Sep 17 00:00:00 2001 From: Enrico Risa Date: Fri, 20 Jun 2025 17:26:37 +0200 Subject: [PATCH 3/4] wip: 2025 refactor --- .../build.gradle.kts | 1 + .../api/v2025/DspCatalogApi2025Extension.java | 10 ++--- .../DspCatalogApiController20251.java | 6 +-- .../v2025/DspCatalogApi2025ExtensionTest.java | 4 +- .../DspCatalogApiControllerV20251Test.java | 4 +- .../build.gradle.kts | 1 + .../DspCatalogTransformV2025Extension.java | 4 +- ...JsonObjectFromCatalogV2025Transformer.java | 2 +- ...ObjectFromCatalogV2025TransformerTest.java | 2 +- .../build.gradle.kts | 1 + .../DspApiConfigurationV2025Extension.java | 10 ++--- .../dsp-http-dispatcher-2025/build.gradle.kts | 1 + .../DspHttpDispatcherV2025Extension.java | 6 +-- .../build.gradle.kts | 1 + .../v2025/DspNegotiationApi2025Extension.java | 6 +-- .../DspNegotiationApiController20251.java | 8 ++-- .../DspNegotiationApi2025ExtensionTest.java | 2 +- ...DspNegotiationApiControllerV20251Test.java | 4 +- .../build.gradle.kts | 1 + ...DspNegotiationTransformV2025Extension.java | 4 +- ...tractAgreementMessageV2025Transformer.java | 2 +- .../v2025/from/TestFunction2025.java | 4 +- .../dsp-2025/dsp-spi-2025/build.gradle.kts | 23 ++++++++++ .../dsp/spi/type/Dsp2025Constants.java | 42 +++++++++++++++++++ .../build.gradle.kts | 1 + .../DspTransferProcessApi2025Extension.java | 6 +-- .../DspTransferProcessApiController20251.java | 8 ++-- ...spTransferProcessApiExtension2025Test.java | 2 +- ...ransferProcessApiControllerV20251Test.java | 4 +- .../build.gradle.kts | 1 + ...ransferProcessTransformV2025Extension.java | 4 +- .../http/spi/types/HttpMessageProtocol.java | 3 -- .../protocol/dsp/spi/type/DspConstants.java | 8 ---- .../protocol/dsp/spi/version/DspVersions.java | 25 ----------- settings.gradle.kts | 1 + .../eclipse/edc/jsonld/spi/Namespaces.java | 1 - .../build.gradle.kts | 1 + .../managementapi/DspSerdeEndToEndTest.java | 6 +-- .../protocol-2025-test/build.gradle.kts | 1 + .../v2025/ProtocolVersionContextProvider.java | 2 +- 40 files changed, 131 insertions(+), 92 deletions(-) create mode 100644 data-protocols/dsp/dsp-2025/dsp-spi-2025/build.gradle.kts create mode 100644 data-protocols/dsp/dsp-2025/dsp-spi-2025/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/Dsp2025Constants.java delete mode 100644 data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/version/DspVersions.java diff --git a/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-http-api-2025/build.gradle.kts b/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-http-api-2025/build.gradle.kts index 2a244563af5..20893a02336 100644 --- a/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-http-api-2025/build.gradle.kts +++ b/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-http-api-2025/build.gradle.kts @@ -20,6 +20,7 @@ plugins { dependencies { api(project(":data-protocols:dsp:dsp-spi")) + api(project(":data-protocols:dsp:dsp-2025:dsp-spi-2025")) api(project(":data-protocols:dsp:dsp-http-spi")) api(project(":spi:common:core-spi")) api(project(":spi:common:web-spi")) diff --git a/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-http-api-2025/src/main/java/org/eclipse/edc/protocol/dsp/catalog/http/api/v2025/DspCatalogApi2025Extension.java b/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-http-api-2025/src/main/java/org/eclipse/edc/protocol/dsp/catalog/http/api/v2025/DspCatalogApi2025Extension.java index f7fe57f897e..ce989009fe7 100644 --- a/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-http-api-2025/src/main/java/org/eclipse/edc/protocol/dsp/catalog/http/api/v2025/DspCatalogApi2025Extension.java +++ b/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-http-api-2025/src/main/java/org/eclipse/edc/protocol/dsp/catalog/http/api/v2025/DspCatalogApi2025Extension.java @@ -41,12 +41,12 @@ import java.util.Objects; -import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DATASPACE_PROTOCOL_HTTP_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_NAMESPACE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_SCOPE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_TRANSFORMER_CONTEXT_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.V_2025_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_REQUEST_MESSAGE_TERM; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2025_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_SCOPE_V_2025_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_TRANSFORMER_CONTEXT_V_2025_1; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2025_1; import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD; /** diff --git a/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-http-api-2025/src/main/java/org/eclipse/edc/protocol/dsp/catalog/http/api/v2025/controller/DspCatalogApiController20251.java b/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-http-api-2025/src/main/java/org/eclipse/edc/protocol/dsp/catalog/http/api/v2025/controller/DspCatalogApiController20251.java index f834c786b77..417149b0e85 100644 --- a/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-http-api-2025/src/main/java/org/eclipse/edc/protocol/dsp/catalog/http/api/v2025/controller/DspCatalogApiController20251.java +++ b/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-http-api-2025/src/main/java/org/eclipse/edc/protocol/dsp/catalog/http/api/v2025/controller/DspCatalogApiController20251.java @@ -24,9 +24,9 @@ import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static org.eclipse.edc.protocol.dsp.catalog.http.api.CatalogApiPaths.BASE_PATH; -import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP_V_2025_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2025_1; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2025_1_PATH; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DATASPACE_PROTOCOL_HTTP_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_NAMESPACE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.V_2025_1_PATH; /** * Versioned Catalog endpoint for 2024/1 protocol version diff --git a/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-http-api-2025/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/v2025/DspCatalogApi2025ExtensionTest.java b/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-http-api-2025/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/v2025/DspCatalogApi2025ExtensionTest.java index 38e9223d4d1..b91ce13aeed 100644 --- a/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-http-api-2025/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/v2025/DspCatalogApi2025ExtensionTest.java +++ b/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-http-api-2025/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/v2025/DspCatalogApi2025ExtensionTest.java @@ -24,9 +24,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_NAMESPACE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.V_2025_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspCatalogPropertyAndTypeNames.DSPACE_TYPE_CATALOG_REQUEST_MESSAGE_TERM; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2025_1; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2025_1; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; diff --git a/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-http-api-2025/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/v2025/controller/DspCatalogApiControllerV20251Test.java b/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-http-api-2025/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/v2025/controller/DspCatalogApiControllerV20251Test.java index ed2ceb938e5..0f4f221a4ec 100644 --- a/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-http-api-2025/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/v2025/controller/DspCatalogApiControllerV20251Test.java +++ b/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-http-api-2025/src/test/java/org/eclipse/edc/protocol/dsp/catalog/http/api/v2025/controller/DspCatalogApiControllerV20251Test.java @@ -19,8 +19,8 @@ import org.eclipse.edc.protocol.dsp.catalog.http.api.controller.DspCatalogApiControllerTestBase; import static org.eclipse.edc.protocol.dsp.catalog.http.api.CatalogApiPaths.BASE_PATH; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2025_1; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2025_1_PATH; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_NAMESPACE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.V_2025_1_PATH; @ApiTest public class DspCatalogApiControllerV20251Test extends DspCatalogApiControllerTestBase { diff --git a/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-transform-2025/build.gradle.kts b/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-transform-2025/build.gradle.kts index f866c4212c4..f7c0e7026a9 100644 --- a/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-transform-2025/build.gradle.kts +++ b/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-transform-2025/build.gradle.kts @@ -20,6 +20,7 @@ plugins { dependencies { api(project(":spi:common:core-spi")) + api(project(":data-protocols:dsp:dsp-2025:dsp-spi-2025")) implementation(project(":core:common:lib:transform-lib")) implementation(project(":data-protocols:dsp:dsp-lib:dsp-catalog-lib:dsp-catalog-transform-lib")) diff --git a/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-transform-2025/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/v2025/DspCatalogTransformV2025Extension.java b/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-transform-2025/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/v2025/DspCatalogTransformV2025Extension.java index e0a05e51d5c..a0934726af2 100644 --- a/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-transform-2025/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/v2025/DspCatalogTransformV2025Extension.java +++ b/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-transform-2025/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/v2025/DspCatalogTransformV2025Extension.java @@ -32,8 +32,8 @@ import java.util.Map; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2025_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_TRANSFORMER_CONTEXT_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_NAMESPACE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_TRANSFORMER_CONTEXT_V_2025_1; import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD; /** diff --git a/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-transform-2025/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/v2025/from/JsonObjectFromCatalogV2025Transformer.java b/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-transform-2025/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/v2025/from/JsonObjectFromCatalogV2025Transformer.java index 0f3bed11600..e03df2e8729 100644 --- a/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-transform-2025/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/v2025/from/JsonObjectFromCatalogV2025Transformer.java +++ b/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-transform-2025/src/main/java/org/eclipse/edc/protocol/dsp/catalog/transform/v2025/from/JsonObjectFromCatalogV2025Transformer.java @@ -39,7 +39,7 @@ import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_DATA_SERVICE_ATTRIBUTE; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_DISTRIBUTION_ATTRIBUTE; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DSPACE_PROPERTY_PARTICIPANT_ID_TERM; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_NAMESPACE_V_2025_1; /** * Converts from a {@link Catalog} to a DCAT catalog as a {@link JsonObject} in JSON-LD expanded form. diff --git a/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-transform-2025/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/v2025/from/JsonObjectFromCatalogV2025TransformerTest.java b/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-transform-2025/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/v2025/from/JsonObjectFromCatalogV2025TransformerTest.java index 739b517c905..e0efbff8e4c 100644 --- a/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-transform-2025/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/v2025/from/JsonObjectFromCatalogV2025TransformerTest.java +++ b/data-protocols/dsp/dsp-2025/dsp-catalog-2025/dsp-catalog-transform-2025/src/test/java/org/eclipse/edc/protocol/dsp/catalog/transform/v2025/from/JsonObjectFromCatalogV2025TransformerTest.java @@ -43,7 +43,7 @@ import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_DATA_SERVICE_ATTRIBUTE; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_DISTRIBUTION_ATTRIBUTE; import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DSPACE_PROPERTY_PARTICIPANT_ID_TERM; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_NAMESPACE_V_2025_1; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; diff --git a/data-protocols/dsp/dsp-2025/dsp-http-api-configuration-2025/build.gradle.kts b/data-protocols/dsp/dsp-2025/dsp-http-api-configuration-2025/build.gradle.kts index d90aa9d218b..b5fb42b1cea 100644 --- a/data-protocols/dsp/dsp-2025/dsp-http-api-configuration-2025/build.gradle.kts +++ b/data-protocols/dsp/dsp-2025/dsp-http-api-configuration-2025/build.gradle.kts @@ -20,6 +20,7 @@ dependencies { api(project(":spi:common:core-spi")) api(project(":spi:common:web-spi")) api(project(":data-protocols:dsp:dsp-spi")) + api(project(":data-protocols:dsp:dsp-2025:dsp-spi-2025")) api(project(":data-protocols:dsp:dsp-http-spi")) implementation(project(":core:common:lib:transform-lib")) diff --git a/data-protocols/dsp/dsp-2025/dsp-http-api-configuration-2025/src/main/java/org/eclipse/edc/protocol/dsp/http/api/configuration/v2025/DspApiConfigurationV2025Extension.java b/data-protocols/dsp/dsp-2025/dsp-http-api-configuration-2025/src/main/java/org/eclipse/edc/protocol/dsp/http/api/configuration/v2025/DspApiConfigurationV2025Extension.java index 55835648908..e36086d89c5 100644 --- a/data-protocols/dsp/dsp-2025/dsp-http-api-configuration-2025/src/main/java/org/eclipse/edc/protocol/dsp/http/api/configuration/v2025/DspApiConfigurationV2025Extension.java +++ b/data-protocols/dsp/dsp-2025/dsp-http-api-configuration-2025/src/main/java/org/eclipse/edc/protocol/dsp/http/api/configuration/v2025/DspApiConfigurationV2025Extension.java @@ -42,11 +42,11 @@ import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_CONTEXT_2025_1; import static org.eclipse.edc.jsonld.spi.Namespaces.EDC_DSPACE_CONTEXT; -import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP_V_2025_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2025_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_SCOPE_V_2025_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_TRANSFORMER_CONTEXT_V_2025_1; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2025_1_PATH; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DATASPACE_PROTOCOL_HTTP_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_NAMESPACE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_SCOPE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_TRANSFORMER_CONTEXT_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.V_2025_1_PATH; import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD; /** diff --git a/data-protocols/dsp/dsp-2025/dsp-http-dispatcher-2025/build.gradle.kts b/data-protocols/dsp/dsp-2025/dsp-http-dispatcher-2025/build.gradle.kts index 2cfadbb2afa..34bed6065fd 100644 --- a/data-protocols/dsp/dsp-2025/dsp-http-dispatcher-2025/build.gradle.kts +++ b/data-protocols/dsp/dsp-2025/dsp-http-dispatcher-2025/build.gradle.kts @@ -18,5 +18,6 @@ plugins { dependencies { api(project(":spi:common:core-spi")) + api(project(":data-protocols:dsp:dsp-2025:dsp-spi-2025")) api(project(":data-protocols:dsp:dsp-http-spi")) } diff --git a/data-protocols/dsp/dsp-2025/dsp-http-dispatcher-2025/src/main/java/org/eclipse/edc/protocol/dsp/http/dispatcher/DspHttpDispatcherV2025Extension.java b/data-protocols/dsp/dsp-2025/dsp-http-dispatcher-2025/src/main/java/org/eclipse/edc/protocol/dsp/http/dispatcher/DspHttpDispatcherV2025Extension.java index 08972b82128..725d239ea35 100644 --- a/data-protocols/dsp/dsp-2025/dsp-http-dispatcher-2025/src/main/java/org/eclipse/edc/protocol/dsp/http/dispatcher/DspHttpDispatcherV2025Extension.java +++ b/data-protocols/dsp/dsp-2025/dsp-http-dispatcher-2025/src/main/java/org/eclipse/edc/protocol/dsp/http/dispatcher/DspHttpDispatcherV2025Extension.java @@ -20,18 +20,18 @@ import org.eclipse.edc.spi.system.ServiceExtension; import org.eclipse.edc.spi.system.ServiceExtensionContext; -import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DATASPACE_PROTOCOL_HTTP_V_2025_1; /** * Registers the message dispatcher for DSP v2025/1. */ public class DspHttpDispatcherV2025Extension implements ServiceExtension { - + @Inject private RemoteMessageDispatcherRegistry dispatcherRegistry; @Inject private DspHttpRemoteMessageDispatcher dispatcher; - + @Override public void initialize(ServiceExtensionContext context) { dispatcherRegistry.register(DATASPACE_PROTOCOL_HTTP_V_2025_1, dispatcher); diff --git a/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-http-api-2025/build.gradle.kts b/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-http-api-2025/build.gradle.kts index 929a323b0cb..b5bdd317c17 100644 --- a/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-http-api-2025/build.gradle.kts +++ b/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-http-api-2025/build.gradle.kts @@ -20,6 +20,7 @@ plugins { dependencies { api(project(":data-protocols:dsp:dsp-spi")) + api(project(":data-protocols:dsp:dsp-2025:dsp-spi-2025")) api(project(":data-protocols:dsp:dsp-http-spi")) api(project(":spi:common:core-spi")) api(project(":spi:common:web-spi")) diff --git a/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-http-api-2025/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/v2025/DspNegotiationApi2025Extension.java b/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-http-api-2025/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/v2025/DspNegotiationApi2025Extension.java index 49116b539fa..f5a037d9c3a 100644 --- a/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-http-api-2025/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/v2025/DspNegotiationApi2025Extension.java +++ b/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-http-api-2025/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/v2025/DspNegotiationApi2025Extension.java @@ -35,15 +35,15 @@ import org.eclipse.edc.web.spi.WebService; import org.eclipse.edc.web.spi.configuration.ApiContext; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2025_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_SCOPE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_NAMESPACE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_SCOPE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.V_2025_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERMINATION_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_OFFER_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_REQUEST_MESSAGE_TERM; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2025_1; import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD; /** diff --git a/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-http-api-2025/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/v2025/controller/DspNegotiationApiController20251.java b/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-http-api-2025/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/v2025/controller/DspNegotiationApiController20251.java index c6c4fa2b062..4661e9a8ffa 100644 --- a/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-http-api-2025/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/v2025/controller/DspNegotiationApiController20251.java +++ b/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-http-api-2025/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/v2025/controller/DspNegotiationApiController20251.java @@ -26,21 +26,21 @@ import org.eclipse.edc.connector.controlplane.services.spi.contractnegotiation.ContractNegotiationProtocolService; import org.eclipse.edc.protocol.dsp.http.spi.message.DspRequestHandler; import org.eclipse.edc.protocol.dsp.negotiation.http.api.controller.BaseDspNegotiationApiController; -import org.eclipse.edc.protocol.dsp.spi.version.DspVersions; import static jakarta.ws.rs.core.HttpHeaders.AUTHORIZATION; -import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP_V_2025_1; import static org.eclipse.edc.protocol.dsp.negotiation.http.api.NegotiationApiPaths.BASE_PATH; import static org.eclipse.edc.protocol.dsp.negotiation.http.api.NegotiationApiPaths.CONTRACT_OFFERS; import static org.eclipse.edc.protocol.dsp.negotiation.http.api.NegotiationApiPaths.INITIAL_CONTRACT_OFFERS; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DATASPACE_PROTOCOL_HTTP_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_NAMESPACE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.V_2025_1_PATH; /** * Versioned Negotiation endpoint for 2024/1 protocol version */ @Consumes({MediaType.APPLICATION_JSON}) @Produces({MediaType.APPLICATION_JSON}) -@Path(DspVersions.V_2025_1_PATH + BASE_PATH) +@Path(V_2025_1_PATH + BASE_PATH) public class DspNegotiationApiController20251 extends BaseDspNegotiationApiController { public DspNegotiationApiController20251(ContractNegotiationProtocolService protocolService, DspRequestHandler dspRequestHandler) { diff --git a/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-http-api-2025/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/v2025/DspNegotiationApi2025ExtensionTest.java b/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-http-api-2025/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/v2025/DspNegotiationApi2025ExtensionTest.java index 4b8c0d0f33d..cfba6644bd7 100644 --- a/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-http-api-2025/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/v2025/DspNegotiationApi2025ExtensionTest.java +++ b/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-http-api-2025/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/v2025/DspNegotiationApi2025ExtensionTest.java @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_NAMESPACE_V_2025_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_VERIFICATION_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_EVENT_MESSAGE_TERM; diff --git a/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-http-api-2025/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/v2025/controller/DspNegotiationApiControllerV20251Test.java b/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-http-api-2025/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/v2025/controller/DspNegotiationApiControllerV20251Test.java index e6f84753b96..0be1443ec3b 100644 --- a/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-http-api-2025/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/v2025/controller/DspNegotiationApiControllerV20251Test.java +++ b/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-http-api-2025/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/http/api/v2025/controller/DspNegotiationApiControllerV20251Test.java @@ -21,8 +21,8 @@ import static org.eclipse.edc.protocol.dsp.negotiation.http.api.NegotiationApiPaths.BASE_PATH; import static org.eclipse.edc.protocol.dsp.negotiation.http.api.NegotiationApiPaths.CONTRACT_OFFERS; import static org.eclipse.edc.protocol.dsp.negotiation.http.api.NegotiationApiPaths.INITIAL_CONTRACT_OFFERS; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2025_1; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2025_1_PATH; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_NAMESPACE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.V_2025_1_PATH; @ApiTest class DspNegotiationApiControllerV20251Test extends DspNegotiationApiControllerTestBase { diff --git a/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-transform-2025/build.gradle.kts b/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-transform-2025/build.gradle.kts index 6d2e97ff380..95b8a86790c 100644 --- a/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-transform-2025/build.gradle.kts +++ b/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-transform-2025/build.gradle.kts @@ -20,6 +20,7 @@ plugins { dependencies { api(project(":spi:common:core-spi")) api(project(":spi:common:transform-spi")) + api(project(":data-protocols:dsp:dsp-2025:dsp-spi-2025")) implementation(project(":data-protocols:dsp:dsp-lib:dsp-negotiation-lib:dsp-negotiation-transform-lib")) } diff --git a/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-transform-2025/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2025/DspNegotiationTransformV2025Extension.java b/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-transform-2025/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2025/DspNegotiationTransformV2025Extension.java index d1d601af459..ed3945ef8ee 100644 --- a/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-transform-2025/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2025/DspNegotiationTransformV2025Extension.java +++ b/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-transform-2025/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2025/DspNegotiationTransformV2025Extension.java @@ -38,8 +38,8 @@ import java.util.Map; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2025_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_TRANSFORMER_CONTEXT_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_NAMESPACE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_TRANSFORMER_CONTEXT_V_2025_1; /** * Provides the transformers for DSP v2025/1 negotiation message types via the {@link TypeTransformerRegistry}. diff --git a/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-transform-2025/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2025/from/JsonObjectFromContractAgreementMessageV2025Transformer.java b/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-transform-2025/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2025/from/JsonObjectFromContractAgreementMessageV2025Transformer.java index 58a99b439f7..51229cf7974 100644 --- a/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-transform-2025/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2025/from/JsonObjectFromContractAgreementMessageV2025Transformer.java +++ b/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-transform-2025/src/main/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2025/from/JsonObjectFromContractAgreementMessageV2025Transformer.java @@ -27,7 +27,7 @@ import static java.time.Instant.ofEpochSecond; 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.spi.type.DspConstants.DSP_NAMESPACE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_NAMESPACE_V_2025_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_AGREEMENT_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_PROPERTY_TIMESTAMP_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_AGREEMENT_MESSAGE_TERM; diff --git a/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-transform-2025/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2025/from/TestFunction2025.java b/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-transform-2025/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2025/from/TestFunction2025.java index 9126cca2cc2..61ecff3edaa 100644 --- a/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-transform-2025/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2025/from/TestFunction2025.java +++ b/data-protocols/dsp/dsp-2025/dsp-negotiation-2025/dsp-negotiation-transform-2025/src/test/java/org/eclipse/edc/protocol/dsp/negotiation/transform/v2025/from/TestFunction2025.java @@ -14,11 +14,11 @@ package org.eclipse.edc.protocol.dsp.negotiation.transform.v2025.from; -import org.eclipse.edc.protocol.dsp.spi.type.DspConstants; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_NAMESPACE_V_2025_1; public class TestFunction2025 { public static String toIri(String term) { - return DspConstants.DSP_NAMESPACE_V_2025_1.toIri(term); + return DSP_NAMESPACE_V_2025_1.toIri(term); } } diff --git a/data-protocols/dsp/dsp-2025/dsp-spi-2025/build.gradle.kts b/data-protocols/dsp/dsp-2025/dsp-spi-2025/build.gradle.kts new file mode 100644 index 00000000000..03a26569fed --- /dev/null +++ b/data-protocols/dsp/dsp-2025/dsp-spi-2025/build.gradle.kts @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2025 Metaform Systems, Inc. + * + * 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: + * Metaform Systems, Inc. - initial API and implementation + * + */ + +plugins { + `java-library` +} + +dependencies { + api(project(":data-protocols:dsp:dsp-spi")) + api(project(":data-protocols:dsp:dsp-http-spi")) + implementation(project(":extensions:common:json-ld")) +} \ No newline at end of file diff --git a/data-protocols/dsp/dsp-2025/dsp-spi-2025/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/Dsp2025Constants.java b/data-protocols/dsp/dsp-2025/dsp-spi-2025/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/Dsp2025Constants.java new file mode 100644 index 00000000000..90c26b98d56 --- /dev/null +++ b/data-protocols/dsp/dsp-2025/dsp-spi-2025/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/Dsp2025Constants.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2025 Metaform Systems, Inc. + * + * 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: + * Metaform Systems, Inc. - initial API and implementation + * + */ + +package org.eclipse.edc.protocol.dsp.spi.type; + +import org.eclipse.edc.connector.controlplane.services.spi.protocol.ProtocolVersion; +import org.eclipse.edc.jsonld.spi.JsonLdNamespace; + +import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP; +import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP_SEPARATOR; +import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_CONTEXT_SEPARATOR; +import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_SCOPE; +import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_TRANSFORMER_CONTEXT; + +public interface Dsp2025Constants { + + String V_2025_1_VERSION = "2025-1"; + String V_2025_1_PATH = "/" + V_2025_1_VERSION; + ProtocolVersion V_2025_1 = new ProtocolVersion(V_2025_1_VERSION, V_2025_1_PATH); + + String DSPACE_SCHEMA_2025_1 = "https://w3id.org/dspace/2025/1/"; + + String DSP_SCOPE_V_2025_1 = DSP_SCOPE + DSP_CONTEXT_SEPARATOR + V_2025_1_VERSION; + + String DSP_TRANSFORMER_CONTEXT_V_2025_1 = DSP_TRANSFORMER_CONTEXT + DSP_CONTEXT_SEPARATOR + V_2025_1_VERSION; + + String DATASPACE_PROTOCOL_HTTP_V_2025_1 = DATASPACE_PROTOCOL_HTTP + DATASPACE_PROTOCOL_HTTP_SEPARATOR + V_2025_1_VERSION; + + JsonLdNamespace DSP_NAMESPACE_V_2025_1 = new JsonLdNamespace(DSPACE_SCHEMA_2025_1); + +} diff --git a/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-http-api-2025/build.gradle.kts b/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-http-api-2025/build.gradle.kts index 60757a33df4..19a4daa091c 100644 --- a/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-http-api-2025/build.gradle.kts +++ b/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-http-api-2025/build.gradle.kts @@ -23,6 +23,7 @@ dependencies { api(project(":spi:control-plane:transfer-spi")) api(project(":spi:control-plane:control-plane-spi")) api(project(":data-protocols:dsp:dsp-spi")) + api(project(":data-protocols:dsp:dsp-2025:dsp-spi-2025")) api(project(":data-protocols:dsp:dsp-http-spi")) implementation(project(":spi:common:json-ld-spi")) diff --git a/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-http-api-2025/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/v2025/DspTransferProcessApi2025Extension.java b/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-http-api-2025/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/v2025/DspTransferProcessApi2025Extension.java index 7c772f8329e..8439698a4da 100644 --- a/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-http-api-2025/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/v2025/DspTransferProcessApi2025Extension.java +++ b/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-http-api-2025/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/v2025/DspTransferProcessApi2025Extension.java @@ -33,13 +33,13 @@ import org.eclipse.edc.web.spi.WebService; import org.eclipse.edc.web.spi.configuration.ApiContext; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2025_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_SCOPE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_NAMESPACE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_SCOPE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.V_2025_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_START_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_TERMINATION_MESSAGE_TERM; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2025_1; import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD; /** diff --git a/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-http-api-2025/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/v2025/controller/DspTransferProcessApiController20251.java b/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-http-api-2025/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/v2025/controller/DspTransferProcessApiController20251.java index 3590929000e..ff83810d53c 100644 --- a/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-http-api-2025/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/v2025/controller/DspTransferProcessApiController20251.java +++ b/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-http-api-2025/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/v2025/controller/DspTransferProcessApiController20251.java @@ -20,11 +20,11 @@ import jakarta.ws.rs.core.MediaType; import org.eclipse.edc.connector.controlplane.services.spi.transferprocess.TransferProcessProtocolService; import org.eclipse.edc.protocol.dsp.http.spi.message.DspRequestHandler; -import org.eclipse.edc.protocol.dsp.spi.version.DspVersions; import org.eclipse.edc.protocol.dsp.transferprocess.http.api.controller.BaseDspTransferProcessApiController; -import static org.eclipse.edc.protocol.dsp.http.spi.types.HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP_V_2025_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DATASPACE_PROTOCOL_HTTP_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_NAMESPACE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.V_2025_1_PATH; import static org.eclipse.edc.protocol.dsp.transferprocess.http.api.TransferProcessApiPaths.BASE_PATH; @@ -33,7 +33,7 @@ */ @Consumes({MediaType.APPLICATION_JSON}) @Produces({MediaType.APPLICATION_JSON}) -@Path(DspVersions.V_2025_1_PATH + BASE_PATH) +@Path(V_2025_1_PATH + BASE_PATH) public class DspTransferProcessApiController20251 extends BaseDspTransferProcessApiController { public DspTransferProcessApiController20251(TransferProcessProtocolService protocolService, DspRequestHandler dspRequestHandler) { diff --git a/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-http-api-2025/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/v2025/DspTransferProcessApiExtension2025Test.java b/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-http-api-2025/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/v2025/DspTransferProcessApiExtension2025Test.java index 89bbf00921e..4fa33be510e 100644 --- a/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-http-api-2025/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/v2025/DspTransferProcessApiExtension2025Test.java +++ b/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-http-api-2025/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/v2025/DspTransferProcessApiExtension2025Test.java @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_NAMESPACE_V_2025_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_COMPLETION_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_REQUEST_MESSAGE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_START_MESSAGE_TERM; diff --git a/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-http-api-2025/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/v2025/controller/DspTransferProcessApiControllerV20251Test.java b/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-http-api-2025/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/v2025/controller/DspTransferProcessApiControllerV20251Test.java index 73b0d2ac8da..f2d13a49381 100644 --- a/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-http-api-2025/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/v2025/controller/DspTransferProcessApiControllerV20251Test.java +++ b/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-http-api-2025/src/test/java/org/eclipse/edc/protocol/dsp/transferprocess/http/api/v2025/controller/DspTransferProcessApiControllerV20251Test.java @@ -18,8 +18,8 @@ import org.eclipse.edc.junit.annotations.ApiTest; import org.eclipse.edc.protocol.dsp.transferprocess.http.api.controller.DspTransferProcessApiControllerBaseTest; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2025_1; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2025_1_PATH; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_NAMESPACE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.V_2025_1_PATH; import static org.eclipse.edc.protocol.dsp.transferprocess.http.api.TransferProcessApiPaths.BASE_PATH; @ApiTest diff --git a/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-transform-2025/build.gradle.kts b/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-transform-2025/build.gradle.kts index 040f0bf1fb5..1b56b3c7af4 100644 --- a/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-transform-2025/build.gradle.kts +++ b/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-transform-2025/build.gradle.kts @@ -22,6 +22,7 @@ dependencies { 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-2025:dsp-spi-2025")) api(project(":data-protocols:dsp:dsp-http-spi")) implementation(project(":core:common:lib:transform-lib")) implementation(project(":data-protocols:dsp:dsp-lib:dsp-transfer-process-lib:dsp-transfer-process-transform-lib")) diff --git a/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-transform-2025/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2025/DspTransferProcessTransformV2025Extension.java b/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-transform-2025/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2025/DspTransferProcessTransformV2025Extension.java index b6f5117aed8..376ecb0a934 100644 --- a/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-transform-2025/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2025/DspTransferProcessTransformV2025Extension.java +++ b/data-protocols/dsp/dsp-2025/dsp-transfer-process-2025/dsp-transfer-process-transform-2025/src/main/java/org/eclipse/edc/protocol/dsp/transferprocess/transform/v2025/DspTransferProcessTransformV2025Extension.java @@ -37,8 +37,8 @@ import java.util.Map; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2025_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_TRANSFORMER_CONTEXT_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_NAMESPACE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_TRANSFORMER_CONTEXT_V_2025_1; import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD; /** diff --git a/data-protocols/dsp/dsp-http-spi/src/main/java/org/eclipse/edc/protocol/dsp/http/spi/types/HttpMessageProtocol.java b/data-protocols/dsp/dsp-http-spi/src/main/java/org/eclipse/edc/protocol/dsp/http/spi/types/HttpMessageProtocol.java index c63c3997f72..39e6c952ece 100644 --- a/data-protocols/dsp/dsp-http-spi/src/main/java/org/eclipse/edc/protocol/dsp/http/spi/types/HttpMessageProtocol.java +++ b/data-protocols/dsp/dsp-http-spi/src/main/java/org/eclipse/edc/protocol/dsp/http/spi/types/HttpMessageProtocol.java @@ -14,8 +14,6 @@ package org.eclipse.edc.protocol.dsp.http.spi.types; -import org.eclipse.edc.protocol.dsp.spi.version.DspVersions; - /** * Provides the name to be used as reference to the dataspace protocol in remote messages. */ @@ -24,6 +22,5 @@ public class HttpMessageProtocol { // When not explicit the default will be v0.8 for backward compatibility public static final String DATASPACE_PROTOCOL_HTTP = "dataspace-protocol-http"; public static final String DATASPACE_PROTOCOL_HTTP_SEPARATOR = ":"; - public static final String DATASPACE_PROTOCOL_HTTP_V_2025_1 = DATASPACE_PROTOCOL_HTTP + DATASPACE_PROTOCOL_HTTP_SEPARATOR + DspVersions.V_2025_1_VERSION; } \ No newline at end of file diff --git a/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspConstants.java b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspConstants.java index bf8040accde..f3ba01a270d 100644 --- a/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspConstants.java +++ b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/type/DspConstants.java @@ -14,11 +14,6 @@ package org.eclipse.edc.protocol.dsp.spi.type; -import org.eclipse.edc.jsonld.spi.JsonLdNamespace; - -import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_SCHEMA_2025_1; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2025_1_VERSION; - /** * Dataspace protocol constants. */ @@ -26,10 +21,7 @@ public interface DspConstants { String DSP_CONTEXT_SEPARATOR = ":"; String DSP_SCOPE = "DSP"; - String DSP_SCOPE_V_2025_1 = DSP_SCOPE + DSP_CONTEXT_SEPARATOR + V_2025_1_VERSION; String DSP_TRANSFORMER_CONTEXT = "dsp-api"; - String DSP_TRANSFORMER_CONTEXT_V_2025_1 = DSP_TRANSFORMER_CONTEXT + DSP_CONTEXT_SEPARATOR + V_2025_1_VERSION; - JsonLdNamespace DSP_NAMESPACE_V_2025_1 = new JsonLdNamespace(DSPACE_SCHEMA_2025_1); } diff --git a/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/version/DspVersions.java b/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/version/DspVersions.java deleted file mode 100644 index a8607ab29c2..00000000000 --- a/data-protocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/version/DspVersions.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - * - * 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: - * Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation - * - */ - -package org.eclipse.edc.protocol.dsp.spi.version; - -import org.eclipse.edc.connector.controlplane.services.spi.protocol.ProtocolVersion; - -public interface DspVersions { - - String V_2025_1_VERSION = "2025-1"; - String V_2025_1_PATH = "/" + V_2025_1_VERSION; - ProtocolVersion V_2025_1 = new ProtocolVersion(V_2025_1_VERSION, V_2025_1_PATH); - -} diff --git a/settings.gradle.kts b/settings.gradle.kts index 4bf8461183e..177442427d6 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -131,6 +131,7 @@ include(":data-protocols:dsp:dsp-2024:dsp-transfer-process-2024:dsp-transfer-pro // dsp version 2025/1 include(":data-protocols:dsp:dsp-2025") +include(":data-protocols:dsp:dsp-2025:dsp-spi-2025") include(":data-protocols:dsp:dsp-2025:dsp-http-api-configuration-2025") include(":data-protocols:dsp:dsp-2025:dsp-http-dispatcher-2025") include(":data-protocols:dsp:dsp-2025:dsp-catalog-2025") diff --git a/spi/common/json-ld-spi/src/main/java/org/eclipse/edc/jsonld/spi/Namespaces.java b/spi/common/json-ld-spi/src/main/java/org/eclipse/edc/jsonld/spi/Namespaces.java index f496d4bcae3..a3fadf6ea08 100644 --- a/spi/common/json-ld-spi/src/main/java/org/eclipse/edc/jsonld/spi/Namespaces.java +++ b/spi/common/json-ld-spi/src/main/java/org/eclipse/edc/jsonld/spi/Namespaces.java @@ -31,7 +31,6 @@ public interface Namespaces { @Deprecated(since = "0.14.0") String DSPACE_SCHEMA = "https://w3id.org/dspace/v0.8/"; - String DSPACE_SCHEMA_2025_1 = "https://w3id.org/dspace/2025/1/"; String DSPACE_CONTEXT_2025_1 = "https://w3id.org/dspace/2025/1/context.jsonld"; String DSPACE_ODRL_PROFILE_2025_1 = "https://w3id.org/dspace/2025/1/odrl-profile.jsonld"; diff --git a/system-tests/management-api/management-api-test-runner/build.gradle.kts b/system-tests/management-api/management-api-test-runner/build.gradle.kts index 3a23ddc2e54..8dfa0acd3a1 100644 --- a/system-tests/management-api/management-api-test-runner/build.gradle.kts +++ b/system-tests/management-api/management-api-test-runner/build.gradle.kts @@ -21,6 +21,7 @@ dependencies { // gives access to the Json LD models, etc. testImplementation(project(":spi:common:json-ld-spi")) testImplementation(project(":data-protocols:dsp:dsp-spi")) + testImplementation(project(":data-protocols:dsp:dsp-2025:dsp-spi-2025")) testImplementation(project(":spi:control-plane:asset-spi")) testImplementation(project(":spi:control-plane:contract-spi")) testImplementation(project(":spi:data-plane-selector:data-plane-selector-spi")) diff --git a/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/DspSerdeEndToEndTest.java b/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/DspSerdeEndToEndTest.java index 084363db729..49370c2f0df 100644 --- a/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/DspSerdeEndToEndTest.java +++ b/system-tests/management-api/management-api-test-runner/src/test/java/org/eclipse/edc/test/e2e/managementapi/DspSerdeEndToEndTest.java @@ -65,9 +65,9 @@ import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.ID; import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE; import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_ODRL_PROFILE_2025_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_NAMESPACE_V_2025_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_SCOPE_V_2025_1; -import static org.eclipse.edc.protocol.dsp.spi.type.DspConstants.DSP_TRANSFORMER_CONTEXT_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_NAMESPACE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_SCOPE_V_2025_1; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.DSP_TRANSFORMER_CONTEXT_V_2025_1; import static org.eclipse.edc.protocol.dsp.spi.type.DspNegotiationPropertyAndTypeNames.DSPACE_TYPE_CONTRACT_NEGOTIATION_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspPropertyAndTypeNames.DSPACE_PROPERTY_STATE_TERM; import static org.eclipse.edc.protocol.dsp.spi.type.DspTransferProcessPropertyAndTypeNames.DSPACE_TYPE_TRANSFER_PROCESS_TERM; diff --git a/system-tests/protocol-2025-test/build.gradle.kts b/system-tests/protocol-2025-test/build.gradle.kts index d7dca68b1a3..694134c0976 100644 --- a/system-tests/protocol-2025-test/build.gradle.kts +++ b/system-tests/protocol-2025-test/build.gradle.kts @@ -17,6 +17,7 @@ plugins { } dependencies { + testImplementation(project(":data-protocols:dsp:dsp-2025:dsp-spi-2025")) testImplementation(project(":data-protocols:dsp:dsp-http-spi")) testImplementation(project(":core:common:junit")) testImplementation(project(":spi:common:json-ld-spi")) diff --git a/system-tests/protocol-2025-test/src/test/java/org/eclipse/edc/test/e2e/protocol/v2025/ProtocolVersionContextProvider.java b/system-tests/protocol-2025-test/src/test/java/org/eclipse/edc/test/e2e/protocol/v2025/ProtocolVersionContextProvider.java index a8d9590ec86..df46896f9be 100644 --- a/system-tests/protocol-2025-test/src/test/java/org/eclipse/edc/test/e2e/protocol/v2025/ProtocolVersionContextProvider.java +++ b/system-tests/protocol-2025-test/src/test/java/org/eclipse/edc/test/e2e/protocol/v2025/ProtocolVersionContextProvider.java @@ -23,7 +23,7 @@ import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_CONTEXT_2025_1; import static org.eclipse.edc.jsonld.spi.Namespaces.EDC_DSPACE_CONTEXT; -import static org.eclipse.edc.protocol.dsp.spi.version.DspVersions.V_2025_1_PATH; +import static org.eclipse.edc.protocol.dsp.spi.type.Dsp2025Constants.V_2025_1_PATH; public class ProtocolVersionContextProvider implements ArgumentsProvider { @Override From 4fa161a6b07028bdaf6953c4ab588d317c98e52c Mon Sep 17 00:00:00 2001 From: Enrico Risa Date: Mon, 23 Jun 2025 12:09:20 +0200 Subject: [PATCH 4/4] chore: add failure on null default protocol version --- .../protocol/dsp/http/protocol/DspProtocolParserImpl.java | 6 +++++- .../dsp/http/protocol/DspProtocolParserImplTest.java | 8 ++++++++ .../services/spi/protocol/ProtocolVersionRegistry.java | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/data-protocols/dsp/dsp-core/dsp-http-core/src/main/java/org/eclipse/edc/protocol/dsp/http/protocol/DspProtocolParserImpl.java b/data-protocols/dsp/dsp-core/dsp-http-core/src/main/java/org/eclipse/edc/protocol/dsp/http/protocol/DspProtocolParserImpl.java index 1e7b14ef986..58faaec85e3 100644 --- a/data-protocols/dsp/dsp-core/dsp-http-core/src/main/java/org/eclipse/edc/protocol/dsp/http/protocol/DspProtocolParserImpl.java +++ b/data-protocols/dsp/dsp-core/dsp-http-core/src/main/java/org/eclipse/edc/protocol/dsp/http/protocol/DspProtocolParserImpl.java @@ -40,7 +40,11 @@ public Result parse(String protocol) { } if (protocolWithVersion.length == 1) { - return Result.success(versionRegistry.getDefaultVersion()); + var defaultVersion = versionRegistry.getDefaultVersion(); + if (defaultVersion == null) { + return Result.failure("No default protocol version registered for %s".formatted(DATASPACE_PROTOCOL_HTTP)); + } + return Result.success(defaultVersion); } var protocolVersion = protocolWithVersion[1]; diff --git a/data-protocols/dsp/dsp-core/dsp-http-core/src/test/java/org/eclipse/edc/protocol/dsp/http/protocol/DspProtocolParserImplTest.java b/data-protocols/dsp/dsp-core/dsp-http-core/src/test/java/org/eclipse/edc/protocol/dsp/http/protocol/DspProtocolParserImplTest.java index 731ee19bd5e..04f9a53d4ce 100644 --- a/data-protocols/dsp/dsp-core/dsp-http-core/src/test/java/org/eclipse/edc/protocol/dsp/http/protocol/DspProtocolParserImplTest.java +++ b/data-protocols/dsp/dsp-core/dsp-http-core/src/test/java/org/eclipse/edc/protocol/dsp/http/protocol/DspProtocolParserImplTest.java @@ -63,4 +63,12 @@ void shouldFailToParseProtocol_whenTypeNotSupported() { void shouldFailToParseProtocol_whenVersionNotSupported() { assertThat(parser.parse(DATASPACE_PROTOCOL_HTTP + ":wrongVersion")).isFailed(); } + + @Test + void shouldFailToParseProtocol_whenNoDefaultVersion() { + var parser = new DspProtocolParserImpl(mock()); + + assertThat(parser.parse(DATASPACE_PROTOCOL_HTTP)).isFailed() + .detail().contains("No default protocol version registered"); + } } diff --git a/spi/control-plane/control-plane-spi/src/main/java/org/eclipse/edc/connector/controlplane/services/spi/protocol/ProtocolVersionRegistry.java b/spi/control-plane/control-plane-spi/src/main/java/org/eclipse/edc/connector/controlplane/services/spi/protocol/ProtocolVersionRegistry.java index e0cb2d4ba50..9bb67687e76 100644 --- a/spi/control-plane/control-plane-spi/src/main/java/org/eclipse/edc/connector/controlplane/services/spi/protocol/ProtocolVersionRegistry.java +++ b/spi/control-plane/control-plane-spi/src/main/java/org/eclipse/edc/connector/controlplane/services/spi/protocol/ProtocolVersionRegistry.java @@ -14,6 +14,8 @@ package org.eclipse.edc.connector.controlplane.services.spi.protocol; +import org.jetbrains.annotations.Nullable; + /** * Keeps track of all the dataspace protocol versions. */ @@ -50,5 +52,6 @@ default void register(ProtocolVersion protocolVersion) { * * @return the default protocol version. */ + @Nullable ProtocolVersion getDefaultVersion(); }