eclipse-edc · bscholtes1A · Apr 21, 2022 · Mar 30, 2022
diff --git a/common/util/src/main/java/org/eclipse/dataspaceconnector/common/string/StringUtils.java b/common/util/src/main/java/org/eclipse/dataspaceconnector/common/string/StringUtils.java
@@ -14,7 +14,6 @@
 
 package org.eclipse.dataspaceconnector.common.string;
 
-import java.util.List;
 import java.util.Objects;
 
 public class StringUtils {

diff --git a/common/util/src/test/java/org/eclipse/dataspaceconnector/common/string/StringUtilsTest.java b/common/util/src/test/java/org/eclipse/dataspaceconnector/common/string/StringUtilsTest.java
@@ -16,10 +16,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 class StringUtilsTest {

diff --git a/core/boot/src/main/java/org/eclipse/dataspaceconnector/boot/system/runtime/BaseRuntime.java b/core/boot/src/main/java/org/eclipse/dataspaceconnector/boot/system/runtime/BaseRuntime.java
@@ -34,7 +34,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicReference;
 
 import static java.lang.Runtime.getRuntime;

diff --git a/...src/main/java/org/eclipse/dataspaceconnector/contract/offer/ContractOfferServiceImpl.java b/...src/main/java/org/eclipse/dataspaceconnector/contract/offer/ContractOfferServiceImpl.java
@@ -31,8 +31,6 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Stream;
 

diff --git a/...ava/org/eclipse/dataspaceconnector/contract/validation/ContractValidationServiceImpl.java b/...ava/org/eclipse/dataspaceconnector/contract/validation/ContractValidationServiceImpl.java
@@ -33,7 +33,6 @@
 
 import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Objects;
 
 import static java.lang.String.format;
 import static org.eclipse.dataspaceconnector.contract.common.ContractId.DEFINITION_PART;

diff --git a/...e/dataspaceconnector/contract/negotiation/AbstractContractNegotiationIntegrationTest.java b/...e/dataspaceconnector/contract/negotiation/AbstractContractNegotiationIntegrationTest.java
@@ -49,7 +49,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 
-import static org.eclipse.dataspaceconnector.spi.response.ResponseStatus.FATAL_ERROR;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

diff --git a/...e/dataspaceconnector/contract/negotiation/ConsumerContractNegotiationManagerImplTest.java b/...e/dataspaceconnector/contract/negotiation/ConsumerContractNegotiationManagerImplTest.java
@@ -46,7 +46,6 @@
 import static java.util.concurrent.CompletableFuture.failedFuture;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.eclipse.dataspaceconnector.spi.response.ResponseStatus.FATAL_ERROR;
 import static org.eclipse.dataspaceconnector.spi.types.domain.contract.negotiation.ContractNegotiationStates.CONFIRMED;
 import static org.eclipse.dataspaceconnector.spi.types.domain.contract.negotiation.ContractNegotiationStates.CONSUMER_APPROVED;
 import static org.eclipse.dataspaceconnector.spi.types.domain.contract.negotiation.ContractNegotiationStates.CONSUMER_APPROVING;

diff --git a/...e/dataspaceconnector/contract/negotiation/ProviderContractNegotiationManagerImplTest.java b/...e/dataspaceconnector/contract/negotiation/ProviderContractNegotiationManagerImplTest.java
@@ -49,7 +49,6 @@
 import static java.util.concurrent.CompletableFuture.failedFuture;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.eclipse.dataspaceconnector.spi.response.ResponseStatus.FATAL_ERROR;
 import static org.eclipse.dataspaceconnector.spi.types.domain.contract.negotiation.ContractNegotiationStates.CONFIRMED;
 import static org.eclipse.dataspaceconnector.spi.types.domain.contract.negotiation.ContractNegotiationStates.CONFIRMING;
 import static org.eclipse.dataspaceconnector.spi.types.domain.contract.negotiation.ContractNegotiationStates.DECLINED;

diff --git a/...java/org/eclipse/dataspaceconnector/contract/offer/ContractDefinitionServiceImplTest.java b/...java/org/eclipse/dataspaceconnector/contract/offer/ContractDefinitionServiceImplTest.java
@@ -28,7 +28,6 @@
 
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.eclipse.dataspaceconnector.spi.asset.AssetSelectorExpression.SELECT_ALL;
@@ -39,7 +38,6 @@
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 

diff --git a/...test/java/org/eclipse/dataspaceconnector/contract/offer/ContractOfferServiceImplTest.java b/...test/java/org/eclipse/dataspaceconnector/contract/offer/ContractOfferServiceImplTest.java
@@ -27,15 +27,13 @@
 import org.eclipse.dataspaceconnector.spi.policy.store.PolicyStore;
 import org.eclipse.dataspaceconnector.spi.types.domain.asset.Asset;
 import org.eclipse.dataspaceconnector.spi.types.domain.contract.offer.ContractDefinition;
-import org.eclipse.dataspaceconnector.spi.types.domain.contract.offer.ContractOffer;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.util.stream.Stream;
 
 import static java.util.Collections.emptyMap;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.mock;

diff --git a/...va/org/eclipse/dataspaceconnector/ids/api/multipart/handler/ContractAgreementHandler.java b/...va/org/eclipse/dataspaceconnector/ids/api/multipart/handler/ContractAgreementHandler.java
@@ -22,7 +22,6 @@
 import org.eclipse.dataspaceconnector.ids.api.multipart.message.MultipartResponse;
 import org.eclipse.dataspaceconnector.ids.spi.transform.ContractTransformerInput;
 import org.eclipse.dataspaceconnector.ids.spi.transform.IdsTransformerRegistry;
-import org.eclipse.dataspaceconnector.spi.asset.AssetIndex;
 import org.eclipse.dataspaceconnector.spi.contract.negotiation.ConsumerContractNegotiationManager;
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
 import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
@@ -37,7 +36,6 @@
 import java.util.Objects;
 
 import static org.eclipse.dataspaceconnector.ids.api.multipart.util.RejectionMessageUtil.badParameters;
-import static org.eclipse.dataspaceconnector.spi.response.ResponseStatus.FATAL_ERROR;
 
 /**
  * This class handles and processes incoming IDS {@link ContractAgreementMessage}s.

diff --git a/...n/java/org/eclipse/dataspaceconnector/ids/api/multipart/handler/ContractOfferHandler.java b/...n/java/org/eclipse/dataspaceconnector/ids/api/multipart/handler/ContractOfferHandler.java
@@ -28,7 +28,6 @@
 import org.eclipse.dataspaceconnector.spi.contract.negotiation.ProviderContractNegotiationManager;
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
 import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
-import org.eclipse.dataspaceconnector.spi.result.Result;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/...va/org/eclipse/dataspaceconnector/ids/api/multipart/handler/ContractRejectionHandler.java b/...va/org/eclipse/dataspaceconnector/ids/api/multipart/handler/ContractRejectionHandler.java
@@ -28,7 +28,6 @@
 import java.util.Objects;
 
 import static org.eclipse.dataspaceconnector.ids.api.multipart.util.RejectionMessageUtil.badParameters;
-import static org.eclipse.dataspaceconnector.spi.response.ResponseStatus.FATAL_ERROR;
 
 /**
  * This class handles and processes incoming IDS {@link ContractRejectionMessage}s.

diff --git a/...ain/java/org/eclipse/dataspaceconnector/ids/api/multipart/handler/DescriptionHandler.java b/...ain/java/org/eclipse/dataspaceconnector/ids/api/multipart/handler/DescriptionHandler.java
@@ -29,7 +29,6 @@
 import org.eclipse.dataspaceconnector.spi.EdcException;
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
 import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
-import org.eclipse.dataspaceconnector.spi.result.Result;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Objects;

diff --git a/...nt-v1/src/main/java/org/eclipse/dataspaceconnector/ids/api/multipart/handler/Handler.java b/...nt-v1/src/main/java/org/eclipse/dataspaceconnector/ids/api/multipart/handler/Handler.java
@@ -17,7 +17,6 @@
 import org.eclipse.dataspaceconnector.ids.api.multipart.message.MultipartRequest;
 import org.eclipse.dataspaceconnector.ids.api.multipart.message.MultipartResponse;
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
-import org.eclipse.dataspaceconnector.spi.result.Result;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/.../org/eclipse/dataspaceconnector/ids/api/multipart/handler/NotificationMessageHandler.java b/.../org/eclipse/dataspaceconnector/ids/api/multipart/handler/NotificationMessageHandler.java
@@ -19,7 +19,6 @@
 import org.eclipse.dataspaceconnector.ids.api.multipart.message.MultipartRequest;
 import org.eclipse.dataspaceconnector.ids.api.multipart.message.MultipartResponse;
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
-import org.eclipse.dataspaceconnector.spi.result.Result;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/...aceconnector/ids/api/multipart/handler/description/ArtifactDescriptionRequestHandler.java b/...aceconnector/ids/api/multipart/handler/description/ArtifactDescriptionRequestHandler.java
@@ -21,7 +21,6 @@
 import org.eclipse.dataspaceconnector.spi.asset.AssetIndex;
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
 import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
-import org.eclipse.dataspaceconnector.spi.result.Result;
 import org.eclipse.dataspaceconnector.spi.types.domain.asset.Asset;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/...connector/ids/api/multipart/handler/description/DataCatalogDescriptionRequestHandler.java b/...connector/ids/api/multipart/handler/description/DataCatalogDescriptionRequestHandler.java
@@ -22,7 +22,6 @@
 import org.eclipse.dataspaceconnector.ids.spi.transform.IdsTransformerRegistry;
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
 import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
-import org.eclipse.dataspaceconnector.spi.result.Result;
 import org.eclipse.dataspaceconnector.spi.types.domain.catalog.Catalog;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/...e/dataspaceconnector/ids/api/multipart/handler/description/DescriptionRequestHandler.java b/...e/dataspaceconnector/ids/api/multipart/handler/description/DescriptionRequestHandler.java
@@ -17,7 +17,6 @@
 import de.fraunhofer.iais.eis.DescriptionRequestMessage;
 import org.eclipse.dataspaceconnector.ids.api.multipart.message.MultipartResponse;
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
-import org.eclipse.dataspaceconnector.spi.result.Result;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/...nector/ids/api/multipart/handler/description/RepresentationDescriptionRequestHandler.java b/...nector/ids/api/multipart/handler/description/RepresentationDescriptionRequestHandler.java
@@ -21,7 +21,6 @@
 import org.eclipse.dataspaceconnector.spi.asset.AssetIndex;
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
 import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
-import org.eclipse.dataspaceconnector.spi.result.Result;
 import org.eclipse.dataspaceconnector.spi.types.domain.asset.Asset;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/...aceconnector/ids/api/multipart/handler/description/ResourceDescriptionRequestHandler.java b/...aceconnector/ids/api/multipart/handler/description/ResourceDescriptionRequestHandler.java
@@ -25,7 +25,6 @@
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
 import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
 import org.eclipse.dataspaceconnector.spi.query.Criterion;
-import org.eclipse.dataspaceconnector.spi.result.Result;
 import org.eclipse.dataspaceconnector.spi.types.domain.asset.Asset;
 import org.eclipse.dataspaceconnector.spi.types.domain.contract.offer.ContractOffer;
 import org.jetbrains.annotations.NotNull;

diff --git a/.../main/java/org/eclipse/dataspaceconnector/ids/api/multipart/message/MultipartRequest.java b/.../main/java/org/eclipse/dataspaceconnector/ids/api/multipart/message/MultipartRequest.java
@@ -16,7 +16,6 @@
 
 import de.fraunhofer.iais.eis.Message;
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
-import org.eclipse.dataspaceconnector.spi.result.Result;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/...connector/ids/api/multipart/IdsApiMultipartEndpointV1IntegrationTestServiceExtension.java b/...connector/ids/api/multipart/IdsApiMultipartEndpointV1IntegrationTestServiceExtension.java
@@ -64,7 +64,6 @@
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;

diff --git a/.../eclipse/dataspaceconnector/ids/api/multipart/handler/NotificationMessageHandlerTest.java b/.../eclipse/dataspaceconnector/ids/api/multipart/handler/NotificationMessageHandlerTest.java
@@ -24,7 +24,6 @@
 import org.eclipse.dataspaceconnector.ids.api.multipart.message.MultipartRequest;
 import org.eclipse.dataspaceconnector.ids.api.multipart.message.MultipartResponse;
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
-import org.eclipse.dataspaceconnector.spi.result.Result;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;

diff --git a/...ipse/dataspaceconnector/ids/api/multipart/handler/description/DescriptionHandlerTest.java b/...ipse/dataspaceconnector/ids/api/multipart/handler/description/DescriptionHandlerTest.java
@@ -22,7 +22,6 @@
 import org.eclipse.dataspaceconnector.ids.spi.transform.IdsTransformerRegistry;
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
 import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
-import org.eclipse.dataspaceconnector.spi.result.Result;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

diff --git a/...ore/src/main/java/org/eclipse/dataspaceconnector/ids/core/service/CatalogServiceImpl.java b/...ore/src/main/java/org/eclipse/dataspaceconnector/ids/core/service/CatalogServiceImpl.java
@@ -20,12 +20,9 @@
 import org.eclipse.dataspaceconnector.spi.contract.offer.ContractOfferService;
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
 import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
-import org.eclipse.dataspaceconnector.spi.result.Result;
 import org.eclipse.dataspaceconnector.spi.types.domain.catalog.Catalog;
-import org.eclipse.dataspaceconnector.spi.types.domain.contract.offer.ContractOffer;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.List;
 import java.util.Objects;
 
 import static java.util.stream.Collectors.toList;

diff --git a/...e/src/main/java/org/eclipse/dataspaceconnector/ids/core/service/ConnectorServiceImpl.java b/...e/src/main/java/org/eclipse/dataspaceconnector/ids/core/service/ConnectorServiceImpl.java
@@ -21,7 +21,6 @@
 import org.eclipse.dataspaceconnector.ids.spi.version.ConnectorVersionProvider;
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
 import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
-import org.eclipse.dataspaceconnector.spi.result.Result;
 import org.eclipse.dataspaceconnector.spi.types.domain.catalog.Catalog;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/...src/test/java/org/eclipse/dataspaceconnector/ids/core/service/CatalogServiceImplTest.java b/...src/test/java/org/eclipse/dataspaceconnector/ids/core/service/CatalogServiceImplTest.java
@@ -19,7 +19,6 @@
 import org.eclipse.dataspaceconnector.spi.contract.offer.ContractOfferService;
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
 import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
-import org.eclipse.dataspaceconnector.spi.result.Result;
 import org.eclipse.dataspaceconnector.spi.types.domain.contract.offer.ContractOffer;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/...c/test/java/org/eclipse/dataspaceconnector/ids/core/service/ConnectorServiceImplTest.java b/...c/test/java/org/eclipse/dataspaceconnector/ids/core/service/ConnectorServiceImplTest.java
@@ -20,7 +20,6 @@
 import org.eclipse.dataspaceconnector.ids.spi.version.ConnectorVersionProvider;
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
 import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
-import org.eclipse.dataspaceconnector.spi.result.Result;
 import org.eclipse.dataspaceconnector.spi.types.domain.catalog.Catalog;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/.../ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/service/CatalogService.java b/.../ids-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/service/CatalogService.java
@@ -15,7 +15,6 @@
 package org.eclipse.dataspaceconnector.ids.spi.service;
 
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
-import org.eclipse.dataspaceconnector.spi.result.Result;
 import org.eclipse.dataspaceconnector.spi.types.domain.catalog.Catalog;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/...ds-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/service/ConnectorService.java b/...ds-spi/src/main/java/org/eclipse/dataspaceconnector/ids/spi/service/ConnectorService.java
@@ -17,7 +17,6 @@
 
 import org.eclipse.dataspaceconnector.ids.spi.types.Connector;
 import org.eclipse.dataspaceconnector.spi.iam.ClaimToken;
-import org.eclipse.dataspaceconnector.spi.result.Result;
 import org.jetbrains.annotations.NotNull;
 
 /**

diff --git a/...aspaceconnector/ids/transform/ContractAgreementToIdsContractAgreementTransformerTest.java b/...aspaceconnector/ids/transform/ContractAgreementToIdsContractAgreementTransformerTest.java
@@ -21,7 +21,6 @@
 import org.eclipse.dataspaceconnector.policy.model.Policy;
 import org.eclipse.dataspaceconnector.policy.model.Prohibition;
 import org.eclipse.dataspaceconnector.spi.transformer.TransformerContext;
-import org.eclipse.dataspaceconnector.spi.types.domain.asset.Asset;
 import org.eclipse.dataspaceconnector.spi.types.domain.contract.agreement.ContractAgreement;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/...ava/org/eclipse/dataspaceconnector/api/datamanagement/asset/service/AssetServiceImpl.java b/...ava/org/eclipse/dataspaceconnector/api/datamanagement/asset/service/AssetServiceImpl.java
@@ -27,7 +27,6 @@
 
 import static java.lang.String.format;
 import static java.util.stream.Collectors.toList;
-import static org.eclipse.dataspaceconnector.spi.types.domain.asset.Asset.PROPERTY_ID;
 
 public class AssetServiceImpl implements AssetService {
     private final AssetIndex index;

diff --git a/...r/api/datamanagement/contractagreement/ContractAgreementApiControllerIntegrationTest.java b/...r/api/datamanagement/contractagreement/ContractAgreementApiControllerIntegrationTest.java
@@ -31,10 +31,8 @@
 
 import static io.restassured.RestAssured.given;
 import static io.restassured.http.ContentType.JSON;
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.eclipse.dataspaceconnector.common.testfixtures.TestUtils.getFreePort;
 import static org.hamcrest.CoreMatchers.is;
-import static org.mockito.Mockito.mock;
 
 @ExtendWith(EdcExtension.class)
 public class ContractAgreementApiControllerIntegrationTest {

diff --git a/...aceconnector/api/datamanagement/contractagreement/ContractAgreementApiControllerTest.java b/...aceconnector/api/datamanagement/contractagreement/ContractAgreementApiControllerTest.java
@@ -24,7 +24,6 @@
 import org.eclipse.dataspaceconnector.spi.query.Criterion;
 import org.eclipse.dataspaceconnector.spi.query.SortOrder;
 import org.eclipse.dataspaceconnector.spi.result.Result;
-import org.eclipse.dataspaceconnector.spi.types.domain.asset.Asset;
 import org.eclipse.dataspaceconnector.spi.types.domain.contract.agreement.ContractAgreement;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/...t/contractagreement/transform/ContractAgreementToContractAgreementDtoTransformerTest.java b/...t/contractagreement/transform/ContractAgreementToContractAgreementDtoTransformerTest.java
@@ -16,7 +16,6 @@
 
 import org.eclipse.dataspaceconnector.policy.model.Policy;
 import org.eclipse.dataspaceconnector.spi.transformer.TransformerContext;
-import org.eclipse.dataspaceconnector.spi.types.domain.asset.Asset;
 import org.eclipse.dataspaceconnector.spi.types.domain.contract.agreement.ContractAgreement;
 import org.junit.jupiter.api.Test;
 

diff --git a/...api/datamanagement/contractdefinition/ContractDefinitionApiControllerIntegrationTest.java b/...api/datamanagement/contractdefinition/ContractDefinitionApiControllerIntegrationTest.java
@@ -19,7 +19,6 @@
 import org.eclipse.dataspaceconnector.api.datamanagement.contractdefinition.model.ContractDefinitionDto;
 import org.eclipse.dataspaceconnector.dataloading.ContractDefinitionLoader;
 import org.eclipse.dataspaceconnector.junit.launcher.EdcExtension;
-import org.eclipse.dataspaceconnector.policy.model.Policy;
 import org.eclipse.dataspaceconnector.spi.asset.AssetSelectorExpression;
 import org.eclipse.dataspaceconnector.spi.contract.offer.store.ContractDefinitionStore;
 import org.eclipse.dataspaceconnector.spi.types.domain.contract.offer.ContractDefinition;

diff --git a/...econnector/api/datamanagement/contractdefinition/ContractDefinitionApiControllerTest.java b/...econnector/api/datamanagement/contractdefinition/ContractDefinitionApiControllerTest.java
@@ -20,7 +20,6 @@
 import org.eclipse.dataspaceconnector.api.exception.ObjectNotFoundException;
 import org.eclipse.dataspaceconnector.api.result.ServiceResult;
 import org.eclipse.dataspaceconnector.api.transformer.DtoTransformerRegistry;
-import org.eclipse.dataspaceconnector.policy.model.Policy;
 import org.eclipse.dataspaceconnector.spi.asset.AssetSelectorExpression;
 import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
 import org.eclipse.dataspaceconnector.spi.query.Criterion;

diff --git a/...ctor/api/datamanagement/contractdefinition/service/ContractDefinitionServiceImplTest.java b/...ctor/api/datamanagement/contractdefinition/service/ContractDefinitionServiceImplTest.java
@@ -15,7 +15,6 @@
 package org.eclipse.dataspaceconnector.api.datamanagement.contractdefinition.service;
 
 import org.eclipse.dataspaceconnector.dataloading.ContractDefinitionLoader;
-import org.eclipse.dataspaceconnector.policy.model.Policy;
 import org.eclipse.dataspaceconnector.spi.asset.AssetSelectorExpression;
 import org.eclipse.dataspaceconnector.spi.contract.offer.store.ContractDefinitionStore;
 import org.eclipse.dataspaceconnector.spi.query.QuerySpec;

diff --git a/...onnector/api/datamanagement/contractnegotiation/ContractNegotiationApiControllerTest.java b/...onnector/api/datamanagement/contractnegotiation/ContractNegotiationApiControllerTest.java
@@ -29,7 +29,6 @@
 import org.eclipse.dataspaceconnector.spi.query.Criterion;
 import org.eclipse.dataspaceconnector.spi.query.SortOrder;
 import org.eclipse.dataspaceconnector.spi.result.Result;
-import org.eclipse.dataspaceconnector.spi.types.domain.asset.Asset;
 import org.eclipse.dataspaceconnector.spi.types.domain.contract.agreement.ContractAgreement;
 import org.eclipse.dataspaceconnector.spi.types.domain.contract.negotiation.ContractNegotiation;
 import org.eclipse.dataspaceconnector.spi.types.domain.contract.negotiation.ContractOfferRequest;

diff --git a/...contractnegotiation/transform/ContractAgreementToContractAgreementDtoTransformerTest.java b/...contractnegotiation/transform/ContractAgreementToContractAgreementDtoTransformerTest.java
@@ -16,7 +16,6 @@
 
 import org.eclipse.dataspaceconnector.policy.model.Policy;
 import org.eclipse.dataspaceconnector.spi.transformer.TransformerContext;
-import org.eclipse.dataspaceconnector.spi.types.domain.asset.Asset;
 import org.eclipse.dataspaceconnector.spi.types.domain.contract.agreement.ContractAgreement;
 import org.junit.jupiter.api.Test;
 

diff --git a/...ractnegotiation/transform/ContractNegotiationToContractNegotiationDtoTransformerTest.java b/...ractnegotiation/transform/ContractNegotiationToContractNegotiationDtoTransformerTest.java
@@ -16,7 +16,6 @@
 
 import org.eclipse.dataspaceconnector.policy.model.Policy;
 import org.eclipse.dataspaceconnector.spi.transformer.TransformerContext;
-import org.eclipse.dataspaceconnector.spi.types.domain.asset.Asset;
 import org.eclipse.dataspaceconnector.spi.types.domain.contract.agreement.ContractAgreement;
 import org.eclipse.dataspaceconnector.spi.types.domain.contract.negotiation.ContractNegotiation;
 import org.eclipse.dataspaceconnector.spi.types.domain.contract.negotiation.ContractNegotiationStates;

diff --git a/...amanagement/transferprocess/transform/TransferProcessToTransferProcessDtoTransformer.java b/...amanagement/transferprocess/transform/TransferProcessToTransferProcessDtoTransformer.java
@@ -23,8 +23,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Objects;
-
 public class TransferProcessToTransferProcessDtoTransformer implements DtoTransformer<TransferProcess, TransferProcessDto> {
 
     @Override

diff --git a/...-plane-s3/src/main/java/org/eclipse/dataspaceconnector/aws/dataplane/s3/S3DataSource.java b/...-plane-s3/src/main/java/org/eclipse/dataspaceconnector/aws/dataplane/s3/S3DataSource.java
@@ -15,7 +15,6 @@
 package org.eclipse.dataspaceconnector.aws.dataplane.s3;
 
 import org.eclipse.dataspaceconnector.dataplane.spi.pipeline.DataSource;
-import org.eclipse.dataspaceconnector.spi.monitor.Monitor;
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.model.GetObjectRequest;
 import software.amazon.awssdk.services.s3.model.HeadObjectRequest;