refactor: cleanup deprecated management-api endpoint (#4713)

eclipse-edc · Jan 14, 2025 · da20905 · da20905
1 parent 9697382
commit da20905
Show file tree

Hide file tree

Showing 61 changed files with 16 additions and 3,264 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/...test/java/org/eclipse/edc/vault/hashicorp/client/HashicorpVaultClientIntegrationTest.java b/...test/java/org/eclipse/edc/vault/hashicorp/client/HashicorpVaultClientIntegrationTest.java
@@ -190,4 +190,4 @@ void beforeEach() throws IOException, InterruptedException {
             );
         }
     }
-}
+}
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/...rg/eclipse/edc/connector/controlplane/api/management/catalog/CatalogApiExtensionTest.java b/...rg/eclipse/edc/connector/controlplane/api/management/catalog/CatalogApiExtensionTest.java
@@ -14,7 +14,6 @@
 
 package org.eclipse.edc.connector.controlplane.api.management.catalog;
 
-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.junit.extensions.DependencyInjectionExtension;
@@ -57,7 +56,6 @@ void initiate_shouldRegisterValidators(CatalogApiExtension extension, ServiceExt
     void initiate_shouldRegisterControllers(CatalogApiExtension extension, ServiceExtensionContext context) {
         extension.initialize(context);
 
-        verify(webService).registerResource(any(), isA(CatalogApiV2Controller.class));
         verify(webService).registerResource(any(), isA(CatalogApiV3Controller.class));
         verify(webService).registerResource(any(), isA(CatalogApiV31AlphaController.class));
     }

diff --git a/...ipse/edc/connector/controlplane/api/management/catalog/v2/CatalogApiV2ControllerTest.java b/...ipse/edc/connector/controlplane/api/management/catalog/v2/CatalogApiV2ControllerTest.java
-Original file line number
+Diff line change
@@ Expand Up @@
                 );
             }
         }
-    }
+    }