refactor convertTarget name

Author: sfc-gh-dheyman

src/main/java/net/snowflake/client/core/SecureStorageAppleManager.java

@@ -32,7 +32,7 @@ public SecureStorageStatus setCredential(String host, String user, String type,
       return SecureStorageStatus.SUCCESS;
     }
 
-    String target = SecureStorageManager.convertTarget(host, user, type);
+    String target = SecureStorageManager.buildCredentialsKey(host, user, type);
     byte[] targetBytes = target.getBytes(StandardCharsets.UTF_8);
     byte[] userBytes = user.toUpperCase().getBytes(StandardCharsets.UTF_8);
     byte[] credBytes = cred.getBytes(StandardCharsets.UTF_8);
@@ -92,7 +92,7 @@ public SecureStorageStatus setCredential(String host, String user, String type,
   }
 
   public String getCredential(String host, String user, String type) {
-    String target = SecureStorageManager.convertTarget(host, user, type);
+    String target = SecureStorageManager.buildCredentialsKey(host, user, type);
     byte[] targetBytes = target.getBytes(StandardCharsets.UTF_8);
     byte[] userBytes = user.toUpperCase().getBytes(StandardCharsets.UTF_8);
 
@@ -141,7 +141,7 @@ public String getCredential(String host, String user, String type) {
   }
 
   public SecureStorageStatus deleteCredential(String host, String user, String type) {
-    String target = SecureStorageManager.convertTarget(host, user, type);
+    String target = SecureStorageManager.buildCredentialsKey(host, user, type);
     byte[] targetBytes = target.getBytes(StandardCharsets.UTF_8);
     byte[] userBytes = user.toUpperCase().getBytes(StandardCharsets.UTF_8);
 

src/main/java/net/snowflake/client/core/SecureStorageLinuxManager.java

@@ -63,7 +63,7 @@ public synchronized SecureStorageStatus setCredential(
     }
     localCredCache.computeIfAbsent(CACHE_FILE_TOKENS_OBJECT_NAME, tokensMap -> new HashMap<>());
     Map<String, String> tokensMap = localCredCache.get(CACHE_FILE_TOKENS_OBJECT_NAME);
-    tokensMap.put(SecureStorageManager.convertTarget(host, user, type), token);
+    tokensMap.put(SecureStorageManager.buildCredentialsKey(host, user, type), token);
     fileCacheManager.writeCacheFile(localCacheToJson());
     return SecureStorageStatus.SUCCESS;
   }
@@ -74,14 +74,14 @@ public synchronized String getCredential(String host, String user, String type)
     if (tokensMap == null) {
       return null;
     }
-    return tokensMap.get(SecureStorageManager.convertTarget(host, user, type));
+    return tokensMap.get(SecureStorageManager.buildCredentialsKey(host, user, type));
   }
 
   /** May delete credentials which doesn't belong to this process */
   public synchronized SecureStorageStatus deleteCredential(String host, String user, String type) {
     Map<String, String> tokensMap = localCredCache.get(CACHE_FILE_TOKENS_OBJECT_NAME);
     if (tokensMap != null) {
-      tokensMap.remove(SecureStorageManager.convertTarget(host, user, type));
+      tokensMap.remove(SecureStorageManager.buildCredentialsKey(host, user, type));
       if (tokensMap.isEmpty()) {
         localCredCache.remove(CACHE_FILE_TOKENS_OBJECT_NAME);
       }

src/main/java/net/snowflake/client/core/SecureStorageManager.java

@@ -20,7 +20,7 @@ interface SecureStorageManager {
 
   SecureStorageStatus deleteCredential(String host, String user, String type);
 
-  static String convertTarget(String host, String user, String type) {
+  static String buildCredentialsKey(String host, String user, String type) {
     StringBuilder target =
         new StringBuilder(host.length() + user.length() + type.length() + 3 * COLON_CHAR_LENGTH);
 

src/main/java/net/snowflake/client/core/SecureStorageWindowsManager.java

@@ -47,7 +47,7 @@ public SecureStorageStatus setCredential(String host, String user, String type,
     Memory credBlobMem = new Memory(credBlob.length);
     credBlobMem.write(0, credBlob, 0, credBlob.length);
 
-    String target = SecureStorageManager.convertTarget(host, user, type);
+    String target = SecureStorageManager.buildCredentialsKey(host, user, type);
 
     SecureStorageWindowsCredential cred = new SecureStorageWindowsCredential();
     cred.Type = SecureStorageWindowsCredentialType.CRED_TYPE_GENERIC.getType();
@@ -76,7 +76,7 @@ public SecureStorageStatus setCredential(String host, String user, String type,
 
   public String getCredential(String host, String user, String type) {
     PointerByReference pCredential = new PointerByReference();
-    String target = SecureStorageManager.convertTarget(host, user, type);
+    String target = SecureStorageManager.buildCredentialsKey(host, user, type);
 
     try {
       boolean ret = false;
@@ -127,7 +127,7 @@ public String getCredential(String host, String user, String type) {
   }
 
   public SecureStorageStatus deleteCredential(String host, String user, String type) {
-    String target = SecureStorageManager.convertTarget(host, user, type);
+    String target = SecureStorageManager.buildCredentialsKey(host, user, type);
 
     boolean ret = false;
     synchronized (advapi32Lib) {

src/test/java/net/snowflake/client/core/SecureStorageManagerTest.java

@@ -226,27 +226,27 @@ public class SecureStorageManagerTest {
   private static final String MFA_TOKEN = "MFATOKEN";
 
   @Test
-  public void testConvertTarget() {
+  public void testBuildCredentialsKey() {
     // hex values obtained using https://emn178.github.io/online-tools/sha256.html
     String hashedKey =
-        SecureStorageManager.convertTarget(
+        SecureStorageManager.buildCredentialsKey(
             host, user, CachedCredentialType.OAUTH_ACCESS_TOKEN.getValue());
     Assertions.assertEquals(
         "A7C7EBB89312E88552CD00664A0E20929801FACFBD682BF7C2363FB6EC8F914E", hashedKey);
 
     hashedKey =
-        SecureStorageManager.convertTarget(
+        SecureStorageManager.buildCredentialsKey(
             host, user, CachedCredentialType.OAUTH_REFRESH_TOKEN.getValue());
     Assertions.assertEquals(
         "DB37028833FA02B125FBD6DE8CE679C7E62E7D38FAC585E98060E00987F96772", hashedKey);
 
     hashedKey =
-        SecureStorageManager.convertTarget(host, user, CachedCredentialType.ID_TOKEN.getValue());
+        SecureStorageManager.buildCredentialsKey(host, user, CachedCredentialType.ID_TOKEN.getValue());
     Assertions.assertEquals(
         "6AA3F783E07D1D2182DAB59442806E2433C55C2BD4D9240790FD5B4B91FD4FDB", hashedKey);
 
     hashedKey =
-        SecureStorageManager.convertTarget(host, user, CachedCredentialType.MFA_TOKEN.getValue());
+        SecureStorageManager.buildCredentialsKey(host, user, CachedCredentialType.MFA_TOKEN.getValue());
     Assertions.assertEquals(
         "9D10D4EFE45605D85993C6AC95334F1B63D36611B83615656EC7F277A947BF4B", hashedKey);
   }