sync from monorepo 4104cdbf0ffe

Author: FusionAuth Automation

build.savant

@@ -18,13 +18,13 @@ fusionauthJWTVersion = "5.2.4"
 jacksonVersion = "2.21.1"
 // No 2.21.0 version available, annotations dropped patch versioning in 2.20+
 // pom target has hack to maintain this "patchless" version
-jacksonAnnotationsVersion = "2.21"  
+jacksonAnnotationsVersion = "2.21"
 jackson5Version = "3.0.1"
 javaErrorVersion = "2.2.3"
-restifyVersion = "4.3.0"
+restifyVersion = "4.4.0"
 testngVersion = "7.5.1"
 
-project(group: "io.fusionauth", name: "fusionauth-java-client", version: "1.64.0", licenses: ["ApacheV2_0"]) {
+project(group: "io.fusionauth", name: "fusionauth-java-client", version: "1.65.0", licenses: ["ApacheV2_0"]) {
   workflow {
     fetch {
       cache()

fusionauth-java-client.iml

@@ -32,11 +32,11 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/.savant/cache/com/inversoft/restify/4.3.0/restify-4.3.0.jar!/" />
+          <root url="jar://$MODULE_DIR$/.savant/cache/com/inversoft/restify/4.4.0/restify-4.4.0.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/.savant/cache/com/inversoft/restify/4.3.0/restify-4.3.0-src.jar!/" />
+          <root url="jar://$MODULE_DIR$/.savant/cache/com/inversoft/restify/4.4.0/restify-4.4.0-src.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>

pom.xml

@@ -17,7 +17,7 @@
 
   <groupId>io.fusionauth</groupId>
   <artifactId>fusionauth-java-client</artifactId>
-  <version>1.64.0</version>
+  <version>1.65.0</version>
   <packaging>jar</packaging>
 
   <name>FusionAuth Java Client Library</name>
@@ -122,7 +122,7 @@
     <dependency>
       <groupId>com.inversoft</groupId>
       <artifactId>restify</artifactId>
-      <version>4.3.0</version>
+      <version>4.4.0</version>
       <type>jar</type>
       <scope>compile</scope>
       <optional>false</optional>

src/main/java/io/fusionauth/client/FusionAuthClient.java

@@ -34,6 +34,7 @@
 import com.inversoft.rest.JSONBodyHandler;
 import com.inversoft.rest.JSONResponseHandler;
 import com.inversoft.rest.RESTClient;
+import com.inversoft.rest.RetryConfiguration;
 import io.fusionauth.domain.LambdaType;
 import io.fusionauth.domain.OpenIdConfiguration;
 import io.fusionauth.domain.api.APIKeyRequest;
@@ -284,6 +285,18 @@ public class FusionAuthClient {
                                                                     .registerModule(new JacksonModule())
                                                                     .registerModule(new FusionAuthJacksonModule());
 
+  /**
+   * Suggested RetryConfiguration to use that retries on 409s when the general error code is [retryableConflict]
+   */
+  public static RetryConfiguration BASIC_RETRY_CONFIGURATION = new RetryConfiguration().with(rc -> rc.retryFunction = clientResponse -> {
+                                                                                               if (clientResponse.status == 409 && clientResponse.errorResponse instanceof Errors) {
+                                                                                                 Errors errors = (Errors) clientResponse.errorResponse;
+                                                                                                 return errors.generalErrors.stream().anyMatch(e -> e.code.equals("[retryableConflict]"));
+                                                                                               }
+                                                                                               return false;
+                                                                                             }
+  );
+
   private final String apiKey;
 
   private final String baseURL;
@@ -296,6 +309,8 @@ public class FusionAuthClient {
 
   public int readTimeout;
 
+  public RetryConfiguration retryConfiguration;
+
   public FusionAuthClient(String apiKey, String baseURL) {
     this(apiKey, baseURL, null);
   }
@@ -335,7 +350,9 @@ public FusionAuthClient setTenantId(UUID tenantId) {
       return this;
     }
 
-    return new FusionAuthClient(apiKey, baseURL, connectTimeout, readTimeout, tenantId.toString());
+    FusionAuthClient client = new FusionAuthClient(apiKey, baseURL, connectTimeout, readTimeout, tenantId.toString());
+    client.retryConfiguration = this.retryConfiguration;
+    return client;
   }
 
   /**
@@ -346,7 +363,9 @@ public FusionAuthClient setTenantId(UUID tenantId) {
   * @return the new FusionAuthClient
   */
   public FusionAuthClient setObjectMapper(ObjectMapper objectMapper) {
-    return new FusionAuthClient(apiKey, baseURL, connectTimeout, readTimeout, tenantId, objectMapper);
+    FusionAuthClient client = new FusionAuthClient(apiKey, baseURL, connectTimeout, readTimeout, tenantId, objectMapper);
+    client.retryConfiguration = this.retryConfiguration;
+    return client;
   }
 
   /**
@@ -2473,6 +2492,7 @@ public ClientResponse<IntrospectResponse, OAuthError> introspectAccessTokenWithR
     parameters.put("client_id", Arrays.asList(request.client_id));
     parameters.put("tenantId", Arrays.asList(request.tenantId));
     parameters.put("token", Arrays.asList(request.token));
+    parameters.put("token_type_hint", Arrays.asList(request.token_type_hint));
     return startAnonymous(IntrospectResponse.class, OAuthError.class)
         .uri("/oauth2/introspect")
         .bodyHandler(new FormDataBodyHandler(parameters))
@@ -6427,6 +6447,10 @@ protected <T, U> RESTClient<T, U> startAnonymous(Class<T> type, Class<U> errorTy
       client.header(TENANT_ID_HEADER, tenantId);
     }
 
+    if (retryConfiguration != null) {
+      client.retry(retryConfiguration);
+    }
+
     return client;
   }
 

src/main/java/io/fusionauth/client/JWTManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, FusionAuth, All Rights Reserved
+ * Copyright (c) 2025-2026, FusionAuth, All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,4 +36,13 @@ public class AccessTokenIntrospectRequest {
    * The access token returned by this OAuth provider as the result of a successful client credentials grant.
    */
   public String token;
+
+  /**
+   * An optional hint to identify the token type.
+   * <p>
+   * When this value is omitted, the token can be an access_token or id_token. When this value is specified, it must match the token type.
+   * <p>
+   * In order to use a refresh token, this value must be set to refresh_token.
+   */
+  public String token_type_hint;
 }

src/main/java/io/fusionauth/domain/oauth2/AccessTokenIntrospectRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024-2025, FusionAuth, All Rights Reserved
+ * Copyright (c) 2024-2026, FusionAuth, All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.