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
14 changes: 1 addition & 13 deletions src/main/java/org/eclipse/dataplane/Dataplane.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> transferTypes = new HashSet<>();
private final Set<String> labels = new HashSet<>();
Expand Down Expand Up @@ -269,7 +267,7 @@ public Result<Void> completed(String flowId) {

public Result<Void> 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()
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@

public record DataPlaneRegistrationMessage(
String dataplaneId,
String name,
String description,
String endpoint,
Set<String> transferTypes,
Set<String> labels
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 0 additions & 6 deletions src/test/java/org/eclipse/dataplane/DataplaneTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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"))
Expand All @@ -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")
Expand Down