Merge remote-tracking branch 'spring/main' into main-bak

Author: StudiousXiaoYu

models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiImageOptions.java

@@ -256,7 +256,7 @@ public String getValue() {
 
 	}
 
-	public final static class Builder {
+	public static final class Builder {
 
 		private final AzureOpenAiImageOptions options;
 

models/spring-ai-bedrock-converse/src/main/java/org/springframework/ai/bedrock/converse/api/ConverseApiUtils.java

@@ -484,7 +484,7 @@ public static Builder builder() {
 			return new Builder();
 		}
 
-		public final static class Builder {
+		public static final class Builder {
 
 			private String role;
 

models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiImageModel.java

@@ -55,7 +55,7 @@
  */
 public class OpenAiImageModel implements ImageModel {
 
-	private final static Logger logger = LoggerFactory.getLogger(OpenAiImageModel.class);
+	private static final Logger logger = LoggerFactory.getLogger(OpenAiImageModel.class);
 
 	private static final ImageModelObservationConvention DEFAULT_OBSERVATION_CONVENTION = new DefaultImageModelObservationConvention();
 

models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiPaymentTransactionIT.java

@@ -58,7 +58,7 @@
 @EnabledIfEnvironmentVariable(named = "OPENAI_API_KEY", matches = ".*")
 public class OpenAiPaymentTransactionIT {
 
-	private final static Logger logger = LoggerFactory.getLogger(OpenAiPaymentTransactionIT.class);
+	private static final Logger logger = LoggerFactory.getLogger(OpenAiPaymentTransactionIT.class);
 
 	private static final Map<Transaction, Status> DATASET = Map.of(new Transaction("001"), new Status("pending"),
 			new Transaction("002"), new Status("approved"), new Transaction("003"), new Status("rejected"));

models/spring-ai-qianfan/src/main/java/org/springframework/ai/qianfan/QianFanImageModel.java

@@ -50,7 +50,7 @@
  */
 public class QianFanImageModel implements ImageModel {
 
-	private final static Logger logger = LoggerFactory.getLogger(QianFanImageModel.class);
+	private static final Logger logger = LoggerFactory.getLogger(QianFanImageModel.class);
 
 	private static final ImageModelObservationConvention DEFAULT_OBSERVATION_CONVENTION = new DefaultImageModelObservationConvention();
 

models/spring-ai-transformers/src/main/java/org/springframework/ai/transformers/TransformersEmbeddingModel.java

@@ -81,19 +81,19 @@
 public class TransformersEmbeddingModel extends AbstractEmbeddingModel implements InitializingBean {
 
 	// ONNX tokenizer for the all-MiniLM-L6-v2 generative
-	public final static String DEFAULT_ONNX_TOKENIZER_URI = "https://raw.githubusercontent.com/spring-projects/spring-ai/main/models/spring-ai-transformers/src/main/resources/onnx/all-MiniLM-L6-v2/tokenizer.json";
+	public static final String DEFAULT_ONNX_TOKENIZER_URI = "https://raw.githubusercontent.com/spring-projects/spring-ai/main/models/spring-ai-transformers/src/main/resources/onnx/all-MiniLM-L6-v2/tokenizer.json";
 
 	// ONNX generative for all-MiniLM-L6-v2 pre-trained transformer:
 	// https://huggingface.co/sentence-transformers/all-MiniLM-L6-v2
-	public final static String DEFAULT_ONNX_MODEL_URI = "https://github.com/spring-projects/spring-ai/raw/main/models/spring-ai-transformers/src/main/resources/onnx/all-MiniLM-L6-v2/model.onnx";
+	public static final String DEFAULT_ONNX_MODEL_URI = "https://github.com/spring-projects/spring-ai/raw/main/models/spring-ai-transformers/src/main/resources/onnx/all-MiniLM-L6-v2/model.onnx";
 
-	public final static String DEFAULT_MODEL_OUTPUT_NAME = "last_hidden_state";
+	public static final String DEFAULT_MODEL_OUTPUT_NAME = "last_hidden_state";
 
 	private static final Log logger = LogFactory.getLog(TransformersEmbeddingModel.class);
 
 	private static final EmbeddingModelObservationConvention DEFAULT_OBSERVATION_CONVENTION = new DefaultEmbeddingModelObservationConvention();
 
-	private final static int EMBEDDING_AXIS = 1;
+	private static final int EMBEDDING_AXIS = 1;
 
 	/**
 	 * Specifies what parts of the {@link Document}'s content and metadata will be used

models/spring-ai-vertex-ai-gemini/src/test/java/org/springframework/ai/vertexai/gemini/function/VertexAiGeminiPaymentTransactionIT.java

@@ -57,7 +57,7 @@
 @EnabledIfEnvironmentVariable(named = "VERTEX_AI_GEMINI_LOCATION", matches = ".*")
 public class VertexAiGeminiPaymentTransactionIT {
 
-	private final static Logger logger = LoggerFactory.getLogger(VertexAiGeminiPaymentTransactionIT.class);
+	private static final Logger logger = LoggerFactory.getLogger(VertexAiGeminiPaymentTransactionIT.class);
 
 	private static final Map<Transaction, Status> DATASET = Map.of(new Transaction("001"), new Status("pending"),
 			new Transaction("002"), new Status("approved"), new Transaction("003"), new Status("rejected"));

models/spring-ai-zhipuai/src/main/java/org/springframework/ai/zhipuai/ZhiPuAiImageModel.java

@@ -43,7 +43,7 @@
  */
 public class ZhiPuAiImageModel implements ImageModel {
 
-	private final static Logger logger = LoggerFactory.getLogger(ZhiPuAiImageModel.class);
+	private static final Logger logger = LoggerFactory.getLogger(ZhiPuAiImageModel.class);
 
 	public final RetryTemplate retryTemplate;
 

pom.xml

@@ -193,7 +193,7 @@
 		<qdrant.version>1.9.1</qdrant.version>
 		<ibm.sdk.version>9.20.0</ibm.sdk.version>
 		<jsonschema.version>4.35.0</jsonschema.version>
-		<swagger-annotations.version>2.2.20</swagger-annotations.version>
+		<swagger-annotations.version>2.2.25</swagger-annotations.version>
 		<spring-cloud-bindings.version>2.0.3</spring-cloud-bindings.version>
 
 		<!-- Protobuf -->

spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/SafeGuardAdvisor.java

@@ -42,9 +42,9 @@
  */
 public class SafeGuardAdvisor implements CallAroundAdvisor, StreamAroundAdvisor {
 
-	private final static String DEFAULT_FAILURE_RESPONSE = "I'm unable to respond to that due to sensitive content. Could we rephrase or discuss something else?";
+	private static final String DEFAULT_FAILURE_RESPONSE = "I'm unable to respond to that due to sensitive content. Could we rephrase or discuss something else?";
 
-	private final static int DEFAULT_ORDER = 0;
+	private static final int DEFAULT_ORDER = 0;
 
 	private final String failureResponse;