Use methods from HttpHeaders which are available both from Spring 6 and Spring 7

filiphr · filiphr · commit be6f36c1f5b7 · 2025-11-06T15:50:16.000+01:00
Signed-off-by: Filip Hrisafov &lt;filip.hrisafov@gmail.com&gt;
diff --git a/models/spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/api/AnthropicApi.java b/models/spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/api/AnthropicApi.java
@@ -176,7 +176,7 @@ public ResponseEntity<ChatCompletionResponse> chatCompletionEntity(ChatCompletio
 		return this.restClient.post()
 			.uri(this.completionsPath)
 			.headers(headers -> {
-				headers.addAll(additionalHttpHeader);
+				additionalHttpHeader.forEach(headers::addAll);
 				addDefaultHeadersIfMissing(headers);
 			})
 			.body(chatRequest)
@@ -217,7 +217,7 @@ public Flux<ChatCompletionResponse> chatCompletionStream(ChatCompletionRequest c
 		return this.webClient.post()
 			.uri(this.completionsPath)
 			.headers(headers -> {
-				headers.addAll(additionalHttpHeader);
+				additionalHttpHeader.forEach(headers::addAll);
 				addDefaultHeadersIfMissing(headers);
 			}) // @formatter:off
 			.body(Mono.just(chatRequest), ChatCompletionRequest.class)
@@ -256,7 +256,8 @@ public Flux<ChatCompletionResponse> chatCompletionStream(ChatCompletionRequest c
 	}
 
 	private void addDefaultHeadersIfMissing(HttpHeaders headers) {
-		if (!headers.containsKey(HEADER_X_API_KEY)) {
+		List<String> apiKeyHeaders = headers.get(HEADER_X_API_KEY);
+		if (apiKeyHeaders == null) {
 			String apiKeyValue = this.apiKey.getValue();
 			if (StringUtils.hasText(apiKeyValue)) {
 				headers.add(HEADER_X_API_KEY, apiKeyValue);
diff --git a/models/spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/api/DeepSeekApi.java b/models/spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/api/DeepSeekApi.java
@@ -94,7 +94,7 @@ public DeepSeekApi(String baseUrl, ApiKey apiKey, MultiValueMap<String, String>
 		Consumer<HttpHeaders> finalHeaders = h -> {
 			h.setBearerAuth(apiKey.getValue());
 			h.setContentType(MediaType.APPLICATION_JSON);
-			h.addAll(headers);
+			headers.forEach(h::addAll);
 		};
 		this.restClient = restClientBuilder.baseUrl(baseUrl)
 			.defaultHeaders(finalHeaders)
@@ -153,7 +153,7 @@ public Flux<ChatCompletionChunk> chatCompletionStream(ChatCompletionRequest chat
 
 		return this.webClient.post()
 			.uri(this.getEndpoint(chatRequest))
-			.headers(headers -> headers.addAll(additionalHttpHeader))
+			.headers(headers -> additionalHttpHeader.forEach(headers::addAll))
 			.body(Mono.just(chatRequest), ChatCompletionRequest.class)
 			.retrieve()
 			.bodyToFlux(String.class)
diff --git a/models/spring-ai-elevenlabs/src/main/java/org/springframework/ai/elevenlabs/api/ElevenLabsApi.java b/models/spring-ai-elevenlabs/src/main/java/org/springframework/ai/elevenlabs/api/ElevenLabsApi.java
@@ -70,7 +70,7 @@ private ElevenLabsApi(String baseUrl, ApiKey apiKey, MultiValueMap<String, Strin
 			if (!(apiKey instanceof NoopApiKey)) {
 				h.set("xi-api-key", apiKey.getValue());
 			}
-			h.addAll(headers);
+			headers.forEach(h::addAll);
 			h.setContentType(MediaType.APPLICATION_JSON);
 		};
 
diff --git a/models/spring-ai-elevenlabs/src/main/java/org/springframework/ai/elevenlabs/api/ElevenLabsVoicesApi.java b/models/spring-ai-elevenlabs/src/main/java/org/springframework/ai/elevenlabs/api/ElevenLabsVoicesApi.java
@@ -62,7 +62,7 @@ public ElevenLabsVoicesApi(String baseUrl, ApiKey apiKey, MultiValueMap<String,
 			if (!(apiKey instanceof NoopApiKey)) {
 				h.set("xi-api-key", apiKey.getValue());
 			}
-			h.addAll(headers);
+			headers.forEach(h::addAll);
 			h.setContentType(MediaType.APPLICATION_JSON);
 		};
 
diff --git a/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiApi.java b/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiApi.java
@@ -145,7 +145,7 @@ public OpenAiApi(String baseUrl, ApiKey apiKey, MultiValueMap<String, String> he
 		Consumer<HttpHeaders> finalHeaders = h -> {
 			h.setContentType(MediaType.APPLICATION_JSON);
 			h.set(HTTP_USER_AGENT_HEADER, SPRING_AI_USER_AGENT);
-			h.addAll(headers);
+			headers.forEach(h::addAll);
 		};
 		this.restClient = restClientBuilder.clone()
 			.baseUrl(baseUrl)
@@ -204,7 +204,7 @@ public ResponseEntity<ChatCompletion> chatCompletionEntity(ChatCompletionRequest
 		return this.restClient.post()
 			.uri(this.completionsPath)
 			.headers(headers -> {
-				headers.addAll(additionalHttpHeader);
+				additionalHttpHeader.forEach(headers::addAll);
 				addDefaultHeadersIfMissing(headers);
 			})
 			.body(chatRequest)
@@ -243,7 +243,7 @@ public Flux<ChatCompletionChunk> chatCompletionStream(ChatCompletionRequest chat
 		return this.webClient.post()
 			.uri(this.completionsPath)
 			.headers(headers -> {
-				headers.addAll(additionalHttpHeader);
+				additionalHttpHeader.forEach(headers::addAll);
 				addDefaultHeadersIfMissing(headers);
 			}) // @formatter:on
 			.body(Mono.just(chatRequest), ChatCompletionRequest.class)
@@ -328,7 +328,8 @@ public <T> ResponseEntity<EmbeddingList<Embedding>> embeddings(EmbeddingRequest<
 	}
 
 	private void addDefaultHeadersIfMissing(HttpHeaders headers) {
-		if (!headers.containsKey(HttpHeaders.AUTHORIZATION) && !(this.apiKey instanceof NoopApiKey)) {
+		List<String> authorizationHeaders = headers.get(HttpHeaders.AUTHORIZATION);
+		if (authorizationHeaders == null && !(this.apiKey instanceof NoopApiKey)) {
 			headers.setBearerAuth(this.apiKey.getValue());
 		}
 	}
diff --git a/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiAudioApi.java b/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiAudioApi.java
@@ -73,7 +73,7 @@ public OpenAiAudioApi(String baseUrl, ApiKey apiKey, MultiValueMap<String, Strin
 			RestClient.Builder restClientBuilder, WebClient.Builder webClientBuilder,
 			ResponseErrorHandler responseErrorHandler) {
 
-		Consumer<HttpHeaders> authHeaders = h -> h.addAll(headers);
+		Consumer<HttpHeaders> authHeaders = h -> headers.forEach(h::addAll);
 
 		// @formatter:off
 		this.restClient = restClientBuilder.clone()
diff --git a/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiFileApi.java b/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiFileApi.java
@@ -51,7 +51,7 @@ public class OpenAiFileApi {
 
 	public OpenAiFileApi(String baseUrl, ApiKey apiKey, MultiValueMap<String, String> headers,
 			RestClient.Builder restClientBuilder, ResponseErrorHandler responseErrorHandler) {
-		Consumer<HttpHeaders> authHeaders = h -> h.addAll(headers);
+		Consumer<HttpHeaders> authHeaders = h -> headers.forEach(h::addAll);
 
 		this.restClient = restClientBuilder.clone()
 			.baseUrl(baseUrl)
diff --git a/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiImageApi.java b/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiImageApi.java
@@ -68,7 +68,7 @@ public OpenAiImageApi(String baseUrl, ApiKey apiKey, MultiValueMap<String, Strin
 			.baseUrl(baseUrl)
 			.defaultHeaders(h -> {
 				h.setContentType(MediaType.APPLICATION_JSON);
-				h.addAll(headers);
+				headers.forEach(h::addAll);
 			})
 			.defaultStatusHandler(responseErrorHandler)
 			.defaultRequest(requestHeadersSpec -> {
diff --git a/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiModerationApi.java b/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiModerationApi.java
@@ -71,7 +71,7 @@ public OpenAiModerationApi(String baseUrl, ApiKey apiKey, MultiValueMap<String,
 			.baseUrl(baseUrl)
 			.defaultHeaders(h -> {
 				h.setContentType(MediaType.APPLICATION_JSON);
-				h.addAll(headers);
+				headers.forEach(h::addAll);
 			})
 			.defaultStatusHandler(responseErrorHandler)
 			.defaultRequest(requestHeadersSpec -> {
diff --git a/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/metadata/support/OpenAiResponseHeaderExtractor.java b/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/metadata/support/OpenAiResponseHeaderExtractor.java
@@ -71,22 +71,18 @@ public static RateLimit extractAiResponseHeaders(ResponseEntity<?> response) {
 
 	private static Duration getHeaderAsDuration(ResponseEntity<?> response, String headerName) {
 		var headers = response.getHeaders();
-		if (headers.containsKey(headerName)) {
-			var values = headers.get(headerName);
-			if (!CollectionUtils.isEmpty(values)) {
-				return DurationFormatter.TIME_UNIT.parse(values.get(0));
-			}
+		var values = headers.get(headerName);
+		if (!CollectionUtils.isEmpty(values)) {
+			return DurationFormatter.TIME_UNIT.parse(values.get(0));
 		}
 		return null;
 	}
 
 	private static Long getHeaderAsLong(ResponseEntity<?> response, String headerName) {
 		var headers = response.getHeaders();
-		if (headers.containsKey(headerName)) {
-			var values = headers.get(headerName);
-			if (!CollectionUtils.isEmpty(values)) {
-				return parseLong(headerName, values.get(0));
-			}
+		var values = headers.get(headerName);
+		if (!CollectionUtils.isEmpty(values)) {
+			return parseLong(headerName, values.get(0));
 		}
 		return null;
 	}
diff --git a/models/spring-ai-zhipuai/src/main/java/org/springframework/ai/zhipuai/api/ZhiPuAiApi.java b/models/spring-ai-zhipuai/src/main/java/org/springframework/ai/zhipuai/api/ZhiPuAiApi.java
@@ -174,7 +174,7 @@ private ZhiPuAiApi(String baseUrl, ApiKey apiKey, MultiValueMap<String, String>
 
 		Consumer<HttpHeaders> authHeaders = h -> {
 			h.setContentType(MediaType.APPLICATION_JSON);
-			h.addAll(headers);
+			headers.forEach(h::addAll);
 		};
 
 		this.restClient = restClientBuilder.clone()
@@ -223,7 +223,7 @@ public ResponseEntity<ChatCompletion> chatCompletionEntity(ChatCompletionRequest
 		return this.restClient.post()
 			.uri(this.completionsPath)
 			.headers(headers -> {
-				headers.addAll(additionalHttpHeader);
+				additionalHttpHeader.forEach(headers::addAll);
 				addDefaultHeadersIfMissing(headers);
 			})
 			.body(chatRequest)
@@ -260,7 +260,7 @@ public Flux<ChatCompletionChunk> chatCompletionStream(ChatCompletionRequest chat
 		return this.webClient.post()
 			.uri(this.completionsPath)
 			.headers(headers -> {
-				headers.addAll(additionalHttpHeader);
+				additionalHttpHeader.forEach(headers::addAll);
 				addDefaultHeadersIfMissing(headers);
 			}) // @formatter:on
 			.body(Mono.just(chatRequest), ChatCompletionRequest.class)
@@ -330,7 +330,8 @@ public <T> ResponseEntity<EmbeddingList<Embedding>> embeddings(EmbeddingRequest<
 	}
 
 	private void addDefaultHeadersIfMissing(HttpHeaders headers) {
-		if (!headers.containsKey(HttpHeaders.AUTHORIZATION) && !(this.apiKey instanceof NoopApiKey)) {
+		List<String> authorizationHeaders = headers.get(HttpHeaders.AUTHORIZATION);
+		if (authorizationHeaders == null && !(this.apiKey instanceof NoopApiKey)) {
 			headers.setBearerAuth(this.apiKey.getValue());
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ private ElevenLabsApi(String baseUrl, ApiKey apiKey, MultiValueMap<String, Strin`
`70`	`70`	`if (!(apiKey instanceof NoopApiKey)) {`
`71`	`71`	`h.set("xi-api-key", apiKey.getValue());`
`72`	`72`	`}`
`73`		`- h.addAll(headers);`
	`73`	`+ headers.forEach(h::addAll);`
`74`	`74`	`h.setContentType(MediaType.APPLICATION_JSON);`
`75`	`75`	`};`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public ElevenLabsVoicesApi(String baseUrl, ApiKey apiKey, MultiValueMap<String,`
`62`	`62`	`if (!(apiKey instanceof NoopApiKey)) {`
`63`	`63`	`h.set("xi-api-key", apiKey.getValue());`
`64`	`64`	`}`
`65`		`- h.addAll(headers);`
	`65`	`+ headers.forEach(h::addAll);`
`66`	`66`	`h.setContentType(MediaType.APPLICATION_JSON);`
`67`	`67`	`};`
`68`	`68`