diff options
Diffstat (limited to 'java/java-tests')
107 files changed, 2507 insertions, 118 deletions
diff --git a/java/java-tests/testData/codeInsight/completion/smartType/NoSemicolonInsideParentheses-out.java b/java/java-tests/testData/codeInsight/completion/smartType/NoSemicolonInsideParentheses-out.java new file mode 100644 index 000000000000..3199c94ee908 --- /dev/null +++ b/java/java-tests/testData/codeInsight/completion/smartType/NoSemicolonInsideParentheses-out.java @@ -0,0 +1,7 @@ +public class MyAspect { + + public void foo() { + String nameToUse = /*adjustName*/(toString())<caret>; //todo + } + +} diff --git a/java/java-tests/testData/codeInsight/completion/smartType/NoSemicolonInsideParentheses.java b/java/java-tests/testData/codeInsight/completion/smartType/NoSemicolonInsideParentheses.java new file mode 100644 index 000000000000..30c2f7d757af --- /dev/null +++ b/java/java-tests/testData/codeInsight/completion/smartType/NoSemicolonInsideParentheses.java @@ -0,0 +1,7 @@ +public class MyAspect { + + public void foo() { + String nameToUse = /*adjustName*/(to<caret>); //todo + } + +} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/CaptureWildcardFromUnboundCaptureWildcard.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/CaptureWildcardFromUnboundCaptureWildcard.java new file mode 100644 index 000000000000..0abec87dc335 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/CaptureWildcardFromUnboundCaptureWildcard.java @@ -0,0 +1,9 @@ +class Test<X extends Getter<?, ?> & Runnable> {} + +interface Supplier<K> { + K get(); +} + +interface Getter<C, S extends C> extends Supplier<C> { + public S get(); +} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA106985.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA106985.java new file mode 100644 index 000000000000..b11bfa46632c --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA106985.java @@ -0,0 +1,15 @@ + +import java.util.Map; + +class Test { + + public static void main(String[] args) { + Map<Integer, Object> map = <error descr="Inferred type 'java.lang.Object' for type parameter 'V' is not within its bound; should implement 'java.lang.Comparable'">make()</error>; + } + + + public static <K extends Comparable, V extends Comparable> Map<K,V> make() { + return null; + } + +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA114797.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA114797.java new file mode 100644 index 000000000000..9e4ee06ade1e --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA114797.java @@ -0,0 +1,15 @@ +import java.util.ArrayList; +import java.util.List; + +interface A{}; +interface B extends A{}; + +class GenericTest { + public static <M extends V, V> List<V> convert(List<M> list){ + return new ArrayList<V>(); + } + + public static void test(){ + List<A> as = convert(new ArrayList<B>()); + } +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/constraints/IntersectionTypeStrictSubtypingConstraint.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/constraints/IntersectionTypeStrictSubtypingConstraint.java new file mode 100644 index 000000000000..df18646a0009 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/constraints/IntersectionTypeStrictSubtypingConstraint.java @@ -0,0 +1,15 @@ +import java.io.Serializable; +import java.util.function.Supplier; + +class Test { + static class Loader<K> { + + static <K> Loader<K> from(Supplier<K> supplier) { + return new Loader<>(); + } + } + + Loader loader = Loader.from((I<String> & Serializable) () -> ""); + + interface I<H> extends Supplier<H>{} +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/FreshVariablesCreatedDuringResolveDependingOnAlreadyResolvedVariables.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/FreshVariablesCreatedDuringResolveDependingOnAlreadyResolvedVariables.java new file mode 100644 index 000000000000..a3701f1b6cf8 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/FreshVariablesCreatedDuringResolveDependingOnAlreadyResolvedVariables.java @@ -0,0 +1,17 @@ +class Test { + + class X<F extends Foo, B extends Bar<F, B>> { + } + class Foo { + } + class Bar<A, B> { + } + + private <F extends Foo, B extends Bar<F, B>> X<F, B> foo() { + return null; + } + + { + X x = foo(); + } +} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/IncompatibleBoundsFromAssignment.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/IncompatibleBoundsFromAssignment.java new file mode 100644 index 000000000000..d5b8b03050d5 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/IncompatibleBoundsFromAssignment.java @@ -0,0 +1,15 @@ +import java.util.Map; + +class Test { + + public static void main(String[] args) { + <error descr="Incompatible types. Found: 'T', required: 'java.util.Map<java.lang.Object,java.lang.Object>'">Map<Object, Object> b = newMapTrie();</error> + <error descr="Incompatible types. Found: 'T', required: 'java.util.Map<java.lang.Object,java.util.Map<java.lang.Object,java.lang.Object>>'">Map<Object, Map<Object, Object>> c = newMapTrie();</error> + <error descr="Incompatible types. Found: 'T', required: 'java.util.Map<java.lang.Object,java.util.Map<java.lang.Object,java.util.Map<java.lang.Object,java.lang.Object>>>'">Map<Object, Map<Object, Map<Object, Object>>> d = newMapTrie();</error> + <error descr="Incompatible types. Found: 'T', required: 'java.util.Map<java.lang.Object,java.util.Map<java.lang.Object,java.util.Map<java.lang.Object,java.util.Map<java.lang.Object,java.lang.Object>>>>'">Map<Object, Map<Object, Map<Object, Map<Object, Object>>>> e = newMapTrie();</error> + } + + public static <T extends Map<Byte, T>> T newMapTrie() { + return null; + } +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/Ambiguity1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/Ambiguity1.java index e66630146e6f..02bbebd074b0 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/Ambiguity1.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/Ambiguity1.java @@ -12,7 +12,7 @@ class Ambiguity1 { static <T> void m(I2<T> i2) {} { - m<error descr="Ambiguous method call: both 'Ambiguity1.m(I1)' and 'Ambiguity1.m(I2<Object>)' match">(()->{throw new AssertionError();})</error>; + m(()->{throw new AssertionError();}); m(() -> {}); m(() -> { if (false) return; diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/AmbiguityRawGenerics.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/AmbiguityRawGenerics.java index 595787704437..6c664dd9e65a 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/AmbiguityRawGenerics.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/AmbiguityRawGenerics.java @@ -22,6 +22,6 @@ class AmbiguityRawGenerics { <Z> void foo(I3<Z> s) { } void bar() { - foo<error descr="Ambiguous method call: both 'AmbiguityRawGenerics.foo(I)' and 'AmbiguityRawGenerics.foo(I1)' match">(()-> { throw new RuntimeException(); })</error>; + foo<error descr="Ambiguous method call: both 'AmbiguityRawGenerics.foo(I1)' and 'AmbiguityRawGenerics.foo(I2)' match">(()-> { throw new RuntimeException(); })</error>; } }
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/EffectiveFinal.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/EffectiveFinal.java index 92b268394994..001b1f39c494 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/EffectiveFinal.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/EffectiveFinal.java @@ -142,3 +142,37 @@ class IDEA128196 { new Thread(() -> System.out.println(value)); } } + +class FinalAssignmentInInitializer { + private final String x; + { + Runnable r = () -> <error descr="Cannot assign a value to final variable 'x'">x</error> = ""; + x = ""; + } +} + +class AssignmentToFinalInsideLambda { + boolean isTrue() { + return true; + } + + Runnable r = () -> { + final int i; + if (isTrue()) { + i = 1; + } else { + i = 0; + } + }; + + void a() { + Runnable r = () -> { + final int i; + if (isTrue()) { + i = 1; + } else { + i = 0; + } + }; + } +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/mostSpecific/NoReturnTypeResolutionForThrownException.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/mostSpecific/NoReturnTypeResolutionForThrownException.java index 81429131d099..1fe14f680abe 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/mostSpecific/NoReturnTypeResolutionForThrownException.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/mostSpecific/NoReturnTypeResolutionForThrownException.java @@ -7,7 +7,7 @@ class Test { void call(I2 p) { } void test() { - call<error descr="Ambiguous method call: both 'Test.call(I1)' and 'Test.call(I2)' match">(() -> { throw new RuntimeException(); })</error>; + call(() -> { throw new RuntimeException(); }); call(() -> { if (true) return ""; throw new RuntimeException(); }); call(() -> { if (true) return; throw new RuntimeException(); }); } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/DeepNestedLambdaExpressionsNoFormalParams.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/DeepNestedLambdaExpressionsNoFormalParams.java new file mode 100644 index 000000000000..5a79aef6a18f --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/DeepNestedLambdaExpressionsNoFormalParams.java @@ -0,0 +1,70 @@ + +import java.util.List; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import java.util.stream.Stream; + + +abstract class Simplified { + public List<Integer> gerFirstTriangles() { + return flatMap(() -> flatMap(() -> map(z -> 1))).collect(Collectors.toList()); + } + + abstract <R> R flatMap(Supplier<R> mapper); + abstract <R> Stream<R> map(Function<Integer, R> mapper); +} + +class PythagoreanTriangles { + + static class Triplet<T,U,R>{ + private T t; + private U u; + private R r; + + public Triplet(T t, U u, R r){ + this.t = t; + this.u = u; + this.r = r; + } + + @Override + public String toString() { + return t.toString() + "," + u.toString() + "," + r.toString(); + } + } + + public void pythagoreanTriangles(Integer num){ + Stream<Integer> numbers = IntStream.rangeClosed(1,num).boxed(); + + Stream<Triplet<Integer, Integer, Integer>> triangles = numbers.flatMap(x -> { + return IntStream.rangeClosed(1, x).boxed().flatMap(y -> { + return IntStream.rangeClosed(1, y).boxed().filter(z -> { + return x * x == y * y + z * z; + }).map(z1 -> new Triplet<Integer, Integer, Integer>(x, y, z1)); + }); + }); + + triangles.forEach(System.out::println); + + } + + public List<Triplet<Integer, Integer, Integer>> gerFirstTriangles(long num){ + Stream<Integer> infinity = Stream.iterate(1, (n) -> n + 1); + return infinity.flatMap(x -> { + return IntStream.rangeClosed(1, x).boxed().flatMap(y -> { + return IntStream.rangeClosed(1, y).boxed().filter(z -> { + return x * x == y * y + z * z; + }).map(z1 -> new Triplet<Integer, Integer, Integer>(x, y, z1)); + }); + }).limit(num).collect(Collectors.toList()); + } + + + public static void main(String[] args) { + PythagoreanTriangles triangles = new PythagoreanTriangles(); + triangles.pythagoreanTriangles(10); + triangles.gerFirstTriangles(5l).forEach(System.out::println); + } +} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/IDEA126778.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/IDEA126778.java new file mode 100644 index 000000000000..d8bdcc0d6c82 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/IDEA126778.java @@ -0,0 +1,27 @@ +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static java.util.stream.Collectors.groupingBy; +import static java.util.stream.Collectors.mapping; + +class Test { + private static Map<Long, Long> multiDataPointsToPerTxnSummedValue(final Stream<Map.Entry<DateTime, Map<Long, Long>>> stream) { + return stream.flatMap(e -> e.getValue().entrySet().stream().map(ex -> + new Object() { + Long txId = ex.getKey(); + DataPoint dataPoint = new DataPoint(e.getKey(), ex.getValue()); + } + )).collect(groupingBy(t -> t.txId, mapping(t -> t.dataPoint, Collectors.summingLong(dataPoint -> dataPoint.getValue().longValue())))); + } + + static class MultiDataPoint {} + static class DateTime {} + + static class DataPoint { + DataPoint(DateTime t, Long val) {} + public Long getValue() { + return null; + } + } +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/NestedLambdaExpressions1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/NestedLambdaExpressions1.java new file mode 100644 index 000000000000..c31497d1f65a --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/NestedLambdaExpressions1.java @@ -0,0 +1,27 @@ +class ExplicitLambdaNoParams { + interface I<T> { + T a(); + } + + <F> I<F> foo(I<F> iff) { return null;} + + { + foo(() -> foo(() -> 1)).a(); + I<Integer> a1 = foo(() -> foo(() -> 1)).a(); + } +} + +class LambdaWithFormalParameterTypes { + + interface I<T> { + T a(int p); + } + + <F> I<F> foo(I<F> iff) { return null;} + + { + foo((int a) -> foo((int b) -> 1)).a(0); + I<Integer> a1 = foo((int a) -> foo((int b) -> 1)).a(0); + } + +} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/NestedLambdaExpressionsNoFormalParams.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/NestedLambdaExpressionsNoFormalParams.java new file mode 100644 index 000000000000..2d6254525d44 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/NestedLambdaExpressionsNoFormalParams.java @@ -0,0 +1,55 @@ +import java.util.function.Function; +import java.util.stream.IntStream; +import java.util.stream.Stream; + +abstract class NoFormalParams { + interface I<T> { + T a(int a); + } + + <F> I<F> foo(I<F> i) { return null;} + + { + I<Integer> i = foo(a -> foo(b -> 1)).a(0); + foo(a -> foo(b -> 1)).a(0); + } +} + +abstract class NoFormalParamTypeInferenceNeeded { + interface I<T> { + T a(int a); + } + + abstract <RR> RR map(I<RR> mapper); + abstract <R, V> R zip(Function<V, R> zipper); + + { + map(a -> zip(text -> text)); + zip(a -> zip(text -> text)); + Integer zip = zip(<error descr="Cyclic inference">a -> zip(text -> text)</error>); + } + +} + +class IDEA124983 { + class Rectangle{ + public Rectangle(int i, int j, int h, int w) { + } + } + + void createGrid() { + IntStream.range(0, 4) + .mapToObj(i -> IntStream.range(0, 4).mapToObj(j -> { + Rectangle rect2 = new Rectangle(i * 64, j * 64, 64, 64); + return rect2; + })) + .flatMap(s -> s) + .forEach(this::add); + } + + void add(final Rectangle r) {} + + void simplified(final IntStream range) { + range.mapToObj(i -> range.mapToObj(j -> 1)).flatMap(s -> s); + } +} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/NestedLambdaExpressionsNoFormalParams1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/NestedLambdaExpressionsNoFormalParams1.java new file mode 100644 index 000000000000..a3ce57be1db8 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/NestedLambdaExpressionsNoFormalParams1.java @@ -0,0 +1,26 @@ +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +class IDEA129251 { + void simplified(final Stream<String> pStream, final Stream<String> pStream1, final Stream<String> pStream2){ + pStream.flatMap(x -> Stream.concat(pStream1, pStream2.map(String::toUpperCase))); + } + + + private final Set<String> m_allSubtablesColumns; + private final List<SubtableDescription> m_subtablesDescription = null; + + { + m_allSubtablesColumns = m_subtablesDescription.stream(). + flatMap(desc -> Stream.concat(desc.getKeyColumns().stream().map(String::toUpperCase), + desc.getValueColumns().stream().map(String::toUpperCase))). + collect(Collectors.toSet()); + } + + abstract class SubtableDescription { + abstract List<String> getKeyColumns(); + abstract List<String> getValueColumns(); + } +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/NestedLambdaExpressionsNoFormalParamsStopAtStandalone.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/NestedLambdaExpressionsNoFormalParamsStopAtStandalone.java new file mode 100644 index 000000000000..be7be3539813 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/NestedLambdaExpressionsNoFormalParamsStopAtStandalone.java @@ -0,0 +1,32 @@ +import java.util.Map; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Collector; +import java.util.stream.Stream; + +class MultiDataPoint { + public MultiDataPoint(final Map<String, String> pCollect) {} + + public static void convertValueResults(final Stream<Result> pStream) { + map(() -> new MultiDataPoint(collect(toMap(r -> r.event.substring(0))))); + } + + static <R> R collect(Collector<? super Result, ?, R> collector) {return null;} + + static <R> R map(Supplier<R> s) { + return null; + } + + static <T, K> Collector<T, ?, Map<K,K>> toMap(Function< T, K> keyMapper) { + return null; + } + + static class Result { + public String event; + + public String getValue() { + return null; + } + } +} + diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/ParenthesizedExpressionsDuringConstrainsCollection.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/ParenthesizedExpressionsDuringConstrainsCollection.java new file mode 100644 index 000000000000..2dd69c3dcc79 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/ParenthesizedExpressionsDuringConstrainsCollection.java @@ -0,0 +1,13 @@ +import java.util.List; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +abstract class Test { + public List<Integer> gerFirstTriangles() { + return flatMap((y -> (map((z1 -> (1)))))).collect(Collectors.toList()); + } + + abstract <R> R flatMap(Function<Integer, R> mapper); + abstract <R> Stream<R> map (Function<Integer, R> mapper); +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/IDEA127275_.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/IDEA127275_.java index c002468c1b91..5743d171ad28 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/IDEA127275_.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/IDEA127275_.java @@ -4,7 +4,7 @@ import java.util.function.Function; class Main { { - List<Optional<Function<String, String>>> list = asList(of(Main::identity)); + List<Optional<Function<String, String>>> list = asList(of(<error descr="T is not a functional interface">Main::identity</error>)); } static <T> List<T> asList(T a) { return null;} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/IDEA102800.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/IDEA102800.java new file mode 100644 index 000000000000..7c2cc7bdae5e --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/IDEA102800.java @@ -0,0 +1,31 @@ +import java.util.function.IntFunction; +import java.util.function.IntUnaryOperator; +import java.util.function.Supplier; +import java.util.stream.IntStream; +import java.util.stream.Stream; + +class Test { + + interface IntStream1 { + Stream<Integer> map(IntFunction<Integer> mapper); + IntStream1 map(IntUnaryOperator mapper); + + Stream<Integer> boxed(); + } + + void fooBar(IntStream1 instr){ + Supplier<Stream<Integer>> si = () -> instr.map ((i) -> (( <error descr="Operator '%' cannot be applied to '<lambda parameter>', 'int'">i % 2</error>) == 0) ? i : <error descr="Incompatible types. Found: '<lambda parameter>', required: '<lambda parameter>'">-i</error>).boxed(); + System.out.println(si); + Supplier<Stream<Integer>> si1 = () -> instr.map <error descr="Ambiguous method call: both 'IntStream1.map(IntFunction<Integer>)' and 'IntStream1.map(IntUnaryOperator)' match">(null)</error>.boxed(); + System.out.println(si1); + } +} + +class TestInitial { + void fooBar(){ + Supplier<Stream<Integer>> si = () -> IntStream.range(0, 20).map((i) -> ((i % 2) == 0) ? i : -i).boxed(); + System.out.println(si); + } +} + + diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/PertinentToApplicabilityOfExplicitlyTypedLambda.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/PertinentToApplicabilityOfExplicitlyTypedLambda.java new file mode 100644 index 000000000000..348108fc3443 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/PertinentToApplicabilityOfExplicitlyTypedLambda.java @@ -0,0 +1,17 @@ +abstract class PertinentToApplicabilityOfExplicitlyTypedLambdaTest { + + interface A { + B m(int a); + } + + interface B { + int m(int b); + } + + abstract void foo(A a); + abstract void foo(B b); + + { + foo<error descr="Ambiguous method call: both 'PertinentToApplicabilityOfExplicitlyTypedLambdaTest.foo(A)' and 'PertinentToApplicabilityOfExplicitlyTypedLambdaTest.foo(B)' match">(x -> y -> 42)</error>; + } +} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/VoidValueCompatibilityOfImplicitlyTypedLambda.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/VoidValueCompatibilityOfImplicitlyTypedLambda.java new file mode 100644 index 000000000000..1188a9584dca --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/VoidValueCompatibilityOfImplicitlyTypedLambda.java @@ -0,0 +1,23 @@ +interface A { + int m(int x); +} + +interface B { + void m(boolean x); +} + +abstract class Test { + abstract void foo(A j); + abstract void foo(B i); + + void bar(Object o) { + foo(x -> { + return x += 1; + }); + foo(x -> <error descr="Incompatible types. Found: 'int', required: '<lambda parameter>'">x += 1</error>); + foo(x -> 1); + foo(x -> <error descr="Operator '!' cannot be applied to 'int'">!x</error>); + foo(x -> <error descr="Operator '++' cannot be applied to '<lambda parameter>'">++x</error>); + foo(x -> o instanceof String ? 1 : 0); + } +} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeMethodSignatureFromUsage8/afterDisjunctionType.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeMethodSignatureFromUsage8/afterDisjunctionType.java new file mode 100644 index 000000000000..7835cfb40ae9 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeMethodSignatureFromUsage8/afterDisjunctionType.java @@ -0,0 +1,15 @@ +// "Add 'Exception' as 1st parameter to method 'f'" "true" +import java.io.FileInputStream; +import java.io.IOException; + +class Test { + public void createFileInputStream() { + try { + new FileInputStream("test"); + } catch (IOException |NullPointerException e) { + f(e); + } + } + + public void f(Exception e) { } +} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeMethodSignatureFromUsage8/beforeDisjunctionType.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeMethodSignatureFromUsage8/beforeDisjunctionType.java new file mode 100644 index 000000000000..ab28d7484f4d --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeMethodSignatureFromUsage8/beforeDisjunctionType.java @@ -0,0 +1,15 @@ +// "Add 'Exception' as 1st parameter to method 'f'" "true" +import java.io.FileInputStream; +import java.io.IOException; + +class Test { + public void createFileInputStream() { + try { + new FileInputStream("test"); + } catch (IOException |NullPointerException e) { + f(<caret>e); + } + } + + public void f() { } +} diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambdaCodeBlock2Expr/afterVoidValueChangedNoConflict.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambdaCodeBlock2Expr/afterVoidValueChangedNoConflict.java new file mode 100644 index 000000000000..295537651974 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambdaCodeBlock2Expr/afterVoidValueChangedNoConflict.java @@ -0,0 +1,16 @@ +// "Replace with expression lambda" "true" +class Test { + { + a(() -> new Object(){}); + } + + void a(Supplier<Object> s) {} + void a(AI<Object> s) {} + + interface AI<K> { + void m(); + } + interface Supplier<T> { + T get(); + } +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambdaCodeBlock2Expr/beforeVoidValueChanged.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambdaCodeBlock2Expr/beforeVoidValueChanged.java new file mode 100644 index 000000000000..20a6c0beac73 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambdaCodeBlock2Expr/beforeVoidValueChanged.java @@ -0,0 +1,19 @@ +// "Replace with expression lambda" "false" +interface A { + int m(int x); +} + +interface B { + void m(boolean x); +} + +abstract class X { + abstract void foo(A j); + abstract void foo(B i); + + void bar(Object o) { + foo(x -> { + retu<caret>rn x += 1; + }); + } +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambdaCodeBlock2Expr/beforeVoidValueChangedNoConflict.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambdaCodeBlock2Expr/beforeVoidValueChangedNoConflict.java new file mode 100644 index 000000000000..fbbf7ff5f527 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambdaCodeBlock2Expr/beforeVoidValueChangedNoConflict.java @@ -0,0 +1,18 @@ +// "Replace with expression lambda" "true" +class Test { + { + a(() -> { + ret<caret>urn new Object(){}; + }); + } + + void a(Supplier<Object> s) {} + void a(AI<Object> s) {} + + interface AI<K> { + void m(); + } + interface Supplier<T> { + T get(); + } +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java/SurroundWithTryFinallyUsingIndents.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java/SurroundWithTryFinallyUsingIndents.java new file mode 100644 index 000000000000..c491a29b3380 --- /dev/null +++ b/java/java-tests/testData/codeInsight/generation/surroundWith/java/SurroundWithTryFinallyUsingIndents.java @@ -0,0 +1,5 @@ +class Test { + void test() { + <selection> int a = 2;</selection> + } +} diff --git a/java/java-tests/testData/codeInsight/generation/surroundWith/java/SurroundWithTryFinallyUsingIndents_after.java b/java/java-tests/testData/codeInsight/generation/surroundWith/java/SurroundWithTryFinallyUsingIndents_after.java new file mode 100644 index 000000000000..a3887076e98f --- /dev/null +++ b/java/java-tests/testData/codeInsight/generation/surroundWith/java/SurroundWithTryFinallyUsingIndents_after.java @@ -0,0 +1,9 @@ +class Test { + void test() { + try { + int a = 2; + } finally { + <caret> + } + } +} diff --git a/java/java-tests/testData/codeInsight/javadocIG/clickableFieldReference.html b/java/java-tests/testData/codeInsight/javadocIG/clickableFieldReference.html new file mode 100644 index 000000000000..28602edf96e3 --- /dev/null +++ b/java/java-tests/testData/codeInsight/javadocIG/clickableFieldReference.html @@ -0,0 +1,3 @@ +<html><head> <style type="text/css"> #error { background-color: #eeeeee; margin-bottom: 10px; } p { margin: 5px 0; } </style></head><body><PRE>@<a href="psi_element://Bar"><code>Bar</code></a>(<a href="psi_element://Baz#CONST"><code>Baz.CONST</code></a> value = {<a href="psi_element://Baz#CONST"><code>Baz.CONST</code></a>}) +class <b>Foo</b> +extends <a href="psi_element://java.lang.Object"><code>Object</code></a></PRE></body></html>
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/javadocIG/clickableFieldReference.java b/java/java-tests/testData/codeInsight/javadocIG/clickableFieldReference.java new file mode 100644 index 000000000000..3f46d7e1d7ec --- /dev/null +++ b/java/java-tests/testData/codeInsight/javadocIG/clickableFieldReference.java @@ -0,0 +1,7 @@ +import java.lang.annotation.Documented; +class Text { Foo foo; } +@Bar(Baz.CONST, value = {Baz.CONST}) class Foo {} +@Documented @interface Bar {} +class Baz { + static int CONST; +}
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/javadocIG/enumConstantOrdinal.html b/java/java-tests/testData/codeInsight/javadocIG/enumConstantOrdinal.html index 11d610085775..613de9167782 100644 --- a/java/java-tests/testData/codeInsight/javadocIG/enumConstantOrdinal.html +++ b/java/java-tests/testData/codeInsight/javadocIG/enumConstantOrdinal.html @@ -1,3 +1,2 @@ -E - E A -Enum constant ordinal: 0
\ No newline at end of file +<html><head> <style type="text/css"> #error { background-color: #eeeeee; margin-bottom: 10px; } p { margin: 5px 0; } </style></head><body><small><b><a href="psi_element://E"><code>E</code></a></b></small><PRE><a href="psi_element://E"><code>E</code></a> <b>A +Enum constant ordinal: 0</b></PRE></body></html>
\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/javadocIG/enumConstantOrdinal_quick.html b/java/java-tests/testData/codeInsight/javadocIG/enumConstantOrdinal_quick.html new file mode 100644 index 000000000000..11d610085775 --- /dev/null +++ b/java/java-tests/testData/codeInsight/javadocIG/enumConstantOrdinal_quick.html @@ -0,0 +1,3 @@ +E + E A +Enum constant ordinal: 0
\ No newline at end of file diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/awt/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/awt/annotations.xml index 2e75eb0e3c6c..68bc4c8bba79 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/awt/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/awt/annotations.xml @@ -132,15 +132,32 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""_,null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.awt.Component java.awt.Color getBackground()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.awt.Component java.awt.Color getForeground()"> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.awt.Component java.awt.Component findUnderMouseInWindow(java.awt.PointerInfo)"> <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.awt.Component java.awt.Component getComponentAt(int, int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.awt.Component java.awt.Component getComponentAt(java.awt.Point) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.awt.Component java.awt.Component getComponentAt(java.awt.Point)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.awt.Component java.awt.Component locate(int, int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.awt.Component java.awt.Dimension getMaximumSize()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -161,6 +178,24 @@ <item name="java.awt.Component java.awt.Dimension size()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.awt.Component java.awt.Font getFont()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.awt.Component java.awt.Font getFont_NoClientCode()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.awt.Component java.awt.Graphics getGraphics()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.awt.Component java.awt.GraphicsConfiguration getGraphicsConfiguration()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.awt.Component java.awt.Image createImage(int, int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.awt.Component java.awt.Image getBackBuffer()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.awt.Component java.awt.Point getLocation(java.awt.Point) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -169,6 +204,9 @@ <val val=""!null->!null;null->!null""/> </annotation> </item> + <item name="java.awt.Component java.awt.Point getMousePosition()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.awt.Component java.awt.Point location()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -194,9 +232,24 @@ <val val=""null->null""/> </annotation> </item> + <item name="java.awt.Component java.awt.im.InputContext getInputContext()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.awt.Component java.awt.im.InputMethodRequests getInputMethodRequests()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.awt.Component java.awt.image.VolatileImage createVolatileImage(int, int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.awt.Component java.awt.image.VolatileImage createVolatileImage(int, int, java.awt.ImageCapabilities) 2"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="java.awt.Component java.awt.image.VolatileImage createVolatileImage(int, int, java.awt.ImageCapabilities)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.awt.Component java.lang.String constructComponentName()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.awt.Component java.lang.String paramString()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -369,21 +422,57 @@ <val val=""_,!null->!null;_,null->null""/> </annotation> </item> + <item name="java.awt.Container java.awt.Component findComponentAt(int, int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.awt.Container java.awt.Component findComponentAt(int, int, boolean)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.awt.Container java.awt.Component findComponentAt(java.awt.Point) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.awt.Container java.awt.Component findComponentAt(java.awt.Point)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.awt.Container java.awt.Component findComponentAtImpl(int, int, boolean)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.awt.Container java.awt.Component getComponentAt(int, int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.awt.Container java.awt.Component getComponentAt(java.awt.Point) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.awt.Container java.awt.Component getComponentAt(java.awt.Point)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.awt.Container java.awt.Component getMouseEventTargetImpl(int, int, boolean, java.awt.Container.EventTargetFilter, boolean, boolean)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.awt.Container java.awt.Component locate(int, int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.awt.Container java.awt.Component[] getComponents()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> <item name="java.awt.Container java.awt.Component[] getComponents_NoClientCode()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.awt.Container java.awt.FocusTraversalPolicy getFocusTraversalPolicy()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.awt.Container java.awt.Point getMousePosition(boolean)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.awt.Container java.lang.String paramString()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.awt.Container javax.accessibility.Accessible getAccessibleAt(java.awt.Point)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.awt.Container javax.accessibility.Accessible getAccessibleChild(int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.awt.Container void addContainerListener(java.awt.event.ContainerListener) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -504,6 +593,15 @@ <val val=""null->false""/> </annotation> </item> + <item name="java.awt.Window java.awt.Component getFocusOwner()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.awt.Window java.awt.Component getMostRecentFocusOwner()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.awt.Window java.awt.Container getFocusCycleRootAncestor()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.awt.Window java.lang.Object access$000(java.awt.Window) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/beans/beancontext/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/beans/beancontext/annotations.xml index ce4e092e389f..19cfde133b6b 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/beans/beancontext/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/beans/beancontext/annotations.xml @@ -12,6 +12,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.beans.beancontext.BeanContextServicesSupport java.beans.beancontext.BeanContextServicesSupport.BCSSServiceProvider createBCSSServiceProvider(java.lang.Class, java.beans.beancontext.BeanContextServiceProvider)"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -31,9 +32,15 @@ <item name="java.beans.beancontext.BeanContextServicesSupport java.lang.Object getService(java.beans.beancontext.BeanContextChild, java.lang.Object, java.lang.Class, java.lang.Object, java.beans.beancontext.BeanContextServiceRevokedListener) 4"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.beans.beancontext.BeanContextServicesSupport java.lang.Object getService(java.beans.beancontext.BeanContextChild, java.lang.Object, java.lang.Class, java.lang.Object, java.beans.beancontext.BeanContextServiceRevokedListener)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.beans.beancontext.BeanContextServicesSupport java.util.Iterator getCurrentServiceClasses()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.beans.beancontext.BeanContextServicesSupport java.util.Iterator getCurrentServiceSelectors(java.lang.Class)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.beans.beancontext.BeanContextServicesSupport void addBeanContextServicesListener(java.beans.beancontext.BeanContextServicesListener) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/io/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/io/annotations.xml index 521adcf48636..4bc566ac9261 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/io/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/io/annotations.xml @@ -11,6 +11,12 @@ <item name="java.io.BufferedReader int read(char[], int, int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.io.BufferedReader java.lang.String readLine()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.io.BufferedReader java.lang.String readLine(boolean)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.io.BufferedWriter BufferedWriter(java.io.Writer) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -50,6 +56,9 @@ <item name="java.io.DataInputStream int read(byte[]) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.io.DataInputStream java.lang.String readLine()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.io.DataInputStream java.lang.String readUTF()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -133,15 +142,30 @@ <item name="java.io.File java.io.File getCanonicalFile()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.io.File java.io.File getParentFile()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.io.File java.io.File[] listFiles()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.io.File java.io.File[] listFiles(java.io.FileFilter) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="java.io.File java.io.File[] listFiles(java.io.FileFilter)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.io.File java.io.File[] listFiles(java.io.FilenameFilter) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="java.io.File java.io.File[] listFiles(java.io.FilenameFilter)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.io.File java.lang.String getName()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.io.File java.lang.String getParent()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.io.File java.lang.String slashify(java.lang.String, boolean) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -270,9 +294,33 @@ <item name="java.io.ObjectInputStream java.lang.Class resolveProxyClass(java.lang.String[]) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.io.ObjectInputStream java.lang.Enum readEnum(boolean)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.io.ObjectInputStream java.lang.Object access$300(java.io.ObjectInputStream, boolean) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.io.ObjectInputStream java.lang.Object access$300(java.io.ObjectInputStream, boolean)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.io.ObjectInputStream java.lang.Object readArray(boolean)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.io.ObjectInputStream java.lang.Object readNull()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.io.ObjectInputStream java.lang.Object readObject()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.io.ObjectInputStream java.lang.Object readObject0(boolean)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.io.ObjectInputStream java.lang.Object readObjectOverride()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.io.ObjectInputStream java.lang.Object readUnshared()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.io.ObjectInputStream java.lang.Object resolveObject(java.lang.Object)"> <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->!null;null->null""/> @@ -466,6 +514,9 @@ <item name="java.io.RandomAccessFile int read(byte[]) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.io.RandomAccessFile java.lang.String readLine()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.io.RandomAccessFile java.lang.String readUTF()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/lang/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/lang/annotations.xml index 4862b313a917..00ee3b5c3075 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/lang/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/lang/annotations.xml @@ -250,6 +250,15 @@ <val val=""!null->!null;null->null""/> </annotation> </item> + <item name="java.lang.Class T newInstance()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.lang.Class T newInstance0()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.lang.Class T[] getEnumConstants()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.Class boolean access$100(java.lang.Object[], java.lang.Object[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -275,6 +284,9 @@ <item name="java.lang.Class boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.Class java.io.InputStream getResourceAsStream(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.Class java.lang.Class toClass(java.lang.reflect.Type)"> <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> @@ -286,12 +298,24 @@ <item name="java.lang.Class java.lang.Class<? extends U> asSubclass(java.lang.Class<U>)"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.Class java.lang.Class.EnclosingMethodInfo getEnclosingMethodInfo()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.lang.Class java.lang.ClassLoader getClassLoader()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.Class java.lang.String argumentTypesToString(java.lang.Class[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.lang.Class java.lang.String argumentTypesToString(java.lang.Class[])"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.Class java.lang.String getCanonicalName()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.lang.Class java.lang.String getSimpleBinaryName()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.Class java.lang.String getSimpleName()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -303,6 +327,9 @@ <item name="java.lang.Class java.lang.String toString()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.Class java.lang.reflect.Constructor<?> getEnclosingConstructor()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.Class java.lang.reflect.Constructor<T> getConstructor(java.lang.Class...) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -324,12 +351,18 @@ <item name="java.lang.Class java.lang.reflect.Field getField0(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.Class java.lang.reflect.Field getField0(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.Class java.lang.reflect.Field searchFields(java.lang.reflect.Field[], java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> <item name="java.lang.Class java.lang.reflect.Field searchFields(java.lang.reflect.Field[], java.lang.String) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.Class java.lang.reflect.Field searchFields(java.lang.reflect.Field[], java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.Class java.lang.reflect.Field[] copyFields(java.lang.reflect.Field[]) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -342,12 +375,18 @@ <item name="java.lang.Class java.lang.reflect.Method getDeclaredMethod(java.lang.String, java.lang.Class...) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="java.lang.Class java.lang.reflect.Method getEnclosingMethod()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.Class java.lang.reflect.Method getMethod(java.lang.String, java.lang.Class...) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> <item name="java.lang.Class java.lang.reflect.Method getMethod0(java.lang.String, java.lang.Class[]) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.Class java.lang.reflect.Method getMethod0(java.lang.String, java.lang.Class[])"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.Class java.lang.reflect.Method searchMethods(java.lang.reflect.Method[], java.lang.String, java.lang.Class[]) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -360,6 +399,12 @@ <item name="java.lang.Class java.lang.reflect.Method[] copyMethods(java.lang.reflect.Method[]) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.Class java.lang.reflect.Type getGenericSuperclass()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.lang.Class java.net.URL getResource(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.Class void addAll(java.util.Collection, java.lang.reflect.Field[]) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -380,6 +425,21 @@ <val val=""_,null->false""/> </annotation> </item> + <item name="java.lang.ClassLoader java.io.InputStream getResourceAsStream(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.lang.ClassLoader java.io.InputStream getSystemResourceAsStream(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.lang.ClassLoader java.lang.ClassLoader getCallerClassLoader()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.lang.ClassLoader java.lang.ClassLoader getParent()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.lang.ClassLoader java.lang.ClassLoader getSystemClassLoader()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.ClassLoader java.lang.Package definePackage(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.net.URL)"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -390,6 +450,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.lang.ClassLoader java.lang.String[] initializePath(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -401,6 +462,16 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.lang.ClassLoader java.net.URL getBootstrapResource(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.lang.ClassLoader java.net.URL getResource(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.lang.ClassLoader java.net.URL getSystemResource(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.lang.ClassLoader java.util.Enumeration findResources(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -1465,6 +1536,12 @@ <item name="java.lang.StringBuilder void writeObject(java.io.ObjectOutputStream) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.System java.io.InputStream nullInputStream()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.lang.System java.io.PrintStream nullPrintStream()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.System java.lang.String clearProperty(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -1486,6 +1563,9 @@ <item name="java.lang.System void setSecurityManager0(java.lang.SecurityManager) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="java.lang.System.1 java.lang.Object run()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.System.2 sun.reflect.ConstantPool getConstantPool(java.lang.Class) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -1525,6 +1605,9 @@ <item name="java.lang.Thread Thread(java.lang.ThreadGroup, java.lang.String) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.Thread java.lang.ClassLoader getContextClassLoader()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.Thread java.lang.String getName()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -1543,6 +1626,15 @@ <item name="java.lang.ThreadLocal T childValue(T) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="java.lang.ThreadLocal T get()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.lang.ThreadLocal T initialValue()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.lang.ThreadLocal T setInitialValue()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.ThreadLocal int access$400(java.lang.ThreadLocal) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -1576,9 +1668,15 @@ <item name="java.lang.ThreadLocal.ThreadLocalMap java.lang.ThreadLocal.ThreadLocalMap.Entry access$000(java.lang.ThreadLocal.ThreadLocalMap, java.lang.ThreadLocal) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.ThreadLocal.ThreadLocalMap java.lang.ThreadLocal.ThreadLocalMap.Entry access$000(java.lang.ThreadLocal.ThreadLocalMap, java.lang.ThreadLocal)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.ThreadLocal.ThreadLocalMap java.lang.ThreadLocal.ThreadLocalMap.Entry getEntry(java.lang.ThreadLocal) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.ThreadLocal.ThreadLocalMap java.lang.ThreadLocal.ThreadLocalMap.Entry getEntry(java.lang.ThreadLocal)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.ThreadLocal.ThreadLocalMap java.lang.ThreadLocal.ThreadLocalMap.Entry getEntryAfterMiss(java.lang.ThreadLocal, int, java.lang.ThreadLocal.ThreadLocalMap.Entry) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -1589,6 +1687,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""_,_,null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.lang.ThreadLocal.ThreadLocalMap void access$100(java.lang.ThreadLocal.ThreadLocalMap, java.lang.ThreadLocal, java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -1608,6 +1707,9 @@ <item name="java.lang.ThreadLocal.ThreadLocalMap void set(java.lang.ThreadLocal, java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.Throwable java.lang.Throwable getCause()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.Throwable java.lang.Throwable initCause(java.lang.Throwable)"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/lang/invoke/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/lang/invoke/annotations.xml index 42a07af318e1..aa3ff596e37d 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/lang/invoke/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/lang/invoke/annotations.xml @@ -118,19 +118,32 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_,_,_->null;_,!null,_,_->null;_,_,_,!null->null;_,_,_,null->null;_,null,_,_->null;null,_,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeCheckCast(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, int, java.lang.Class<?>) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeCheckCast(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, int, java.lang.Class<?>)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeDropArguments(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, int, int) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeDropArguments(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, int, int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeDupArguments(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, int, int) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeDupArguments(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, int, int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makePairwiseConvert(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makePairwiseConvert(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makePermutation(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, int[]) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -144,16 +157,26 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeRetype(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, boolean) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeRetype(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, boolean)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeRetypeOnly(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeRetypeOnly(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeRetypeRaw(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeRetypeRaw(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeRotateArguments(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, int, int, int) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -161,14 +184,19 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeSpreadArguments(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, java.lang.Class<?>, int, int) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeSpreadArguments(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, java.lang.Class<?>, int, int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeSwapArguments(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, int, int)"> <annotation name="org.jetbrains.annotations.Contract"> <val val=""_,null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeUnboxArgument(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, int, java.lang.Class<?>) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -176,6 +204,9 @@ <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeUnboxArgument(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, int, java.lang.Class<?>) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeUnboxArgument(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle, int, java.lang.Class<?>)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.AdapterMethodHandle java.lang.invoke.MethodHandle makeVarargsCollector(java.lang.invoke.MethodHandle, java.lang.Class<?>) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -236,6 +267,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_,_->!null;null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.lang.invoke.BoundMethodHandle java.lang.RuntimeException badBoundArgumentException(java.lang.Object, java.lang.invoke.MethodHandle, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -271,6 +303,9 @@ <item name="java.lang.invoke.CallSite java.lang.invoke.CallSite makeSite(java.lang.invoke.MethodHandle, java.lang.String, java.lang.invoke.MethodType, java.lang.Object, java.lang.invoke.MemberName, int) 4"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.CallSite java.lang.invoke.MethodHandle makeDynamicInvoker()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.CallSite java.lang.invoke.WrongMethodTypeException wrongTargetType(java.lang.invoke.MethodHandle, java.lang.invoke.MethodType) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -328,6 +363,9 @@ <item name="java.lang.invoke.FilterGeneric java.lang.invoke.FilterGeneric.Adapter findAdapter(java.lang.invoke.MethodType, java.lang.invoke.FilterGeneric.Kind, int) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.FilterGeneric java.lang.invoke.FilterGeneric.Adapter findAdapter(java.lang.invoke.MethodType, java.lang.invoke.FilterGeneric.Kind, int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.FilterGeneric java.lang.invoke.FilterGeneric.Adapter getAdapter(java.lang.invoke.FilterGeneric.Kind, int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -389,6 +427,9 @@ <item name="java.lang.invoke.FilterGeneric.Adapter java.lang.Class<? extends java.lang.invoke.FilterGeneric.Adapter> findSubClass(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="java.lang.invoke.FilterGeneric.Adapter java.lang.Class<? extends java.lang.invoke.FilterGeneric.Adapter> findSubClass(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.FilterGeneric.F0 F0(java.lang.invoke.MethodHandle) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -667,6 +708,9 @@ <item name="java.lang.invoke.FromGeneric java.lang.invoke.FromGeneric.Adapter findAdapter(java.lang.invoke.MethodType) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.FromGeneric java.lang.invoke.FromGeneric.Adapter findAdapter(java.lang.invoke.MethodType)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.FromGeneric java.lang.invoke.FromGeneric.Adapter makeInstance(java.lang.invoke.MethodHandle) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -826,6 +870,9 @@ <item name="java.lang.invoke.FromGeneric.Adapter java.lang.Class<? extends java.lang.invoke.FromGeneric.Adapter> findSubClass(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="java.lang.invoke.FromGeneric.Adapter java.lang.Class<? extends java.lang.invoke.FromGeneric.Adapter> findSubClass(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.InvokeGeneric boolean returnConversionNeeded(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -863,6 +910,9 @@ <val val=""null->null""/> </annotation> </item> + <item name="java.lang.invoke.InvokeGeneric java.lang.invoke.MethodHandle makeInitialInvoker()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.Invokers Invokers(java.lang.invoke.MethodType) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -893,6 +943,12 @@ <item name="java.lang.invoke.MemberName int access$200(java.lang.invoke.MemberName) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.MemberName java.lang.Class<?> getFieldType()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.lang.invoke.MemberName java.lang.ClassLoader getClassLoader()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.MemberName java.lang.IllegalAccessException makeAccessException(java.lang.String, java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -913,6 +969,9 @@ <val val=""_,!null->!null;_,null->null""/> </annotation> </item> + <item name="java.lang.invoke.MemberName java.lang.Object getType()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.MemberName java.lang.ReflectiveOperationException makeAccessException(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -930,6 +989,9 @@ <val val=""_,!null->!null;_,null->null""/> </annotation> </item> + <item name="java.lang.invoke.MemberName java.lang.String getName()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.MemberName java.lang.String getName(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -938,12 +1000,21 @@ <val val=""null->!null""/> </annotation> </item> + <item name="java.lang.invoke.MemberName java.lang.String getSignature()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.lang.invoke.MemberName java.lang.invoke.MethodType getMethodType()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.MemberName.Factory boolean resolveInPlace(java.lang.invoke.MemberName, boolean, java.lang.Class<?>) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> <item name="java.lang.invoke.MemberName.Factory java.lang.invoke.MemberName resolveOrNull(java.lang.invoke.MemberName, boolean, java.lang.Class<?>) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.MemberName.Factory java.lang.invoke.MemberName resolveOrNull(java.lang.invoke.MemberName, boolean, java.lang.Class<?>)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.MemberName.Factory java.util.List<java.lang.invoke.MemberName> getMembers(java.lang.Class<?>, java.lang.String, java.lang.Object, int, java.lang.Class<?>) 2"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -1005,10 +1076,14 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle collectArguments(java.lang.invoke.MethodHandle, java.lang.invoke.MethodType, int, java.lang.invoke.MethodHandle) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle collectArguments(java.lang.invoke.MethodHandle, java.lang.invoke.MethodType, int, java.lang.invoke.MethodHandle)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle dropArguments(java.lang.invoke.MethodHandle, java.lang.invoke.MethodType, int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -1030,6 +1105,9 @@ <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle foldArguments(java.lang.invoke.MethodHandle, java.lang.invoke.MethodType, java.lang.invoke.MethodHandle) 2"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle foldArguments(java.lang.invoke.MethodHandle, java.lang.invoke.MethodType, java.lang.invoke.MethodHandle)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle makeAllocator(java.lang.invoke.MethodHandle) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -1039,15 +1117,24 @@ <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle makeGuardWithCatch(java.lang.invoke.MethodHandle, java.lang.Class<? extends java.lang.Throwable>, java.lang.invoke.MethodHandle) 2"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle makeGuardWithCatch(java.lang.invoke.MethodHandle, java.lang.Class<? extends java.lang.Throwable>, java.lang.invoke.MethodHandle)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle makeGuardWithTest(java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle makeGuardWithTest(java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle makeGuardWithTest(java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle spreadArguments(java.lang.invoke.MethodHandle, java.lang.invoke.MethodType, int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.MethodHandleImpl java.lang.invoke.MethodHandle throwException(java.lang.invoke.MethodType)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.MethodHandleImpl sun.invoke.empty.Empty throwException(T) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -1057,6 +1144,9 @@ <item name="java.lang.invoke.MethodHandleImpl.AllocateObject java.lang.invoke.MethodHandle make(java.lang.Class<?>, java.lang.invoke.MethodHandle) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.MethodHandleImpl.AllocateObject java.lang.invoke.MethodHandle make(java.lang.Class<?>, java.lang.invoke.MethodHandle)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.MethodHandleImpl.AllocateObject java.lang.invoke.MethodType makeConType(java.lang.invoke.MethodHandle) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -1093,6 +1183,9 @@ <item name="java.lang.invoke.MethodHandleImpl.FieldAccessor java.lang.Object staticBase(java.lang.invoke.MemberName) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.MethodHandleImpl.FieldAccessor java.lang.Object staticBase(java.lang.invoke.MemberName)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.MethodHandleImpl.FieldAccessor java.lang.String aname(java.lang.Class<?>, boolean) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -1165,6 +1258,9 @@ <item name="java.lang.invoke.MethodHandleImpl.GuardWithTest java.lang.invoke.MethodHandle make(java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.MethodHandleImpl.GuardWithTest java.lang.invoke.MethodHandle make(java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.MethodHandleNatives java.lang.Object[] makeTarget(java.lang.Class<?>, java.lang.String, java.lang.String, int, java.lang.Class<?>)"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -1271,9 +1367,15 @@ <item name="java.lang.invoke.MethodHandles java.lang.Object access$200(java.lang.Object, java.lang.reflect.Method, java.lang.Object[]) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.MethodHandles java.lang.Object access$200(java.lang.Object, java.lang.reflect.Method, java.lang.Object[])"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.MethodHandles java.lang.Object callObjectMethod(java.lang.Object, java.lang.reflect.Method, java.lang.Object[]) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.MethodHandles java.lang.Object callObjectMethod(java.lang.Object, java.lang.reflect.Method, java.lang.Object[])"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.MethodHandles java.lang.RuntimeException misMatchedTypes(java.lang.String, java.lang.invoke.MethodType, java.lang.invoke.MethodType) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -1304,6 +1406,9 @@ <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle catchException(java.lang.invoke.MethodHandle, java.lang.Class<? extends java.lang.Throwable>, java.lang.invoke.MethodHandle) 2"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle catchException(java.lang.invoke.MethodHandle, java.lang.Class<? extends java.lang.Throwable>, java.lang.invoke.MethodHandle)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle collectArguments(java.lang.invoke.MethodHandle, java.lang.invoke.MethodType) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -1350,12 +1455,18 @@ <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle filterReturnValue(java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle filterReturnValue(java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle foldArguments(java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle foldArguments(java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle foldArguments(java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle genericInvoker(java.lang.invoke.MethodType) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -1368,6 +1479,12 @@ <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle guardWithTest(java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle) 2"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle guardWithTest(java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle, java.lang.invoke.MethodHandle)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle identity(java.lang.Class<?>)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle insertArguments(java.lang.invoke.MethodHandle, int, java.lang.Object...) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -1395,6 +1512,9 @@ <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle throwException(java.lang.Class<?>, java.lang.Class<? extends java.lang.Throwable>) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle throwException(java.lang.Class<?>, java.lang.Class<? extends java.lang.Throwable>)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.MethodHandles java.lang.invoke.MethodHandle wrapperInstanceTarget(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -1404,9 +1524,15 @@ <item name="java.lang.invoke.MethodHandles java.lang.reflect.Constructor getSingleConstructor(java.lang.Class<?>) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.MethodHandles java.lang.reflect.Constructor getSingleConstructor(java.lang.Class<?>)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.MethodHandles java.lang.reflect.Method getSingleMethod(java.lang.Class<?>) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.MethodHandles java.lang.reflect.Method getSingleMethod(java.lang.Class<?>)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.MethodHandles sun.invoke.WrapperInstance asWrapperInstance(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -1433,6 +1559,12 @@ <item name="java.lang.invoke.MethodHandles.1 java.lang.Object invoke(java.lang.Object, java.lang.reflect.Method, java.lang.Object[]) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.MethodHandles.1 java.lang.Object invoke(java.lang.Object, java.lang.reflect.Method, java.lang.Object[])"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.lang.invoke.MethodHandles.Lookup java.lang.Class<?> lookupClassOrNull()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.MethodHandles.Lookup java.lang.String accessFailedMessage(java.lang.Class<?>, java.lang.invoke.MemberName) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -1674,10 +1806,14 @@ <item name="java.lang.invoke.MethodTypeForm int[] primsAtEndOrder(java.lang.invoke.MethodType) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.MethodTypeForm int[] primsAtEndOrder(java.lang.invoke.MethodType)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.MethodTypeForm java.lang.Class<?> canonicalize(java.lang.Class<?>, int)"> <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.lang.invoke.MethodTypeForm java.lang.Class<?>[] canonicalizes(java.lang.Class<?>[], int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -1688,6 +1824,9 @@ <item name="java.lang.invoke.MethodTypeForm java.lang.invoke.MethodType canonicalize(java.lang.invoke.MethodType, int, int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.MethodTypeForm java.lang.invoke.MethodType canonicalize(java.lang.invoke.MethodType, int, int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.MethodTypeForm java.lang.invoke.MethodType reorderParameters(java.lang.invoke.MethodType, int[], java.lang.Class<?>[]) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -1747,6 +1886,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""_,null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.lang.invoke.SpreadGeneric.Adapter Adapter(java.lang.invoke.SpreadGeneric, java.lang.invoke.MethodHandle) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -1754,6 +1894,9 @@ <item name="java.lang.invoke.SpreadGeneric.Adapter java.lang.Class<? extends java.lang.invoke.SpreadGeneric.Adapter> findSubClass(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="java.lang.invoke.SpreadGeneric.Adapter java.lang.Class<? extends java.lang.invoke.SpreadGeneric.Adapter> findSubClass(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.SpreadGeneric.S0 S0(java.lang.invoke.SpreadGeneric, java.lang.invoke.MethodHandle) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -1857,6 +2000,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""_,null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.lang.invoke.SwitchPoint void invalidateAll(java.lang.invoke.SwitchPoint[]) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -1873,6 +2017,9 @@ <item name="java.lang.invoke.ToGeneric java.lang.invoke.MethodHandle computeReturnConversion(java.lang.invoke.MethodType, java.lang.invoke.MethodType, boolean) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.ToGeneric java.lang.invoke.MethodHandle computeReturnConversion(java.lang.invoke.MethodType, java.lang.invoke.MethodType, boolean)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.ToGeneric java.lang.invoke.MethodHandle make(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -1886,6 +2033,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.lang.invoke.ToGeneric java.lang.invoke.ToGeneric of(java.lang.invoke.MethodType) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -1896,6 +2044,9 @@ <item name="java.lang.invoke.ToGeneric java.lang.invoke.ToGeneric.Adapter findAdapter(java.lang.invoke.MethodType) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.lang.invoke.ToGeneric java.lang.invoke.ToGeneric.Adapter findAdapter(java.lang.invoke.MethodType)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.ToGeneric java.lang.invoke.ToGeneric.Adapter makeInstance(java.lang.invoke.MethodType, java.lang.invoke.MethodHandle) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -2040,6 +2191,9 @@ <item name="java.lang.invoke.ToGeneric.Adapter java.lang.Class<? extends java.lang.invoke.ToGeneric.Adapter> findSubClass(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="java.lang.invoke.ToGeneric.Adapter java.lang.Class<? extends java.lang.invoke.ToGeneric.Adapter> findSubClass(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.lang.invoke.VolatileCallSite VolatileCallSite(java.lang.invoke.MethodHandle) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/net/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/net/annotations.xml index be6006068f41..5a53068cca3b 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/net/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/net/annotations.xml @@ -41,6 +41,18 @@ <item name="java.net.DatagramSocket DatagramSocket(java.net.SocketAddress) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="java.net.DatagramSocket java.net.InetAddress getLocalAddress()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.net.DatagramSocket java.net.SocketAddress getLocalSocketAddress()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.net.DatagramSocket java.net.SocketAddress getRemoteSocketAddress()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.net.DatagramSocket java.nio.channels.DatagramChannel getChannel()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.net.DatagramSocket void connect(java.net.InetAddress, int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -67,6 +79,9 @@ <val val=""!null->false;null->false""/> </annotation> </item> + <item name="java.net.InetAddress byte[] getAddress()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.net.InetAddress int checkNumericZone(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -74,13 +89,20 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.net.InetAddress java.lang.Object getCachedAddress(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.net.InetAddress java.lang.Object getCachedAddress(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.net.InetAddress java.lang.Object readResolve()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.net.InetAddress java.lang.String getHostAddress()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.net.InetAddress java.lang.String getHostFromNameService(java.net.InetAddress, boolean) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -127,12 +149,21 @@ <item name="java.net.ServerSocket java.lang.String toString()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.net.ServerSocket java.net.InetAddress getInetAddress()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.net.ServerSocket java.net.Socket accept()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.net.ServerSocket java.net.SocketAddress getLocalSocketAddress()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.net.ServerSocket java.net.SocketImpl access$000(java.net.ServerSocket) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.net.ServerSocket java.nio.channels.ServerSocketChannel getChannel()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.net.ServerSocket void implAccept(java.net.Socket) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -163,6 +194,18 @@ <item name="java.net.Socket java.lang.String toString()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.net.Socket java.net.InetAddress getInetAddress()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.net.Socket java.net.SocketAddress getLocalSocketAddress()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.net.Socket java.net.SocketAddress getRemoteSocketAddress()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.net.Socket java.nio.channels.SocketChannel getChannel()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.net.Socket void bind(java.net.SocketAddress) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -572,9 +615,15 @@ <item name="java.net.URLConnection int readBytes(int[], int, java.io.InputStream) 2"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.net.URLConnection java.lang.String getContentEncoding()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.net.URLConnection java.lang.String getContentHandlerPkgPrefixes()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.net.URLConnection java.lang.String getContentType()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.net.URLConnection java.lang.String getDefaultRequestProperty(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -582,6 +631,10 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.net.URLConnection java.lang.String getHeaderField(int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.net.URLConnection java.lang.String getHeaderField(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -590,10 +643,20 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.net.URLConnection java.lang.String getHeaderFieldKey(int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.net.URLConnection java.lang.String getRequestProperty(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.net.URLConnection java.lang.String guessContentTypeFromStream(java.io.InputStream) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.net.URLConnection java.lang.String guessContentTypeFromStream(java.io.InputStream)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.net.URLConnection java.lang.String stripOffParameters(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -601,6 +664,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->!null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.net.URLConnection java.lang.String toString()"> <annotation name="org.jetbrains.annotations.NotNull"/> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/security/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/security/annotations.xml index 597b80fe0d3f..b99175ab871b 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/security/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/security/annotations.xml @@ -45,6 +45,12 @@ <item name="java.security.Provider java.lang.String[] getTypeAndAlgorithm(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.security.Provider java.lang.String[] getTypeAndAlgorithm(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.security.Provider java.security.Provider.Service getService(java.lang.String, java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.security.Provider java.util.Collection values()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -120,6 +126,9 @@ <item name="java.security.Security java.lang.String getAlgorithmProperty(java.lang.String, java.lang.String) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="java.security.Security java.lang.String getAlgorithmProperty(java.lang.String, java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.security.Security java.lang.String getProviderProperty(java.lang.String, java.security.Provider) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -135,9 +144,18 @@ <item name="java.security.Security java.security.Provider[] getProviders(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.security.Security java.security.Provider[] getProviders(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.security.Security java.security.Provider[] getProviders(java.util.Map) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.security.Security java.security.Provider[] getProviders(java.util.Map)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.security.Security java.security.Security.ProviderProperty getProviderProperty(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.security.Security java.util.LinkedHashSet getAllQualifyingCandidates(java.lang.String, java.lang.String, java.security.Provider[]) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/sql/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/sql/annotations.xml index 1938616b2fff..194509a466c5 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/sql/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/sql/annotations.xml @@ -23,6 +23,9 @@ <item name="java.sql.BatchUpdateException BatchUpdateException(java.lang.String, java.lang.String, int[], java.lang.Throwable) 2"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="java.sql.BatchUpdateException int[] getUpdateCounts()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.sql.Date java.lang.String toString()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -89,6 +92,12 @@ <item name="java.sql.DriverManager void setLogWriter(java.io.PrintWriter) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="java.sql.DriverManager.2 java.lang.Object run()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.sql.DriverManager.2 java.lang.Void run()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.sql.SQLException java.util.Iterator<java.lang.Throwable> iterator()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/util/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/util/annotations.xml index 5e73e2012e79..b00729c52c66 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/util/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/util/annotations.xml @@ -61,6 +61,9 @@ <item name="java.util.AbstractMap V get(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="java.util.AbstractMap V get(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.AbstractMap V put(K, V) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -70,6 +73,9 @@ <item name="java.util.AbstractMap V remove(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="java.util.AbstractMap V remove(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.AbstractMap boolean containsKey(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -1101,6 +1107,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.util.Collections.EmptyMap boolean containsKey(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -1172,6 +1179,9 @@ <item name="java.util.Collections.SingletonMap V get(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="java.util.Collections.SingletonMap V get(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.Collections.SingletonMap boolean containsKey(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -1392,6 +1402,9 @@ <item name="java.util.Date int compareTo(java.util.Date) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.util.Date java.lang.Object clone()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.Date long parse(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -1442,13 +1455,23 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.util.HashMap V get(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="java.util.HashMap V get(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.HashMap V put(K, V) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="java.util.HashMap V put(K, V)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.util.HashMap V remove(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.HashMap boolean containsKey(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -1476,6 +1499,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.util.HashMap java.util.Iterator<K> newKeyIterator()"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -1510,15 +1534,24 @@ <item name="java.util.Hashtable V get(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.util.Hashtable V get(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.Hashtable V put(K, V) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> <item name="java.util.Hashtable V put(K, V) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.util.Hashtable V put(K, V)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.Hashtable V remove(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.util.Hashtable V remove(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.Hashtable boolean contains(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -1615,12 +1648,21 @@ <item name="java.util.IdentityHashMap V get(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="java.util.IdentityHashMap V get(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.IdentityHashMap V put(K, V) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="java.util.IdentityHashMap V put(K, V)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.IdentityHashMap V remove(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="java.util.IdentityHashMap V remove(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.IdentityHashMap boolean access$1500(java.util.IdentityHashMap, java.lang.Object, java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -1676,6 +1718,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.util.IdentityHashMap java.lang.Object maskNull(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -1689,6 +1732,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.util.IdentityHashMap java.lang.Object[] access$100(java.util.IdentityHashMap) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -1711,6 +1755,9 @@ <item name="java.util.IdentityHashMap.EntryIterator.Entry Entry(java.util.IdentityHashMap.EntryIterator, int, java.util.IdentityHashMap.1) 2"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="java.util.IdentityHashMap.EntryIterator.Entry K getKey()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.IdentityHashMap.EntryIterator.Entry boolean equals(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -1751,6 +1798,9 @@ <item name="java.util.IdentityHashMap.IdentityHashMapIterator IdentityHashMapIterator(java.util.IdentityHashMap, java.util.IdentityHashMap.1) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="java.util.IdentityHashMap.KeyIterator K next()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.IdentityHashMap.KeyIterator KeyIterator(java.util.IdentityHashMap, java.util.IdentityHashMap.1) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -1835,6 +1885,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""_,null->!null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.util.Locale java.lang.String toLowerCase(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -1944,6 +1995,15 @@ <item name="java.util.TreeMap TreeMap(java.util.SortedMap<K,? extends V>) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.util.TreeMap V get(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.util.TreeMap V put(K, V)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.util.TreeMap V remove(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.TreeMap boolean access$500(java.lang.Object, java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -1997,12 +2057,18 @@ <item name="java.util.TreeMap java.util.TreeMap.Entry access$1100(java.util.TreeMap, java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.util.TreeMap java.util.TreeMap.Entry access$1100(java.util.TreeMap, java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.TreeMap java.util.TreeMap.Entry access$1300(java.util.TreeMap) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> <item name="java.util.TreeMap java.util.TreeMap.Entry access$1400(java.util.TreeMap, java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.util.TreeMap java.util.TreeMap.Entry access$1400(java.util.TreeMap, java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.TreeMap java.util.TreeMap.Entry access$300(java.util.TreeMap) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -2016,10 +2082,26 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""_,null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.util.TreeMap java.util.TreeMap.Entry access$800(java.util.TreeMap, java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.util.TreeMap java.util.TreeMap.Entry access$800(java.util.TreeMap, java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.util.TreeMap java.util.TreeMap.Entry<K,V> buildFromSorted(int, int, int, int, java.util.Iterator, java.io.ObjectInputStream, V)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.util.TreeMap java.util.TreeMap.Entry<K,V> getCeilEntry(K)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.util.TreeMap java.util.TreeMap.Entry<K,V> getEntry(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.util.TreeMap java.util.TreeMap.Entry<K,V> getPrecedingEntry(K)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.TreeMap java.util.TreeMap.Entry<K,V> leftOf(java.util.TreeMap.Entry<K,V>) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -2027,6 +2109,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.util.TreeMap java.util.TreeMap.Entry<K,V> parentOf(java.util.TreeMap.Entry<K,V>) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2035,6 +2118,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.util.TreeMap java.util.TreeMap.Entry<K,V> rightOf(java.util.TreeMap.Entry<K,V>) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2043,6 +2127,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.util.TreeMap java.util.TreeMap.Entry<K,V> successor(java.util.TreeMap.Entry<K,V>) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2051,6 +2136,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="java.util.TreeMap void access$600(java.util.TreeMap, java.util.TreeMap.Entry) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/util/concurrent/locks/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/util/concurrent/locks/annotations.xml index 08c07b4d957f..56dd8599d15d 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/util/concurrent/locks/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/java/util/concurrent/locks/annotations.xml @@ -29,6 +29,12 @@ <item name="java.util.concurrent.locks.AbstractQueuedSynchronizer java.lang.String toString()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.util.concurrent.locks.AbstractQueuedSynchronizer java.lang.Thread fullGetFirstQueuedThread()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="java.util.concurrent.locks.AbstractQueuedSynchronizer java.lang.Thread getFirstQueuedThread()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.concurrent.locks.AbstractQueuedSynchronizer java.util.Collection<java.lang.Thread> getWaitingThreads(java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -83,12 +89,18 @@ <item name="java.util.concurrent.locks.ReentrantLock java.lang.String toString()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.util.concurrent.locks.ReentrantLock java.lang.Thread getOwner()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.concurrent.locks.ReentrantLock java.util.Collection<java.lang.Thread> getWaitingThreads(java.util.concurrent.locks.Condition) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> <item name="java.util.concurrent.locks.ReentrantLock java.util.concurrent.locks.Condition newCondition()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.util.concurrent.locks.ReentrantLock.Sync java.lang.Thread getOwner()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.concurrent.locks.ReentrantLock.Sync java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject newCondition()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -104,6 +116,9 @@ <item name="java.util.concurrent.locks.ReentrantReadWriteLock java.lang.String toString()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.util.concurrent.locks.ReentrantReadWriteLock java.lang.Thread getOwner()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.concurrent.locks.ReentrantReadWriteLock java.util.Collection<java.lang.Thread> getWaitingThreads(java.util.concurrent.locks.Condition) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -119,6 +134,9 @@ <item name="java.util.concurrent.locks.ReentrantReadWriteLock.Sync java.lang.IllegalMonitorStateException unmatchedUnlockException()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="java.util.concurrent.locks.ReentrantReadWriteLock.Sync java.lang.Thread getOwner()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="java.util.concurrent.locks.ReentrantReadWriteLock.Sync java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject newCondition()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/javax/swing/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/javax/swing/annotations.xml index 910842a47153..80dbfdb022ed 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/javax/swing/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/javax/swing/annotations.xml @@ -5,9 +5,15 @@ <item name="javax.swing.AbstractButton boolean isListener(java.lang.Class, java.awt.event.ActionListener) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="javax.swing.AbstractButton java.awt.Insets getMargin()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="javax.swing.AbstractButton java.beans.PropertyChangeListener createActionPropertyChangeListener(javax.swing.Action)"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="javax.swing.AbstractButton java.lang.Object[] getSelectedObjects()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="javax.swing.AbstractButton java.lang.String paramString()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -63,6 +69,9 @@ <item name="javax.swing.JComponent byte getWriteObjCounter(javax.swing.JComponent) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="javax.swing.JComponent java.awt.Container getTopLevelAncestor()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="javax.swing.JComponent java.awt.Dimension getSize(java.awt.Dimension) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -94,6 +103,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="javax.swing.JComponent java.awt.Point getToolTipLocation(java.awt.event.MouseEvent) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -102,6 +112,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="javax.swing.JComponent java.awt.Rectangle getBounds(java.awt.Rectangle) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -114,6 +125,12 @@ <item name="javax.swing.JComponent java.awt.Rectangle getVisibleRect()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="javax.swing.JComponent java.awt.event.ActionListener getActionForKeyStroke(javax.swing.KeyStroke)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="javax.swing.JComponent java.lang.Object getClientProperty(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="javax.swing.JComponent java.lang.String getToolTipText(java.awt.event.MouseEvent) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -123,6 +140,27 @@ <item name="javax.swing.JComponent java.lang.String paramString()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="javax.swing.JComponent javax.swing.ActionMap getActionMap()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="javax.swing.JComponent javax.swing.ActionMap getActionMap(boolean)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="javax.swing.JComponent javax.swing.InputMap getInputMap()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="javax.swing.JComponent javax.swing.InputMap getInputMap(int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="javax.swing.JComponent javax.swing.InputMap getInputMap(int, boolean)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="javax.swing.JComponent javax.swing.JPopupMenu getPopupMenu()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="javax.swing.JComponent javax.swing.JRootPane getRootPane()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="javax.swing.JComponent javax.swing.JToolTip createToolTip()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -178,10 +216,20 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="javax.swing.JComponent.AccessibleJComponent java.lang.String getTitledBorderText()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="javax.swing.JComponent.AccessibleJComponent java.lang.String getToolTipText()"> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="javax.swing.JComponent.AccessibleJComponent javax.accessibility.AccessibleExtendedComponent getAccessibleExtendedComponent()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="javax.swing.JComponent.AccessibleJComponent javax.accessibility.AccessibleKeyBinding getAccessibleKeyBinding()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="javax.swing.JComponent.AccessibleJComponent javax.swing.JComponent access$100(javax.swing.JComponent.AccessibleJComponent) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -245,6 +293,9 @@ <item name="javax.swing.JScrollPane java.awt.Component getCorner(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="javax.swing.JScrollPane java.awt.Component getCorner(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="javax.swing.JScrollPane java.awt.Rectangle getViewportBorderBounds()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -343,6 +394,9 @@ <item name="javax.swing.JTable javax.swing.table.JTableHeader createDefaultTableHeader()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="javax.swing.JTable javax.swing.table.TableCellEditor getCellEditor(int, int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="javax.swing.JTable javax.swing.table.TableCellEditor getDefaultEditor(java.lang.Class) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -350,6 +404,10 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="javax.swing.JTable javax.swing.table.TableCellRenderer getCellRenderer(int, int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="javax.swing.JTable javax.swing.table.TableCellRenderer getDefaultRenderer(java.lang.Class) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -358,6 +416,10 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="javax.swing.JTable javax.swing.table.TableColumn getResizingColumn()"> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="javax.swing.JTable javax.swing.table.TableColumnModel createDefaultColumnModel()"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -521,12 +583,21 @@ <item name="javax.swing.SwingUtilities java.awt.Component findFocusOwner(java.awt.Component) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="javax.swing.SwingUtilities java.awt.Component findFocusOwner(java.awt.Component)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="javax.swing.SwingUtilities java.awt.Component getDeepestComponentAt(java.awt.Component, int, int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="javax.swing.SwingUtilities java.awt.Component getDeepestComponentAt(java.awt.Component, int, int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="javax.swing.SwingUtilities java.awt.Component getRoot(java.awt.Component) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="javax.swing.SwingUtilities java.awt.Component getRoot(java.awt.Component)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="javax.swing.SwingUtilities java.awt.Container getAncestorNamed(java.lang.String, java.awt.Component) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -537,6 +608,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""_,null->null;null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="javax.swing.SwingUtilities java.awt.Container getAncestorOfClass(java.lang.Class, java.awt.Component) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -548,6 +620,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""_,null->null;null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="javax.swing.SwingUtilities java.awt.Point convertPoint(java.awt.Component, int, int, java.awt.Component)"> <annotation name="org.jetbrains.annotations.Contract"> @@ -575,6 +648,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="javax.swing.SwingUtilities java.awt.Rectangle computeIntersection(int, int, int, int, java.awt.Rectangle) 4"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -613,9 +687,15 @@ <item name="javax.swing.SwingUtilities java.awt.Window getWindowAncestor(java.awt.Component) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="javax.swing.SwingUtilities java.awt.Window getWindowAncestor(java.awt.Component)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="javax.swing.SwingUtilities java.awt.Window windowForComponent(java.awt.Component) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="javax.swing.SwingUtilities java.awt.Window windowForComponent(java.awt.Component)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="javax.swing.SwingUtilities java.awt.event.MouseEvent convertMouseEvent(java.awt.Component, java.awt.event.MouseEvent, java.awt.Component) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -686,6 +766,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="javax.swing.SwingUtilities javax.accessibility.Accessible getAccessibleChild(java.awt.Component, int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -696,12 +777,18 @@ <item name="javax.swing.SwingUtilities javax.swing.ActionMap getUIActionMap(javax.swing.JComponent) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="javax.swing.SwingUtilities javax.swing.ActionMap getUIActionMap(javax.swing.JComponent)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="javax.swing.SwingUtilities javax.swing.CellRendererPane getCellRendererPane(java.awt.Component, java.awt.Container) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> <item name="javax.swing.SwingUtilities javax.swing.InputMap getUIInputMap(javax.swing.JComponent, int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="javax.swing.SwingUtilities javax.swing.InputMap getUIInputMap(javax.swing.JComponent, int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="javax.swing.SwingUtilities javax.swing.JRootPane getRootPane(java.awt.Component) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -709,6 +796,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="javax.swing.SwingUtilities void convertPointFromScreen(java.awt.Point, java.awt.Component) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/collections/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/collections/annotations.xml index 89a90c53dae2..2cce3e65d8e3 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/collections/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/collections/annotations.xml @@ -20,6 +20,15 @@ <item name="org.apache.commons.collections.ExtendedProperties java.lang.String escape(java.lang.String)"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.collections.ExtendedProperties java.lang.String getString(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.commons.collections.ExtendedProperties java.lang.String getString(java.lang.String, java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.commons.collections.ExtendedProperties java.lang.String interpolate(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.collections.ExtendedProperties java.lang.String interpolateHelper(java.lang.String, java.util.List) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -27,10 +36,14 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_->!null;null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.collections.ExtendedProperties java.lang.String testBoolean(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.collections.ExtendedProperties java.lang.String testBoolean(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.collections.ExtendedProperties java.lang.String unescape(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -40,6 +53,9 @@ <item name="org.apache.commons.collections.ExtendedProperties org.apache.commons.collections.ExtendedProperties convertProperties(java.util.Properties) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.collections.ExtendedProperties org.apache.commons.collections.ExtendedProperties subset(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.collections.ExtendedProperties void combine(org.apache.commons.collections.ExtendedProperties) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -52,6 +68,9 @@ <item name="org.apache.commons.collections.ExtendedProperties void setInclude(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.collections.ExtendedProperties.PropertiesReader java.lang.String readProperty()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.collections.ExtendedProperties.PropertiesTokenizer java.lang.String nextToken()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/collections/map/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/collections/map/annotations.xml index bd99ae8b862d..57a09af56b91 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/collections/map/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/collections/map/annotations.xml @@ -24,6 +24,9 @@ <item name="org.apache.commons.collections.map.AbstractHashedMap int hash(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.collections.map.AbstractHashedMap java.lang.Object clone()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.collections.map.AbstractHashedMap java.lang.Object convertKey(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -38,6 +41,15 @@ <item name="org.apache.commons.collections.map.AbstractHashedMap java.lang.Object entryValue(org.apache.commons.collections.map.AbstractHashedMap.HashEntry) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.collections.map.AbstractHashedMap java.lang.Object get(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.commons.collections.map.AbstractHashedMap java.lang.Object put(java.lang.Object, java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.commons.collections.map.AbstractHashedMap java.lang.Object remove(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.collections.map.AbstractHashedMap java.lang.String toString()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -47,6 +59,9 @@ <item name="org.apache.commons.collections.map.AbstractHashedMap org.apache.commons.collections.map.AbstractHashedMap.HashEntry entryNext(org.apache.commons.collections.map.AbstractHashedMap.HashEntry) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.collections.map.AbstractHashedMap org.apache.commons.collections.map.AbstractHashedMap.HashEntry getEntry(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.collections.map.AbstractHashedMap void destroyEntry(org.apache.commons.collections.map.AbstractHashedMap.HashEntry) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -93,6 +108,9 @@ <item name="org.apache.commons.collections.map.AbstractHashedMap.HashEntry boolean equals(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.collections.map.AbstractHashedMap.HashEntry java.lang.Object getKey()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.collections.map.AbstractHashedMap.HashEntry java.lang.String toString()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -117,6 +135,12 @@ <item name="org.apache.commons.collections.map.AbstractLinkedMap boolean containsValue(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.collections.map.AbstractLinkedMap java.lang.Object nextKey(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.commons.collections.map.AbstractLinkedMap java.lang.Object previousKey(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.collections.map.AbstractLinkedMap org.apache.commons.collections.map.AbstractHashedMap.HashEntry createEntry(org.apache.commons.collections.map.AbstractHashedMap.HashEntry, int, java.lang.Object, java.lang.Object)"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -167,6 +191,9 @@ <val val=""!null->true;null->true""/> </annotation> </item> + <item name="org.apache.commons.collections.map.LRUMap java.lang.Object get(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.collections.map.LRUMap void doReadObject(java.io.ObjectInputStream) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/annotations.xml index 7115dfb72473..e825ad4c8fa7 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/annotations.xml @@ -161,6 +161,9 @@ <item name="org.apache.commons.lang.ArrayUtils boolean[] addAll(boolean[], boolean[]) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.lang.ArrayUtils boolean[] addAll(boolean[], boolean[])"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.ArrayUtils boolean[] clone(boolean[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -168,10 +171,14 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils boolean[] remove(boolean[], int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.lang.ArrayUtils boolean[] removeElement(boolean[], boolean)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.ArrayUtils boolean[] subarray(boolean[], int, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -179,6 +186,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils boolean[] toPrimitive(java.lang.Boolean[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -187,6 +195,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils boolean[] toPrimitive(java.lang.Boolean[], boolean) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -195,6 +204,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils byte[] add(byte[], byte) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -205,6 +215,9 @@ <item name="org.apache.commons.lang.ArrayUtils byte[] addAll(byte[], byte[]) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.lang.ArrayUtils byte[] addAll(byte[], byte[])"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.ArrayUtils byte[] clone(byte[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -212,10 +225,14 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils byte[] remove(byte[], int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.lang.ArrayUtils byte[] removeElement(byte[], byte)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.ArrayUtils byte[] subarray(byte[], int, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -223,6 +240,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils byte[] toPrimitive(java.lang.Byte[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -231,6 +249,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils byte[] toPrimitive(java.lang.Byte[], byte) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -239,6 +258,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils char[] add(char[], char) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -249,6 +269,9 @@ <item name="org.apache.commons.lang.ArrayUtils char[] addAll(char[], char[]) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.lang.ArrayUtils char[] addAll(char[], char[])"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.ArrayUtils char[] clone(char[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -256,10 +279,14 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils char[] remove(char[], int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.lang.ArrayUtils char[] removeElement(char[], char)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.ArrayUtils char[] subarray(char[], int, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -267,6 +294,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils char[] toPrimitive(java.lang.Character[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -275,6 +303,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils char[] toPrimitive(java.lang.Character[], char) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -283,6 +312,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils double[] add(double[], double) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -293,6 +323,9 @@ <item name="org.apache.commons.lang.ArrayUtils double[] addAll(double[], double[]) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.lang.ArrayUtils double[] addAll(double[], double[])"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.ArrayUtils double[] clone(double[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -300,10 +333,14 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils double[] remove(double[], int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.lang.ArrayUtils double[] removeElement(double[], double)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.ArrayUtils double[] subarray(double[], int, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -311,6 +348,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils double[] toPrimitive(java.lang.Double[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -319,6 +357,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils double[] toPrimitive(java.lang.Double[], double) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -327,6 +366,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils float[] add(float[], float) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -337,6 +377,9 @@ <item name="org.apache.commons.lang.ArrayUtils float[] addAll(float[], float[]) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.lang.ArrayUtils float[] addAll(float[], float[])"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.ArrayUtils float[] clone(float[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -344,10 +387,14 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils float[] remove(float[], int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.lang.ArrayUtils float[] removeElement(float[], float)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.ArrayUtils float[] subarray(float[], int, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -355,6 +402,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils float[] toPrimitive(java.lang.Float[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -363,6 +411,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils float[] toPrimitive(java.lang.Float[], float) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -371,6 +420,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils int getLength(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -468,6 +518,9 @@ <item name="org.apache.commons.lang.ArrayUtils int[] addAll(int[], int[]) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.lang.ArrayUtils int[] addAll(int[], int[])"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.ArrayUtils int[] clone(int[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -475,10 +528,14 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils int[] remove(int[], int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.lang.ArrayUtils int[] removeElement(int[], int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.ArrayUtils int[] subarray(int[], int, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -486,6 +543,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils int[] toPrimitive(java.lang.Integer[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -494,6 +552,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils int[] toPrimitive(java.lang.Integer[], int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -502,6 +561,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils java.lang.Boolean[] toObject(boolean[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -510,6 +570,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils java.lang.Byte[] toObject(byte[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -518,6 +579,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils java.lang.Character[] toObject(char[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -526,6 +588,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils java.lang.Double[] toObject(double[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -534,6 +597,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils java.lang.Float[] toObject(float[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -542,6 +606,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils java.lang.Integer[] toObject(int[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -550,6 +615,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils java.lang.Long[] toObject(long[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -558,6 +624,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils java.lang.Object copyArrayGrow1(java.lang.Object, java.lang.Class) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -574,6 +641,9 @@ <item name="org.apache.commons.lang.ArrayUtils java.lang.Object[] addAll(java.lang.Object[], java.lang.Object[]) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.lang.ArrayUtils java.lang.Object[] addAll(java.lang.Object[], java.lang.Object[])"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.ArrayUtils java.lang.Object[] clone(java.lang.Object[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -581,6 +651,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils java.lang.Object[] remove(java.lang.Object[], int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -588,6 +659,9 @@ <item name="org.apache.commons.lang.ArrayUtils java.lang.Object[] removeElement(java.lang.Object[], java.lang.Object) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.lang.ArrayUtils java.lang.Object[] removeElement(java.lang.Object[], java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.ArrayUtils java.lang.Object[] subarray(java.lang.Object[], int, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -595,6 +669,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils java.lang.Short[] toObject(short[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -603,6 +678,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils java.lang.String toString(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -617,6 +693,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils long[] add(long[], long) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -627,6 +704,9 @@ <item name="org.apache.commons.lang.ArrayUtils long[] addAll(long[], long[]) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.lang.ArrayUtils long[] addAll(long[], long[])"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.ArrayUtils long[] clone(long[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -634,10 +714,14 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils long[] remove(long[], int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.lang.ArrayUtils long[] removeElement(long[], long)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.ArrayUtils long[] subarray(long[], int, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -645,6 +729,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils long[] toPrimitive(java.lang.Long[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -653,6 +738,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils long[] toPrimitive(java.lang.Long[], long) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -661,6 +747,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils short[] add(short[], short) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -671,6 +758,9 @@ <item name="org.apache.commons.lang.ArrayUtils short[] addAll(short[], short[]) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.lang.ArrayUtils short[] addAll(short[], short[])"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.ArrayUtils short[] clone(short[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -678,10 +768,14 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils short[] remove(short[], int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.lang.ArrayUtils short[] removeElement(short[], short)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.ArrayUtils short[] subarray(short[], int, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -689,6 +783,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils short[] toPrimitive(java.lang.Short[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -697,6 +792,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils short[] toPrimitive(java.lang.Short[], short) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -705,6 +801,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ArrayUtils void reverse(boolean[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -794,6 +891,10 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.commons.lang.BooleanUtils java.lang.Boolean toBooleanObject(int, int, int, int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.BooleanUtils java.lang.Boolean toBooleanObject(java.lang.Integer) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -802,6 +903,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.BooleanUtils java.lang.Boolean toBooleanObject(java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -812,9 +914,15 @@ <item name="org.apache.commons.lang.BooleanUtils java.lang.Boolean toBooleanObject(java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer) 3"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.lang.BooleanUtils java.lang.Boolean toBooleanObject(java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.BooleanUtils java.lang.Boolean toBooleanObject(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.lang.BooleanUtils java.lang.Boolean toBooleanObject(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.BooleanUtils java.lang.Boolean toBooleanObject(java.lang.String, java.lang.String, java.lang.String, java.lang.String) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -824,6 +932,9 @@ <item name="org.apache.commons.lang.BooleanUtils java.lang.Boolean toBooleanObject(java.lang.String, java.lang.String, java.lang.String, java.lang.String) 3"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.lang.BooleanUtils java.lang.Boolean toBooleanObject(java.lang.String, java.lang.String, java.lang.String, java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.BooleanUtils java.lang.Boolean xor(java.lang.Boolean[]) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -834,6 +945,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.BooleanUtils java.lang.Integer toIntegerObject(java.lang.Boolean, java.lang.Integer, java.lang.Integer, java.lang.Integer) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -877,6 +989,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->!null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.CharSet void add(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -904,6 +1017,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_->!null;null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.CharSetUtils java.lang.String keep(java.lang.String, java.lang.String[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -915,6 +1029,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_->!null;null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.CharSetUtils java.lang.String modify(java.lang.String, java.lang.String[], boolean) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -950,6 +1065,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->!null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.CharUtils char toChar(java.lang.Character) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -970,6 +1086,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.CharUtils java.lang.String toString(java.lang.Character) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -978,6 +1095,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.CharUtils java.lang.String unicodeEscaped(char)"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -989,6 +1107,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->!null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ClassUtils boolean isAssignable(java.lang.Class, java.lang.Class) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -1027,6 +1146,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ClassUtils java.lang.Class[] toClass(java.lang.Object[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -1035,6 +1155,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ClassUtils java.lang.Class[] wrappersToPrimitives(java.lang.Class[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -1043,6 +1164,10 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.commons.lang.ClassUtils java.lang.String getCanonicalName(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ClassUtils java.lang.String getPackageCanonicalName(java.lang.Class) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -1136,6 +1261,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ClassUtils java.util.List convertClassesToClassNames(java.util.List) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -1144,6 +1270,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ClassUtils java.util.List getAllInterfaces(java.lang.Class) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -1152,6 +1279,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ClassUtils java.util.List getAllSuperclasses(java.lang.Class) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -1160,6 +1288,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.Entities java.io.StringWriter createStringWriter(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -1197,6 +1326,12 @@ <item name="org.apache.commons.lang.Entities.ArrayEntityMap int value(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.lang.Entities.ArrayEntityMap java.lang.String name(int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.commons.lang.Entities.BinaryEntityMap java.lang.String name(int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.IllegalClassException IllegalClassException(java.lang.Class, java.lang.Class) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -1216,6 +1351,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.IncompleteArgumentException IncompleteArgumentException(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -1233,10 +1369,20 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.IntHashMap boolean contains(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.lang.IntHashMap java.lang.Object get(int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.commons.lang.IntHashMap java.lang.Object put(int, java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.commons.lang.IntHashMap java.lang.Object remove(int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.LocaleUtils java.util.List localeLookupList(java.util.Locale)"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -1253,6 +1399,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->!null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.NotImplementedException NotImplementedException(java.lang.Class) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -1263,6 +1410,9 @@ <item name="org.apache.commons.lang.NotImplementedException NotImplementedException(java.lang.String, java.lang.Throwable) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.lang.NotImplementedException java.lang.String getMessage()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.NullArgumentException NullArgumentException(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -1351,6 +1501,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.NumberUtils java.math.BigDecimal createBigDecimal(java.lang.String)"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -1388,6 +1539,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->!null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ObjectUtils java.lang.String toString(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -1410,6 +1562,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""_,!null->!null;_,null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.ObjectUtils void identityToString(java.lang.StringBuffer, java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -1462,15 +1615,27 @@ <item name="org.apache.commons.lang.RandomStringUtils java.lang.String randomNumeric(int)"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.lang.SerializationUtils java.lang.Object clone(java.io.Serializable)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.SerializationUtils java.lang.Object deserialize(byte[]) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.lang.SerializationUtils java.lang.Object deserialize(byte[])"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.SerializationUtils java.lang.Object deserialize(java.io.InputStream) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.lang.SerializationUtils java.lang.Object deserialize(java.io.InputStream)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.SerializationUtils void serialize(java.io.Serializable, java.io.OutputStream) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.lang.StringEscapeUtils java.lang.String escapeCsv(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.StringEscapeUtils java.lang.String escapeHtml(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -1478,13 +1643,20 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringEscapeUtils java.lang.String escapeJava(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.lang.StringEscapeUtils java.lang.String escapeJava(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.StringEscapeUtils java.lang.String escapeJavaScript(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.lang.StringEscapeUtils java.lang.String escapeJavaScript(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.StringEscapeUtils java.lang.String escapeJavaStyleString(java.lang.String, boolean) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -1492,6 +1664,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringEscapeUtils java.lang.String escapeSql(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -1500,6 +1673,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->!null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringEscapeUtils java.lang.String escapeXml(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -1508,6 +1682,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringEscapeUtils java.lang.String hex(char)"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -1519,6 +1694,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringEscapeUtils java.lang.String unescapeHtml(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -1527,6 +1703,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringEscapeUtils java.lang.String unescapeJava(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -1535,10 +1712,14 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringEscapeUtils java.lang.String unescapeJavaScript(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.lang.StringEscapeUtils java.lang.String unescapeJavaScript(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.StringEscapeUtils java.lang.String unescapeXml(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -1546,6 +1727,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringEscapeUtils void escapeHtml(java.io.Writer, java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -1898,6 +2080,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_->!null;null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String abbreviate(java.lang.String, int, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -1906,6 +2089,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_,_->!null;null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String capitalise(java.lang.String)"> <annotation name="org.jetbrains.annotations.Contract"> @@ -1926,16 +2110,19 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String center(java.lang.String, int, char)"> <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String center(java.lang.String, int, java.lang.String)"> <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String chomp(java.lang.String)"> <annotation name="org.jetbrains.annotations.Contract"> @@ -1973,6 +2160,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->!null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String chopNewline(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -1993,6 +2181,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->!null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String defaultString(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2017,6 +2206,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->!null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String deleteWhitespace(java.lang.String)"> <annotation name="org.jetbrains.annotations.Contract"> @@ -2034,6 +2224,9 @@ <item name="org.apache.commons.lang.StringUtils java.lang.String escape(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.lang.StringUtils java.lang.String escape(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.StringUtils java.lang.String getChomp(java.lang.String, java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -2063,6 +2256,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""_,null->null;null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String getNestedString(java.lang.String, java.lang.String, java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2077,6 +2271,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""_,_,null->null;_,null,_->null;null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String getPrechomp(java.lang.String, java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -2094,6 +2289,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->!null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String join(java.lang.Object[], char) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2102,6 +2298,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_->!null;null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String join(java.lang.Object[], char, int, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2110,6 +2307,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_,_,_->!null;null,_,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String join(java.lang.Object[], java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2121,6 +2319,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_->!null;null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String join(java.lang.Object[], java.lang.String, int, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2132,6 +2331,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_,_,_->!null;null,_,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String join(java.util.Collection, char) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2140,6 +2340,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String join(java.util.Collection, java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2151,6 +2352,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String join(java.util.Iterator, char) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2159,6 +2361,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String join(java.util.Iterator, java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2170,6 +2373,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String left(java.lang.String, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2178,6 +2382,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_->!null;null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String leftPad(java.lang.String, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2186,6 +2391,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String leftPad(java.lang.String, int, char) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2194,6 +2400,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String leftPad(java.lang.String, int, java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2202,6 +2409,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String lowerCase(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2210,6 +2418,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->!null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String mid(java.lang.String, int, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2218,6 +2427,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_,_->!null;null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String overlay(java.lang.String, java.lang.String, int, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2229,6 +2439,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_,_,_->!null;null,_,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String overlayString(java.lang.String, java.lang.String, int, int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -2290,6 +2501,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_->!null;null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String replace(java.lang.String, java.lang.String, java.lang.String) 2"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2314,6 +2526,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_,_->!null;null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String replaceChars(java.lang.String, java.lang.String, java.lang.String) 2"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2371,6 +2584,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->!null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String reverseDelimited(java.lang.String, char) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2379,6 +2593,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String reverseDelimitedString(java.lang.String, java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2390,6 +2605,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String right(java.lang.String, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2398,6 +2614,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_->!null;null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String rightPad(java.lang.String, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2406,6 +2623,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String rightPad(java.lang.String, int, char) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2414,6 +2632,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String rightPad(java.lang.String, int, java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2422,6 +2641,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String strip(java.lang.String, java.lang.String) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2457,6 +2677,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String substring(java.lang.String, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2465,6 +2686,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_->!null;null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String substring(java.lang.String, int, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2473,6 +2695,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_,_->!null;null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String substringAfter(java.lang.String, java.lang.String) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2510,6 +2733,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""_,null->null;null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String substringBetween(java.lang.String, java.lang.String, java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2524,6 +2748,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""_,_,null->null;_,null,_->null;null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String swapCase(java.lang.String)"> <annotation name="org.jetbrains.annotations.Contract"> @@ -2537,6 +2762,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->!null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String trimToEmpty(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2551,6 +2777,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String uncapitalise(java.lang.String)"> <annotation name="org.jetbrains.annotations.Contract"> @@ -2569,6 +2796,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->!null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String[] split(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2577,6 +2805,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String[] split(java.lang.String, char) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2585,6 +2814,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String[] split(java.lang.String, java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2596,6 +2826,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String[] split(java.lang.String, java.lang.String, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2607,6 +2838,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String[] splitByCharacterType(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2615,6 +2847,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String[] splitByCharacterType(java.lang.String, boolean) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2623,6 +2856,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String[] splitByCharacterTypeCamelCase(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2631,6 +2865,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String[] splitByWholeSeparator(java.lang.String, java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2642,6 +2877,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String[] splitByWholeSeparator(java.lang.String, java.lang.String, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2653,6 +2889,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String[] splitByWholeSeparatorPreserveAllTokens(java.lang.String, java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2664,6 +2901,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String[] splitByWholeSeparatorPreserveAllTokens(java.lang.String, java.lang.String, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2675,6 +2913,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String[] splitByWholeSeparatorWorker(java.lang.String, java.lang.String, int, boolean) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2686,6 +2925,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String[] splitPreserveAllTokens(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2694,6 +2934,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String[] splitPreserveAllTokens(java.lang.String, char) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2702,6 +2943,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String[] splitPreserveAllTokens(java.lang.String, java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2713,6 +2955,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String[] splitPreserveAllTokens(java.lang.String, java.lang.String, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2724,6 +2967,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String[] splitWorker(java.lang.String, char, boolean) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2732,6 +2976,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String[] splitWorker(java.lang.String, java.lang.String, int, boolean) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2743,6 +2988,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.StringUtils java.lang.String[] stripAll(java.lang.String[])"> <annotation name="org.jetbrains.annotations.Contract"> @@ -2764,6 +3010,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.SystemUtils boolean getJavaVersionMatches(java.lang.String)"> <annotation name="org.jetbrains.annotations.Contract"> @@ -2787,6 +3034,12 @@ <item name="org.apache.commons.lang.SystemUtils java.io.File getUserHome()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.lang.SystemUtils java.lang.String getJavaVersionTrimmed()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.commons.lang.SystemUtils java.lang.String getSystemProperty(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.Validate void allElementsOfType(java.util.Collection, java.lang.Class) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -2866,6 +3119,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_,_,_->!null;null,_,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.WordUtils java.lang.String capitalize(java.lang.String)"> <annotation name="org.jetbrains.annotations.Contract"> @@ -2931,6 +3185,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_->!null;null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.WordUtils java.lang.String wrap(java.lang.String, int, java.lang.String, boolean) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -2942,5 +3197,6 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_,_,_->!null;null,_,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> </root> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/enum/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/enum/annotations.xml index 05b15d3460ce..0a18f70a8a8c 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/enum/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/enum/annotations.xml @@ -5,6 +5,9 @@ <item name="org.apache.commons.lang.enum.Enum boolean equals(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.lang.enum.Enum java.lang.Object readResolve()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.enum.Enum java.lang.String getNameInOtherClassLoader(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -20,6 +23,9 @@ <item name="org.apache.commons.lang.enum.Enum org.apache.commons.lang.enum.Enum getEnum(java.lang.Class, java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.lang.enum.Enum org.apache.commons.lang.enum.Enum getEnum(java.lang.Class, java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.enum.Enum org.apache.commons.lang.enum.Enum.Entry createEntry(java.lang.Class) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -38,6 +44,9 @@ <item name="org.apache.commons.lang.enum.EnumUtils org.apache.commons.lang.enum.Enum getEnum(java.lang.Class, java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.lang.enum.EnumUtils org.apache.commons.lang.enum.Enum getEnum(java.lang.Class, java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.enum.EnumUtils org.apache.commons.lang.enum.ValuedEnum getEnum(java.lang.Class, int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -50,4 +59,7 @@ <item name="org.apache.commons.lang.enum.ValuedEnum org.apache.commons.lang.enum.Enum getEnum(java.lang.Class, int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.lang.enum.ValuedEnum org.apache.commons.lang.enum.Enum getEnum(java.lang.Class, int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> </root> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/enums/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/enums/annotations.xml index 3b827c118787..88ab27cab4cb 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/enums/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/enums/annotations.xml @@ -5,6 +5,9 @@ <item name="org.apache.commons.lang.enums.Enum boolean equals(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.lang.enums.Enum java.lang.Object readResolve()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.enums.Enum java.lang.String getNameInOtherClassLoader(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -20,6 +23,9 @@ <item name="org.apache.commons.lang.enums.Enum org.apache.commons.lang.enums.Enum getEnum(java.lang.Class, java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.lang.enums.Enum org.apache.commons.lang.enums.Enum getEnum(java.lang.Class, java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.enums.Enum org.apache.commons.lang.enums.Enum.Entry createEntry(java.lang.Class) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -38,6 +44,9 @@ <item name="org.apache.commons.lang.enums.EnumUtils org.apache.commons.lang.enums.Enum getEnum(java.lang.Class, java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.lang.enums.EnumUtils org.apache.commons.lang.enums.Enum getEnum(java.lang.Class, java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.enums.EnumUtils org.apache.commons.lang.enums.ValuedEnum getEnum(java.lang.Class, int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -50,4 +59,7 @@ <item name="org.apache.commons.lang.enums.ValuedEnum org.apache.commons.lang.enums.Enum getEnum(java.lang.Class, int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.lang.enums.ValuedEnum org.apache.commons.lang.enums.Enum getEnum(java.lang.Class, int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> </root> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/exception/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/exception/annotations.xml index 585584b958f2..ba729507a8bc 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/exception/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/exception/annotations.xml @@ -86,6 +86,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.exception.ExceptionUtils java.lang.Throwable getCause(java.lang.Throwable, java.lang.String[]) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -94,6 +95,13 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.commons.lang.exception.ExceptionUtils java.lang.Throwable getCauseUsingFieldName(java.lang.Throwable, java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.commons.lang.exception.ExceptionUtils java.lang.Throwable getCauseUsingMethodName(java.lang.Throwable, java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.exception.ExceptionUtils java.lang.Throwable getCauseUsingWellKnownTypes(java.lang.Throwable) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -102,10 +110,14 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.exception.ExceptionUtils java.lang.Throwable getRootCause(java.lang.Throwable) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.lang.exception.ExceptionUtils java.lang.Throwable getRootCause(java.lang.Throwable)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.exception.ExceptionUtils java.lang.Throwable[] getThrowables(java.lang.Throwable) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -153,4 +165,13 @@ <item name="org.apache.commons.lang.exception.NestableDelegate void trimStackFrames(java.util.List) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.lang.exception.NestableError java.lang.String getMessage()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.commons.lang.exception.NestableException java.lang.String getMessage()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.commons.lang.exception.NestableRuntimeException java.lang.String getMessage()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> </root> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/math/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/math/annotations.xml index 567cb620681f..d0657899989a 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/math/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/math/annotations.xml @@ -302,6 +302,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->!null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.math.NumberUtils java.lang.Float createFloat(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -310,6 +311,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->!null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.math.NumberUtils java.lang.Integer createInteger(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -318,6 +320,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->!null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.math.NumberUtils java.lang.Long createLong(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -326,6 +329,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->!null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.math.NumberUtils java.lang.Number createNumber(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -334,6 +338,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.math.NumberUtils java.math.BigDecimal createBigDecimal(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -342,6 +347,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->!null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.math.NumberUtils java.math.BigInteger createBigInteger(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -350,6 +356,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->!null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.math.NumberUtils long max(long[]) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/text/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/text/annotations.xml index 0e46f59ecbed..044b34e70faf 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/text/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/text/annotations.xml @@ -37,11 +37,13 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""_,_,!null,_->!null;_,_,null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.text.ExtendedMessageFormat java.text.Format getFormat(java.lang.String)"> <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.text.ExtendedMessageFormat java.text.ParsePosition next(java.text.ParsePosition) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -422,6 +424,9 @@ <item name="org.apache.commons.lang.text.StrLookup org.apache.commons.lang.text.StrLookup mapLookup(java.util.Map)"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.lang.text.StrLookup.MapStrLookup java.lang.String lookup(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.text.StrMatcher int isMatch(char[], int) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -503,6 +508,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String replace(char[], int, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -511,6 +517,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String replace(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -519,6 +526,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String replace(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -527,6 +535,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String replace(java.lang.String, int, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -535,6 +544,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String replace(java.lang.StringBuffer) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -543,6 +553,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String replace(java.lang.StringBuffer, int, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -551,6 +562,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String replace(org.apache.commons.lang.text.StrBuilder) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -559,6 +571,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String replace(org.apache.commons.lang.text.StrBuilder, int, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -567,10 +580,14 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String resolveVariable(java.lang.String, org.apache.commons.lang.text.StrBuilder, int, int) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.commons.lang.text.StrSubstitutor java.lang.String resolveVariable(java.lang.String, org.apache.commons.lang.text.StrBuilder, int, int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.text.StrSubstitutor org.apache.commons.lang.text.StrSubstitutor setVariablePrefix(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -613,6 +630,18 @@ <item name="org.apache.commons.lang.text.StrTokenizer int readWithQuotes(char[], int, int, org.apache.commons.lang.text.StrBuilder, java.util.List, int, int) 3"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.commons.lang.text.StrTokenizer java.lang.Object clone()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.commons.lang.text.StrTokenizer java.lang.String getContent()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.commons.lang.text.StrTokenizer java.lang.String nextToken()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.commons.lang.text.StrTokenizer java.lang.String previousToken()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.text.StrTokenizer java.lang.String toString()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/time/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/time/annotations.xml index 12183165228a..fbd05e4e413c 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/time/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/commons/lang/time/annotations.xml @@ -373,6 +373,9 @@ <val val=""null->false""/> </annotation> </item> + <item name="org.apache.commons.lang.time.DurationFormatUtils.Token java.lang.String toString()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.commons.lang.time.FastDateFormat FastDateFormat(java.lang.String, java.util.TimeZone, java.util.Locale) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -400,6 +403,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_->null;_,!null->null;null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.commons.lang.time.FastDateFormat java.lang.String format(java.util.Calendar)"> <annotation name="org.jetbrains.annotations.NotNull"/> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/annotations.xml index 7ef87f095569..ae835d69fbff 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/annotations.xml @@ -5,4 +5,7 @@ <item name="org.apache.velocity.VelocityContext VelocityContext(java.util.Map, org.apache.velocity.context.Context) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.velocity.VelocityContext java.lang.Object clone()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> </root> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/app/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/app/annotations.xml index fac918657687..ee0af29aafee 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/app/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/app/annotations.xml @@ -1,4 +1,7 @@ <root> + <item name="org.apache.velocity.app.FieldMethodizer java.lang.Object get(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.app.FieldMethodizer void addObject(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/app/event/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/app/event/annotations.xml index d1987cbafc38..6d0bbb6d0226 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/app/event/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/app/event/annotations.xml @@ -23,6 +23,9 @@ <val val=""null->false""/> </annotation> </item> + <item name="org.apache.velocity.app.event.EventCartridge java.util.Iterator getReferenceInsertionEventHandlers()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.app.event.EventHandlerUtil boolean shouldLogOnNullSet(org.apache.velocity.runtime.RuntimeServices, org.apache.velocity.context.InternalContextAdapter, java.lang.String, java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -95,6 +98,9 @@ <item name="org.apache.velocity.app.event.InvalidReferenceEventHandler.InvalidMethodExecutor void execute(org.apache.velocity.app.event.EventHandler) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.app.event.InvalidReferenceEventHandler.InvalidSetMethodExecutor java.lang.Object getReturnValue()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.app.event.InvalidReferenceEventHandler.InvalidSetMethodExecutor void execute(org.apache.velocity.app.event.EventHandler) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/app/event/implement/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/app/event/implement/annotations.xml index 643ea130fd54..28deac2b6343 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/app/event/implement/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/app/event/implement/annotations.xml @@ -2,12 +2,18 @@ <item name="org.apache.velocity.app.event.implement.EscapeHtmlReference java.lang.String escape(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.app.event.implement.EscapeHtmlReference java.lang.String escape(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.app.event.implement.EscapeHtmlReference java.lang.String getMatchAttribute()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> <item name="org.apache.velocity.app.event.implement.EscapeJavaScriptReference java.lang.String escape(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.app.event.implement.EscapeJavaScriptReference java.lang.String escape(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.app.event.implement.EscapeJavaScriptReference java.lang.String getMatchAttribute()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -22,12 +28,18 @@ <item name="org.apache.velocity.app.event.implement.EscapeSqlReference java.lang.String escape(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.app.event.implement.EscapeSqlReference java.lang.String escape(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.app.event.implement.EscapeSqlReference java.lang.String getMatchAttribute()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> <item name="org.apache.velocity.app.event.implement.EscapeXmlReference java.lang.String escape(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.app.event.implement.EscapeXmlReference java.lang.String escape(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.app.event.implement.EscapeXmlReference java.lang.String getMatchAttribute()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -37,6 +49,9 @@ <item name="org.apache.velocity.app.event.implement.IncludeNotFound java.lang.String includeEvent(java.lang.String, java.lang.String, java.lang.String) 2"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.velocity.app.event.implement.IncludeNotFound java.lang.String includeEvent(java.lang.String, java.lang.String, java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.app.event.implement.IncludeNotFound void setRuntimeServices(org.apache.velocity.runtime.RuntimeServices) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -102,6 +117,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_,_,_,_->null;_,!null,_,_,_->null;_,_,!null,_,_->null;_,_,_,!null,_->null;_,_,_,_,!null->null;_,_,_,_,null->null;_,_,_,null,_->null;_,_,null,_,_->null;_,null,_,_,_->null;null,_,_,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.velocity.app.event.implement.ReportInvalidReferences java.lang.Object invalidMethod(org.apache.velocity.context.Context, java.lang.String, java.lang.Object, java.lang.String, org.apache.velocity.util.introspection.Info) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -119,6 +135,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_,_,_,_->null;_,!null,_,_,_->null;_,_,!null,_,_->null;_,_,_,!null,_->null;_,_,_,_,!null->null;_,_,_,_,null->null;_,_,_,null,_->null;_,_,null,_,_->null;_,null,_,_,_->null;null,_,_,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.velocity.app.event.implement.ReportInvalidReferences void reportInvalidReference(java.lang.String, org.apache.velocity.util.introspection.Info) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/context/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/context/annotations.xml index 62279b8f44db..7952023d2550 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/context/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/context/annotations.xml @@ -14,6 +14,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.velocity.context.AbstractContext java.lang.Object put(java.lang.String, java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -22,6 +23,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.velocity.context.AbstractContext java.lang.Object remove(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -30,6 +32,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.velocity.context.EvaluateContext EvaluateContext(org.apache.velocity.context.InternalContextAdapter, org.apache.velocity.runtime.RuntimeServices) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -37,12 +40,21 @@ <item name="org.apache.velocity.context.EvaluateContext void initContext(org.apache.velocity.runtime.RuntimeServices) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.context.InternalContextAdapterImpl org.apache.velocity.app.event.EventCartridge attachEventCartridge(org.apache.velocity.app.event.EventCartridge)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.velocity.context.InternalContextAdapterImpl org.apache.velocity.app.event.EventCartridge getEventCartridge()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.context.InternalContextAdapterImpl org.apache.velocity.context.InternalContextAdapter getBaseContext()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> <item name="org.apache.velocity.context.ProxyVMContext boolean isConstant(org.apache.velocity.runtime.parser.node.Node) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.context.ProxyVMContext java.lang.Object remove(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.context.ProxyVMContext void addVMProxyArg(org.apache.velocity.context.InternalContextAdapter, java.lang.String, java.lang.String, org.apache.velocity.runtime.Renderable) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/io/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/io/annotations.xml index f55b4257f29a..003fd3e71e3d 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/io/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/io/annotations.xml @@ -1,4 +1,7 @@ <root> + <item name="org.apache.velocity.io.UnicodeInputStream java.lang.String readEncoding()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.io.UnicodeInputStream org.apache.velocity.io.UnicodeInputStream.UnicodeBOM match(org.apache.velocity.io.UnicodeInputStream.UnicodeBOM, org.apache.velocity.io.UnicodeInputStream.UnicodeBOM) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/annotations.xml index 1dd01a70efdd..20fa8692e567 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/annotations.xml @@ -31,6 +31,12 @@ <val val=""!null,_,_,_->true;_,!null,_,_->true;_,_,!null,_->true;_,_,_,!null->true;_,_,_,null->true;_,_,null,_->true;_,null,_,_->true;null,_,_,_->true""/> </annotation> </item> + <item name="org.apache.velocity.runtime.RuntimeInstance java.lang.Object getProperty(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.velocity.runtime.RuntimeInstance java.lang.String getString(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.runtime.RuntimeInstance org.apache.velocity.app.event.EventHandler initializeSpecificEventHandler(java.lang.String, java.lang.String, java.lang.Class) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -41,6 +47,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""_,_,null->null;null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.velocity.runtime.RuntimeInstance org.apache.velocity.runtime.parser.Parser createNewParser()"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -101,9 +108,24 @@ <item name="org.apache.velocity.runtime.VelocimacroManager boolean usingNamespaces(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.velocity.runtime.VelocimacroManager java.lang.String getLibraryName(java.lang.String, java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.velocity.runtime.VelocimacroManager java.util.Map addNamespace(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.velocity.runtime.VelocimacroManager java.util.Map getNamespace(java.lang.String, boolean)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.velocity.runtime.VelocimacroManager org.apache.velocity.runtime.directive.VelocimacroProxy get(java.lang.String, java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.runtime.VelocimacroManager org.apache.velocity.runtime.directive.VelocimacroProxy get(java.lang.String, java.lang.String, java.lang.String) 2"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.velocity.runtime.VelocimacroManager org.apache.velocity.runtime.directive.VelocimacroProxy get(java.lang.String, java.lang.String, java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.runtime.VelocimacroManager.MacroEntry MacroEntry(java.lang.String, org.apache.velocity.runtime.parser.node.Node, java.lang.String[], java.lang.String, org.apache.velocity.runtime.RuntimeServices) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/directive/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/directive/annotations.xml index e9d35d5e61e8..e3142ca5a771 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/directive/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/directive/annotations.xml @@ -11,6 +11,9 @@ <item name="org.apache.velocity.runtime.directive.Block void init(org.apache.velocity.runtime.RuntimeServices, org.apache.velocity.context.InternalContextAdapter, org.apache.velocity.runtime.parser.node.Node) 2"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.runtime.directive.Block.Reference java.lang.String toString()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.runtime.directive.BlockMacro void init(org.apache.velocity.runtime.RuntimeServices, org.apache.velocity.context.InternalContextAdapter, org.apache.velocity.runtime.parser.node.Node) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -128,6 +131,9 @@ <item name="org.apache.velocity.runtime.directive.Foreach.NullHolderContext NullHolderContext(java.lang.String, org.apache.velocity.context.InternalContextAdapter, org.apache.velocity.runtime.directive.Foreach.1) 2"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.velocity.runtime.directive.Foreach.NullHolderContext java.lang.Object get(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.runtime.directive.ForeachScope ForeachScope(java.lang.Object, java.lang.Object) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -258,6 +264,15 @@ <item name="org.apache.velocity.runtime.directive.Scope.Info Info(org.apache.velocity.runtime.directive.Scope, java.lang.Object) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.velocity.runtime.directive.Scope.Info java.lang.String getName()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.velocity.runtime.directive.Scope.Info java.lang.String getTemplate()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.velocity.runtime.directive.Scope.Info java.lang.String getType()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.runtime.directive.Scope.Info java.lang.String toString()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/parser/node/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/parser/node/annotations.xml index b6a2face76a9..d10a46a0230e 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/parser/node/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/parser/node/annotations.xml @@ -14,6 +14,9 @@ <item name="org.apache.velocity.runtime.parser.node.ASTAddNode java.lang.Object handleSpecial(java.lang.Object, java.lang.Object, org.apache.velocity.context.InternalContextAdapter) 2"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.velocity.runtime.parser.node.ASTAddNode java.lang.Object handleSpecial(java.lang.Object, java.lang.Object, org.apache.velocity.context.InternalContextAdapter)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.runtime.parser.node.ASTAndNode java.lang.Object jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -66,6 +69,9 @@ <item name="org.apache.velocity.runtime.parser.node.ASTDivNode java.lang.Number perform(java.lang.Number, java.lang.Number, org.apache.velocity.context.InternalContextAdapter) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.runtime.parser.node.ASTDivNode java.lang.Number perform(java.lang.Number, java.lang.Number, org.apache.velocity.context.InternalContextAdapter)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.runtime.parser.node.ASTEQNode java.lang.Object jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -156,6 +162,9 @@ <item name="org.apache.velocity.runtime.parser.node.ASTIdentifier java.lang.Object execute(java.lang.Object, org.apache.velocity.context.InternalContextAdapter) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.runtime.parser.node.ASTIdentifier java.lang.Object execute(java.lang.Object, org.apache.velocity.context.InternalContextAdapter)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.runtime.parser.node.ASTIdentifier java.lang.Object init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object)"> <annotation name="org.jetbrains.annotations.Contract"> <val val=""_,!null->!null;_,null->null""/> @@ -189,6 +198,9 @@ <item name="org.apache.velocity.runtime.parser.node.ASTIndex java.lang.Object execute(java.lang.Object, org.apache.velocity.context.InternalContextAdapter) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.runtime.parser.node.ASTIndex java.lang.Object execute(java.lang.Object, org.apache.velocity.context.InternalContextAdapter)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.runtime.parser.node.ASTIndex java.lang.Object init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object)"> <annotation name="org.jetbrains.annotations.Contract"> <val val=""_,!null->!null;_,null->null""/> @@ -208,6 +220,9 @@ <item name="org.apache.velocity.runtime.parser.node.ASTIntegerRange java.lang.Object jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.runtime.parser.node.ASTIntegerRange java.lang.Object value(org.apache.velocity.context.InternalContextAdapter)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.runtime.parser.node.ASTLENode java.lang.Object jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -230,6 +245,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_,_->null;_,!null,_->null;_,_,!null->null;_,_,null->null;_,null,_->null;null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.velocity.runtime.parser.node.ASTMathNode java.lang.Object init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object)"> <annotation name="org.jetbrains.annotations.Contract"> @@ -239,9 +255,15 @@ <item name="org.apache.velocity.runtime.parser.node.ASTMathNode java.lang.Object jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.runtime.parser.node.ASTMathNode java.lang.Object value(org.apache.velocity.context.InternalContextAdapter)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.runtime.parser.node.ASTMethod java.lang.Object execute(java.lang.Object, org.apache.velocity.context.InternalContextAdapter) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.runtime.parser.node.ASTMethod java.lang.Object execute(java.lang.Object, org.apache.velocity.context.InternalContextAdapter)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.runtime.parser.node.ASTMethod java.lang.Object handleInvocationException(java.lang.Object, org.apache.velocity.context.InternalContextAdapter, java.lang.Throwable) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -276,6 +298,9 @@ <item name="org.apache.velocity.runtime.parser.node.ASTModNode java.lang.Number perform(java.lang.Number, java.lang.Number, org.apache.velocity.context.InternalContextAdapter) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.runtime.parser.node.ASTModNode java.lang.Number perform(java.lang.Number, java.lang.Number, org.apache.velocity.context.InternalContextAdapter)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.runtime.parser.node.ASTMulNode java.lang.Number perform(java.lang.Number, java.lang.Number, org.apache.velocity.context.InternalContextAdapter) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -308,6 +333,9 @@ <item name="org.apache.velocity.runtime.parser.node.ASTReference java.lang.Object execute(java.lang.Object, org.apache.velocity.context.InternalContextAdapter) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.velocity.runtime.parser.node.ASTReference java.lang.Object execute(java.lang.Object, org.apache.velocity.context.InternalContextAdapter)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.runtime.parser.node.ASTReference java.lang.Object getVariableValue(org.apache.velocity.context.Context, java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -319,6 +347,9 @@ <item name="org.apache.velocity.runtime.parser.node.ASTReference java.lang.Object jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.runtime.parser.node.ASTReference java.lang.Object value(org.apache.velocity.context.InternalContextAdapter)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.runtime.parser.node.ASTReference java.lang.String getDollarBang()"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -452,6 +483,9 @@ <item name="org.apache.velocity.runtime.parser.node.GetExecutor GetExecutor(org.apache.velocity.runtime.log.Log, org.apache.velocity.util.introspection.Introspector, java.lang.Class, java.lang.String) 3"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.velocity.runtime.parser.node.GetExecutor java.lang.Object execute(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.runtime.parser.node.MapGetExecutor java.lang.Object execute(java.lang.Object) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -541,9 +575,18 @@ <item name="org.apache.velocity.runtime.parser.node.PropertyExecutor PropertyExecutor(org.apache.velocity.runtime.RuntimeLogger, org.apache.velocity.util.introspection.Introspector, java.lang.Class, java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.runtime.parser.node.PropertyExecutor java.lang.Object execute(java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.runtime.parser.node.PropertyExecutor void discover(java.lang.Class, java.lang.String) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.velocity.runtime.parser.node.PutExecutor java.lang.Object execute(java.lang.Object, java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.velocity.runtime.parser.node.SetPropertyExecutor java.lang.Object execute(java.lang.Object, java.lang.Object)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.runtime.parser.node.SimpleNode boolean evaluate(org.apache.velocity.context.InternalContextAdapter) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -572,6 +615,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null,_->null;_,!null->null;_,null->null;null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.velocity.runtime.parser.node.SimpleNode java.lang.Object init(org.apache.velocity.context.InternalContextAdapter, java.lang.Object)"> <annotation name="org.jetbrains.annotations.Contract"> @@ -588,6 +632,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.velocity.runtime.parser.node.SimpleNode java.lang.String getLocation(org.apache.velocity.context.InternalContextAdapter) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/resource/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/resource/annotations.xml index 6d9f27bfe3ff..cbc6c2b8383a 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/resource/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/resource/annotations.xml @@ -2,10 +2,22 @@ <item name="org.apache.velocity.runtime.resource.ResourceFactory org.apache.velocity.runtime.resource.Resource getResource(java.lang.String, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.velocity.runtime.resource.ResourceFactory org.apache.velocity.runtime.resource.Resource getResource(java.lang.String, int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.velocity.runtime.resource.ResourceManagerImpl java.lang.String getLoaderNameForResource(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.runtime.resource.ResourceManagerImpl org.apache.velocity.runtime.resource.Resource createResource(java.lang.String, int) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.velocity.runtime.resource.ResourceManagerImpl org.apache.velocity.runtime.resource.Resource createResource(java.lang.String, int)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.runtime.resource.ResourceManagerImpl org.apache.velocity.runtime.resource.Resource refreshResource(org.apache.velocity.runtime.resource.Resource, java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.runtime.resource.ResourceManagerImpl org.apache.velocity.runtime.resource.loader.ResourceLoader getLoaderForResource(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> </root> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/resource/loader/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/resource/loader/annotations.xml index ca5b1efb729c..315bc40466a1 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/resource/loader/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/runtime/resource/loader/annotations.xml @@ -72,6 +72,9 @@ <item name="org.apache.velocity.runtime.resource.loader.FileResourceLoader java.io.InputStream findTemplate(java.lang.String, java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.velocity.runtime.resource.loader.FileResourceLoader java.io.InputStream findTemplate(java.lang.String, java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.runtime.resource.loader.FileResourceLoader java.io.InputStream getResourceStream(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -87,6 +90,9 @@ <item name="org.apache.velocity.runtime.resource.loader.JarHolder JarHolder(org.apache.velocity.runtime.RuntimeServices, java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.runtime.resource.loader.JarHolder java.io.InputStream getResource(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.runtime.resource.loader.JarResourceLoader boolean isSourceModified(org.apache.velocity.runtime.resource.Resource) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/util/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/util/annotations.xml index 8b1334446ad3..7bcfa1afe805 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/util/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/util/annotations.xml @@ -5,14 +5,23 @@ <item name="org.apache.velocity.util.ClassUtils java.io.InputStream getResourceAsStream(java.lang.Class, java.lang.String) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.util.ClassUtils java.lang.Object getNewInstance(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.util.ClassUtils org.apache.velocity.util.introspection.VelMethod getMethod(java.lang.String, java.lang.Object[], java.lang.Class[], java.lang.Object, org.apache.velocity.context.InternalContextAdapter, org.apache.velocity.runtime.parser.node.SimpleNode, boolean) 4"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.util.ClassUtils org.apache.velocity.util.introspection.VelMethod getMethod(java.lang.String, java.lang.Object[], java.lang.Class[], java.lang.Object, org.apache.velocity.context.InternalContextAdapter, org.apache.velocity.runtime.parser.node.SimpleNode, boolean)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.util.ExceptionUtils java.lang.Throwable createWithCause(java.lang.Class, java.lang.String, java.lang.Throwable)"> <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> </item> + <item name="org.apache.velocity.util.SimplePool java.lang.Object get()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.util.StringUtils boolean allEmpty(java.util.List) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -68,6 +77,9 @@ <item name="org.apache.velocity.util.StringUtils java.lang.String normalizePath(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.util.StringUtils java.lang.String normalizePath(java.lang.String)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.util.StringUtils java.lang.String nullTrim(java.lang.String) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -75,6 +87,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->!null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.velocity.util.StringUtils java.lang.String removeAndHump(java.lang.String)"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -89,6 +102,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.velocity.util.StringUtils java.lang.String sub(java.lang.String, java.lang.String, java.lang.String) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -114,5 +128,6 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""!null->!null;null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> </root> diff --git a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/util/introspection/annotations.xml b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/util/introspection/annotations.xml index 4fd41ea336be..3f4478e881e8 100644 --- a/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/util/introspection/annotations.xml +++ b/java/java-tests/testData/codeInspection/bytecodeAnalysis/annotations/org/apache/velocity/util/introspection/annotations.xml @@ -1,7 +1,22 @@ <root> + <item name="org.apache.velocity.util.introspection.AbstractChainableUberspector java.util.Iterator getIterator(java.lang.Object, org.apache.velocity.util.introspection.Info)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.velocity.util.introspection.AbstractChainableUberspector org.apache.velocity.util.introspection.VelMethod getMethod(java.lang.Object, java.lang.String, java.lang.Object[], org.apache.velocity.util.introspection.Info)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.velocity.util.introspection.AbstractChainableUberspector org.apache.velocity.util.introspection.VelPropertyGet getPropertyGet(java.lang.Object, java.lang.String, org.apache.velocity.util.introspection.Info)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> + <item name="org.apache.velocity.util.introspection.AbstractChainableUberspector org.apache.velocity.util.introspection.VelPropertySet getPropertySet(java.lang.Object, java.lang.String, java.lang.Object, org.apache.velocity.util.introspection.Info)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.util.introspection.ClassMap java.lang.reflect.Method findMethod(java.lang.String, java.lang.Object[]) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.util.introspection.ClassMap java.lang.reflect.Method findMethod(java.lang.String, java.lang.Object[])"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.util.introspection.ClassMap void populateMethodCacheWithInterface(org.apache.velocity.util.introspection.ClassMap.MethodCache, java.lang.Class) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -17,6 +32,9 @@ <item name="org.apache.velocity.util.introspection.ClassMap.MethodCache java.lang.reflect.Method get(java.lang.String, java.lang.Object[]) 1"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.util.introspection.ClassMap.MethodCache java.lang.reflect.Method get(java.lang.String, java.lang.Object[])"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.util.introspection.ClassMap.MethodCache void access$100(org.apache.velocity.util.introspection.ClassMap.MethodCache, java.lang.reflect.Method) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> @@ -48,6 +66,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.velocity.util.introspection.IntrospectorBase java.lang.reflect.Method getMethod(java.lang.Class, java.lang.String, java.lang.Object[]) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -86,6 +105,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""_,null->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.velocity.util.introspection.MethodMap java.lang.reflect.Method getBestMatch(java.util.List, java.lang.Class[]) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -100,6 +120,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""_,_,null->null;null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.velocity.util.introspection.SecureUberspector java.util.Iterator getIterator(java.lang.Object, org.apache.velocity.util.introspection.Info) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -111,6 +132,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.velocity.util.introspection.UberspectImpl java.util.Iterator getIterator(java.lang.Object, org.apache.velocity.util.introspection.Info) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> @@ -118,6 +140,9 @@ <item name="org.apache.velocity.util.introspection.UberspectImpl java.util.Iterator getIterator(java.lang.Object, org.apache.velocity.util.introspection.Info) 1"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> + <item name="org.apache.velocity.util.introspection.UberspectImpl java.util.Iterator getIterator(java.lang.Object, org.apache.velocity.util.introspection.Info)"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.util.introspection.UberspectImpl org.apache.velocity.util.introspection.VelMethod getMethod(java.lang.Object, java.lang.String, java.lang.Object[], org.apache.velocity.util.introspection.Info) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> </item> @@ -128,6 +153,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.velocity.util.introspection.UberspectImpl org.apache.velocity.util.introspection.VelPropertyGet getPropertyGet(java.lang.Object, java.lang.String, org.apache.velocity.util.introspection.Info) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -139,6 +165,7 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.velocity.util.introspection.UberspectImpl org.apache.velocity.util.introspection.VelPropertySet getPropertySet(java.lang.Object, java.lang.String, java.lang.Object, org.apache.velocity.util.introspection.Info) 0"> <annotation name="org.jetbrains.annotations.Nullable"/> @@ -150,11 +177,18 @@ <annotation name="org.jetbrains.annotations.Contract"> <val val=""null,_,_,_->null""/> </annotation> + <annotation name="org.jetbrains.annotations.Nullable"/> </item> <item name="org.apache.velocity.util.introspection.UberspectImpl void setRuntimeLogger(org.apache.velocity.runtime.RuntimeLogger) 0"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.util.introspection.UberspectImpl.VelGetterImpl java.lang.String getMethodName()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> <item name="org.apache.velocity.util.introspection.UberspectImpl.VelMethodImpl java.lang.Object[] handleVarArg(java.lang.Class, int, java.lang.Object[]) 2"> <annotation name="org.jetbrains.annotations.NotNull"/> </item> + <item name="org.apache.velocity.util.introspection.UberspectImpl.VelSetterImpl java.lang.String getMethodName()"> + <annotation name="org.jetbrains.annotations.Nullable"/> + </item> </root> diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/RootThrowableCause.java b/java/java-tests/testData/inspection/dataFlow/fixture/RootThrowableCause.java index 6086c92b40d4..1197fe817e8e 100644 --- a/java/java-tests/testData/inspection/dataFlow/fixture/RootThrowableCause.java +++ b/java/java-tests/testData/inspection/dataFlow/fixture/RootThrowableCause.java @@ -1,3 +1,6 @@ +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.Nullable; + class Doo { void foo(Throwable e) { @@ -9,4 +12,18 @@ class Doo { } } +} + +abstract class Test04 { + @Nullable + @Contract(pure = true) + abstract Test04 getParent(); + + Test04 getTopParent() { + Test04 top = this; + while (top.getParent() != null) { + top = top.getParent(); + } + return top; + } }
\ No newline at end of file diff --git a/java/java-tests/testData/refactoring/extractMethodObject4Debugger/AnonymousClassParams.java b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/AnonymousClassParams.java new file mode 100644 index 000000000000..3a722d36aeea --- /dev/null +++ b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/AnonymousClassParams.java @@ -0,0 +1,8 @@ +interface I { + void foo(int i) {} +} +class Sample { + void foo() { + System.out.println("hello <caret>world"); + } +}
\ No newline at end of file diff --git a/java/java-tests/testData/refactoring/extractMethodObject4Debugger/InnerClass.java b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/InnerClass.java new file mode 100644 index 000000000000..448724bf0543 --- /dev/null +++ b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/InnerClass.java @@ -0,0 +1,30 @@ +/* + * Copyright 2000-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +class Sample { + + void a() { + System.out.println("<caret>"); + } + + class I { + public I(int i) { + } + + void foo() { + bar(); + } + } +} diff --git a/java/java-tests/testData/refactoring/extractMethodObject4Debugger/InvokeReturnType.java b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/InvokeReturnType.java new file mode 100644 index 000000000000..353941357c68 --- /dev/null +++ b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/InvokeReturnType.java @@ -0,0 +1,9 @@ +package my; + +class Sample { + static void foo() { + int x =5; + int y =5; + int <caret>z =5; + } +}
\ No newline at end of file diff --git a/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OffsetsAtCallSite.java b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OffsetsAtCallSite.java new file mode 100644 index 000000000000..353564c51240 --- /dev/null +++ b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/OffsetsAtCallSite.java @@ -0,0 +1,44 @@ +package my; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +class Java8Private { + public static void main(String[] args) { + new Java8Private().foo(); + } + + private void foo() { + final Map<Integer,Integer> map = new HashMap<Integer,Integer>(); + map.put(1, 2); + //evaluate here map.entrySet().stream().filter((a) -> (a.getKey()>0)); + <caret>new Inner(map).invoke(); + map.put(3, 5); + } + + private void zoo(int a) { + System.out.println("DONE " + a); + } + + + public class Inner extends MagicAccessorBridge { + final Map<Integer,Integer> map; + + public Inner(Map<Integer, Integer> map) { + this.map = map; + } + + void invoke() { + map.entrySet().stream().forEach((a) -> accessorZoo(Java8Private.this, a.getValue())); + } + + // accessor + void accessorZoo(Java8Private obj, int a) { + obj.zoo(a); + } + } +} + +class MagicAccessorBridge { +}
\ No newline at end of file diff --git a/java/java-tests/testData/refactoring/extractMethodObject4Debugger/ResultExpr.java b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/ResultExpr.java new file mode 100644 index 000000000000..7a83d4c57bf3 --- /dev/null +++ b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/ResultExpr.java @@ -0,0 +1,25 @@ +/* + * Copyright 2000-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +class Sample { + + void a() { + System.out.println("<caret>"); + } + + private int foo() { + return 1; + } +} diff --git a/java/java-tests/testData/refactoring/extractMethodObject4Debugger/ResultStatements.java b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/ResultStatements.java new file mode 100644 index 000000000000..20d69ea477b4 --- /dev/null +++ b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/ResultStatements.java @@ -0,0 +1,25 @@ +/* + * Copyright 2000-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +class Sample { + + void a() { + System.out.println("<caret>"); + } + + int foo() { + return 1; + } +} diff --git a/java/java-tests/testData/refactoring/extractMethodObject4Debugger/SimpleGeneration.java b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/SimpleGeneration.java new file mode 100644 index 000000000000..873f2205e1af --- /dev/null +++ b/java/java-tests/testData/refactoring/extractMethodObject4Debugger/SimpleGeneration.java @@ -0,0 +1,5 @@ +class Sample { + void foo() { + System.out.println("hello <caret>world"); + } +}
\ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartType18CompletionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartType18CompletionTest.java index eb3c4c4577b6..68aba5eca978 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartType18CompletionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartType18CompletionTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,9 +17,6 @@ package com.intellij.codeInsight.completion; import com.intellij.JavaTestUtil; import com.intellij.codeInsight.lookup.Lookup; -import com.intellij.psi.JavaPsiFacade; -import com.intellij.psi.impl.source.resolve.PsiResolveHelperImpl; -import com.intellij.psi.impl.source.resolve.graphInference.PsiGraphInferenceHelper; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; @@ -117,16 +114,9 @@ public class SmartType18CompletionTest extends LightFixtureCompletionTestCase { } public void testInferFromRawType() throws Exception { - final PsiResolveHelperImpl helper = (PsiResolveHelperImpl)JavaPsiFacade.getInstance(getProject()).getResolveHelper(); - helper.setTestHelper(new PsiGraphInferenceHelper(getPsiManager())); - try { - configureByFile("/" + getTestName(false) + ".java"); - assertNotNull(myItems); - assertTrue(myItems.length == 0); - } - finally { - helper.setTestHelper(null); - } + configureByFile("/" + getTestName(false) + ".java"); + assertNotNull(myItems); + assertTrue(myItems.length == 0); } public void testDiamondsInsideMethodCall() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java index 967de28820e8..2db5b7fbbfea 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java @@ -701,6 +701,8 @@ public class SmartTypeCompletionTest extends LightFixtureCompletionTestCase { doTest(); } + public void testNoSemicolonInsideParentheses() { doTest(); } + public void testAssignFromTheSameFieldOfAnotherObject() throws Throwable { doTest(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java index 09225b64bc1d..ac57a71e9c9f 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java @@ -372,6 +372,9 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase { public void testIDEA126633() { doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_7, false); } public void testIDEA124363() { doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_7, false); } public void testIDEA78402() { doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_7, false); } + public void testIDEA106985() { doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_7, false); } + public void testIDEA114797() { doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_7, false); } + public void testCaptureWildcardFromUnboundCaptureWildcard() { doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_7, false); } public void testSuperCaptureSubstitutionWhenTypeParameterHasUpperBounds() { doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_7, false); } public void testParameterBoundsWithCapturedWildcard() { doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_7, false); } //jdk should propagate LL 1.4 but actually it provides LL 1.7?! diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/ConstraintsInferenceMiscTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/ConstraintsInferenceMiscTest.java index 42433d327e2d..08857080b060 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/ConstraintsInferenceMiscTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/ConstraintsInferenceMiscTest.java @@ -54,8 +54,12 @@ public class ConstraintsInferenceMiscTest extends LightDaemonAnalyzerTestCase { doTest(false); } + public void testIntersectionTypeStrictSubtypingConstraint() throws Exception { + doTest(false); + } + private void doTest(final boolean checkWarnings) { - doTestNewInference(BASE_PATH + "/" + getTestName(false) + ".java", checkWarnings, false); + doTest(BASE_PATH + "/" + getTestName(false) + ".java", checkWarnings, false); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/Diamond8HighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/Diamond8HighlightingTest.java index eb73906a5f15..62c96e148ea1 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/Diamond8HighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/Diamond8HighlightingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ public class Diamond8HighlightingTest extends LightDaemonAnalyzerTestCase { } private void doTest() throws Exception { - doTestNewInference(BASE_PATH + "/" + getTestName(false) + ".java", false, false); + doTest(BASE_PATH + "/" + getTestName(false) + ".java", false, false); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/ExceptionVariablesInferenceTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/ExceptionVariablesInferenceTest.java index 0384c0f074db..c55c6ae2e775 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/ExceptionVariablesInferenceTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/ExceptionVariablesInferenceTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,6 +54,6 @@ public class ExceptionVariablesInferenceTest extends LightDaemonAnalyzerTestCase } private void doTest(final boolean checkWarnings) throws Exception { - doTestNewInference(BASE_PATH + "/" + getTestName(false) + ".java", checkWarnings, false); + doTest(BASE_PATH + "/" + getTestName(false) + ".java", checkWarnings, false); } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/FunctionalExpressionIncompleteHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/FunctionalExpressionIncompleteHighlightingTest.java index e47f6acc9afc..5e34b963e321 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/FunctionalExpressionIncompleteHighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/FunctionalExpressionIncompleteHighlightingTest.java @@ -47,7 +47,7 @@ public class FunctionalExpressionIncompleteHighlightingTest extends LightDaemonA } private void doTest(final boolean checkWarnings) { - doTestNewInference(BASE_PATH + "/" + getTestName(false) + ".java", checkWarnings, false); + doTest(BASE_PATH + "/" + getTestName(false) + ".java", checkWarnings, false); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/FunctionalTypeWildcardParameterizationTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/FunctionalTypeWildcardParameterizationTest.java index 599ae74cd00d..72f709a48697 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/FunctionalTypeWildcardParameterizationTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/FunctionalTypeWildcardParameterizationTest.java @@ -38,7 +38,7 @@ public class FunctionalTypeWildcardParameterizationTest extends LightDaemonAnaly private void doTest() { IdeaTestUtil.setTestVersion(JavaSdkVersion.JDK_1_8, getModule(), getTestRootDisposable()); - doTestNewInference(BASE_PATH + "/" + getTestName(false) + ".java", false, false); + doTest(BASE_PATH + "/" + getTestName(false) + ".java", false, false); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GenericsHighlighting8Test.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GenericsHighlighting8Test.java index a66d999b283c..a919843a3164 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GenericsHighlighting8Test.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GenericsHighlighting8Test.java @@ -1,11 +1,11 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http:www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -24,9 +24,6 @@ import com.intellij.openapi.projectRoots.JavaSdkVersion; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.LanguageLevelProjectExtension; import com.intellij.pom.java.LanguageLevel; -import com.intellij.psi.JavaPsiFacade; -import com.intellij.psi.impl.source.resolve.PsiResolveHelperImpl; -import com.intellij.psi.impl.source.resolve.graphInference.PsiGraphInferenceHelper; import com.intellij.testFramework.IdeaTestUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -772,14 +769,7 @@ public class GenericsHighlighting8Test extends LightDaemonAnalyzerTestCase { private void doTest(boolean warnings) { LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_8); IdeaTestUtil.setTestVersion(JavaSdkVersion.JDK_1_8, getModule(), myTestRootDisposable); - final PsiResolveHelperImpl helper = (PsiResolveHelperImpl)JavaPsiFacade.getInstance(getProject()).getResolveHelper(); - helper.setTestHelper(new PsiGraphInferenceHelper(getPsiManager())); - try { - doTest(BASE_PATH + "/" + getTestName(false) + ".java", warnings, false); - } - finally { - helper.setTestHelper(null); - } + doTest(BASE_PATH + "/" + getTestName(false) + ".java", warnings, false); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GraphInferenceHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GraphInferenceHighlightingTest.java index 7585d661b289..69afb0db23bb 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GraphInferenceHighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GraphInferenceHighlightingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -236,13 +236,21 @@ public class GraphInferenceHighlightingTest extends LightDaemonAnalyzerTestCase doTest(); } + public void testIncompatibleBoundsFromAssignment() throws Exception { + doTest(); + } + + public void testFreshVariablesCreatedDuringResolveDependingOnAlreadyResolvedVariables() throws Exception { + doTest(); + } + private void doTest() throws Exception { doTest(false); } private void doTest(final boolean checkWarnings) throws Exception { IdeaTestUtil.setTestVersion(JavaSdkVersion.JDK_1_8, getModule(), getTestRootDisposable()); - doTestNewInference(BASE_PATH + "/" + getTestName(false) + ".java", checkWarnings, false); + doTest(BASE_PATH + "/" + getTestName(false) + ".java", checkWarnings, false); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaHighlightingTest.java index a3a326cfcf81..5ecab96d8926 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaHighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaHighlightingTest.java @@ -112,7 +112,7 @@ public class LambdaHighlightingTest extends LightDaemonAnalyzerTestCase { } private void doTest(final boolean checkWarnings) { - doTestNewInference(BASE_PATH + "/" + getTestName(false) + ".java", checkWarnings, false); + doTest(BASE_PATH + "/" + getTestName(false) + ".java", checkWarnings, false); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaInferenceTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaInferenceTest.java index 96e60587a225..b13cfbc22e02 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaInferenceTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaInferenceTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,6 +30,6 @@ public class LambdaInferenceTest extends LightDaemonAnalyzerTestCase { } private void doTest() throws Exception { - doTestNewInference(BASE_PATH + "/" + getTestName(false) + ".java", false, false); + doTest(BASE_PATH + "/" + getTestName(false) + ".java", false, false); } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaParamsTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaParamsTest.java index 94ca90df2d02..faf1608c1cf0 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaParamsTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaParamsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,6 +30,6 @@ public class LambdaParamsTest extends LightDaemonAnalyzerTestCase { public void testInferFromFormal() { doTest(); } private void doTest() { - doTestNewInference(BASE_PATH + "/" + getTestName(false) + ".java", false, false); + doTest(BASE_PATH + "/" + getTestName(false) + ".java", false, false); } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaRedundantCastTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaRedundantCastTest.java index 36f98aa91cc6..ae5a97933ca8 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaRedundantCastTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaRedundantCastTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,6 +35,6 @@ public class LambdaRedundantCastTest extends LightDaemonAnalyzerTestCase { public void testIntersection() { doTest(); } public void testSer() { doTest(); } private void doTest() { - doTestNewInference(BASE_PATH + "/" + getTestName(false) + ".java", true, false); + doTest(BASE_PATH + "/" + getTestName(false) + ".java", true, false); } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LightAdvHighlightingJdk8Test.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LightAdvHighlightingJdk8Test.java index 630acb0404b7..08a2b63550ff 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LightAdvHighlightingJdk8Test.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LightAdvHighlightingJdk8Test.java @@ -18,7 +18,6 @@ package com.intellij.codeInsight.daemon.lambda; import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.compiler.JavacQuirksInspection; -import com.intellij.codeInspection.unusedSymbol.UnusedSymbolLocalInspection; import com.intellij.openapi.projectRoots.JavaSdkVersion; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.testFramework.IdeaTestUtil; @@ -42,7 +41,7 @@ public class LightAdvHighlightingJdk8Test extends LightDaemonAnalyzerTestCase { private void doTest() { IdeaTestUtil.setTestVersion(JavaSdkVersion.JDK_1_8, getModule(), getTestRootDisposable()); - doTestNewInference(BASE_PATH + "/" + getTestName(false) + ".java", true, false); + doTest(BASE_PATH + "/" + getTestName(false) + ".java", true, false); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/MethodRefHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/MethodRefHighlightingTest.java index 156aac5613c1..d0bed5e9d5df 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/MethodRefHighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/MethodRefHighlightingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -116,7 +116,7 @@ public class MethodRefHighlightingTest extends LightDaemonAnalyzerTestCase { private void doTest(boolean warnings) { IdeaTestUtil.setTestVersion(JavaSdkVersion.JDK_1_8, getModule(), getTestRootDisposable()); - doTestNewInference(BASE_PATH + "/" + getTestName(false) + ".java", warnings, false); + doTest(BASE_PATH + "/" + getTestName(false) + ".java", warnings, false); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/MostSpecificResolutionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/MostSpecificResolutionTest.java index 9bb7d4801944..294a3cc8a4f6 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/MostSpecificResolutionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/MostSpecificResolutionTest.java @@ -121,7 +121,7 @@ public class MostSpecificResolutionTest extends LightDaemonAnalyzerTestCase { private void doTest(boolean warnings) { IdeaTestUtil.setTestVersion(JavaSdkVersion.JDK_1_8, getModule(), getTestRootDisposable()); - doTestNewInference(BASE_PATH + "/" + getTestName(false) + ".java", warnings, false); + doTest(BASE_PATH + "/" + getTestName(false) + ".java", warnings, false); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/NewLambdaHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/NewLambdaHighlightingTest.java index 1da75f51ba6f..712df26e356f 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/NewLambdaHighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/NewLambdaHighlightingTest.java @@ -22,6 +22,8 @@ import com.intellij.idea.Bombed; import com.intellij.openapi.projectRoots.JavaSdkVersion; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.testFramework.IdeaTestUtil; +import junit.framework.Test; +import junit.framework.TestSuite; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -71,21 +73,23 @@ public class NewLambdaHighlightingTest extends LightDaemonAnalyzerTestCase { public void testIDEA121315() { doTest(); } public void testIDEA118965comment() { doTest(); } public void testIDEA122074() { doTest(); } + @Bombed(day = 30, month = Calendar.SEPTEMBER) public void testIDEA122084() { doTest(); } public void testAdditionalConstraintDependsOnNonMentionedVars() { doTest(); } public void testIDEA122616() { doTest(); } public void testIDEA122700() { doTest(); } public void testIDEA122406() { doTest(); } - @Bombed(day = 30, month = Calendar.SEPTEMBER) public void testNestedCallsInsideLambdaReturnExpression() { doTest(); } @Bombed(day = 30, month = Calendar.SEPTEMBER) public void testIDEA123731() { doTest(); } public void testIDEA123869() { doTest(); } + @Bombed(day = 30, month = Calendar.SEPTEMBER) public void testIDEA123848() { doTest(); } public void testOnlyLambdaAtTypeParameterPlace() { doTest(); } public void testLiftedIntersectionType() { doTest(); } public void testInferenceFromReturnStatements() { doTest(); } public void testDownUpThroughLambdaReturnStatements() { doTest(); } + @Bombed(day = 30, month = Calendar.SEPTEMBER) public void testIDEA124547() { doTest(); } public void testIDEA118362() { doTest(); } public void testIDEA126056() { doTest(); } @@ -94,12 +98,17 @@ public class NewLambdaHighlightingTest extends LightDaemonAnalyzerTestCase { public void testIDEA126109() { doTest(); } public void testIDEA126809() { doTest(); } public void testIDEA124424() { doTest(); } + public void testNestedLambdaExpressions1() { doTest(); } + public void testNestedLambdaExpressionsNoFormalParams() { doTest(); } + @Bombed(day = 30, month = Calendar.SEPTEMBER) + public void testNestedLambdaExpressionsNoFormalParams1() { doTest(); } + public void testDeepNestedLambdaExpressionsNoFormalParams() { doTest(); } + public void testNestedLambdaExpressionsNoFormalParamsStopAtStandalone() { doTest(); } public void testIDEA127596() throws Exception { doTest(); } - @Bombed(day = 30, month = Calendar.SEPTEMBER) public void testIDEA124983() throws Exception { doTest(); } @@ -115,17 +124,34 @@ public class NewLambdaHighlightingTest extends LightDaemonAnalyzerTestCase { doTest(); } + public void testParenthesizedExpressionsDuringConstrainsCollection() throws Exception { + doTest(); + } + + @Bombed(day = 30, month = Calendar.SEPTEMBER) + public void testIDEA126778() throws Exception { + doTest(); + } + private void doTest() { doTest(false); } private void doTest(boolean warnings) { IdeaTestUtil.setTestVersion(JavaSdkVersion.JDK_1_8, getModule(), getTestRootDisposable()); - doTestNewInference(BASE_PATH + "/" + getTestName(false) + ".java", warnings, false); + doTest(BASE_PATH + "/" + getTestName(false) + ".java", warnings, false); } @Override protected Sdk getProjectJDK() { return IdeaTestUtil.getMockJdk18(); } +/* + public static Test suite() { + final TestSuite suite = new TestSuite(); + for (int i = 0; i < 100; i++) { + suite.addTestSuite(NewLambdaHighlightingTest.class); + } + return suite; + }*/ } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/NewMethodRefHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/NewMethodRefHighlightingTest.java index c981137d0253..0b8a66fe5b39 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/NewMethodRefHighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/NewMethodRefHighlightingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -288,7 +288,6 @@ public class NewMethodRefHighlightingTest extends LightDaemonAnalyzerTestCase { doTest(); } - @Bombed(day = 30, month = Calendar.SEPTEMBER) public void testIDEA127275_() throws Exception { doTest(); } @@ -305,7 +304,6 @@ public class NewMethodRefHighlightingTest extends LightDaemonAnalyzerTestCase { doTest(); } - @Bombed(day = 30, month = Calendar.SEPTEMBER) public void testAdditionalConstraints3Level() throws Exception { doTest(); } @@ -320,7 +318,7 @@ public class NewMethodRefHighlightingTest extends LightDaemonAnalyzerTestCase { private void doTest(boolean warnings) { IdeaTestUtil.setTestVersion(JavaSdkVersion.JDK_1_8, getModule(), getTestRootDisposable()); - doTestNewInference(BASE_PATH + "/" + getTestName(false) + ".java", warnings, false); + doTest(BASE_PATH + "/" + getTestName(false) + ".java", warnings, false); } @Override diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/OverloadResolutionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/OverloadResolutionTest.java new file mode 100644 index 000000000000..0e5c5a2f3d78 --- /dev/null +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/OverloadResolutionTest.java @@ -0,0 +1,63 @@ +/* + * Copyright 2000-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.codeInsight.daemon.lambda; + +import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase; +import com.intellij.codeInspection.LocalInspectionTool; +import com.intellij.codeInspection.unusedSymbol.UnusedSymbolLocalInspection; +import com.intellij.openapi.projectRoots.JavaSdkVersion; +import com.intellij.openapi.projectRoots.Sdk; +import com.intellij.testFramework.IdeaTestUtil; +import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; + +public class OverloadResolutionTest extends LightDaemonAnalyzerTestCase { + @NonNls static final String BASE_PATH = "/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution"; + + @NotNull + @Override + protected LocalInspectionTool[] configureLocalInspectionTools() { + return new LocalInspectionTool[]{ + new UnusedSymbolLocalInspection(), + }; + } + + public void testPertinentToApplicabilityOfExplicitlyTypedLambda() throws Exception { + doTest(); + } + + public void testVoidValueCompatibilityOfImplicitlyTypedLambda() throws Exception { + doTest(); + } + + public void testIDEA102800() throws Exception { + doTest(); + } + + private void doTest() { + doTest(true); + } + + private void doTest(boolean warnings) { + IdeaTestUtil.setTestVersion(JavaSdkVersion.JDK_1_8, getModule(), getTestRootDisposable()); + doTest(BASE_PATH + "/" + getTestName(false) + ".java", warnings, false); + } + + @Override + protected Sdk getProjectJDK() { + return IdeaTestUtil.getMockJdk18(); + } +} diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/folding/JavaFoldingTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/folding/JavaFoldingTest.groovy index 095de51543af..3907b9828888 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/folding/JavaFoldingTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/folding/JavaFoldingTest.groovy @@ -578,10 +578,14 @@ class Test { return 0; } + int arrayMethod(int param)[] { + return new int[]; + } + }""" PsiClass fooClass = JavaPsiFacade.getInstance(project).findClass('Foo', GlobalSearchScope.allScope(project)) def regions = myFixture.editor.foldingModel.allFoldRegions.sort { it.startOffset } - assert regions.size() == 3 + assert regions.size() == 4 checkAccessorFolding(regions[0], regions[1], fooClass.methods[0]) } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/generation/surroundWith/JavaSurroundWithTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/generation/surroundWith/JavaSurroundWithTest.java index 60be917bde7c..8bd53fdabfbf 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/generation/surroundWith/JavaSurroundWithTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/generation/surroundWith/JavaSurroundWithTest.java @@ -17,6 +17,7 @@ package com.intellij.codeInsight.generation.surroundWith; import com.intellij.codeInsight.template.impl.TemplateManagerImpl; import com.intellij.codeInsight.template.impl.TemplateState; +import com.intellij.ide.highlighter.JavaFileType; import com.intellij.lang.LanguageSurrounders; import com.intellij.lang.java.JavaLanguage; import com.intellij.lang.surroundWith.SurroundDescriptor; @@ -24,6 +25,7 @@ import com.intellij.lang.surroundWith.Surrounder; import com.intellij.openapi.editor.SelectionModel; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; +import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.intellij.testFramework.LightCodeInsightTestCase; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; @@ -156,6 +158,18 @@ public class JavaSurroundWithTest extends LightCodeInsightTestCase { doTest(getTestName(false), new JavaWithIfElseExpressionSurrounder()); } + public void testSurroundWithTryFinallyUsingIndents() { + CommonCodeStyleSettings.IndentOptions indentOptions = getCurrentCodeStyleSettings().getIndentOptions(JavaFileType.INSTANCE); + boolean oldUseTabs = indentOptions.USE_TAB_CHARACTER; + try { + indentOptions.USE_TAB_CHARACTER = true; + doTest(getTestName(false), new JavaWithTryFinallySurrounder()); + } + finally { + indentOptions.USE_TAB_CHARACTER = oldUseTabs; + } + } + private void doTest(@NotNull String fileName, final Surrounder surrounder) { configureByFile(BASE_PATH + fileName + ".java"); diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java index 8bac921916d3..409ebcc681c1 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java @@ -99,11 +99,26 @@ public class JavaDocInfoGeneratorTest extends CodeInsightTestCase { public void testEnumConstantOrdinal() throws Exception { PsiClass psiClass = getTestClass(); PsiField field = psiClass.getFields() [0]; - final File htmlPath = new File(JavaTestUtil.getJavaTestDataPath() + "/codeInsight/javadocIG/" + getTestName(true) + ".html"); - String htmlText = FileUtil.loadFile(htmlPath); - String docInfo = new JavaDocumentationProvider().getQuickNavigateInfo(field, field); + String docInfo = new JavaDocumentationProvider().generateDoc(field, field); assertNotNull(docInfo); - assertEquals(StringUtil.convertLineSeparators(htmlText.trim()), StringUtil.convertLineSeparators(docInfo.trim())); + assertEquals(exampleHtmlFileText(getTestName(true)), StringUtil.convertLineSeparators(docInfo.trim())); + + docInfo = new JavaDocumentationProvider().getQuickNavigateInfo(field, field); + assertNotNull(docInfo); + assertEquals(exampleHtmlFileText(getTestName(true) + "_quick"), StringUtil.convertLineSeparators(docInfo.trim())); + } + + public void testClickableFieldReference() throws Exception { + PsiClass aClass = getTestClass(); + PsiTypeElement element = aClass.getFields()[0].getTypeElement(); + String docInfo = new JavaDocumentationProvider().generateDoc(element.getInnermostComponentReferenceElement().resolve(), element); + assertNotNull(docInfo); + assertEquals(exampleHtmlFileText(getTestName(true)), StringUtil.convertLineSeparators(docInfo.trim())); + } + + private static String exampleHtmlFileText(String name) throws IOException { + final File htmlPath = new File(JavaTestUtil.getJavaTestDataPath() + "/codeInsight/javadocIG/" + name + ".html"); + return StringUtil.convertLineSeparators(FileUtil.loadFile(htmlPath).trim()); } public void testClassTypeParamsPresentation() throws Exception { @@ -111,11 +126,10 @@ public class JavaDocInfoGeneratorTest extends CodeInsightTestCase { final PsiReferenceList extendsList = psiClass.getExtendsList(); final PsiJavaCodeReferenceElement referenceElement = extendsList.getReferenceElements()[0]; final PsiClass superClass = extendsList.getReferencedTypes()[0].resolve(); - final File htmlPath = new File(JavaTestUtil.getJavaTestDataPath() + "/codeInsight/javadocIG/" + getTestName(true) + ".html"); - String htmlText = FileUtil.loadFile(htmlPath); + String docInfo = new JavaDocumentationProvider().getQuickNavigateInfo(superClass, referenceElement); assertNotNull(docInfo); - assertEquals(StringUtil.convertLineSeparators(htmlText.trim()), StringUtil.convertLineSeparators(docInfo.trim())); + assertEquals(exampleHtmlFileText(getTestName(true)), StringUtil.convertLineSeparators(docInfo.trim())); } private void doTestField() throws Exception { @@ -136,11 +150,9 @@ public class JavaDocInfoGeneratorTest extends CodeInsightTestCase { } private void verifyJavaDoc(final PsiElement field) throws IOException { - final File htmlPath = new File(JavaTestUtil.getJavaTestDataPath() + "/codeInsight/javadocIG/" + getTestName(true) + ".html"); - String htmlText = FileUtil.loadFile(htmlPath); String docInfo = new JavaDocInfoGenerator(getProject(), field).generateDocInfo(null); assertNotNull(docInfo); - assertEquals(StringUtil.convertLineSeparators(htmlText.trim()), StringUtil.convertLineSeparators(docInfo.trim())); + assertEquals(exampleHtmlFileText(getTestName(true)), StringUtil.convertLineSeparators(docInfo.trim())); } public void testPackageInfo() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/template/LiveTemplateTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/template/LiveTemplateTest.groovy index d866ddd783cf..6abd2e809cdd 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/template/LiveTemplateTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInsight/template/LiveTemplateTest.groovy @@ -14,16 +14,14 @@ * limitations under the License. */ package com.intellij.codeInsight.template + import com.intellij.JavaTestUtil import com.intellij.codeInsight.CodeInsightSettings import com.intellij.codeInsight.lookup.LookupManager import com.intellij.codeInsight.lookup.impl.LookupImpl import com.intellij.codeInsight.lookup.impl.LookupManagerImpl import com.intellij.codeInsight.template.impl.* -import com.intellij.codeInsight.template.macro.ClassNameCompleteMacro -import com.intellij.codeInsight.template.macro.CompleteMacro -import com.intellij.codeInsight.template.macro.MethodReturnTypeMacro -import com.intellij.codeInsight.template.macro.SnakeCaseMacro +import com.intellij.codeInsight.template.macro.* import com.intellij.openapi.Disposable import com.intellij.openapi.command.WriteCommandAction import com.intellij.openapi.editor.Editor @@ -39,6 +37,7 @@ import com.intellij.util.ui.UIUtil import org.jetbrains.annotations.NotNull import static com.intellij.codeInsight.template.Template.Property.USE_STATIC_IMPORT_IF_POSSIBLE + /** * @author spleaner */ @@ -462,7 +461,8 @@ class Foo { @Override protected void invokeTestRunnable(@NotNull final Runnable runnable) throws Exception { - if (name in ["testNavigationActionsDontTerminateTemplate", "testTemplateWithEnd", "testDisappearingVar", "test escape string characters in soutv"]) { + if (name in ["testNavigationActionsDontTerminateTemplate", "testTemplateWithEnd", "testDisappearingVar", + "test escape string characters in soutv", "test do not replace macro value with empty result"]) { runnable.run(); return; } @@ -823,4 +823,38 @@ class Foo { } """ } + + public void "test do not replace macro value with empty result"() { + myFixture.configureByText "a.java", """\ +class Foo { + { + <caret> + } +} +""" + final TemplateManager manager = TemplateManager.getInstance(getProject()); + final Template template = manager.createTemplate("xxx", "user", '$VAR1$ $VAR2$ $VAR1$'); + template.addVariable("VAR1", "", "", true) + template.addVariable("VAR2", new MacroCallNode(new FileNameMacro()), new ConstantNode("default"), true) + ((TemplateImpl)template).templateContext.setEnabled(contextType(JavaCodeContextType.class), true) + addTemplate(template, testRootDisposable) + + startTemplate(template); + myFixture.checkResult """\ +class Foo { + { + <caret> a.java + } +} +""" + myFixture.type 'test' + + myFixture.checkResult """\ +class Foo { + { + test<caret> a.java test + } +} +""" + } } diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/ContractInferenceFromSourceTest.groovy b/java/java-tests/testSrc/com/intellij/codeInspection/ContractInferenceFromSourceTest.groovy index c3bb014d8342..d8b6fb2c53df 100644 --- a/java/java-tests/testSrc/com/intellij/codeInspection/ContractInferenceFromSourceTest.groovy +++ b/java/java-tests/testSrc/com/intellij/codeInspection/ContractInferenceFromSourceTest.groovy @@ -161,11 +161,10 @@ class ContractInferenceFromSourceTest extends LightCodeInsightFixtureTestCase { assert c == ['null -> fail'] } - void "_test no NotNull duplication"() { + void "test no return value NotNull duplication"() { def c = inferContracts(""" - boolean smth(@org.jetbrains.annotations.NotNull Object o) { - if (o == null) throw new RuntimeException(); - return o.hashCode() == 1; + @org.jetbrains.annotations.NotNull String smth(Object o) { + return "abc"; } """) assert c == [] @@ -334,29 +333,41 @@ class ContractInferenceFromSourceTest extends LightCodeInsightFixtureTestCase { assert c == ['null -> null'] } - public void "test go inside try"() { + public void "test use invoked method notnull"() { def c = inferContracts(""" final Object foo(Object bar) { - try { - if (bar == null) return null; - bar = smth(bar); - } finally {} - return new String("abc"); + if (bar == null) return null; + return doo(); } + + @org.jetbrains.annotations.NotNull Object doo() {} """) - assert c == ['null -> null'] + assert c == ['null -> null', '!null -> !null'] } - public void "test use invoked method notnull"() { + public void "test use delegated method notnull"() { def c = inferContracts(""" final Object foo(Object bar) { - if (bar == null) return null; return doo(); } @org.jetbrains.annotations.NotNull Object doo() {} """) - assert c == ['null -> null', '!null -> !null'] + assert c == ['_ -> !null'] + } + + public void "test use delegated method notnull with contracts"() { + def c = inferContracts(""" + final Object foo(Object bar, Object o2) { + return doo(o2); + } + + @org.jetbrains.annotations.NotNull Object doo(Object o) { + if (o == null) throw new RuntimeException(); + return smth(); + } + """) + assert c == ['_, null -> fail', '_, _ -> !null'] } private String inferContract(String method) { diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java index a10d02d31fca..0acf071bbf4a 100644 --- a/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java @@ -113,7 +113,8 @@ public class DataFlowInspectionTest extends LightCodeInsightFixtureTestCase { public void testReturningNullFromVoidMethod() throws Throwable { doTest(); } public void testCatchRuntimeException() throws Throwable { doTest(); } - public void testCatchThrowable() throws Throwable { doTest(); } + // IDEA-129331 + //public void testCatchThrowable() throws Throwable { doTest(); } public void testNotNullCatchParameter() { doTest(); } public void testAssertFailInCatch() throws Throwable { diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisIntegrationTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisIntegrationTest.java index ab6d92263162..8cde2d7f1bc2 100644 --- a/java/java-tests/testSrc/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisIntegrationTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisIntegrationTest.java @@ -133,22 +133,37 @@ public class BytecodeAnalysisIntegrationTest extends JavaCodeInsightFixtureTestC return; } - // not null-result - String externalOutAnnotation = - myExternalAnnotationsManager.findExternalAnnotation(method, AnnotationUtil.NOT_NULL) == null ? "null" : "@NotNull"; - String inferredOutAnnotation = - myInferredAnnotationsManager.findInferredAnnotation(method, AnnotationUtil.NOT_NULL) == null ? "null" : "@NotNull"; String methodKey = PsiFormatUtil.getExternalName(method, false, Integer.MAX_VALUE); - if (!externalOutAnnotation.equals(inferredOutAnnotation)) { - diffs.add(methodKey + ": " + externalOutAnnotation + " != " + inferredOutAnnotation); + { + // @NotNull method + String externalNotNullMethodAnnotation = + myExternalAnnotationsManager.findExternalAnnotation(method, AnnotationUtil.NOT_NULL) == null ? "null" : "@NotNull"; + String inferredNotNullMethodAnnotation = + myInferredAnnotationsManager.findInferredAnnotation(method, AnnotationUtil.NOT_NULL) == null ? "null" : "@NotNull"; + + if (!externalNotNullMethodAnnotation.equals(inferredNotNullMethodAnnotation)) { + diffs.add(methodKey + ": " + externalNotNullMethodAnnotation + " != " + inferredNotNullMethodAnnotation); + } + } + + { + // @Nullable method + String externalNullableMethodAnnotation = + myExternalAnnotationsManager.findExternalAnnotation(method, AnnotationUtil.NULLABLE) == null ? "null" : "@Nullable"; + String inferredNullableMethodAnnotation = + myInferredAnnotationsManager.findInferredAnnotation(method, AnnotationUtil.NULLABLE) == null ? "null" : "@Nullable"; + + if (!externalNullableMethodAnnotation.equals(inferredNullableMethodAnnotation)) { + diffs.add(methodKey + ": " + externalNullableMethodAnnotation + " != " + inferredNullableMethodAnnotation); + } } for (PsiParameter parameter : method.getParameterList().getParameters()) { String parameterKey = PsiFormatUtil.getExternalName(parameter, false, Integer.MAX_VALUE); { - // @NotNull + // @NotNull parameter String externalNotNull = myExternalAnnotationsManager.findExternalAnnotation(parameter, AnnotationUtil.NOT_NULL) == null ? "null" : "@NotNull"; String inferredNotNull = @@ -159,7 +174,7 @@ public class BytecodeAnalysisIntegrationTest extends JavaCodeInsightFixtureTestC } { - // @Nullable + // @Nullable parameter String externalNullable = myExternalAnnotationsManager.findExternalAnnotation(parameter, AnnotationUtil.NULLABLE) == null ? "null" : "@Nullable"; String inferredNullable = @@ -170,6 +185,7 @@ public class BytecodeAnalysisIntegrationTest extends JavaCodeInsightFixtureTestC } } + // @Contract PsiAnnotation externalContractAnnotation = myExternalAnnotationsManager.findExternalAnnotation(method, ORG_JETBRAINS_ANNOTATIONS_CONTRACT); PsiAnnotation inferredContractAnnotation = diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisTest.java index 2cbf3fbdfd6c..abae78e2a8e5 100644 --- a/java/java-tests/testSrc/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInspection/bytecodeAnalysis/BytecodeAnalysisTest.java @@ -184,14 +184,13 @@ public class BytecodeAnalysisTest extends JavaCodeInsightFixtureTestCase { } private void checkCompoundId(Method method, PsiMethod psiMethod, boolean noKey) throws IOException { - Direction direction = new Out(); System.out.println(); System.out.println(method.internalClassName); System.out.println(method.methodName); System.out.println(method.methodDesc); - HKey psiKey = BytecodeAnalysisConverter.psiKey(psiMethod, direction, myMessageDigest); + HKey psiKey = BytecodeAnalysisConverter.psiKey(psiMethod, Direction.Out, myMessageDigest); if (noKey) { assertTrue(null == psiKey); return; @@ -199,7 +198,7 @@ public class BytecodeAnalysisTest extends JavaCodeInsightFixtureTestCase { else { assertFalse(null == psiKey); } - HKey asmKey = BytecodeAnalysisConverter.asmKey(new Key(method, direction, true), myMessageDigest); + HKey asmKey = BytecodeAnalysisConverter.asmKey(new Key(method, Direction.Out, true), myMessageDigest); Assert.assertEquals(asmKey, psiKey); } diff --git a/java/java-tests/testSrc/com/intellij/execution/configurations/JavaCommandLineTest.java b/java/java-tests/testSrc/com/intellij/execution/configurations/JavaCommandLineTest.java index 2708ac91181c..e4d0bc039c5d 100644 --- a/java/java-tests/testSrc/com/intellij/execution/configurations/JavaCommandLineTest.java +++ b/java/java-tests/testSrc/com/intellij/execution/configurations/JavaCommandLineTest.java @@ -48,6 +48,14 @@ public class JavaCommandLineTest extends LightIdeaTestCase { } } + public void testJarParameter() throws CantRunException { + JavaParameters javaParameters = new JavaParameters(); + javaParameters.setJdk(getProjectJDK()); + javaParameters.setJarPath("my-jar-file.jar"); + String commandLineString = CommandLineBuilder.createFromJavaParameters(javaParameters).getCommandLineString(); + assertTrue(commandLineString, commandLineString.contains("-jar my-jar-file.jar")); + } + public void testClasspath() throws CantRunException { JavaParameters javaParameters; String commandLineString; @@ -55,12 +63,14 @@ public class JavaCommandLineTest extends LightIdeaTestCase { javaParameters = new JavaParameters(); final Sdk internalJdk = JavaAwareProjectJdkTableImpl.getInstanceEx().getInternalJdk(); javaParameters.setJdk(internalJdk); + javaParameters.getClassPath().add("my-jar-file.jar"); javaParameters.setMainClass("Main"); commandLineString = CommandLineBuilder.createFromJavaParameters(javaParameters).getCommandLineString(); assertTrue(containsClassPath(commandLineString)); javaParameters = new JavaParameters(); javaParameters.setJdk(internalJdk); + javaParameters.getClassPath().add("my-jar-file.jar"); javaParameters.setMainClass("Main"); javaParameters.getVMParametersList().add("-cp"); javaParameters.getVMParametersList().add(".."); @@ -70,6 +80,7 @@ public class JavaCommandLineTest extends LightIdeaTestCase { javaParameters = new JavaParameters(); javaParameters.setJdk(internalJdk); + javaParameters.getClassPath().add("my-jar-file.jar"); javaParameters.setMainClass("Main"); javaParameters.getVMParametersList().add("-classpath"); javaParameters.getVMParametersList().add(".."); diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterWrapTest.java b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterWrapTest.java index c06370b06743..b16e23e83e37 100644 --- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterWrapTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterWrapTest.java @@ -16,7 +16,6 @@ package com.intellij.psi.formatter.java; import com.intellij.idea.Bombed; -import com.intellij.lang.java.JavaLanguage; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.codeStyle.CommonCodeStyleSettings; @@ -448,4 +447,34 @@ public class JavaFormatterWrapTest extends AbstractJavaFormatterTest { " public @TA String m();\n" + "}"); } + + public void testKeepSingleFieldAnnotationOnSameLine() { + getJavaSettings().DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION = true; + doClassTest( + "@NotNull public String result = \"OK\"\n" + + "@NotNull String newResult = \"OK\"\n" + + "@NotNull\n" + + "@Deprecated public String bad = \"bad\"", + + "@NotNull public String result = \"OK\"\n" + + "@NotNull String newResult = \"OK\"\n" + + "@NotNull\n" + + "@Deprecated\n" + + "public String bad = \"bad\"" + ); + } + + public void testMoveSingleAnnotationOnSameLine() { + getJavaSettings().DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION = true; + getSettings().KEEP_LINE_BREAKS = false; + doClassTest( + "@NotNull\n" + + "public String test = \"tst\";\n" + + "String ok = \"ok\";\n", + "@NotNull public String test = \"tst\";\n" + + "String ok = \"ok\";\n" + ); + } + + } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObject4DebuggerTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObject4DebuggerTest.java new file mode 100644 index 000000000000..9321cf9a6695 --- /dev/null +++ b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObject4DebuggerTest.java @@ -0,0 +1,179 @@ +/* + * Copyright 2000-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* + * User: anna + * Date: 06-May-2008 + */ +package com.intellij.refactoring; + +import com.intellij.JavaTestUtil; +import com.intellij.idea.Bombed; +import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.projectRoots.Sdk; +import com.intellij.psi.*; +import com.intellij.refactoring.extractMethodObject.ExtractLightMethodObjectHandler; +import com.intellij.testFramework.IdeaTestUtil; +import org.jetbrains.annotations.NotNull; + +import java.util.Calendar; + +public class ExtractMethodObject4DebuggerTest extends LightRefactoringTestCase { + @NotNull + @Override + protected String getTestDataPath() { + return JavaTestUtil.getJavaTestDataPath(); + } + + private void doTest(String evaluatedText, String expectedCallSite, String expectedClass) throws Exception { + final String testName = getTestName(false); + configureByFile("/refactoring/extractMethodObject4Debugger/" + testName + ".java"); + final int offset = getEditor().getCaretModel().getOffset(); + final PsiElement context = getFile().findElementAt(offset); + final JavaCodeFragment fragment = JavaCodeFragmentFactory.getInstance(getProject()).createCodeBlockCodeFragment(evaluatedText, context, false); + final ExtractLightMethodObjectHandler.ExtractedData extractedData = + ExtractLightMethodObjectHandler.extractLightMethodObject(getProject(), getFile(), fragment, "test"); + assertNotNull(extractedData); + assertEquals(expectedCallSite, extractedData.getGeneratedCallText()); + final PsiClass innerClass = extractedData.getGeneratedInnerClass(); + assertEquals(expectedClass, innerClass.getText()); + } + + public void testSimpleGeneration() throws Exception { + doTest("int i = 0; int j = 0;", "Test test = new Test().invoke();int i = test.getI();int j = test.getJ();", + + "public class Test {\n" + + " private int i;\n" + + " private int j;\n" + + "\n" + + " public int getI() {\n" + + " return i;\n" + + " }\n" + + "\n" + + " public int getJ() {\n" + + " return j;\n" + + " }\n" + + "\n" + + " public Test invoke() {\n" + + " i = 0;\n" + + " j = 0;\n" + + " return this;\n" + + " }\n" + + " }"); + } + + public void testInvokeReturnType() throws Exception { + doTest("x = 6; y = 6;", "Test test = new Test().invoke();x = test.getX();y = test.getY();", + + "public static class Test {\n" + + " private int x;\n" + + " private int y;\n" + + "\n" + + " public int getX() {\n" + + " return x;\n" + + " }\n" + + "\n" + + " public int getY() {\n" + + " return y;\n" + + " }\n" + + "\n" + + " public Test invoke() {\n" + + " x = 6;\n" + + " y = 6;\n" + + " return this;\n" + + " }\n" + + " }"); + } + + public void testAnonymousClassParams() throws Exception { + doTest("new I() {public void foo(int i) {i++;}};", "I result = new Test().invoke();", + + "public class Test {\n" + + " public I invoke() {\n" + + " return new I() {\n" + + " public void foo(int i) {\n" + + " i++;\n" + + " }\n" + + " };\n" + + " }\n" + + " }"); + } + + public void testInnerClass() throws Exception { + doTest(" new I(2).foo()", "new Test().invoke();", + + "public class Test {\n" + + " public void invoke() {\n" + + " new Sample.I(2).foo();\n" + + " }\n" + + " }"); + } + + public void testResultExpr() throws Exception { + doTest(" foo()", "int result = new Test().invoke();", + + "public class Test {\n" + + " public int invoke() {\n" + + " return foo();\n" + + " }\n" + + " }"); + } + + public void testResultStatements() throws Exception { + doTest("int i = 0;\nfoo()", "Test test = new Test().invoke();int i = test.getI();int result = test.getResult();", + + "public class Test {\n" + + " private int i;\n" + + " private int result;\n" + + "\n" + + " public int getI() {\n" + + " return i;\n" + + " }\n" + + "\n" + + " public int getResult() {\n" + + " return result;\n" + + " }\n" + + "\n" + + " public Test invoke() {\n" + + " i = 0;\n" + + " result = foo();\n" + + " return this;\n" + + " }\n" + + " }"); + } + + + public void testOffsetsAtCallSite() throws Exception { + doTest("map.entrySet().stream().filter((a) -> (a.getKey()>0));", + "java.util.stream.Stream<Map.Entry<Integer,Integer>> result = new Test(map).invoke();", + "public class Test {\n" + + " private Map<Integer, Integer> map;\n" + + "\n" + + " public Test(Map<Integer, Integer> map) {\n" + + " this.map = map;\n" + + " }\n" + + "\n" + + " public Stream<Map.Entry<Integer, Integer>> invoke() {\n" + + " return map.entrySet().stream().filter((a) -> (a.getKey() > 0));\n" + + " }\n" + + " }"); + } + + @Override + protected Sdk getProjectJDK() { + return IdeaTestUtil.getMockJdk18(); + } +} diff --git a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java index 34745372977e..6ef80d01903e 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java @@ -18,9 +18,10 @@ package com.intellij.refactoring; import com.intellij.JavaTestUtil; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; -import com.intellij.psi.*; -import com.intellij.psi.impl.source.resolve.PsiResolveHelperImpl; -import com.intellij.psi.impl.source.resolve.graphInference.PsiGraphInferenceHelper; +import com.intellij.psi.CommonClassNames; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiExpression; +import com.intellij.psi.PsiType; import com.intellij.refactoring.introduce.inplace.OccurrencesChooser; import com.intellij.refactoring.introduceVariable.InputValidator; import com.intellij.refactoring.introduceVariable.IntroduceVariableBase; @@ -95,15 +96,8 @@ public class IntroduceVariableTest extends LightCodeInsightTestCase { } public void testExpectedType8Inference() { - final PsiResolveHelperImpl helper = (PsiResolveHelperImpl)JavaPsiFacade.getInstance(getProject()).getResolveHelper(); - helper.setTestHelper(new PsiGraphInferenceHelper(getPsiManager())); - try { - doTest(new MockIntroduceVariableHandler("temp", true, false, false, - "java.util.Map<java.lang.String,java.util.List<java.lang.String>>")); - } - finally { - helper.setTestHelper(null); - } + doTest(new MockIntroduceVariableHandler("temp", true, false, false, + "java.util.Map<java.lang.String,java.util.List<java.lang.String>>")); } public void testMethodCall() { |