changing method name as per suggestion of GoogleApplicationDefaultCre…

…dentials Signed-off-by: fahadshamiinsta <[email protected]>
fahadshamiinsta · Dec 15, 2023 · 773184b · 773184b
1 parent b922aed
commit 773184b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...cs/src/main/java/org/opensearch/repositories/gcs/GoogleApplicationDefaultCredentials.java b/...cs/src/main/java/org/opensearch/repositories/gcs/GoogleApplicationDefaultCredentials.java
@@ -17,7 +17,7 @@
 public class GoogleApplicationDefaultCredentials {
     private static final Logger logger = LogManager.getLogger(GoogleApplicationDefaultCredentials.class);
 
-    public GoogleCredentials getApplicationDefaultCredentials() {
+    public GoogleCredentials get() {
         GoogleCredentials credentials = null;
         try {
             credentials = SocketAccess.doPrivilegedIOException(GoogleCredentials::getApplicationDefault);

diff --git a/...pository-gcs/src/main/java/org/opensearch/repositories/gcs/GoogleCloudStorageService.java b/...pository-gcs/src/main/java/org/opensearch/repositories/gcs/GoogleCloudStorageService.java
@@ -224,7 +224,7 @@ StorageOptions createStorageOptions(
         }
         if (clientSettings.getCredential() == null) {
             logger.info("\"Application Default Credentials\" will be in use");
-            final GoogleCredentials credentials = googleApplicationDefaultCredentials.getApplicationDefaultCredentials();
+            final GoogleCredentials credentials = googleApplicationDefaultCredentials.get();
             if (credentials != null) {
                 storageOptionsBuilder.setCredentials(credentials);
             }

diff --git a/...ory-gcs/src/test/java/org/opensearch/repositories/gcs/GoogleCloudStorageServiceTests.java b/...ory-gcs/src/test/java/org/opensearch/repositories/gcs/GoogleCloudStorageServiceTests.java
@@ -93,7 +93,7 @@ public void testClientInitializer() throws Exception {
             .build();
         GoogleCredentials mockGoogleCredentials = Mockito.mock(GoogleCredentials.class);
         GoogleApplicationDefaultCredentials mockDefaultCredentials = Mockito.mock(GoogleApplicationDefaultCredentials.class);
-        Mockito.when(mockDefaultCredentials.getApplicationDefaultCredentials()).thenReturn(mockGoogleCredentials);
+        Mockito.when(mockDefaultCredentials.get()).thenReturn(mockGoogleCredentials);
 
         final GoogleCloudStorageService service = new GoogleCloudStorageService(mockDefaultCredentials);
         service.refreshAndClearCache(GoogleCloudStorageClientSettings.load(settings));
@@ -218,7 +218,7 @@ public void testApplicationDefaultCredential() throws Exception {
         GoogleCredentials mockGoogleCredentials = Mockito.mock(GoogleCredentials.class);
         HttpTransportOptions mockHttpTransportOptions = Mockito.mock(HttpTransportOptions.class);
         GoogleApplicationDefaultCredentials mockDefaultCredentials = Mockito.mock(GoogleApplicationDefaultCredentials.class);
-        Mockito.when(mockDefaultCredentials.getApplicationDefaultCredentials()).thenReturn(mockGoogleCredentials);
+        Mockito.when(mockDefaultCredentials.get()).thenReturn(mockGoogleCredentials);
 
         GoogleCloudStorageService service = new GoogleCloudStorageService(mockDefaultCredentials);
         StorageOptions storageOptions = service.createStorageOptions(settings,mockHttpTransportOptions);