diff options
3 files changed, 7 insertions, 6 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; diff --git a/config/src/test/java/com/yahoo/vespa/config/buildergen/ConfigBuilderGeneratorTest.java b/config/src/test/java/com/yahoo/vespa/config/buildergen/ConfigBuilderGeneratorTest.java index 4d122744388..525921d3052 100644 --- a/config/src/test/java/com/yahoo/vespa/config/buildergen/ConfigBuilderGeneratorTest.java +++ b/config/src/test/java/com/yahoo/vespa/config/buildergen/ConfigBuilderGeneratorTest.java @@ -3,7 +3,6 @@ package com.yahoo.vespa.config.buildergen; import com.google.common.io.Files; import com.yahoo.config.ConfigInstance; -import com.yahoo.config.codegen.ConfigGenerator; import com.yahoo.slime.Cursor; import com.yahoo.slime.Slime; import com.yahoo.vespa.config.ConfigDefinitionKey; @@ -16,6 +15,7 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.net.URISyntaxException; +import static com.yahoo.config.codegen.ConfiggenUtil.createClassName; import static junit.framework.TestCase.assertNotNull; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -43,7 +43,7 @@ public class ConfigBuilderGeneratorTest { root.setString("intval", "3"); root.setString("stringval", "Hello, world"); payloadApplier.applyPayload(new ConfigPayload(slime)); - String className = ConfigGenerator.createClassName(key.getName()); + String className = createClassName(key.getName()); ConfigInstance instance = (ConfigInstance) builder.getClass().getClassLoader().loadClass("com.yahoo." + key.getNamespace() + "." + className).getConstructor(new Class<?>[]{builder.getClass()}).newInstance(builder); assertNotNull(instance); assertThat(instance.toString(), is("intval 3\nstringval \"Hello, world\"")); |