diff options
author | gjoranv <gjoranv@gmail.com> | 2017-05-05 15:28:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-05 15:28:09 +0200 |
commit | c7caf62359a96fc97fbd4524312cb54a7cbdcbc0 (patch) | |
tree | 5bf318174def71936d940d31fbd56bd6c101dca9 /configgen/src/main/scala | |
parent | a0ab426a612dd140349711adba6d4bb5af280fd5 (diff) |
Revert "Remove the default ctor for the generated config classes."
Diffstat (limited to 'configgen/src/main/scala')
-rw-r--r-- | configgen/src/main/scala/com/yahoo/config/codegen/ConfigGenerator.scala | 12 |
1 files changed, 3 insertions, 9 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 533b9b2be23..716f2a60c33 100644 --- a/configgen/src/main/scala/com/yahoo/config/codegen/ConfigGenerator.scala +++ b/configgen/src/main/scala/com/yahoo/config/codegen/ConfigGenerator.scala @@ -180,14 +180,8 @@ object ConfigGenerator { } } - // 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 => "" - } - } - + // 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() def defaultConstructor = { // TODO @link gives javadoc warnings, although the syntax seems to be valid //def link = "{@link " + {nodeClass(inner)} + "#" + {nodeClass(inner)} + "(Builder)}" @@ -208,7 +202,7 @@ object ConfigGenerator { // TODO: merge these two constructors into one when the config library uses builders to set values from payload. <code> - |{defaultConstructorIfArray} + |{defaultConstructor} | |public {nodeClass(inner)}(Builder builder) {{ | this(builder, true); |