KT-5287 J2K: Convert class with private constructor and static functions to "object" instead of class with "class object"

#KT-5287 Fixed

j2k/testData/fileOrElement/class/ClassShadowing.java

@@ -1,7 +1,10 @@
 package test;
 
+import java.lang.String;
+
 public class Short {
-	public static Short valueOf(String value) {return new Short();}
+        public Short(String s){}
+	public static Short valueOf(String value) {return new Short(value);}
 }
 
 class Test {

j2k/testData/fileOrElement/class/ClassShadowing.kt

@@ -1,19 +1,17 @@
 package test
 
-public class Short {
+public class Short(s: String) {
     companion object {
         public fun valueOf(value: String): Short {
-            return Short()
+            return Short(value)
         }
     }
 }
 
-class Test {
-    companion object {
-        public fun test() {
-            test.Short.valueOf("1")
-            test.Short.valueOf("1")
-            java.lang.Short.valueOf("1")
-        }
+object Test {
+    public fun test() {
+        test.Short.valueOf("1")
+        test.Short.valueOf("1")
+        java.lang.Short.valueOf("1")
     }
 }

j2k/testData/fileOrElement/class/notUtilityClass.java

@@ -0,0 +1,7 @@
+class Base {
+    public static final int CONSTANT = 10;
+}
+
+class Derived extends Base {
+    void foo(){}
+}

j2k/testData/fileOrElement/class/notUtilityClass.kt

@@ -0,0 +1,10 @@
+open class Base {
+    companion object {
+        public val CONSTANT: Int = 10
+    }
+}
+
+class Derived : Base() {
+    fun foo() {
+    }
+}

j2k/testData/fileOrElement/class/oneStaticMethod.kt

@@ -1,7 +1,5 @@
-class S {
-    companion object {
-        fun staticF(): Boolean {
-            return true
-        }
+object S {
+    fun staticF(): Boolean {
+        return true
     }
 }

j2k/testData/fileOrElement/class/twoStaticMethod.kt

@@ -1,11 +1,9 @@
-class S {
-    companion object {
-        fun sB(): Boolean {
-            return true
-        }
+object S {
+    fun sB(): Boolean {
+        return true
+    }
 
-        fun sI(): Int {
-            return 1
-        }
+    fun sI(): Int {
+        return 1
     }
 }

j2k/testData/fileOrElement/class/utilityClass1.java

@@ -0,0 +1,6 @@
+class Util {
+    public static void util1() {}
+    public static void util2() {}
+
+    public static final int CONSTANT = 10;
+}

j2k/testData/fileOrElement/class/utilityClass1.kt

@@ -0,0 +1,9 @@
+object Util {
+    public fun util1() {
+    }
+
+    public fun util2() {
+    }
+
+    public val CONSTANT: Int = 10
+}

j2k/testData/fileOrElement/class/utilityClass2.java

@@ -0,0 +1,8 @@
+class Util {
+    private Util(){}
+
+    public static void util1() {}
+    public static void util2() {}
+
+    public static final int CONSTANT = 10;
+}

j2k/testData/fileOrElement/class/utilityClass2.kt

@@ -0,0 +1,10 @@
+object Util {
+
+    public fun util1() {
+    }
+
+    public fun util2() {
+    }
+
+    public val CONSTANT: Int = 10
+}

j2k/testData/fileOrElement/class/utilityClass3.java

@@ -0,0 +1,6 @@
+abstract class Util {
+    public static void util1() {}
+    public static void util2() {}
+
+    public static final int CONSTANT = 10;
+}

j2k/testData/fileOrElement/class/utilityClass3.kt

@@ -0,0 +1,9 @@
+object Util {
+    public fun util1() {
+    }
+
+    public fun util2() {
+    }
+
+    public val CONSTANT: Int = 10
+}