feat: use configuration.getTelemetry() instead of this.Telemetry

Author: SoulPancake

src/main/java/dev/openfga/sdk/api/OpenFgaApi.java

@@ -145,7 +145,7 @@ private CompletableFuture<ApiResponse<BatchCheckResponse>> batchCheck(
 
         try {
             HttpRequest request = buildHttpRequest("POST", path, body, configuration);
-            return new HttpRequestAttempt<>(request, "batchCheck", BatchCheckResponse.class, apiClient, configuration, this.telemetry)
+            return new HttpRequestAttempt<>(request, "batchCheck", BatchCheckResponse.class, apiClient, configuration, configuration.getTelemetry())
                     .addTelemetryAttributes(telemetryAttributes)
                     .attemptHttpRequest();
         } catch (ApiException e) {
@@ -201,7 +201,7 @@ private CompletableFuture<ApiResponse<CheckResponse>> check(
 
         try {
             HttpRequest request = buildHttpRequest("POST", path, body, configuration);
-            return new HttpRequestAttempt<>(request, "check", CheckResponse.class, apiClient, configuration, this.telemetry)
+            return new HttpRequestAttempt<>(request, "check", CheckResponse.class, apiClient, configuration, configuration.getTelemetry())
                     .addTelemetryAttributes(telemetryAttributes)
                     .attemptHttpRequest();
         } catch (ApiException e) {
@@ -251,7 +251,7 @@ private CompletableFuture<ApiResponse<CreateStoreResponse>> createStore(
 
         try {
             HttpRequest request = buildHttpRequest("POST", path, body, configuration);
-            return new HttpRequestAttempt<>(request, "createStore", CreateStoreResponse.class, apiClient, configuration, this.telemetry)
+            return new HttpRequestAttempt<>(request, "createStore", CreateStoreResponse.class, apiClient, configuration, configuration.getTelemetry())
                     .addTelemetryAttributes(telemetryAttributes)
                     .attemptHttpRequest();
         } catch (ApiException e) {
@@ -300,7 +300,7 @@ private CompletableFuture<ApiResponse<Void>> deleteStore(String storeId, Configu
 
         try {
             HttpRequest request = buildHttpRequest("DELETE", path, configuration);
-            return new HttpRequestAttempt<>(request, "deleteStore", Void.class, apiClient, configuration, this.telemetry)
+            return new HttpRequestAttempt<>(request, "deleteStore", Void.class, apiClient, configuration, configuration.getTelemetry())
                     .addTelemetryAttributes(telemetryAttributes)
                     .attemptHttpRequest();
         } catch (ApiException e) {
@@ -356,7 +356,7 @@ private CompletableFuture<ApiResponse<ExpandResponse>> expand(
 
         try {
             HttpRequest request = buildHttpRequest("POST", path, body, configuration);
-            return new HttpRequestAttempt<>(request, "expand", ExpandResponse.class, apiClient, configuration, this.telemetry)
+            return new HttpRequestAttempt<>(request, "expand", ExpandResponse.class, apiClient, configuration, configuration.getTelemetry())
                     .addTelemetryAttributes(telemetryAttributes)
                     .attemptHttpRequest();
         } catch (ApiException e) {
@@ -406,7 +406,7 @@ private CompletableFuture<ApiResponse<GetStoreResponse>> getStore(String storeId
 
         try {
             HttpRequest request = buildHttpRequest("GET", path, configuration);
-            return new HttpRequestAttempt<>(request, "getStore", GetStoreResponse.class, apiClient, configuration, this.telemetry)
+            return new HttpRequestAttempt<>(request, "getStore", GetStoreResponse.class, apiClient, configuration, configuration.getTelemetry())
                     .addTelemetryAttributes(telemetryAttributes)
                     .attemptHttpRequest();
         } catch (ApiException e) {
@@ -462,7 +462,7 @@ private CompletableFuture<ApiResponse<ListObjectsResponse>> listObjects(
 
         try {
             HttpRequest request = buildHttpRequest("POST", path, body, configuration);
-            return new HttpRequestAttempt<>(request, "listObjects", ListObjectsResponse.class, apiClient, configuration, this.telemetry)
+            return new HttpRequestAttempt<>(request, "listObjects", ListObjectsResponse.class, apiClient, configuration, configuration.getTelemetry())
                     .addTelemetryAttributes(telemetryAttributes)
                     .attemptHttpRequest();
         } catch (ApiException e) {
@@ -513,7 +513,7 @@ private CompletableFuture<ApiResponse<ListStoresResponse>> listStores(
 
         try {
             HttpRequest request = buildHttpRequest("GET", path, configuration);
-            return new HttpRequestAttempt<>(request, "listStores", ListStoresResponse.class, apiClient, configuration, this.telemetry)
+            return new HttpRequestAttempt<>(request, "listStores", ListStoresResponse.class, apiClient, configuration, configuration.getTelemetry())
                     .addTelemetryAttributes(telemetryAttributes)
                     .attemptHttpRequest();
         } catch (ApiException e) {
@@ -569,7 +569,7 @@ private CompletableFuture<ApiResponse<ListUsersResponse>> listUsers(
 
         try {
             HttpRequest request = buildHttpRequest("POST", path, body, configuration);
-            return new HttpRequestAttempt<>(request, "listUsers", ListUsersResponse.class, apiClient, configuration, this.telemetry)
+            return new HttpRequestAttempt<>(request, "listUsers", ListUsersResponse.class, apiClient, configuration, configuration.getTelemetry())
                     .addTelemetryAttributes(telemetryAttributes)
                     .attemptHttpRequest();
         } catch (ApiException e) {
@@ -625,7 +625,7 @@ private CompletableFuture<ApiResponse<ReadResponse>> read(
 
         try {
             HttpRequest request = buildHttpRequest("POST", path, body, configuration);
-            return new HttpRequestAttempt<>(request, "read", ReadResponse.class, apiClient, configuration, this.telemetry)
+            return new HttpRequestAttempt<>(request, "read", ReadResponse.class, apiClient, configuration, configuration.getTelemetry())
                     .addTelemetryAttributes(telemetryAttributes)
                     .attemptHttpRequest();
         } catch (ApiException e) {
@@ -684,7 +684,7 @@ private CompletableFuture<ApiResponse<ReadAssertionsResponse>> readAssertions(
         try {
             HttpRequest request = buildHttpRequest("GET", path, configuration);
             return new HttpRequestAttempt<>(
-                            request, "readAssertions", ReadAssertionsResponse.class, apiClient, configuration, this.telemetry)
+                            request, "readAssertions", ReadAssertionsResponse.class, apiClient, configuration, configuration.getTelemetry())
                     .addTelemetryAttributes(telemetryAttributes)
                     .attemptHttpRequest();
         } catch (ApiException e) {
@@ -747,7 +747,7 @@ private CompletableFuture<ApiResponse<ReadAuthorizationModelResponse>> readAutho
                             ReadAuthorizationModelResponse.class,
                             apiClient,
                             configuration,
-                            this.telemetry)
+                            configuration.getTelemetry())
                     .addTelemetryAttributes(telemetryAttributes)
                     .attemptHttpRequest();
         } catch (ApiException e) {
@@ -812,7 +812,7 @@ private CompletableFuture<ApiResponse<ReadAuthorizationModelsResponse>> readAuth
                             ReadAuthorizationModelsResponse.class,
                             apiClient,
                             configuration,
-                            this.telemetry)
+                            configuration.getTelemetry())
                     .addTelemetryAttributes(telemetryAttributes)
                     .attemptHttpRequest();
         } catch (ApiException e) {
@@ -898,7 +898,7 @@ private CompletableFuture<ApiResponse<ReadChangesResponse>> readChanges(
 
         try {
             HttpRequest request = buildHttpRequest("GET", path, configuration);
-            return new HttpRequestAttempt<>(request, "readChanges", ReadChangesResponse.class, apiClient, configuration, this.telemetry)
+            return new HttpRequestAttempt<>(request, "readChanges", ReadChangesResponse.class, apiClient, configuration, configuration.getTelemetry())
                     .addTelemetryAttributes(telemetryAttributes)
                     .attemptHttpRequest();
         } catch (ApiException e) {
@@ -953,7 +953,7 @@ private CompletableFuture<ApiResponse<Object>> write(String storeId, WriteReques
 
         try {
             HttpRequest request = buildHttpRequest("POST", path, body, configuration);
-            return new HttpRequestAttempt<>(request, "write", Object.class, apiClient, configuration, this.telemetry)
+            return new HttpRequestAttempt<>(request, "write", Object.class, apiClient, configuration, configuration.getTelemetry())
                     .addTelemetryAttributes(telemetryAttributes)
                     .attemptHttpRequest();
         } catch (ApiException e) {
@@ -1020,7 +1020,7 @@ private CompletableFuture<ApiResponse<Void>> writeAssertions(
 
         try {
             HttpRequest request = buildHttpRequest("PUT", path, body, configuration);
-            return new HttpRequestAttempt<>(request, "writeAssertions", Void.class, apiClient, configuration, this.telemetry)
+            return new HttpRequestAttempt<>(request, "writeAssertions", Void.class, apiClient, configuration, configuration.getTelemetry())
                     .addTelemetryAttributes(telemetryAttributes)
                     .attemptHttpRequest();
         } catch (ApiException e) {
@@ -1083,7 +1083,7 @@ private CompletableFuture<ApiResponse<WriteAuthorizationModelResponse>> writeAut
                             WriteAuthorizationModelResponse.class,
                             apiClient,
                             configuration,
-                            this.telemetry)
+                            configuration.getTelemetry())
                     .addTelemetryAttributes(telemetryAttributes)
                     .attemptHttpRequest();
         } catch (ApiException e) {
@@ -1259,20 +1259,24 @@ private String pathWithParams(String basePath, Object... params) {
      * @throws IllegalStateException when the configuration is invalid
      */
     private String getAccessToken(Configuration configuration) throws ApiException {
-        CredentialsMethod credentialsMethod = configuration.getCredentials().getCredentialsMethod();
-
-        if (credentialsMethod == CredentialsMethod.API_TOKEN) {
-            return configuration.getCredentials().getApiToken().getToken();
-        }
-
-        if (credentialsMethod == CredentialsMethod.CLIENT_CREDENTIALS) {
-            try {
-                return oAuth2Client.getAccessToken().get();
-            } catch (Exception e) {
-                throw new ApiException(e);
+                CredentialsMethod credentialsMethod = configuration.getCredentials().getCredentialsMethod();
+
+                        if (credentialsMethod == CredentialsMethod.API_TOKEN) {
+                     return configuration.getCredentials().getApiToken().getToken();
+                    }
+
+                        if (credentialsMethod == CredentialsMethod.CLIENT_CREDENTIALS) {
+                        try {
+                                OAuth2Client client =
+                                            (configuration == this.configuration && this.oAuth2Client != null)
+                                                        ? this.oAuth2Client
+                                                        : new OAuth2Client(configuration, apiClient, configuration.getTelemetry());
+                                return client.getAccessToken().get();
+                            } catch (Exception e) {
+                                throw new ApiException(e);
+                            }
+                    }
+
+                        throw new IllegalStateException("Configuration is invalid.");
             }
-        }
-
-        throw new IllegalStateException("Configuration is invalid.");
-    }
 }