Remove remaining NonNull on NullMarked packages (#12369)

Author: dstepanov

context/src/test/java/io/micronaut/runtime/context/CompositeMessageSourceTest.java

@@ -6,7 +6,6 @@
 import io.micronaut.context.annotation.Property;
 import io.micronaut.context.annotation.Requires;
 import io.micronaut.context.i18n.ResourceBundleMessageSource;
-import org.jspecify.annotations.NonNull;
 import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
 import jakarta.inject.Singleton;
 import org.junit.jupiter.api.Test;

core-reactive/src/main/java/io/micronaut/core/async/ReactiveStreamsTypeInformationProvider.java

@@ -18,7 +18,6 @@
 import io.micronaut.core.annotation.AnnotationMetadata;
 import io.micronaut.core.annotation.AnnotationMetadataProvider;
 import io.micronaut.core.annotation.Internal;
-import org.jspecify.annotations.NonNull;
 import io.micronaut.core.async.annotation.SingleResult;
 import io.micronaut.core.async.publisher.Publishers;
 import io.micronaut.core.type.TypeInformationProvider;
@@ -33,24 +32,24 @@
 public final class ReactiveStreamsTypeInformationProvider implements TypeInformationProvider {
 
     @Override
-    public boolean isSpecifiedSingle(@NonNull AnnotationMetadataProvider annotationMetadataProvider) {
+    public boolean isSpecifiedSingle(AnnotationMetadataProvider annotationMetadataProvider) {
         AnnotationMetadata annotationMetadata = annotationMetadataProvider.getAnnotationMetadata();
         return annotationMetadata.hasStereotype(SingleResult.class) &&
             annotationMetadata.booleanValue(SingleResult.NAME).orElse(true);
     }
 
     @Override
-    public boolean isSingle(@NonNull Class<?> type) {
+    public boolean isSingle(Class<?> type) {
         return Publishers.isSingle(type);
     }
 
     @Override
-    public boolean isReactive(@NonNull Class<?> type) {
+    public boolean isReactive(Class<?> type) {
         return Publishers.isConvertibleToPublisher(type);
     }
 
     @Override
-    public boolean isCompletable(@NonNull Class<?> type) {
+    public boolean isCompletable(Class<?> type) {
         return Publishers.isCompletable(type);
     }
 }

core-reactive/src/main/java/io/micronaut/core/async/propagation/ReactivePropagation.java

@@ -16,7 +16,6 @@
 package io.micronaut.core.async.propagation;
 
 import io.micronaut.core.annotation.Experimental;
-import org.jspecify.annotations.NonNull;
 import io.micronaut.core.propagation.PropagatedContext;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
@@ -68,7 +67,7 @@ public static <T> Publisher<T> propagate(PropagatedContext propagatedContext, Pu
     public static <T> Publisher<T> propagate(PropagatedContext propagatedContext, CorePublisher<T> actual) {
         return new CorePublisher<>() {
             @Override
-            public void subscribe(@NonNull CoreSubscriber<? super T> subscriber) {
+            public void subscribe(CoreSubscriber<? super T> subscriber) {
                 try (PropagatedContext.Scope ignore = propagatedContext.propagate()) {
                     actual.subscribe(propagate(propagatedContext, subscriber));
                 }
@@ -98,7 +97,6 @@ public void subscribe(Subscriber<? super T> subscriber) {
     public static <T> Subscriber<T> propagate(PropagatedContext propagatedContext, Subscriber<T> actual) {
         return new CoreSubscriber<>() {
 
-            @NonNull
             @Override
             public Context currentContext() {
                 Context ctx;
@@ -111,7 +109,7 @@ public Context currentContext() {
             }
 
             @Override
-            public void onSubscribe(@NonNull Subscription s) {
+            public void onSubscribe(Subscription s) {
                 try (PropagatedContext.Scope ignore = propagatedContext.propagate()) {
                     actual.onSubscribe(s);
                 }

core-reactive/src/main/java/io/micronaut/core/async/propagation/ReactorPropagation.java

@@ -16,7 +16,6 @@
 package io.micronaut.core.async.propagation;
 
 import io.micronaut.core.annotation.Experimental;
-import org.jspecify.annotations.NonNull;
 import io.micronaut.core.propagation.PropagatedContext;
 import io.micronaut.core.propagation.PropagatedContextElement;
 import reactor.util.context.Context;
@@ -49,8 +48,7 @@ private ReactorPropagation() {
      * @param propagatedContext The propagated context
      * @return The modified context
      */
-    @NonNull
-    public static Context addPropagatedContext(@NonNull Context context, @NonNull PropagatedContext propagatedContext) {
+    public static Context addPropagatedContext(Context context, PropagatedContext propagatedContext) {
         return context.put(
             ReactorPropagation.PROPAGATED_CONTEXT_REACTOR_CONTEXT_VIEW_KEY,
             propagatedContext
@@ -64,8 +62,7 @@ public static Context addPropagatedContext(@NonNull Context context, @NonNull Pr
      * @param contextElement The propagated context element
      * @return The modified context
      */
-    @NonNull
-    public static Context addContextElement(@NonNull Context context, @NonNull PropagatedContextElement contextElement) {
+    public static Context addContextElement(Context context, PropagatedContextElement contextElement) {
         return addPropagatedContext(context, findPropagatedContext(context).orElse(PropagatedContext.getOrEmpty()).plus(contextElement));
     }
 
@@ -77,8 +74,8 @@ public static Context addContextElement(@NonNull Context context, @NonNull Propa
      * @param <E> The element type
      * @return optional context element
      */
-    public static <E extends PropagatedContextElement> Optional<E> findContextElement(@NonNull ContextView contextView,
-                                                                                      @NonNull Class<E> contextElementType) {
+    public static <E extends PropagatedContextElement> Optional<E> findContextElement(ContextView contextView,
+                                                                                      Class<E> contextElementType) {
         return findPropagatedContext(contextView)
             .flatMap(ctx -> ctx.find(contextElementType));
     }
@@ -91,8 +88,8 @@ public static <E extends PropagatedContextElement> Optional<E> findContextElemen
      * @param <E> All elements if the type
      * @return optional context element
      */
-    public static <E extends PropagatedContextElement> Stream<E> findAllContextElements(@NonNull ContextView contextView,
-                                                                                        @NonNull Class<E> contextElementType) {
+    public static <E extends PropagatedContextElement> Stream<E> findAllContextElements(ContextView contextView,
+                                                                                        Class<E> contextElementType) {
         return findPropagatedContext(contextView)
             .stream()
             .flatMap(ctx -> ctx.findAll(contextElementType));
@@ -104,7 +101,7 @@ public static <E extends PropagatedContextElement> Stream<E> findAllContextEleme
      * @param contextView The context
      * @return optional propagated context
      */
-    public static Optional<PropagatedContext> findPropagatedContext(@NonNull ContextView contextView) {
+    public static Optional<PropagatedContext> findPropagatedContext(ContextView contextView) {
         return contextView.getOrEmpty(ReactorPropagation.PROPAGATED_CONTEXT_REACTOR_CONTEXT_VIEW_KEY)
             .map(ctx -> (PropagatedContext) ctx);
     }

core-reactive/src/main/java/io/micronaut/core/async/publisher/Publishers.java

@@ -16,7 +16,6 @@
 package io.micronaut.core.async.publisher;
 
 import io.micronaut.core.annotation.Internal;
-import org.jspecify.annotations.NonNull;
 import io.micronaut.core.annotation.TypeHint;
 import io.micronaut.core.async.subscriber.CompletionAwareSubscriber;
 import io.micronaut.core.convert.ConversionService;
@@ -94,7 +93,6 @@ public class Publishers {
         COMPLETABLE_TYPES = completableTypes;
     }
 
-    @NonNull
     private static List<String> getSingleTypeNames() {
         return List.of(
             "io.micronaut.core.async.publisher.CompletableFuturePublisher",
@@ -108,7 +106,6 @@ private static List<String> getSingleTypeNames() {
         );
     }
 
-    @NonNull
     private static List<String> getCompletableTypeNames() {
         return List.of(
             "io.reactivex.Completable",
@@ -117,7 +114,6 @@ private static List<String> getCompletableTypeNames() {
         );
     }
 
-    @NonNull
     private static List<String> getNonSpecificReactiveTypeNames() {
         return List.of(
             "io.reactivex.Observable",
@@ -128,7 +124,6 @@ private static List<String> getNonSpecificReactiveTypeNames() {
         );
     }
 
-    @NonNull
     public static List<String> getReactiveTypeNames() {
         return Stream.of(
             getNonSpecificReactiveTypeNames(),
@@ -525,8 +520,7 @@ public static <T> T convertPublisher(ConversionService conversionService, Object
      * @return The Resulting in publisher
      * @since 4.6.0
      */
-    @NonNull
-    public static <T> Publisher<T> convertToPublisher(@NonNull ConversionService conversionService, @Nullable Object object) {
+    public static <T> Publisher<T> convertToPublisher(ConversionService conversionService, @Nullable Object object) {
         Objects.requireNonNull(object, "Argument [object] cannot be null");
         if (object instanceof Publisher<?> publisher) {
             return (Publisher<T>) publisher;
@@ -587,15 +581,13 @@ public interface MapOrSupplyEmpty<T, R> {
          * @param result The next value.
          * @return The mapped value.
          */
-        @NonNull
-        R map(@NonNull T result);
+        R map(T result);
 
         /**
          * Supplies an empty value if there is no next value.
          *
          * @return The result.
          */
-        @NonNull
         R supplyEmpty();
 
     }

core-reactive/src/main/java/io/micronaut/core/async/subscriber/LazySendingSubscriber.java

@@ -16,7 +16,6 @@
 package io.micronaut.core.async.subscriber;
 
 import io.micronaut.core.annotation.Internal;
-import org.jspecify.annotations.NonNull;
 import io.micronaut.core.execution.DelayedExecutionFlow;
 import io.micronaut.core.execution.ExecutionFlow;
 import org.jspecify.annotations.NullUnmarked;
@@ -62,8 +61,7 @@ private LazySendingSubscriber() {
      * @return A flow that will complete with the same stream
      * @param <T> The item type
      */
-    @NonNull
-    public static <T> ExecutionFlow<Publisher<T>> create(@NonNull Publisher<T> input) {
+    public static <T> ExecutionFlow<Publisher<T>> create(Publisher<T> input) {
         LazySendingSubscriber<T> subscriber = new LazySendingSubscriber<>();
         input.subscribe(subscriber);
         return subscriber.result;

discovery-core/src/main/java/io/micronaut/discovery/CompositeDiscoveryClient.java

@@ -15,7 +15,6 @@
  */
 package io.micronaut.discovery;
 
-import org.jspecify.annotations.NonNull;
 import io.micronaut.core.naming.NameUtils;
 import io.micronaut.core.util.ArrayUtils;
 import org.reactivestreams.Publisher;
@@ -48,7 +47,6 @@ protected CompositeDiscoveryClient(DiscoveryClient[] discoveryClients) {
         this.discoveryClients = discoveryClients;
     }
 
-    @NonNull
     @Override
     public String getDescription() {
         return toString();

discovery-core/src/main/java/io/micronaut/discovery/DefaultServiceInstanceIdGenerator.java

@@ -16,7 +16,6 @@
 package io.micronaut.discovery;
 
 import io.micronaut.context.env.Environment;
-import org.jspecify.annotations.NonNull;
 import jakarta.inject.Singleton;
 
 import java.util.Optional;
@@ -37,7 +36,6 @@ public class DefaultServiceInstanceIdGenerator implements ServiceInstanceIdGener
     protected DefaultServiceInstanceIdGenerator() {
     }
 
-    @NonNull
     @Override
     public String generateId(Environment environment, ServiceInstance serviceInstance) {
         Optional<String> cloudFoundryId = environment.getProperty("vcap.application.instance_id", String.class);

discovery-core/src/main/java/io/micronaut/discovery/ServiceInstanceIdGenerator.java

@@ -16,7 +16,6 @@
 package io.micronaut.discovery;
 
 import io.micronaut.context.env.Environment;
-import org.jspecify.annotations.NonNull;
 
 /**
  * Interface for generating IDs for {@link ServiceInstance}.
@@ -33,6 +32,5 @@ public interface ServiceInstanceIdGenerator {
      * @param serviceInstance The service instance
      * @return The generated ID. Never null
      */
-    @NonNull
     String generateId(Environment environment, ServiceInstance serviceInstance);
 }

discovery-core/src/main/java/io/micronaut/discovery/cloud/digitalocean/package-info.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2017-2026 original authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * The digital ocean cloud provider implementation.
+ */
+@NullMarked
+package io.micronaut.discovery.cloud.digitalocean;
+
+import org.jspecify.annotations.NullMarked;