From 0c0787b849f6ddcf856e6eaaf2b8a49264ce8c26 Mon Sep 17 00:00:00 2001
From: Ilayaperumal Gopinathan <ilayaperumal.gopinathan@broadcom.com>
Date: Mon, 28 Apr 2025 18:51:10 +0100
Subject: [PATCH] Make ImageOptions non-null when constructing ImagePrompt

  - Pass non-null ImageOptions when instantiating ImagePrompt

Signed-off-by: Ilayaperumal Gopinathan <ilayaperumal.gopinathan@broadcom.com>
---
 .../org/springframework/ai/image/ImagePrompt.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/spring-ai-model/src/main/java/org/springframework/ai/image/ImagePrompt.java b/spring-ai-model/src/main/java/org/springframework/ai/image/ImagePrompt.java
index a212c2cf4..6cc6efd8d 100644
--- a/spring-ai-model/src/main/java/org/springframework/ai/image/ImagePrompt.java
+++ b/spring-ai-model/src/main/java/org/springframework/ai/image/ImagePrompt.java
@@ -29,12 +29,7 @@ public class ImagePrompt implements ModelRequest<List<ImageMessage>> {
 	private ImageOptions imageModelOptions;
 
 	public ImagePrompt(List<ImageMessage> messages) {
-		this.messages = messages;
-	}
-
-	public ImagePrompt(List<ImageMessage> messages, ImageOptions imageModelOptions) {
-		this.messages = messages;
-		this.imageModelOptions = imageModelOptions;
+		this(messages, ImageOptionsBuilder.builder().build());
 	}
 
 	public ImagePrompt(ImageMessage imageMessage, ImageOptions imageOptions) {
@@ -49,6 +44,11 @@ public class ImagePrompt implements ModelRequest<List<ImageMessage>> {
 		this(new ImageMessage(instructions), ImageOptionsBuilder.builder().build());
 	}
 
+	public ImagePrompt(List<ImageMessage> messages, ImageOptions imageModelOptions) {
+		this.messages = messages;
+		this.imageModelOptions = imageModelOptions != null ? imageModelOptions : ImageOptionsBuilder.builder().build();
+	}
+
 	@Override
 	public List<ImageMessage> getInstructions() {
 		return this.messages;