1 files changed, 7 insertions, 32 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/InstanceName.java b/config-provisioning/src/main/java/com/yahoo/config/provision/InstanceName.java
index 8101b70b943..fc40d351465 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/InstanceName.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/InstanceName.java
@@ -1,7 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.provision;
 
-import java.util.Objects;
+import ai.vespa.validation.PatternedStringWrapper;
 
 /**
  * Represents an applications instance name, which may be any kind of string or default. This type is defined
@@ -9,30 +9,12 @@ import java.util.Objects;
  *
  * @author Ulf Lilleengen
  */
-public class InstanceName implements Comparable<InstanceName> {
+public class InstanceName extends PatternedStringWrapper<InstanceName> {
 
-    private static final InstanceName defaultInstance = new InstanceName("default");
+    private static final InstanceName defaultName = new InstanceName("default");
 
-    private final String instanceName;
-
-    private InstanceName(String instanceName) {
-        this.instanceName = instanceName;
-    }
-
-    @Override
-    public int hashCode() {
-        return instanceName.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (!(obj instanceof InstanceName)) return false;
-        return Objects.equals(((InstanceName) obj).instanceName, instanceName);
-    }
-
-    @Override
-    public String toString() {
-        return instanceName;
+    private InstanceName(String name) {
+        super(name, ApplicationId.namePattern, "instance name");
     }
 
     public static InstanceName from(String name) {
@@ -40,22 +22,15 @@ public class InstanceName implements Comparable<InstanceName> {
     }
 
     public static InstanceName defaultName() {
-        return defaultInstance;
+        return defaultName;
     }
 
     public boolean isDefault() {
-        return equals(InstanceName.defaultName());
+        return equals(defaultName);
     }
 
     public boolean isTester() {
         return value().endsWith("-t");
     }
 
-    public String value() { return instanceName; }
-
-    @Override
-    public int compareTo(InstanceName instance) {
-        return instanceName.compareTo(instance.instanceName);
-    }
-
 }