model: add request ID to data response models

CHANGELOG.md

@@ -11,6 +11,7 @@
 * Split `SercretResponse`  into `PlainSecretResponse` and `MetaSecretResponse` subclasses (common API unchanged)
 * Add missing fields to `AuthMethod` model
 * Add support for (dis)allowed policy glob patterns in `TokenRole`
+* Add request ID to data response models
 
 ### Test
 * Tested against Vault 1.10.1

src/main/java/de/stklcode/jvault/connector/model/response/VaultDataResponse.java

@@ -29,7 +29,10 @@ import java.util.Objects;
  * @since 0.1
  */
 public abstract class VaultDataResponse implements VaultResponse {
-    private static final long serialVersionUID = 2507925101227179499L;
+    private static final long serialVersionUID = 7486270767477652184L;
+
+    @JsonProperty("request_id")
+    private String requestId;
 
     @JsonProperty("lease_id")
     private String leaseId;
@@ -46,6 +49,14 @@ public abstract class VaultDataResponse implements VaultResponse {
     @JsonProperty("wrap_info")
     private WrapInfo wrapInfo;
 
+    /**
+     * @return Request ID
+     * @since 1.1
+     */
+    public final String getRequestId() {
+        return requestId;
+    }
+
     /**
      * @return Lease ID
      */
@@ -91,6 +102,7 @@ public abstract class VaultDataResponse implements VaultResponse {
         }
         VaultDataResponse that = (VaultDataResponse) o;
         return renewable == that.renewable &&
+                Objects.equals(requestId, that.requestId) &&
                 Objects.equals(leaseId, that.leaseId) &&
                 Objects.equals(leaseDuration, that.leaseDuration) &&
                 Objects.equals(warnings, that.warnings) &&
@@ -99,6 +111,6 @@ public abstract class VaultDataResponse implements VaultResponse {
 
     @Override
     public int hashCode() {
-        return Objects.hash(leaseId, renewable, leaseDuration, warnings, wrapInfo);
+        return Objects.hash(requestId, leaseId, renewable, leaseDuration, warnings, wrapInfo);
     }
 }

src/test/java/de/stklcode/jvault/connector/model/response/MetaSecretResponseTest.java

@@ -132,6 +132,7 @@ class MetaSecretResponseTest extends AbstractModelTest<MetaSecretResponse> {
 
     private void assertSecretData(SecretResponse res) {
         assertNotNull(res, "Parsed response is NULL");
+        assertEquals(SECRET_REQUEST_ID, res.getRequestId(), "Incorrect request ID");
         assertEquals(SECRET_LEASE_ID, res.getLeaseId(), "Incorrect lease ID");
         assertEquals(SECRET_LEASE_DURATION, res.getLeaseDuration(), "Incorrect lease duration");
         assertEquals(SECRET_RENEWABLE, res.isRenewable(), "Incorrect renewable status");

src/test/java/de/stklcode/jvault/connector/model/response/PlainSecretResponseTest.java

@@ -78,6 +78,7 @@ class PlainSecretResponseTest extends AbstractModelTest<PlainSecretResponse> {
         );
 
         assertNotNull(res, "Parsed response is NULL");
+        assertEquals(SECRET_REQUEST_ID, res.getRequestId(), "Incorrect request ID");
         assertEquals(SECRET_LEASE_ID, res.getLeaseId(), "Incorrect lease ID");
         assertEquals(SECRET_LEASE_DURATION, res.getLeaseDuration(), "Incorrect lease duration");
         assertEquals(SECRET_RENEWABLE, res.isRenewable(), "Incorrect renewable status");