Harmonize key management in data-plane-transfer

Author: bscholtes1A

CHANGELOG.md

@@ -10,6 +10,7 @@ in the detailed section referring to by linking pull requests or issues.
 ## [Unreleased]
 
 ### Overview
+
 * Bugfixing DataManagementApi
 * Build improvements
 * Improvements to Dependency Resolution
@@ -24,12 +25,14 @@ in the detailed section referring to by linking pull requests or issues.
 * Implement Catalog service for Data Management API (#1195)
 * Add strict body validation for REST endpoints (#1128)
 * Dependency injection using factory/provider methods (#1056)
+* Harmonize setting names in `data-plane-transfer` (#1164)
 
 #### Changed
 
 * Restructure sql extension folder tree (#1154)
 * Extract single `PolicyArchive` implementation (#1158)
-* Replace `accessPolicy` and `contractPolicy` with `accessPolicyId` and `contractPolicyId` on `ContractDefinition` (#1144)
+* Replace `accessPolicy` and `contractPolicy` with `accessPolicyId` and `contractPolicyId` on `ContractDefinition` (
+  #1144)
 * All DMgmt Api methods now produce and consume `APPLICATION_JSON` (#1175)
 
 #### Removed

extensions/data-plane-transfer/data-plane-transfer-core/build.gradle.kts extensions/data-plane-transfer/build.gradle.kts

@@ -16,21 +16,16 @@ plugins {
     `java-library`
 }
 
-val nimbusVersion: String by project
 
 dependencies {
-    api(project(":spi:core-spi"))
-    api(project(":spi:transfer-spi"))
-    api(project(":extensions:data-plane-transfer:data-plane-transfer-spi"))
-    api(project(":common:token-generation-lib"))
-
-    api("com.nimbusds:nimbus-jose-jwt:${nimbusVersion}")
+    api(project(":extensions:data-plane-transfer:data-plane-transfer-sync"))
+    api(project(":extensions:data-plane-transfer:data-plane-transfer-client"))
 }
 
 publishing {
     publications {
-        create<MavenPublication>("data-plane-transfer-core") {
-            artifactId = "data-plane-transfer-core"
+        create<MavenPublication>("data-plane-transfer") {
+            artifactId = "data-plane-transfer"
             from(components["java"])
         }
     }

extensions/data-plane-transfer/data-plane-transfer-client/build.gradle.kts

@@ -24,6 +24,7 @@ val faker: String by project
 
 dependencies {
     api(project(":spi:core-spi"))
+    api(project(":spi:transfer-spi"))
     api(project(":extensions:data-plane:data-plane-spi"))
     api(project(":extensions:data-plane-transfer:data-plane-transfer-spi"))
     api(project(":extensions:data-plane-selector:selector-spi"))

extensions/data-plane-transfer/data-plane-transfer-client/src/main/java/org/eclipse/dataspaceconnector/transfer/dataplane/DataPlaneTransferClientExtension.java

@@ -24,10 +24,10 @@
 import org.eclipse.dataspaceconnector.spi.system.ServiceExtension;
 import org.eclipse.dataspaceconnector.spi.system.ServiceExtensionContext;
 import org.eclipse.dataspaceconnector.spi.transfer.flow.DataFlowManager;
-import org.eclipse.dataspaceconnector.transfer.dataplane.client.DataPlaneTransferClient;
 import org.eclipse.dataspaceconnector.transfer.dataplane.client.EmbeddedDataPlaneTransferClient;
 import org.eclipse.dataspaceconnector.transfer.dataplane.client.RemoteDataPlaneTransferClient;
 import org.eclipse.dataspaceconnector.transfer.dataplane.flow.DataPlaneTransferFlowController;
+import org.eclipse.dataspaceconnector.transfer.dataplane.spi.client.DataPlaneTransferClient;
 
 import java.util.Objects;
 

extensions/data-plane-transfer/data-plane-transfer-client/src/main/java/org/eclipse/dataspaceconnector/transfer/dataplane/client/EmbeddedDataPlaneTransferClient.java

@@ -19,6 +19,7 @@
 import org.eclipse.dataspaceconnector.spi.response.ResponseStatus;
 import org.eclipse.dataspaceconnector.spi.response.StatusResult;
 import org.eclipse.dataspaceconnector.spi.types.domain.transfer.DataFlowRequest;
+import org.eclipse.dataspaceconnector.transfer.dataplane.spi.client.DataPlaneTransferClient;
 
 /**
  * Implementation of a {@link DataPlaneTransferClient} that uses a local {@link org.eclipse.dataspaceconnector.dataplane.spi.manager.DataPlaneManager},

extensions/data-plane-transfer/data-plane-transfer-client/src/main/java/org/eclipse/dataspaceconnector/transfer/dataplane/client/RemoteDataPlaneTransferClient.java

@@ -31,6 +31,7 @@
 import org.eclipse.dataspaceconnector.spi.response.ResponseStatus;
 import org.eclipse.dataspaceconnector.spi.response.StatusResult;
 import org.eclipse.dataspaceconnector.spi.types.domain.transfer.DataFlowRequest;
+import org.eclipse.dataspaceconnector.transfer.dataplane.spi.client.DataPlaneTransferClient;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;

extensions/data-plane-transfer/data-plane-transfer-client/src/main/java/org/eclipse/dataspaceconnector/transfer/dataplane/flow/DataPlaneTransferFlowController.java

@@ -22,19 +22,18 @@
 import org.eclipse.dataspaceconnector.spi.types.domain.DataAddress;
 import org.eclipse.dataspaceconnector.spi.types.domain.transfer.DataFlowRequest;
 import org.eclipse.dataspaceconnector.spi.types.domain.transfer.DataRequest;
-import org.eclipse.dataspaceconnector.transfer.dataplane.client.DataPlaneTransferClient;
+import org.eclipse.dataspaceconnector.transfer.dataplane.spi.client.DataPlaneTransferClient;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.UUID;
 
-import static java.lang.String.join;
-import static org.eclipse.dataspaceconnector.transfer.dataplane.spi.DataPlaneTransferType.SYNC;
+import static org.eclipse.dataspaceconnector.transfer.dataplane.spi.DataPlaneTransferType.HTTP_PROXY;
 
 /**
  * Implementation of {@link DataFlowController} that delegates data transfer to Data Plane instance.
  * Note that Data Plane can be embedded in current runtime (test, samples...) or accessed remotely.
  * The present {@link DataFlowController} is triggered when destination type in the {@link DataRequest} is different from
- * {@link org.eclipse.dataspaceconnector.transfer.dataplane.spi.DataPlaneTransferType#SYNC}, as this one is reserved for synchronous data transfers.
+ * {@link org.eclipse.dataspaceconnector.transfer.dataplane.spi.DataPlaneTransferType#HTTP_PROXY}, as this one is reserved for synchronous data transfers.
  */
 public class DataPlaneTransferFlowController implements DataFlowController {
     private final DataPlaneTransferClient client;
@@ -47,7 +46,7 @@ public DataPlaneTransferFlowController(DataPlaneTransferClient client) {
     public boolean canHandle(DataRequest dataRequest, DataAddress contentAddress) {
         var type = dataRequest.getDestinationType();
         if (!StringUtils.isNullOrBlank(type)) {
-            return !SYNC.equals(dataRequest.getDestinationType());
+            return !HTTP_PROXY.equals(dataRequest.getDestinationType());
         }
         return false;
     }
@@ -58,7 +57,7 @@ public boolean canHandle(DataRequest dataRequest, DataAddress contentAddress) {
         var result = client.transfer(dataFlowRequest);
         if (result.failed()) {
             return StatusResult.failure(ResponseStatus.FATAL_ERROR,
-                    "Failed to delegate data transfer to Data Plane: " + join(", ", result.getFailureMessages()));
+                    "Failed to delegate data transfer to Data Plane: " + String.join(", ", result.getFailureMessages()));
         }
         return StatusResult.success("");
     }

extensions/data-plane-transfer/data-plane-transfer-client/src/test/java/org/eclipse/dataspaceconnector/transfer/dataplane/client/EmbeddedDataPlaneTransferClientTest.java

@@ -17,6 +17,7 @@
 import com.github.javafaker.Faker;
 import org.eclipse.dataspaceconnector.dataplane.spi.manager.DataPlaneManager;
 import org.eclipse.dataspaceconnector.spi.result.Result;
+import org.eclipse.dataspaceconnector.transfer.dataplane.spi.client.DataPlaneTransferClient;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -26,7 +27,6 @@
 import static org.mockito.Mockito.doNothing;
 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;
 
@@ -52,7 +52,7 @@ void validationFailure_shouldReturnFailedResult() {
 
         var result = client.transfer(request);
 
-        verify(dataPlaneManagerMock, times(1)).validate(request);
+        verify(dataPlaneManagerMock).validate(request);
         verify(dataPlaneManagerMock, never()).initiateTransfer(any());
 
         assertThat(result.failed()).isTrue();
@@ -69,8 +69,8 @@ void transferSuccess() {
 
         var result = client.transfer(request);
 
-        verify(dataPlaneManagerMock, times(1)).validate(request);
-        verify(dataPlaneManagerMock, times(1)).initiateTransfer(request);
+        verify(dataPlaneManagerMock).validate(request);
+        verify(dataPlaneManagerMock).initiateTransfer(request);
 
         assertThat(result.succeeded()).isTrue();
     }

extensions/data-plane-transfer/data-plane-transfer-client/src/test/java/org/eclipse/dataspaceconnector/transfer/dataplane/client/RemoteDataPlaneTransferClientTest.java

@@ -22,6 +22,7 @@
 import org.eclipse.dataspaceconnector.dataplane.selector.instance.DataPlaneInstance;
 import org.eclipse.dataspaceconnector.dataplane.spi.response.TransferErrorResponse;
 import org.eclipse.dataspaceconnector.spi.response.ResponseStatus;
+import org.eclipse.dataspaceconnector.transfer.dataplane.spi.client.DataPlaneTransferClient;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;

extensions/data-plane-transfer/data-plane-transfer-client/src/test/java/org/eclipse/dataspaceconnector/transfer/dataplane/flow/DataPlaneTransferFlowControllerTest.java

@@ -21,13 +21,13 @@
 import org.eclipse.dataspaceconnector.spi.types.domain.DataAddress;
 import org.eclipse.dataspaceconnector.spi.types.domain.transfer.DataFlowRequest;
 import org.eclipse.dataspaceconnector.spi.types.domain.transfer.DataRequest;
-import org.eclipse.dataspaceconnector.transfer.dataplane.client.DataPlaneTransferClient;
+import org.eclipse.dataspaceconnector.transfer.dataplane.spi.client.DataPlaneTransferClient;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.eclipse.dataspaceconnector.transfer.dataplane.spi.DataPlaneTransferType.SYNC;
+import static org.eclipse.dataspaceconnector.transfer.dataplane.spi.DataPlaneTransferType.HTTP_PROXY;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
@@ -50,9 +50,9 @@ public void setUp() {
 
     @Test
     void canHandle() {
-        var contentAddress = DataAddress.Builder.newInstance().type(SYNC).build();
+        var contentAddress = DataAddress.Builder.newInstance().type(HTTP_PROXY).build();
         assertThat(flowController.canHandle(createDataRequest(), contentAddress)).isTrue();
-        assertThat(flowController.canHandle(createDataRequest(SYNC), contentAddress)).isFalse();
+        assertThat(flowController.canHandle(createDataRequest(HTTP_PROXY), contentAddress)).isFalse();
     }
 
     @Test