@@ -94,30 +94,9 @@ private A2ACardResolver(A2AHttpClient httpClient, String baseUrl, @Nullable Stri
9494 // Strip any well-known suffix from baseUrl so that a full card URL like
9595 // https://host/.well-known/agent-card.json doesn't produce a malformed path.
9696 String cleanBase = Utils .stripWellKnownSuffix (baseUrl );
97- String resolvedCardUrl ;
98- @ Nullable String resolvedFallbackUrl ;
99- if (agentCardPath != null && !agentCardPath .isEmpty ()) {
100- // Custom path: tenant goes as path prefix (explicit override); no fallback.
101- String baseUrlWithTenant = Utils .buildBaseUrl (cleanBase , tenant );
102- Utils .validateAbsoluteUrl (baseUrlWithTenant );
103- resolvedCardUrl = Utils .buildCardUrl (baseUrlWithTenant , agentCardPath );
104- resolvedFallbackUrl = null ;
105- } else {
106- // Standard well-known path: optionally embed tenant inside the path.
107- if (tenant != null && !tenant .isBlank ()) {
108- // {base}/.well-known/{tenant}/agent-card.json
109- Utils .validateTenant (tenant );
110- Utils .validateAbsoluteUrl (cleanBase );
111- resolvedCardUrl = Utils .buildCardUrl (cleanBase , "/.well-known/" + Utils .normalizeTenant (tenant ) + "/agent-card.json" );
112- } else {
113- // {base}/.well-known/agent-card.json
114- Utils .validateAbsoluteUrl (cleanBase );
115- resolvedCardUrl = Utils .buildCardUrl (cleanBase , Utils .DEFAULT_AGENT_CARD_PATH );
116- }
117- resolvedFallbackUrl = isSameUrl (resolvedCardUrl , baseUrl ) ? null : cleanBase ;
118- }
119- this .cardUrl = resolvedCardUrl ;
120- this .fallbackUrl = resolvedFallbackUrl ;
97+ ResolvedUrls resolved = resolveUrls (cleanBase , baseUrl , tenant , agentCardPath );
98+ this .cardUrl = resolved .cardUrl ();
99+ this .fallbackUrl = resolved .fallbackUrl ();
121100 } catch (URISyntaxException e ) {
122101 throw new A2AClientError ("Invalid agent URL" , e );
123102 }
@@ -244,8 +223,8 @@ public A2ACardResolver build() throws A2AClientError {
244223 * <p>Fetches from the custom {@code agentCardPath} when one was supplied, otherwise fetches
245224 * from the standard {@code /.well-known/agent-card.json} (or tenant-specific variant) endpoint.
246225 * When no custom path was provided and the computed card URL differs from the originally
247- * supplied base URL, a 404 on the primary URL triggers a single retry against the
248- * original base URL before propagating the error.
226+ * supplied base URL, a 404 response from the primary URL triggers a single retry against
227+ * the original base URL before propagating the error.
249228 *
250229 * @return the agent card
251230 * @throws A2AClientHTTPError If the server returns a non-2xx response (carries status, body, and headers)
@@ -271,9 +250,37 @@ public AgentCard getAgentCard() throws A2AClientError, A2AClientJSONError {
271250 }
272251 }
273252
253+ private static ResolvedUrls resolveUrls (String cleanBase , String originalBase , @ Nullable String tenant , @ Nullable String agentCardPath ) throws URISyntaxException {
254+ if (agentCardPath != null && !agentCardPath .isBlank ()) {
255+ // Custom path: tenant goes as path prefix (explicit override); no fallback.
256+ String baseUrlWithTenant = Utils .buildBaseUrl (cleanBase , tenant );
257+ Utils .validateAbsoluteUrl (baseUrlWithTenant );
258+ return new ResolvedUrls (Utils .buildCardUrl (baseUrlWithTenant , agentCardPath ), null );
259+ }
260+ // Standard well-known path: optionally embed tenant inside the path.
261+ String cardUrl ;
262+ if (tenant != null && !tenant .isBlank ()) {
263+ // {base}/.well-known/{tenant}/agent-card.json
264+ Utils .validateTenant (tenant );
265+ Utils .validateAbsoluteUrl (cleanBase );
266+ cardUrl = Utils .buildCardUrl (cleanBase , Utils .buildTenantCardPath (tenant ));
267+ } else {
268+ // {base}/.well-known/agent-card.json
269+ Utils .validateAbsoluteUrl (cleanBase );
270+ cardUrl = Utils .buildCardUrl (cleanBase , Utils .DEFAULT_AGENT_CARD_PATH );
271+ }
272+ String fallbackUrl = isSameUrl (cardUrl , originalBase ) ? null : cleanBase ;
273+ return new ResolvedUrls (cardUrl , fallbackUrl );
274+ }
275+
276+ private record ResolvedUrls (String cardUrl , @ Nullable String fallbackUrl ) {}
277+
278+ // Intentionally limited: only strips trailing slashes. Both arguments are always
279+ // programmatically constructed URLs so case, port, and percent-encoding are consistent.
274280 private static boolean isSameUrl (String a , String b ) {
275- String stripSlash = b .endsWith ("/" ) ? b .substring (0 , b .length () - 1 ) : b ;
276- return a .equals (stripSlash );
281+ String normA = a .endsWith ("/" ) ? a .substring (0 , a .length () - 1 ) : a ;
282+ String normB = b .endsWith ("/" ) ? b .substring (0 , b .length () - 1 ) : b ;
283+ return normA .equals (normB );
277284 }
278285
279286 private AgentCard fetchAgentCard (String url ) throws A2AClientError , A2AClientJSONError {
0 commit comments