Skip to content

Commit 72c97d8

Browse files
authored
feat: deprecate EDR cache (#5641)
feat: remove EDR api V4 beta and deprecate EDR cache spi
1 parent 9936a17 commit 72c97d8

13 files changed

Lines changed: 15 additions & 450 deletions

File tree

extensions/common/api/lib/management-api-lib/src/main/java/org/eclipse/edc/api/management/schema/ManagementApiJsonSchema.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ interface V4 {
2828
String POLICY_DEFINITION = EDC_MGMT_V4_SCHEMA_PREFIX + "/policy-definition-schema.json";
2929
String CONTRACT_DEFINITION = EDC_MGMT_V4_SCHEMA_PREFIX + "/contract-definition-schema.json";
3030
String DATAPLANE_INSTANCE = EDC_MGMT_V4_SCHEMA_PREFIX + "/dataplane-instance-schema.json";
31-
String DATA_ADDRESS = EDC_MGMT_V4_SCHEMA_PREFIX + "/data-address-schema.json#/definitions/DataAddressRoot";
3231
String EDR_ENTRY = EDC_MGMT_V4_SCHEMA_PREFIX + "/edr-entry-schema.json";
3332
String POLICY_EVALUATION_REQUEST = EDC_MGMT_V4_SCHEMA_PREFIX + "/policy-evaluation-plan-request-schema.json";
3433
String POLICY_EVALUATION_PLAN = EDC_MGMT_V4_SCHEMA_PREFIX + "/policy-evaluation-plan-schema.json";

extensions/common/api/management-api-configuration/src/main/resources/management-api-version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{
99
"version": "4.0.0-beta",
1010
"urlPath": "/v4beta",
11-
"lastUpdated": "2026-04-09T08:43:01Z",
11+
"lastUpdated": "2026-04-09T09:43:01Z",
1212
"maturity": "beta"
1313
},
1414
{

extensions/common/api/management-api-schema-validator/src/main/resources/schema/management/v4/catalog-asset-schema.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,12 @@
3030
},
3131
"isCatalog": {
3232
"type": "boolean"
33-
},
34-
"dataAddress": {
35-
"$ref": "https://w3id.org/edc/connector/management/schema/v4/data-address-schema.json"
3633
}
3734
},
3835
"required": [
3936
"@context",
4037
"@type",
41-
"properties",
42-
"dataAddress"
38+
"properties"
4339
]
4440
}
4541
}

extensions/common/api/management-api-schema-validator/src/main/resources/schema/management/v4/data-address-schema.json

Lines changed: 0 additions & 49 deletions
This file was deleted.

extensions/control-plane/api/management-api/edr-cache-api/src/main/java/org/eclipse/edc/connector/controlplane/api/management/edr/EdrCacheApiExtension.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@
1515
package org.eclipse.edc.connector.controlplane.api.management.edr;
1616

1717
import jakarta.json.Json;
18-
import org.eclipse.edc.api.management.schema.ManagementApiJsonSchema;
1918
import org.eclipse.edc.connector.controlplane.api.management.edr.transform.JsonObjectFromEndpointDataReferenceEntryTransformer;
2019
import org.eclipse.edc.connector.controlplane.api.management.edr.v3.EdrCacheApiV3Controller;
21-
import org.eclipse.edc.connector.controlplane.api.management.edr.v4.EdrCacheApiV4Controller;
2220
import org.eclipse.edc.edr.spi.store.EndpointDataReferenceStore;
2321
import org.eclipse.edc.jsonld.spi.JsonLd;
2422
import org.eclipse.edc.runtime.metamodel.annotation.Extension;
@@ -36,7 +34,6 @@
3634
import java.util.Map;
3735

3836
import static org.eclipse.edc.api.management.ManagementApi.MANAGEMENT_SCOPE;
39-
import static org.eclipse.edc.api.management.ManagementApi.MANAGEMENT_SCOPE_V4;
4037
import static org.eclipse.edc.connector.controlplane.api.management.edr.EdrCacheApiExtension.NAME;
4138
import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD;
4239

@@ -77,8 +74,5 @@ public void initialize(ServiceExtensionContext context) {
7774
webService.registerResource(ApiContext.MANAGEMENT, new EdrCacheApiV3Controller(edrStore, managementTypeTransformerRegistry, validator, monitor));
7875
webService.registerDynamicResource(ApiContext.MANAGEMENT, EdrCacheApiV3Controller.class, new JerseyJsonLdInterceptor(jsonLd, typeManager, JSON_LD, MANAGEMENT_SCOPE));
7976

80-
webService.registerResource(ApiContext.MANAGEMENT, new EdrCacheApiV4Controller(edrStore, managementTypeTransformerRegistry, validator, monitor));
81-
webService.registerDynamicResource(ApiContext.MANAGEMENT, EdrCacheApiV4Controller.class, new JerseyJsonLdInterceptor(jsonLd, typeManager, JSON_LD, MANAGEMENT_SCOPE_V4, validator, ManagementApiJsonSchema.V4.version()));
82-
8377
}
8478
}

extensions/control-plane/api/management-api/edr-cache-api/src/main/java/org/eclipse/edc/connector/controlplane/api/management/edr/v4/EdrCacheApiV4.java

Lines changed: 0 additions & 68 deletions
This file was deleted.

extensions/control-plane/api/management-api/edr-cache-api/src/main/java/org/eclipse/edc/connector/controlplane/api/management/edr/v4/EdrCacheApiV4Controller.java

Lines changed: 0 additions & 65 deletions
This file was deleted.

extensions/control-plane/api/management-api/edr-cache-api/src/test/java/org/eclipse/edc/connector/controlplane/api/management/edr/v4/EdrCacheApiV4ControllerTest.java

Lines changed: 0 additions & 39 deletions
This file was deleted.

spi/common/edr-store-spi/src/main/java/org/eclipse/edc/edr/spi/store/EndpointDataReferenceCache.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@
2020

2121
/**
2222
* Client side Cache for {@link DataAddress} associated to a transfer process in PULL scenario
23+
*
24+
* @deprecated since management-api:v
2325
*/
26+
@Deprecated(since = "management-api:v3")
2427
@ExtensionPoint
2528
public interface EndpointDataReferenceCache {
2629

spi/common/edr-store-spi/src/main/java/org/eclipse/edc/edr/spi/store/EndpointDataReferenceEntryIndex.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,13 @@
2525

2626
/**
2727
* Stores and queries metadata {@link EndpointDataReferenceEntry} associated with an EDR ({@link DataAddress})
28+
*
29+
* @deprecated since management-api:v3*
2830
*/
31+
@Deprecated(since = "management-api:v3")
2932
@ExtensionPoint
3033
public interface EndpointDataReferenceEntryIndex {
31-
34+
3235
String ENDPOINT_DATA_REFERENCE_ENTRY_FOUND = "Endpoint DataReference Entry with ID %s not found";
3336

3437
/**

0 commit comments

Comments
 (0)