Cleanup, should not change anything

7 files changed, 15 insertions, 29 deletions

diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/TenantId.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/TenantId.java
index 7d94a0418e4..20aca379015 100644
--- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/TenantId.java
+++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/TenantId.java
@@ -31,8 +31,6 @@ public class TenantId {
         return id;
     }
 
-    public TenantName toName() { return TenantName.from(id); }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java
index 76d4ae3f1a6..274a3902d04 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java
@@ -3,6 +3,8 @@ package com.yahoo.config.provision;
 
 import com.yahoo.cloud.config.ApplicationIdConfig;
 
+import java.util.Objects;
+
 /**
  * A complete, immutable identification of an application instance.
  *
@@ -15,8 +17,6 @@ public final class ApplicationId implements Comparable<ApplicationId> {
     private final TenantName tenant;
     private final ApplicationName application;
     private final InstanceName instance;
-
-    private final String stringValue;
     private final String serializedForm;
 
     public ApplicationId(ApplicationIdConfig config) {
@@ -27,7 +27,6 @@ public final class ApplicationId implements Comparable<ApplicationId> {
         this.tenant = tenant;
         this.application = applicationName;
         this.instance = instanceName;
-        this.stringValue = toStringValue();
         this.serializedForm = toSerializedForm();
     }
 
@@ -44,7 +43,7 @@ public final class ApplicationId implements Comparable<ApplicationId> {
         if (parts.length < 3)
             throw new IllegalArgumentException("Application ids must be on the form tenant:application:instance, but was " + idString);
 
-        return new Builder().tenant(parts[0]).applicationName(parts[1]).instanceName(parts[2]).build();
+        return from(parts[0], parts[1], parts[2]);
     }
 
     public static ApplicationId fromFullString(String idString) {
@@ -52,11 +51,11 @@ public final class ApplicationId implements Comparable<ApplicationId> {
         if (parts.length < 3)
             throw new IllegalArgumentException("Application ids must be on the form tenant.application.instance, but was " + idString);
 
-        return new Builder().tenant(parts[0]).applicationName(parts[1]).instanceName(parts[2]).build();
+        return from(parts[0], parts[1], parts[2]);
     }
 
     @Override
-    public int hashCode() { return stringValue.hashCode(); }
+    public int hashCode() { return Objects.hash(tenant, application, instance); }
 
     @Override
     public boolean equals(Object other) {
@@ -72,10 +71,6 @@ public final class ApplicationId implements Comparable<ApplicationId> {
     /** Returns a serialized form of the content of this: tenant:application:instance */
     public String serializedForm() { return serializedForm; }
 
-    private String toStringValue() {
-        return "tenant '" + tenant + "', application '" + application + "', instance '" + instance + "'";
-    }
-
     /** Returns "dotted" string (tenant.application.instance) with instance name omitted if it is "default" */
     public String toShortString() {
         return tenant().value() + "." + application().value() +
@@ -88,7 +83,7 @@ public final class ApplicationId implements Comparable<ApplicationId> {
     }
 
     private String toSerializedForm() {
-        return tenant + ":" + application + ":" + instance;
+        return tenant.value() + ":" + application.value() + ":" + instance.value();
     }
 
     @Override
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponses.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponses.java
index d3976464bde..7e6fccb6d2f 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponses.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/DelayedConfigResponses.java
@@ -193,10 +193,9 @@ public class DelayedConfigResponses {
     }
 
     private synchronized void metricDelayedResponses(ApplicationId app, int elems) {
-        if ( ! metrics.containsKey(app)) {
-            metrics.put(app, rpcServer.metricUpdaterFactory().getOrCreateMetricUpdater(Metrics.createDimensions(app)));
-        }
-        metrics.get(app).setDelayedResponses(elems);
+        metrics.computeIfAbsent(app, key -> rpcServer.metricUpdaterFactory()
+                                                     .getOrCreateMetricUpdater(Metrics.createDimensions(key)))
+               .setDelayedResponses(elems);
     }
 
     private synchronized void createQueueIfNotExists(GetConfigContext context) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
index 99ffff6403b..ebf1fb32141 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
@@ -243,13 +243,9 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener {
     }
 
     private ApplicationState getState(ApplicationId id) {
-        ApplicationState state = applicationStateMap.get(id);
-        if (state == null) {
-            applicationStateMap.putIfAbsent(id, new ApplicationState(0));
-            state = applicationStateMap.get(id);
-        }
-        return state;
+        return applicationStateMap.computeIfAbsent(id, __ -> new ApplicationState(0));
     }
+
     boolean hasNewerGeneration(ApplicationId id, long generation) {
         return getState(id).getActiveGeneration() > generation;
     }
diff --git a/testutil/src/main/java/com/yahoo/test/OrderTester.java b/testutil/src/main/java/com/yahoo/test/OrderTester.java
index 4acba4ee7fe..cc28ca9f469 100644
--- a/testutil/src/main/java/com/yahoo/test/OrderTester.java
+++ b/testutil/src/main/java/com/yahoo/test/OrderTester.java
@@ -15,8 +15,8 @@ import java.util.List;
  *
  */
 
-public abstract class OrderTester<T extends Comparable<T>> {
-    private ArrayList<List<T>> groups = new ArrayList<>();
+public abstract class OrderTester<T extends Comparable<? super T>> {
+    private final ArrayList<List<T>> groups = new ArrayList<>();
 
     abstract protected void lessTest(T a, T b);
     abstract protected void greaterTest(T a, T b);
@@ -24,7 +24,7 @@ public abstract class OrderTester<T extends Comparable<T>> {
 
     @SafeVarargs
     @SuppressWarnings("varargs")
-    private final OrderTester<T> addGroup(T... group) {
+    private OrderTester<T> addGroup(T... group) {
         groups.add(Arrays.asList(group));
         return this;
     }
diff --git a/testutil/src/main/java/com/yahoo/test/TotalOrderTester.java b/testutil/src/main/java/com/yahoo/test/TotalOrderTester.java
index 850369fbc2e..e95bc056ba8 100644
--- a/testutil/src/main/java/com/yahoo/test/TotalOrderTester.java
+++ b/testutil/src/main/java/com/yahoo/test/TotalOrderTester.java
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertTrue;
  * @author Vegard Sjonfjell
  */
 
-public class TotalOrderTester<T extends Comparable<T>> extends OrderTester<T> {
+public class TotalOrderTester<T extends Comparable<? super T>> extends OrderTester<T> {
     protected void lessTest(T a, T b) throws AssertionError {
         assertTrue(a + " must be less than " + b, a.compareTo(b) <= -1);
     }
diff --git a/vespajlib/src/main/java/ai/vespa/validation/Name.java b/vespajlib/src/main/java/ai/vespa/validation/Name.java
index b275917dcff..a6ab456c285 100644
--- a/vespajlib/src/main/java/ai/vespa/validation/Name.java
+++ b/vespajlib/src/main/java/ai/vespa/validation/Name.java
@@ -3,8 +3,6 @@ package ai.vespa.validation;
 
 import java.util.regex.Pattern;
 
-import static ai.vespa.validation.Validation.requireMatch;
-
 /**
  * A name has from 1 to 64 {@link String} characters which may be letters, numbers,
  * dashes or underscores, and must start with a letter.