Throw exception when trying to create ApplicationId from from a string with too many parts

1 files changed, 3 insertions, 8 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 69d25cd118a..49e0b0f478d 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
@@ -64,14 +64,9 @@ public class ApplicationId implements Comparable<ApplicationId> {
 
     private static ApplicationId fromIdString(String idString, String splitCharacter) {
         String[] parts = idString.split(Pattern.quote(splitCharacter));
-        String errorMessage = "Application ids must be on the form tenant" +
-                splitCharacter + "application" + splitCharacter + "instance, but was " + idString;
-        if (parts.length < 3)
-            throw new IllegalArgumentException(errorMessage);
-        // TODO: Throw exception when we have verified no-one is abusing this with more than 3 parts in id string
-        // Include code in require_that_invalid_idstring_throws_exception() in ApplicationIdTest to test this
-        if (parts.length > 3)
-            log.log(SEVERE, errorMessage);
+        if (parts.length != 3)
+            throw new IllegalArgumentException("Application ids must be on the form tenant" +
+                                                       splitCharacter + "application" + splitCharacter + "instance, but was " + idString);
         return from(parts[0], parts[1], parts[2]);
     }