From 1c72f14a696b9ed857faf96e6bc6088ff22ca913 Mon Sep 17 00:00:00 2001
From: Ilayaperumal Gopinathan <ilayaperumal.gopinathan@broadcom.com>
Date: Wed, 18 Dec 2024 13:06:27 +0000
Subject: [PATCH] Refactor ModerationResult builder methods

 - Deprecate the existing builder methods to remove the prefix `with`
 - Update references
---
 .../ai/openai/OpenAiModerationModel.java      |  6 ++---
 .../ai/moderation/ModerationResult.java       | 27 +++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiModerationModel.java b/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiModerationModel.java
index 73b156067..8e00c24b4 100644
--- a/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiModerationModel.java
+++ b/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiModerationModel.java
@@ -147,9 +147,9 @@ public class OpenAiModerationModel implements ModerationModel {
 						.build();
 				}
 				ModerationResult moderationResult = ModerationResult.builder()
-					.withCategories(categories)
-					.withCategoryScores(categoryScores)
-					.withFlagged(result.flagged())
+					.categories(categories)
+					.categoryScores(categoryScores)
+					.flagged(result.flagged())
 					.build();
 				moderationResults.add(moderationResult);
 			}
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/moderation/ModerationResult.java b/spring-ai-core/src/main/java/org/springframework/ai/moderation/ModerationResult.java
index 29ea10830..18e9a9b23 100644
--- a/spring-ai-core/src/main/java/org/springframework/ai/moderation/ModerationResult.java
+++ b/spring-ai-core/src/main/java/org/springframework/ai/moderation/ModerationResult.java
@@ -100,16 +100,43 @@ public final class ModerationResult {
 
 		private CategoryScores categoryScores;
 
+		public Builder flagged(boolean flagged) {
+			this.flagged = flagged;
+			return this;
+		}
+
+		public Builder categories(Categories categories) {
+			this.categories = categories;
+			return this;
+		}
+
+		public Builder categoryScores(CategoryScores categoryScores) {
+			this.categoryScores = categoryScores;
+			return this;
+		}
+
+		/**
+		 * @deprecated use {@link #flagged(boolean)} instead.
+		 */
+		@Deprecated(forRemoval = true, since = "1.0.0-M5")
 		public Builder withFlagged(boolean flagged) {
 			this.flagged = flagged;
 			return this;
 		}
 
+		/**
+		 * @deprecated use {@link #categories(Categories)} instead.
+		 */
+		@Deprecated(forRemoval = true, since = "1.0.0-M5")
 		public Builder withCategories(Categories categories) {
 			this.categories = categories;
 			return this;
 		}
 
+		/**
+		 * @deprecated use {@link #categoryScores(CategoryScores)} instead.
+		 */
+		@Deprecated(forRemoval = true, since = "1.0.0-M5")
 		public Builder withCategoryScores(CategoryScores categoryScores) {
 			this.categoryScores = categoryScores;
 			return this;