Revert "Rewrite ConfigGenerator.createClassName to Java."

This reverts commit f6ec274aab8d1b4d2ac25c104bc5a603dc4156ff.

2 files changed, 17 insertions, 5 deletions

diff --git a/configgen/src/main/scala/com/yahoo/config/codegen/ConfigGenerator.scala b/configgen/src/main/scala/com/yahoo/config/codegen/ConfigGenerator.scala
index b4a19ea431d..7ea07762c01 100644
--- a/configgen/src/main/scala/com/yahoo/config/codegen/ConfigGenerator.scala
+++ b/configgen/src/main/scala/com/yahoo/config/codegen/ConfigGenerator.scala
@@ -2,11 +2,11 @@
 package com.yahoo.config.codegen
 
 
-import com.yahoo.config.codegen.BuilderGenerator.getBuilder
-import com.yahoo.config.codegen.ConfiggenUtil.createClassName
-import com.yahoo.config.codegen.JavaClassBuilder.Indentation
 import com.yahoo.config.codegen.LeafCNode._
 import com.yahoo.config.codegen.ReservedWords.{INTERNAL_PREFIX => InternalPrefix}
+import JavaClassBuilder.Indentation
+import BuilderGenerator.getBuilder
+import util.parsing.combinator.JavaTokenParsers
 
 /**
  * @author gjoranv
@@ -449,4 +449,17 @@ object ConfigGenerator {
     }
   }
 
+  /**
+   * Create class name from def name
+   * @param defName The file name without the '.def' suffix
+   */
+  def createClassName(defName: String): String = {
+    val className = defName.split("-").map (_.capitalize).mkString + "Config"
+    val parser = new JavaTokenParsers {}
+    parser.parseAll(parser.ident, className) match {
+      case parser.NoSuccess(msg, _) =>
+        throw new CodegenRuntimeException("Illegal config definition file name '" + defName + "': " + msg)
+      case success => success.get
+    }
+  }
 }
diff --git a/configgen/src/main/scala/com/yahoo/config/codegen/JavaClassBuilder.scala b/configgen/src/main/scala/com/yahoo/config/codegen/JavaClassBuilder.scala
index e03a6d3d04b..518815d5a10 100644
--- a/configgen/src/main/scala/com/yahoo/config/codegen/JavaClassBuilder.scala
+++ b/configgen/src/main/scala/com/yahoo/config/codegen/JavaClassBuilder.scala
@@ -3,8 +3,7 @@ package com.yahoo.config.codegen
 
 import java.io.{File, FileNotFoundException, FileOutputStream, PrintStream}
 
-import com.yahoo.config.codegen.ConfigGenerator.indentCode
-import com.yahoo.config.codegen.ConfiggenUtil.createClassName
+import com.yahoo.config.codegen.ConfigGenerator.{createClassName, indentCode}
 import com.yahoo.config.codegen.DefParser.DEFAULT_PACKAGE_PREFIX
 
 import scala.collection.JavaConverters._