Pushes fields from VaultResponse down to the specific response subclass where they're used

Author: steve-perkins

README.md

@@ -138,6 +138,8 @@ should represent non-breaking changes.  The third number represents any very min
   * Removes the `com.bettercloud.vault.api.Sys` class, deprecated in the 1.2.0 release.
   * Removes the `com.bettercloud.vault.api.Auth.loginByUsernamePassword` method, deprecated in the 1.2.0 release.
   * Changes the `com.bettercloud.vault.response.AuthReponse` class field `authLeaseDuration` from type `int` to `long`.
+  * Removes the fields `leaseId`, `leaseDuration`, and `renewable` from the `VaultResponse` base class, instead 
+    including them only in the subclasses for specific response types where they are used.
   * Adds support for authentication via the AppRole auth backend.  
   * Adds support for renewing secret leases.
 * **1.2.0**: This is a substantial release, with numerous additions.  It's a minor version number only because there 

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

@@ -16,6 +16,7 @@
  */
 public class AuthResponse extends VaultResponse {
 
+    private Boolean renewable;
     private String authClientToken;
     private List<String> authPolicies;
     private long authLeaseDuration;
@@ -38,6 +39,7 @@ public AuthResponse(final RestResponse restResponse, final int retries) {
             final JsonObject jsonObject = Json.parse(responseJson).asObject();
             final JsonObject authJsonObject = jsonObject.get("auth").asObject();
 
+            renewable = jsonObject.get("renewable").asBoolean();
             authLeaseDuration = authJsonObject.getInt("lease_duration", 0);
             authRenewable = authJsonObject.getBoolean("renewable", false);
             if (authJsonObject.get("metadata") != null && !authJsonObject.get("metadata").toString().equalsIgnoreCase("null")) {
@@ -48,25 +50,20 @@ public AuthResponse(final RestResponse restResponse, final int retries) {
             }
             authClientToken = authJsonObject.getString("client_token", "");
             final JsonArray authPoliciesJsonArray = authJsonObject.get("policies").asArray();
-            authPolicies = new ArrayList<String>();
+            authPolicies = new ArrayList<>();
             for (final JsonValue authPolicy : authPoliciesJsonArray) {
                 authPolicies.add(authPolicy.asString());
             }
         } catch (UnsupportedEncodingException | ParseException e) {
-            e.printStackTrace();
         }
     }
 
     public String getUsername() {
         return username;
     }
 
-    /**
-     * @return Deprecated.  Use <code>getRenewable()</code> (returning object <code>Boolean</code> rather than primitive <code>boolean</code>.
-     */
-    @Deprecated
-    public boolean isRenewable() {
-        return getRenewable() == null ? false : getRenewable();
+    public Boolean getRenewable() {
+        return renewable;
     }
 
     public String getAuthClientToken() {

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

@@ -1,5 +1,7 @@
 package com.bettercloud.vault.response;
 
+import com.bettercloud.vault.json.Json;
+import com.bettercloud.vault.json.JsonObject;
 import com.bettercloud.vault.rest.RestResponse;
 
 import java.util.HashMap;
@@ -12,6 +14,9 @@
 public class LogicalResponse extends VaultResponse {
 
     private Map<String, String> data = new HashMap<String, String>();
+    private String leaseId;
+    private Boolean renewable;
+    private Long leaseDuration;
 
     /**
      * This constructor simply exposes the common base class constructor.
@@ -21,6 +26,7 @@ public class LogicalResponse extends VaultResponse {
      */
     public LogicalResponse(final RestResponse restResponse, final int retries) {
         super(restResponse, retries);
+        parseMetadataFields();
     }
 
     /**
@@ -37,14 +43,35 @@ public LogicalResponse(
     ) {
         super(restResponse, retries);
         this.data.putAll(data);
+        parseMetadataFields();
     }
 
     public Map<String, String> getData() {
         return data;
     }
 
-    @Deprecated
-    public void setData(final Map<String, String> data) {
-        this.data = data;
+    public String getLeaseId() {
+        return leaseId;
+    }
+
+    public Boolean getRenewable() {
+        return renewable;
+    }
+
+    public Long getLeaseDuration() {
+        return leaseDuration;
+    }
+
+    private void parseMetadataFields() {
+        try {
+            final String jsonString = new String(getRestResponse().getBody(), "UTF-8");
+            final JsonObject jsonObject = Json.parse(jsonString).asObject();
+
+            this.leaseId = jsonObject.get("lease_id").asString();
+            this.renewable = jsonObject.get("renewable").asBoolean();
+            this.leaseDuration = jsonObject.get("lease_duration").asLong();
+        } catch (Exception e) {
+            return;
+        }
     }
 }

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

@@ -1,6 +1,5 @@
 package com.bettercloud.vault.response;
 
-import com.bettercloud.vault.json.Json;
 import com.bettercloud.vault.rest.RestResponse;
 
 /**
@@ -20,92 +19,20 @@ public class VaultResponse {
     private RestResponse restResponse;
     private int retries;
 
-    @Deprecated
-    private String leaseId;
-    @Deprecated
-    private Boolean renewable;
-    @Deprecated
-    private Long leaseDuration;
-
     /**
      * @param restResponse The raw HTTP response from Vault.
      * @param retries The number of retry attempts that occurred during the API call (can be zero).
      */
     public VaultResponse(final RestResponse restResponse, final int retries) {
         this.restResponse = restResponse;
         this.retries = retries;
-        parseMetadataFields();
     }
 
     public RestResponse getRestResponse() {
         return restResponse;
     }
 
-    @Deprecated
-    public void setRestResponse(final RestResponse restResponse) {
-        this.restResponse = restResponse;
-        parseMetadataFields();
-    }
-
     public int getRetries() {
         return retries;
     }
-
-    @Deprecated
-    public void setRetries(final int retries) {
-        this.retries = retries;
-    }
-
-    public String getLeaseId() {
-        return leaseId;
-    }
-
-    @Deprecated
-    public void setLeaseId(final String leaseId) {
-        this.leaseId = leaseId;
-    }
-
-    public Boolean getRenewable() {
-        return renewable;
-    }
-
-    @Deprecated
-    public void setRenewable(final Boolean renewable) {
-        this.renewable = renewable;
-    }
-
-    @Deprecated
-    public void baseSetRenewable(final Boolean renewable) {
-        this.renewable = renewable;
-    }
-
-    public Long getLeaseDuration() {
-        return leaseDuration;
-    }
-
-    @Deprecated
-    public void setLeaseDuration(final Long leaseDuration) {
-        this.leaseDuration = leaseDuration;
-    }
-
-    private void parseMetadataFields() {
-        String jsonString;
-        try {
-            jsonString = new String(this.restResponse.getBody(), "UTF-8");
-        } catch (Exception e) {
-            return;
-        }
-        try {
-            this.leaseId = Json.parse(jsonString).asObject().get("lease_id").asString();
-        } catch (Exception e) {
-        }
-        try {
-            this.renewable = Json.parse(jsonString).asObject().get("renewable").asBoolean();
-        } catch (Exception e) {
-        }
-        try {
-            this.leaseDuration = Json.parse(jsonString).asObject().get("lease_duration").asLong();
-        } catch (Exception e) {
-        }
-    }
 }