From 4d43a809cee85fb13234613b26692b53be5c30cd Mon Sep 17 00:00:00 2001 From: Paul Latzelsperger Date: Sat, 30 Mar 2024 14:01:28 +0100 Subject: [PATCH] chore(compile): fix compile errors after EDC refactor --- build.gradle.kts | 8 -------- .../org/eclipse/edc/gcp/common/GcpAccessToken.java | 2 +- .../gcp/GcsConsumerResourceDefinitionGenerator.java | 6 +++--- .../connector/provision/gcp/GcsProvisionExtension.java | 4 ++-- .../provision/gcp/GcsProvisionedResource.java | 4 ++-- .../edc/connector/provision/gcp/GcsProvisioner.java | 10 +++++----- .../connector/provision/gcp/GcsResourceDefinition.java | 3 ++- .../GcsConsumerResourceDefinitionGeneratorTest.java | 4 ++-- 8 files changed, 17 insertions(+), 24 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 09af4bd..56ed05f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -52,12 +52,4 @@ allprojects { configFile = rootProject.file("resources/checkstyle-config.xml") configDirectory.set(rootProject.file("resources")) } - - // EdcRuntimeExtension uses this to determine the runtime classpath of the module to run. - tasks.register("printClasspath") { - doLast { - println(sourceSets["main"].runtimeClasspath.asPath) - } - } - } diff --git a/extensions/common/gcp/gcp-core/src/main/java/org/eclipse/edc/gcp/common/GcpAccessToken.java b/extensions/common/gcp/gcp-core/src/main/java/org/eclipse/edc/gcp/common/GcpAccessToken.java index b762506..958700e 100644 --- a/extensions/common/gcp/gcp-core/src/main/java/org/eclipse/edc/gcp/common/GcpAccessToken.java +++ b/extensions/common/gcp/gcp-core/src/main/java/org/eclipse/edc/gcp/common/GcpAccessToken.java @@ -16,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import org.eclipse.edc.connector.transfer.spi.types.SecretToken; +import org.eclipse.edc.connector.controlplane.transfer.spi.types.SecretToken; @JsonTypeName("dataspaceconnector:gcptoken") public class GcpAccessToken implements SecretToken { diff --git a/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsConsumerResourceDefinitionGenerator.java b/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsConsumerResourceDefinitionGenerator.java index e650ed9..f80f684 100644 --- a/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsConsumerResourceDefinitionGenerator.java +++ b/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsConsumerResourceDefinitionGenerator.java @@ -16,9 +16,9 @@ package org.eclipse.edc.connector.provision.gcp; -import org.eclipse.edc.connector.transfer.spi.provision.ConsumerResourceDefinitionGenerator; -import org.eclipse.edc.connector.transfer.spi.types.ResourceDefinition; -import org.eclipse.edc.connector.transfer.spi.types.TransferProcess; +import org.eclipse.edc.connector.controlplane.transfer.spi.provision.ConsumerResourceDefinitionGenerator; +import org.eclipse.edc.connector.controlplane.transfer.spi.types.ResourceDefinition; +import org.eclipse.edc.connector.controlplane.transfer.spi.types.TransferProcess; import org.eclipse.edc.gcp.storage.GcsStoreSchema; import org.eclipse.edc.policy.model.Policy; import org.jetbrains.annotations.Nullable; diff --git a/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsProvisionExtension.java b/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsProvisionExtension.java index 75e28a4..d53ea6d 100644 --- a/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsProvisionExtension.java +++ b/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsProvisionExtension.java @@ -16,8 +16,8 @@ import com.google.cloud.storage.Storage; import com.google.cloud.storage.StorageOptions; -import org.eclipse.edc.connector.transfer.spi.provision.ProvisionManager; -import org.eclipse.edc.connector.transfer.spi.provision.ResourceManifestGenerator; +import org.eclipse.edc.connector.controlplane.transfer.spi.provision.ProvisionManager; +import org.eclipse.edc.connector.controlplane.transfer.spi.provision.ResourceManifestGenerator; import org.eclipse.edc.gcp.common.GcpConfiguration; import org.eclipse.edc.gcp.iam.IamService; import org.eclipse.edc.gcp.storage.StorageServiceImpl; diff --git a/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsProvisionedResource.java b/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsProvisionedResource.java index dee832d..fd6b985 100644 --- a/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsProvisionedResource.java +++ b/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsProvisionedResource.java @@ -18,7 +18,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; -import org.eclipse.edc.connector.transfer.spi.types.ProvisionedDataDestinationResource; +import org.eclipse.edc.connector.controlplane.transfer.spi.types.ProvisionedDataDestinationResource; import org.eclipse.edc.gcp.storage.GcsStoreSchema; import static org.eclipse.edc.gcp.storage.GcsStoreSchema.BUCKET_NAME; @@ -26,7 +26,7 @@ import static org.eclipse.edc.gcp.storage.GcsStoreSchema.SERVICE_ACCOUNT_EMAIL; import static org.eclipse.edc.gcp.storage.GcsStoreSchema.SERVICE_ACCOUNT_NAME; import static org.eclipse.edc.gcp.storage.GcsStoreSchema.STORAGE_CLASS; -import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE; +import static org.eclipse.edc.spi.constants.CoreConstants.EDC_NAMESPACE; @JsonDeserialize(builder = GcsProvisionedResource.Builder.class) @JsonTypeName("dataspaceconnector:gcsgrovisionedresource") diff --git a/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsProvisioner.java b/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsProvisioner.java index c2543c5..2ebc41b 100644 --- a/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsProvisioner.java +++ b/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsProvisioner.java @@ -15,11 +15,11 @@ package org.eclipse.edc.connector.provision.gcp; import com.google.common.collect.ImmutableList; -import org.eclipse.edc.connector.transfer.spi.provision.Provisioner; -import org.eclipse.edc.connector.transfer.spi.types.DeprovisionedResource; -import org.eclipse.edc.connector.transfer.spi.types.ProvisionResponse; -import org.eclipse.edc.connector.transfer.spi.types.ProvisionedResource; -import org.eclipse.edc.connector.transfer.spi.types.ResourceDefinition; +import org.eclipse.edc.connector.controlplane.transfer.spi.provision.Provisioner; +import org.eclipse.edc.connector.controlplane.transfer.spi.types.DeprovisionedResource; +import org.eclipse.edc.connector.controlplane.transfer.spi.types.ProvisionResponse; +import org.eclipse.edc.connector.controlplane.transfer.spi.types.ProvisionedResource; +import org.eclipse.edc.connector.controlplane.transfer.spi.types.ResourceDefinition; import org.eclipse.edc.gcp.common.GcpAccessToken; import org.eclipse.edc.gcp.common.GcpConfiguration; import org.eclipse.edc.gcp.common.GcpException; diff --git a/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsResourceDefinition.java b/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsResourceDefinition.java index 4748bd5..8c0e4d1 100644 --- a/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsResourceDefinition.java +++ b/extensions/control-plane/provision/provision-gcs/src/main/java/org/eclipse/edc/connector/provision/gcp/GcsResourceDefinition.java @@ -14,7 +14,8 @@ package org.eclipse.edc.connector.provision.gcp; -import org.eclipse.edc.connector.transfer.spi.types.ResourceDefinition; + +import org.eclipse.edc.connector.controlplane.transfer.spi.types.ResourceDefinition; import java.util.Objects; diff --git a/extensions/control-plane/provision/provision-gcs/src/test/java/org/eclipse/edc/connector/provision/gcp/GcsConsumerResourceDefinitionGeneratorTest.java b/extensions/control-plane/provision/provision-gcs/src/test/java/org/eclipse/edc/connector/provision/gcp/GcsConsumerResourceDefinitionGeneratorTest.java index ffe5ac9..4ced5cc 100644 --- a/extensions/control-plane/provision/provision-gcs/src/test/java/org/eclipse/edc/connector/provision/gcp/GcsConsumerResourceDefinitionGeneratorTest.java +++ b/extensions/control-plane/provision/provision-gcs/src/test/java/org/eclipse/edc/connector/provision/gcp/GcsConsumerResourceDefinitionGeneratorTest.java @@ -15,11 +15,11 @@ package org.eclipse.edc.connector.provision.gcp; -import org.eclipse.edc.connector.transfer.spi.types.TransferProcess; +import org.eclipse.edc.connector.controlplane.asset.spi.domain.Asset; +import org.eclipse.edc.connector.controlplane.transfer.spi.types.TransferProcess; import org.eclipse.edc.gcp.storage.GcsStoreSchema; import org.eclipse.edc.policy.model.Policy; import org.eclipse.edc.spi.types.domain.DataAddress; -import org.eclipse.edc.spi.types.domain.asset.Asset; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test;