Minor: update testData with nullability annotations

plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt

@@ -60,7 +60,6 @@ import java.lang.System;
 public enum E3 {
     /*public static final*/ X /* = new E3() */,
     /*public static final*/ Y /* = new E3() */;
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.String a = null;
 
     @org.jetbrains.annotations.NotNull()
@@ -80,7 +79,6 @@ import java.lang.System;
 @kotlin.Metadata()
 public enum E4 {
     /*public static final*/ X /* = new E4() */;
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.String a = null;
     private final int b = 0;
     private final long c = 0L;

plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.txt

@@ -4,15 +4,10 @@ import a.b.ABC;
 
 @kotlin.Metadata()
 public final class Test {
-    @org.jetbrains.annotations.NotNull()
     public Test.MyDate date;
-    @org.jetbrains.annotations.NotNull()
     public java.util.concurrent.TimeUnit timeUnit;
-    @org.jetbrains.annotations.NotNull()
     public java.util.concurrent.TimeUnit microseconds;
-    @org.jetbrains.annotations.NotNull()
     public a.b.ABC abc;
-    @org.jetbrains.annotations.NotNull()
     public bcd bcd;
 
     @org.jetbrains.annotations.NotNull()
@@ -66,7 +61,6 @@ public final class Test {
 
     @kotlin.Metadata()
     public static final class MyDate {
-        @org.jetbrains.annotations.NotNull()
         public Test.MyDate date2;
 
         @org.jetbrains.annotations.NotNull()
@@ -93,7 +87,6 @@ import a.b.ABC;
 
 @kotlin.Metadata()
 public final class Test2 {
-    @org.jetbrains.annotations.NotNull()
     public java.util.Date date;
 
     @org.jetbrains.annotations.NotNull()

plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt

@@ -99,7 +99,6 @@ import java.lang.System;
 @Anno2(i = 6, s = "BCD", ii = {4, 5, 6}, ss = {"Z", "X"}, a = @Anno1(), color = Colors.WHITE, colors = {Colors.WHITE}, clazz = TestAnno.class, classes = {TestAnno.class, Anno1.class})
 @Anno3(value = "value")
 public final class TestAnno2 {
-    @org.jetbrains.annotations.NotNull()
     @Anno3(value = "field")
     private java.lang.String b = "property initializer";
 

plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt

@@ -75,7 +75,6 @@ import java.lang.System;
 @kotlin.Metadata()
 @Anno(value = "clazz")
 public abstract class Test {
-    @org.jetbrains.annotations.NotNull()
     private java.lang.String v;
 
     @org.jetbrains.annotations.NotNull()

plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.txt

@@ -12,7 +12,6 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class Bar {
-    @org.jetbrains.annotations.NotNull()
     @FieldAnno()
     private final java.lang.String a = "";
 
@@ -72,7 +71,6 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class Foo {
-    @org.jetbrains.annotations.NotNull()
     @FieldAnno()
     private final java.lang.String a = null;
 

plugins/kapt3/kapt3-compiler/testData/converter/comments.txt

@@ -62,7 +62,6 @@ public final class Test {
     /**
      * prop2.
      */
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.String prop2 = "";
 
     /**
@@ -129,7 +128,6 @@ import java.lang.System;
  */
 @kotlin.Metadata()
 public final class Test2 {
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.String a = null;
 
     @org.jetbrains.annotations.NotNull()
@@ -153,7 +151,6 @@ import java.lang.System;
  */
 @kotlin.Metadata()
 public final class Test3 {
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.String a = null;
 
     @org.jetbrains.annotations.NotNull()

plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt

@@ -2,9 +2,7 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class User {
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.String firstName = null;
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.String secondName = null;
     private final int age = 0;
 

plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.txt

@@ -25,23 +25,14 @@ public final class Foo {
     private final long l = 0L;
     private final float f = 0.0F;
     private final double d = 0.0;
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.String s = null;
-    @org.jetbrains.annotations.NotNull()
     private final int[] iarr = null;
-    @org.jetbrains.annotations.NotNull()
     private final long[] larr = null;
-    @org.jetbrains.annotations.NotNull()
     private final double[] darr = null;
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.String[] sarr = null;
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.Class<?> cl = null;
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.Class<?>[] clarr = null;
-    @org.jetbrains.annotations.NotNull()
     private final Em em = null;
-    @org.jetbrains.annotations.NotNull()
     private final Em[] emarr = null;
 
     public final void foo(int a) {

plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.txt

@@ -25,23 +25,14 @@ public final class Foo {
     private final long l = -10L;
     private final float f = 1.0F;
     private final double d = -1.0;
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.String s = "foo";
-    @org.jetbrains.annotations.NotNull()
     private final int[] iarr = {1, 2, 3};
-    @org.jetbrains.annotations.NotNull()
     private final long[] larr = {-1L, 0L, 1L};
-    @org.jetbrains.annotations.NotNull()
     private final double[] darr = {7.3};
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.String[] sarr = {"a", "bc"};
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.Class<?> cl = null;
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.Class<?>[] clarr = null;
-    @org.jetbrains.annotations.NotNull()
     private final Em em = Em.BAR;
-    @org.jetbrains.annotations.NotNull()
     private final Em[] emarr = {Em.FOO, Em.BAR};
 
     public final void foo(int a) {

plugins/kapt3/kapt3-compiler/testData/converter/enums.txt

@@ -30,7 +30,6 @@ import java.lang.System;
 public enum Enum2 {
     /*public static final*/ RED /* = new Enum2() */,
     /*public static final*/ WHITE /* = new Enum2() */;
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.String col = null;
     private final int col2 = 0;
 

plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.txt

@@ -28,11 +28,8 @@ import kotlin.reflect.KClass;
 
 @kotlin.Metadata()
 public final class ErrorInConstructorParameter {
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.String a = null;
-    @org.jetbrains.annotations.NotNull()
     private final ABC b = null;
-    @org.jetbrains.annotations.NotNull()
     private final java.util.List<ABC> c = null;
 
     @org.jetbrains.annotations.NotNull()
@@ -65,11 +62,8 @@ import kotlin.reflect.KClass;
 
 @kotlin.Metadata()
 public final class ErrorInDeclarations {
-    @org.jetbrains.annotations.NotNull()
     public java.lang.String p1;
-    @org.jetbrains.annotations.NotNull()
     public ABC p2;
-    @org.jetbrains.annotations.NotNull()
     public BCD<java.lang.String> p3;
 
     @org.jetbrains.annotations.NotNull()

plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclassCorrectErrorTypes.txt

@@ -177,7 +177,6 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class TFooBar extends Foo implements test.Intf, Bar {
-    @org.jetbrains.annotations.NotNull()
     private final X a = null;
 
     @org.jetbrains.annotations.NotNull()
@@ -199,7 +198,6 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class TFooBar2 implements Foo, Bar {
-    @org.jetbrains.annotations.NotNull()
     private final X a = null;
 
     @org.jetbrains.annotations.NotNull()

plugins/kapt3/kapt3-compiler/testData/converter/genericParameters.txt

@@ -2,7 +2,6 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class MappedList<T extends java.lang.Object, R extends java.lang.Object> extends kotlin.collections.AbstractList<R> implements java.util.List<R> {
-    @org.jetbrains.annotations.NotNull()
     private final java.util.List<T> list = null;
     private final kotlin.jvm.functions.Function1<T, R> function = null;
 

plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt

@@ -51,7 +51,6 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class MyClass<M1 extends java.lang.Object, M2 extends java.lang.Object> extends BaseClass<java.lang.RuntimeException> implements Intf<java.lang.Object, java.util.Date>, OtherIntf<java.lang.String> {
-    @org.jetbrains.annotations.Nullable()
     private final java.util.List<java.util.Map<java.lang.String, M1>> fld = null;
 
     @org.jetbrains.annotations.Nullable()

plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt

@@ -4,7 +4,6 @@ import java.lang.System;
 public final class Test {
     @org.jetbrains.annotations.NotNull()
     public final java.lang.String ignoredProperty = "";
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.String nonIgnoredProperty = "";
 
     public final void nonIgnoredFun() {

plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.txt

@@ -19,7 +19,6 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class Cl {
-    @org.jetbrains.annotations.NotNull()
     private java.lang.String name;
 
     @org.jetbrains.annotations.NotNull()
@@ -49,11 +48,8 @@ public final class TestKt {
     public TestKt() {
         super();
     }
-    @org.jetbrains.annotations.NotNull()
     private static final lib.Prop<test.Cl> TEST = null;
-    @org.jetbrains.annotations.NotNull()
     private static final lib.Prop<test.Cl>[] TESTS_ARRAY = null;
-    @org.jetbrains.annotations.NotNull()
     private static final java.util.List<lib.Prop<test.Cl>> TESTS_LIST = null;
 
     @org.jetbrains.annotations.NotNull()

plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.txt

@@ -6,7 +6,6 @@ public final class Cl {
     public Cl() {
         super();
     }
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.String a = null;
 
     @org.jetbrains.annotations.NotNull()

plugins/kapt3/kapt3-compiler/testData/converter/interfaceImplementation.txt

@@ -14,7 +14,6 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class Product2 implements Named {
-    @org.jetbrains.annotations.Nullable()
     private java.lang.String name;
 
     @org.jetbrains.annotations.Nullable()

plugins/kapt3/kapt3-compiler/testData/converter/javadoc.txt

@@ -32,14 +32,12 @@ public final class B {
      * member
      * comment.
      */
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.String a = "";
 
     /**
      * Mixed
      * tabs/spaces
      */
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.String b = "";
 
     /**
@@ -47,14 +45,12 @@ public final class B {
      * * first item
      * * second item
      */
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.String c = "";
 
     /**
      * Without
      * stars
      */
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.String d = "";
 
     @org.jetbrains.annotations.NotNull()

plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt

@@ -4,7 +4,6 @@ import java.lang.System;
 public final class State {
     private final int someInt = 0;
     private final long someLong = 0L;
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.String someString = null;
 
     public final int getSomeInt() {

plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt

@@ -2,7 +2,6 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class Test {
-    @org.jetbrains.annotations.NotNull()
     private static final java.lang.String test = "";
     @org.jetbrains.annotations.NotNull()
     public static final Test.A A = null;

plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt

@@ -13,9 +13,7 @@ public final class Outer {
 
     @kotlin.Metadata()
     final class Inner {
-        @org.jetbrains.annotations.NotNull()
         private final java.lang.String foo = null;
-        @org.jetbrains.annotations.NotNull()
         private final java.lang.String bar = null;
 
         @org.jetbrains.annotations.NotNull()
@@ -37,9 +35,7 @@ public final class Outer {
 
     @kotlin.Metadata()
     static final class Nested {
-        @org.jetbrains.annotations.NotNull()
         private final java.lang.String foo = null;
-        @org.jetbrains.annotations.NotNull()
         private final java.lang.String bar = null;
 
         @org.jetbrains.annotations.NotNull()

plugins/kapt3/kapt3-compiler/testData/converter/kt18791.txt

@@ -89,7 +89,6 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class JJ {
-    @org.jetbrains.annotations.NotNull()
     private static final java.lang.String b = null;
     @org.jetbrains.annotations.NotNull()
     public static final app.JJ INSTANCE = null;

plugins/kapt3/kapt3-compiler/testData/converter/kt24272.txt

@@ -2,7 +2,6 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class Foo {
-    @org.jetbrains.annotations.NotNull()
     private final Foo.Bar bar = null;
     private final java.lang.String string = null;
 
@@ -18,9 +17,7 @@ public final class Foo {
 
     @kotlin.Metadata()
     public static final class Bar {
-        @org.jetbrains.annotations.NotNull()
         private final java.util.ArrayList<Foo.Bar.Bar> bars = null;
-        @org.jetbrains.annotations.NotNull()
         private final java.lang.String string = null;
 
         @org.jetbrains.annotations.NotNull()

plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt

@@ -28,9 +28,7 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class Modifiers {
-    @org.jetbrains.annotations.NotNull()
     private final transient java.lang.String transientField = "";
-    @org.jetbrains.annotations.NotNull()
     private volatile java.lang.String volatileField = "";
 
     @org.jetbrains.annotations.NotNull()

plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt

@@ -2,7 +2,6 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class A {
-    @org.jetbrains.annotations.Nullable()
     private final A x = null;
 
     @org.jetbrains.annotations.Nullable()

plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt

@@ -2,21 +2,13 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class A$B {
-    @org.jetbrains.annotations.NotNull()
     public A$B.C c;
-    @org.jetbrains.annotations.NotNull()
     public A$B.D$E de;
-    @org.jetbrains.annotations.NotNull()
     public J$B.C jc;
-    @org.jetbrains.annotations.NotNull()
     public J$B.D$E jde;
-    @org.jetbrains.annotations.NotNull()
     public A$B.D$$E dee;
-    @org.jetbrains.annotations.NotNull()
     public A$B.D$$$E deee;
-    @org.jetbrains.annotations.NotNull()
     public J$B.D$$E jdee;
-    @org.jetbrains.annotations.NotNull()
     public J$B.D$$$E jdeee;
 
     public A$B() {
@@ -33,13 +25,9 @@ public final class A$B {
 
     @kotlin.Metadata()
     public static final class D$E {
-        @org.jetbrains.annotations.NotNull()
         public A$B.D$E.F f;
-        @org.jetbrains.annotations.NotNull()
         public A$B.D$E.F$G fg;
-        @org.jetbrains.annotations.NotNull()
         public J$B.D$E.F jf;
-        @org.jetbrains.annotations.NotNull()
         public J$B.D$E.F$G jfg;
 
         public D$E() {
@@ -254,7 +242,6 @@ import java.lang.System;
 @kotlin.Metadata()
 @IFoo.IBar.Anno(value = {IFoo.IBar.IZoo.class, Foo.Bar.class})
 public final class Test1 extends Foo.Bar implements IFoo.IBar, IFoo.IBar.IZoo {
-    @org.jetbrains.annotations.NotNull()
     private final Foo.Bar.Zoo zoo = null;
 
     @org.jetbrains.annotations.NotNull()

plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt

@@ -4,21 +4,13 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class A$B {
-    @org.jetbrains.annotations.NotNull()
     public test.A$B.C c;
-    @org.jetbrains.annotations.NotNull()
     public test.A$B.D$E de;
-    @org.jetbrains.annotations.NotNull()
     public test.J$B.C jc;
-    @org.jetbrains.annotations.NotNull()
     public test.J$B.D$E jde;
-    @org.jetbrains.annotations.NotNull()
     public test.A$B.D$$E dee;
-    @org.jetbrains.annotations.NotNull()
     public test.A$B.D$$$E deee;
-    @org.jetbrains.annotations.NotNull()
     public test.J$B.D$$E jdee;
-    @org.jetbrains.annotations.NotNull()
     public test.J$B.D$$$E jdeee;
 
     public A$B() {
@@ -35,13 +27,9 @@ public final class A$B {
 
     @kotlin.Metadata()
     public static final class D$E {
-        @org.jetbrains.annotations.NotNull()
         public test.A$B.D$E.F f;
-        @org.jetbrains.annotations.NotNull()
         public test.A$B.D$E.F$G fg;
-        @org.jetbrains.annotations.NotNull()
         public test.J$B.D$E.F jf;
-        @org.jetbrains.annotations.NotNull()
         public test.J$B.D$E.F$G jfg;
 
         public D$E() {
@@ -262,7 +250,6 @@ import java.lang.System;
 @kotlin.Metadata()
 @test.IFoo.IBar.Anno(value = {test.IFoo.IBar.IZoo.class, test.Foo.Bar.class})
 public final class Test1 extends test.Foo.Bar implements test.IFoo.IBar, test.IFoo.IBar.IZoo {
-    @org.jetbrains.annotations.NotNull()
     private final test.Foo.Bar.Zoo zoo = null;
 
     @org.jetbrains.annotations.NotNull()

plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt

@@ -3,13 +3,9 @@ import java.lang.System;
 @kotlin.Suppress(names = {"UNRESOLVED_REFERENCE"})
 @kotlin.Metadata()
 public final class NonExistentType {
-    @org.jetbrains.annotations.Nullable()
     private static final ABCDEF a = null;
-    @org.jetbrains.annotations.Nullable()
     private static final java.util.List<ABCDEF> b = null;
-    @org.jetbrains.annotations.NotNull()
     private static final Function1<ABCDEF, kotlin.Unit> c = null;
-    @org.jetbrains.annotations.Nullable()
     private static final ABCDEF<java.lang.String, Function1<java.util.List<ABCDEF>, kotlin.Unit>> d = null;
     @org.jetbrains.annotations.NotNull()
     public static final NonExistentType INSTANCE = null;

plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt

@@ -48,51 +48,28 @@ import kotlin.reflect.KClass;
 @kotlin.Metadata()
 @Anno(a = Blah.class, b = {NoFoo1.class, NoBar1.class}, c = {NoFoo2.class, kotlin.String.class}, d = {kotlin.Boolean.class, NoBar3.class})
 public final class Test<G extends java.lang.Object> {
-    @org.jetbrains.annotations.NotNull()
     public ABC a;
-    @org.jetbrains.annotations.Nullable()
     private final ABC b = null;
-    @org.jetbrains.annotations.Nullable()
     private final java.util.List<ABC> c = null;
-    @org.jetbrains.annotations.Nullable()
     private final java.util.List<java.util.Map<BCD, ABC<java.util.List<BCD>>>> d = null;
-    @org.jetbrains.annotations.NotNull()
     public java.util.List<java.util.Map<? extends ABC, BCD>> e;
-    @org.jetbrains.annotations.NotNull()
     public ABC<?> f;
-    @org.jetbrains.annotations.NotNull()
     public java.util.List<?> g;
-    @org.jetbrains.annotations.NotNull()
     public ABC<java.lang.Integer, java.lang.String> h;
-    @org.jetbrains.annotations.NotNull()
     public Function2<ABC, java.util.List<BCD>, CDE> i;
-    @org.jetbrains.annotations.NotNull()
     public Function0<CDE> j;
-    @org.jetbrains.annotations.NotNull()
     public Function2<ABC, java.util.List<BCD>, CDE> k;
-    @org.jetbrains.annotations.NotNull()
     public ABC.BCD.EFG l;
-    @org.jetbrains.annotations.NotNull()
     public ABC coocoo;
-    @org.jetbrains.annotations.NotNull()
     public ABC<java.lang.String> coocoo2;
-    @org.jetbrains.annotations.NotNull()
     public ABC<ABC> coocoo21;
-    @org.jetbrains.annotations.NotNull()
     public ABC<java.lang.String, java.lang.String> coocoo3;
-    @org.jetbrains.annotations.NotNull()
     public ABC<java.lang.String, ABC<ABC>> coocoo31;
-    @org.jetbrains.annotations.NotNull()
     public ABC nested;
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.Object m = null;
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.String n = "";
-    @org.jetbrains.annotations.NotNull()
     public java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends java.util.List<? extends error.NonExistentClass>>>>>>>>>> o11;
-    @org.jetbrains.annotations.NotNull()
     public java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<java.util.List<ABC>>>>>>>>> o10;
-    @org.jetbrains.annotations.NotNull()
     public java.util.Calendar.Builder p;
 
     @org.jetbrains.annotations.NotNull()

plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt

@@ -12,25 +12,15 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class NonExistentType {
-    @org.jetbrains.annotations.Nullable()
     private static final error.NonExistentClass a = null;
-    @org.jetbrains.annotations.Nullable()
     private static final java.util.List<error.NonExistentClass> b = null;
-    @org.jetbrains.annotations.NotNull()
     private static final kotlin.jvm.functions.Function1<error.NonExistentClass, kotlin.Unit> c = null;
-    @org.jetbrains.annotations.Nullable()
     private static final error.NonExistentClass d = null;
-    @org.jetbrains.annotations.NotNull()
     public static java.lang.String string2;
-    @org.jetbrains.annotations.NotNull()
     public static error.NonExistentClass coocoo;
-    @org.jetbrains.annotations.NotNull()
     public static error.NonExistentClass coocoo2;
-    @org.jetbrains.annotations.NotNull()
     public static error.NonExistentClass coocoo21;
-    @org.jetbrains.annotations.NotNull()
     public static error.NonExistentClass coocoo3;
-    @org.jetbrains.annotations.NotNull()
     public static error.NonExistentClass coocoo31;
     @org.jetbrains.annotations.NotNull()
     public static final NonExistentType INSTANCE = null;

plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt

@@ -24,7 +24,6 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class Test {
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.String prop = "A";
 
     @Anno2()

plugins/kapt3/kapt3-compiler/testData/converter/recentlyNullable.txt

@@ -25,7 +25,6 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class KBox implements androidx.annotation.Box {
-    @org.jetbrains.annotations.NotNull()
     private final androidx.annotation.Box delegate = null;
 
     @org.jetbrains.annotations.NotNull()

plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt

@@ -183,7 +183,6 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class Test {
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.String value = "";
 
     @lib.Anno(value = "3", construct = {"C"})

plugins/kapt3/kapt3-compiler/testData/converter/secondaryConstructor.txt

@@ -17,7 +17,6 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class Product2 implements secondary.Named {
-    @org.jetbrains.annotations.Nullable()
     private java.lang.String name;
 
     @org.jetbrains.annotations.Nullable()

plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt

@@ -17,7 +17,6 @@ import java.lang.System;
 @kotlin.Metadata()
 public enum StrangeEnum {
     /*public static final*/ InvalidFieldName /* = new StrangeEnum() */;
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.String size = null;
 
     @org.jetbrains.annotations.NotNull()
@@ -36,7 +35,6 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class Test {
-    @org.jetbrains.annotations.NotNull()
     public java.lang.String simpleName;
 
     @org.jetbrains.annotations.NotNull()

plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.txt

@@ -2,7 +2,6 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class Boo {
-    @org.jetbrains.annotations.NotNull()
     private static final java.lang.String z = null;
     @org.jetbrains.annotations.NotNull()
     public static final Boo INSTANCE = null;
@@ -32,23 +31,17 @@ public final class Foo {
     @org.jetbrains.annotations.NotNull()
     public static final java.lang.String aString = "foo";
     public static final int aInt = 3;
-    @org.jetbrains.annotations.NotNull()
     private static final java.lang.String bString = "bar";
     private static final int bInt = 5;
-    @org.jetbrains.annotations.NotNull()
     private static java.lang.String cString = "baz";
     private static int cInt = 7;
-    @org.jetbrains.annotations.NotNull()
     private static final java.lang.String d = null;
     private static final int e = 0;
     private static final int f = 8;
-    @org.jetbrains.annotations.NotNull()
     private static final java.lang.String g = "ab";
     private static final int h = -4;
     private static final int i = 2147483647;
-    @org.jetbrains.annotations.NotNull()
     private static final java.lang.String j = null;
-    @org.jetbrains.annotations.NotNull()
     private static final java.lang.String k = null;
     @org.jetbrains.annotations.NotNull()
     public static final Foo INSTANCE = null;
@@ -126,30 +119,18 @@ import java.lang.System;
 
 @kotlin.Metadata()
 public final class HavingState {
-    @org.jetbrains.annotations.NotNull()
     private final State state = State.START;
-    @org.jetbrains.annotations.NotNull()
     private final State[] stateArray = {State.START};
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.String[] stringArray = {"foo"};
-    @org.jetbrains.annotations.NotNull()
     private final java.util.List<java.lang.String> stringList = null;
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.Integer[] intArray = {1};
-    @org.jetbrains.annotations.NotNull()
     private final float[] floatArray = {-1.0F};
-    @org.jetbrains.annotations.NotNull()
     private final java.util.List<java.lang.Integer> intList = null;
     private final int uint = 1;
-    @org.jetbrains.annotations.NotNull()
     private final kotlin.UInt[] uintArray = {1};
-    @org.jetbrains.annotations.NotNull()
     private final java.util.List<kotlin.UInt> uintList = null;
-    @org.jetbrains.annotations.NotNull()
     private final kotlin.reflect.KClass<State> clazz = null;
-    @org.jetbrains.annotations.NotNull()
     private final java.lang.Class<State> javaClass = null;
-    @org.jetbrains.annotations.NotNull()
     private final kotlin.reflect.KClass<? extends java.lang.Object> anonymous = null;
 
     @org.jetbrains.annotations.NotNull()