[jspecify] Change annotations' package from org.jspecify.annotations to org.jspecify.nullness, and DefaultNonNull to NullMarked
^KT-45409 Fixed
This commit is contained in:
Vendored
+4
-4
@@ -1,6 +1,6 @@
|
||||
import org.jspecify.annotations.*;
|
||||
import org.jspecify.nullness.*;
|
||||
|
||||
@DefaultNonNull
|
||||
@NullMarked
|
||||
public class AnnotatedBoundsOfWildcard {
|
||||
public void superAsIs(Test<? super @NullnessUnspecified Base, ? super @NullnessUnspecified Base, ? super @NullnessUnspecified Base> a) {}
|
||||
public void superNotNull(Test<? super Base, ? super Base, ? super Base> a) {}
|
||||
@@ -16,10 +16,10 @@ public class AnnotatedBoundsOfWildcard {
|
||||
class Base {}
|
||||
class Derived extends Base {}
|
||||
|
||||
@DefaultNonNull
|
||||
@NullMarked
|
||||
class Test<T extends Object, E extends @Nullable Object, F extends @NullnessUnspecified Object> { }
|
||||
|
||||
@DefaultNonNull
|
||||
@NullMarked
|
||||
class Use {
|
||||
public void main(
|
||||
Test<Derived, Derived, Derived> aNotNullNotNullNotNull,
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
import org.jspecify.annotations.*;
|
||||
import org.jspecify.nullness.*;
|
||||
|
||||
@DefaultNonNull
|
||||
@NullMarked
|
||||
public class Defaults {
|
||||
public Foo defaultField = null;
|
||||
@Nullable public Foo field = null;
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
import org.jspecify.annotations.*;
|
||||
import org.jspecify.nullness.*;
|
||||
|
||||
@DefaultNonNull
|
||||
@NullMarked
|
||||
public class IgnoreAnnotations {
|
||||
@Nullable public Derived field = null;
|
||||
|
||||
|
||||
Vendored
+2
-2
@@ -1,4 +1,4 @@
|
||||
import org.jspecify.annotations.*;
|
||||
import org.jspecify.nullness.*;
|
||||
|
||||
public class NonPlatformTypeParameter<T extends @Nullable Object> {
|
||||
public void foo(T t) {}
|
||||
@@ -7,7 +7,7 @@ public class NonPlatformTypeParameter<T extends @Nullable Object> {
|
||||
|
||||
class Test {}
|
||||
|
||||
@DefaultNonNull
|
||||
@NullMarked
|
||||
class Use {
|
||||
public <T extends Test> void main(NonPlatformTypeParameter<@Nullable Object> a1, NonPlatformTypeParameter<Test> a2, T x) {
|
||||
a1.foo(null);
|
||||
|
||||
Vendored
+2
-2
@@ -1,6 +1,6 @@
|
||||
import org.jspecify.annotations.*;
|
||||
import org.jspecify.nullness.*;
|
||||
|
||||
@DefaultNonNull
|
||||
@NullMarked
|
||||
public class NullnessUnspecifiedTypeParameter<T> {
|
||||
public void foo(T t) {}
|
||||
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
import org.jspecify.annotations.*;
|
||||
import org.jspecify.nullness.*;
|
||||
|
||||
@DefaultNotNull
|
||||
public class SelfType<T extends SelfType<T>> {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import org.jspecify.annotations.*;
|
||||
import org.jspecify.nullness.*;
|
||||
|
||||
@DefaultNonNull
|
||||
@NullMarked
|
||||
public class Simple {
|
||||
@Nullable public Derived field = null;
|
||||
|
||||
@@ -19,7 +19,7 @@ class Derived extends Base {
|
||||
void foo() {}
|
||||
}
|
||||
|
||||
@DefaultNonNull
|
||||
@NullMarked
|
||||
class Use {
|
||||
static public void main(Simple a, Derived x) {
|
||||
a.foo(x, null).foo();
|
||||
|
||||
Vendored
+4
-4
@@ -1,13 +1,13 @@
|
||||
import org.jspecify.annotations.*;
|
||||
import org.jspecify.nullness.*;
|
||||
|
||||
@DefaultNonNull
|
||||
@NullMarked
|
||||
public class TypeArgumentsFromParameterBounds<T extends Object, E extends @Nullable Object, F extends @NullnessUnspecified Object> { }
|
||||
|
||||
class A {
|
||||
public void bar(TypeArgumentsFromParameterBounds<@Nullable Test, @Nullable Test, @Nullable Test> a) {}
|
||||
}
|
||||
|
||||
@DefaultNonNull
|
||||
@NullMarked
|
||||
class B {
|
||||
public void bar(TypeArgumentsFromParameterBounds<Test, Test, Test> a) {}
|
||||
}
|
||||
@@ -18,7 +18,7 @@ class C {
|
||||
|
||||
class Test {}
|
||||
|
||||
@DefaultNonNull
|
||||
@NullMarked
|
||||
class Use {
|
||||
static public void main(
|
||||
TypeArgumentsFromParameterBounds<Test, Test, Test> aNotNullNotNullNotNull,
|
||||
|
||||
+4
-4
@@ -1,12 +1,12 @@
|
||||
import org.jspecify.annotations.*;
|
||||
import org.jspecify.nullness.*;
|
||||
|
||||
@DefaultNonNull
|
||||
@NullMarked
|
||||
class A<T> {
|
||||
public void foo(@NullnessUnspecified T t) {}
|
||||
public <E> void bar(E e) {}
|
||||
}
|
||||
|
||||
@DefaultNonNull
|
||||
@NullMarked
|
||||
class B<T> {
|
||||
public void foo(T t) {}
|
||||
public <E> void bar(E e) {}
|
||||
@@ -14,7 +14,7 @@ class B<T> {
|
||||
|
||||
class Test {}
|
||||
|
||||
@DefaultNonNull
|
||||
@NullMarked
|
||||
public class TypeParameterBounds {
|
||||
<T extends Test> void main(A<@Nullable Object> a1, A<Test> a2, B<@Nullable Object> b1, B<Test> b2, T x) {
|
||||
// jspecify_nullness_mismatch
|
||||
|
||||
+3
-3
@@ -1,6 +1,6 @@
|
||||
import org.jspecify.annotations.*;
|
||||
import org.jspecify.nullness.*;
|
||||
|
||||
@DefaultNonNull
|
||||
@NullMarked
|
||||
public class WildcardsWithDefault {
|
||||
public void noBoundsNotNull(A<?, ?, ?> a) {}
|
||||
public void noBoundsNullable(A<@Nullable ?, @Nullable ?, @Nullable ?> a) {}
|
||||
@@ -8,7 +8,7 @@ public class WildcardsWithDefault {
|
||||
|
||||
class A <T extends Object, E extends @Nullable Object, F extends @NullnessUnspecified Object> {}
|
||||
|
||||
@DefaultNonNull
|
||||
@NullMarked
|
||||
class Use {
|
||||
public static void main(
|
||||
A<Object, Object, Object> aNotNullNotNullNotNull,
|
||||
|
||||
Reference in New Issue
Block a user