Remove setters from options interface

youngmoneee · markpollack · commit 3938cc83ad82 · 2024-03-06T17:18:14.000-05:00
* Add test code
diff --git a/models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiChatOptions.java b/models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiChatOptions.java
@@ -312,7 +312,6 @@ public Float getTemperature() {
 		return this.temperature;
 	}
 
-	@Override
 	public void setTemperature(Float temperature) {
 		this.temperature = temperature;
 	}
@@ -322,7 +321,6 @@ public Float getTopP() {
 		return this.topP;
 	}
 
-	@Override
 	public void setTopP(Float topP) {
 		this.topP = topP;
 	}
@@ -333,7 +331,6 @@ public Integer getTopK() {
 		throw new UnsupportedOperationException("Unimplemented method 'getTopK'");
 	}
 
-	@Override
 	@JsonIgnore
 	public void setTopK(Integer topK) {
 		throw new UnsupportedOperationException("Unimplemented method 'setTopK'");
@@ -344,7 +341,6 @@ public List<FunctionCallback> getFunctionCallbacks() {
 		return this.functionCallbacks;
 	}
 
-	@Override
 	public void setFunctionCallbacks(List<FunctionCallback> functionCallbacks) {
 		this.functionCallbacks = functionCallbacks;
 	}
@@ -354,7 +350,6 @@ public Set<String> getFunctions() {
 		return this.functions;
 	}
 
-	@Override
 	public void setFunctions(Set<String> functions) {
 		this.functions = functions;
 	}
diff --git a/models/spring-ai-bedrock/src/main/java/org/springframework/ai/bedrock/anthropic/AnthropicChatOptions.java b/models/spring-ai-bedrock/src/main/java/org/springframework/ai/bedrock/anthropic/AnthropicChatOptions.java
@@ -119,7 +119,6 @@ public Float getTemperature() {
 		return this.temperature;
 	}
 
-	@Override
 	public void setTemperature(Float temperature) {
 		this.temperature = temperature;
 	}
@@ -137,7 +136,6 @@ public Integer getTopK() {
 		return this.topK;
 	}
 
-	@Override
 	public void setTopK(Integer topK) {
 		this.topK = topK;
 	}
@@ -147,7 +145,6 @@ public Float getTopP() {
 		return this.topP;
 	}
 
-	@Override
 	public void setTopP(Float topP) {
 		this.topP = topP;
 	}
diff --git a/models/spring-ai-bedrock/src/main/java/org/springframework/ai/bedrock/cohere/BedrockCohereChatOptions.java b/models/spring-ai-bedrock/src/main/java/org/springframework/ai/bedrock/cohere/BedrockCohereChatOptions.java
@@ -144,7 +144,6 @@ public Float getTemperature() {
 		return this.temperature;
 	}
 
-	@Override
 	public void setTemperature(Float temperature) {
 		this.temperature = temperature;
 	}
@@ -154,7 +153,6 @@ public Float getTopP() {
 		return this.topP;
 	}
 
-	@Override
 	public void setTopP(Float topP) {
 		this.topP = topP;
 	}
@@ -164,7 +162,6 @@ public Integer getTopK() {
 		return this.topK;
 	}
 
-	@Override
 	public void setTopK(Integer topK) {
 		this.topK = topK;
 	}
diff --git a/models/spring-ai-bedrock/src/main/java/org/springframework/ai/bedrock/llama2/BedrockLlama2ChatOptions.java b/models/spring-ai-bedrock/src/main/java/org/springframework/ai/bedrock/llama2/BedrockLlama2ChatOptions.java
@@ -105,7 +105,6 @@ public Integer getTopK() {
 		throw new UnsupportedOperationException("Unsupported option: 'TopK'");
 	}
 
-	@Override
 	@JsonIgnore
 	public void setTopK(Integer topK) {
 		throw new UnsupportedOperationException("Unsupported option: 'TopK'");
diff --git a/models/spring-ai-bedrock/src/main/java/org/springframework/ai/bedrock/titan/BedrockTitanChatOptions.java b/models/spring-ai-bedrock/src/main/java/org/springframework/ai/bedrock/titan/BedrockTitanChatOptions.java
@@ -125,7 +125,6 @@ public Integer getTopK() {
 		throw new UnsupportedOperationException("Bedrock Titian Chat does not support the 'TopK' option.");
 	}
 
-	@Override
 	public void setTopK(Integer topK) {
 		throw new UnsupportedOperationException("Bedrock Titian Chat does not support the 'TopK' option.'");
 	}
diff --git a/models/spring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/MistralAiChatOptions.java b/models/spring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/MistralAiChatOptions.java
@@ -264,7 +264,6 @@ public Float getTemperature() {
 		return this.temperature;
 	}
 
-	@Override
 	public void setTemperature(Float temperature) {
 		this.temperature = temperature;
 	}
@@ -274,7 +273,6 @@ public Float getTopP() {
 		return this.topP;
 	}
 
-	@Override
 	public void setTopP(Float topP) {
 		this.topP = topP;
 	}
@@ -285,7 +283,6 @@ public Integer getTopK() {
 		throw new UnsupportedOperationException("Unsupported option: 'TopK'");
 	}
 
-	@Override
 	@JsonIgnore
 	public void setTopK(Integer topK) {
 		throw new UnsupportedOperationException("Unsupported option: 'TopK'");
diff --git a/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiChatOptions.java b/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiChatOptions.java
@@ -333,7 +333,6 @@ public Float getTemperature() {
 		return this.temperature;
 	}
 
-	@Override
 	public void setTemperature(Float temperature) {
 		this.temperature = temperature;
 	}
@@ -343,7 +342,6 @@ public Float getTopP() {
 		return this.topP;
 	}
 
-	@Override
 	public void setTopP(Float topP) {
 		this.topP = topP;
 	}
@@ -387,7 +385,6 @@ public Set<String> getFunctions() {
 		return functions;
 	}
 
-	@Override
 	public void setFunctions(Set<String> functionNames) {
 		this.functions = functionNames;
 	}
@@ -515,7 +512,6 @@ public Integer getTopK() {
 		throw new UnsupportedOperationException("Unimplemented method 'getTopK'");
 	}
 
-	@Override
 	@JsonIgnore
 	public void setTopK(Integer topK) {
 		throw new UnsupportedOperationException("Unimplemented method 'setTopK'");
diff --git a/models/spring-ai-vertex-ai-gemini/src/main/java/org/springframework/ai/vertexai/gemini/VertexAiGeminiChatOptions.java b/models/spring-ai-vertex-ai-gemini/src/main/java/org/springframework/ai/vertexai/gemini/VertexAiGeminiChatOptions.java
@@ -190,7 +190,6 @@ public Float getTemperature() {
 		return this.temperature;
 	}
 
-	@Override
 	public void setTemperature(Float temperature) {
 		this.temperature = temperature;
 	}
@@ -200,7 +199,6 @@ public Float getTopP() {
 		return this.topP;
 	}
 
-	@Override
 	public void setTopP(Float topP) {
 		this.topP = topP;
 	}
@@ -215,7 +213,6 @@ public void setTopK(Float topK) {
 		this.topK = topK;
 	}
 
-	@Override
 	@JsonIgnore
 	public void setTopK(Integer topK) {
 		this.topK = (topK != null) ? topK.floatValue() : null;
diff --git a/models/spring-ai-vertex-ai-palm2/src/main/java/org/springframework/ai/vertexai/palm2/VertexAiPaLm2ChatOptions.java b/models/spring-ai-vertex-ai-palm2/src/main/java/org/springframework/ai/vertexai/palm2/VertexAiPaLm2ChatOptions.java
@@ -98,7 +98,6 @@ public Float getTemperature() {
 		return this.temperature;
 	}
 
-	@Override
 	public void setTemperature(Float temperature) {
 		this.temperature = temperature;
 	}
@@ -116,7 +115,6 @@ public Float getTopP() {
 		return this.topP;
 	}
 
-	@Override
 	public void setTopP(Float topP) {
 		this.topP = topP;
 	}
@@ -126,7 +124,6 @@ public Integer getTopK() {
 		return this.topK;
 	}
 
-	@Override
 	public void setTopK(Integer topK) {
 		this.topK = topK;
 	}
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/prompt/ChatOptions.java b/spring-ai-core/src/main/java/org/springframework/ai/chat/prompt/ChatOptions.java
@@ -25,14 +25,8 @@ public interface ChatOptions extends ModelOptions {
 
 	Float getTemperature();
 
-	void setTemperature(Float temperature);
-
 	Float getTopP();
 
-	void setTopP(Float topP);
-
 	Integer getTopK();
 
-	void setTopK(Integer topK);
-
 }
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/prompt/ChatOptionsBuilder.java b/spring-ai-core/src/main/java/org/springframework/ai/chat/prompt/ChatOptionsBuilder.java
@@ -31,7 +31,6 @@ public Float getTemperature() {
 			return temperature;
 		}
 
-		@Override
 		public void setTemperature(Float temperature) {
 			this.temperature = temperature;
 		}
@@ -41,7 +40,6 @@ public Float getTopP() {
 			return topP;
 		}
 
-		@Override
 		public void setTopP(Float topP) {
 			this.topP = topP;
 		}
@@ -51,7 +49,6 @@ public Integer getTopK() {
 			return topK;
 		}
 
-		@Override
 		public void setTopK(Integer topK) {
 			this.topK = topK;
 		}
@@ -86,4 +83,4 @@ public ChatOptions build() {
 		return options;
 	}
 
-}
+}
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/model/function/FunctionCallingOptions.java b/spring-ai-core/src/main/java/org/springframework/ai/model/function/FunctionCallingOptions.java
@@ -63,4 +63,4 @@ public static FunctionCallingOptionsBuilder builder() {
 		return new FunctionCallingOptionsBuilder();
 	}
 
-}
+}
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/model/function/FunctionCallingOptionsBuilder.java b/spring-ai-core/src/main/java/org/springframework/ai/model/function/FunctionCallingOptionsBuilder.java
@@ -98,7 +98,6 @@ public List<FunctionCallback> getFunctionCallbacks() {
 			return this.functionCallbacks;
 		}
 
-		@Override
 		public void setFunctionCallbacks(List<FunctionCallback> functionCallbacks) {
 			Assert.notNull(functionCallbacks, "FunctionCallbacks must not be null");
 			this.functionCallbacks = functionCallbacks;
@@ -109,7 +108,6 @@ public Set<String> getFunctions() {
 			return this.functions;
 		}
 
-		@Override
 		public void setFunctions(Set<String> functions) {
 			Assert.notNull(functions, "Functions must not be null");
 			this.functions = functions;
@@ -120,7 +118,6 @@ public Float getTemperature() {
 			return this.temperature;
 		}
 
-		@Override
 		public void setTemperature(Float temperature) {
 			this.temperature = temperature;
 		}
@@ -130,7 +127,6 @@ public Float getTopP() {
 			return this.topP;
 		}
 
-		@Override
 		public void setTopP(Float topP) {
 			this.topP = topP;
 		}
@@ -140,11 +136,10 @@ public Integer getTopK() {
 			return this.topK;
 		}
 
-		@Override
 		public void setTopK(Integer topK) {
 			this.topK = topK;
 		}
 
 	}
 
-}
+}
diff --git a/spring-ai-core/src/test/java/org/springframework/ai/chat/ChatBuilderTests.java b/spring-ai-core/src/test/java/org/springframework/ai/chat/ChatBuilderTests.java

Original file line number	Diff line number	Diff line change
`@@ -312,7 +312,6 @@ public Float getTemperature() {`
`312`	`312`	`return this.temperature;`
`313`	`313`	`}`
`314`	`314`
`315`		`- @Override`
`316`	`315`	`public void setTemperature(Float temperature) {`
`317`	`316`	`this.temperature = temperature;`
`318`	`317`	`}`
`@@ -322,7 +321,6 @@ public Float getTopP() {`
`322`	`321`	`return this.topP;`
`323`	`322`	`}`
`324`	`323`
`325`		`- @Override`
`326`	`324`	`public void setTopP(Float topP) {`
`327`	`325`	`this.topP = topP;`
`328`	`326`	`}`
`@@ -333,7 +331,6 @@ public Integer getTopK() {`
`333`	`331`	`throw new UnsupportedOperationException("Unimplemented method 'getTopK'");`
`334`	`332`	`}`
`335`	`333`
`336`		`- @Override`
`337`	`334`	`@JsonIgnore`
`338`	`335`	`public void setTopK(Integer topK) {`
`339`	`336`	`throw new UnsupportedOperationException("Unimplemented method 'setTopK'");`
`@@ -344,7 +341,6 @@ public List<FunctionCallback> getFunctionCallbacks() {`
`344`	`341`	`return this.functionCallbacks;`
`345`	`342`	`}`
`346`	`343`
`347`		`- @Override`
`348`	`344`	`public void setFunctionCallbacks(List<FunctionCallback> functionCallbacks) {`
`349`	`345`	`this.functionCallbacks = functionCallbacks;`
`350`	`346`	`}`
`@@ -354,7 +350,6 @@ public Set<String> getFunctions() {`
`354`	`350`	`return this.functions;`
`355`	`351`	`}`
`356`	`352`
`357`		`- @Override`
`358`	`353`	`public void setFunctions(Set<String> functions) {`
`359`	`354`	`this.functions = functions;`
`360`	`355`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,6 @@ public Float getTemperature() {`
`119`	`119`	`return this.temperature;`
`120`	`120`	`}`
`121`	`121`
`122`		`- @Override`
`123`	`122`	`public void setTemperature(Float temperature) {`
`124`	`123`	`this.temperature = temperature;`
`125`	`124`	`}`
`@@ -137,7 +136,6 @@ public Integer getTopK() {`
`137`	`136`	`return this.topK;`
`138`	`137`	`}`
`139`	`138`
`140`		`- @Override`
`141`	`139`	`public void setTopK(Integer topK) {`
`142`	`140`	`this.topK = topK;`
`143`	`141`	`}`
`@@ -147,7 +145,6 @@ public Float getTopP() {`
`147`	`145`	`return this.topP;`
`148`	`146`	`}`
`149`	`147`
`150`		`- @Override`
`151`	`148`	`public void setTopP(Float topP) {`
`152`	`149`	`this.topP = topP;`
`153`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,6 @@ public Float getTemperature() {`
`144`	`144`	`return this.temperature;`
`145`	`145`	`}`
`146`	`146`
`147`		`- @Override`
`148`	`147`	`public void setTemperature(Float temperature) {`
`149`	`148`	`this.temperature = temperature;`
`150`	`149`	`}`
`@@ -154,7 +153,6 @@ public Float getTopP() {`
`154`	`153`	`return this.topP;`
`155`	`154`	`}`
`156`	`155`
`157`		`- @Override`
`158`	`156`	`public void setTopP(Float topP) {`
`159`	`157`	`this.topP = topP;`
`160`	`158`	`}`
`@@ -164,7 +162,6 @@ public Integer getTopK() {`
`164`	`162`	`return this.topK;`
`165`	`163`	`}`
`166`	`164`
`167`		`- @Override`
`168`	`165`	`public void setTopK(Integer topK) {`
`169`	`166`	`this.topK = topK;`
`170`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,6 @@ public Integer getTopK() {`
`105`	`105`	`throw new UnsupportedOperationException("Unsupported option: 'TopK'");`
`106`	`106`	`}`
`107`	`107`
`108`		`- @Override`
`109`	`108`	`@JsonIgnore`
`110`	`109`	`public void setTopK(Integer topK) {`
`111`	`110`	`throw new UnsupportedOperationException("Unsupported option: 'TopK'");`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,6 @@ public Integer getTopK() {`
`125`	`125`	`throw new UnsupportedOperationException("Bedrock Titian Chat does not support the 'TopK' option.");`
`126`	`126`	`}`
`127`	`127`
`128`		`- @Override`
`129`	`128`	`public void setTopK(Integer topK) {`
`130`	`129`	`throw new UnsupportedOperationException("Bedrock Titian Chat does not support the 'TopK' option.'");`
`131`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,6 @@ public Float getTemperature() {`
`264`	`264`	`return this.temperature;`
`265`	`265`	`}`
`266`	`266`
`267`		`- @Override`
`268`	`267`	`public void setTemperature(Float temperature) {`
`269`	`268`	`this.temperature = temperature;`
`270`	`269`	`}`
`@@ -274,7 +273,6 @@ public Float getTopP() {`
`274`	`273`	`return this.topP;`
`275`	`274`	`}`
`276`	`275`
`277`		`- @Override`
`278`	`276`	`public void setTopP(Float topP) {`
`279`	`277`	`this.topP = topP;`
`280`	`278`	`}`
`@@ -285,7 +283,6 @@ public Integer getTopK() {`
`285`	`283`	`throw new UnsupportedOperationException("Unsupported option: 'TopK'");`
`286`	`284`	`}`
`287`	`285`
`288`		`- @Override`
`289`	`286`	`@JsonIgnore`
`290`	`287`	`public void setTopK(Integer topK) {`
`291`	`288`	`throw new UnsupportedOperationException("Unsupported option: 'TopK'");`
Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,6 @@ public Float getTemperature() {`
`333`	`333`	`return this.temperature;`
`334`	`334`	`}`
`335`	`335`
`336`		`- @Override`
`337`	`336`	`public void setTemperature(Float temperature) {`
`338`	`337`	`this.temperature = temperature;`
`339`	`338`	`}`
`@@ -343,7 +342,6 @@ public Float getTopP() {`
`343`	`342`	`return this.topP;`
`344`	`343`	`}`
`345`	`344`
`346`		`- @Override`
`347`	`345`	`public void setTopP(Float topP) {`
`348`	`346`	`this.topP = topP;`
`349`	`347`	`}`
`@@ -387,7 +385,6 @@ public Set<String> getFunctions() {`
`387`	`385`	`return functions;`
`388`	`386`	`}`
`389`	`387`
`390`		`- @Override`
`391`	`388`	`public void setFunctions(Set<String> functionNames) {`
`392`	`389`	`this.functions = functionNames;`
`393`	`390`	`}`
`@@ -515,7 +512,6 @@ public Integer getTopK() {`
`515`	`512`	`throw new UnsupportedOperationException("Unimplemented method 'getTopK'");`
`516`	`513`	`}`
`517`	`514`
`518`		`- @Override`
`519`	`515`	`@JsonIgnore`
`520`	`516`	`public void setTopK(Integer topK) {`
`521`	`517`	`throw new UnsupportedOperationException("Unimplemented method 'setTopK'");`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,6 @@ public Float getTemperature() {`
`190`	`190`	`return this.temperature;`
`191`	`191`	`}`
`192`	`192`
`193`		`- @Override`
`194`	`193`	`public void setTemperature(Float temperature) {`
`195`	`194`	`this.temperature = temperature;`
`196`	`195`	`}`
`@@ -200,7 +199,6 @@ public Float getTopP() {`
`200`	`199`	`return this.topP;`
`201`	`200`	`}`
`202`	`201`
`203`		`- @Override`
`204`	`202`	`public void setTopP(Float topP) {`
`205`	`203`	`this.topP = topP;`
`206`	`204`	`}`
`@@ -215,7 +213,6 @@ public void setTopK(Float topK) {`
`215`	`213`	`this.topK = topK;`
`216`	`214`	`}`
`217`	`215`
`218`		`- @Override`
`219`	`216`	`@JsonIgnore`
`220`	`217`	`public void setTopK(Integer topK) {`
`221`	`218`	`this.topK = (topK != null) ? topK.floatValue() : null;`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,6 @@ public Float getTemperature() {`
`98`	`98`	`return this.temperature;`
`99`	`99`	`}`
`100`	`100`
`101`		`- @Override`
`102`	`101`	`public void setTemperature(Float temperature) {`
`103`	`102`	`this.temperature = temperature;`
`104`	`103`	`}`
`@@ -116,7 +115,6 @@ public Float getTopP() {`
`116`	`115`	`return this.topP;`
`117`	`116`	`}`
`118`	`117`
`119`		`- @Override`
`120`	`118`	`public void setTopP(Float topP) {`
`121`	`119`	`this.topP = topP;`
`122`	`120`	`}`
`@@ -126,7 +124,6 @@ public Integer getTopK() {`
`126`	`124`	`return this.topK;`
`127`	`125`	`}`
`128`	`126`
`129`		`- @Override`
`130`	`127`	`public void setTopK(Integer topK) {`
`131`	`128`	`this.topK = topK;`
`132`	`129`	`}`