Add more annotations

1 files changed, 42 insertions, 12 deletions

diff --git a/src/core/lombok/core/handlers/HandlerUtil.java b/src/core/lombok/core/handlers/HandlerUtil.java
index 33f2c00f..7c71af4b 100644
--- a/src/core/lombok/core/handlers/HandlerUtil.java
+++ b/src/core/lombok/core/handlers/HandlerUtil.java
@@ -83,42 +83,73 @@ public class HandlerUtil {
 		NONNULL_ANNOTATIONS = Collections.unmodifiableList(Arrays.asList(new String[] {
 			"android.annotation.NonNull",
 			"android.support.annotation.NonNull",
+			"android.support.annotation.RecentlyNonNull",
 			"androidx.annotation.NonNull",
 			"androidx.annotation.RecentlyNonNull",
+			"com.android.annotations.NonNull",
+			"com.google.firebase.database.annotations.NotNull",
+			"com.google.firebase.internal.NonNull",
+			"com.mongodb.lang.NonNull",
+			"com.sun.istack.NotNull",
 			"com.sun.istack.internal.NotNull",
+			"com.unboundid.util.NotNull",
 			"edu.umd.cs.findbugs.annotations.NonNull",
+			"io.micrometer.core.lang.NonNull",
 			"io.reactivex.annotations.NonNull",
 			"io.reactivex.rxjava3.annotations.NonNull",
 			"javax.annotation.Nonnull",
 			// "javax.validation.constraints.NotNull", // The field might contain a null value until it is persisted.
+			"libcore.util.NonNull",
 			"lombok.NonNull",
+			"org.antlr.v4.runtime.misc.NotNull",
 			"org.checkerframework.checker.nullness.qual.NonNull",
 			"org.checkerframework.checker.nullness.compatqual.NonNullDecl",
 			"org.checkerframework.checker.nullness.compatqual.NonNullType",
 			"org.codehaus.commons.nullanalysis.NotNull",
 			"org.eclipse.jdt.annotation.NonNull",
 			"org.eclipse.jgit.annotations.NonNull",
+			"org.eclipse.lsp4j.jsonrpc.validation.NonNull",
 			"org.jetbrains.annotations.NotNull",
 			"org.jmlspecs.annotation.NonNull",
 			"org.netbeans.api.annotations.common.NonNull",
 			"org.springframework.lang.NonNull",
+			"reactor.util.annotation.NonNull",
 		}));
 		BASE_COPYABLE_ANNOTATIONS = Collections.unmodifiableList(Arrays.asList(new String[] {
 			"android.annotation.NonNull",
 			"android.annotation.Nullable",
 			"android.support.annotation.NonNull",
 			"android.support.annotation.Nullable",
+			"android.support.annotation.RecentlyNonNull",
+			"android.support.annotation.RecentlyNullable",
 			"androidx.annotation.NonNull",
 			"androidx.annotation.Nullable",
 			"androidx.annotation.RecentlyNonNull",
 			"androidx.annotation.RecentlyNullable",
+			"com.android.annotations.NonNull",
+			"com.android.annotations.Nullable",
+			"com.beust.jcommander.internal.Nullable",
+			"com.google.api.server.spi.config.Nullable",
+			"com.google.firebase.database.annotations.NotNull",
+			"com.google.firebase.database.annotations.Nullable",
+			"com.google.firebase.internal.NonNull",
+			"com.google.firebase.internal.Nullable",
+			"com.google.gerrit.common.Nullable",
+			"com.mongodb.lang.NonNull",
+			"com.mongodb.lang.Nullable",
+			"com.sun.istack.NotNull",
+			"com.sun.istack.Nullable",
 			"com.sun.istack.internal.NotNull",
 			"com.sun.istack.internal.Nullable",
+			"com.unboundid.util.NotNull",
+			"com.unboundid.util.Nullable",
 			"edu.umd.cs.findbugs.annotations.CheckForNull",
 			"edu.umd.cs.findbugs.annotations.NonNull",
 			"edu.umd.cs.findbugs.annotations.Nullable",
 			"edu.umd.cs.findbugs.annotations.PossiblyNull",
 			"edu.umd.cs.findbugs.annotations.UnknownNullness",
+			"io.micrometer.core.lang.NonNull",
+			"io.micrometer.core.lang.Nullable",
 			"io.reactivex.annotations.NonNull",
 			"io.reactivex.annotations.Nullable",
 			"io.reactivex.rxjava3.annotations.NonNull",
@@ -127,19 +158,28 @@ public class HandlerUtil {
 			"javax.annotation.Nonnull",
 			"javax.annotation.Nonnull",
 			"javax.annotation.Nullable",
+			"javax.validation.constraints.NotNull",
+			"junitparams.converters.Nullable",
+			"libcore.util.NonNull",
+			"libcore.util.Nullable",
 			"lombok.NonNull",
+			"org.antlr.v4.runtime.misc.NotNull",
+			"org.apache.avro.reflect.Nullable",
+			"org.apache.cxf.jaxrs.ext.Nullable",
+			"org.apache.shindig.common.Nullable",
 			"org.checkerframework.checker.nullness.compatqual.NonNullDecl",
 			"org.checkerframework.checker.nullness.compatqual.NonNullType",
 			"org.checkerframework.checker.nullness.compatqual.NullableDecl",
 			"org.checkerframework.checker.nullness.compatqual.NullableType",
-			"org.checkerframework.checker.nullness.qual.NonNull"
-			"org.checkerframework.checker.nullness.qual.Nullable"
+			"org.checkerframework.checker.nullness.qual.NonNull",
+			"org.checkerframework.checker.nullness.qual.Nullable",
 			"org.codehaus.commons.nullanalysis.NotNull",
 			"org.codehaus.commons.nullanalysis.Nullable",
 			"org.eclipse.jdt.annotation.NonNull",
 			"org.eclipse.jdt.annotation.Nullable",
 			"org.eclipse.jgit.annotations.NonNull",
 			"org.eclipse.jgit.annotations.Nullable",
+			"org.eclipse.lsp4j.jsonrpc.validation.NonNull",
 			"org.jetbrains.annotations.NotNull",
 			"org.jetbrains.annotations.Nullable",
 			"org.jmlspecs.annotation.NonNull",
@@ -253,12 +293,9 @@ public class HandlerUtil {
 			"org.checkerframework.checker.nullness.qual.KeyForBottom",
 			"org.checkerframework.checker.nullness.qual.MonotonicNonNull",
 			"org.checkerframework.checker.nullness.qual.NonNull",
-			"org.checkerframework.checker.nullness.qual.NonRaw",
 			"org.checkerframework.checker.nullness.qual.Nullable",
 			"org.checkerframework.checker.nullness.qual.PolyKeyFor",
 			"org.checkerframework.checker.nullness.qual.PolyNull",
-			"org.checkerframework.checker.nullness.qual.PolyRaw",
-			"org.checkerframework.checker.nullness.qual.Raw",
 			"org.checkerframework.checker.nullness.qual.UnknownKeyFor",
 			"org.checkerframework.checker.optional.qual.MaybePresent",
 			"org.checkerframework.checker.optional.qual.OptionalBottom",
@@ -273,7 +310,6 @@ public class HandlerUtil {
 			"org.checkerframework.checker.regex.qual.UnknownRegex",
 			"org.checkerframework.checker.signature.qual.ArrayWithoutPackage",
 			"org.checkerframework.checker.signature.qual.BinaryName",
-			"org.checkerframework.checker.signature.qual.BinaryNameInUnnamedPackage",
 			"org.checkerframework.checker.signature.qual.BinaryNameOrPrimitiveType",
 			"org.checkerframework.checker.signature.qual.BinaryNameWithoutPackage",
 			"org.checkerframework.checker.signature.qual.CanonicalName",
@@ -286,21 +322,17 @@ public class HandlerUtil {
 			"org.checkerframework.checker.signature.qual.DotSeparatedIdentifiersOrPrimitiveType",
 			"org.checkerframework.checker.signature.qual.FieldDescriptor",
 			"org.checkerframework.checker.signature.qual.FieldDescriptorForPrimitive",
-			"org.checkerframework.checker.signature.qual.FieldDescriptorForPrimitiveOrArrayInUnnamedPackage",
 			"org.checkerframework.checker.signature.qual.FieldDescriptorWithoutPackage",
 			"org.checkerframework.checker.signature.qual.FqBinaryName",
 			"org.checkerframework.checker.signature.qual.FullyQualifiedName",
 			"org.checkerframework.checker.signature.qual.Identifier",
-			"org.checkerframework.checker.signature.qual.IdentifierOrArray",
 			"org.checkerframework.checker.signature.qual.IdentifierOrPrimitiveType",
 			"org.checkerframework.checker.signature.qual.InternalForm",
 			"org.checkerframework.checker.signature.qual.MethodDescriptor",
 			"org.checkerframework.checker.signature.qual.PolySignature",
 			"org.checkerframework.checker.signature.qual.PrimitiveType",
 			"org.checkerframework.checker.signature.qual.SignatureBottom",
-			"org.checkerframework.checker.signedness.qual.Constant",
 			"org.checkerframework.checker.signedness.qual.PolySigned",
-			"org.checkerframework.checker.signedness.qual.PolySignedness",
 			"org.checkerframework.checker.signedness.qual.Signed",
 			"org.checkerframework.checker.signedness.qual.SignednessBottom",
 			"org.checkerframework.checker.signedness.qual.SignednessGlb",
@@ -386,9 +418,7 @@ public class HandlerUtil {
 			"org.checkerframework.common.value.qual.PolyValue",
 			"org.checkerframework.common.value.qual.StringVal",
 			"org.checkerframework.common.value.qual.UnknownVal",
-			"org.checkerframework.framework.qual.PolyAll",
 			"org.checkerframework.framework.qual.PurityUnqualified",
-			"org.checkerframework.framework.util.PurityUnqualified",
 		}));
 		COPY_TO_SETTER_ANNOTATIONS = Collections.unmodifiableList(Arrays.asList(new String[] {
 			"com.fasterxml.jackson.annotation.JacksonInject",