diff options
3 files changed, 10 insertions, 5 deletions
diff --git a/config-class-plugin/src/main/java/com/yahoo/vespa/ConfigGenMojo.java b/config-class-plugin/src/main/java/com/yahoo/vespa/ConfigGenMojo.java index 66c62b3b194..64941fdc1a2 100644 --- a/config-class-plugin/src/main/java/com/yahoo/vespa/ConfigGenMojo.java +++ b/config-class-plugin/src/main/java/com/yahoo/vespa/ConfigGenMojo.java @@ -1,6 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa; +import com.yahoo.config.codegen.DefParser; import com.yahoo.config.codegen.MakeConfig; import com.yahoo.config.codegen.MakeConfigProperties; import com.yahoo.config.codegen.PropertyException; @@ -19,6 +20,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import static com.yahoo.config.codegen.DefParser.DEFAULT_PACKAGE_PREFIX; + /** * Goal which generates config classes from def-files. @@ -58,7 +61,7 @@ public class ConfigGenMojo extends AbstractMojo { /** * Package prefix of generated configs. The resulting package name will be packagePrefix.namespace if specified. */ - @Parameter(property = "plugin.configuration.packagePrefix", defaultValue = "com.yahoo.") + @Parameter(property = "plugin.configuration.packagePrefix", defaultValue = DEFAULT_PACKAGE_PREFIX) private String packagePrefix; /** 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) |