diff options
Diffstat (limited to 'configgen/src/main/java/com/yahoo')
3 files changed, 3 insertions, 3 deletions
diff --git a/configgen/src/main/java/com/yahoo/config/codegen/BuilderGenerator.java b/configgen/src/main/java/com/yahoo/config/codegen/BuilderGenerator.java index e7b6455f3e0..78ef17f613a 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/BuilderGenerator.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/BuilderGenerator.java @@ -271,7 +271,7 @@ public class BuilderGenerator { String bType = builderType(n); String stringSetter = ""; - if ( ! "String".equals(bType) && ! "FileReference".equals(bType)) { + if ( ! "String".equals(bType) && ! "FileReference".equals(bType) && ! "ModelReference".equals(bType)) { String type = boxedDataType(n); if ("UrlReference".equals(bType)) type = bType; diff --git a/configgen/src/main/java/com/yahoo/config/codegen/ConfigGenerator.java b/configgen/src/main/java/com/yahoo/config/codegen/ConfigGenerator.java index fd3aa388ed6..5ffe18b1699 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/ConfigGenerator.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/ConfigGenerator.java @@ -434,7 +434,7 @@ public class ConfigGenerator { } else if (node instanceof UrlLeaf) { return "File"; } else if (node instanceof ModelLeaf) { - return "ModelReference"; + return "Path"; } else if (node instanceof IntegerLeaf) { return "int"; } else if (node instanceof LongLeaf) { diff --git a/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java b/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java index 4141a3b6e09..78977f43bdd 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java @@ -138,7 +138,7 @@ public class JavaClassBuilder implements ClassBuilder { for (int i = 1;; i++) { String candidate = (i < basis.length()) ? basis.substring(0, i) : ReservedWords.INTERNAL_PREFIX + basis + rng.nextInt(Integer.MAX_VALUE); - if (usedSymbols.contains(candidate) == false) { + if ( ! usedSymbols.contains(candidate)) { return candidate; } } |