restructure HashiCorp package to support dedicated and other types of…

… vault
oracle · Dec 25, 2024 · 56e27e1 · 56e27e1
1 parent 4d5553d
commit 56e27e1
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 19 deletions.
diff --git a/...orp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/HashiVaultResourceFactory.java b/...orp/src/main/java/oracle/jdbc/provider/hashicorp/dedicated/HashiVaultResourceFactory.java
@@ -1,9 +1,9 @@
-package oracle.jdbc.provider.hashicorp;
+package oracle.jdbc.provider.hashicorp.dedicated;
 
 import oracle.jdbc.provider.factory.Resource;
 import oracle.jdbc.provider.factory.ResourceFactory;
-import oracle.jdbc.provider.hashicorp.authentication.HashiCredentials;
-import oracle.jdbc.provider.hashicorp.authentication.HashicorpCredentialsFactory;
+import oracle.jdbc.provider.hashicorp.dedicated.authentication.HashiCredentials;
+import oracle.jdbc.provider.hashicorp.dedicated.authentication.HashicorpCredentialsFactory;
 import oracle.jdbc.provider.parameter.ParameterSet;
 
 /**

diff --git a/...c/main/java/oracle/jdbc/provider/hashicorp/dedicated/authentication/HashiCredentials.java b/...c/main/java/oracle/jdbc/provider/hashicorp/dedicated/authentication/HashiCredentials.java
@@ -1,4 +1,4 @@
-package oracle.jdbc.provider.hashicorp.authentication;
+package oracle.jdbc.provider.hashicorp.dedicated.authentication;
 
 /**
  * Simple credentials object for HashiCorp Vault that holds a token.

diff --git a/...racle/jdbc/provider/hashicorp/dedicated/authentication/HashicorpAuthenticationMethod.java b/...racle/jdbc/provider/hashicorp/dedicated/authentication/HashicorpAuthenticationMethod.java
@@ -1,4 +1,4 @@
-package oracle.jdbc.provider.hashicorp.authentication;
+package oracle.jdbc.provider.hashicorp.dedicated.authentication;
 
 /**
  * A method of authentication using HashiCorp Vault.

diff --git a/.../oracle/jdbc/provider/hashicorp/dedicated/authentication/HashicorpCredentialsFactory.java b/.../oracle/jdbc/provider/hashicorp/dedicated/authentication/HashicorpCredentialsFactory.java
@@ -1,8 +1,8 @@
-package oracle.jdbc.provider.hashicorp.authentication;
+package oracle.jdbc.provider.hashicorp.dedicated.authentication;
 
 import oracle.jdbc.provider.factory.Resource;
 import oracle.jdbc.provider.factory.ResourceFactory;
-import oracle.jdbc.provider.hashicorp.secrets.HashiVaultSecretsManagerFactory;
+import oracle.jdbc.provider.hashicorp.dedicated.secrets.HashiVaultSecretsManagerFactory;
 import oracle.jdbc.provider.parameter.Parameter;
 import oracle.jdbc.provider.parameter.ParameterSet;
 

diff --git a/...n/java/oracle/jdbc/provider/hashicorp/dedicated/configuration/HashiJsonVaultProvider.java b/...n/java/oracle/jdbc/provider/hashicorp/dedicated/configuration/HashiJsonVaultProvider.java
@@ -1,7 +1,7 @@
-package oracle.jdbc.provider.hashicorp.configuration;
+package oracle.jdbc.provider.hashicorp.dedicated.configuration;
 
 import oracle.jdbc.provider.configuration.JsonSecretUtil;
-import oracle.jdbc.provider.hashicorp.secrets.HashiVaultSecretsManagerFactory;
+import oracle.jdbc.provider.hashicorp.dedicated.secrets.HashiVaultSecretsManagerFactory;
 import oracle.jdbc.provider.parameter.ParameterSet;
 import oracle.jdbc.spi.OracleConfigurationJsonSecretProvider;
 import oracle.sql.json.OracleJsonObject;
@@ -10,8 +10,8 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 
-import static oracle.jdbc.provider.hashicorp.configuration.HashiVaultSecretsManagerConfigurationProvider.PARAMETER_SET_PARSER;
-import static oracle.jdbc.provider.hashicorp.secrets.HashiVaultSecretsManagerFactory.FIELD_NAME;
+import static oracle.jdbc.provider.hashicorp.dedicated.configuration.HashiVaultSecretsManagerConfigurationProvider.PARAMETER_SET_PARSER;
+import static oracle.jdbc.provider.hashicorp.dedicated.secrets.HashiVaultSecretsManagerFactory.FIELD_NAME;
 
 public class HashiJsonVaultProvider implements OracleConfigurationJsonSecretProvider {
 

diff --git a/...ider/hashicorp/dedicated/configuration/HashiVaultSecretsManagerConfigurationProvider.java b/...ider/hashicorp/dedicated/configuration/HashiVaultSecretsManagerConfigurationProvider.java
@@ -1,7 +1,7 @@
-package oracle.jdbc.provider.hashicorp.configuration;
+package oracle.jdbc.provider.hashicorp.dedicated.configuration;
 
 import oracle.jdbc.driver.OracleConfigurationJsonProvider;
-import oracle.jdbc.provider.hashicorp.secrets.HashiVaultSecretsManagerFactory;
+import oracle.jdbc.provider.hashicorp.dedicated.secrets.HashiVaultSecretsManagerFactory;
 import oracle.jdbc.provider.parameter.ParameterSet;
 import oracle.jdbc.provider.parameter.ParameterSetParser;
 import oracle.jdbc.util.OracleConfigurationCache;

diff --git a/...cle/jdbc/provider/hashicorp/dedicated/configuration/HashicorpConfigurationParameters.java b/...cle/jdbc/provider/hashicorp/dedicated/configuration/HashicorpConfigurationParameters.java
@@ -1,7 +1,7 @@
-package oracle.jdbc.provider.hashicorp.configuration;
+package oracle.jdbc.provider.hashicorp.dedicated.configuration;
 
-import oracle.jdbc.provider.hashicorp.authentication.HashicorpAuthenticationMethod;
-import oracle.jdbc.provider.hashicorp.authentication.HashicorpCredentialsFactory;
+import oracle.jdbc.provider.hashicorp.dedicated.authentication.HashicorpAuthenticationMethod;
+import oracle.jdbc.provider.hashicorp.dedicated.authentication.HashicorpCredentialsFactory;
 import oracle.jdbc.provider.parameter.ParameterSetParser;
 
 /**

diff --git a/...ava/oracle/jdbc/provider/hashicorp/dedicated/secrets/HashiVaultSecretsManagerFactory.java b/...ava/oracle/jdbc/provider/hashicorp/dedicated/secrets/HashiVaultSecretsManagerFactory.java
@@ -1,10 +1,10 @@
-package oracle.jdbc.provider.hashicorp.secrets;
+package oracle.jdbc.provider.hashicorp.dedicated.secrets;
 
 import oracle.jdbc.provider.cache.CachedResourceFactory;
 import oracle.jdbc.provider.factory.Resource;
 import oracle.jdbc.provider.factory.ResourceFactory;
-import oracle.jdbc.provider.hashicorp.HashiVaultResourceFactory;
-import oracle.jdbc.provider.hashicorp.authentication.HashiCredentials;
+import oracle.jdbc.provider.hashicorp.dedicated.HashiVaultResourceFactory;
+import oracle.jdbc.provider.hashicorp.dedicated.authentication.HashiCredentials;
 import oracle.jdbc.provider.parameter.Parameter;
 import oracle.jdbc.provider.parameter.ParameterSet;
 import oracle.sql.json.OracleJsonFactory;