Rename field 'expiry' => 'expireAt'

2 files changed, 12 insertions, 12 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/ServiceDumpReport.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/ServiceDumpReport.java
index a2701c51727..bbe46e637c8 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/ServiceDumpReport.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/ServiceDumpReport.java
@@ -25,7 +25,7 @@ class ServiceDumpReport extends BaseReport {
     private static final String FAILED_AT_FIELD = "failedAt";
     private static final String LOCATION_FIELD = "location";
     private static final String CONFIG_ID_FIELD = "configId";
-    private static final String EXPIRY_FIELD = "expiry";
+    private static final String EXPIRE_AT_FIELD = "expireAt";
     private static final String ERROR_FIELD = "error";
 
     private final Long requestedAt;
@@ -34,7 +34,7 @@ class ServiceDumpReport extends BaseReport {
     private final Long failedAt;
     private final String location;
     private final String configId;
-    private final Long expiry;
+    private final Long expireAt;
     private final String error;
 
     @JsonCreator
@@ -44,7 +44,7 @@ class ServiceDumpReport extends BaseReport {
                              @JsonProperty(FAILED_AT_FIELD) Long failedAt,
                              @JsonProperty(LOCATION_FIELD) String location,
                              @JsonProperty(CONFIG_ID_FIELD) String configId,
-                             @JsonProperty(EXPIRY_FIELD) Long expiry,
+                             @JsonProperty(EXPIRE_AT_FIELD) Long expireAt,
                              @JsonProperty(ERROR_FIELD) String error) {
         super(null, null);
         this.requestedAt = requestedAt;
@@ -53,7 +53,7 @@ class ServiceDumpReport extends BaseReport {
         this.failedAt = failedAt;
         this.location = location;
         this.configId = configId;
-        this.expiry = expiry;
+        this.expireAt = expireAt;
         this.error = error;
     }
 
@@ -63,6 +63,6 @@ class ServiceDumpReport extends BaseReport {
     @JsonGetter(FAILED_AT_FIELD) public Long failedAt() { return failedAt; }
     @JsonGetter(LOCATION_FIELD) public String location() { return location; }
     @JsonGetter(CONFIG_ID_FIELD) public String configId() { return configId; }
-    @JsonGetter(EXPIRY_FIELD) public Long expiry() { return expiry; }
+    @JsonGetter(EXPIRE_AT_FIELD) public Long expireAt() { return expireAt; }
     @JsonGetter(ERROR_FIELD) public String error() { return error; }
 }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java
index d03e9e23032..1778c4db342 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java
@@ -56,7 +56,7 @@ public class VespaServiceDumperImpl implements VespaServiceDumper {
             handleFailure(context, request, startedAt, null, "Service config id is missing from request");
             return;
         }
-        Instant expiry = expiry(startedAt, request);
+        Instant expiry = expireAt(startedAt, request);
         if (expiry.isBefore(startedAt)) {
             handleFailure(context, request, startedAt, null, "Request already expired");
             return;
@@ -106,9 +106,9 @@ public class VespaServiceDumperImpl implements VespaServiceDumper {
         }
     }
 
-    private static Instant expiry(Instant startedAt, ServiceDumpReport request) {
-        return request.expiry() != null
-                ? Instant.ofEpochMilli(request.expiry())
+    private static Instant expireAt(Instant startedAt, ServiceDumpReport request) {
+        return request.expireAt() != null
+                ? Instant.ofEpochMilli(request.expireAt())
                 : startedAt.plus(7, ChronoUnit.DAYS);
     }
 
@@ -132,19 +132,19 @@ public class VespaServiceDumperImpl implements VespaServiceDumper {
     private static ServiceDumpReport createStartedReport(ServiceDumpReport request, Instant startedAt) {
         return new ServiceDumpReport(
                 request.requestedAt(), startedAt.toEpochMilli(), null, null, null, request.configId(),
-                request.expiry(), null);
+                request.expireAt(), null);
     }
 
     private static ServiceDumpReport createSuccessReport(ServiceDumpReport request, Instant startedAt, URI location) {
         return new ServiceDumpReport(
                 request.requestedAt(), startedAt.toEpochMilli(), Instant.now().toEpochMilli(), null,
-                location.toString(), request.configId(), request.expiry(), null);
+                location.toString(), request.configId(), request.expireAt(), null);
     }
 
     private static ServiceDumpReport createErrorReport(ServiceDumpReport request, Instant startedAt, String message) {
         return new ServiceDumpReport(
                 request.requestedAt(), startedAt.toEpochMilli(), null, Instant.now().toEpochMilli(), null,
-                request.configId(), request.expiry(), message);
+                request.configId(), request.expireAt(), message);
     }
 
     private static String createDumpId(ServiceDumpReport report) {