Switch to (temporary) use of 'Date' type where possible

apache · Dec 23, 2024 · c4103d9 · c4103d9
1 parent 639b8ea
commit c4103d9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/solr/api/src/java/org/apache/solr/client/api/model/CollectionStatusResponse.java b/solr/api/src/java/org/apache/solr/client/api/model/CollectionStatusResponse.java
@@ -18,7 +18,9 @@
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -33,8 +35,12 @@ public class CollectionStatusResponse extends SolrJerseyResponse {
 
   @JsonProperty public String name;
   @JsonProperty public Integer znodeVersion;
+
   // TODO - consider 'Instant' once SOLR-17608 is finished
-  @JsonProperty public Long creationTimeMillis;
+  @JsonProperty
+  @JsonFormat(shape = JsonFormat.Shape.NUMBER)
+  public Date creationTimeMillis;
+
   @JsonProperty public CollectionMetadata properties;
   @JsonProperty public Integer activeShards;
   @JsonProperty public Integer inactiveShards;

diff --git a/solr/api/src/java/org/apache/solr/client/api/model/GetSegmentDataResponse.java b/solr/api/src/java/org/apache/solr/client/api/model/GetSegmentDataResponse.java
@@ -108,8 +108,11 @@ public static class SegmentDiagnosticInfo {
     public String luceneVersion;
 
     @JsonProperty public String source;
+
     // TODO - consider 'Instant' once SOLR-17608 is finished
-    @JsonProperty public Long timestamp;
+    @JsonProperty
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER)
+    public Date timestamp;
 
     @JsonProperty("java.runtime.version")
     public String javaRuntimeVersion;