Revert "Merge pull request #21961 from vespa-engine/revert-21918-jonmv/misc-6"

This reverts commit a0b02d8bd00bf8d7f3410cbf47ae432770546883, reversing
changes made to 64d0102f9931a01d31976e85b585b9e63894f08e.

1 files changed, 7 insertions, 32 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/TenantName.java b/config-provisioning/src/main/java/com/yahoo/config/provision/TenantName.java
index 92fe5345b4e..9909ab360a0 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/TenantName.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/TenantName.java
@@ -1,56 +1,31 @@
 // 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 a tenant in the provision API.
  *
  * @author Ulf Lilleengen
  */
-public class TenantName implements Comparable<TenantName> {
+public class TenantName extends PatternedStringWrapper<TenantName> {
 
-    private final String name;
+    private static final TenantName defaultName = new TenantName("default");
 
     private TenantName(String name) {
-        this.name = name;
+        super(name, ApplicationId.namePattern, "tenant name");
     }
 
-    public String value() { return name; }
-
-    /**
-     * Create a {@link TenantName} with a given name.
-     *
-     * @param name Name of tenant.
-     * @return instance of {@link TenantName}.
-     */
     public static TenantName from(String name) {
         return new TenantName(name);
     }
     
-    @Override
-    public int hashCode() {
-    	return name.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-    	if (!(obj instanceof TenantName)) return false;
-    	return Objects.equals(((TenantName)obj).value(), value());
-    }
-
-    @Override
-    public String toString() {
-        return name;
-    }
-
     public static TenantName defaultName() {
-        return from("default");
+        return defaultName;
     }
 
-    @Override
-    public int compareTo(TenantName that) {
-        return this.name.compareTo(that.name);
+    public boolean isDefault() {
+        return equals(defaultName);
     }
 
 }