diff options
author | Harald Musum <musum@yahoo-inc.com> | 2017-06-08 21:36:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-08 21:36:32 +0200 |
commit | 5d228e521e445aba9db988d1080341b308560cfa (patch) | |
tree | d1c053f421fed0fdc70db2982efcd02f3811e668 /configgen | |
parent | 03fe521bd2e44e867e97e6ae4e2200542cebfc6f (diff) |
Revert "Revert "Revert "Gjoranv/remove default ctor4"""
Diffstat (limited to 'configgen')
-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); |