chore: fix compile errors (#144)

* chore: fix compile errors * DEPENDENCIES
eclipse-edc · Nov 7, 2023 · 7e070bb · 7e070bb
1 parent f7e299c
commit 7e070bb
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 52 deletions.
diff --git a/DEPENDENCIES b/DEPENDENCIES
diff --git a/...catalog-core/src/main/java/org/eclipse/edc/catalog/cache/query/BatchedRequestFetcher.java b/...catalog-core/src/main/java/org/eclipse/edc/catalog/cache/query/BatchedRequestFetcher.java
@@ -20,7 +20,6 @@
 import org.eclipse.edc.catalog.spi.Catalog;
 import org.eclipse.edc.catalog.spi.CatalogConstants;
 import org.eclipse.edc.catalog.spi.CatalogRequestMessage;
-import org.eclipse.edc.connector.contract.spi.types.offer.ContractOffer;
 import org.eclipse.edc.jsonld.spi.JsonLd;
 import org.eclipse.edc.spi.EdcException;
 import org.eclipse.edc.spi.message.Range;
@@ -29,6 +28,7 @@
 import org.eclipse.edc.spi.query.QuerySpec;
 import org.eclipse.edc.spi.response.StatusResult;
 import org.eclipse.edc.spi.result.Failure;
+import org.eclipse.edc.spi.types.domain.offer.ContractOffer;
 import org.eclipse.edc.transform.spi.TypeTransformerRegistry;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/...src/test/java/org/eclipse/edc/catalog/defaults/store/InMemoryFederatedCacheStoreTest.java b/...src/test/java/org/eclipse/edc/catalog/defaults/store/InMemoryFederatedCacheStoreTest.java
@@ -18,9 +18,9 @@
 import org.eclipse.edc.catalog.spi.Catalog;
 import org.eclipse.edc.catalog.spi.CatalogConstants;
 import org.eclipse.edc.catalog.store.InMemoryFederatedCacheStore;
-import org.eclipse.edc.connector.contract.spi.types.offer.ContractOffer;
 import org.eclipse.edc.policy.model.Policy;
 import org.eclipse.edc.spi.types.domain.asset.Asset;
+import org.eclipse.edc.spi.types.domain.offer.ContractOffer;
 import org.eclipse.edc.util.concurrency.LockManager;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/core/federated-catalog-core/src/testFixtures/java/org/eclipse/edc/catalog/test/TestUtil.java b/core/federated-catalog-core/src/testFixtures/java/org/eclipse/edc/catalog/test/TestUtil.java
@@ -20,8 +20,8 @@
 import org.eclipse.edc.catalog.spi.Distribution;
 import org.eclipse.edc.catalog.spi.FederatedCacheNode;
 import org.eclipse.edc.catalog.spi.WorkItem;
-import org.eclipse.edc.connector.contract.spi.types.offer.ContractOffer;
 import org.eclipse.edc.policy.model.Policy;
+import org.eclipse.edc.spi.types.domain.offer.ContractOffer;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;

diff --git a/...ated-catalog-api/src/main/java/org/eclipse/edc/catalog/api/query/FederatedCatalogApi.java b/...ated-catalog-api/src/main/java/org/eclipse/edc/catalog/api/query/FederatedCatalogApi.java
@@ -23,7 +23,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.json.JsonArray;
 import org.eclipse.edc.catalog.spi.model.FederatedCatalogCacheQuery;
-import org.eclipse.edc.connector.contract.spi.types.offer.ContractOffer;
+import org.eclipse.edc.spi.types.domain.offer.ContractOffer;
 
 @OpenAPIDefinition
 @Tag(name = "Federated Catalog")

diff --git a/spi/federated-catalog-spi/src/main/java/org/eclipse/edc/catalog/spi/FederatedCacheStore.java b/spi/federated-catalog-spi/src/main/java/org/eclipse/edc/catalog/spi/FederatedCacheStore.java
@@ -14,9 +14,9 @@
 
 package org.eclipse.edc.catalog.spi;
 
-import org.eclipse.edc.connector.contract.spi.types.offer.ContractOffer;
 import org.eclipse.edc.runtime.metamodel.annotation.ExtensionPoint;
 import org.eclipse.edc.spi.query.Criterion;
+import org.eclipse.edc.spi.types.domain.offer.ContractOffer;
 
 import java.util.Collection;
 import java.util.List;

diff --git a/system-tests/component-tests/src/test/java/org/eclipse/edc/catalog/TestFunctions.java b/system-tests/component-tests/src/test/java/org/eclipse/edc/catalog/TestFunctions.java
@@ -30,13 +30,13 @@
 import org.eclipse.edc.catalog.spi.FederatedCacheNode;
 import org.eclipse.edc.catalog.spi.FederatedCacheNodeDirectory;
 import org.eclipse.edc.catalog.spi.model.FederatedCatalogCacheQuery;
-import org.eclipse.edc.connector.contract.spi.types.offer.ContractOffer;
 import org.eclipse.edc.jsonld.TitaniumJsonLd;
 import org.eclipse.edc.jsonld.spi.JsonLd;
 import org.eclipse.edc.policy.model.Policy;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.response.StatusResult;
 import org.eclipse.edc.spi.result.Result;
+import org.eclipse.edc.spi.types.domain.offer.ContractOffer;
 
 import java.util.ArrayList;
 import java.util.Collections;