Merge pull request #1305 from nats-io/api-stats-missed-long

Update account AccountTier with reserved memory and reserved storage

Author: scottf

src/main/java/io/nats/client/api/AccountStatistics.java

@@ -54,7 +54,7 @@ public AccountStatistics(Message msg) {
      * @return bytes
      */
     public long getMemory() {
-        return rollupTier.getMemory();
+        return rollupTier.getMemoryBytes();
     }
 
     /**
@@ -63,7 +63,23 @@ public long getMemory() {
      * @return bytes
      */
     public long getStorage() {
-        return rollupTier.getStorage();
+        return rollupTier.getStorageBytes();
+    }
+
+    /**
+     * Bytes that is reserved for memory usage by this account on the server
+     * @return the memory usage in bytes
+     */
+    public long getReservedMemory() {
+        return rollupTier.getReservedMemoryBytes();
+    }
+
+    /**
+     * Bytes that is reserved for disk usage by this account on the server
+     * @return the disk usage in bytes
+     */
+    public long getReservedStorage() {
+        return rollupTier.getReservedStorageBytes();
     }
 
     /**

src/main/java/io/nats/client/api/AccountTier.java

@@ -24,10 +24,10 @@
  */
 public class AccountTier {
 
-    private final int memory;
-    private final int storage;
-    private final int reservedMemory;
-    private final int reservedStorage;
+    private final long memory;
+    private final long storage;
+    private final long reservedMemory;
+    private final long reservedStorage;
     private final int streams;
     private final int consumers;
     private final AccountLimits limits;
@@ -46,31 +46,47 @@ public class AccountTier {
      * Memory Storage being used for Stream Message storage in this tier.
      * @return the memory storage in bytes
      */
-    public int getMemory() {
+    public long getMemoryBytes() {
         return memory;
     }
 
     /**
      * File Storage being used for Stream Message storage in this tier.
      * @return the storage in bytes
      */
-    public int getStorage() {
+    public long getStorageBytes() {
         return storage;
     }
 
     /**
      * Bytes that is reserved for memory usage by this account on the server
      * @return the memory usage in bytes
      */
-    public int getReservedMemory() {
+    public long getReservedMemory() {
+        return (int)reservedMemory;
+    }
+
+    /**
+     * Bytes that is reserved for disk usage by this account on the server
+     * @return the disk usage in bytes
+     */
+    public long getReservedStorage() {
+        return reservedStorage;
+    }
+
+    /**
+     * Bytes that is reserved for memory usage by this account on the server
+     * @return the memory usage in bytes
+     */
+    public long getReservedMemoryBytes() {
         return reservedMemory;
     }
 
     /**
      * Bytes that is reserved for disk usage by this account on the server
      * @return the disk usage in bytes
      */
-    public int getReservedStorage() {
+    public long getReservedStorageBytes() {
         return reservedStorage;
     }
 
@@ -97,4 +113,24 @@ public int getConsumers() {
     public AccountLimits getLimits() {
         return limits;
     }
+
+    /**
+     * @deprecated use getMemoryBytes instead
+     * Memory Storage being used for Stream Message storage in this tier.
+     * @return the memory storage in bytes
+     */
+    @Deprecated
+    public int getMemory() {
+        return (int)memory;
+    }
+
+    /**
+     * @deprecated use getStorageBytes instead
+     * File Storage being used for Stream Message storage in this tier.
+     * @return the storage in bytes
+     */
+    @Deprecated
+    public int getStorage() {
+        return (int)storage;
+    }
 }

src/test/java/io/nats/client/api/AccountStatisticsTests.java

@@ -78,8 +78,10 @@ public void testAccountStatsImpl() {
 
     private void validateTier(AccountTier tier, int tierBase, int limitsIdBase) {
         assertNotNull(tier);
-        assertEquals(tierBase + 1, tier.getMemory());
-        assertEquals(tierBase + 2, tier.getStorage());
+        assertEquals(tierBase + 1, tier.getMemory()); // COVERAGE
+        assertEquals(tierBase + 1, tier.getMemoryBytes());
+        assertEquals(tierBase + 2, tier.getStorage()); // COVERAGE
+        assertEquals(tierBase + 2, tier.getStorageBytes());
         assertEquals(tierBase + 3, tier.getStreams());
         assertEquals(tierBase + 4, tier.getConsumers());
         assertEquals(tierBase + 5, tier.getReservedMemory());