diff options
author | gjoranv <gv@yahoo-inc.com> | 2017-07-18 19:42:43 +0200 |
---|---|---|
committer | gjoranv <gv@yahoo-inc.com> | 2017-07-18 19:42:43 +0200 |
commit | c5155a6aff99a5ed0b8d0c7ef38cd4b7cc1cb408 (patch) | |
tree | d4592aadd99524e4d4990d19b6f4b6bdd0e475d6 /configgen/src | |
parent | ef77c0130f6d7dc832a814034e491e387aa7b7df (diff) |
Remove default ctor for the outer config class.
+ Make default ctor for arrays private.
Diffstat (limited to 'configgen/src')
-rw-r--r-- | configgen/src/main/scala/com/yahoo/config/codegen/ConfigGenerator.scala | 12 |
1 files changed, 7 insertions, 5 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 455ac53c2ec..7ea07762c01 100644 --- a/configgen/src/main/scala/com/yahoo/config/codegen/ConfigGenerator.scala +++ b/configgen/src/main/scala/com/yahoo/config/codegen/ConfigGenerator.scala @@ -186,11 +186,8 @@ object ConfigGenerator { // TODO @link gives javadoc warnings, although the syntax seems to be valid //def link = "{@link " + {nodeClass(inner)} + "#" + {nodeClass(inner)} + "(Builder)}" def link = {nodeClass(inner)} + "(Builder)" - def visibility = inner match { - case array: InnerCNode if inner.isArray => "public" - case _ => "private" - } + def ctor = <code> |/** | * @deprecated Not for public use. @@ -198,10 +195,15 @@ object ConfigGenerator { | * Replaced by {link} | */ |@Deprecated - |{visibility} {nodeClass(inner)}() {{ + |private {nodeClass(inner)}() {{ | this(new Builder(), false); |}} </code>.text.stripMargin.trim + + inner match { + case array: InnerCNode if inner.isArray => ctor + case _ => "" + } } // TODO: merge these two constructors into one when the config library uses builders to set values from payload. |