Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ public void initialize(ServiceExtensionContext context) {

webService.registerResource(ApiContext.MANAGEMENT, new DataPlaneRegistrationApiV4Controller(dataPlaneSelectorService));
webService.registerResource(ApiContext.SIGNALING, new DataPlaneTransferAuthorizationFilter(signalingAuthorizationRegistry, transferProcessService, dataPlaneSelectorService));
webService.registerResource(ApiContext.SIGNALING, new DataPlaneTransferApiController(transferProcessService, typeTransformerRegistry));
webService.registerResource(ApiContext.SIGNALING, new DataPlaneTransferApiController(transferProcessService,
typeTransformerRegistry, context.getMonitor().withPrefix("DataPlaneTransferApiController")));

try (var versionContent = getClass().getClassLoader().getResourceAsStream(API_VERSION_JSON_FILE)) {
apiVersionService.registerVersionInfo(ApiContext.SIGNALING, versionContent);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,15 @@ public interface DataPlaneTransferApi {
)
Response completed(String transferId);

@Operation(
method = POST,
description = "Notify an errored transfer",
responses = {
@ApiResponse(responseCode = "200", description = "Errored notification delivered correctly"),
@ApiResponse(responseCode = "404", description = "Transfer process does not exist",
content = @Content(array = @ArraySchema(schema = @Schema(implementation = ApiCoreSchema.ApiErrorDetailSchema.class))))
}
)
Response errored(String transferId, DataFlowStatusMessage message);

}
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.eclipse.edc.signaling.domain.DataFlowPrepareMessage;
import org.eclipse.edc.signaling.domain.DataFlowStartMessage;
import org.eclipse.edc.signaling.domain.DataFlowStatusMessage;
import org.eclipse.edc.spi.monitor.Monitor;
import org.eclipse.edc.spi.result.ServiceResult;
import org.eclipse.edc.transform.spi.TypeTransformerRegistry;

Expand All @@ -42,10 +43,12 @@ public class DataPlaneTransferApiController implements DataPlaneTransferApi {

private final TransferProcessService transferProcessService;
private final TypeTransformerRegistry typeTransformerRegistry;
private final Monitor monitor;

public DataPlaneTransferApiController(TransferProcessService transferProcessService, TypeTransformerRegistry typeTransformerRegistry) {
public DataPlaneTransferApiController(TransferProcessService transferProcessService, TypeTransformerRegistry typeTransformerRegistry, Monitor monitor) {
this.transferProcessService = transferProcessService;
this.typeTransformerRegistry = typeTransformerRegistry;
this.monitor = monitor;
}

@Path("/{transferId}/dataflow/prepared")
Expand Down Expand Up @@ -84,4 +87,15 @@ public Response completed(@PathParam("transferId") String transferId) {
return Response.ok().build();
}

@Path("/{transferId}/dataflow/errored")
@POST
@Override
public Response errored(@PathParam("transferId") String transferId, DataFlowStatusMessage message) {
monitor.warning("Errored DataFlow notification received about TransferProcess %s: %s".formatted(transferId, message.getError()));
return Response.ok().build();
}




}
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import static java.util.Collections.emptyMap;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.ArgumentMatchers.contains;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
Expand Down Expand Up @@ -331,9 +332,35 @@ void shouldReturnError_whenServiceCallFails() {
}
}

@Nested
class Errored {
@BeforeEach
void setUp() {
setupValidAuthorization();
}

@Test
void shouldLogWarning() {
var transferId = UUID.randomUUID().toString();
when(transferProcessService.complete(any())).thenReturn(ServiceResult.success());
var message = DataFlowStatusMessage.Builder.newInstance().error("data-plane error").build();

given()
.port(port)
.contentType(ContentType.JSON)
.body(message)
.post("/transfers/{transferId}/dataflow/errored", transferId)
.then()
.log().ifValidationFails()
.statusCode(200);

verify(monitor).warning(contains("data-plane error"));
}
}

@Override
protected Object controller() {
return new DataPlaneTransferApiController(transferProcessService, typeTransformerRegistry);
return new DataPlaneTransferApiController(transferProcessService, typeTransformerRegistry, monitor);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
{
"version": "1.0.0-alpha",
"urlPath": "/v1",
"lastUpdated": "2026-04-13T14:00:01Z"
"lastUpdated": "2026-04-15T14:00:01Z"
}
]
Loading