Addressed PR comments.

Author: vverman

samples/snippets/pom.xml

@@ -75,12 +75,6 @@
       <version>2.20.27</version>
     </dependency>
 
-    <!-- Gson -->
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.10.1</version>
-    </dependency>
 
 <!--    Test dependencies-->
     <dependency>

samples/snippets/src/main/java/CustomCredentialSupplierAwsWorkload.java

@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-import com.google.auth.oauth2.AwsCredentials;
-import com.google.auth.oauth2.AwsSecurityCredentialsSupplier;
-import com.google.auth.oauth2.ExternalAccountSupplierContext;
-import com.google.auth.oauth2.GoogleCredentials;
+import com.google.auth.oauth2.*;
 import com.google.cloud.storage.Bucket;
 import com.google.cloud.storage.Storage;
 import com.google.cloud.storage.StorageOptions;
@@ -34,7 +31,7 @@
 public class CustomCredentialSupplierAwsWorkload {
 
   public static void main(String[] args) {
-    // TODO(Developer): Replace these variables with your actual values.
+    // TODO(Developer): Set these environment variable values.
     String gcpWorkloadAudience = System.getenv("GCP_WORKLOAD_AUDIENCE");
     String saImpersonationUrl = System.getenv("GCP_SERVICE_ACCOUNT_IMPERSONATION_URL");
     String gcsBucketName = System.getenv("GCS_BUCKET_NAME");
@@ -115,7 +112,7 @@ public String getRegion(ExternalAccountSupplierContext context) {
 
     /** Retrieves AWS security credentials using the AWS SDK's default provider chain. */
     @Override
-    public com.google.auth.oauth2.AwsSecurityCredentials getCredentials(
+    public AwsSecurityCredentials getCredentials(
         ExternalAccountSupplierContext context) {
       software.amazon.awssdk.auth.credentials.AwsCredentials credentials =
           this.awsCredentialsProvider.resolveCredentials();

samples/snippets/src/main/java/CustomCredentialSupplierOktaWorkload.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
+import com.google.api.client.json.GenericJson;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.auth.oauth2.ExternalAccountSupplierContext;
 import com.google.auth.oauth2.GoogleCredentials;
 import com.google.auth.oauth2.IdentityPoolCredentials;
 import com.google.auth.oauth2.IdentityPoolSubjectTokenSupplier;
 import com.google.cloud.storage.Bucket;
 import com.google.cloud.storage.Storage;
 import com.google.cloud.storage.StorageOptions;
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -188,13 +188,16 @@ private void fetchOktaAccessToken() throws IOException {
             response.append(line);
           }
 
-          Gson gson = new Gson();
-          JsonObject jsonObject = gson.fromJson(response.toString(), JsonObject.class);
+          GenericJson jsonObject =
+              GsonFactory.getDefaultInstance()
+                  .createJsonParser(response.toString())
+                  .parse(GenericJson.class);
 
-          if (jsonObject.has("access_token") && jsonObject.has("expires_in")) {
-            this.accessToken = jsonObject.get("access_token").getAsString();
-            int expiresIn = jsonObject.get("expires_in").getAsInt();
-            this.expiryTime = System.currentTimeMillis() + expiresIn * 1000;
+          if (jsonObject.containsKey("access_token") && jsonObject.containsKey("expires_in")) {
+            this.accessToken = (String) jsonObject.get("access_token");
+            Number expiresInNumber = (Number) jsonObject.get("expires_in");
+            int expiresIn = expiresInNumber.intValue();
+            this.expiryTime = System.currentTimeMillis() + expiresIn * 1000L;
             System.out.println(
                 "[Supplier] Successfully received Access Token from Okta. Expires in "
                     + expiresIn