diff options
author | gjoranv <gjoranv@gmail.com> | 2017-06-08 14:35:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-08 14:35:40 +0200 |
commit | b70a6ac5dd61a0f6eb86118df64dbaf4ae435782 (patch) | |
tree | f1567ad6f7be2555eb433a72b9c31c9d0110f69b /configgen/src/main/scala/com/yahoo/config/codegen/ConfigGenerator.scala | |
parent | e9db206c1a50fda586472b76aa58885bbb73c782 (diff) |
Revert "Revert "Gjoranv/remove default ctor4""
Diffstat (limited to 'configgen/src/main/scala/com/yahoo/config/codegen/ConfigGenerator.scala')
-rw-r--r-- | configgen/src/main/scala/com/yahoo/config/codegen/ConfigGenerator.scala | 12 |
1 files changed, 9 insertions, 3 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 716f2a60c33..533b9b2be23 100644 --- a/configgen/src/main/scala/com/yahoo/config/codegen/ConfigGenerator.scala +++ b/configgen/src/main/scala/com/yahoo/config/codegen/ConfigGenerator.scala @@ -180,8 +180,14 @@ object ConfigGenerator { } } - // TODO: The default ctor can be removed if the config library uses builders to set values from payload, but ... - // a default ctor is also needed for all innerArrays, because of InnerNodeVector.createNew() + // TODO: The default ctor is possibly still needed for innerArrays, because of InnerNodeVector.createNew() + def defaultConstructorIfArray = { + inner match { + case array: InnerCNode if inner.isArray => defaultConstructor + case scalar: InnerCNode => "" + } + } + def defaultConstructor = { // TODO @link gives javadoc warnings, although the syntax seems to be valid //def link = "{@link " + {nodeClass(inner)} + "#" + {nodeClass(inner)} + "(Builder)}" @@ -202,7 +208,7 @@ object ConfigGenerator { // TODO: merge these two constructors into one when the config library uses builders to set values from payload. <code> - |{defaultConstructor} + |{defaultConstructorIfArray} | |public {nodeClass(inner)}(Builder builder) {{ | this(builder, true); |