diff options
author | Harald Musum <musum@yahoo-inc.com> | 2017-05-10 13:11:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-10 13:11:47 +0200 |
commit | 962bfb72ea4a2b1a96620cca68df1559d549e897 (patch) | |
tree | e793e6a49c06b441a0eb0aea16079f3250b79159 /configgen | |
parent | fc6a5364352050df8c0073cc69a32c4b2bf9a145 (diff) | |
parent | 7510ba6dc2915c29b2e215b557330bb711108068 (diff) |
Merge pull request #2439 from yahoo/gjoranv/revert-remove-default-ctor
Revert "Remove the default ctor for the generated config classes."
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); |