Bumps version to 4.1.0. Fixes recent mounts-support PR, since Lombok was removed

Author: steve-perkins-bc

build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'signing'
 
 group 'com.bettercloud'
 archivesBaseName = 'vault-java-driver'
-version '4.0.0'
+version '4.1.0'
 ext.isReleaseVersion = !version.endsWith('SNAPSHOT')
 
 compileJava {

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

@@ -151,7 +151,8 @@ public VaultConfig secretsEnginePathMap(final Map<String, String> secretEngineVe
      * <p>Sets the secrets Engine version be used by Vault for the provided path.</p>
      *
      * @param path the path to use for accessing Vault secrets.
-     *             Example "/secret/foo" 
+     *             Example "/secret/foo"
+     * @param version The key-value engine version used for this path.
      * @return This object, with a new entry in the secrets paths map, ready for additional builder-pattern method calls or else finalization with 
      *         the build() method
      */

src/main/java/com/bettercloud/vault/api/Logical.java

@@ -31,7 +31,7 @@ public class Logical {
 
     private String nameSpace;
 
-    public enum logicalOperations {authentication, deleteV1, deleteV2, destroy, listV1, listV2, readV1, readV2, writeV1, writeV2, unDelete}
+    public enum logicalOperations {authentication, deleteV1, deleteV2, destroy, listV1, listV2, readV1, readV2, writeV1, writeV2, unDelete, mount}
 
     public Logical(final VaultConfig config) {
         this.config = config;

src/main/java/com/bettercloud/vault/api/mounts/Mount.java

@@ -2,8 +2,6 @@
 
 import java.io.Serializable;
 
-import lombok.Getter;
-
 /**
  * <p>A container for options returned by mounts endpoints on the Secret Engine backend. This class is
  * meant for use with a builder pattern style.  Example usage:</p>
@@ -17,13 +15,14 @@
  * </blockquote>
  */
 public class Mount implements Serializable {
+    
     private static final long serialVersionUID = 45748211702309181L;
 
-    @Getter private MountType type;
-    @Getter private String description;
-    @Getter private MountConfig config;
-    @Getter private Boolean local;
-    @Getter private Boolean sealWrap;
+    private MountType type;
+    private String description;
+    private MountConfig config;
+    private Boolean local;
+    private Boolean sealWrap;
 
     public Mount type(final MountType type) {
         this.type = type;
@@ -49,4 +48,25 @@ public Mount sealWrap(final Boolean sealWrap) {
         this.sealWrap = sealWrap;
         return this;
     }
+
+    public MountType getType() {
+        return type;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public MountConfig getConfig() {
+        return config;
+    }
+
+    public Boolean getLocal() {
+        return local;
+    }
+
+    public Boolean getSealWrap() {
+        return sealWrap;
+    }
+
 }

src/main/java/com/bettercloud/vault/api/mounts/MountConfig.java

@@ -4,8 +4,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import lombok.Getter;
-
 /**
  * <p>A container for options returned by mounts endpoints on the Secret Engine backend. This class is
  * meant for use with a builder pattern style.  Example usage:</p>
@@ -25,11 +23,11 @@
 public class MountConfig implements Serializable {
     private static final long serialVersionUID = 839595627039704093L;
 
-    @Getter private Integer defaultLeaseTtl;
-    @Getter private Integer maxLeaseTtl;
-    @Getter private String description;
-    @Getter private Boolean forceNoCache;
-    @Getter private String pluginName;
+    private Integer defaultLeaseTtl;
+    private Integer maxLeaseTtl;
+    private String description;
+    private Boolean forceNoCache;
+    private String pluginName;
     private List<String> auditNonHmacRequestKeys;
     private List<String> auditNonHmacResponseKeys;
 
@@ -93,4 +91,25 @@ public List<String> getAuditNonHmacResponseKeys() {
             return clone;
         }
     }
+
+    public Integer getDefaultLeaseTtl() {
+        return defaultLeaseTtl;
+    }
+
+    public Integer getMaxLeaseTtl() {
+        return maxLeaseTtl;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public Boolean getForceNoCache() {
+        return forceNoCache;
+    }
+
+    public String getPluginName() {
+        return pluginName;
+    }
+
 }

src/main/java/com/bettercloud/vault/api/mounts/MountPayload.java

@@ -8,8 +8,6 @@
 import com.bettercloud.vault.json.Json;
 import com.bettercloud.vault.json.JsonObject;
 
-import lombok.Getter;
-
 /**
  * <p>A container for options sent to mounts endpoints on the Secret Engine backend as REST payload. This class is
  * meant for use with a builder pattern style.  Example usage:</p>
@@ -26,13 +24,13 @@
 public class MountPayload implements Serializable {
     private static final long serialVersionUID = 839595627039704093L;
 
-    @Getter private TimeToLive defaultLeaseTtl;
-    @Getter private TimeToLive maxLeaseTtl;
-    @Getter private String description;
-    @Getter private Boolean forceNoCache;
-    @Getter private String pluginName;
-    @Getter private Boolean local;
-    @Getter private Boolean sealWrap;
+    private TimeToLive defaultLeaseTtl;
+    private TimeToLive maxLeaseTtl;
+    private String description;
+    private Boolean forceNoCache;
+    private String pluginName;
+    private Boolean local;
+    private Boolean sealWrap;
     private List<String> auditNonHmacRequestKeys;
     private List<String> auditNonHmacResponseKeys;
 
@@ -156,4 +154,33 @@ private JsonObject toConfigJson() {
 
         return jsonObject;
     }
+
+    public TimeToLive getDefaultLeaseTtl() {
+        return defaultLeaseTtl;
+    }
+
+    public TimeToLive getMaxLeaseTtl() {
+        return maxLeaseTtl;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public Boolean getForceNoCache() {
+        return forceNoCache;
+    }
+
+    public String getPluginName() {
+        return pluginName;
+    }
+
+    public Boolean getLocal() {
+        return local;
+    }
+
+    public Boolean getSealWrap() {
+        return sealWrap;
+    }
+
 }

src/main/java/com/bettercloud/vault/api/mounts/TimeToLive.java

@@ -2,10 +2,6 @@
 
 import java.util.concurrent.TimeUnit;
 
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-
 /**
  * <p>A container for Time To Live information sent to mounts endpoints on the Secret Engine backend as REST payload.
  * This class is meant for use with a static <code>TimeToLive.of(int, TimeUnit)</code> method pattern style.  Example
@@ -25,10 +21,19 @@
  * <li><code>TimeUnit.HOURS</code></li>
  * </ul>
  */
-@RequiredArgsConstructor(staticName = "of")
 public class TimeToLive {
-    @Getter private final int ttl;
-    @Getter @NonNull private final TimeUnit unit;
+    private final int ttl;
+    private final TimeUnit unit;
+
+    public static TimeToLive of(final int ttl, final TimeUnit unit) {
+        return new TimeToLive(ttl, unit);
+    }
+
+    private TimeToLive(final int ttl, final TimeUnit unit) {
+        if (unit == null) throw new NullPointerException("unit is null");
+        this.ttl = ttl;
+        this.unit = unit;
+    }
 
     public String toString() {
         return new StringBuilder()

src/main/java/com/bettercloud/vault/response/MountResponse.java

@@ -6,6 +6,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
+import com.bettercloud.vault.api.Logical;
 import com.bettercloud.vault.api.mounts.Mount;
 import com.bettercloud.vault.api.mounts.MountConfig;
 import com.bettercloud.vault.api.mounts.MountType;
@@ -30,7 +31,7 @@ public class MountResponse extends LogicalResponse {
      * @param isList the flag to indicate if we're expecting a list of Mounts from Vault or not
      */
     public MountResponse(final RestResponse restResponse, final int retries, final boolean isList) {
-        super(restResponse, retries);
+        super(restResponse, retries, Logical.logicalOperations.mount);
 
         mount = isList ? null : buildMount(this.getDataObject());
         mounts = isList ? buildMountsMap() : null;

src/test/java/com/bettercloud/vault/VaultConfigTests.java

@@ -15,7 +15,6 @@
 import java.util.Map;
 import java.util.UUID;
 
-import static junit.framework.Assert.assertSame;
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertTrue;
 
@@ -128,6 +127,7 @@ public void testConfigConstructor_FailToLoad() throws VaultException {
     @Test
     public void testConfigBuilder() throws VaultException {
         Map<String, String> testMap = new HashMap<>();
+        testMap.put("foo", "bar");
         final VaultConfig config =
                 new VaultConfig()
                         .address("address")
@@ -138,7 +138,7 @@ public void testConfigBuilder() throws VaultException {
         assertEquals("address", config.getAddress());
         assertEquals("token", config.getToken());
         assertEquals("1", config.getGlobalEngineVersion().toString());
-        assertSame(testMap, config.getSecretsEnginePathMap());
+        assertEquals("bar", config.getSecretsEnginePathMap().get("foo"));
     }
 
     /**