Revert "Bratseth/node metrics"

5 files changed, 9 insertions, 9 deletions

diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json
index 9a091f1161c..f2ae997a164 100644
--- a/config-provisioning/abi-spec.json
+++ b/config-provisioning/abi-spec.json
@@ -391,7 +391,6 @@
     "methods": [
       "public void <init>(com.yahoo.config.provisioning.FlavorsConfig$Flavor)",
       "public void <init>(com.yahoo.config.provision.NodeResources)",
-      "public void <init>(java.lang.String, com.yahoo.config.provision.NodeResources)",
       "public com.yahoo.config.provision.Flavor with(com.yahoo.config.provision.host.FlavorOverrides)",
       "public com.yahoo.config.provision.Flavor with(com.yahoo.config.provision.NodeResources)",
       "public java.lang.String name()",
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
index 5aed5d8e2e7..16369d82f9f 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
@@ -158,6 +158,7 @@ public final class ClusterSpec {
     }
 
     /** Identifier of a group within a cluster */
+    @SuppressWarnings("deprecation")
     public static final class Group {
 
         private final int index;
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java
index d11d7137226..2711406c216 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java
@@ -49,11 +49,6 @@ public class Flavor {
         this(resources.toString(), resources, Optional.empty(), Type.DOCKER_CONTAINER, false, 0, resources.vcpu());
     }
 
-    /** Creates a *host* flavor for testing */
-    public Flavor(String name, NodeResources resources) {
-        this(name, resources, Optional.empty(), Flavor.Type.VIRTUAL_MACHINE, true, 0, resources.vcpu());
-    }
-
     private Flavor(String name,
                    NodeResources resources,
                    Optional<FlavorOverrides> flavorOverrides,
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/HostName.java b/config-provisioning/src/main/java/com/yahoo/config/provision/HostName.java
index 25c42884295..510122c2342 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/HostName.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/HostName.java
@@ -4,7 +4,7 @@ package com.yahoo.config.provision;
 import java.util.Objects;
 
 /**
- * A host name
+ * Represents a host name
  *
  * @author mortent
  */
@@ -18,7 +18,12 @@ public class HostName implements Comparable<HostName> {
 
     public String value() { return name; }
 
-    /** Create a {@link HostName} with a given name */
+    /**
+     * Create a {@link HostName} with a given name.
+     *
+     * @param name Name
+     * @return instance of {@link HostName}.
+     */
     public static HostName from(String name) {
         return new HostName(name);
     }
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
index eb462c86f4f..a9f031cae70 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
@@ -14,7 +14,7 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
- * All the flavors configured in this zone (i.e this should be called HostFlavors).
+ * All the flavors *configured* in this zone (i.e this should be called HostFlavors).
  *
  * @author bratseth
  */