simpler super constructor derivation

digital-asset · S11001001 · May 6, 2022 · Apr 27, 2022 · Apr 27, 2022 · Apr 27, 2022
commit 8f2f0777ebec322b0a6a192e5798447f19dbc845
diff --git a/...en/src/main/scala/com/digitalasset/daml/lf/codegen/backend/java/inner/ContractClass.scala b/...en/src/main/scala/com/digitalasset/daml/lf/codegen/backend/java/inner/ContractClass.scala
@@ -157,16 +157,16 @@ object ContractClass {
         .addParameter(setOfStrings, signatoriesFieldName)
         .addParameter(setOfStrings, observersFieldName)
 
-      val (superCtor, superCtorKeyArgs) = contractKeyClassName.cata(
-        _ => ("super($L, $L, $L, $L, $L, $L)", Seq(contractKeyFieldName)),
-        ("super($L, $L, $L, $L, $L)", Seq.empty),
-      )
+      val superCtorKeyArgs = contractKeyClassName.map(_ => contractKeyFieldName).toList
       constructorBuilder.addStatement(
-        superCtor,
-        Seq(idFieldName, dataFieldName, agreementFieldName) ++ superCtorKeyArgs ++ Seq(
-          signatoriesFieldName,
-          observersFieldName,
-        ): _*
+        "super($L)",
+        CodeBlock.join(
+          (Seq(idFieldName, dataFieldName, agreementFieldName) ++ superCtorKeyArgs ++ Seq(
+            signatoriesFieldName,
+            observersFieldName,
+          )).map(CodeBlock.of("$L", _)).asJava,
+          ",$W",
+        ),
       )
 
       val constructor = constructorBuilder.build()