New J2K: Fix existing test data

j2k/testData/fileOrElement/constructors/artificialPrimary.new.kt

@@ -1,6 +1,6 @@
 // ERROR: Property must be initialized or be abstract
 class Test {
-    private val s: String?
+    private val s: String
     internal var b = false
     internal var d = 0.0
 
@@ -8,7 +8,7 @@ class Test {
         b = true
     }
 
-    constructor(s: String?) {
+    constructor(s: String) {
         this.s = s
     }
 }

j2k/testData/fileOrElement/constructors/customerBuilder.kt

@@ -12,6 +12,7 @@ internal class Customer(val firstName: String, val lastName: String) {
 }
 
 internal class CustomerBuilder {
+    var _firstName = "Homer"
     var _firstName = "Homer"
     var _lastName = "Simpson"
 

j2k/testData/fileOrElement/constructors/customerBuilder.new.kt

@@ -1,6 +1,6 @@
 package org.test.customer
 
-internal class Customer(val firstName: String?, val lastName: String?) {
+internal class Customer(val firstName: String, val lastName: String) {
     init {
         doSmthBefore()
         doSmthAfter()
@@ -12,14 +12,14 @@ internal class Customer(val firstName: String?, val lastName: String?) {
 }
 
 internal class CustomerBuilder {
-    var _firstName: String? = "Homer"
-    var _lastName: String? = "Simpson"
-    fun WithFirstName(firstName: String?): CustomerBuilder {
+    var _firstName = "Homer"
+    var _lastName = "Simpson"
+    fun WithFirstName(firstName: String): CustomerBuilder {
         _firstName = firstName
         return this
     }
 
-    fun WithLastName(lastName: String?): CustomerBuilder {
+    fun WithLastName(lastName: String): CustomerBuilder {
         _lastName = lastName
         return this
     }

j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams6.new.kt

@@ -1,5 +1,5 @@
-internal class C(x: String?) {
-    var x: Any?
+internal class C(x: String) {
+    var x: Any
 
     init {
         this.x = x

j2k/testData/fileOrElement/constructors/genericIdentifier.new.kt

@@ -1,18 +1,18 @@
 class Identifier<T> {
-    val name: T?
+    val name: T
     private var myHasDollar = false
     private var myNullable = true
 
-    constructor(name: T?) {
+    constructor(name: T) {
         this.name = name
     }
 
-    constructor(name: T?, isNullable: Boolean) {
+    constructor(name: T, isNullable: Boolean) {
         this.name = name
         myNullable = isNullable
     }
 
-    constructor(name: T?, hasDollar: Boolean, isNullable: Boolean) {
+    constructor(name: T, hasDollar: Boolean, isNullable: Boolean) {
         this.name = name
         myHasDollar = hasDollar
         myNullable = isNullable
@@ -22,7 +22,7 @@ class Identifier<T> {
 object User {
     fun main() {
         val i1: Identifier<*> = Identifier<String?>("name", false, true)
-        val i2 = Identifier<String?>("name", false)
-        val i3 = Identifier<String?>("name")
+        val i2 = Identifier("name", false)
+        val i3 = Identifier("name")
     }
 }

j2k/testData/fileOrElement/constructors/identifier.new.kt

@@ -1,19 +1,19 @@
 // ERROR: Property must be initialized or be abstract
 class Identifier {
-    val name: String?
+    val name: String
     private var myHasDollar = false
     private var myNullable = true
 
-    constructor(name: String?) {
+    constructor(name: String) {
         this.name = name
     }
 
-    constructor(name: String?, isNullable: Boolean) {
+    constructor(name: String, isNullable: Boolean) {
         this.name = name
         myNullable = isNullable
     }
 
-    constructor(name: String?, hasDollar: Boolean, isNullable: Boolean) {
+    constructor(name: String, hasDollar: Boolean, isNullable: Boolean) {
         this.name = name
         myHasDollar = hasDollar
         myNullable = isNullable

j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.new.kt

@@ -1,6 +1,8 @@
-internal class A @JvmOverloads constructor(nested: Nested? = Nested(Nested.FIELD)) {
+internal class A @JvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) {
+
     internal class Nested(p: Int) {
         companion object {
+
             const val FIELD = 0
         }
     }

j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.new.kt

@@ -1,4 +1,4 @@
-internal class A @JvmOverloads constructor(nested: Nested? = Nested(Nested.FIELD)) {
+internal class A @JvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) {
     internal class Nested(p: Int) {
         companion object {
             const val FIELD = 0

j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.new.kt

@@ -1,6 +1,6 @@
 package pack
 
-internal class A @JvmOverloads constructor(nested: Nested? = Nested(Nested.FIELD)) {
+internal class A @JvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) {
     internal class Nested(p: Int) {
         companion object {
             const val FIELD = 0

j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.new.kt

@@ -1,6 +1,6 @@
 package pack
 
-internal class A @JvmOverloads constructor(nested: Nested? = Nested(Nested.FIELD)) {
+internal class A @JvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) {
     internal class Nested(p: Int) {
         companion object {
             const val FIELD = 0

j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues.new.kt

@@ -1,11 +1,11 @@
 internal class A {
-    private var s: String? = ""
+    private var s = ""
     private var x = 0
 
     constructor() {}
 
     @JvmOverloads
-    constructor(p: Int, s: String?, x: Int = 1) {
+    constructor(p: Int, s: String, x: Int = 1) {
         this.s = s
         this.x = x
     }

j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues2.new.kt

@@ -1,9 +1,9 @@
 internal class A() {
-    private var s: String? = ""
+    private var s = ""
     private var x = 0
 
     @JvmOverloads
-    constructor(p: Int, s: String?, x: Int = 1) : this() {
+    constructor(p: Int, s: String, x: Int = 1) : this() {
         this.s = s
         this.x = x
     }

j2k/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.new.kt

@@ -0,0 +1,46 @@
+// ERROR: Modifier 'protected' is not applicable inside 'object'
+internal object Outer {
+    private class Nested1() {
+
+        constructor(a: Int) : this() {}
+
+        protected constructor(c: Char) : this() {}
+
+        private constructor(b: Boolean) : this() {}
+    }
+
+    protected class Nested2() {
+
+        constructor(a: Int) : this() {}
+
+        protected constructor(c: Char) : this() {}
+
+        private constructor(b: Boolean) : this() {}
+
+    }
+
+    internal class Nested3() {
+
+        constructor(a: Int) : this() {}
+
+        protected constructor(c: Char) : this() {}
+
+        private constructor(b: Boolean) : this() {}
+    }
+
+    class Nested4() {
+
+        constructor(a: Int) : this() {}
+
+        protected constructor(c: Char) : this() {}
+
+        private constructor(b: Boolean) : this() {}
+    }
+
+    fun foo() {
+        val nested1 = Nested1(1)
+        val nested2 = Nested2(2)
+        val nested3 = Nested3(3)
+        val nested4 = Nested4(4)
+    }
+}

j2k/testData/fileOrElement/constructors/withManyDefaultParams.new.kt

@@ -1,6 +1,6 @@
 // ERROR: Property must be initialized or be abstract
 class Test {
-    private val myName: String?
+    private val myName: String
     internal var a = false
     internal var b = 0.0
     internal var c = 0f
@@ -11,13 +11,13 @@ class Test {
 
     constructor() {}
 
-    constructor(name: String?) {
+    constructor(name: String) {
         myName = foo(name)
     }
 
     companion object {
 
-        internal fun foo(n: String?): String {
+        internal fun foo(n: String): String {
             return ""
         }
     }