summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorgjoranv <gv@oath.com>2017-09-05 21:37:32 +0200
committergjoranv <gv@oath.com>2017-09-05 21:37:32 +0200
commitb9e580c68db05ec8ee66b4ecf40e2d64d9641373 (patch)
treea5a623550bdf277e9744e3012740bf8b2119058d /config
parenta3e58b6db3fefb5a46e0cee8c2f7ac094f870a69 (diff)
Revert "Keep using the deprecated createClassName method for now."
This reverts commit 121785959820d1f3803a160b589644685e9684e9.
Diffstat (limited to 'config')
-rw-r--r--config/src/test/java/com/yahoo/vespa/config/buildergen/ConfigBuilderGeneratorTest.java4
1 files changed, 2 insertions, 2 deletions
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\""));