Replace annotations with internal aliases.

raphw · Dec 16, 2021 · a9ab948 · a9ab948
1 parent 111521a
commit a9ab948
Show file tree

Hide file tree

Showing 58 changed files with 55 additions and 67 deletions.
diff --git a/byte-buddy-agent/src/main/java/net/bytebuddy/agent/VirtualMachine.java b/byte-buddy-agent/src/main/java/net/bytebuddy/agent/VirtualMachine.java
@@ -24,8 +24,6 @@
 import net.bytebuddy.agent.nullability.MaybeNull;
 import net.bytebuddy.agent.nullability.UnknownNull;
 
-import javax.annotation.Nonnull;
-import javax.annotation.meta.When;
 import java.io.*;
 import java.net.ServerSocket;
 import java.net.Socket;

diff --git a/byte-buddy-android/src/main/java/net/bytebuddy/android/package-info.java b/byte-buddy-android/src/main/java/net/bytebuddy/android/package-info.java
@@ -16,7 +16,7 @@
 /**
  * This package is dedicated to supporting Byte Buddy on Android devices.
  */
-@NeverNull
+@NeverNull.ByDefault
 package net.bytebuddy.android;
 
 import net.bytebuddy.utility.nullability.NeverNull;
diff --git a/byte-buddy-benchmark/src/main/java/net/bytebuddy/benchmark/ClassByExtensionBenchmark.java b/byte-buddy-benchmark/src/main/java/net/bytebuddy/benchmark/ClassByExtensionBenchmark.java
@@ -28,6 +28,7 @@
 import net.bytebuddy.implementation.SuperMethodCall;
 import net.bytebuddy.implementation.bind.annotation.*;
 import net.bytebuddy.pool.TypePool;
+import net.bytebuddy.utility.nullability.MaybeNull;
 import net.sf.cglib.proxy.*;
 import org.openjdk.jmh.annotations.*;
 

diff --git a/...buddy-benchmark/src/main/java/net/bytebuddy/benchmark/ClassByImplementationBenchmark.java b/...buddy-benchmark/src/main/java/net/bytebuddy/benchmark/ClassByImplementationBenchmark.java
@@ -25,6 +25,8 @@
 import net.bytebuddy.dynamic.scaffold.TypeValidation;
 import net.bytebuddy.implementation.StubMethod;
 import net.bytebuddy.pool.TypePool;
+import net.bytebuddy.utility.nullability.AlwaysNull;
+import net.bytebuddy.utility.nullability.MaybeNull;
 import net.sf.cglib.proxy.CallbackHelper;
 import net.sf.cglib.proxy.Enhancer;
 import net.sf.cglib.proxy.FixedValue;
@@ -257,79 +259,79 @@ public double method(double arg) {
             /**
              * {@inheritDoc}
              */
-            @MaybeNull
+            @AlwaysNull
             public Object method(Object arg) {
                 return null;
             }
 
             /**
              * {@inheritDoc}
              */
-            @MaybeNull
+            @AlwaysNull
             public boolean[] method(boolean arg1, boolean arg2, boolean arg3) {
                 return null;
             }
 
             /**
              * {@inheritDoc}
              */
-            @MaybeNull
+            @AlwaysNull
             public byte[] method(byte arg1, byte arg2, byte arg3) {
                 return null;
             }
 
             /**
              * {@inheritDoc}
              */
-            @MaybeNull
+            @AlwaysNull
             public short[] method(short arg1, short arg2, short arg3) {
                 return null;
             }
 
             /**
              * {@inheritDoc}
              */
-            @MaybeNull
+            @AlwaysNull
             public int[] method(int arg1, int arg2, int arg3) {
                 return null;
             }
 
             /**
              * {@inheritDoc}
              */
-            @MaybeNull
+            @AlwaysNull
             public char[] method(char arg1, char arg2, char arg3) {
                 return null;
             }
 
             /**
              * {@inheritDoc}
              */
-            @MaybeNull
+            @AlwaysNull
             public long[] method(long arg1, long arg2, long arg3) {
                 return null;
             }
 
             /**
              * {@inheritDoc}
              */
-            @MaybeNull
+            @AlwaysNull
             public float[] method(float arg1, float arg2, float arg3) {
                 return null;
             }
 
             /**
              * {@inheritDoc}
              */
-            @MaybeNull
+            @AlwaysNull
             public double[] method(double arg1, double arg2, double arg3) {
                 return null;
             }
 
             /**
              * {@inheritDoc}
              */
-            @MaybeNull
+            @AlwaysNull
             public Object[] method(Object arg1, Object arg2, Object arg3) {
                 return null;
             }

diff --git a/byte-buddy-benchmark/src/main/java/net/bytebuddy/benchmark/StubInvocationBenchmark.java b/byte-buddy-benchmark/src/main/java/net/bytebuddy/benchmark/StubInvocationBenchmark.java
@@ -16,6 +16,7 @@
 package net.bytebuddy.benchmark;
 
 import net.bytebuddy.benchmark.specimen.ExampleInterface;
+import net.bytebuddy.utility.nullability.MaybeNull;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 

diff --git a/...-buddy-benchmark/src/main/java/net/bytebuddy/benchmark/SuperClassInvocationBenchmark.java b/...-buddy-benchmark/src/main/java/net/bytebuddy/benchmark/SuperClassInvocationBenchmark.java
@@ -16,6 +16,7 @@
 package net.bytebuddy.benchmark;
 
 import net.bytebuddy.benchmark.specimen.ExampleClass;
+import net.bytebuddy.utility.nullability.MaybeNull;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.Blackhole;
 

diff --git a/byte-buddy-benchmark/src/main/java/net/bytebuddy/benchmark/package-info.java b/byte-buddy-benchmark/src/main/java/net/bytebuddy/benchmark/package-info.java
@@ -16,7 +16,7 @@
 /**
  * A package containing benchmarks for Byte Buddy and other code generation libraries.
  */
-@NeverNull
+@NeverNull.ByDefault
 package net.bytebuddy.benchmark;
 
 import net.bytebuddy.utility.nullability.NeverNull;
diff --git a/byte-buddy-benchmark/src/main/java/net/bytebuddy/benchmark/runner/package-info.java b/byte-buddy-benchmark/src/main/java/net/bytebuddy/benchmark/runner/package-info.java
@@ -16,7 +16,7 @@
 /**
  * A package dedicated to running benchmarks.
  */
-@NeverNull
+@NeverNull.ByDefault
 package net.bytebuddy.benchmark.runner;
 
 import net.bytebuddy.utility.nullability.NeverNull;
diff --git a/byte-buddy-benchmark/src/main/java/net/bytebuddy/benchmark/specimen/ExampleInterface.java b/byte-buddy-benchmark/src/main/java/net/bytebuddy/benchmark/specimen/ExampleInterface.java
@@ -15,6 +15,8 @@
  */
 package net.bytebuddy.benchmark.specimen;
 
+import net.bytebuddy.utility.nullability.MaybeNull;
+
 /**
  * An example interface with several methods which is used as a specimen in benchmarks.
  */

diff --git a/byte-buddy-benchmark/src/main/java/net/bytebuddy/benchmark/specimen/package-info.java b/byte-buddy-benchmark/src/main/java/net/bytebuddy/benchmark/specimen/package-info.java
@@ -16,7 +16,7 @@
 /**
  * Specimen classes which are required for some benchmarks.
  */
-@NeverNull
+@NeverNull.ByDefault
 package net.bytebuddy.benchmark.specimen;
 
 import net.bytebuddy.utility.nullability.NeverNull;
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/agent/builder/AgentBuilder.java b/byte-buddy-dep/src/main/java/net/bytebuddy/agent/builder/AgentBuilder.java
@@ -67,10 +67,10 @@
 import net.bytebuddy.utility.JavaModule;
 import net.bytebuddy.utility.JavaType;
 import net.bytebuddy.utility.dispatcher.JavaDispatcher;
+import net.bytebuddy.utility.nullability.AlwaysNull;
 import net.bytebuddy.utility.nullability.MaybeNull;
 import org.objectweb.asm.*;
 
-import javax.annotation.CheckForNull;
 import java.io.*;
 import java.lang.instrument.*;
 import java.lang.ref.WeakReference;

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/agent/builder/package-info.java b/byte-buddy-dep/src/main/java/net/bytebuddy/agent/builder/package-info.java
@@ -19,7 +19,7 @@
  * but offers higher-level APIs in order to allow for the implementation of very readable transformations using
  * {@link net.bytebuddy.ByteBuddy}.
  */
-@NeverNull
+@NeverNull.ByDefault
 package net.bytebuddy.agent.builder;
 
 import net.bytebuddy.utility.nullability.NeverNull;
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/asm/AsmVisitorWrapper.java b/byte-buddy-dep/src/main/java/net/bytebuddy/asm/AsmVisitorWrapper.java
@@ -31,7 +31,6 @@
 import org.objectweb.asm.FieldVisitor;
 import org.objectweb.asm.MethodVisitor;
 
-import javax.annotation.CheckForNull;
 import java.util.*;
 
 import static net.bytebuddy.matcher.ElementMatchers.isConstructor;

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/asm/MemberSubstitution.java b/byte-buddy-dep/src/main/java/net/bytebuddy/asm/MemberSubstitution.java
@@ -43,6 +43,7 @@
 import net.bytebuddy.pool.TypePool;
 import net.bytebuddy.utility.CompoundList;
 import net.bytebuddy.utility.OpenedClassReader;
+import net.bytebuddy.utility.nullability.MaybeNull;
 import net.bytebuddy.utility.visitor.LocalVariableAwareMethodVisitor;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/build/HashCodeAndEqualsPlugin.java b/byte-buddy-dep/src/main/java/net/bytebuddy/build/HashCodeAndEqualsPlugin.java
@@ -30,10 +30,10 @@
 import net.bytebuddy.implementation.attribute.MethodAttributeAppender;
 import net.bytebuddy.matcher.ElementMatcher;
 import net.bytebuddy.matcher.ElementMatchers;
+import net.bytebuddy.utility.nullability.MaybeNull;
 import org.objectweb.asm.AnnotationVisitor;
 import org.objectweb.asm.MethodVisitor;
 
-import javax.annotation.CheckForNull;
 import java.lang.annotation.*;
 import java.util.Comparator;
 

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java b/byte-buddy-dep/src/main/java/net/bytebuddy/build/Plugin.java
@@ -31,7 +31,6 @@
 import net.bytebuddy.utility.nullability.AlwaysNull;
 import net.bytebuddy.utility.nullability.MaybeNull;
 
-import javax.annotation.CheckForNull;
 import java.io.*;
 import java.lang.annotation.*;
 import java.lang.reflect.Constructor;

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/build/ToStringPlugin.java b/byte-buddy-dep/src/main/java/net/bytebuddy/build/ToStringPlugin.java
@@ -24,8 +24,8 @@
 import net.bytebuddy.dynamic.DynamicType;
 import net.bytebuddy.implementation.ToStringMethod;
 import net.bytebuddy.matcher.ElementMatchers;
+import net.bytebuddy.utility.nullability.MaybeNull;
 
-import javax.annotation.CheckForNull;
 import java.lang.annotation.*;
 
 import static net.bytebuddy.matcher.ElementMatchers.*;

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/TypeVariableSource.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/TypeVariableSource.java
@@ -18,6 +18,8 @@
 import net.bytebuddy.description.method.MethodDescription;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.description.type.TypeList;
+import net.bytebuddy.utility.nullability.AlwaysNull;
+import net.bytebuddy.utility.nullability.MaybeNull;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/annotation/AnnotationDescription.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/annotation/AnnotationDescription.java
@@ -30,7 +30,6 @@
 import net.bytebuddy.utility.nullability.MaybeNull;
 import net.bytebuddy.utility.privilege.SetAccessibleAction;
 
-import javax.annotation.CheckForNull;
 import java.lang.annotation.*;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/annotation/AnnotationValue.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/annotation/AnnotationValue.java
@@ -25,7 +25,6 @@
 import net.bytebuddy.utility.nullability.AlwaysNull;
 import net.bytebuddy.utility.nullability.MaybeNull;
 
-import javax.annotation.CheckForNull;
 import java.lang.annotation.Annotation;
 import java.lang.annotation.AnnotationTypeMismatchException;
 import java.lang.annotation.IncompleteAnnotationException;

diff --git a/...buddy-dep/src/main/java/net/bytebuddy/description/enumeration/EnumerationDescription.java b/...buddy-dep/src/main/java/net/bytebuddy/description/enumeration/EnumerationDescription.java
@@ -18,8 +18,8 @@
 import net.bytebuddy.build.CachedReturnPlugin;
 import net.bytebuddy.description.NamedElement;
 import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.utility.nullability.MaybeNull;
 
-import javax.annotation.CheckForNull;
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/field/FieldDescription.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/field/FieldDescription.java
@@ -30,7 +30,6 @@
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.signature.SignatureWriter;
 
-import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 import java.lang.reflect.Field;
 import java.lang.reflect.GenericSignatureFormatError;

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/method/MethodDescription.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/method/MethodDescription.java
@@ -39,7 +39,6 @@
 import org.objectweb.asm.Type;
 import org.objectweb.asm.signature.SignatureWriter;
 
-import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.*;

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/method/ParameterDescription.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/method/ParameterDescription.java
@@ -34,7 +34,6 @@
 import net.bytebuddy.utility.nullability.AlwaysNull;
 import net.bytebuddy.utility.nullability.MaybeNull;
 
-import javax.annotation.CheckForNull;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Constructor;

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/package-info.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/package-info.java
@@ -18,7 +18,7 @@
  * reflection API, it would be required to load classes but by using these descriptions, it is possible to
  * represent byte code elements without prior loading.
  */
-@NeverNull
+@NeverNull.ByDefault
 package net.bytebuddy.description;
 
 import net.bytebuddy.utility.nullability.NeverNull;
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/PackageDescription.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/PackageDescription.java
@@ -19,10 +19,9 @@
 import net.bytebuddy.description.annotation.AnnotationList;
 import net.bytebuddy.description.annotation.AnnotationSource;
 import net.bytebuddy.utility.nullability.AlwaysNull;
+import net.bytebuddy.utility.nullability.MaybeNull;
 import org.objectweb.asm.Opcodes;
 
-import javax.annotation.CheckForNull;
-
 /**
  * A package description represents a Java package.
  */

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/RecordComponentDescription.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/RecordComponentDescription.java
@@ -29,7 +29,6 @@
 import net.bytebuddy.utility.nullability.MaybeNull;
 import org.objectweb.asm.signature.SignatureWriter;
 
-import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.GenericSignatureFormatError;

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/TypeDefinition.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/TypeDefinition.java
@@ -25,8 +25,6 @@
 import net.bytebuddy.utility.nullability.MaybeNull;
 import net.bytebuddy.utility.nullability.UnknownNull;
 
-import javax.annotation.Nonnull;
-import javax.annotation.meta.When;
 import java.lang.reflect.*;
 import java.security.PrivilegedAction;
 import java.util.Iterator;

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/TypeDescription.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/TypeDescription.java
@@ -46,7 +46,6 @@
 import org.objectweb.asm.signature.SignatureVisitor;
 import org.objectweb.asm.signature.SignatureWriter;
 
-import javax.annotation.CheckForNull;
 import java.io.Serializable;
 import java.lang.annotation.Annotation;
 import java.lang.annotation.ElementType;

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/TypeVariableToken.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/TypeVariableToken.java
@@ -20,8 +20,8 @@
 import net.bytebuddy.description.annotation.AnnotationDescription;
 import net.bytebuddy.description.annotation.AnnotationList;
 import net.bytebuddy.matcher.ElementMatcher;
+import net.bytebuddy.utility.nullability.MaybeNull;
 
-import javax.annotation.CheckForNull;
 import java.util.Collections;
 import java.util.List;
 

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/DynamicType.java b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/DynamicType.java
@@ -41,6 +41,7 @@
 import net.bytebuddy.utility.CompoundList;
 import net.bytebuddy.utility.FileSystem;
 import net.bytebuddy.utility.GraalImageCode;
+import net.bytebuddy.utility.nullability.MaybeNull;
 import org.objectweb.asm.Opcodes;
 
 import java.io.*;

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/Nexus.java b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/Nexus.java
@@ -15,7 +15,9 @@
  */
 package net.bytebuddy.dynamic;
 
-import javax.annotation.CheckForNull;
+import net.bytebuddy.utility.nullability.AlwaysNull;
+import net.bytebuddy.utility.nullability.MaybeNull;
+
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/loading/ClassInjector.java b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/loading/ClassInjector.java
@@ -39,8 +39,6 @@
 import net.bytebuddy.utility.nullability.UnknownNull;
 import net.bytebuddy.utility.privilege.GetMethodAction;
 
-import javax.annotation.Nonnull;
-import javax.annotation.meta.When;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/loading/PackageDefinitionStrategy.java b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/loading/PackageDefinitionStrategy.java
@@ -20,7 +20,6 @@
 import net.bytebuddy.utility.nullability.AlwaysNull;
 import net.bytebuddy.utility.nullability.MaybeNull;
 
-import javax.annotation.CheckForNull;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;