chore: Remove aggregate-service-spi and move result classes to core-s…

…pi (#3578) Remove aggregate-service-spi and move result classes to core-spi
eclipse-edc · Oct 30, 2023 · 32f44af · 32f44af
1 parent a93a66c
commit 32f44af
Show file tree

Hide file tree

Showing 63 changed files with 122 additions and 179 deletions.
diff --git a/...va/org/eclipse/edc/connector/contract/negotiation/ContractNegotiationIntegrationTest.java b/...va/org/eclipse/edc/connector/contract/negotiation/ContractNegotiationIntegrationTest.java
@@ -38,13 +38,13 @@
 import org.eclipse.edc.policy.model.Duty;
 import org.eclipse.edc.policy.model.Policy;
 import org.eclipse.edc.policy.model.PolicyType;
-import org.eclipse.edc.service.spi.result.ServiceResult;
 import org.eclipse.edc.spi.iam.ClaimToken;
 import org.eclipse.edc.spi.message.RemoteMessageDispatcherRegistry;
 import org.eclipse.edc.spi.monitor.ConsoleMonitor;
 import org.eclipse.edc.spi.protocol.ProtocolWebhook;
 import org.eclipse.edc.spi.response.StatusResult;
 import org.eclipse.edc.spi.result.Result;
+import org.eclipse.edc.spi.result.ServiceResult;
 import org.eclipse.edc.spi.telemetry.Telemetry;
 import org.eclipse.edc.spi.types.domain.callback.CallbackAddress;
 import org.eclipse.edc.transaction.spi.NoopTransactionContext;

diff --git a/...gate-services/src/main/java/org/eclipse/edc/connector/service/asset/AssetServiceImpl.java b/...gate-services/src/main/java/org/eclipse/edc/connector/service/asset/AssetServiceImpl.java
@@ -18,10 +18,10 @@
 import org.eclipse.edc.connector.contract.spi.negotiation.store.ContractNegotiationStore;
 import org.eclipse.edc.connector.service.query.QueryValidator;
 import org.eclipse.edc.connector.spi.asset.AssetService;
-import org.eclipse.edc.service.spi.result.ServiceResult;
 import org.eclipse.edc.spi.asset.AssetIndex;
 import org.eclipse.edc.spi.query.Criterion;
 import org.eclipse.edc.spi.query.QuerySpec;
+import org.eclipse.edc.spi.result.ServiceResult;
 import org.eclipse.edc.spi.types.domain.asset.Asset;
 import org.eclipse.edc.transaction.spi.TransactionContext;
 import org.eclipse.edc.validator.spi.DataAddressValidatorRegistry;

diff --git a/...s/src/main/java/org/eclipse/edc/connector/service/catalog/CatalogProtocolServiceImpl.java b/...s/src/main/java/org/eclipse/edc/connector/service/catalog/CatalogProtocolServiceImpl.java
@@ -20,9 +20,9 @@
 import org.eclipse.edc.catalog.spi.Dataset;
 import org.eclipse.edc.catalog.spi.DatasetResolver;
 import org.eclipse.edc.connector.spi.catalog.CatalogProtocolService;
-import org.eclipse.edc.service.spi.result.ServiceResult;
 import org.eclipse.edc.spi.agent.ParticipantAgentService;
 import org.eclipse.edc.spi.iam.ClaimToken;
+import org.eclipse.edc.spi.result.ServiceResult;
 import org.jetbrains.annotations.NotNull;
 
 import static java.lang.String.format;

diff --git a/...ava/org/eclipse/edc/connector/service/contractagreement/ContractAgreementServiceImpl.java b/...ava/org/eclipse/edc/connector/service/contractagreement/ContractAgreementServiceImpl.java
@@ -19,8 +19,8 @@
 import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiation;
 import org.eclipse.edc.connector.service.query.QueryValidator;
 import org.eclipse.edc.connector.spi.contractagreement.ContractAgreementService;
-import org.eclipse.edc.service.spi.result.ServiceResult;
 import org.eclipse.edc.spi.query.QuerySpec;
+import org.eclipse.edc.spi.result.ServiceResult;
 import org.eclipse.edc.transaction.spi.TransactionContext;
 
 import java.util.stream.Stream;

diff --git a/...a/org/eclipse/edc/connector/service/contractdefinition/ContractDefinitionServiceImpl.java b/...a/org/eclipse/edc/connector/service/contractdefinition/ContractDefinitionServiceImpl.java
@@ -19,8 +19,8 @@
 import org.eclipse.edc.connector.contract.spi.types.offer.ContractDefinition;
 import org.eclipse.edc.connector.service.query.QueryValidator;
 import org.eclipse.edc.connector.spi.contractdefinition.ContractDefinitionService;
-import org.eclipse.edc.service.spi.result.ServiceResult;
 import org.eclipse.edc.spi.query.QuerySpec;
+import org.eclipse.edc.spi.result.ServiceResult;
 import org.eclipse.edc.transaction.spi.TransactionContext;
 
 import java.util.stream.Stream;

diff --git a/...pse/edc/connector/service/contractnegotiation/ContractNegotiationProtocolServiceImpl.java b/...pse/edc/connector/service/contractnegotiation/ContractNegotiationProtocolServiceImpl.java
@@ -29,9 +29,9 @@
 import org.eclipse.edc.connector.contract.spi.validation.ContractValidationService;
 import org.eclipse.edc.connector.contract.spi.validation.ValidatedConsumerOffer;
 import org.eclipse.edc.connector.spi.contractnegotiation.ContractNegotiationProtocolService;
-import org.eclipse.edc.service.spi.result.ServiceResult;
 import org.eclipse.edc.spi.iam.ClaimToken;
 import org.eclipse.edc.spi.monitor.Monitor;
+import org.eclipse.edc.spi.result.ServiceResult;
 import org.eclipse.edc.spi.telemetry.Telemetry;
 import org.eclipse.edc.transaction.spi.TransactionContext;
 import org.jetbrains.annotations.NotNull;
@@ -157,7 +157,7 @@ public ServiceResult<ContractNegotiation> notifyTerminated(ContractNegotiationTe
                     observable.invokeForEach(l -> l.terminated(negotiation));
                 }));
     }
-    
+
     @Override
     @WithSpan
     @NotNull

diff --git a/...org/eclipse/edc/connector/service/contractnegotiation/ContractNegotiationServiceImpl.java b/...org/eclipse/edc/connector/service/contractnegotiation/ContractNegotiationServiceImpl.java
@@ -23,9 +23,9 @@
 import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractRequest;
 import org.eclipse.edc.connector.service.query.QueryValidator;
 import org.eclipse.edc.connector.spi.contractnegotiation.ContractNegotiationService;
-import org.eclipse.edc.service.spi.result.ServiceResult;
 import org.eclipse.edc.spi.command.CommandHandlerRegistry;
 import org.eclipse.edc.spi.query.QuerySpec;
+import org.eclipse.edc.spi.result.ServiceResult;
 import org.eclipse.edc.transaction.spi.TransactionContext;
 
 import java.util.Optional;

diff --git a/.../java/org/eclipse/edc/connector/service/policydefinition/PolicyDefinitionServiceImpl.java b/.../java/org/eclipse/edc/connector/service/policydefinition/PolicyDefinitionServiceImpl.java
@@ -28,8 +28,8 @@
 import org.eclipse.edc.policy.model.MultiplicityConstraint;
 import org.eclipse.edc.policy.model.OrConstraint;
 import org.eclipse.edc.policy.model.XoneConstraint;
-import org.eclipse.edc.service.spi.result.ServiceResult;
 import org.eclipse.edc.spi.query.QuerySpec;
+import org.eclipse.edc.spi.result.ServiceResult;
 import org.eclipse.edc.transaction.spi.TransactionContext;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/...org/eclipse/edc/connector/service/transferprocess/TransferProcessProtocolServiceImpl.java b/...org/eclipse/edc/connector/service/transferprocess/TransferProcessProtocolServiceImpl.java
@@ -30,10 +30,10 @@
 import org.eclipse.edc.connector.transfer.spi.types.protocol.TransferRequestMessage;
 import org.eclipse.edc.connector.transfer.spi.types.protocol.TransferStartMessage;
 import org.eclipse.edc.connector.transfer.spi.types.protocol.TransferTerminationMessage;
-import org.eclipse.edc.service.spi.result.ServiceResult;
 import org.eclipse.edc.spi.iam.ClaimToken;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.result.Result;
+import org.eclipse.edc.spi.result.ServiceResult;
 import org.eclipse.edc.spi.telemetry.Telemetry;
 import org.eclipse.edc.spi.types.domain.DataAddress;
 import org.eclipse.edc.transaction.spi.TransactionContext;

diff --git a/...in/java/org/eclipse/edc/connector/service/transferprocess/TransferProcessServiceImpl.java b/...in/java/org/eclipse/edc/connector/service/transferprocess/TransferProcessServiceImpl.java
@@ -33,10 +33,10 @@
 import org.eclipse.edc.connector.transfer.spi.types.command.DeprovisionCompleteCommand;
 import org.eclipse.edc.connector.transfer.spi.types.command.DeprovisionRequest;
 import org.eclipse.edc.connector.transfer.spi.types.command.TerminateTransferCommand;
-import org.eclipse.edc.service.spi.result.ServiceResult;
 import org.eclipse.edc.spi.command.CommandHandlerRegistry;
 import org.eclipse.edc.spi.query.QuerySpec;
 import org.eclipse.edc.spi.result.AbstractResult;
+import org.eclipse.edc.spi.result.ServiceResult;
 import org.eclipse.edc.transaction.spi.TransactionContext;
 import org.eclipse.edc.validator.spi.DataAddressValidatorRegistry;
 import org.jetbrains.annotations.NotNull;

diff --git a/...-services/src/test/java/org/eclipse/edc/connector/service/asset/AssetServiceImplTest.java b/...-services/src/test/java/org/eclipse/edc/connector/service/asset/AssetServiceImplTest.java
@@ -21,12 +21,12 @@
 import org.eclipse.edc.connector.contract.spi.types.negotiation.ContractNegotiation;
 import org.eclipse.edc.connector.spi.asset.AssetService;
 import org.eclipse.edc.policy.model.Policy;
-import org.eclipse.edc.service.spi.result.ServiceFailure;
-import org.eclipse.edc.service.spi.result.ServiceResult;
 import org.eclipse.edc.spi.asset.AssetIndex;
 import org.eclipse.edc.spi.query.Criterion;
 import org.eclipse.edc.spi.query.QuerySpec;
 import org.eclipse.edc.spi.result.Failure;
+import org.eclipse.edc.spi.result.ServiceFailure;
+import org.eclipse.edc.spi.result.ServiceResult;
 import org.eclipse.edc.spi.result.StoreResult;
 import org.eclipse.edc.spi.types.domain.DataAddress;
 import org.eclipse.edc.spi.types.domain.asset.Asset;
@@ -50,10 +50,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat;
-import static org.eclipse.edc.service.spi.result.ServiceFailure.Reason.BAD_REQUEST;
-import static org.eclipse.edc.service.spi.result.ServiceFailure.Reason.CONFLICT;
-import static org.eclipse.edc.service.spi.result.ServiceFailure.Reason.NOT_FOUND;
 import static org.eclipse.edc.spi.query.Criterion.criterion;
+import static org.eclipse.edc.spi.result.ServiceFailure.Reason.BAD_REQUEST;
+import static org.eclipse.edc.spi.result.ServiceFailure.Reason.CONFLICT;
+import static org.eclipse.edc.spi.result.ServiceFailure.Reason.NOT_FOUND;
 import static org.eclipse.edc.validator.spi.Violation.violation;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 import static org.mockito.AdditionalMatchers.and;
@@ -77,8 +77,7 @@ class AssetServiceImplTest {
     private final AssetObservable observable = mock();
     private final DataAddressValidatorRegistry dataAddressValidator = mock();
 
-    private final AssetService service = new AssetServiceImpl(index, contractNegotiationStore, dummyTransactionContext,
-            observable, dataAddressValidator);
+    private final AssetService service = new AssetServiceImpl(index, contractNegotiationStore, dummyTransactionContext, observable, dataAddressValidator);
 
     @Test
     void findById_shouldRelyOnAssetIndex() {
@@ -102,17 +101,9 @@ void query_shouldRelyOnAssetIndex() {
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {
-            Asset.PROPERTY_ID,
-            Asset.PROPERTY_NAME,
-            Asset.PROPERTY_DESCRIPTION,
-            Asset.PROPERTY_VERSION,
-            Asset.PROPERTY_CONTENT_TYPE
-    })
+    @ValueSource(strings = { Asset.PROPERTY_ID, Asset.PROPERTY_NAME, Asset.PROPERTY_DESCRIPTION, Asset.PROPERTY_VERSION, Asset.PROPERTY_CONTENT_TYPE })
     void query_validFilter(String filter) {
-        var query = QuerySpec.Builder.newInstance()
-                .filter(criterion(filter, "=", "somevalue"))
-                .build();
+        var query = QuerySpec.Builder.newInstance().filter(criterion(filter, "=", "somevalue")).build();
 
         service.query(query);
 
@@ -122,14 +113,11 @@ void query_validFilter(String filter) {
     @ParameterizedTest
     @ArgumentsSource(InvalidFilters.class)
     void query_invalidFilter(Criterion filter) {
-        var query = QuerySpec.Builder.newInstance()
-                .filter(filter)
-                .build();
+        var query = QuerySpec.Builder.newInstance().filter(filter).build();
 
         var result = service.query(query);
 
-        assertThat(result).isFailed()
-                .extracting(Failure::getMessages).asList().hasSize(1);
+        assertThat(result).isFailed().extracting(Failure::getMessages).asList().hasSize(1);
     }
 
     @Test
@@ -166,25 +154,18 @@ void createAsset_shouldNotCreateAssetIfDataAddressInvalid() {
 
         var result = service.create(asset);
 
-        Assertions.assertThat(result).satisfies(ServiceResult::failed)
-                .extracting(ServiceResult::reason)
-                .isEqualTo(BAD_REQUEST);
+        Assertions.assertThat(result).satisfies(ServiceResult::failed).extracting(ServiceResult::reason).isEqualTo(BAD_REQUEST);
         verifyNoInteractions(index);
     }
 
     @Test
     void createAsset_shouldFail_whenPropertiesAreDuplicated() {
-        var asset = createAssetBuilder("assetId")
-                .property("property", "value")
-                .privateProperty("property", "other-value")
-                .build();
+        var asset = createAssetBuilder("assetId").property("property", "value").privateProperty("property", "other-value").build();
         when(dataAddressValidator.validateSource(any())).thenReturn(ValidationResult.success());
 
         var result = service.create(asset);
 
-        assertThat(result).isFailed()
-                .extracting(ServiceFailure::getReason)
-                .isEqualTo(BAD_REQUEST);
+        assertThat(result).isFailed().extracting(ServiceFailure::getReason).isEqualTo(BAD_REQUEST);
         verifyNoInteractions(index);
     }
 
@@ -243,8 +224,7 @@ void delete_verifyCorrectQuery() {
 
         var deleted = service.delete("test-asset");
         assertThat(deleted.succeeded()).isTrue();
-        verify(contractNegotiationStore).queryNegotiations(argThat(argument -> argument.getFilterExpression().size() == 1 &&
-                argument.getFilterExpression().get(0).getOperandLeft().equals("contractAgreement.assetId")));
+        verify(contractNegotiationStore).queryNegotiations(argThat(argument -> argument.getFilterExpression().size() == 1 && argument.getFilterExpression().get(0).getOperandLeft().equals("contractAgreement.assetId")));
     }
 
     @Test
@@ -278,24 +258,18 @@ void updateAsset_shouldReturnNotFound_whenNotExists() {
 
     @Test
     void updateAsset_shouldFail_whenPropertiesAreDuplicated() {
-        var asset = createAssetBuilder("assetId")
-                .property("property", "value")
-                .privateProperty("property", "other-value")
-                .build();
+        var asset = createAssetBuilder("assetId").property("property", "value").privateProperty("property", "other-value").build();
 
         var result = service.update(asset);
 
-        assertThat(result).isFailed()
-                .extracting(ServiceFailure::getReason)
-                .isEqualTo(BAD_REQUEST);
+        assertThat(result).isFailed().extracting(ServiceFailure::getReason).isEqualTo(BAD_REQUEST);
         verifyNoInteractions(index);
     }
 
     private static class InvalidFilters implements ArgumentsProvider {
         @Override
         public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
-            return Stream.of(
-                    arguments(criterion("  asset_prop_id", "in", "(foo, bar)")), // invalid leading whitespace
+            return Stream.of(arguments(criterion("  asset_prop_id", "in", "(foo, bar)")), // invalid leading whitespace
                     arguments(criterion(".customProp", "=", "whatever"))  // invalid leading dot
             );
         }

diff --git a/...c/test/java/org/eclipse/edc/connector/service/catalog/CatalogProtocolServiceImplTest.java b/...c/test/java/org/eclipse/edc/connector/service/catalog/CatalogProtocolServiceImplTest.java
@@ -21,11 +21,11 @@
 import org.eclipse.edc.catalog.spi.DatasetResolver;
 import org.eclipse.edc.catalog.spi.Distribution;
 import org.eclipse.edc.policy.model.Policy;
-import org.eclipse.edc.service.spi.result.ServiceFailure;
 import org.eclipse.edc.spi.agent.ParticipantAgent;
 import org.eclipse.edc.spi.agent.ParticipantAgentService;
 import org.eclipse.edc.spi.iam.ClaimToken;
 import org.eclipse.edc.spi.query.QuerySpec;
+import org.eclipse.edc.spi.result.ServiceFailure;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
@@ -35,7 +35,7 @@
 import static java.util.Collections.emptyMap;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat;
-import static org.eclipse.edc.service.spi.result.ServiceFailure.Reason.NOT_FOUND;
+import static org.eclipse.edc.spi.result.ServiceFailure.Reason.NOT_FOUND;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;

diff --git a/...g/eclipse/edc/connector/service/contractdefinition/ContractDefinitionServiceImplTest.java b/...g/eclipse/edc/connector/service/contractdefinition/ContractDefinitionServiceImplTest.java
@@ -38,9 +38,9 @@
 import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.eclipse.edc.service.spi.result.ServiceFailure.Reason.CONFLICT;
-import static org.eclipse.edc.service.spi.result.ServiceFailure.Reason.NOT_FOUND;
 import static org.eclipse.edc.spi.query.Criterion.criterion;
+import static org.eclipse.edc.spi.result.ServiceFailure.Reason.CONFLICT;
+import static org.eclipse.edc.spi.result.ServiceFailure.Reason.NOT_FOUND;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;