diff --git a/src/main/java/org/eclipse/dataplane/Dataplane.java b/src/main/java/org/eclipse/dataplane/Dataplane.java index 32f5953..6d5b37d 100644 --- a/src/main/java/org/eclipse/dataplane/Dataplane.java +++ b/src/main/java/org/eclipse/dataplane/Dataplane.java @@ -55,8 +55,6 @@ public class Dataplane { private final ObjectMapper objectMapper = new ObjectMapper().configure(FAIL_ON_UNKNOWN_PROPERTIES, false); private final DataFlowStore store = new InMemoryDataFlowStore(objectMapper); private String id; - private String name; - private String description; private String endpoint; private final Set transferTypes = new HashSet<>(); private final Set labels = new HashSet<>(); @@ -269,7 +267,7 @@ public Result completed(String flowId) { public Result registerOn(String controlPlaneEndpoint) { - var message = new DataPlaneRegistrationMessage(id, name, description, endpoint, transferTypes, labels); + var message = new DataPlaneRegistrationMessage(id, endpoint, transferTypes, labels); return toJson(message) .map(body -> HttpRequest.newBuilder() @@ -337,16 +335,6 @@ public Builder id(String id) { return this; } - public Builder name(String name) { - dataplane.name = name; - return this; - } - - public Builder description(String description) { - dataplane.description = description; - return this; - } - public Builder endpoint(String endpoint) { dataplane.endpoint = endpoint; return this; diff --git a/src/main/java/org/eclipse/dataplane/domain/registration/DataPlaneRegistrationMessage.java b/src/main/java/org/eclipse/dataplane/domain/registration/DataPlaneRegistrationMessage.java index b4f72d5..195b708 100644 --- a/src/main/java/org/eclipse/dataplane/domain/registration/DataPlaneRegistrationMessage.java +++ b/src/main/java/org/eclipse/dataplane/domain/registration/DataPlaneRegistrationMessage.java @@ -18,8 +18,6 @@ public record DataPlaneRegistrationMessage( String dataplaneId, - String name, - String description, String endpoint, Set transferTypes, Set labels diff --git a/src/main/java/org/eclipse/dataplane/port/DataPlaneSignalingApiController.java b/src/main/java/org/eclipse/dataplane/port/DataPlaneSignalingApiController.java index 954f574..c964f1f 100644 --- a/src/main/java/org/eclipse/dataplane/port/DataPlaneSignalingApiController.java +++ b/src/main/java/org/eclipse/dataplane/port/DataPlaneSignalingApiController.java @@ -47,12 +47,6 @@ public DataPlaneSignalingApiController(Dataplane dataplane) { this.dataplane = dataplane; } - @GET - @Path("/") - public Response check() { - return Response.ok().build(); - } - @POST @Path("/prepare") public Response prepare(DataFlowPrepareMessage message) { diff --git a/src/test/java/org/eclipse/dataplane/DataplaneTest.java b/src/test/java/org/eclipse/dataplane/DataplaneTest.java index ae4e90a..800da36 100644 --- a/src/test/java/org/eclipse/dataplane/DataplaneTest.java +++ b/src/test/java/org/eclipse/dataplane/DataplaneTest.java @@ -124,8 +124,6 @@ void shouldRegisterOnTheControlPlane() { var dataplane = Dataplane.newInstance() .id("dataplane-id") - .name("dataplane-name") - .description("dataplane-description") .endpoint("http://localhost/dataplane") .transferType("SupportedTransferType-PUSH") .label("label-one").label("label-two") @@ -137,8 +135,6 @@ void shouldRegisterOnTheControlPlane() { controlPlane.verify(postRequestedFor(urlPathEqualTo("/dataplanes/register")) .withRequestBody(and( matchingJsonPath("dataplaneId", equalTo("dataplane-id")), - matchingJsonPath("name", equalTo("dataplane-name")), - matchingJsonPath("description", equalTo("dataplane-description")), matchingJsonPath("endpoint", equalTo("http://localhost/dataplane")), matchingJsonPath("transferTypes[0]", equalTo("SupportedTransferType-PUSH")), matchingJsonPath("labels.size()", equalTo("2")) @@ -152,8 +148,6 @@ void shouldFail_whenStatusIsNot200() { var dataplane = Dataplane.newInstance() .id("dataplane-id") - .name("dataplane-name") - .description("dataplane-description") .endpoint("http://localhost/dataplane") .transferType("SupportedTransferType-PUSH") .label("label-one").label("label-two")