Skip to content

Commit fa83c07

Browse files
authored
chore: use of upstream transformers for all mgmt apis (#81)
1 parent c847528 commit fa83c07

File tree

14 files changed

+7
-659
lines changed

14 files changed

+7
-659
lines changed

extensions/control-plane/api/management-api/asset-api/src/main/java/org/eclipse/edc/virtualized/connector/controlplane/api/management/asset/AssetApiExtension.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,12 @@
3030
import org.eclipse.edc.transform.spi.TypeTransformerRegistry;
3131
import org.eclipse.edc.validator.spi.JsonObjectValidatorRegistry;
3232
import org.eclipse.edc.virtualized.connector.controlplane.api.management.asset.v4.AssetApiV4Controller;
33-
import org.eclipse.edc.virtualized.connector.controlplane.api.management.asset.validation.AssetValidator;
34-
import org.eclipse.edc.virtualized.connector.controlplane.api.management.asset.validation.DataAddressValidator;
3533
import org.eclipse.edc.web.jersey.providers.jsonld.JerseyJsonLdInterceptor;
3634
import org.eclipse.edc.web.spi.WebService;
3735
import org.eclipse.edc.web.spi.configuration.ApiContext;
3836

3937
import static org.eclipse.edc.api.management.ManagementApi.MANAGEMENT_SCOPE_V4;
40-
import static org.eclipse.edc.connector.controlplane.asset.spi.domain.Asset.EDC_ASSET_TYPE;
4138
import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD;
42-
import static org.eclipse.edc.spi.types.domain.DataAddress.EDC_DATA_ADDRESS_TYPE;
4339

4440
@Extension(value = AssetApiExtension.NAME)
4541
public class AssetApiExtension implements ServiceExtension {
@@ -75,9 +71,6 @@ public String name() {
7571
public void initialize(ServiceExtensionContext context) {
7672
var monitor = context.getMonitor();
7773

78-
validatorRegistry.register(EDC_ASSET_TYPE, AssetValidator.instance());
79-
validatorRegistry.register(EDC_DATA_ADDRESS_TYPE, DataAddressValidator.instance());
80-
8174
var managementTypeTransformerRegistry = transformerRegistry.forContext("management-api");
8275

8376
authorizationService.addLookupFunction(Asset.class, this::findAsset);

extensions/control-plane/api/management-api/asset-api/src/main/java/org/eclipse/edc/virtualized/connector/controlplane/api/management/asset/validation/AssetValidator.java

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

extensions/control-plane/api/management-api/asset-api/src/main/java/org/eclipse/edc/virtualized/connector/controlplane/api/management/asset/validation/DataAddressValidator.java

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

extensions/control-plane/api/management-api/catalog-api/src/main/java/org/eclipse/edc/virtual/connector/controlplane/api/management/catalog/CatalogApiExtension.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
import org.eclipse.edc.api.auth.spi.AuthorizationService;
1818
import org.eclipse.edc.api.management.schema.ManagementApiJsonSchema;
1919
import org.eclipse.edc.connector.controlplane.services.spi.catalog.CatalogService;
20+
import org.eclipse.edc.connector.controlplane.transform.edc.catalog.to.JsonObjectToCatalogRequestTransformer;
21+
import org.eclipse.edc.connector.controlplane.transform.edc.catalog.to.JsonObjectToDatasetRequestTransformer;
2022
import org.eclipse.edc.jsonld.spi.JsonLd;
2123
import org.eclipse.edc.participantcontext.spi.service.ParticipantContextService;
2224
import org.eclipse.edc.runtime.metamodel.annotation.Extension;
@@ -26,8 +28,6 @@
2628
import org.eclipse.edc.spi.types.TypeManager;
2729
import org.eclipse.edc.transform.spi.TypeTransformerRegistry;
2830
import org.eclipse.edc.validator.spi.JsonObjectValidatorRegistry;
29-
import org.eclipse.edc.virtual.connector.controlplane.api.management.catalog.transform.JsonObjectToCatalogRequestTransformer;
30-
import org.eclipse.edc.virtual.connector.controlplane.api.management.catalog.transform.JsonObjectToDatasetRequestTransformer;
3131
import org.eclipse.edc.virtual.connector.controlplane.api.management.catalog.v4.CatalogApiV4Controller;
3232
import org.eclipse.edc.web.jersey.providers.jsonld.JerseyJsonLdInterceptor;
3333
import org.eclipse.edc.web.spi.WebService;
@@ -76,7 +76,7 @@ public void initialize(ServiceExtensionContext context) {
7676
var managementApiTransformerRegistry = transformerRegistry.forContext("management-api");
7777

7878
// authorization service does need an additional lookup function - catalogs are not a persisted entity
79-
79+
8080
webService.registerResource(ApiContext.MANAGEMENT, new CatalogApiV4Controller(service, managementApiTransformerRegistry, authorizationService, participantContextService));
8181
webService.registerDynamicResource(ApiContext.MANAGEMENT, CatalogApiV4Controller.class, new JerseyJsonLdInterceptor(jsonLd, typeManager, JSON_LD, MANAGEMENT_SCOPE_V4, validatorRegistry, ManagementApiJsonSchema.V4.version()));
8282
}

extensions/control-plane/api/management-api/catalog-api/src/main/java/org/eclipse/edc/virtual/connector/controlplane/api/management/catalog/transform/JsonObjectToCatalogRequestTransformer.java

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

extensions/control-plane/api/management-api/catalog-api/src/main/java/org/eclipse/edc/virtual/connector/controlplane/api/management/catalog/transform/JsonObjectToDatasetRequestTransformer.java

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

0 commit comments

Comments
 (0)