refactor: cleanup deprecated management-api endpoint

eclipse-edc · Jan 10, 2025 · cac982a · cac982a
1 parent a6a339f
commit cac982a
Show file tree

Hide file tree

Showing 41 changed files with 5 additions and 2,838 deletions.
diff --git a/...ns/common/api/management-api-configuration/src/main/resources/management-api-version.json b/...ns/common/api/management-api-configuration/src/main/resources/management-api-version.json
@@ -1,8 +1,8 @@
 [
   {
-    "version": "3.0.5",
+    "version": "3.0.6",
     "urlPath": "/v3",
-    "lastUpdated": "2025-01-08T14:26:00Z",
+    "lastUpdated": "2025-01-10T16:46:00Z",
     "maturity": "stable"
   },
   {

diff --git a/...va/org/eclipse/edc/connector/controlplane/api/management/catalog/CatalogApiExtension.java b/...va/org/eclipse/edc/connector/controlplane/api/management/catalog/CatalogApiExtension.java
@@ -16,7 +16,6 @@
 
 import org.eclipse.edc.connector.controlplane.api.management.catalog.transform.JsonObjectToCatalogRequestTransformer;
 import org.eclipse.edc.connector.controlplane.api.management.catalog.transform.JsonObjectToDatasetRequestTransformer;
-import org.eclipse.edc.connector.controlplane.api.management.catalog.v2.CatalogApiV2Controller;
 import org.eclipse.edc.connector.controlplane.api.management.catalog.v3.CatalogApiV3Controller;
 import org.eclipse.edc.connector.controlplane.api.management.catalog.v31alpha.CatalogApiV31AlphaController;
 import org.eclipse.edc.connector.controlplane.api.management.catalog.validation.CatalogRequestValidator;
@@ -66,7 +65,6 @@ public void initialize(ServiceExtensionContext context) {
         transformerRegistry.register(new JsonObjectToDatasetRequestTransformer());
 
         var managementApiTransformerRegistry = transformerRegistry.forContext("management-api");
-        webService.registerResource(ApiContext.MANAGEMENT, new CatalogApiV2Controller(service, managementApiTransformerRegistry, validatorRegistry, context.getMonitor()));
         webService.registerResource(ApiContext.MANAGEMENT, new CatalogApiV3Controller(service, managementApiTransformerRegistry, validatorRegistry));
         webService.registerResource(ApiContext.MANAGEMENT, new CatalogApiV31AlphaController(service, managementApiTransformerRegistry, validatorRegistry));
 

diff --git a/...n/java/org/eclipse/edc/connector/controlplane/api/management/catalog/v2/CatalogApiV2.java b/...n/java/org/eclipse/edc/connector/controlplane/api/management/catalog/v2/CatalogApiV2.java
diff --git a/.../eclipse/edc/connector/controlplane/api/management/catalog/v2/CatalogApiV2Controller.java b/.../eclipse/edc/connector/controlplane/api/management/catalog/v2/CatalogApiV2Controller.java
diff --git a/...ipse/edc/connector/controlplane/api/management/catalog/v2/CatalogApiV2ControllerTest.java b/...ipse/edc/connector/controlplane/api/management/catalog/v2/CatalogApiV2ControllerTest.java
diff --git a/...onnector/controlplane/api/management/contractagreement/ContractAgreementApiExtension.java b/...onnector/controlplane/api/management/contractagreement/ContractAgreementApiExtension.java
@@ -15,7 +15,6 @@
 
 package org.eclipse.edc.connector.controlplane.api.management.contractagreement;
 
-import org.eclipse.edc.connector.controlplane.api.management.contractagreement.v2.ContractAgreementApiV2Controller;
 import org.eclipse.edc.connector.controlplane.api.management.contractagreement.v3.ContractAgreementApiV3Controller;
 import org.eclipse.edc.connector.controlplane.api.management.contractagreement.v4alpha.ContractAgreementApiV4AlphaController;
 import org.eclipse.edc.connector.controlplane.services.spi.contractagreement.ContractAgreementService;
@@ -57,11 +56,9 @@ public void initialize(ServiceExtensionContext context) {
         var monitor = context.getMonitor();
 
         var managementApiTransformerRegistry = transformerRegistry.forContext(MANAGEMENT_API_CONTEXT);
-        var managementApiTransformerRegistryV31Alpha = managementApiTransformerRegistry.forContext(MANAGEMENT_API_V_4_ALPHA);
+        var managementApiTransformerRegistryV4Alpha = managementApiTransformerRegistry.forContext(MANAGEMENT_API_V_4_ALPHA);
 
-
-        webService.registerResource(ApiContext.MANAGEMENT, new ContractAgreementApiV2Controller(service, managementApiTransformerRegistry, monitor, validatorRegistry));
         webService.registerResource(ApiContext.MANAGEMENT, new ContractAgreementApiV3Controller(service, managementApiTransformerRegistry, monitor, validatorRegistry));
-        webService.registerResource(ApiContext.MANAGEMENT, new ContractAgreementApiV4AlphaController(service, managementApiTransformerRegistryV31Alpha, monitor, validatorRegistry));
+        webService.registerResource(ApiContext.MANAGEMENT, new ContractAgreementApiV4AlphaController(service, managementApiTransformerRegistryV4Alpha, monitor, validatorRegistry));
     }
 }