Cleanup config model, part 1

Remove unused code, optimize imports, fix method signatures.
No functional changes

1 files changed, 4 insertions, 4 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
index 0da3b8e1f5f..1f0b0188681 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
@@ -93,14 +93,14 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
 
     // TODO: remove test when all containers are named 'container'
     @Test
-    public void cluster_with_only_search_gets_qrserver_as_service_name() throws Exception {
+    public void cluster_with_only_search_gets_qrserver_as_service_name() {
         createClusterWithOnlyDefaultChains();
         ApplicationContainerCluster cluster = (ApplicationContainerCluster)root.getChildren().get("default");
         assertThat(cluster.getContainers().get(0).getServiceName(), is(QRSERVER.serviceName));
     }
 
     @Test
-    public void empty_search_element_gives_default_chains() throws Exception {
+    public void empty_search_element_gives_default_chains() {
         createClusterWithOnlyDefaultChains();
         assertThat(chainsConfig().chains(), hasItemWithMethod("vespaPhases", "id"));
         assertThat(chainsConfig().chains(), hasItemWithMethod("native", "id"));
@@ -137,7 +137,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void cluster_is_connected_to_content_clusters() throws Exception {
+    public void cluster_is_connected_to_content_clusters() {
         String hosts = hostsXml();
 
         String services = "" +
@@ -163,7 +163,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void cluster_is_connected_to_search_clusters() throws Exception {
+    public void cluster_is_connected_to_search_clusters() {
         String hosts = hostsXml();
 
         String services = "" +