Rename R_AKVURLInvalid as its use is no longer AKV specific

microsoft · Sep 19, 2024 · bbcdf8d · bbcdf8d
1 parent 9269c18
commit bbcdf8d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/ConfigurableRetryLogic.java b/src/main/java/com/microsoft/sqlserver/jdbc/ConfigurableRetryLogic.java
@@ -154,7 +154,7 @@ private static String getCurrentClassPath() throws SQLServerException {
             URI uri = new URI(location + FORWARD_SLASH);
             return uri.getPath() + DEFAULT_PROPS_FILE; // For now, we only allow "mssql-jdbc.properties" as file name.
         } catch (URISyntaxException e) {
-            MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_AKVURLInvalid"));
+            MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_URLInvalid"));
             Object[] msgArgs = {location + FORWARD_SLASH};
             throw new SQLServerException(form.format(msgArgs), null, 0, e);
         } catch (ClassNotFoundException e) {

diff --git a/...ain/java/com/microsoft/sqlserver/jdbc/SQLServerColumnEncryptionAzureKeyVaultProvider.java b/...ain/java/com/microsoft/sqlserver/jdbc/SQLServerColumnEncryptionAzureKeyVaultProvider.java
@@ -645,7 +645,7 @@ private void validateNonEmptyAKVPath(String masterKeyPath) throws SQLServerExcep
                     }
                 }
             } catch (URISyntaxException e) {
-                MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_AKVURLInvalid"));
+                MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_URLInvalid"));
                 Object[] msgArgs = {masterKeyPath};
                 throw new SQLServerException(form.format(msgArgs), null, 0, e);
             }

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResource.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResource.java
@@ -370,8 +370,8 @@ protected Object[][] getContents() {
         {"R_ForceEncryptionTrue_HonorAEFalseRS", "Cannot set Force Encryption to true for parameter {0} because encryption is not enabled for the statement or procedure."},
         {"R_ForceEncryptionTrue_HonorAETrue_UnencryptedColumnRS", "Cannot execute update because Force Encryption was set as true for parameter {0} and the database expects this parameter to be sent as plaintext. This may be due to a configuration error."},
         {"R_NullValue", "{0} cannot be null."},
+        {"R_URLInvalid", "Invalid URL specified: {0}."},
         {"R_AKVPathNull", "Azure Key Vault key path cannot be null."},
-        {"R_AKVURLInvalid", "Invalid URL specified: {0}."},
         {"R_AKVMasterKeyPathInvalid", "Invalid Azure Key Vault key path specified: {0}."},
         {"R_ManagedIdentityInitFail", "Failed to initialize package to get Managed Identity token for Azure Key Vault."},
         {"R_EmptyCEK", "Empty column encryption key specified."},

diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/JDBCEncryptionDecryptionTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/JDBCEncryptionDecryptionTest.java
@@ -313,7 +313,7 @@ public void testAkvDecryptColumnEncryptionKey(String serverName, String url, Str
             akv.decryptColumnEncryptionKey("http:///^[!#$&-;=?-[]_a-", "", null);
             fail(TestResource.getResource("R_expectedExceptionNotThrown"));
         } catch (SQLServerException e) {
-            assertTrue(e.getMessage().matches(TestUtils.formatErrorMsg("R_AKVURLInvalid")), e.getMessage());
+            assertTrue(e.getMessage().matches(TestUtils.formatErrorMsg("R_URLInvalid")), e.getMessage());
         }
 
         // null encryptedColumnEncryptionKey