Start introducing JSpecify

Signed-off-by: Eric Bottard <[email protected]>

Author: ericbottard

spring-ai-commons/src/main/java/org/springframework/ai/content/Media.java

@@ -19,8 +19,10 @@
 import java.io.IOException;
 import java.net.URI;
 
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.core.io.Resource;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.MimeType;
 
@@ -67,6 +69,7 @@
  * @author Thomas Vitale
  * @since 1.0.0
  */
+@NullMarked
 public class Media {
 
 	private static final String NAME_PREFIX = "media-";
@@ -75,8 +78,7 @@ public class Media {
 	 * An Id of the media object, usually defined when the model returns a reference to
 	 * media it has been passed.
 	 */
-	@Nullable
-	private final String id;
+	private final @Nullable String id;
 
 	private final MimeType mimeType;
 
@@ -195,8 +197,7 @@ public byte[] getDataAsByteArray() {
 	 * Get the media id
 	 * @return the media id
 	 */
-	@Nullable
-	public String getId() {
+	public @Nullable String getId() {
 		return this.id;
 	}
 
@@ -209,13 +210,13 @@ public String getName() {
 	 */
 	public static final class Builder {
 
-		private String id;
+		private @Nullable String id;
 
-		private MimeType mimeType;
+		private @Nullable MimeType mimeType;
 
-		private Object data;
+		private @Nullable Object data;
 
-		private String name;
+		private @Nullable String name;
 
 		private Builder() {
 		}
@@ -315,6 +316,8 @@ public Builder name(String name) {
 		 * @throws IllegalArgumentException if mimeType or data are null
 		 */
 		public Media build() {
+			Assert.state(this.mimeType != null, "MimeType must not be null");
+			Assert.state(this.data != null, "Data must not be null");
 			return new Media(this.mimeType, this.data, this.id, this.name);
 		}