diff options
author | gjoranv <gv@oath.com> | 2017-09-05 21:37:32 +0200 |
---|---|---|
committer | gjoranv <gv@oath.com> | 2017-09-05 21:37:32 +0200 |
commit | b9e580c68db05ec8ee66b4ecf40e2d64d9641373 (patch) | |
tree | a5a623550bdf277e9744e3012740bf8b2119058d /config-model | |
parent | a3e58b6db3fefb5a46e0cee8c2f7ac094f870a69 (diff) |
Revert "Keep using the deprecated createClassName method for now."
This reverts commit 121785959820d1f3803a160b589644685e9684e9.
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/InstanceResolver.java | 5 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java | 4 |
2 files changed, 5 insertions, 4 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 39d07257e1a..108b016e067 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 @@ -5,7 +5,6 @@ import com.yahoo.config.ConfigBuilder; import com.yahoo.config.ConfigInstance; import com.yahoo.config.ConfigurationRuntimeException; import com.yahoo.config.codegen.CNode; -import com.yahoo.config.codegen.ConfigGenerator; import com.yahoo.config.codegen.InnerCNode; import com.yahoo.config.codegen.LeafCNode; import com.yahoo.vespa.config.ConfigDefinitionKey; @@ -18,6 +17,8 @@ import java.lang.reflect.Method; import java.util.List; import java.util.Map; +import static com.yahoo.config.codegen.ConfiggenUtil.createClassName; + /** * <p> * This class is capable of resolving config from a config model for a given request. It will handle @@ -152,7 +153,7 @@ class InstanceResolver { */ @SuppressWarnings("unchecked") private static Class<? extends ConfigInstance> getConfigClass(ConfigDefinitionKey cKey, ClassLoader instanceLoader) { - String className = ConfigGenerator.createClassName(cKey.getName()); + String className = createClassName(cKey.getName()); String fullClassName = packageName(cKey) + "." + className; Class<?> clazz; try { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java index 6b5ee4d2f6f..eda8b564ffd 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java @@ -9,7 +9,6 @@ import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.application.api.ValidationId; import com.yahoo.config.application.api.ValidationOverrides; -import com.yahoo.config.codegen.ConfigGenerator; import com.yahoo.config.codegen.InnerCNode; import com.yahoo.config.model.ApplicationConfigProducerRoot; import com.yahoo.config.model.ConfigModelRegistry; @@ -63,6 +62,7 @@ import java.util.Set; import java.util.logging.Logger; import java.util.stream.Collectors; +import static com.yahoo.config.codegen.ConfiggenUtil.createClassName; import static com.yahoo.text.StringUtilities.quote; /** @@ -358,7 +358,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri } public ConfigInstance.Builder createBuilder(ConfigDefinitionKey key, ConfigDefinition targetDef) { - String className = ConfigGenerator.createClassName(key.getName()); + String className = createClassName(key.getName()); Class<?> clazz; final String fullClassName = InstanceResolver.packageName(key) + "." + className; |