Remove unused imports and imports by *.

2 files changed, 12 insertions, 8 deletions

diff --git a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StateRestApiV2Handler.java b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StateRestApiV2Handler.java
index 431fc797df6..eea085bd103 100644
--- a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StateRestApiV2Handler.java
+++ b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StateRestApiV2Handler.java
@@ -3,8 +3,6 @@ package com.yahoo.vespa.clustercontroller.apps.clustercontroller;
 
 import com.google.inject.Inject;
 import com.yahoo.cloud.config.ClusterInfoConfig;
-import com.yahoo.cloud.config.ModelConfig;
-import com.yahoo.container.jdisc.config.HttpServerConfig;
 import com.yahoo.container.logging.AccessLog;
 import com.yahoo.log.LogLevel;
 import com.yahoo.vespa.clustercontroller.apputil.communication.http.JDiscHttpRequestHandler;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
index 6d4945f23ad..b4b89278c51 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
@@ -8,7 +8,15 @@ import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.defaults.Defaults;
 import com.yahoo.vespa.filedistribution.PathDoesNotExistException;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 
 import static com.yahoo.text.Lowercase.toLowerCase;
 
@@ -66,7 +74,7 @@ public abstract class AbstractService extends AbstractConfigProducer<AbstractCon
      * more key/value pairs to the service-list dump.
      * Supported key datatypes are String, and values may be String or Integer.
      */
-    private HashMap<String, Object> serviceProperties = new LinkedHashMap<>();
+    private Map<String, Object> serviceProperties = new LinkedHashMap<>();
 
     /** The affinity properties of this service. */
     private Optional<Affinity> affinity = Optional.empty();
@@ -522,15 +530,13 @@ public abstract class AbstractService extends AbstractConfigProducer<AbstractCon
      * The service HTTP port for health status
      * @return portnumber
      */
-    public int getHealthPort() {return -1;}
+    public int getHealthPort() { return -1;}
 
     /**
      * Overridden by subclasses. List of default dimensions to be added to this services metrics
      * @return The default dimensions for this service
      */
-    public HashMap<String, String> getDefaultMetricDimensions(){
-        return  new LinkedHashMap<>();
-    }
+    public HashMap<String, String> getDefaultMetricDimensions(){ return new LinkedHashMap<>(); }
 
     // For testing
     public int getNumPortsAllocated() {