Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
package org.eclipse.edc.connector.core;

import org.eclipse.edc.connector.core.agent.ParticipantAgentServiceImpl;
import org.eclipse.edc.connector.core.validator.DataAddressValidatorRegistryImpl;
import org.eclipse.edc.participant.spi.ParticipantAgentService;
import org.eclipse.edc.policy.engine.PolicyEngineImpl;
import org.eclipse.edc.policy.engine.RuleBindingRegistryImpl;
Expand All @@ -31,7 +30,6 @@
import org.eclipse.edc.spi.system.ServiceExtension;
import org.eclipse.edc.spi.system.ServiceExtensionContext;
import org.eclipse.edc.spi.types.TypeManager;
import org.eclipse.edc.validator.spi.DataAddressValidatorRegistry;

@Extension(value = CoreServicesExtension.NAME)
public class CoreServicesExtension implements ServiceExtension {
Expand Down Expand Up @@ -75,10 +73,5 @@ public PolicyEngine policyEngine() {
return new PolicyEngineImpl(scopeFilter, ruleValidator);
}

@Provider
public DataAddressValidatorRegistry dataAddressValidatorRegistry(ServiceExtensionContext context) {
return new DataAddressValidatorRegistryImpl(context.getMonitor());
}

}

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
import org.eclipse.edc.spi.event.EventSubscriber;
import org.eclipse.edc.spi.iam.IdentityService;
import org.eclipse.edc.spi.types.domain.DataAddress;
import org.eclipse.edc.validator.spi.DataAddressValidatorRegistry;
import org.eclipse.edc.validator.spi.ValidationResult;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
Expand Down Expand Up @@ -67,8 +65,7 @@ void setUp(RuntimeExtension extension) {
}

@Test
void shouldDispatchEventsOnAssetCreationAndDeletion(AssetService service, EventRouter eventRouter, DataAddressValidatorRegistry dataAddressValidatorRegistry) {
dataAddressValidatorRegistry.registerSourceValidator("type", a -> ValidationResult.success());
void shouldDispatchEventsOnAssetCreationAndDeletion(AssetService service, EventRouter eventRouter) {
eventRouter.register(AssetEvent.class, eventSubscriber);
var dataAddress = DataAddress.Builder.newInstance().type("type").build();
var asset = Asset.Builder.newInstance().id("assetId").dataAddress(dataAddress).build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,13 @@
import org.eclipse.edc.connector.controlplane.contract.spi.types.offer.ContractDefinition;
import org.eclipse.edc.connector.controlplane.policy.spi.PolicyDefinition;
import org.eclipse.edc.connector.controlplane.policy.spi.store.PolicyDefinitionStore;
import org.eclipse.edc.dataaddress.httpdata.spi.HttpDataAddressSchema;
import org.eclipse.edc.participant.spi.ParticipantAgent;
import org.eclipse.edc.participantcontext.spi.types.ParticipantContext;
import org.eclipse.edc.policy.model.Policy;
import org.eclipse.edc.query.CriterionOperatorRegistryImpl;
import org.eclipse.edc.spi.message.Range;
import org.eclipse.edc.spi.query.Criterion;
import org.eclipse.edc.spi.query.QuerySpec;
import org.eclipse.edc.spi.types.domain.DataAddress;
import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
Expand All @@ -54,6 +52,7 @@
import static java.util.stream.IntStream.range;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.entry;
import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.DCAT_ENDPOINT_URL_ATTRIBUTE;
import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat;
import static org.eclipse.edc.policy.model.PolicyType.OFFER;
import static org.eclipse.edc.spi.constants.CoreConstants.EDC_NAMESPACE;
Expand Down Expand Up @@ -279,12 +278,12 @@ void shouldReturnCatalogWithinCatalog_whenAssetIsCatalogAsset() {
.endpointDescription("test-asset-desc")
.endpointUrl("https://foo.bar/baz")
.build())
.format(HttpDataAddressSchema.HTTP_DATA_TYPE).build();
.format("HttpData").build();

when(definitionResolver.resolveFor(any(), any())).thenReturn(new ResolvedContractDefinitions(List.of(contractDefinition)));
when(assetIndex.queryAssets(isA(QuerySpec.class))).thenReturn(Stream.of(createAsset("assetId")
.property(Asset.PROPERTY_IS_CATALOG, true)
.dataAddress(DataAddress.Builder.newInstance().type(HttpDataAddressSchema.HTTP_DATA_TYPE).build())
.property(DCAT_ENDPOINT_URL_ATTRIBUTE, "https://foo.bar/baz")
.build()));
when(policyStore.findById("contractPolicyId")).thenReturn(PolicyDefinition.Builder.newInstance().policy(contractPolicy).build());
when(distributionResolver.getDistributions(any(), isA(Asset.class))).thenReturn(List.of(distribution));
Expand Down
1 change: 0 additions & 1 deletion dist/bom/controlplane-base-bom/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ dependencies {

api(project(":extensions:common:http"))
api(project(":extensions:common:iam:oauth2:oauth2-client"))
api(project(":extensions:common:validator:validator-data-address-http-data"))
api(project(":extensions:control-plane:api:management-api"))
api(project(":extensions:control-plane:callback:callback-event-dispatcher"))
api(project(":extensions:control-plane:callback:callback-static-endpoint"))
Expand Down
1 change: 0 additions & 1 deletion dist/bom/controlplane-virtual-base-bom/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ dependencies {

api(project(":extensions:common:http"))
api(project(":extensions:common:iam:oauth2:oauth2-client"))
api(project(":extensions:common:validator:validator-data-address-http-data"))
api(project(":extensions:control-plane:api:management-api-v5"))
api(project(":extensions:common:api:json-ld-cache-api"))
api(project(":extensions:common:api:management-api-authorization"))
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading