diff options
3 files changed, 4 insertions, 13 deletions
diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigKey.java b/config/src/main/java/com/yahoo/vespa/config/ConfigKey.java index 9a7ac58e339..2fccabe111b 100755 --- a/config/src/main/java/com/yahoo/vespa/config/ConfigKey.java +++ b/config/src/main/java/com/yahoo/vespa/config/ConfigKey.java @@ -108,16 +108,7 @@ public class ConfigKey<CONFIGCLASS extends ConfigInstance> implements Comparable return configClass; } - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("name="); - sb.append(name); - sb.append(",namespace="); - sb.append(namespace); - sb.append(",configId="); - sb.append(configId); - return sb.toString(); - } + public String toString() { return "name=" + namespace + "." + name + ",configId=" + configId; } public static ConfigKey<?> createFull(String name, String configId, String namespace) { return new ConfigKey<>(name, configId, namespace, null); diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigSetTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigSetTest.java index c9e7bb23402..c141ed8403c 100644 --- a/config/src/test/java/com/yahoo/config/subscription/ConfigSetTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/ConfigSetTest.java @@ -18,7 +18,7 @@ public class ConfigSetTest { ConfigSet set = new ConfigSet(); SimpletypesConfig.Builder builder = new SimpletypesConfig.Builder(); set.addBuilder("foo", builder); - assertTrue(Pattern.matches("name=simpletypes,namespace=foo,configId=foo=>com.yahoo.foo.SimpletypesConfig.*", + assertTrue(Pattern.matches("name=foo.simpletypes,configId=foo=>com.yahoo.foo.SimpletypesConfig.*", set.toString())); } } diff --git a/config/src/vespa/config/common/configkey.cpp b/config/src/vespa/config/common/configkey.cpp index 248890b05f9..f6f0b6cba00 100644 --- a/config/src/vespa/config/common/configkey.cpp +++ b/config/src/vespa/config/common/configkey.cpp @@ -73,9 +73,9 @@ ConfigKey::toString() const { vespalib::string s; s.append("name="); - s.append(_defName); - s.append(",namespace="); s.append(_defNamespace); + s.append("."); + s.append(_defName); s.append(",configId="); s.append(_configId); return s; |