feat: dsp constants refactor

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;

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");
                 });
     }

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<ProtocolVersion> 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;
+    }
 }

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"))

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"))

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

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);
     }

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);
     }
 }

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);

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"))
 }

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));

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"))

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));
     }

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();

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"))

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);
     }
 
 

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 {