From 05672ec789cb59721969356a75814681ef385ff1 Mon Sep 17 00:00:00 2001 From: Gabriel Hartmann Date: Tue, 25 Apr 2017 20:25:10 -0700 Subject: [PATCH] Revert "Add plan-summary endpoint (#911)" (#919) This reverts commit 9668f128eb70eb73a76be62cc6b50c22fc1a83a4. --- .../com/mesosphere/sdk/api/PlansResource.java | 21 ----- .../sdk/api/types/PlanSummaryInfo.java | 64 --------------- .../mesosphere/sdk/api/PlansResourceTest.java | 81 ------------------- 3 files changed, 166 deletions(-) delete mode 100644 sdk/scheduler/src/main/java/com/mesosphere/sdk/api/types/PlanSummaryInfo.java diff --git a/sdk/scheduler/src/main/java/com/mesosphere/sdk/api/PlansResource.java b/sdk/scheduler/src/main/java/com/mesosphere/sdk/api/PlansResource.java index 2cc839a06f2..f5c85ddf712 100644 --- a/sdk/scheduler/src/main/java/com/mesosphere/sdk/api/PlansResource.java +++ b/sdk/scheduler/src/main/java/com/mesosphere/sdk/api/PlansResource.java @@ -1,7 +1,6 @@ package com.mesosphere.sdk.api; import com.mesosphere.sdk.api.types.PlanInfo; -import com.mesosphere.sdk.api.types.PlanSummaryInfo; import com.mesosphere.sdk.api.types.PrettyJsonResource; import com.mesosphere.sdk.offer.evaluate.placement.RegexMatcher; import com.mesosphere.sdk.offer.evaluate.placement.StringMatcher; @@ -47,26 +46,6 @@ public Response listPlans() { return jsonOkResponse(new JSONArray(getPlanNames())); } - /** - * Returns a summary of all plans. - */ - @GET - @Path("/plan-summary") - public Response getPlanSummary() { - List planSummaries = planCoordinator.getPlanManagers().stream() - .map(planManager -> planManager.getPlan()) - .map(plan -> PlanSummaryInfo.forPlan(plan)) - .collect(Collectors.toList()); - - long incompletePlanCount = planSummaries.stream() - .filter(planSummaryInfo -> !planSummaryInfo.getStatus().equals(Status.COMPLETE)) - .count(); - - Response.Status status = incompletePlanCount == 0 ? Response.Status.OK : Response.Status.ACCEPTED; - - return jsonResponseBean(planSummaries, status); - } - /** * Returns a full list of the {@link Plan}'s contents (incl all {@link Phase}s/{@link Step}s). */ diff --git a/sdk/scheduler/src/main/java/com/mesosphere/sdk/api/types/PlanSummaryInfo.java b/sdk/scheduler/src/main/java/com/mesosphere/sdk/api/types/PlanSummaryInfo.java deleted file mode 100644 index c5c0b3136e5..00000000000 --- a/sdk/scheduler/src/main/java/com/mesosphere/sdk/api/types/PlanSummaryInfo.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.mesosphere.sdk.api.types; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.mesosphere.sdk.scheduler.plan.Plan; -import com.mesosphere.sdk.scheduler.plan.Status; -import org.apache.commons.lang3.builder.EqualsBuilder; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; - -import java.util.Objects; - -/** - * Immutable JSON serialization object for a summary of a {@link Plan}. - */ -public class PlanSummaryInfo { - private final String name; - private final Status status; - private final String msg; - - public static PlanSummaryInfo forPlan(final Plan plan) { - return new PlanSummaryInfo(plan.getName(), plan.getStatus(), plan.getMessage()); - } - - @JsonCreator - public PlanSummaryInfo( - @JsonProperty("status") final String name, - @JsonProperty("status") final Status status, - @JsonProperty("message") final String msg) { - this.name = name; - this.status = status; - this.msg = msg; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("status") - public Status getStatus() { - return status; - } - - @JsonProperty("message") - public String getMessage() { - return msg; - } - - @Override - public boolean equals(Object o) { - return EqualsBuilder.reflectionEquals(this, o); - } - - @Override - public int hashCode() { - return Objects.hash(getName(), getStatus(), getMessage()); - } - - @Override - public String toString() { - return ReflectionToStringBuilder.toString(this); - } -} - diff --git a/sdk/scheduler/src/test/java/com/mesosphere/sdk/api/PlansResourceTest.java b/sdk/scheduler/src/test/java/com/mesosphere/sdk/api/PlansResourceTest.java index b12fcd8d97c..c415dc9e5da 100644 --- a/sdk/scheduler/src/test/java/com/mesosphere/sdk/api/PlansResourceTest.java +++ b/sdk/scheduler/src/test/java/com/mesosphere/sdk/api/PlansResourceTest.java @@ -67,87 +67,6 @@ public void testListPlans() { assertEquals(String.format("[\"%s\"]", planName), response.getEntity().toString()); } - @Test - public void testGetSingleCompletePlanSummary() { - when(mockPlan.getStatus()).thenReturn(Status.COMPLETE); - when(mockPlan.getMessage()).thenReturn("The test plan is complete."); - Response response = resource.getPlanSummary(); - assertEquals(200, response.getStatus()); - } - - @Test - public void testGetMultipleCompletePlanSummary() { - when(mockPlan.getStatus()).thenReturn(Status.COMPLETE); - when(mockPlan.getMessage()).thenReturn("The test plan is complete."); - resource = new PlansResource( - new DefaultPlanCoordinator( - Arrays.asList( - new DefaultPlanManager(mockPlan), - new DefaultPlanManager(mockPlan)), - planScheduler)); - Response response = resource.getPlanSummary(); - assertEquals(200, response.getStatus()); - } - - @Test - public void testGetMultipleIncompletePlanSummary() { - when(mockPlan.getStatus()).thenReturn(Status.COMPLETE); - when(mockPlan.getMessage()).thenReturn("The test plan is complete."); - PlanManager planManagerA = new DefaultPlanManager(mockPlan); - - when(mockPlan.getStatus()).thenReturn(Status.IN_PROGRESS); - when(mockPlan.getMessage()).thenReturn("The test plan is in progress."); - PlanManager planManagerB = new DefaultPlanManager(mockPlan); - - resource = new PlansResource( - new DefaultPlanCoordinator( - Arrays.asList( - planManagerA, - planManagerB), - planScheduler)); - Response response = resource.getPlanSummary(); - assertEquals(202, response.getStatus()); - } - - @Test - public void testGetMultipleBothIncompletePlanSummary() { - when(mockPlan.getStatus()).thenReturn(Status.STARTING); - when(mockPlan.getMessage()).thenReturn("The test plan is starting."); - PlanManager planManagerA = new DefaultPlanManager(mockPlan); - - when(mockPlan.getStatus()).thenReturn(Status.IN_PROGRESS); - when(mockPlan.getMessage()).thenReturn("The test plan is in progress."); - PlanManager planManagerB = new DefaultPlanManager(mockPlan); - - resource = new PlansResource( - new DefaultPlanCoordinator( - Arrays.asList( - planManagerA, - planManagerB), - planScheduler)); - Response response = resource.getPlanSummary(); - assertEquals(202, response.getStatus()); - } - - @Test - public void testGetMultipleBothCompletePlanSummary() { - when(mockPlan.getMessage()).thenReturn("The test plan is complete."); - when(mockPlan.getStatus()).thenReturn(Status.COMPLETE); - PlanManager planManagerA = new DefaultPlanManager(mockPlan); - - when(mockPlan.getStatus()).thenReturn(Status.COMPLETE); - PlanManager planManagerB = new DefaultPlanManager(mockPlan); - - resource = new PlansResource( - new DefaultPlanCoordinator( - Arrays.asList( - planManagerA, - planManagerB), - planScheduler)); - Response response = resource.getPlanSummary(); - assertEquals(200, response.getStatus()); - } - @Test public void testFullInfoComplete() { when(mockPlan.isComplete()).thenReturn(true);