Skip to content

refactor: incorrect paramaters order in dataplane logs regarding DataFlow Id #4833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 21, 2025
Merged

refactor: incorrect paramaters order in dataplane logs regarding DataFlow Id #4833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
639e170
Refactor incorrect paramaters' order in dataplane logs regarding Data…
bmg13 Feb 21, 2025
727cad1
Added unit tests.
bmg13 Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...main/java/org/eclipse/edc/connector/dataplane/framework/pipeline/PipelineServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public CompletableFuture<StreamResult<Object>> transfer(DataFlowStartMessage req
var source = sourceFactory.createSource(request);
sources.put(request.getProcessId(), source);
monitor.debug(() -> format("Transferring from %s to %s for flow id: %s.",
request.getProcessId(), request.getSourceDataAddress().getType(), request.getDestinationDataAddress().getType()));
request.getSourceDataAddress().getType(), request.getDestinationDataAddress().getType(), request.getProcessId()));
return sink.transfer(source)
.thenApply(result -> {
terminate(request.getProcessId());
Expand Down Expand Up @@ -179,13 +179,13 @@ private DataSinkFactory getSinkFactory(DataFlowStartMessage request) {
@NotNull
private CompletableFuture<StreamResult<Object>> noSourceFactory(DataFlowStartMessage request) {
return completedFuture(StreamResult.error("Unknown data source type %s for flow id: %s.".formatted(
request.getProcessId(), request.getSourceDataAddress().getType())));
request.getSourceDataAddress().getType(), request.getProcessId())));
}

@NotNull
private CompletableFuture<StreamResult<Object>> noSinkFactory(DataFlowStartMessage request) {
return completedFuture(StreamResult.error("Unknown data sink type %s for flow id: %s.".formatted(
request.getProcessId(), request.getDestinationDataAddress().getType())));
request.getDestinationDataAddress().getType(), request.getProcessId())));
}


Expand Down
50 changes: 49 additions & 1 deletion .../java/org/eclipse/edc/connector/dataplane/framework/pipeline/PipelineServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import java.util.concurrent.TimeUnit;
import java.util.stream.Stream;

import static java.lang.String.format;
import static java.util.concurrent.CompletableFuture.completedFuture;
import static org.assertj.core.api.Assertions.assertThat;
import static org.eclipse.edc.connector.dataplane.spi.pipeline.StreamFailure.Reason.GENERAL_ERROR;
Expand All @@ -53,6 +54,8 @@

class PipelineServiceImplTest {

private static final String PROCESS_ID = "1";

private final Monitor monitor = mock();

private final DataSourceFactory sourceFactory = mock();
Expand Down Expand Up @@ -109,6 +112,51 @@ public CompletableFuture<StreamResult<Object>> transfer(DataSource source) {
verifyNoInteractions(sinkFactory);
verify(source).close();
}

@Test
void transfer_withUnknownSource_shouldFail() {
var flowRequest = dataFlow("wrong-source", "custom-destination").toRequest();
var expectedErrorMessage = format("Unknown data source type wrong-source for flow id: %s.", PROCESS_ID);

when(sourceFactory.supportedType()).thenReturn("source");
when(sourceFactory.createSource(any())).thenReturn(source);

var customSink = new DataSink() {
@Override
public CompletableFuture<StreamResult<Object>> transfer(DataSource source) {
return CompletableFuture.completedFuture(StreamResult.success("test-response"));
}
};

var future = service.transfer(flowRequest, customSink);
assertThat(future).succeedsWithin(Duration.ofSeconds(5))
.satisfies(res -> assertThat(res).isFailed())
.satisfies(res -> assertThat(res.getFailure().getMessages()).hasSize(1))
.satisfies(res -> assertThat(res.getFailure().getMessages().get(0)).isEqualTo(expectedErrorMessage));

verify(sourceFactory).supportedType();
verifyNoInteractions(sinkFactory);
verifyNoInteractions(source);
}

@Test
void transfer_withUnknownSink_shouldFail() {
var flowRequest = dataFlow("source", "custom-destination").toRequest();
var expectedErrorMessage = format("Unknown data sink type custom-destination for flow id: %s.", PROCESS_ID);

when(sourceFactory.supportedType()).thenReturn("source");
when(sourceFactory.createSource(any())).thenReturn(source);

var future = service.transfer(flowRequest);
assertThat(future).succeedsWithin(Duration.ofSeconds(5))
.satisfies(res -> assertThat(res).isFailed())
.satisfies(res -> assertThat(res.getFailure().getMessages()).hasSize(1))
.satisfies(res -> assertThat(res.getFailure().getMessages().get(0)).isEqualTo(expectedErrorMessage));

verify(sinkFactory).supportedType();
verifyNoInteractions(sourceFactory);
verifyNoInteractions(source);
}
}

@Nested
Expand Down Expand Up @@ -216,7 +264,7 @@ void shouldCloseAllTheOngoingDataFlows() throws Exception {

private DataFlow dataFlow(String sourceType, String destinationType) {
return DataFlow.Builder.newInstance()
.id("1")
.id(PROCESS_ID)
.source(DataAddress.Builder.newInstance().type(sourceType).build())
.destination(DataAddress.Builder.newInstance().type(destinationType).build())
.build();
Expand Down