feat: add IdResponse on addEntry API

extensions/data-plane-selector/data-plane-selector-api/src/main/java/org/eclipse/edc/connector/dataplane/selector/DataPlaneSelectorApiExtension.java

@@ -31,6 +31,7 @@
 import org.eclipse.edc.validator.spi.JsonObjectValidatorRegistry;
 import org.eclipse.edc.web.spi.WebService;
 
+import java.time.Clock;
 import java.util.Map;
 
 import static jakarta.json.Json.createBuilderFactory;
@@ -57,6 +58,9 @@ public class DataPlaneSelectorApiExtension implements ServiceExtension {
     @Inject
     private JsonObjectValidatorRegistry validatorRegistry;
 
+    @Inject
+    private Clock clock;
+
     @Override
     public void initialize(ServiceExtensionContext context) {
         typeManager.registerTypes(DataPlaneInstance.class);
@@ -65,7 +69,7 @@ public void initialize(ServiceExtensionContext context) {
         transformerRegistry.register(new JsonObjectToSelectionRequestTransformer());
         transformerRegistry.register(new JsonObjectToDataPlaneInstanceTransformer());
         transformerRegistry.register(new JsonObjectFromDataPlaneInstanceTransformer(createBuilderFactory(Map.of()), typeManager.getMapper(JSON_LD)));
-        var controller = new DataplaneSelectorApiController(selectionService, transformerRegistry, validatorRegistry);
+        var controller = new DataplaneSelectorApiController(selectionService, transformerRegistry, validatorRegistry, clock);
 
         webservice.registerResource(managementApiConfiguration.getContextAlias(), controller);
     }

extensions/data-plane-selector/data-plane-selector-api/src/main/java/org/eclipse/edc/connector/dataplane/selector/api/v2/DataplaneSelectorApi.java

@@ -53,17 +53,18 @@ public interface DataplaneSelectorApi {
             description = "Adds one datatplane instance to the internal database of the selector",
             requestBody = @RequestBody(content = @Content(schema = @Schema(implementation = DataPlaneInstanceSchema.class))),
             responses = {
-                    @ApiResponse(responseCode = "200", description = "Entry was added successfully to the database"),
+                    @ApiResponse(responseCode = "200", description = "Entry was added successfully to the database", content = @Content(schema = @Schema(implementation = ApiCoreSchema.IdResponseSchema.class))),
                     @ApiResponse(responseCode = "400", description = "Request body was malformed", content = @Content(array = @ArraySchema(schema = @Schema(implementation = ApiCoreSchema.ApiErrorDetailSchema.class))))
             }
     )
     @POST
-    void addEntry(JsonObject instance);
+    JsonObject addEntry(JsonObject instance);
 
     @Operation(method = "GET",
             description = "Returns a list of all currently registered data plane instances",
             responses = {
-                    @ApiResponse(responseCode = "204", description = "A (potentially empty) list of currently registered data plane instances"),
+                    @ApiResponse(responseCode = "200", description = "A (potentially empty) list of currently registered data plane instances",
+                            content = @Content(array = @ArraySchema(schema = @Schema(implementation = DataPlaneInstanceSchema.class)))),
                     @ApiResponse(responseCode = "400", description = "Request body was malformed", content = @Content(array = @ArraySchema(schema = @Schema(implementation = ApiCoreSchema.ApiErrorDetailSchema.class))))
             }
     )

extensions/data-plane-selector/data-plane-selector-api/src/main/java/org/eclipse/edc/connector/dataplane/selector/api/v2/DataplaneSelectorApiController.java

@@ -22,6 +22,7 @@
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
+import org.eclipse.edc.api.model.IdResponse;
 import org.eclipse.edc.connector.dataplane.selector.api.v2.model.SelectionRequest;
 import org.eclipse.edc.connector.dataplane.selector.spi.DataPlaneSelectorService;
 import org.eclipse.edc.connector.dataplane.selector.spi.instance.DataPlaneInstance;
@@ -32,6 +33,7 @@
 import org.eclipse.edc.web.spi.exception.InvalidRequestException;
 import org.eclipse.edc.web.spi.exception.ValidationFailureException;
 
+import java.time.Clock;
 import java.util.function.Supplier;
 
 import static jakarta.json.stream.JsonCollectors.toJsonArray;
@@ -49,11 +51,13 @@ public class DataplaneSelectorApiController implements DataplaneSelectorApi {
 
     private final JsonObjectValidatorRegistry validatorRegistry;
 
+    private final Clock clock;
 
-    public DataplaneSelectorApiController(DataPlaneSelectorService selectionService, TypeTransformerRegistry transformerRegistry, JsonObjectValidatorRegistry validatorRegistry) {
+    public DataplaneSelectorApiController(DataPlaneSelectorService selectionService, TypeTransformerRegistry transformerRegistry, JsonObjectValidatorRegistry validatorRegistry, Clock clock) {
         this.selectionService = selectionService;
         this.transformerRegistry = transformerRegistry;
         this.validatorRegistry = validatorRegistry;
+        this.clock = clock;
     }
 
     @Override
@@ -76,14 +80,22 @@ public JsonObject find(JsonObject requestObject) {
 
     @Override
     @POST
-    public void addEntry(JsonObject jsonObject) {
+    public JsonObject addEntry(JsonObject jsonObject) {
         validatorRegistry.validate(DATAPLANE_INSTANCE_TYPE, jsonObject).orElseThrow(ValidationFailureException::new);
 
         var instance = transformerRegistry.transform(jsonObject, DataPlaneInstance.class)
                 .orElseThrow(InvalidRequestException::new);
 
         selectionService.addInstance(instance)
                 .orElseThrow(exceptionMapper(DataPlaneInstance.class, instance.getId()));
+
+        var idResponse = IdResponse.Builder.newInstance()
+                .id(instance.getId())
+                .createdAt(clock.millis())
+                .build();
+
+        return transformerRegistry.transform(idResponse, JsonObject.class)
+                .orElseThrow(f -> new EdcException(f.getFailureDetail()));
     }
 
     @Override

extensions/data-plane-selector/data-plane-selector-api/src/test/java/org/eclipse/edc/connector/dataplane/selector/api/DataPlaneSelectorApiControllerTest.java

@@ -78,13 +78,15 @@ void getAll_noneExist() {
     void addEntry(DataPlaneInstanceStore store) {
         var dpi = createInstanceJson("test-id");
 
-        baseRequest()
+        var result = baseRequest()
                 .body(dpi)
                 .contentType(JSON)
                 .post()
                 .then()
-                .statusCode(204);
+                .statusCode(200)
+                .extract().body().as(JsonObject.class);
 
+        assertThat(result.getString(ID)).isEqualTo("test-id");
         assertThat(store.getAll()).hasSize(1)
                 .allMatch(d -> d.getId().equals("test-id"));
     }
@@ -99,7 +101,7 @@ void addEntry_fails_whenMissingUrl(DataPlaneInstanceStore store) {
                 .post()
                 .then()
                 .statusCode(400);
-        
+
     }
 
     @Test
@@ -119,7 +121,7 @@ void addEntry_exists_shouldOverwrite(DataPlaneInstanceStore store) {
                 .contentType(JSON)
                 .post()
                 .then()
-                .statusCode(204);
+                .statusCode(200);
 
 
         assertThat(store.getAll()).hasSize(3)

extensions/data-plane-selector/data-plane-selector-client/src/test/java/org/eclipse/edc/connector/dataplane/selector/client/RemoteDataPlaneSelectorClientTest.java

@@ -38,6 +38,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import java.time.Clock;
 import java.util.List;
 import java.util.Map;
 
@@ -107,7 +108,7 @@ void find_withStrategy() {
 
     @Override
     protected Object controller() {
-        return new DataplaneSelectorApiController(SELECTOR_SERVICE_MOCK, typeTransformerRegistry, validator);
+        return new DataplaneSelectorApiController(SELECTOR_SERVICE_MOCK, typeTransformerRegistry, validator, Clock.systemUTC());
     }
 
     @Override