diff --git a/src/java.base/share/classes/java/io/UnsupportedEncodingException.java b/src/java.base/share/classes/java/io/UnsupportedEncodingException.java index b80f453f5c6..a121e243210 100644 --- a/src/java.base/share/classes/java/io/UnsupportedEncodingException.java +++ b/src/java.base/share/classes/java/io/UnsupportedEncodingException.java @@ -24,12 +24,16 @@ */ package java.io; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; + /** * The Character Encoding is not supported. * * @author Asmus Freytag * @since 1.1 */ +@NullMarked public class UnsupportedEncodingException extends IOException { @@ -47,7 +51,7 @@ public UnsupportedEncodingException() { * Constructs an UnsupportedEncodingException with a detail message. * @param s Describes the reason for the exception. */ - public UnsupportedEncodingException(String s) { + public UnsupportedEncodingException(@Nullable String s) { super(s); } } diff --git a/src/java.base/share/classes/java/lang/MatchException.java b/src/java.base/share/classes/java/lang/MatchException.java index 832d71bcb1d..f87f44c6f85 100644 --- a/src/java.base/share/classes/java/lang/MatchException.java +++ b/src/java.base/share/classes/java/lang/MatchException.java @@ -25,6 +25,9 @@ package java.lang; +import org.jspecify.annotations.NullMarked; +import org.jspecify.annotations.Nullable; + /** * Thrown to indicate an unexpected failure in pattern matching. * @@ -76,6 +79,7 @@ * * @since 21 */ +@NullMarked public final class MatchException extends RuntimeException { @java.io.Serial private static final long serialVersionUID = 0L; @@ -91,7 +95,7 @@ public final class MatchException extends RuntimeException { * permitted, and indicates that the cause is nonexistent or * unknown.) */ - public MatchException(String message, Throwable cause) { + public MatchException(@Nullable String message, @Nullable Throwable cause) { super(message, cause); } } diff --git a/src/java.base/share/classes/java/nio/charset/MalformedInputException.java b/src/java.base/share/classes/java/nio/charset/MalformedInputException.java index a4e7f31fc2c..352ec83887e 100644 --- a/src/java.base/share/classes/java/nio/charset/MalformedInputException.java +++ b/src/java.base/share/classes/java/nio/charset/MalformedInputException.java @@ -25,6 +25,7 @@ package java.nio.charset; +import org.jspecify.annotations.NullMarked; /** * Checked exception thrown when an input byte sequence is not legal for given @@ -33,7 +34,7 @@ * * @since 1.4 */ - +@NullMarked public class MalformedInputException extends CharacterCodingException { diff --git a/src/java.base/share/classes/java/nio/charset/UnmappableCharacterException.java b/src/java.base/share/classes/java/nio/charset/UnmappableCharacterException.java index 8f79a232f03..f844c95096a 100644 --- a/src/java.base/share/classes/java/nio/charset/UnmappableCharacterException.java +++ b/src/java.base/share/classes/java/nio/charset/UnmappableCharacterException.java @@ -25,6 +25,7 @@ package java.nio.charset; +import org.jspecify.annotations.NullMarked; /** * Checked exception thrown when an input character (or byte) sequence @@ -33,7 +34,7 @@ * * @since 1.4 */ - +@NullMarked public class UnmappableCharacterException extends CharacterCodingException {