Skip to content

Commit de5e800

Browse files
fix: compile errors
1 parent 1d93cba commit de5e800

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

extensions/data-plane/data-plane-azure-data-factory/src/main/java/org/eclipse/edc/connector/dataplane/azure/datafactory/AzureDataFactoryTransferManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public AzureDataFactoryTransferManager(
7878
* @param request the data flow request.
7979
* @return a {@link CompletableFuture} that completes when the data transfer completes.
8080
*/
81-
public CompletableFuture<StreamResult<Void>> transfer(DataFlowRequest request) {
81+
public CompletableFuture<StreamResult<Object>> transfer(DataFlowRequest request) {
8282

8383
PipelineResource pipeline = pipelineFactory.createPipeline(request);
8484

@@ -108,7 +108,7 @@ public CompletableFuture<StreamResult<Void>> transfer(DataFlowRequest request) {
108108
}
109109

110110
@NotNull
111-
private CompletableFuture<StreamResult<Void>> awaitRunCompletion(String runId) {
111+
private CompletableFuture<StreamResult<Object>> awaitRunCompletion(String runId) {
112112
monitor.debug("Awaiting ADF pipeline completion for run " + runId);
113113

114114
var timeout = clock.instant().plus(maxDuration);
@@ -142,7 +142,7 @@ private CompletableFuture<StreamResult<Void>> awaitRunCompletion(String runId) {
142142
return completedFuture(StreamResult.error("ADF run timed out"));
143143
}
144144

145-
private StreamResult<Void> complete(String accountName, String containerName, String sharedAccessSignature) {
145+
private StreamResult<Object> complete(String accountName, String containerName, String sharedAccessSignature) {
146146
try {
147147
// Write an empty blob to indicate completion
148148
blobStoreApi.getBlobAdapter(accountName, containerName, COMPLETE_BLOB_NAME, new AzureSasCredential(sharedAccessSignature))

extensions/data-plane/data-plane-azure-data-factory/src/main/java/org/eclipse/edc/connector/dataplane/azure/datafactory/AzureDataFactoryTransferService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public boolean canHandle(DataFlowRequest request) {
4646
}
4747

4848
@Override
49-
public CompletableFuture<StreamResult<Void>> transfer(DataFlowRequest request) {
49+
public CompletableFuture<StreamResult<Object>> transfer(DataFlowRequest request) {
5050
return transferManager.transfer(request);
5151
}
5252

extensions/data-plane/data-plane-azure-data-factory/src/test/java/org/eclipse/edc/connector/dataplane/azure/datafactory/AzureDataFactoryTransferManagerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ void transfer_timeout() {
171171
verify(client).cancelPipelineRun(runId);
172172
}
173173

174-
ObjectAssert<StreamResult<Void>> assertThatTransferResult() {
174+
ObjectAssert<StreamResult<Object>> assertThatTransferResult() {
175175
return assertThat(transferManager.transfer(request))
176176
.succeedsWithin(Duration.ofMinutes(1));
177177
}

extensions/data-plane/data-plane-azure-data-factory/src/test/java/org/eclipse/edc/connector/dataplane/azure/datafactory/AzureDataFactoryTransferServiceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ class AzureDataFactoryTransferServiceTest {
4141
private final Result<Boolean> failure = Result.failure("Test Failure");
4242
private final Result<Boolean> success = Result.success(true);
4343
@SuppressWarnings("unchecked")
44-
private final CompletableFuture<StreamResult<Void>> result = mock(CompletableFuture.class);
44+
private final CompletableFuture<StreamResult<Object>> result = mock(CompletableFuture.class);
4545

4646
@ParameterizedTest
47-
@ValueSource(booleans = { true, false })
47+
@ValueSource(booleans = {true, false})
4848
void canHandle_onResult(boolean expected) {
4949
// Arrange
5050
when(validator.canHandle(request.build())).thenReturn(expected);

extensions/data-plane/data-plane-azure-storage/src/main/java/org/eclipse/edc/connector/dataplane/azure/storage/pipeline/AzureStorageDataSink.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,14 @@ public class AzureStorageDataSink extends ParallelSink {
3838
private String sharedAccessSignature;
3939
private BlobStoreApi blobStoreApi;
4040

41+
private AzureStorageDataSink() {
42+
}
43+
4144
/**
4245
* Writes data into an Azure storage container.
4346
*/
4447
@Override
45-
protected StreamResult<Void> transferParts(List<DataSource.Part> parts) {
48+
protected StreamResult<Object> transferParts(List<DataSource.Part> parts) {
4649
for (DataSource.Part part : parts) {
4750
String blobName = part.name();
4851
try (var input = part.openStream()) {
@@ -64,7 +67,7 @@ protected StreamResult<Void> transferParts(List<DataSource.Part> parts) {
6467
}
6568

6669
@Override
67-
protected StreamResult<Void> complete() {
70+
protected StreamResult<Object> complete() {
6871
try {
6972
// Write an empty blob to indicate completion
7073
blobStoreApi.getBlobAdapter(accountName, containerName, COMPLETE_BLOB_NAME, new AzureSasCredential(sharedAccessSignature))
@@ -76,17 +79,18 @@ protected StreamResult<Void> complete() {
7679
}
7780

7881
@NotNull
79-
private StreamResult<Void> getTransferResult(Exception e, String logMessage, Object... args) {
82+
private StreamResult<Object> getTransferResult(Exception e, String logMessage, Object... args) {
8083
String message = format(logMessage, args);
8184
monitor.severe(message, e);
8285
return StreamResult.error(message);
8386
}
8487

85-
private AzureStorageDataSink() {
86-
}
87-
8888
public static class Builder extends ParallelSink.Builder<Builder, AzureStorageDataSink> {
8989

90+
private Builder() {
91+
super(new AzureStorageDataSink());
92+
}
93+
9094
public static Builder newInstance() {
9195
return new Builder();
9296
}
@@ -118,9 +122,5 @@ protected void validate() {
118122
Objects.requireNonNull(sink.sharedAccessSignature, "sharedAccessSignature");
119123
Objects.requireNonNull(sink.blobStoreApi, "blobStoreApi");
120124
}
121-
122-
private Builder() {
123-
super(new AzureStorageDataSink());
124-
}
125125
}
126126
}

0 commit comments

Comments
 (0)