Don't support missing namespace

1 files changed, 12 insertions, 1 deletions

diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionKey.java b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionKey.java
index 29c39ef0ab0..c7396394f62 100644
--- a/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionKey.java
+++ b/config/src/main/java/com/yahoo/vespa/config/ConfigDefinitionKey.java
@@ -1,6 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config;
 
+import java.util.Objects;
+
 /**
  * Represents one config definition key (name, namespace)
  *
@@ -13,13 +15,22 @@ public class ConfigDefinitionKey {
 
     /**
      * Creates a config definition key.
-     *  @param name      config definition name
+     * 
+     * @param name      config definition name
      * @param namespace config definition namespace
      */
     public ConfigDefinitionKey(String name, String namespace) {
+        require(name, "A config name cannot be null or empty");
+        require(namespace, "A config name cannot be null or empty");
         this.name = name;
         this.namespace = namespace;
     }
+    
+    private static void require(String object, String message) {
+        Objects.requireNonNull(object, message);
+        if (object.isEmpty())
+            throw new IllegalArgumentException(message);
+    }
 
     public ConfigDefinitionKey(ConfigKey<?> key) {
         this(key.getName(), key.getNamespace());