Kapt3: Put static modifiers on nested non-inner classes.

Do not initialize synthetic and static fields in constructor.

plugins/kapt3/testData/converter/dataClass.txt

@@ -1,8 +1,8 @@
 
 public final class User {
-    private final java.lang.String firstName;
-    private final java.lang.String secondName;
-    private final int age;
+    private final java.lang.String firstName = null;
+    private final java.lang.String secondName = null;
+    private final int age = 0;
 
     public final void procedure() {
     }
@@ -21,9 +21,6 @@ public final class User {
 
     public /*missing*/ User(java.lang.String firstName, java.lang.String secondName, int age) {
         super();
-        this.firstName = null;
-        this.secondName = null;
-        this.age = 0;
     }
 
     public final java.lang.String component1() {

plugins/kapt3/testData/converter/inheritanceSimple.txt

@@ -11,15 +11,13 @@ public final class Context {
 ////////////////////
 
 
-public enum Result extends java.lang.Enum {
+public enum Result {
 ;
-    public static final Result SUCCESS;
-    public static final Result ERROR;
+    public static final Result SUCCESS = null;
+    public static final Result ERROR = null;
     
     protected /*missing*/ Result(java.lang.String $enum_name_or_ordinal$0, int $enum_name_or_ordinal$1) {
         super(null, 0);
-        this.SUCCESS = null;
-        this.ERROR = null;
     }
     
     public static Result[] values() {

plugins/kapt3/testData/converter/nestedClasses.kt

@@ -0,0 +1,15 @@
+class Test {
+    class Nested {
+        class NestedNested
+    }
+
+    inner class Inner
+
+    object NestedObject
+
+    interface NestedInterface
+
+    enum class NestedEnum {
+        BLACK, WHITE
+    }
+}

plugins/kapt3/testData/converter/nestedClasses.txt

@@ -0,0 +1,57 @@
+
+public final class Test {
+
+    public /*missing*/ Test() {
+        super();
+    }
+
+    public static final class Nested {
+
+        public /*missing*/ Nested() {
+            super();
+        }
+
+        public static final class NestedNested {
+
+            public /*missing*/ NestedNested() {
+                super();
+            }
+        }
+    }
+
+    public final class Inner {
+
+        public /*missing*/ Inner(Test $outer) {
+            super();
+        }
+    }
+
+    public static final class NestedObject {
+        public static final Test.NestedObject INSTANCE = null;
+
+        private /*missing*/ NestedObject() {
+            super();
+        }
+    }
+
+    public static abstract interface NestedInterface {
+    }
+
+    public static enum NestedEnum {
+;
+        public static final Test.NestedEnum BLACK = null;
+        public static final Test.NestedEnum WHITE = null;
+
+        protected /*missing*/ NestedEnum(java.lang.String $enum_name_or_ordinal$0, int $enum_name_or_ordinal$1) {
+            super(null, 0);
+        }
+
+        public static Test.NestedEnum[] values() {
+            return null;
+        }
+
+        public static Test.NestedEnum valueOf(java.lang.String p0) {
+            return null;
+        }
+    }
+}

plugins/kapt3/testData/runner/Simple.java

@@ -9,4 +9,19 @@ class Simple {
 
 @interface MyAnnotation {
 
+}
+
+enum EnumClass {
+    BLACK, WHITE
+}
+
+
+enum EnumClass2 {
+    WHITE("A"), RED("B");
+
+    private final String blah;
+
+    EnumClass2(String blah) {
+        this.blah = blah;
+    }
 }