Java to Kotlin convertor: generating of val/var constructor parameters when possible

j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt

@@ -1,10 +1,8 @@
-class C(arg1: Int) {
-    val myArg1: Int
+class C(val myArg1: Int) {
     var myArg2: Int = 0
     var myArg3: Int = 0
 
     {
-        myArg1 = arg1
         myArg2 = 0
         myArg3 = 0
     }

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

@@ -1,10 +1,8 @@
-open class C(arg1: Int) {
-    val myArg1: Int
+open class C(val myArg1: Int) {
     var myArg2: Int = 0
     var myArg3: Int = 0
 
     {
-        myArg1 = arg1
         myArg2 = 0
         myArg3 = 0
     }

j2k/tests/testData/ast/constructors/customerBuilder.ide.kt

@@ -1,8 +1,6 @@
 package org.test.customer
 
-class Customer(first: String, last: String) {
-    public val _firstName: String
-    public val _lastName: String
+class Customer(public val _firstName: String, public val _lastName: String) {
 
     public fun getFirstName(): String {
         return _firstName
@@ -19,8 +17,6 @@ class Customer(first: String, last: String) {
 
     {
         doSmthBefore()
-        _firstName = first
-        _lastName = last
         doSmthAfter()
     }
 }

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

@@ -1,8 +1,6 @@
 package org.test.customer
 
-open class Customer(first: String?, last: String?) {
-    public val _firstName: String?
-    public val _lastName: String?
+open class Customer(public val _firstName: String?, public val _lastName: String?) {
 
     public open fun getFirstName(): String? {
         return _firstName
@@ -19,8 +17,6 @@ open class Customer(first: String?, last: String?) {
 
     {
         doSmthBefore()
-        _firstName = first
-        _lastName = last
         doSmthAfter()
     }
 }

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.ide.kt

@@ -0,0 +1 @@
+class C(private val p1: Int, private val myP2: Int, public var p3: Int) {}

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.java

@@ -0,0 +1,12 @@
+//file
+class C {
+    private final int p1;
+    private final int myP2;
+    public int p3;
+
+    public C(int p1, int p2, int p3) {
+        this.p1 = p1;
+        myP2 = p2;
+        this.p3 = p3;
+    }
+}

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

@@ -0,0 +1 @@
+open class C(private val p1: Int, private val myP2: Int, public var p3: Int) {}

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.ide.kt

@@ -0,0 +1,5 @@
+class C(private val field: Int) {
+    {
+        System.out.println(field)
+    }
+}

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.java

@@ -0,0 +1,9 @@
+//file
+class C {
+    private final int field;
+
+    public C(int p) {
+        field = p
+        System.out.println(p);
+    }
+}

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

@@ -0,0 +1,5 @@
+open class C(private val field: Int) {
+    {
+        System.out?.println(field)
+    }
+}

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.ide.kt

@@ -0,0 +1,9 @@
+class C(p: Int) {
+    private val p: Int
+
+    {
+        this.p = p
+        System.out.println(p++)
+        System.out.println(p)
+    }
+}

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.java

@@ -0,0 +1,10 @@
+//file
+class C {
+    private final int p;
+
+    public C(int p) {
+        this.p = p
+        System.out.println(p++);
+        System.out.println(p);
+    }
+}

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

@@ -0,0 +1,9 @@
+open class C(p: Int) {
+    private val p: Int
+
+    {
+        this.p = p
+        System.out?.println(p++)
+        System.out?.println(p)
+    }
+}

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.ide.kt

@@ -0,0 +1,7 @@
+class C(p: Int, c: C) {
+    public var p: Int = 0
+
+    {
+        c.p = p
+    }
+}

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.java

@@ -0,0 +1,8 @@
+//file
+class C {
+    public int p;
+
+    public C(int p, C c) {
+        c.p = p;
+    }
+}

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

@@ -0,0 +1,7 @@
+open class C(p: Int, c: C?) {
+    public var p: Int = 0
+
+    {
+        c?.p = p
+    }
+}

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.ide.kt

@@ -0,0 +1,10 @@
+class C(p: Int) {
+    public var p: Int = 0
+
+    {
+        this.p = 0
+        if (p > 0) {
+            this.p = p
+        }
+    }
+}

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.java

@@ -0,0 +1,11 @@
+//file
+class C {
+    public int p;
+
+    public C(int p) {
+        this.p = 0
+        if (p > 0) {
+            this.p = p
+        }
+    }
+}

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

@@ -0,0 +1,10 @@
+open class C(p: Int) {
+    public var p: Int = 0
+
+    {
+        this.p = 0
+        if (p > 0) {
+            this.p = p
+        }
+    }
+}

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.ide.kt

@@ -0,0 +1,7 @@
+class C(x: String) {
+    public var x: Any = 0
+
+    {
+        this.x = x
+    }
+}

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.java

@@ -0,0 +1,8 @@
+//file
+class C {
+    public Object x;
+
+    public C(String x) {
+        this.x = x;
+    }
+}

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

@@ -0,0 +1,7 @@
+open class C(x: String?) {
+    public var x: Any? = null
+
+    {
+        this.x = x
+    }
+}

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.ide.kt

@@ -0,0 +1,9 @@
+class C(x: Any, b: Boolean) {
+    public var x: Any = 0
+
+    {
+        if (b) {
+            this.x = x
+        }
+    }
+}

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.java

@@ -0,0 +1,10 @@
+//file
+class C {
+    public Object x;
+
+    public C(Object x, boolean b) {
+        if (b) {
+            this.x = x;
+        }
+    }
+}

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

@@ -0,0 +1,9 @@
+open class C(x: Any?, b: Boolean) {
+    public var x: Any? = null
+
+    {
+        if (b) {
+            this.x = x
+        }
+    }
+}

j2k/tests/testData/ast/enum/colorEnum.ide.kt

@@ -1,16 +1,10 @@
 package demo
 
-enum class MyEnum(_color: Int) {
+enum class MyEnum(private val color: Int) {
     RED : MyEnum(10)
     BLUE : MyEnum(20)
 
-    private val color: Int
-
     public fun getColor(): Int {
         return color
     }
-
-    {
-        color = _color
-    }
 }

j2k/tests/testData/ast/enum/colorEnum.kt

@@ -1,16 +1,10 @@
 package demo
 
-enum class MyEnum(_color: Int) {
+enum class MyEnum(private val color: Int) {
     RED : MyEnum(10)
     BLUE : MyEnum(20)
 
-    private val color: Int
-
     public fun getColor(): Int {
         return color
     }
-
-    {
-        color = _color
-    }
 }

j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.ide.kt

@@ -1,17 +1,11 @@
-enum class Color(c: Int) {
+enum class Color(private var code: Int) {
     WHITE : Color(21)
     BLACK : Color(22)
     RED : Color(23)
     YELLOW : Color(24)
     BLUE : Color(25)
 
-    private var code: Int = 0
-
     public fun getCode(): Int {
         return code
     }
-
-    {
-        code = c
-    }
 }

j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.java

@@ -1,13 +1,14 @@
 //class
 enum Color {
-  WHITE(21), BLACK(22), RED(23), YELLOW(24), BLUE(25);
+    WHITE(21), BLACK(22), RED(23), YELLOW(24), BLUE(25);
 
-  private int code;
+    private int code;
 
-  private Color(int c) {
-    code = c;
-  }
+    private Color(int c) {
+        code = c;
+    }
 
-  public int getCode() {
-    return code;
-  }
+    public int getCode() {
+        return code;
+    }
+}

j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.kt

@@ -1,17 +1,11 @@
-enum class Color(c: Int) {
+enum class Color(private var code: Int) {
     WHITE : Color(21)
     BLACK : Color(22)
     RED : Color(23)
     YELLOW : Color(24)
     BLUE : Color(25)
 
-    private var code: Int = 0
-
     public fun getCode(): Int {
         return code
     }
-
-    {
-        code = c
-    }
 }

j2k/tests/testData/ast/enum/primaryPrivateConstructor.ide.kt

@@ -1,13 +1,8 @@
 package demo
 
-enum class Color(c: Int) {
-    private var code: Int = 0
+enum class Color(private var code: Int) {
 
     public fun getCode(): Int {
         return code
     }
-
-    {
-        code = c
-    }
 }

j2k/tests/testData/ast/enum/primaryPrivateConstructor.kt

@@ -1,13 +1,8 @@
 package demo
 
-enum class Color(c: Int) {
-    private var code: Int = 0
+enum class Color(private var code: Int) {
 
     public fun getCode(): Int {
         return code
     }
-
-    {
-        code = c
-    }
 }

j2k/tests/testData/ast/function/varVararg.ide.kt

@@ -1,7 +1,7 @@
 package demo
 
 class Test() {
-    fun test(vararg var args: Any) {
+    fun test(vararg args: Any) {
         args = array<Int>(1, 2, 3)
     }
 }

j2k/tests/testData/ast/function/varVararg.kt

@@ -1,7 +1,7 @@
 package demo
 
 open class Test() {
-    open fun test(vararg var args: Any?) {
+    open fun test(vararg args: Any?) {
         args = array<Int?>(1, 2, 3)
     }
 }

j2k/tests/testData/ast/function/writableParameter.ide.kt

@@ -1,7 +1,7 @@
 package demo
 
 class Test() {
-    fun test(var i: Int): Int {
+    fun test(i: Int): Int {
         i = 10
         return i + 20
     }

j2k/tests/testData/ast/function/writableParameter.kt

@@ -1,7 +1,7 @@
 package demo
 
 open class Test() {
-    open fun test(var i: Int): Int {
+    open fun test(i: Int): Int {
         i = 10
         return i + 20
     }

j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt

@@ -2,14 +2,9 @@ class `$$$$$`() {}
 
 class `$`() {}
 
-class `$$`(`$$$$`: `$$$$$`) : `$`() {
-    val `$$$`: `$$$$$`
+class `$$`(val `$$$`: `$$$$$`) : `$`() {
 
     public fun `$$$$$$`(): `$$$$$` {
         return `$$$`
     }
-
-    {
-        `$$$` = `$$$$`
-    }
 }

j2k/tests/testData/ast/identifier/finalFieldReference.kt

@@ -2,14 +2,9 @@ open class `$$$$$`() {}
 
 open class `$`() {}
 
-open class `$$`(`$$$$`: `$$$$$`?) : `$`() {
-    val `$$$`: `$$$$$`?
+open class `$$`(val `$$$`: `$$$$$`?) : `$`() {
 
     public open fun `$$$$$$`(): `$$$$$`? {
         return `$$$`
     }
-
-    {
-        `$$$` = `$$$$`
-    }
 }

j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt

@@ -1,9 +1,3 @@
 class Base<T>(name: T) {}
 
-class One<T, K>(name: T, second: K) : Base<T>(name) {
-    private var mySecond: K = 0
-
-    {
-        mySecond = second
-    }
-}
+class One<T, K>(name: T, private var mySecond: K) : Base<T>(name) {}

j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt

@@ -1,9 +1,3 @@
 open class Base<T>(name: T?) {}
 
-open class One<T, K>(name: T?, second: K?) : Base<T?>(name) {
-    private var mySecond: K? = null
-
-    {
-        mySecond = second
-    }
-}
+open class One<T, K>(name: T?, private var mySecond: K?) : Base<T?>(name) {}

j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt

@@ -1,9 +1,3 @@
 class Base(name: String) {}
 
-class One(name: String, second: String) : Base(name) {
-    private var mySecond: String = 0
-
-    {
-        mySecond = second
-    }
-}
+class One(name: String, private var mySecond: String) : Base(name) {}

j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt

@@ -1,9 +1,3 @@
 open class Base(name: String?) {}
 
-open class One(name: String?, second: String?) : Base(name) {
-    private var mySecond: String? = null
-
-    {
-        mySecond = second
-    }
-}
+open class One(name: String?, private var mySecond: String?) : Base(name) {}

j2k/tests/testData/ast/issues/kt-1016.ide.kt

@@ -1,9 +1,3 @@
 package demo
 
-class C(i: Int) {
-    private val i: Int
-
-    {
-        this.i = i
-    }
-}
+class C(private val i: Int) {}

j2k/tests/testData/ast/issues/kt-1016.kt

@@ -1,9 +1,3 @@
 package demo
 
-open class C(i: Int) {
-    private val i: Int
-
-    {
-        this.i = i
-    }
-}
+open class C(private val i: Int) {}

j2k/tests/testData/ast/issues/kt-836.ide.kt

@@ -2,16 +2,11 @@ package com.voltvoodoo.saplo4j.model
 
 import java.io.Serializable
 
-public class Language(code: String) : Serializable {
-    protected var code: String = 0
+public class Language(protected var code: String) : Serializable {
 
     override fun toString(): String {
         return this.code
     }
-
-    {
-        this.code = code
-    }
 }
 
 

j2k/tests/testData/ast/issues/kt-836.kt

@@ -2,16 +2,11 @@ package com.voltvoodoo.saplo4j.model
 
 import java.io.Serializable
 
-public open class Language(code: String?) : Serializable {
-    protected var code: String? = null
+public open class Language(protected var code: String?) : Serializable {
 
     override fun toString(): String? {
         return this.code
     }
-
-    {
-        this.code = code
-    }
 }
 
 

j2k/tests/testData/ast/issues/kt-837.ide.kt

@@ -2,21 +2,16 @@ package com.voltvoodoo.saplo4j.model
 
 import java.io.Serializable
 
-public class Language(code: String) : Serializable {
-
-    protected var code: String = 0
+public class Language(protected var code: String) : Serializable {
 
     public fun equals(other: Language): Boolean {
         return other.toString().equals(this.toString())
     }
 
-    {
-        this.code = code
-    }
-
     class object {
         public var ENGLISH: Language = Language("en")
         public var SWEDISH: Language = Language("sv")
+
         private val serialVersionUID: Long = -2442762969929206780
     }
 }

j2k/tests/testData/ast/issues/kt-837.kt

@@ -2,21 +2,16 @@ package com.voltvoodoo.saplo4j.model
 
 import java.io.Serializable
 
-public open class Language(code: String?) : Serializable {
-
-    protected var code: String? = null
+public open class Language(protected var code: String?) : Serializable {
 
     public open fun equals(other: Language?): Boolean {
         return other?.toString()?.equals(this.toString())!!
     }
 
-    {
-        this.code = code
-    }
-
     class object {
         public var ENGLISH: Language? = Language("en")
         public var SWEDISH: Language? = Language("sv")
+
         private val serialVersionUID: Long = -2442762969929206780
     }
 }