CR

micronaut-projects · Jul 22, 2024 · 289f691 · 289f691
1 parent 3317acc
commit 289f691
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 5 deletions.
diff --git a/core/src/main/java/io/micronaut/core/type/Argument.java b/core/src/main/java/io/micronaut/core/type/Argument.java
@@ -502,7 +502,7 @@ static <T> Argument<T> of(
      * @since 4.6
      */
     @NonNull
-    static <T> Argument<T> ofInstance(T instance) {
+    static <T> Argument<T> ofInstance(@NonNull T instance) {
         return Argument.of((Class<T>) instance.getClass());
     }
 

diff --git a/core/src/main/java/io/micronaut/core/type/MutableHeaders.java b/core/src/main/java/io/micronaut/core/type/MutableHeaders.java
@@ -16,6 +16,8 @@
 package io.micronaut.core.type;
 
 
+import io.micronaut.core.annotation.NonNull;
+
 /**
  * Common interface for all mutable header types.
  *
@@ -48,7 +50,8 @@ public interface MutableHeaders extends Headers {
      * @return This headers
      * @since 1.3.3
      */
-    default MutableHeaders set(CharSequence header, CharSequence value) {
+    @NonNull
+    default MutableHeaders set(@NonNull CharSequence header, @NonNull CharSequence value) {
         remove(header);
         add(header, value);
         return this;
@@ -62,7 +65,8 @@ default MutableHeaders set(CharSequence header, CharSequence value) {
      * @return This headers
      * @since 4.6
      */
-    default MutableHeaders setIfMissing(CharSequence header, CharSequence value) {
+    @NonNull
+    default MutableHeaders setIfMissing(@NonNull CharSequence header, @NonNull CharSequence value) {
         if (!contains(header.toString())) {
             add(header, value);
         }

diff --git a/http/src/main/java/io/micronaut/http/body/AbstractMessageBodyHandlerRegistry.java b/http/src/main/java/io/micronaut/http/body/AbstractMessageBodyHandlerRegistry.java
@@ -41,7 +41,7 @@
  */
 @Internal
 @Experimental
-abstract class AbstractMessageBodyHandlerRegistry implements MessageBodyHandlerRegistry {
+abstract sealed class AbstractMessageBodyHandlerRegistry implements MessageBodyHandlerRegistry permits ContextlessMessageBodyHandlerRegistry, DefaultMessageBodyHandlerRegistry {
     private static final MessageBodyReader<Object> NO_READER = new NoReader();
     private static final MessageBodyWriter<Object> NO_WRITER = new NoWriter();
     private final Map<HandlerKey<?>, MessageBodyReader<?>> readers = new ConcurrentHashMap<>(10);

diff --git a/http/src/main/java/io/micronaut/http/body/MessageBodyHandlerRegistry.java b/http/src/main/java/io/micronaut/http/body/MessageBodyHandlerRegistry.java
@@ -73,7 +73,7 @@ <T> Optional<MessageBodyWriter<T>> findWriter(
     );
 
     /**
-     * Gets a writer for the type and annotation metadata at declaration point or fails.
+     * Gets a writer for the type and annotation metadata at declaration point or fails with {@link CodecException}.
      * @param type The type
      * @param mediaType The media type
      * @return A message body writer if it is existing.

diff --git a/http/src/main/java/io/micronaut/http/body/TypedMessageBodyHandler.java b/http/src/main/java/io/micronaut/http/body/TypedMessageBodyHandler.java
@@ -16,6 +16,7 @@
 package io.micronaut.http.body;
 
 import io.micronaut.core.annotation.Experimental;
+import io.micronaut.core.annotation.NonNull;
 import io.micronaut.core.type.Argument;
 
 /**
@@ -31,5 +32,6 @@ public interface TypedMessageBodyHandler<T> extends MessageBodyHandler<T>, Typed
     /**
      * @return The body type.
      */
+    @NonNull
     Argument<T> getType();
 }
diff --git a/http/src/main/java/io/micronaut/http/body/TypedMessageBodyReader.java b/http/src/main/java/io/micronaut/http/body/TypedMessageBodyReader.java
@@ -16,6 +16,7 @@
 package io.micronaut.http.body;
 
 import io.micronaut.core.annotation.Experimental;
+import io.micronaut.core.annotation.NonNull;
 import io.micronaut.core.type.Argument;
 import io.micronaut.http.MediaType;
 
@@ -32,6 +33,7 @@ public interface TypedMessageBodyReader<T> extends MessageBodyReader<T> {
     /**
      * @return The body type.
      */
+    @NonNull
     Argument<T> getType();
 
     @Override

diff --git a/http/src/main/java/io/micronaut/http/body/TypedMessageBodyWriter.java b/http/src/main/java/io/micronaut/http/body/TypedMessageBodyWriter.java
@@ -16,6 +16,7 @@
 package io.micronaut.http.body;
 
 import io.micronaut.core.annotation.Experimental;
+import io.micronaut.core.annotation.NonNull;
 import io.micronaut.core.type.Argument;
 import io.micronaut.http.MediaType;
 
@@ -32,6 +33,7 @@ public interface TypedMessageBodyWriter<T> extends MessageBodyWriter<T> {
     /**
      * @return The body type.
      */
+    @NonNull
     Argument<T> getType();
 
     @Override