Convert everything to jspecify to avoid two annotation libs

Author: octylFractal

buildSrc/src/main/kotlin/Libs.kt

@@ -17,7 +17,7 @@ object Libs {
     private const val log4jVersion = "2.26.0"
     const val log4jApi = "org.apache.logging.log4j:log4j-api:$log4jVersion"
     const val log4jCore = "org.apache.logging.log4j:log4j-core:$log4jVersion"
-    const val javaxAnnotations = "com.google.code.findbugs:jsr305:3.0.2"
+    const val jspecify = "org.jspecify:jspecify:1.0.0"
     const val compileTesting = "com.google.testing.compile:compile-testing:0.23.0"
     const val mockito = "org.mockito:mockito-core:5.23.0"
 }

core-ap/annotations/src/main/java/org/enginehub/piston/annotation/package-info.java

@@ -17,5 +17,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-@org.enginehub.piston.util.NonnullByDefault
+@org.jspecify.annotations.NullMarked
 package org.enginehub.piston.annotation;

…inehub/piston/util/NonnullByDefault.java …iston/annotation/param/package-info.javacore/src/main/java/org/enginehub/piston/util/NonnullByDefault.java renamed to core-ap/annotations/src/main/java/org/enginehub/piston/annotation/param/package-info.java core/src/main/java/org/enginehub/piston/util/NonnullByDefault.java renamed to core-ap/annotations/src/main/java/org/enginehub/piston/annotation/param/package-info.java

@@ -17,23 +17,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.enginehub.piston.util;
-
-import javax.annotation.Nonnull;
-import javax.annotation.meta.TypeQualifierDefault;
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marks a package, class, or method as having all elements {@link Nonnull} by default.
- */
-@Documented
-@Nonnull
-@TypeQualifierDefault({ElementType.PARAMETER, ElementType.FIELD, ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.PACKAGE, ElementType.TYPE, ElementType.METHOD})
-public @interface NonnullByDefault {
-}
+@org.jspecify.annotations.NullMarked
+package org.enginehub.piston.annotation.param;

core-ap/processor/src/main/java/org/enginehub/piston/gen/CommandProcessor.java

@@ -41,12 +41,12 @@
 import org.enginehub.piston.gen.value.CommandInfo;
 import org.enginehub.piston.gen.value.CommandParamInfo;
 import org.enginehub.piston.gen.value.RegistrationInfo;
+import org.jspecify.annotations.Nullable;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-import javax.annotation.Nullable;
 import javax.annotation.processing.Processor;
 import javax.annotation.processing.SupportedOptions;
 import javax.lang.model.SourceVersion;

core-ap/processor/src/main/java/org/enginehub/piston/gen/GenerationSupport.java

@@ -23,8 +23,7 @@
 import com.squareup.javapoet.CodeBlock;
 import com.squareup.javapoet.TypeName;
 import org.enginehub.piston.inject.Key;
-
-import javax.annotation.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public interface GenerationSupport {
 

core-ap/processor/src/main/java/org/enginehub/piston/gen/GenerationSupportImpl.java

@@ -25,8 +25,8 @@
 import org.enginehub.piston.gen.value.KeyInfo;
 import org.enginehub.piston.gen.value.RegistrationInfo;
 import org.enginehub.piston.gen.value.RequiredVariable;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;

core-ap/processor/src/main/java/org/enginehub/piston/gen/optimize/package-info.java

@@ -17,7 +17,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-@NonnullByDefault
+@org.jspecify.annotations.NullMarked
 package org.enginehub.piston.gen.optimize;
-
-import org.enginehub.piston.util.NonnullByDefault;

core-ap/processor/src/main/java/org/enginehub/piston/gen/package-info.java

@@ -17,5 +17,5 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-@org.enginehub.piston.util.NonnullByDefault
+@org.jspecify.annotations.NullMarked
 package org.enginehub.piston.gen;

core-ap/processor/src/main/java/org/enginehub/piston/gen/util/AnnoValueExtraction.java

@@ -21,8 +21,8 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.primitives.Primitives;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.AnnotationValueVisitor;

core-ap/processor/src/main/java/org/enginehub/piston/gen/util/CodeBlockUtil.java

@@ -24,8 +24,8 @@
 import com.squareup.javapoet.TypeName;
 import net.kyori.adventure.text.Component;
 import org.enginehub.piston.internal.RegistrationUtil;
+import org.jspecify.annotations.Nullable;
 
-import javax.annotation.Nullable;
 import javax.lang.model.element.ExecutableElement;
 import java.lang.reflect.Method;
 import java.util.function.Supplier;
@@ -106,8 +106,7 @@ private static final class CodeBlockJoiner {
         private final CodeBlock suffix;
         @Nullable
         private CodeBlock emptyValue;
-        @Nullable
-        private CodeBlock.Builder value;
+        private CodeBlock.@Nullable Builder value;
 
         CodeBlockJoiner(CodeBlock prefix, CodeBlock delimiter, CodeBlock suffix) {
             this.prefix = requireNonNull(prefix);