J2K: no explicit type required for public declarations

j2k/src/org/jetbrains/kotlin/j2k/Converter.kt

@@ -317,7 +317,7 @@ class Converter private constructor(
         else {
             val isVal = field.isVal(referenceSearcher)
             val typeToDeclare = variableTypeToDeclare(field,
-                                                      settings.specifyFieldTypeByDefault || modifiers.isPublic || modifiers.isProtected,
+                                                      settings.specifyFieldTypeByDefault,
                                                       isVal && modifiers.isPrivate)
             val propertyType = typeToDeclare ?: typeConverter.convertVariableType(field)
 

j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt

@@ -57,10 +57,7 @@ class Modifiers(modifiers: Collection<Modifier>) : Element() {
 
     fun contains(modifier: Modifier): Boolean = modifiers.contains(modifier)
 
-    val isPublic: Boolean get() = contains(Modifier.PUBLIC)
     val isPrivate: Boolean get() = contains(Modifier.PRIVATE)
-    val isProtected: Boolean get() = contains(Modifier.PROTECTED)
-    val isInternal: Boolean get() = contains(Modifier.INTERNAL)
 
     fun accessModifier(): Modifier? = modifiers.firstOrNull { it in ACCESS_MODIFIERS }
 

j2k/testData/fileOrElement/annotations/annotationInterface3.kt

@@ -8,7 +8,7 @@ annotation internal class Anon(val value: String) {
 
     companion object {
 
-        val field: E = E.A
+        val field = E.A
     }
 }
 

j2k/testData/fileOrElement/class/notUtilityClass.kt

@@ -1,6 +1,6 @@
 internal open class Base {
     companion object {
-        val CONSTANT: Int = 10
+        val CONSTANT = 10
     }
 }
 

j2k/testData/fileOrElement/class/utilityClass1.kt

@@ -5,5 +5,5 @@ internal object Util {
     fun util2() {
     }
 
-    val CONSTANT: Int = 10
+    val CONSTANT = 10
 }

j2k/testData/fileOrElement/class/utilityClass2.kt

@@ -6,5 +6,5 @@ internal object Util {
     fun util2() {
     }
 
-    val CONSTANT: Int = 10
+    val CONSTANT = 10
 }

j2k/testData/fileOrElement/class/utilityClass3.kt

@@ -5,5 +5,5 @@ internal object Util {
     fun util2() {
     }
 
-    val CONSTANT: Int = 10
+    val CONSTANT = 10
 }

j2k/testData/fileOrElement/comments/comments2.kt

@@ -23,6 +23,6 @@ internal class A {
 
     companion object {
 
-        /*it's public*//*and static*//*and final*/ val C: Int = 1
+        /*it's public*//*and static*//*and final*/ val C = 1
     }
 }

j2k/testData/fileOrElement/constructors/customerBuilder.kt

@@ -15,8 +15,8 @@ internal class Customer internal constructor(val firstName: String, val lastName
 }
 
 internal class CustomerBuilder {
-    var _firstName: String = "Homer"
-    var _lastName: String = "Simpson"
+    var _firstName = "Homer"
+    var _lastName = "Simpson"
 
     fun WithFirstName(firstName: String): CustomerBuilder {
         _firstName = firstName

j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt

@@ -3,7 +3,7 @@ internal class A JvmOverloads internal constructor(nested: A.Nested = A.Nested(A
     internal class Nested internal constructor(p: Int) {
         companion object {
 
-            val FIELD: Int = 0
+            val FIELD = 0
         }
     }
 }

j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt

@@ -6,7 +6,7 @@ internal class A JvmOverloads internal constructor(nested: Nested = Nested(Neste
     internal class Nested internal constructor(p: Int) {
         companion object {
 
-            val FIELD: Int = 0
+            val FIELD = 0
         }
     }
 }

j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt

@@ -8,7 +8,7 @@ internal class A JvmOverloads internal constructor(nested: Nested = Nested(Neste
     internal class Nested internal constructor(p: Int) {
         companion object {
 
-            val FIELD: Int = 0
+            val FIELD = 0
         }
     }
 }

j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt

@@ -8,7 +8,7 @@ internal class A JvmOverloads internal constructor(nested: Nested = Nested(Neste
     internal class Nested internal constructor(p: Int) {
         companion object {
 
-            val FIELD: Int = 0
+            val FIELD = 0
         }
     }
 }

j2k/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.kt

@@ -3,7 +3,7 @@ internal open class Base internal constructor(nested: Base.Nested) {
     internal class Nested internal constructor(p: Int) {
         companion object {
 
-            val FIELD: Int = 0
+            val FIELD = 0
         }
     }
 }

j2k/testData/fileOrElement/dropAccessors/AccessInGetterWithThis.kt

@@ -1,3 +1,3 @@
 class AAA {
-    val x: Int = 42
+    val x = 42
 }

j2k/testData/fileOrElement/dropAccessors/DifferentFieldName.kt

@@ -1,5 +1,5 @@
 class AAA {
-    var x: Int = 42
+    var x = 42
         private set
 
     fun foo(other: AAA) {

j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.kt

@@ -1,5 +1,5 @@
 open class Base internal constructor(x: Int) {
-    var x: Int = 42
+    var x = 42
         protected set
 
     init {

j2k/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.kt

@@ -1,5 +1,5 @@
 open class AAA {
-    var x: Int = 42
+    var x = 42
         protected set
 
     fun foo(other: AAA) {

j2k/testData/fileOrElement/dropAccessors/DropGetter.kt

@@ -1,3 +1,3 @@
 class AAA {
-    val x: Int = 42
+    val x = 42
 }

j2k/testData/fileOrElement/dropAccessors/DropGetterAndSetter.kt

@@ -1,3 +1,3 @@
 class AAA {
-    var x: Int = 42
+    var x = 42
 }

j2k/testData/fileOrElement/dropAccessors/DropGetterForMutable.kt

@@ -1,5 +1,5 @@
 class AAA {
-    var x: Int = 42
+    var x = 42
         private set
 
     fun foo() {

j2k/testData/fileOrElement/dropAccessors/FalseSetter.kt

@@ -1,5 +1,5 @@
 class AAA {
-    var x: Int = 42
+    var x = 42
         private set
 
     fun setX(x: Int) {

j2k/testData/fileOrElement/dropAccessors/GetterAndSetterNamesDifferent.kt

@@ -1,5 +1,5 @@
 class AAA {
-    var x: Int = 42
+    var x = 42
         private set
 
     fun setY(x: Int) {

j2k/testData/fileOrElement/dropAccessors/GetterSetterUsages.kt

@@ -1,5 +1,5 @@
 class AAA {
-    var x: Int = 42
+    var x = 42
 
     fun foo() {
         x = x + 1

j2k/testData/fileOrElement/dropAccessors/InCompanionObject.kt

@@ -5,6 +5,6 @@ class AAA {
 
     companion object {
 
-        var x: Int = 42
+        var x = 42
     }
 }

j2k/testData/fileOrElement/dropAccessors/InObject.kt

@@ -1,7 +1,7 @@
 object AAA {
-    var x: Int = 42
-    var y: Int = 0
-    val z: Int = 0
+    var x = 42
+    var y = 0
+    val z = 0
 
     fun setZ(z: Int) {
         Other.z = z
@@ -9,5 +9,5 @@ object AAA {
 }
 
 internal object Other {
-    var z: Int = 0
+    var z = 0
 }

j2k/testData/fileOrElement/dropAccessors/JavaKeywordPropertyName.kt

@@ -1,5 +1,5 @@
 internal class C {
-    val default: Int = 0
+    val default = 0
 
     internal fun foo() {
         println(default)

j2k/testData/fileOrElement/dropAccessors/KeywordPropertyName.kt

@@ -1,5 +1,5 @@
 internal class C {
-    val `this`: Int = 0
+    val `this` = 0
 
     internal fun foo() {
         println(`this`)

j2k/testData/fileOrElement/field/specifyType.kt

@@ -3,8 +3,8 @@ import java.util.*
 internal class A {
     private val field1 = ArrayList<String>()
     internal val field2: List<String> = ArrayList()
-    val field3: Int = 0
-    protected val field4: Int = 0
+    val field3 = 0
+    protected val field4 = 0
 
     private var field5: List<String> = ArrayList()
     internal var field6: List<String> = ArrayList()

j2k/testData/fileOrElement/for/forThroughNonArrayIndices.kt

@@ -1,5 +1,5 @@
 internal class X {
-    var length: Int = 5
+    var length = 5
 }
 
 internal class C {

j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.kt

@@ -9,7 +9,7 @@ internal class Test {
     }
 
     companion object {
-        var field: Java8Class = Java8Class()
+        var field = Java8Class()
         fun staticFun(): Java8Class {
             return Java8Class()
         }

j2k/testData/fileOrElement/function/java8MRSamConstructor.kt

@@ -15,7 +15,7 @@ internal class Test {
     }
 
     companion object {
-        var field: Java8Class = Java8Class()
+        var field = Java8Class()
         fun staticFun(): Java8Class {
             return Java8Class()
         }

j2k/testData/fileOrElement/issues/kt-837.kt

@@ -9,8 +9,8 @@ class Language(protected var code: String) : Serializable {
     }
 
     companion object {
-        var ENGLISH: Language = Language("en")
-        var SWEDISH: Language = Language("sv")
+        var ENGLISH = Language("en")
+        var SWEDISH = Language("sv")
         private val serialVersionUID = -2442762969929206780L
     }
 }

j2k/testData/fileOrElement/overloads/AccessorToDrop.kt

@@ -1,5 +1,5 @@
 internal class A {
-    var field: Int = 0
+    var field = 0
 
     fun setField() {
         field = 0

j2k/testData/fileOrElement/trait/interfaceWithFields.kt

@@ -1,7 +1,7 @@
 internal interface INode {
     companion object {
-        val IN: String = "in"
-        val AT: String = "@"
-        val COMMA_WITH_SPACE: String = COMMA + SPACE
+        val IN = "in"
+        val AT = "@"
+        val COMMA_WITH_SPACE = COMMA + SPACE
     }
 }

j2k/testData/fileOrElement/trait/interfaceWithStaticFields.kt

@@ -1,7 +1,7 @@
 interface INode {
     companion object {
-        val IN: String = "in"
-        val AT: String = "@"
-        val COMMA_WITH_SPACE: String = COMMA + SPACE
+        val IN = "in"
+        val AT = "@"
+        val COMMA_WITH_SPACE = COMMA + SPACE
     }
 }

j2k/testData/multiFile/FieldToProperty/JavaClass.kt

@@ -1,8 +1,8 @@
 package test
 
 internal open class JavaClass {
-    var field: Int = 0
+    var field = 0
 
-    var property: Int = 0
+    var property = 0
         protected set
 }

j2k/testData/multiFile/GetterAndSetterUsages/1.kt

@@ -1,5 +1,5 @@
 class AAA {
-    var x: Int = 42
+    var x = 42
 
     fun foo() {
         x = x + 1

j2k/testData/multiFile/GetterAndSetterUsages/2.kt

@@ -4,6 +4,6 @@ internal class B {
         YY += "a"
     }
 
-    var YY: String = ""
+    var YY = ""
         private set
 }

j2k/testData/multiFile/ToCompanionObject/ClassWithStatics.kt

@@ -9,8 +9,8 @@ internal open class ClassWithStatics {
         fun staticMethod(p: Int) {
         }
 
-        val staticField: Int = 1
+        val staticField = 1
 
-        var value: Int = 0
+        var value = 0
     }
 }

j2k/testData/multiFile/ToObject/Utils.kt

@@ -8,5 +8,5 @@ internal object Utils {
         return 1
     }
 
-    val staticField: Int = 1
+    val staticField = 1
 }