Split instance and application and creation and deletion, but let REST API do both

3 files changed, 6 insertions, 7 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/ApplicationId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/ApplicationId.java
index fceecedb9fe..c2512c2032b 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/ApplicationId.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/ApplicationId.java
@@ -10,10 +10,6 @@ public class ApplicationId extends NonDefaultIdentifier {
         super(id);
     }
 
-    public static boolean isLegal(String id) {
-        return strictPattern.matcher(id).matches();
-    }
-    
     @Override
     public void validate() {
         super.validate();
@@ -21,9 +17,8 @@ public class ApplicationId extends NonDefaultIdentifier {
     }
 
     public static void validate(String id) {
-        if (!isLegal(id)) {
+        if ( ! strictPattern.matcher(id).matches())
             throwInvalidId(id, strictPatternExplanation);
-        }
     }
 
 }
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/Identifier.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/Identifier.java
index 2067a88e5fb..4007ac2b9cd 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/Identifier.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/Identifier.java
@@ -15,7 +15,6 @@ public abstract class Identifier {
     protected static final String strictPatternExplanation =
             "New tenant or application names must start with a letter, may contain no more than 20 " +
             "characters, and may only contain lowercase letters, digits or dashes, but no double-dashes.";
-    // TODO: Use this also for instances, if they ever get proper support.
     protected static final Pattern strictPattern = Pattern.compile("^(?=.{1,20}$)[a-z](-?[a-z0-9]+)*$");
     private static final Pattern serializedIdentifierPattern = Pattern.compile("[a-zA-Z0-9_-]+");
     private static final Pattern serializedPattern = Pattern.compile("[a-zA-Z0-9_.-]+");
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/InstanceId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/InstanceId.java
index 6e3087cdcf6..8e14774b827 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/InstanceId.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/identifiers/InstanceId.java
@@ -16,4 +16,9 @@ public class InstanceId extends SerializedIdentifier {
         validateNoUpperCase();
     }
 
+    public static void validate(String id) {
+        if ( ! strictPattern.matcher(id).matches())
+            throwInvalidId(id, strictPatternExplanation);
+    }
+
 }