Remove unused and undocumented partition state request support

3 files changed, 7 insertions, 85 deletions

diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/NotMasterTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/NotMasterTest.java
index 15aeded2d37..3beeecf8dc4 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/NotMasterTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/NotMasterTest.java
@@ -4,10 +4,12 @@ package com.yahoo.vespa.clustercontroller.core.restapiv2;
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.errors.OtherMasterException;
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.errors.UnknownMasterException;
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.response.UnitResponse;
-import static com.yahoo.vespa.defaults.Defaults.getDefaults;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static com.yahoo.vespa.defaults.Defaults.getDefaults;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class NotMasterTest extends StateRestApiTest {
 
@@ -52,12 +54,6 @@ public class NotMasterTest extends StateRestApiTest {
             assertTrue(e.getMessage().contains("No known master cluster controller"), e.getMessage());
         }
         try {
-            restAPI.getState(new StateRequest("music/storage/1/0", 0));
-            fail();
-        } catch (UnknownMasterException e) {
-            assertTrue(e.getMessage().contains("No known master cluster controller"), e.getMessage());
-        }
-        try {
             restAPI.setUnitState(new SetNodeStateTest.SetUnitStateRequestImpl("music/storage/1")
                     .setNewState("user", "down", "test"));
             fail();
@@ -116,14 +112,6 @@ public class NotMasterTest extends StateRestApiTest {
             assertEquals(e.getPort(), getDefaults().vespaWebServicePort());
         }
         try {
-            restAPI.getState(new StateRequest("music/storage/1/0", 0));
-            fail();
-        } catch (OtherMasterException e) {
-            assertTrue(e.getMessage().contains("Cluster controller not master. Use master at otherhost:" + getDefaults().vespaWebServicePort() + "."), e.getMessage());
-            assertEquals("otherhost", e.getHost());
-            assertEquals(e.getPort(), getDefaults().vespaWebServicePort());
-        }
-        try {
             restAPI.setUnitState(new SetNodeStateTest.SetUnitStateRequestImpl("music/storage/1")
                     .setNewState("user", "down", "test"));
             fail();
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/PartitionTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/PartitionTest.java
deleted file mode 100644
index 65acea02d34..00000000000
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/PartitionTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.clustercontroller.core.restapiv2;
-
-import com.yahoo.vespa.clustercontroller.utils.staterestapi.response.UnitResponse;
-import org.codehaus.jettison.json.JSONObject;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class PartitionTest extends StateRestApiTest {
-
-    @Test
-    void testPartition() throws Exception {
-        setUp(true);
-        UnitResponse response = restAPI.getState(new StateRequest("music/storage/1/0", 0));
-        String expected =
-                "{\n" +
-                        "  \"state\": {\"generated\": {\n" +
-                        "    \"state\": \"up\",\n" +
-                        "    \"reason\": \"\"\n" +
-                        "  }},\n" +
-                        "  \"metrics\": {\n" +
-                        "    \"bucket-count\": 1,\n" +
-                        "    \"unique-document-count\": 2,\n" +
-                        "    \"unique-document-total-size\": 3\n" +
-                        "  }\n" +
-                        "}";
-        assertEquals(expected, jsonWriter.createJson(response).toString(2));
-    }
-
-    @Test
-    void testRecursiveCluster() throws Exception {
-        setUp(true);
-        UnitResponse response = restAPI.getState(new StateRequest("music/storage/1/0", 1));
-        String expected =
-                "{\n" +
-                        "  \"state\": {\"generated\": {\n" +
-                        "    \"state\": \"up\",\n" +
-                        "    \"reason\": \"\"\n" +
-                        "  }},\n" +
-                        "  \"metrics\": {\n" +
-                        "    \"bucket-count\": 1,\n" +
-                        "    \"unique-document-count\": 2,\n" +
-                        "    \"unique-document-total-size\": 3\n" +
-                        "  }\n" +
-                        "}";
-        assertEquals(expected, jsonWriter.createJson(response).toString(2));
-    }
-}
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/SetNodeStateTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/SetNodeStateTest.java
index 1b52194b270..33a962a532d 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/SetNodeStateTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/SetNodeStateTest.java
@@ -341,6 +341,7 @@ public class SetNodeStateTest extends StateRestApiTest {
         setUp(true);
 
         String wrongUnitMessage = "State can only be set at cluster or node level";
+
         try {
             restAPI.setUnitState(new SetUnitStateRequestImpl(
                     "").setNewState("user", "down", "testing"));
@@ -349,8 +350,6 @@ public class SetNodeStateTest extends StateRestApiTest {
             assertTrue(e.getMessage().contains(wrongUnitMessage), e.getMessage());
         }
 
-        // ... setting at cluster-level is allowed
-
         try {
             restAPI.setUnitState(new SetUnitStateRequestImpl(
                     "music/distributor").setNewState("user", "down", "testing"));
@@ -358,16 +357,6 @@ public class SetNodeStateTest extends StateRestApiTest {
         } catch (OperationNotSupportedForUnitException e) {
             assertTrue(e.getMessage().contains(wrongUnitMessage), e.getMessage());
         }
-
-        // ... setting at node-level is allowed
-
-        try {
-            restAPI.setUnitState(new SetUnitStateRequestImpl(
-                    "music/storage/1/0").setNewState("user", "down", "testing"));
-            fail();
-        } catch (OperationNotSupportedForUnitException e) {
-            assertTrue(e.getMessage().contains(wrongUnitMessage), e.getMessage());
-        }
     }
 
     @Test
@@ -403,12 +392,6 @@ public class SetNodeStateTest extends StateRestApiTest {
             fail();
         } catch (MissingUnitException e) {
         }
-        try {
-            restAPI.setUnitState(new SetUnitStateRequestImpl(
-                    "music/storage/1/bar").setNewState("user", "down", "testing"));
-            fail();
-        } catch (MissingUnitException e) {
-        }
     }
 
     @Test
@@ -520,7 +503,7 @@ public class SetNodeStateTest extends StateRestApiTest {
     // important to test (and expected to happen) for requests that have dependencies on cluster
     // state version publishing.
     @Test
-    void leadership_loss_fails_set_node_state_request() throws Exception {
+    void leadership_loss_fails_set_node_state_request() {
         Throwable exception = assertThrows(UnknownMasterException.class, () -> {
 
             SetNodeStateRequest request = createDummySetNodeStateRequest();
@@ -538,7 +521,7 @@ public class SetNodeStateTest extends StateRestApiTest {
     }
 
     @Test
-    void deadline_exceeded_fails_set_node_state_request() throws Exception {
+    void deadline_exceeded_fails_set_node_state_request() {
         Throwable exception = assertThrows(DeadlineExceededException.class, () -> {
 
             SetNodeStateRequest request = createDummySetNodeStateRequest();