Minor cleanup

Reindentation, added a toString(), removed unused methods, style fixes

1 files changed, 6 insertions, 1 deletions

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 bda79ee2356..dd6556f81d2 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
@@ -102,7 +102,7 @@ public abstract class AbstractService extends AbstractConfigProducer<AbstractCon
         Map<HostResource, List<SERVICE>> affinityMap = new HashMap<>();
         for (SERVICE service : services) {
             if (!affinityMap.containsKey(service.getHostResource())) {
-                affinityMap.put(service.getHostResource(), new ArrayList<SERVICE>());
+                affinityMap.put(service.getHostResource(), new ArrayList<>());
             }
             int cpuSocket = affinityMap.get(service.getHostResource()).size();
             affinityMap.get(service.getHostResource()).add(service);
@@ -548,4 +548,9 @@ public abstract class AbstractService extends AbstractConfigProducer<AbstractCon
     public void setAffinity(Affinity affinity) {
         this.affinity = Optional.ofNullable(affinity);
     }
+
+    @Override
+    public String toString() {
+        return getServiceName() + " on " + getHost().toString();
+    }
 }