Migrate to JSpecify annotations

annotation-processor/src/main/java/com/linecorp/armeria/server/annotation/processor/package-info.java

@@ -17,7 +17,7 @@
 /**
  * Annotation processors for annotated services.
  */
-@NonNullByDefault
+@NullMarked
 package com.linecorp.armeria.server.annotation.processor;
 
-import com.linecorp.armeria.common.annotation.NonNullByDefault;
+import org.jspecify.annotations.NullMarked;

athenz/src/main/java/com/linecorp/armeria/client/athenz/RoleTokenClient.java

@@ -20,14 +20,15 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
+import org.jspecify.annotations.Nullable;
+
 import com.google.common.base.Joiner;
 import com.yahoo.athenz.zts.RoleToken;
 
 import com.linecorp.armeria.client.InvalidHttpResponseException;
 import com.linecorp.armeria.client.WebClient;
 import com.linecorp.armeria.client.WebClientRequestPreparation;
 import com.linecorp.armeria.common.HttpStatus;
-import com.linecorp.armeria.common.annotation.Nullable;
 import com.linecorp.armeria.common.athenz.AccessDeniedException;
 import com.linecorp.armeria.common.util.AsyncLoader;
 import com.linecorp.armeria.common.util.Exceptions;

athenz/src/main/java/com/linecorp/armeria/client/athenz/ZtsBaseClient.java

@@ -26,6 +26,7 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
+import org.jspecify.annotations.Nullable;
 import org.slf4j.LoggerFactory;
 
 import com.linecorp.armeria.client.ClientFactory;
@@ -38,7 +39,6 @@
 import com.linecorp.armeria.common.CommonPools;
 import com.linecorp.armeria.common.TlsKeyPair;
 import com.linecorp.armeria.common.TlsProvider;
-import com.linecorp.armeria.common.annotation.Nullable;
 import com.linecorp.armeria.common.annotation.UnstableApi;
 import com.linecorp.armeria.common.logging.LogLevel;
 import com.linecorp.armeria.common.logging.LogWriter;

athenz/src/main/java/com/linecorp/armeria/client/athenz/ZtsBaseClientBuilder.java

@@ -29,6 +29,8 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
+import org.jspecify.annotations.Nullable;
+
 import com.google.common.collect.ImmutableList;
 
 import com.linecorp.armeria.client.ClientFactory;
@@ -38,7 +40,6 @@
 import com.linecorp.armeria.client.proxy.ConnectProxyConfig;
 import com.linecorp.armeria.client.proxy.ProxyConfig;
 import com.linecorp.armeria.common.TlsKeyPair;
-import com.linecorp.armeria.common.annotation.Nullable;
 import com.linecorp.armeria.common.annotation.UnstableApi;
 import com.linecorp.armeria.internal.common.util.CertificateUtil;
 

athenz/src/main/java/com/linecorp/armeria/client/athenz/package-info.java

@@ -18,8 +18,9 @@
  * Provides the client-side classes and interfaces for <a href="https://www.athenz.io/">Athenz</a> integration.
  */
 @UnstableApi
-@NonNullByDefault
+@NullMarked
 package com.linecorp.armeria.client.athenz;
 
-import com.linecorp.armeria.common.annotation.NonNullByDefault;
+import org.jspecify.annotations.NullMarked;
+
 import com.linecorp.armeria.common.annotation.UnstableApi;

athenz/src/main/java/com/linecorp/armeria/common/athenz/TokenType.java

@@ -16,8 +16,9 @@
 
 package com.linecorp.armeria.common.athenz;
 
+import org.jspecify.annotations.Nullable;
+
 import com.linecorp.armeria.common.HttpHeaderNames;
-import com.linecorp.armeria.common.annotation.Nullable;
 import com.linecorp.armeria.common.annotation.UnstableApi;
 
 import io.netty.util.AsciiString;

athenz/src/main/java/com/linecorp/armeria/common/athenz/package-info.java

@@ -18,8 +18,9 @@
  * Provides common classes and interfaces for <a href="https://www.athenz.io/">Athenz</a> integration.
  */
 @UnstableApi
-@NonNullByDefault
+@NullMarked
 package com.linecorp.armeria.common.athenz;
 
-import com.linecorp.armeria.common.annotation.NonNullByDefault;
+import org.jspecify.annotations.NullMarked;
+
 import com.linecorp.armeria.common.annotation.UnstableApi;

athenz/src/main/java/com/linecorp/armeria/internal/server/athenz/AthenzServiceDecoratorFactoryProvider.java

@@ -21,11 +21,12 @@
 import java.time.Duration;
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
+
 import com.google.common.collect.ImmutableMap;
 
 import com.linecorp.armeria.client.athenz.ZtsBaseClient;
 import com.linecorp.armeria.client.athenz.ZtsBaseClientBuilder;
-import com.linecorp.armeria.common.annotation.Nullable;
 import com.linecorp.armeria.server.Server;
 import com.linecorp.armeria.server.ServerBuilder;
 import com.linecorp.armeria.server.ServerListenerAdapter;

athenz/src/main/java/com/linecorp/armeria/internal/server/athenz/package-info.java

@@ -18,8 +18,9 @@
  * Internal classes for Athenz integration.
  */
 @UnstableApi
-@NonNullByDefault
+@NullMarked
 package com.linecorp.armeria.internal.server.athenz;
 
-import com.linecorp.armeria.common.annotation.NonNullByDefault;
+import org.jspecify.annotations.NullMarked;
+
 import com.linecorp.armeria.common.annotation.UnstableApi;

athenz/src/main/java/com/linecorp/armeria/server/athenz/AbstractAthenzServiceBuilder.java

@@ -23,12 +23,13 @@
 import java.net.URI;
 import java.time.Duration;
 
+import org.jspecify.annotations.Nullable;
+
 import com.yahoo.athenz.zpe.ZpeClient;
 import com.yahoo.athenz.zpe.ZpeConsts;
 import com.yahoo.athenz.zpe.pkey.PublicKeyStore;
 
 import com.linecorp.armeria.client.athenz.ZtsBaseClient;
-import com.linecorp.armeria.common.annotation.Nullable;
 import com.linecorp.armeria.common.annotation.UnstableApi;
 
 /**

athenz/src/main/java/com/linecorp/armeria/server/athenz/AthenzPolicyHandler.java

@@ -40,6 +40,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -63,8 +64,6 @@
 import com.yahoo.athenz.zts.SignedPolicyData;
 import com.yahoo.rdl.Struct;
 
-import com.linecorp.armeria.common.annotation.Nullable;
-
 final class AthenzPolicyHandler {
 
     // Forked from: https://github.com/AthenZ/athenz/blob/7e326fa655fef997ce913267f9dd561a9f4c82dd/clients/java/zpe/src/main/java/com/yahoo/athenz/zpe/ZpeUpdPolLoader.java#L333

athenz/src/main/java/com/linecorp/armeria/server/athenz/AthenzPolicyLoader.java

@@ -23,6 +23,8 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
+import org.jspecify.annotations.Nullable;
+
 import com.google.common.collect.ImmutableMap;
 import com.yahoo.athenz.zpe.pkey.PublicKeyStore;
 import com.yahoo.athenz.zts.DomainSignedPolicyData;
@@ -31,7 +33,6 @@
 import com.linecorp.armeria.client.WebClient;
 import com.linecorp.armeria.client.athenz.ZtsBaseClient;
 import com.linecorp.armeria.common.CommonPools;
-import com.linecorp.armeria.common.annotation.Nullable;
 import com.linecorp.armeria.common.util.AsyncLoader;
 
 final class AthenzPolicyLoader {

athenz/src/main/java/com/linecorp/armeria/server/athenz/AthenzService.java

@@ -22,13 +22,14 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
+import org.jspecify.annotations.Nullable;
+
 import com.linecorp.armeria.client.athenz.ZtsBaseClient;
 import com.linecorp.armeria.common.HttpRequest;
 import com.linecorp.armeria.common.HttpResponse;
 import com.linecorp.armeria.common.HttpStatus;
 import com.linecorp.armeria.common.MediaType;
 import com.linecorp.armeria.common.RequestHeaders;
-import com.linecorp.armeria.common.annotation.Nullable;
 import com.linecorp.armeria.common.annotation.UnstableApi;
 import com.linecorp.armeria.common.athenz.TokenType;
 import com.linecorp.armeria.common.util.Exceptions;

athenz/src/main/java/com/linecorp/armeria/server/athenz/AthenzServiceBuilder.java

@@ -23,12 +23,13 @@
 import java.util.List;
 import java.util.function.Function;
 
+import org.jspecify.annotations.Nullable;
+
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 
 import com.linecorp.armeria.client.HttpClient;
 import com.linecorp.armeria.client.athenz.ZtsBaseClient;
-import com.linecorp.armeria.common.annotation.Nullable;
 import com.linecorp.armeria.common.annotation.UnstableApi;
 import com.linecorp.armeria.common.athenz.TokenType;
 import com.linecorp.armeria.server.HttpService;

athenz/src/main/java/com/linecorp/armeria/server/athenz/MinifiedAuthZpeClient.java

@@ -41,6 +41,7 @@
 
 import javax.net.ssl.SSLContext;
 
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -59,7 +60,6 @@
 import com.linecorp.armeria.client.ClientFactory;
 import com.linecorp.armeria.client.athenz.ZtsBaseClient;
 import com.linecorp.armeria.common.TlsProvider;
-import com.linecorp.armeria.common.annotation.Nullable;
 import com.linecorp.armeria.common.util.TlsEngineType;
 import com.linecorp.armeria.internal.common.SslContextFactory;
 import com.linecorp.armeria.internal.common.SslContextFactory.SslContextMode;

athenz/src/main/java/com/linecorp/armeria/server/athenz/package-info.java

@@ -19,8 +19,9 @@
  * Provides the server-side classes and interfaces for <a href="https://www.athenz.io/">Athenz</a> integration.
  */
 @UnstableApi
-@NonNullByDefault
+@NullMarked
 package com.linecorp.armeria.server.athenz;
 
-import com.linecorp.armeria.common.annotation.NonNullByDefault;
+import org.jspecify.annotations.NullMarked;
+
 import com.linecorp.armeria.common.annotation.UnstableApi;

athenz/src/test/java/com/linecorp/armeria/server/athenz/AthenzDocker.java

@@ -26,6 +26,7 @@
 
 import javax.net.ssl.SSLContext;
 
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.ComposeContainer;
@@ -47,7 +48,6 @@
 import com.linecorp.armeria.client.WebClientBuilder;
 import com.linecorp.armeria.client.athenz.ZtsBaseClient;
 import com.linecorp.armeria.common.TlsKeyPair;
-import com.linecorp.armeria.common.annotation.Nullable;
 import com.linecorp.armeria.common.util.SafeCloseable;
 
 import io.micrometer.core.instrument.util.IOUtils;

benchmarks/jmh/src/jmh/java/com/linecorp/armeria/common/HttpHeadersBenchmark.java

@@ -16,11 +16,10 @@
 
 package com.linecorp.armeria.common;
 
+import org.jspecify.annotations.Nullable;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Fork;
 
-import com.linecorp.armeria.common.annotation.Nullable;
-
 /**
  * Microbenchmarks of {@link DefaultHttpHeaders} construction.
  */

benchmarks/jmh/src/jmh/java/com/linecorp/armeria/core/client/endpoint/WeightedRoundRobinStrategyBenchmark.java

@@ -20,6 +20,7 @@
 import java.util.List;
 import java.util.Random;
 
+import org.jspecify.annotations.Nullable;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.Setup;
@@ -29,7 +30,6 @@
 import com.linecorp.armeria.client.endpoint.EndpointGroup;
 import com.linecorp.armeria.client.endpoint.EndpointSelectionStrategy;
 import com.linecorp.armeria.client.endpoint.EndpointSelector;
-import com.linecorp.armeria.common.annotation.Nullable;
 
 /**
  * Microbenchmarks of different {@link EndpointSelector} configurations.

benchmarks/jmh/src/jmh/java/com/linecorp/armeria/grpc/shared/SimpleBenchmarkBase.java

@@ -20,6 +20,7 @@
 
 import java.util.concurrent.TimeUnit;
 
+import org.jspecify.annotations.Nullable;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Param;
 import org.openjdk.jmh.annotations.Scope;
@@ -32,7 +33,6 @@
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.protobuf.Empty;
 
-import com.linecorp.armeria.common.annotation.Nullable;
 import com.linecorp.armeria.grpc.GithubApi.SearchResponse;
 import com.linecorp.armeria.grpc.GithubServiceGrpc;
 import com.linecorp.armeria.grpc.GithubServiceGrpc.GithubServiceBlockingStub;

benchmarks/jmh/src/jmh/java/com/linecorp/armeria/internal/server/annotation/MethodInvokerBenchmark.java

@@ -23,6 +23,7 @@
 import java.lang.reflect.Modifier;
 import java.util.concurrent.TimeUnit;
 
+import org.jspecify.annotations.Nullable;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Level;
@@ -34,8 +35,6 @@
 import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.infra.Blackhole;
 
-import com.linecorp.armeria.common.annotation.Nullable;
-
 @State(Scope.Benchmark)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 @BenchmarkMode(Mode.AverageTime)

benchmarks/jmh/src/jmh/java/com/linecorp/armeria/server/AnnotatedServiceBenchmark.java

@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
+import org.jspecify.annotations.Nullable;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Scope;
@@ -29,7 +30,6 @@
 
 import com.linecorp.armeria.client.WebClient;
 import com.linecorp.armeria.common.HttpResponse;
-import com.linecorp.armeria.common.annotation.Nullable;
 import com.linecorp.armeria.server.annotation.Get;
 
 @State(Scope.Benchmark)

brave/brave5/src/main/java/com/linecorp/armeria/client/brave/package-info.java

@@ -23,7 +23,7 @@
  *             1.28 Breaking Changes</a> for more information.
  */
 @Deprecated
-@NonNullByDefault
+@NullMarked
 package com.linecorp.armeria.client.brave;
 
-import com.linecorp.armeria.common.annotation.NonNullByDefault;
+import org.jspecify.annotations.NullMarked;

brave/brave5/src/main/java/com/linecorp/armeria/common/brave/package-info.java

@@ -23,7 +23,7 @@
  *             1.28 Breaking Changes</a> for more information.
  */
 @Deprecated
-@NonNullByDefault
+@NullMarked
 package com.linecorp.armeria.common.brave;
 
-import com.linecorp.armeria.common.annotation.NonNullByDefault;
+import org.jspecify.annotations.NullMarked;

brave/brave5/src/main/java/com/linecorp/armeria/internal/common/brave/package-info.java

@@ -23,7 +23,7 @@
  *             1.28 Breaking Changes</a> for more information.
  */
 @Deprecated
-@NonNullByDefault
+@NullMarked
 package com.linecorp.armeria.internal.common.brave;
 
-import com.linecorp.armeria.common.annotation.NonNullByDefault;
+import org.jspecify.annotations.NullMarked;

brave/brave5/src/main/java/com/linecorp/armeria/server/brave/package-info.java

@@ -23,7 +23,7 @@
  *             1.28 Breaking Changes</a> for more information.
  */
 @Deprecated
-@NonNullByDefault
+@NullMarked
 package com.linecorp.armeria.server.brave;
 
-import com.linecorp.armeria.common.annotation.NonNullByDefault;
+import org.jspecify.annotations.NullMarked;

brave/brave6/src/main/java/com/linecorp/armeria/client/brave/BraveClient.java

@@ -21,6 +21,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,7 +31,6 @@
 import com.linecorp.armeria.common.HttpRequest;
 import com.linecorp.armeria.common.HttpResponse;
 import com.linecorp.armeria.common.RequestHeadersBuilder;
-import com.linecorp.armeria.common.annotation.Nullable;
 import com.linecorp.armeria.common.brave.RequestContextCurrentTraceContext;
 import com.linecorp.armeria.common.logging.ClientConnectionTimings;
 import com.linecorp.armeria.internal.common.RequestContextExtension;

brave/brave6/src/main/java/com/linecorp/armeria/client/brave/ClientRequestContextAdapter.java

@@ -16,12 +16,13 @@
 
 package com.linecorp.armeria.client.brave;
 
+import org.jspecify.annotations.Nullable;
+
 import com.linecorp.armeria.client.ClientRequestContext;
 import com.linecorp.armeria.common.HttpRequest;
 import com.linecorp.armeria.common.RequestHeadersBuilder;
 import com.linecorp.armeria.common.SerializationFormat;
 import com.linecorp.armeria.common.SessionProtocol;
-import com.linecorp.armeria.common.annotation.Nullable;
 import com.linecorp.armeria.common.logging.RequestLog;
 import com.linecorp.armeria.common.logging.RequestLogAccess;
 import com.linecorp.armeria.common.logging.RequestLogProperty;