From 9468670980209ebffbef340ca52c027a831304de Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Fri, 26 Jun 2020 15:17:23 +0300 Subject: [PATCH] Minor: update testData with nullability annotations --- .../testData/converter/abstractEnum.txt | 2 -- .../testData/converter/aliasedImports.txt | 7 ------ .../testData/converter/annotations.txt | 1 - .../testData/converter/annotations2.txt | 1 - .../converter/annotationsWithTargets.txt | 2 -- .../testData/converter/comments.txt | 3 --- .../testData/converter/dataClass.txt | 2 -- .../converter/defaultParameterValueOff.txt | 9 -------- .../converter/defaultParameterValueOn.txt | 9 -------- .../testData/converter/enums.txt | 1 - .../converter/errorLocationMapping.txt | 6 ----- .../errorSuperclassCorrectErrorTypes.txt | 2 -- .../testData/converter/genericParameters.txt | 1 - .../testData/converter/genericSimple.txt | 1 - .../testData/converter/ignoredMembers.txt | 1 - .../converter/implicitReturnTypes.txt | 4 ---- .../testData/converter/inlineClasses.txt | 1 - .../converter/interfaceImplementation.txt | 1 - .../testData/converter/javadoc.txt | 4 ---- .../testData/converter/jvmOverloads.txt | 1 - .../converter/jvmStaticFieldInParent.txt | 1 - .../testData/converter/kt14998.txt | 4 ---- .../testData/converter/kt18791.txt | 1 - .../testData/converter/kt24272.txt | 3 --- .../testData/converter/modifiers.txt | 2 -- .../testData/converter/nestedClasses.txt | 1 - .../testData/converter/nestedClasses2.txt | 13 ----------- .../converter/nestedClassesNonRootPackage.txt | 13 ----------- .../testData/converter/nonExistentClass.txt | 4 ---- .../nonExistentClassTypesConversion.txt | 23 ------------------- .../nonExistentClassWIthoutCorrection.txt | 10 -------- .../converter/propertyAnnotations.txt | 1 - .../testData/converter/recentlyNullable.txt | 1 - .../converter/repeatableAnnotations.txt | 1 - .../converter/secondaryConstructor.txt | 1 - .../testData/converter/strangeIdentifiers.txt | 2 -- .../converter/unsafePropertyInitializers.txt | 19 --------------- 37 files changed, 159 deletions(-) diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt b/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt index 5da6cc6ef88..df79522ca78 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/abstractEnum.txt +++ b/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; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.txt b/plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.txt index aeeae101f1f..35770662333 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/aliasedImports.txt +++ b/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() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt index ddbaa8f4059..3da7e5a1861 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt +++ b/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"; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt index 1ecb47c7377..f0590863f87 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt +++ b/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() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.txt index 71efe5e7a30..13c9f7c7c75 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/annotationsWithTargets.txt +++ b/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; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt b/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt index 27375cccb3c..c3d7168f758 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/comments.txt +++ b/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() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt b/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt index 7342fc46d0d..86754ee31d5 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/dataClass.txt +++ b/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; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.txt index a20dea0e171..55019723ccf 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOff.txt +++ b/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) { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.txt b/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.txt index a9a400e9d5f..8f5df864d39 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/defaultParameterValueOn.txt +++ b/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) { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt b/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt index 90bb77c418d..76b4edbe8f5 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/enums.txt +++ b/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; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.txt b/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.txt index 8bded353588..9e4384810d2 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.txt +++ b/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 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 p3; @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclassCorrectErrorTypes.txt b/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclassCorrectErrorTypes.txt index 01c641b3783..175f14cf90e 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/errorSuperclassCorrectErrorTypes.txt +++ b/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() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters.txt b/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters.txt index 3124b0ba9ac..1669cc37d58 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/genericParameters.txt @@ -2,7 +2,6 @@ import java.lang.System; @kotlin.Metadata() public final class MappedList extends kotlin.collections.AbstractList implements java.util.List { - @org.jetbrains.annotations.NotNull() private final java.util.List list = null; private final kotlin.jvm.functions.Function1 function = null; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt b/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt index 2cc611e3767..1f000a116be 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt +++ b/plugins/kapt3/kapt3-compiler/testData/converter/genericSimple.txt @@ -51,7 +51,6 @@ import java.lang.System; @kotlin.Metadata() public final class MyClass extends BaseClass implements Intf, OtherIntf { - @org.jetbrains.annotations.Nullable() private final java.util.List> fld = null; @org.jetbrains.annotations.Nullable() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt index 5becde66c24..163e9b402f6 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/ignoredMembers.txt +++ b/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() { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.txt b/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.txt index c8072353f9f..b6a5eb9809e 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.txt +++ b/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 = null; - @org.jetbrains.annotations.NotNull() private static final lib.Prop[] TESTS_ARRAY = null; - @org.jetbrains.annotations.NotNull() private static final java.util.List> TESTS_LIST = null; @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.txt b/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.txt index adbce593298..357f4909c69 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/inlineClasses.txt +++ b/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() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/interfaceImplementation.txt b/plugins/kapt3/kapt3-compiler/testData/converter/interfaceImplementation.txt index fe33cd8aad0..2fb7fa3521c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/interfaceImplementation.txt +++ b/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() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.txt b/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.txt index c8e28d7075d..7e156137818 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/javadoc.txt +++ b/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() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt index 2b92efc2804..53eed47076c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmOverloads.txt +++ b/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() { diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt index 74e088d08fa..1e2b5d09953 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmStaticFieldInParent.txt +++ b/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; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt index 3bf3b1ad424..2f681e095e4 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt14998.txt +++ b/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() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt18791.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt18791.txt index 88d1bf86686..27591da2145 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt18791.txt +++ b/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; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.txt b/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.txt index b3fbf47e87c..5bcb8492ac5 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/kt24272.txt +++ b/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 bars = null; - @org.jetbrains.annotations.NotNull() private final java.lang.String string = null; @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt index f54ffd3f1da..d95a5370fd4 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/modifiers.txt +++ b/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() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt index cc890eed4ce..81b069fba1c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses.txt +++ b/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() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt index 43f392d7b15..616a7c6231b 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt +++ b/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() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt index cf532f5c702..8a6c3b999dc 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt +++ b/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() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt index 0c835f604aa..422dff505d1 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClass.txt +++ b/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 b = null; - @org.jetbrains.annotations.NotNull() private static final Function1 c = null; - @org.jetbrains.annotations.Nullable() private static final ABCDEF, kotlin.Unit>> d = null; @org.jetbrains.annotations.NotNull() public static final NonExistentType INSTANCE = null; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt index 333a325a2d2..886fca9c2a4 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt +++ b/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 { - @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 c = null; - @org.jetbrains.annotations.Nullable() private final java.util.List>>> d = null; - @org.jetbrains.annotations.NotNull() public java.util.List> e; - @org.jetbrains.annotations.NotNull() public ABC f; - @org.jetbrains.annotations.NotNull() public java.util.List g; - @org.jetbrains.annotations.NotNull() public ABC h; - @org.jetbrains.annotations.NotNull() public Function2, CDE> i; - @org.jetbrains.annotations.NotNull() public Function0 j; - @org.jetbrains.annotations.NotNull() public Function2, CDE> k; - @org.jetbrains.annotations.NotNull() public ABC.BCD.EFG l; - @org.jetbrains.annotations.NotNull() public ABC coocoo; - @org.jetbrains.annotations.NotNull() public ABC coocoo2; - @org.jetbrains.annotations.NotNull() public ABC coocoo21; - @org.jetbrains.annotations.NotNull() public ABC coocoo3; - @org.jetbrains.annotations.NotNull() public 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>>>>>>>>> o11; - @org.jetbrains.annotations.NotNull() public java.util.List>>>>>>>> o10; - @org.jetbrains.annotations.NotNull() public java.util.Calendar.Builder p; @org.jetbrains.annotations.NotNull() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt b/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt index 4ef24b14805..4f7a70635ff 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassWIthoutCorrection.txt +++ b/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 b = null; - @org.jetbrains.annotations.NotNull() private static final kotlin.jvm.functions.Function1 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; diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt b/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt index 4452a93f9e6..dc1be19528c 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/propertyAnnotations.txt +++ b/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() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/recentlyNullable.txt b/plugins/kapt3/kapt3-compiler/testData/converter/recentlyNullable.txt index 60e2db544c7..42019388194 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/recentlyNullable.txt +++ b/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() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt b/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt index 75af5872492..ea81cca8e79 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt +++ b/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"}) diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/secondaryConstructor.txt b/plugins/kapt3/kapt3-compiler/testData/converter/secondaryConstructor.txt index b032273355c..1f7a6d97238 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/secondaryConstructor.txt +++ b/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() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt index d59d54435f9..448e50b3f07 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/strangeIdentifiers.txt +++ b/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() diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.txt b/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.txt index b929d8e55a1..70c37ab85d6 100644 --- a/plugins/kapt3/kapt3-compiler/testData/converter/unsafePropertyInitializers.txt +++ b/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 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 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 uintList = null; - @org.jetbrains.annotations.NotNull() private final kotlin.reflect.KClass clazz = null; - @org.jetbrains.annotations.NotNull() private final java.lang.Class javaClass = null; - @org.jetbrains.annotations.NotNull() private final kotlin.reflect.KClass anonymous = null; @org.jetbrains.annotations.NotNull()