Cleanup of config definition name and namespace

Config definition name and namespace are mandatory, so no need
to fallback to default namespace anymore

2 files changed, 5 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/InstanceResolver.java b/config-model/src/main/java/com/yahoo/vespa/model/InstanceResolver.java
index f90b399d305..a8404b076d4 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/InstanceResolver.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/InstanceResolver.java
@@ -135,8 +135,7 @@ class InstanceResolver {
     }
 
     static String packageName(ConfigDefinitionKey cKey, PackagePrefix packagePrefix) {
-        String prefix = packagePrefix.value;
-        return prefix + (cKey.getNamespace().isEmpty() ? CNode.DEFAULT_NAMESPACE : cKey.getNamespace());
+        return packagePrefix.value + cKey.getNamespace();
     }
 
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java
index d07f6c4e6fd..31231857aae 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java
@@ -86,11 +86,15 @@ public class DomConfigPayloadBuilder {
     }
 
     private static boolean validName(String name) {
+        if (name == null) return false;
+
         Matcher m = namePattern.matcher(name);
         return m.matches();
     }
 
     private static boolean validNamespace(String namespace) {
+        if (namespace == null) return false;
+
         Matcher m = namespacePattern.matcher(namespace);
         return m.matches();
     }