From 7987cfa3a10f9f43f67786efecd97d2148cc4471 Mon Sep 17 00:00:00 2001
From: xingyc <downcent163@gmail.com>
Date: Thu, 30 Oct 2025 17:01:43 +0800
Subject: [PATCH] fix(proxy): apply proxy in mergeHttpOptions to ensure
 functionality

---
 src/main/java/com/google/genai/ApiClient.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/com/google/genai/ApiClient.java b/src/main/java/com/google/genai/ApiClient.java
index 48d5f3c7878..c42cf3e57f3 100644
--- a/src/main/java/com/google/genai/ApiClient.java
+++ b/src/main/java/com/google/genai/ApiClient.java
@@ -411,6 +411,9 @@ HttpOptions mergeHttpOptions(HttpOptions httpOptionsToApply) {
     if (httpOptionsToApply.timeout().isPresent()) {
       mergedHttpOptionsBuilder.timeout(httpOptionsToApply.timeout().get());
     }
+    if (httpOptionsToApply.proxy().isPresent()) {
+      mergedHttpOptionsBuilder.proxy(httpOptionsToApply.proxy().get());
+    }
     if (httpOptionsToApply.headers().isPresent()) {
       Stream<Map.Entry<String, String>> headersStream =
           Stream.concat(