Merge pull request #1640 from pveentjer/cleanup/monitor

Cleaned up the monitor package
hazelcast · Jan 28, 2014 · a6a1789 · a6a1789
2 parents 17bd6a8 + 703ef6b
commit a6a1789
Show file tree

Hide file tree

Showing 13 changed files with 110 additions and 32 deletions.
diff --git a/hazelcast/src/main/java/com/hazelcast/monitor/LocalInstanceStats.java b/hazelcast/src/main/java/com/hazelcast/monitor/LocalInstanceStats.java
@@ -20,6 +20,6 @@
 
 public interface LocalInstanceStats extends DataSerializable {
 
-    public long getCreationTime();
+    long getCreationTime();
 
 }
diff --git a/hazelcast/src/main/java/com/hazelcast/monitor/LocalMultiMapStats.java b/hazelcast/src/main/java/com/hazelcast/monitor/LocalMultiMapStats.java
@@ -16,10 +16,5 @@
 
 package com.hazelcast.monitor;
 
-/**
- * User: sancar
- * Date: 4/10/13
- * Time: 2:28 PM
- */
 public interface LocalMultiMapStats extends LocalMapStats {
 }
diff --git a/hazelcast/src/main/java/com/hazelcast/monitor/LocalQueueStats.java b/hazelcast/src/main/java/com/hazelcast/monitor/LocalQueueStats.java
@@ -20,6 +20,7 @@
  * Local queue statistics.
  */
 public interface LocalQueueStats extends LocalInstanceStats {
+
     /**
      * Returns the number of owned items in this member.
      *

diff --git a/hazelcast/src/main/java/com/hazelcast/monitor/NearCacheStats.java b/hazelcast/src/main/java/com/hazelcast/monitor/NearCacheStats.java
@@ -1,11 +1,7 @@
 package com.hazelcast.monitor;
 
-/**
- * User: eminn
- * Date: 03/12/13
- * Time: 10:48 AM
- */
 public interface NearCacheStats extends LocalInstanceStats {
+
     /**
      * Returns the creation time of this NearCache on this member
      *
@@ -20,7 +16,6 @@ public interface NearCacheStats extends LocalInstanceStats {
      */
     long getOwnedEntryCount();
 
-
     /**
      * Returns memory cost (number of bytes) of entries in this cache.
      *
@@ -48,6 +43,4 @@ public interface NearCacheStats extends LocalInstanceStats {
      * @return hit/miss ratio.
      */
     double getRatio();
-
-
 }
diff --git a/hazelcast/src/main/java/com/hazelcast/monitor/TimedMemberState.java b/hazelcast/src/main/java/com/hazelcast/monitor/TimedMemberState.java
@@ -28,6 +28,7 @@
 import java.util.Set;
 
 public class TimedMemberState implements DataSerializable, Cloneable {
+
     long time;
     MemberState memberState = null;
     Set<String> instanceNames = null;

diff --git a/hazelcast/src/main/java/com/hazelcast/monitor/impl/LocalExecutorStatsImpl.java b/hazelcast/src/main/java/com/hazelcast/monitor/impl/LocalExecutorStatsImpl.java
@@ -57,34 +57,42 @@ public void cancelExecution() {
         cancelled.incrementAndGet();
     }
 
+    @Override
     public long getCreationTime() {
         return creationTime;
     }
 
+    @Override
     public long getPendingTaskCount() {
         return pending.get();
     }
 
+    @Override
     public long getStartedTaskCount() {
         return started.get();
     }
 
+    @Override
     public long getCompletedTaskCount() {
         return completed.get();
     }
 
+    @Override
     public long getCancelledTaskCount() {
         return cancelled.get();
     }
 
+    @Override
     public long getTotalStartLatency() {
         return totalStartLatency.get();
     }
 
+    @Override
     public long getTotalExecutionLatency() {
         return totalExecutionTime.get();
     }
 
+    @Override
     public void writeData(ObjectDataOutput out) throws IOException {
         out.writeLong(creationTime);
         out.writeLong(pending.get());
@@ -94,6 +102,7 @@ public void writeData(ObjectDataOutput out) throws IOException {
         out.writeLong(totalExecutionTime.get());
     }
 
+    @Override
     public void readData(ObjectDataInput in) throws IOException {
         creationTime = in.readLong();
         pending.set(in.readLong());

diff --git a/hazelcast/src/main/java/com/hazelcast/monitor/impl/LocalMapStatsImpl.java b/hazelcast/src/main/java/com/hazelcast/monitor/impl/LocalMapStatsImpl.java
@@ -58,6 +58,7 @@ public LocalMapStatsImpl() {
         creationTime = Clock.currentTimeMillis();
     }
 
+    @Override
     public void writeData(ObjectDataOutput out) throws IOException {
         out.writeLong(getCount.get());
         out.writeLong(putCount.get());
@@ -90,6 +91,7 @@ public void writeData(ObjectDataOutput out) throws IOException {
         }
     }
 
+    @Override
     public void readData(ObjectDataInput in) throws IOException {
         getCount.set(in.readLong());
         putCount.set(in.readLong());
@@ -122,6 +124,7 @@ public void readData(ObjectDataInput in) throws IOException {
         }
     }
 
+    @Override
     public long getOwnedEntryCount() {
         return ownedEntryCount;
     }
@@ -130,6 +133,7 @@ public void setOwnedEntryCount(long ownedEntryCount) {
         this.ownedEntryCount = ownedEntryCount;
     }
 
+    @Override
     public long getBackupEntryCount() {
         return backupEntryCount;
     }
@@ -138,6 +142,7 @@ public void setBackupEntryCount(long backupEntryCount) {
         this.backupEntryCount = backupEntryCount;
     }
 
+    @Override
     public int getBackupCount() {
         return backupCount;
     }
@@ -146,6 +151,7 @@ public void setBackupCount(int backupCount) {
         this.backupCount = backupCount;
     }
 
+    @Override
     public long getOwnedEntryMemoryCost() {
         return ownedEntryMemoryCost;
     }
@@ -154,6 +160,7 @@ public void setOwnedEntryMemoryCost(long ownedEntryMemoryCost) {
         this.ownedEntryMemoryCost = ownedEntryMemoryCost;
     }
 
+    @Override
     public long getBackupEntryMemoryCost() {
         return backupEntryMemoryCost;
     }
@@ -162,10 +169,12 @@ public void setBackupEntryMemoryCost(long backupEntryMemoryCost) {
         this.backupEntryMemoryCost = backupEntryMemoryCost;
     }
 
+    @Override
     public long getCreationTime() {
         return creationTime;
     }
 
+    @Override
     public long getLastAccessTime() {
         return lastAccessTime.get();
     }
@@ -174,6 +183,7 @@ public void setLastAccessTime(long lastAccessTime) {
         this.lastAccessTime.set(Math.max(this.lastAccessTime.get(), lastAccessTime));
     }
 
+    @Override
     public long getLastUpdateTime() {
         return lastUpdateTime.get();
     }
@@ -182,6 +192,7 @@ public void setLastUpdateTime(long lastUpdateTime) {
         this.lastUpdateTime.set(Math.max(this.lastUpdateTime.get(), lastUpdateTime));
     }
 
+    @Override
     public long getHits() {
         return hits.get();
     }
@@ -190,6 +201,7 @@ public void setHits(long hits) {
         this.hits.set(hits);
     }
 
+    @Override
     public long getLockedEntryCount() {
         return lockedEntryCount;
     }
@@ -198,6 +210,7 @@ public void setLockedEntryCount(long lockedEntryCount) {
         this.lockedEntryCount = lockedEntryCount;
     }
 
+    @Override
     public long getDirtyEntryCount() {
         return dirtyEntryCount;
     }
@@ -206,10 +219,12 @@ public void setDirtyEntryCount(long l) {
         this.dirtyEntryCount = l;
     }
 
+    @Override
     public long total() {
         return putCount.get() + getCount.get() + removeCount.get() + numberOfOtherOperations.get();
     }
 
+    @Override
     public long getPutOperationCount() {
         return putCount.get();
     }
@@ -220,6 +235,7 @@ public void incrementPuts(long latency) {
         maxPutLatency.set(Math.max(maxPutLatency.get(), latency));
     }
 
+    @Override
     public long getGetOperationCount() {
         return getCount.get();
     }
@@ -230,6 +246,7 @@ public void incrementGets(long latency) {
         maxGetLatency.set(Math.max(maxGetLatency.get(), latency));
     }
 
+    @Override
     public long getRemoveOperationCount() {
         return removeCount.get();
     }
@@ -240,30 +257,37 @@ public void incrementRemoves(long latency) {
         maxRemoveLatency.set(Math.max(maxRemoveLatency.get(), latency));
     }
 
+    @Override
     public long getTotalPutLatency() {
         return totalPutLatencies.get();
     }
 
+    @Override
     public long getTotalGetLatency() {
         return totalGetLatencies.get();
     }
 
+    @Override
     public long getTotalRemoveLatency() {
         return totalRemoveLatencies.get();
     }
 
+    @Override
     public long getMaxPutLatency() {
         return maxPutLatency.get();
     }
 
+    @Override
     public long getMaxGetLatency() {
         return maxGetLatency.get();
     }
 
+    @Override
     public long getMaxRemoveLatency() {
         return maxRemoveLatency.get();
     }
 
+    @Override
     public long getOtherOperationCount() {
         return numberOfOtherOperations.get();
     }
@@ -272,6 +296,7 @@ public void incrementOtherOperations() {
         numberOfOtherOperations.incrementAndGet();
     }
 
+    @Override
     public long getEventOperationCount() {
         return numberOfEvents.get();
     }
@@ -284,10 +309,12 @@ public void setHeapCost(long heapCost) {
         this.heapCost = heapCost;
     }
 
+    @Override
     public long getHeapCost() {
         return heapCost;
     }
 
+    @Override
     public NearCacheStatsImpl getNearCacheStats() {
         return nearCacheStats;
     }
@@ -296,6 +323,7 @@ public void setNearCacheStats(NearCacheStatsImpl nearCacheStats) {
         this.nearCacheStats = nearCacheStats;
     }
 
+    @Override
     public String toString() {
         return "LocalMapStatsImpl{" +
                 "lastAccessTime=" + lastAccessTime +

diff --git a/hazelcast/src/main/java/com/hazelcast/monitor/impl/LocalMultiMapStatsImpl.java b/hazelcast/src/main/java/com/hazelcast/monitor/impl/LocalMultiMapStatsImpl.java
@@ -18,10 +18,5 @@
 
 import com.hazelcast.monitor.LocalMultiMapStats;
 
-/**
- * User: sancar
- * Date: 4/10/13
- * Time: 2:34 PM
- */
 public class LocalMultiMapStatsImpl extends LocalMapStatsImpl implements LocalMultiMapStats {
 }