2020-05-01 22:03:47 +00:00
|
|
|
From 97522334c2889d82b4b13fbb754bbf3b7cd4f4e3 Mon Sep 17 00:00:00 2001
|
2019-03-24 23:13:07 +00:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Sun, 24 Mar 2019 18:44:26 -0400
|
|
|
|
Subject: [PATCH] Ignore package-private methods for nullability annotations
|
|
|
|
|
|
|
|
This isn't API
|
|
|
|
|
|
|
|
diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
|
2020-04-02 21:07:06 +00:00
|
|
|
index 38be576b3..a48be38b1 100644
|
2019-03-24 23:13:07 +00:00
|
|
|
--- a/src/test/java/org/bukkit/AnnotationTest.java
|
|
|
|
+++ b/src/test/java/org/bukkit/AnnotationTest.java
|
2019-05-22 04:14:56 +00:00
|
|
|
@@ -162,7 +162,7 @@ public class AnnotationTest {
|
2019-03-24 23:13:07 +00:00
|
|
|
|
|
|
|
private static boolean isMethodIncluded(@NotNull ClassNode clazz, @NotNull MethodNode method, @NotNull Map<String, ClassNode> allClasses) {
|
|
|
|
// Exclude private, synthetic and deprecated methods
|
|
|
|
- if ((method.access & (Opcodes.ACC_PRIVATE | Opcodes.ACC_SYNTHETIC | Opcodes.ACC_DEPRECATED)) != 0) {
|
|
|
|
+ if ((method.access & (Opcodes.ACC_PRIVATE | Opcodes.ACC_SYNTHETIC | Opcodes.ACC_DEPRECATED)) != 0 || (method.access & (Opcodes.ACC_PRIVATE | Opcodes.ACC_PROTECTED | Opcodes.ACC_PUBLIC)) == 0) { // Paper - ignore package-private
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
--
|
2020-05-01 22:03:47 +00:00
|
|
|
2.26.2
|
2019-03-24 23:13:07 +00:00
|
|
|
|