diff options
author | Lester Solbakken <lesters@oath.com> | 2022-04-06 15:42:16 +0200 |
---|---|---|
committer | Lester Solbakken <lesters@oath.com> | 2022-04-06 15:42:16 +0200 |
commit | 0040e513d9ebf634130615dde62b2908c4aa9aa1 (patch) | |
tree | 9d153ffe7204cf2a7d1b744cb94ed962c68c72e2 /configgen | |
parent | 7359332a2a806c84c2e504da60b9c5b087e81747 (diff) |
Move embedder config def to configdefinitions and serialize as reference
Diffstat (limited to 'configgen')
-rw-r--r-- | configgen/src/main/java/com/yahoo/config/codegen/BuilderGenerator.java | 17 | ||||
-rw-r--r-- | configgen/src/test/resources/allfeatures.reference | 11 |
2 files changed, 22 insertions, 6 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 937d04b35bd..a0717a1060f 100644 --- a/configgen/src/main/java/com/yahoo/config/codegen/BuilderGenerator.java +++ b/configgen/src/main/java/com/yahoo/config/codegen/BuilderGenerator.java @@ -204,7 +204,7 @@ public class BuilderGenerator { } private static String privateLeafNodeSetter(LeafCNode n) { - if ("String".equals(builderType(n)) || "FileReference".equals(builderType(n)) || "UrlReference".equals(builderType(n))) { + if ("String".equals(builderType(n)) || "FileReference".equals(builderType(n))) { return ""; } else { return "\n\n" + // @@ -247,7 +247,7 @@ public class BuilderGenerator { } private static String privateLeafMapSetter(CNode n) { - if ("String".equals(builderType(n)) || "FileReference".equals(builderType(n)) || "UrlReference".equals(builderType(n))) { + if ("String".equals(builderType(n)) || "FileReference".equals(builderType(n))) { return ""; } else { return "\n\n" + // @@ -269,10 +269,15 @@ public class BuilderGenerator { : ""; String bType = builderType(n); - String stringSetter = "String".equals(bType) || "FileReference".equals(bType) || "UrlReference".equals(bType) ? "" - : String.format("\nprivate Builder %s(String %svalue) {\n" + // - " return %s(%s.valueOf(%svalue));\n" + // - "}", name, INTERNAL_PREFIX, name, boxedDataType(n), INTERNAL_PREFIX); + String stringSetter = ""; + if ( ! "String".equals(bType) && ! "FileReference".equals(bType)) { + String type = boxedDataType(n); + if ("UrlReference".equals(bType)) + type = bType; + stringSetter = String.format("\nprivate Builder %s(String %svalue) {\n" + // + " return %s(%s.valueOf(%svalue));\n" + // + "}", name, INTERNAL_PREFIX, name, type, INTERNAL_PREFIX); + } String getNullGuard = bType.equals(boxedBuilderType(n)) ? String.format( "\nif (%svalue == null) throw new IllegalArgumentException(\"Null value is not allowed.\");", INTERNAL_PREFIX) : ""; diff --git a/configgen/src/test/resources/allfeatures.reference b/configgen/src/test/resources/allfeatures.reference index 7698ea6727c..21f49d21413 100644 --- a/configgen/src/test/resources/allfeatures.reference +++ b/configgen/src/test/resources/allfeatures.reference @@ -406,6 +406,9 @@ public final class AllfeaturesConfig extends ConfigInstance { return this; } + private Builder urlVal(String __value) { + return urlVal(UrlReference.valueOf(__value)); + } public Builder boolarr(Boolean __value) { boolarr.add(__value); @@ -527,6 +530,10 @@ public final class AllfeaturesConfig extends ConfigInstance { return this; } + private Builder urlArr(String __value) { + return urlArr(UrlReference.valueOf(__value)); + } + public Builder intMap(String __key, Integer __value) { intMap.put(__key, __value); return this; @@ -561,6 +568,10 @@ public final class AllfeaturesConfig extends ConfigInstance { return this; } + private Builder urlMap(String __key, String __value) { + return urlMap(__key, UrlReference.valueOf(__value)); + } + public Builder basic_struct(Basic_struct.Builder __builder) { basic_struct = __builder; return this; |