diff options
Diffstat (limited to 'configgen/src')
-rw-r--r-- | configgen/src/main/java/com/yahoo/config/codegen/DefParser.java | 7 | ||||
-rw-r--r-- | configgen/src/main/scala/com/yahoo/config/codegen/JavaClassBuilder.scala | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/configgen/src/main/java/com/yahoo/config/codegen/DefParser.java b/configgen/src/main/java/com/yahoo/config/codegen/DefParser.java index 54b882d276c..3fecc7e108e 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/DefParser.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/DefParser.java @@ -14,6 +14,8 @@ import java.util.regex.Pattern; * @author hmusum */ public class DefParser { + public static final String DEFAULT_PACKAGE_PREFIX = "com.yahoo."; + static final Pattern commentPattern = Pattern.compile("^\\s*#+\\s*(.*?)\\s*$"); public static final Pattern versionPattern = Pattern.compile("^(version\\s*=\\s*)([0-9][0-9-]*)$"); // Namespace must start with a letter, since Java (Java language Spec, section 3.8) and C++ identifiers cannot start with a digit @@ -148,9 +150,8 @@ public class DefParser { } private void parseNamespaceLine(String namespace) { - if (namespace.startsWith("com.yahoo.")) - throw new IllegalArgumentException("Remove 'com.yahoo.' from the namespace '" + namespace + - "' - it will be automatically added to the java package name."); + if (namespace.startsWith(DEFAULT_PACKAGE_PREFIX)) + throw new IllegalArgumentException("Please use 'package' instead of 'namespace'."); root.setNamespace(namespace); root.setComment(comment); comment = ""; 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 578a8215750..51065eba03e 100644 --- a/configgen/src/main/scala/com/yahoo/config/codegen/JavaClassBuilder.scala +++ b/configgen/src/main/scala/com/yahoo/config/codegen/JavaClassBuilder.scala @@ -4,6 +4,7 @@ package com.yahoo.config.codegen import java.io.{File, FileNotFoundException, FileOutputStream, PrintStream} import com.yahoo.config.codegen.ConfigGenerator.{createClassName, indentCode} +import com.yahoo.config.codegen.DefParser.DEFAULT_PACKAGE_PREFIX import scala.collection.JavaConverters._ import scala.util.Random @@ -22,7 +23,7 @@ class JavaClassBuilder( { import JavaClassBuilder._ - val packagePrefix = if (rawPackagePrefix != null) rawPackagePrefix else "com.yahoo." + val packagePrefix = if (rawPackagePrefix != null) rawPackagePrefix else DEFAULT_PACKAGE_PREFIX val javaPackage = packagePrefix + root.getNamespace val className = createClassName(root.getName) |