1 files changed, 33 insertions, 33 deletions

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..aa70bf4d26a 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,10 @@ package com.yahoo.config.provision;
 
 import com.yahoo.cloud.config.ApplicationIdConfig;
 
+import java.util.Comparator;
+import java.util.Objects;
+import java.util.regex.Pattern;
+
 /**
  * A complete, immutable identification of an application instance.
  *
@@ -10,27 +14,40 @@ import com.yahoo.cloud.config.ApplicationIdConfig;
  * @author vegard
  * @author bratseth
  */
-public final class ApplicationId implements Comparable<ApplicationId> {
+public class ApplicationId implements Comparable<ApplicationId> {
+
+    // TODO: remove '.' and '*' from this pattern.
+    static final Pattern namePattern = Pattern.compile("(?!\\.\\.)[a-zA-Z0-9_.*-]{1,256}");
+
+    private static final ApplicationId global = new ApplicationId(TenantName.from("*"),
+                                                                  ApplicationName.from("*"),
+                                                                  InstanceName.from("*")) {
+        @Override public boolean equals(Object other) { return this == other; }
+    };
+
+    private static final Comparator<ApplicationId> comparator = Comparator.comparing(ApplicationId::tenant)
+                                                                          .thenComparing(ApplicationId::application)
+                                                                          .thenComparing(ApplicationId::instance)
+                                                                          .thenComparing(global::equals, Boolean::compare);
 
     private final TenantName tenant;
     private final ApplicationName application;
     private final InstanceName instance;
-
-    private final String stringValue;
     private final String serializedForm;
 
-    public ApplicationId(ApplicationIdConfig config) {
-        this(TenantName.from(config.tenant()), ApplicationName.from(config.application()), InstanceName.from(config.instance()));
-    }
-
     private ApplicationId(TenantName tenant, ApplicationName applicationName, InstanceName instanceName) {
         this.tenant = tenant;
         this.application = applicationName;
         this.instance = instanceName;
-        this.stringValue = toStringValue();
         this.serializedForm = toSerializedForm();
     }
 
+    public static ApplicationId from(ApplicationIdConfig config) {
+        return from(TenantName.from(config.tenant()),
+                    ApplicationName.from(config.application()),
+                    InstanceName.from(config.instance()));
+    }
+
     public static ApplicationId from(TenantName tenant, ApplicationName application, InstanceName instance) {
         return new ApplicationId(tenant, application, instance);
     }
@@ -44,7 +61,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 +69,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 +89,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 +101,7 @@ public final class ApplicationId implements Comparable<ApplicationId> {
     }
 
     private String toSerializedForm() {
-        return tenant + ":" + application + ":" + instance;
+        return tenant.value() + ":" + application.value() + ":" + instance.value();
     }
 
     @Override
@@ -100,18 +113,7 @@ public final class ApplicationId implements Comparable<ApplicationId> {
 
     @Override
     public int compareTo(ApplicationId other) {
-        int diff;
-
-        diff = tenant.compareTo(other.tenant);
-        if (diff != 0) { return diff; }
-
-        diff = application.compareTo(other.application);
-        if (diff != 0) { return diff; }
-
-        diff = instance.compareTo(other.instance);
-        if (diff != 0) { return diff; }
-
-        return 0;
+        return comparator.compare(this, other);
     }
 
     /** Returns an application id where all fields are "default" */
@@ -119,12 +121,10 @@ public final class ApplicationId implements Comparable<ApplicationId> {
         return new ApplicationId(TenantName.defaultName(), ApplicationName.defaultName(), InstanceName.defaultName());
     }
 
-    /** Returns an application id where all fields are "*" */
+    // TODO: kill this
+    /** Returns a very special application id, which is not equal to any other id. */
     public static ApplicationId global() {
-        return new Builder().tenant("*")
-                            .applicationName("*")
-                            .instanceName("*")
-                            .build();
+        return global;
     }
 
     public static class Builder {