Merge pull request #99 from BetterCloud/expose-environmentloader

Gives VaultConfig the ability to disable loading from environment var…

Author: steve-perkins

README.md

@@ -230,6 +230,7 @@ should represent non-breaking changes.  The third number represents any very min
   * Allows auth backend methods to be configured for non-default mount points.  
   * Adds "revoke-self" capability for auth tokens.  
   * Support for signing a new certificate based on a CSR (i.e. the `/v1/pki/sign` endpoint).
+  * Gives `VaultConfig` the ability to disable loading from environment variables if desired.
   * Cleans up issues with the new Docker-based integration test suite.  
   * Updates all dependencies to their latest versions (including switching to Vault 0.9.1 for integration testing).
 

src/main/java/com/bettercloud/vault/VaultConfig.java

@@ -43,15 +43,19 @@ public class VaultConfig implements Serializable {
      * <p>The code used to load environment variables is encapsulated here, so that a mock version of that environment
      * loader can be used by unit tests.</p>
      *
-     * <p>This method is used by unit tests, to inject a mock environment variable when constructing a
-     * <code>VaultConfig</code> instance using the builder pattern approach rather than the convenience constructor.
-     * There really shouldn't ever be a need to call this method outside of a unit test context (hence the
-     * <code>protected</code> access level).</p>
+     * <p>This method is primarily intended for use by unit tests, to inject a mock environment variable when
+     * constructing a <code>VaultConfig</code> instance using the builder pattern approach rather than the convenience
+     * constructor.  This method's access level was therefore originally set to <code>protected</code>, but was bumped
+     * up to <code>public</code> due to community request for the ability to disable environment loading altogether
+     * (see https://github.com/BetterCloud/vault-java-driver/issues/77).
+     *
+     * Note that if you do override this, however, then obviously all of the environment checking discussed in the
+     * documentation becomes disabled.
      *
      * @param environmentLoader An environment variable loader implementation (presumably a mock)
      * @return This object, with environmentLoader populated, ready for additional builder-pattern method calls or else finalization with the build() method
      */
-    protected VaultConfig environmentLoader(final EnvironmentLoader environmentLoader) {
+    public VaultConfig environmentLoader(final EnvironmentLoader environmentLoader) {
         this.environmentLoader = environmentLoader;
         return this;
     }