refactor: cleanup deprecated DSP versions (#5452)

Author: ndr-brt

core/common/lib/json-ld-lib/src/main/java/org/eclipse/edc/jsonld/CachedDocumentRegistry.java

@@ -42,7 +42,6 @@ public class CachedDocumentRegistry {
     public static Stream<Result<JsonLdContext>> getDocuments() {
         return Map.of(
                 "odrl.jsonld", "http://www.w3.org/ns/odrl.jsonld",
-                "dspace.jsonld", "https://w3id.org/dspace/2024/1/context.json",
                 "management-context-v1.jsonld", EDC_CONNECTOR_MANAGEMENT_CONTEXT,
                 "management-context-v2.jsonld", EDC_CONNECTOR_MANAGEMENT_CONTEXT_V2,
                 "dspace-edc-context-v1.jsonld", EDC_DSPACE_CONTEXT,

core/common/lib/json-ld-lib/src/main/resources/document/dspace.jsonld

@@ -45,7 +45,7 @@ public JwtGenerationService(JwsSignerProvider jwsSignerProvider) {
     }
 
     @Override
-    @Deprecated
+    @Deprecated(since = "0.15.0")
     public Result<TokenRepresentation> generate(String privateKeyId, @NotNull TokenDecorator... decorators) {
 
         var tokenSignerResult = jwsGeneratorFunction.createJwsSigner(privateKeyId);

core/common/lib/token-lib/src/main/java/org/eclipse/edc/token/JwtGenerationService.java

@@ -26,4 +26,5 @@ dependencies {
     testImplementation(project(":tests:junit-base"));
     testImplementation(project(":core:common:lib:json-lib"))
     testImplementation(project(":core:common:lib:json-ld-lib"))
+    testImplementation(project(":data-protocols:dsp:dsp-2025:dsp-spi-2025"))
 }

core/common/lib/transform-lib/build.gradle.kts

@@ -14,25 +14,16 @@
 
 package org.eclipse.edc.transform.transformer.dspace;
 
-import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_SCHEMA;
-
 /**
  * Contains constants specifically intended for serializing a {@link org.eclipse.edc.spi.types.domain.DataAddress}
  * to JSON-LD using the `dspace:` prefix format.
  */
 public interface DataAddressDspaceSerialization {
     String DSPACE_DATAADDRESS_TYPE_TERM = "DataAddress";
-    String DSPACE_DATAADDRESS_TYPE_IRI = DSPACE_SCHEMA + DSPACE_DATAADDRESS_TYPE_TERM;
     String ENDPOINT_TYPE_PROPERTY_TERM = "endpointType";
-    String ENDPOINT_TYPE_PROPERTY_IRI = DSPACE_SCHEMA + ENDPOINT_TYPE_PROPERTY_TERM;
     String ENDPOINT_PROPERTY_TERM = "endpoint";
-    String ENDPOINT_PROPERTY_IRI = DSPACE_SCHEMA + ENDPOINT_PROPERTY_TERM;
     String ENDPOINT_PROPERTIES_PROPERTY_TERM = "endpointProperties";
-    String ENDPOINT_PROPERTIES_PROPERTY_IRI = DSPACE_SCHEMA + ENDPOINT_PROPERTIES_PROPERTY_TERM;
     String ENDPOINT_PROPERTY_PROPERTY_TYPE_TERM = "EndpointProperty";
-    String ENDPOINT_PROPERTY_PROPERTY_TYPE_IRI = DSPACE_SCHEMA + ENDPOINT_PROPERTY_PROPERTY_TYPE_TERM;
     String ENDPOINT_PROPERTY_NAME_PROPERTY_TERM = "name";
-    String ENDPOINT_PROPERTY_NAME_PROPERTY_IRI = DSPACE_SCHEMA + ENDPOINT_PROPERTY_NAME_PROPERTY_TERM;
     String ENDPOINT_PROPERTY_VALUE_PROPERTY_TERM = "value";
-    String ENDPOINT_PROPERTY_VALUE_PROPERTY_IRI = DSPACE_SCHEMA + ENDPOINT_PROPERTY_VALUE_PROPERTY_TERM;
 }

core/common/lib/transform-lib/src/main/java/org/eclipse/edc/transform/transformer/dspace/DataAddressDspaceSerialization.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2024 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ *  Copyright (c) 2026 Think-it GmbH
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Apache License, Version 2.0 which is available at
@@ -8,7 +8,7 @@
  *  SPDX-License-Identifier: Apache-2.0
  *
  *  Contributors:
- *       Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
+ *       Think-it GmbH - initial API and implementation
  *
  */
 
@@ -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;
 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 JsonObjectFromDataAddressDspaceTransformer extends AbstractNamespac
     private final TypeManager typeManager;
     private final String typeContext;
 
-    public JsonObjectFromDataAddressDspaceTransformer(JsonBuilderFactory jsonFactory, TypeManager typeManager, String typeContext) {
-        this(jsonFactory, typeManager, typeContext, new JsonLdNamespace(DSPACE_SCHEMA));
-    }
-
     public JsonObjectFromDataAddressDspaceTransformer(JsonBuilderFactory jsonFactory, TypeManager typeManager, String typeContext, JsonLdNamespace namespace) {
         super(DataAddress.class, JsonObject.class, namespace);
         this.jsonFactory = jsonFactory;
@@ -64,7 +59,7 @@ public JsonObjectFromDataAddressDspaceTransformer(JsonBuilderFactory jsonFactory
 
         return jsonFactory.createObjectBuilder()
                 .add(TYPE, forNamespace(DSPACE_DATAADDRESS_TYPE_TERM))
-                .add(forNamespace(ENDPOINT_TYPE_PROPERTY_TERM), dataAddress.getType())
+                .add(forNamespace(ENDPOINT_TYPE_PROPERTY_TERM), createId(jsonFactory, dataAddress.getType()))
                 .add(forNamespace(ENDPOINT_PROPERTIES_PROPERTY_TERM), endpointProperties)
                 .build();
     }

core/common/lib/transform-lib/src/main/java/org/eclipse/edc/transform/transformer/dspace/from/JsonObjectFromDataAddressDspaceTransformer.java

@@ -27,7 +27,6 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import static org.eclipse.edc.jsonld.spi.Namespaces.DSPACE_SCHEMA;
 import static org.eclipse.edc.spi.types.domain.DataAddress.EDC_DATA_ADDRESS_RESPONSE_CHANNEL;
 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;
@@ -39,10 +38,6 @@
  */
 public class JsonObjectToDataAddressDspaceTransformer extends AbstractNamespaceAwareJsonLdTransformer<JsonObject, DataAddress> {
 
-    public JsonObjectToDataAddressDspaceTransformer() {
-        this(new JsonLdNamespace(DSPACE_SCHEMA));
-    }
-
     public JsonObjectToDataAddressDspaceTransformer(JsonLdNamespace namespace) {
         super(JsonObject.class, DataAddress.class, namespace);
     }