Java to Kotlin converter: do not initialize non-val's in artificial primary constructor - it often produced stupid code

j2k/src/org/jetbrains/jet/j2k/ConstructorConverter.kt

@@ -168,10 +168,10 @@ class ConstructorConverter(private val converter: Converter) {
     private fun generateArtificialPrimaryConstructor(className: Identifier, classBody: ClassBody): ClassBody {
         assert(classBody.primaryConstructorSignature == null)
 
-        val finalOrWithEmptyInitializerFields = classBody.members.filterIsInstance(javaClass<Field>()).filter { it.isVal || it.initializer.isEmpty }
+        val fieldsToInitialize = classBody.members.filterIsInstance(javaClass<Field>()).filter { it.isVal }
         val initializers = HashMap<Field, Expression?>()
         for (factoryFunction in classBody.factoryFunctions()) {
-            for (field in finalOrWithEmptyInitializerFields) {
+            for (field in fieldsToInitialize) {
                 initializers.put(field, getDefaultInitializer(field))
             }
 
@@ -182,7 +182,7 @@ class ConstructorConverter(private val converter: Converter) {
                     val assignee = statement.left
                     if (assignee is QualifiedExpression && (assignee.qualifier as? Identifier)?.name == tempValName) {
                         val name = (assignee.identifier as Identifier).name
-                        for (field in finalOrWithEmptyInitializerFields) {
+                        for (field in fieldsToInitialize) {
                             if (name == field.identifier.name) {
                                 initializers.put(field, statement.right)
                                 keepStatement = false
@@ -198,7 +198,7 @@ class ConstructorConverter(private val converter: Converter) {
                 }
             }
 
-            val arguments = finalOrWithEmptyInitializerFields.map { initializers[it] ?: LiteralExpression("null").assignNoPrototype() }
+            val arguments = fieldsToInitialize.map { initializers[it] ?: LiteralExpression("null").assignNoPrototype() }
             val initializer = MethodCallExpression.buildNotNull(null, className.name, arguments).assignNoPrototype()
             if (statements.isNotEmpty()) {
                 val localVar = LocalVariable(tempValIdentifier(),
@@ -217,7 +217,7 @@ class ConstructorConverter(private val converter: Converter) {
             factoryFunction.body = Block(statements, LBrace().assignNoPrototype(), RBrace().assignNoPrototype()).assignNoPrototype()
         }
 
-        val parameters = finalOrWithEmptyInitializerFields.map { field ->
+        val parameters = fieldsToInitialize.map { field ->
             val varValModifier = if (field.isVal) Parameter.VarValModifier.Val else Parameter.VarValModifier.Var
             Parameter(field.identifier, field.`type`, varValModifier, field.annotations, field.modifiers.filter { it in ACCESS_MODIFIERS }).assignPrototypesFrom(field)
         }
@@ -225,7 +225,7 @@ class ConstructorConverter(private val converter: Converter) {
         val modifiers = Modifiers(listOf(Modifier.PRIVATE)).assignNoPrototype()
         val parameterList = ParameterList(parameters).assignNoPrototype()
         val constructorSignature = PrimaryConstructorSignature(modifiers, parameterList).assignNoPrototype()
-        val updatedMembers = classBody.members.filter { !finalOrWithEmptyInitializerFields.contains(it) }
+        val updatedMembers = classBody.members.filter { !fieldsToInitialize.contains(it) }
         return ClassBody(constructorSignature, updatedMembers, classBody.classObjectMembers, classBody.lBrace, classBody.rBrace)
     }
 

j2k/tests/testData/ast/constructors/withManyDefaultParams.kt

@@ -1,12 +1,20 @@
-public class Test private(private val myName: String, var a: Boolean, var b: Double, var c: Float, var d: Long, var e: Int, protected var f: Short, protected var g: Char) {
+public class Test private(private val myName: String) {
+    var a: Boolean = false
+    var b: Double = 0.toDouble()
+    var c: Float = 0.toFloat()
+    var d: Long = 0
+    var e: Int = 0
+    protected var f: Short = 0
+    protected var g: Char = ' '
+
     class object {
 
         public fun create(): Test {
-            return Test(null, false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ')
+            return Test(null)
         }
 
         public fun create(name: String): Test {
-            return Test(foo(name), false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ')
+            return Test(foo(name))
         }
 
         fun foo(n: String): String {