fix: clean up and merge

eclipse-edc · Oct 26, 2023 · 20d7201 · 20d7201
1 parent a8e093e
commit 20d7201
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 13 deletions.
diff --git a/...org/eclipse/edc/samples/advanced/advanced00opentelemetry/Advanced00openTelemetryTest.java b/...org/eclipse/edc/samples/advanced/advanced00opentelemetry/Advanced00openTelemetryTest.java
@@ -34,12 +34,12 @@
 import static org.eclipse.edc.samples.transfer.FileTransferCommon.getFileFromRelativePath;
 import static org.eclipse.edc.samples.transfer.TransferUtil.checkTransferStatus;
 import static org.eclipse.edc.samples.transfer.TransferUtil.startTransfer;
+import static org.eclipse.edc.samples.transfer.transfer00prerequisites.PrerequisitesCommon.runPrerequisites;
 import static org.eclipse.edc.samples.transfer.transfer01negotiation.NegotiationCommon.createAsset;
 import static org.eclipse.edc.samples.transfer.transfer01negotiation.NegotiationCommon.createContractDefinition;
 import static org.eclipse.edc.samples.transfer.transfer01negotiation.NegotiationCommon.createPolicy;
 import static org.eclipse.edc.samples.transfer.transfer01negotiation.NegotiationCommon.getContractAgreementId;
 import static org.eclipse.edc.samples.transfer.transfer01negotiation.NegotiationCommon.negotiateContract;
-import static org.eclipse.edc.samples.transfer.transfer00prerequisites.PrerequisitesCommon.runPrerequisites;
 
 @EndToEndTest
 @Testcontainers

diff --git a/...ava/org/eclipse/edc/samples/transfer/transfer01negotiation/Transfer01negotiationTest.java b/...ava/org/eclipse/edc/samples/transfer/transfer01negotiation/Transfer01negotiationTest.java
@@ -20,15 +20,15 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.edc.samples.transfer.transfer00prerequisites.PrerequisitesCommon.getConsumer;
+import static org.eclipse.edc.samples.transfer.transfer00prerequisites.PrerequisitesCommon.getProvider;
+import static org.eclipse.edc.samples.transfer.transfer00prerequisites.PrerequisitesCommon.runPrerequisites;
 import static org.eclipse.edc.samples.transfer.transfer01negotiation.NegotiationCommon.createAsset;
 import static org.eclipse.edc.samples.transfer.transfer01negotiation.NegotiationCommon.createContractDefinition;
 import static org.eclipse.edc.samples.transfer.transfer01negotiation.NegotiationCommon.createPolicy;
 import static org.eclipse.edc.samples.transfer.transfer01negotiation.NegotiationCommon.fetchCatalog;
 import static org.eclipse.edc.samples.transfer.transfer01negotiation.NegotiationCommon.getContractAgreementId;
 import static org.eclipse.edc.samples.transfer.transfer01negotiation.NegotiationCommon.negotiateContract;
-import static org.eclipse.edc.samples.transfer.transfer00prerequisites.PrerequisitesCommon.getConsumer;
-import static org.eclipse.edc.samples.transfer.transfer00prerequisites.PrerequisitesCommon.getProvider;
-import static org.eclipse.edc.samples.transfer.transfer00prerequisites.PrerequisitesCommon.runPrerequisites;
 
 @EndToEndTest
 public class Transfer01negotiationTest {

diff --git a/...a/org/eclipse/edc/samples/transfer/transfer02consumerpull/Transfer02consumerPullTest.java b/...a/org/eclipse/edc/samples/transfer/transfer02consumerpull/Transfer02consumerPullTest.java
@@ -33,13 +33,13 @@
 import static org.eclipse.edc.samples.transfer.HttpRequestLoggerUtil.getHttpRequestLoggerContainer;
 import static org.eclipse.edc.samples.transfer.TransferUtil.checkTransferStatus;
 import static org.eclipse.edc.samples.transfer.TransferUtil.startTransfer;
-import static org.eclipse.edc.samples.transfer.transfer01negotiation.NegotiationCommon.runNegotiation;
 import static org.eclipse.edc.samples.transfer.transfer00prerequisites.PrerequisitesCommon.API_KEY_HEADER_KEY;
 import static org.eclipse.edc.samples.transfer.transfer00prerequisites.PrerequisitesCommon.API_KEY_HEADER_VALUE;
 import static org.eclipse.edc.samples.transfer.transfer00prerequisites.PrerequisitesCommon.CONSUMER_PUBLIC_URL;
 import static org.eclipse.edc.samples.transfer.transfer00prerequisites.PrerequisitesCommon.getConsumer;
 import static org.eclipse.edc.samples.transfer.transfer00prerequisites.PrerequisitesCommon.getProvider;
 import static org.eclipse.edc.samples.transfer.transfer00prerequisites.PrerequisitesCommon.runPrerequisites;
+import static org.eclipse.edc.samples.transfer.transfer01negotiation.NegotiationCommon.runNegotiation;
 import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
 

diff --git a/...a/org/eclipse/edc/samples/transfer/transfer03providerpush/Transfer03providerPushTest.java b/...a/org/eclipse/edc/samples/transfer/transfer03providerpush/Transfer03providerPushTest.java
@@ -30,10 +30,10 @@
 import static org.eclipse.edc.samples.transfer.HttpRequestLoggerUtil.getHttpRequestLoggerContainer;
 import static org.eclipse.edc.samples.transfer.TransferUtil.checkTransferStatus;
 import static org.eclipse.edc.samples.transfer.TransferUtil.startTransfer;
-import static org.eclipse.edc.samples.transfer.transfer01negotiation.NegotiationCommon.runNegotiation;
 import static org.eclipse.edc.samples.transfer.transfer00prerequisites.PrerequisitesCommon.getConsumer;
 import static org.eclipse.edc.samples.transfer.transfer00prerequisites.PrerequisitesCommon.getProvider;
 import static org.eclipse.edc.samples.transfer.transfer00prerequisites.PrerequisitesCommon.runPrerequisites;
+import static org.eclipse.edc.samples.transfer.transfer01negotiation.NegotiationCommon.runNegotiation;
 
 @EndToEndTest
 @Testcontainers

diff --git a/...org/eclipse/edc/samples/transfer/transfer04eventconsumer/Transfer04eventConsumerTest.java b/...org/eclipse/edc/samples/transfer/transfer04eventconsumer/Transfer04eventConsumerTest.java
@@ -31,10 +31,10 @@
 import static org.eclipse.edc.samples.transfer.HttpRequestLoggerUtil.getHttpRequestLoggerContainer;
 import static org.eclipse.edc.samples.transfer.TransferUtil.checkTransferStatus;
 import static org.eclipse.edc.samples.transfer.TransferUtil.startTransfer;
-import static org.eclipse.edc.samples.transfer.transfer01negotiation.NegotiationCommon.runNegotiation;
 import static org.eclipse.edc.samples.transfer.transfer00prerequisites.PrerequisitesCommon.getConsumer;
 import static org.eclipse.edc.samples.transfer.transfer00prerequisites.PrerequisitesCommon.getProvider;
 import static org.eclipse.edc.samples.transfer.transfer00prerequisites.PrerequisitesCommon.runPrerequisites;
+import static org.eclipse.edc.samples.transfer.transfer01negotiation.NegotiationCommon.runNegotiation;
 
 @EndToEndTest
 public class Transfer04eventConsumerTest {

diff --git a/...c/main/java/org/eclipse/edc/sample/extension/listener/TransferProcessStartedListener.java b/...c/main/java/org/eclipse/edc/sample/extension/listener/TransferProcessStartedListener.java
@@ -18,12 +18,6 @@
 import org.eclipse.edc.connector.transfer.spi.types.TransferProcess;
 import org.eclipse.edc.spi.monitor.Monitor;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import static java.lang.String.format;
-
 public class TransferProcessStartedListener implements TransferProcessListener {
 
     private final Monitor monitor;