You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by nn...@apache.org on 2018/11/29 22:27:57 UTC
[geode] branch develop updated: GEODE-6097: Using primitive instead
of boxed variables (#2908)
This is an automated email from the ASF dual-hosted git repository.
nnag pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 944951f GEODE-6097: Using primitive instead of boxed variables (#2908)
944951f is described below
commit 944951fcbd28bf46d50c93291653e281482fcfd9
Author: Nabarun Nag <na...@users.noreply.github.com>
AuthorDate: Thu Nov 29 14:27:47 2018 -0800
GEODE-6097: Using primitive instead of boxed variables (#2908)
* Fixes determined by LGTM
* Improves performance and prevents superfluous allocation of objects.
---
.../cache/client/internal/pooling/ConnectionManagerImpl.java | 2 +-
.../org/apache/geode/internal/cache/DistributedRegion.java | 2 +-
.../org/apache/geode/internal/cache/PartitionedRegion.java | 10 +++++-----
.../internal/cache/tier/sockets/ClientProxyMembershipID.java | 4 ++--
.../apache/geode/internal/cache/versions/RVVExceptionB.java | 2 +-
.../geode/internal/cache/versions/RegionVersionHolder.java | 2 +-
.../geode/internal/memcached/commands/DecrementCommand.java | 2 +-
.../geode/internal/memcached/commands/IncrementCommand.java | 2 +-
.../management/internal/beans/DistributedSystemBridge.java | 8 ++++----
.../java/org/apache/geode/redis/internal/DoubleWrapper.java | 2 +-
.../redis/internal/executor/hash/HIncrByFloatExecutor.java | 2 +-
.../geode/redis/internal/executor/list/LIndexExecutor.java | 2 +-
.../geode/redis/internal/executor/string/DecrByExecutor.java | 4 ++--
.../geode/redis/internal/executor/string/DecrExecutor.java | 2 +-
.../geode/redis/internal/executor/string/IncrByExecutor.java | 4 ++--
.../redis/internal/executor/string/IncrByFloatExecutor.java | 4 ++--
.../geode/redis/internal/executor/string/IncrExecutor.java | 2 +-
.../src/main/java/parReg/query/unittest/NewPortfolio.java | 8 ++++----
.../apache/geode/tools/pulse/internal/data/JMXDataUpdater.java | 4 ++--
.../tools/pulse/internal/service/ClusterDetailsService.java | 4 ++--
.../pulse/internal/service/ClusterMembersRGraphService.java | 6 +++---
.../tools/pulse/internal/service/ClusterRegionService.java | 6 +++---
.../tools/pulse/internal/service/ClusterRegionsService.java | 6 +++---
.../pulse/internal/service/ClusterSelectedRegionService.java | 2 +-
.../tools/pulse/internal/service/MemberDetailsService.java | 4 ++--
.../tools/pulse/internal/service/MemberRegionsService.java | 2 +-
26 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerImpl.java
index 99583d7..39f482a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerImpl.java
@@ -571,7 +571,7 @@ public class ConnectionManagerImpl implements ConnectionManager {
if (shouldClose) {
try {
PoolImpl localpool = (PoolImpl) PoolManagerImpl.getPMI().find(poolName);
- Boolean durable = false;
+ boolean durable = false;
if (localpool != null) {
durable = localpool.isDurableClient();
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
index 3688272..b848a1a 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
@@ -2512,7 +2512,7 @@ public class DistributedRegion extends LocalRegion implements InternalDistribute
protected void waitForCurrentOperations() {
// Fix for #48066 - make sure that region operations are completely
// distributed to peers before destroying the region.
- Boolean flushOnClose =
+ boolean flushOnClose =
!Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "no-flush-on-close"); // test hook
if (!this.cache.forcedDisconnect() && flushOnClose
&& this.getDistributionManager().getMembershipManager() != null
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
index 72c3659..197a65a 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
@@ -1624,7 +1624,7 @@ public class PartitionedRegion extends LocalRegion
logger.trace("getEntryInBucket: " + "Key key={} ({}) from: {} bucketId={}", key,
key.hashCode(), targetNode, bucketStringForLogs(bucketId));
}
- Integer bucketIdInt = bucketId;
+ int bucketIdInt = bucketId;
EntrySnapshot ret = null;
int count = 0;
RetryTimeKeeper retryTime = null;
@@ -4269,7 +4269,7 @@ public class PartitionedRegion extends LocalRegion
* @return A set of keys from bucketNum or {@link Collections#EMPTY_SET}if no keys can be found.
*/
public Set getBucketKeys(int bucketNum, boolean allowTombstones) {
- Integer buck = bucketNum;
+ int buck = bucketNum;
final int retryAttempts = calcRetry();
Set ret = null;
int count = 0;
@@ -5631,7 +5631,7 @@ public class PartitionedRegion extends LocalRegion
void invalidateInBucket(final EntryEventImpl event) throws EntryNotFoundException {
final boolean isDebugEnabled = logger.isDebugEnabled();
- final Integer bucketId = event.getKeyInfo().getBucketId();
+ final int bucketId = event.getKeyInfo().getBucketId();
assert bucketId != KeyInfo.UNKNOWN_BUCKET;
final InternalDistributedMember targetNode = getOrCreateNodeForBucketWrite(bucketId, null);
@@ -8052,7 +8052,7 @@ public class PartitionedRegion extends LocalRegion
int retryAttempts = calcRetry();
for (int bucket = 0; bucket < totalBuckets; bucket++) {
Set bucketSet = null;
- Integer lbucket = bucket;
+ int lbucket = bucket;
final RetryTimeKeeper retryTime = new RetryTimeKeeper(Integer.MAX_VALUE);
InternalDistributedMember bucketNode = getOrCreateNodeForBucketRead(lbucket);
for (int count = 0; count <= retryAttempts; count++) {
@@ -9761,7 +9761,7 @@ public class PartitionedRegion extends LocalRegion
public void updateEntryVersionInBucket(EntryEventImpl event) {
final boolean isDebugEnabled = logger.isDebugEnabled();
- final Integer bucketId = event.getKeyInfo().getBucketId();
+ final int bucketId = event.getKeyInfo().getBucketId();
assert bucketId != KeyInfo.UNKNOWN_BUCKET;
final InternalDistributedMember targetNode = getOrCreateNodeForBucketWrite(bucketId, null);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyMembershipID.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyMembershipID.java
index c5c34ae..fad87b9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyMembershipID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientProxyMembershipID.java
@@ -195,9 +195,9 @@ public class ClientProxyMembershipID
}
private ClientProxyMembershipID(int id, byte[] clientSideIdentity) {
- Boolean specialCase = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "SPECIAL_DURABLE");
+ boolean specialCase = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "SPECIAL_DURABLE");
String durableID = this.system.getProperties().getProperty(DURABLE_CLIENT_ID);
- if (specialCase.booleanValue() && durableID != null && (!durableID.equals(""))) {
+ if (specialCase && durableID != null && (!durableID.equals(""))) {
this.uniqueId = durable_synch_counter;
} else {
this.uniqueId = id;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RVVExceptionB.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RVVExceptionB.java
index 78d33c8..7198dd8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RVVExceptionB.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RVVExceptionB.java
@@ -133,7 +133,7 @@ public class RVVExceptionB extends RVVException {
// TODO - it would be better just to serialize the longs[] in the BitSet
// as is, rather than go through this delta encoding.
for (ReceivedVersionsReverseIterator it = receivedVersionsReverseIterator(); it.hasNext();) {
- Long version = it.next();
+ long version = it.next();
deltas.addFirst(last - version);
last = version;
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionHolder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionHolder.java
index 5c51995..874cc45 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionHolder.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionHolder.java
@@ -762,7 +762,7 @@ public class RegionVersionHolder<T> implements Cloneable, DataSerializable {
// Iterate through the set of received versions for this exception
for (RVVException.ReceivedVersionsReverseIterator it =
exception.receivedVersionsReverseIterator(); it.hasNext();) {
- Long received = it.next();
+ long received = it.next();
// If we find a gap between the previous received version and the
// next received version, add an exception.
if (received != previous - 1) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/DecrementCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/DecrementCommand.java
index 8dce68d..34c2343 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/DecrementCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/DecrementCommand.java
@@ -60,7 +60,7 @@ public class DecrementCommand extends AbstractCommand {
assert "decr".equals(firstLineElements[0]);
String key = firstLineElements[1];
String decrByStr = stripNewline(firstLineElements[2]);
- Long decrBy = Long.parseLong(decrByStr);
+ long decrBy = Long.parseLong(decrByStr);
boolean noReply = firstLineElements.length > 3;
Region<Object, ValueWrapper> r = getMemcachedRegion(cache);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/IncrementCommand.java b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/IncrementCommand.java
index e9f1597..f8f303d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/IncrementCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/memcached/commands/IncrementCommand.java
@@ -61,7 +61,7 @@ public class IncrementCommand extends AbstractCommand {
assert "incr".equals(firstLineElements[0]);
String key = firstLineElements[1];
String incrByStr = stripNewline(firstLineElements[2]);
- Long incrBy = Long.parseLong(incrByStr);
+ long incrBy = Long.parseLong(incrByStr);
boolean noReply = firstLineElements.length > 3;
Region<Object, ValueWrapper> r = getMemcachedRegion(cache);
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java
index a691f80..516c065 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/DistributedSystemBridge.java
@@ -1404,15 +1404,15 @@ public class DistributedSystemBridge {
if (mapOfGatewaySenders.values().size() > 0) {
Map<String, Boolean> senderMap = new HashMap<>();
for (GatewaySenderMXBean bean : mapOfGatewaySenders.values()) {
- Integer dsId = bean.getRemoteDSId();
- if (dsId == null || dsId <= -1) {
+ int dsId = bean.getRemoteDSId();
+ if (dsId <= -1) {
continue;
}
if (bean.isParallel()) {
- senderMap.merge(dsId.toString(), bean.isConnected(), Boolean::logicalAnd);
+ senderMap.merge(String.valueOf(dsId), bean.isConnected(), Boolean::logicalAnd);
} else {
if (bean.isPrimary()) {
- senderMap.put(dsId.toString(), bean.isConnected());
+ senderMap.put(String.valueOf(dsId), bean.isConnected());
}
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/DoubleWrapper.java b/geode-core/src/main/java/org/apache/geode/redis/internal/DoubleWrapper.java
index d7253fc..05a6a9c 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/DoubleWrapper.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/DoubleWrapper.java
@@ -58,7 +58,7 @@ public class DoubleWrapper implements DataSerializable, Comparable<Object> {
other = (Double) arg0;
} else
return 0;
- Double diff = this.score - other;
+ double diff = this.score - other;
if (diff > 0)
return 1;
else if (diff < 0)
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByFloatExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByFloatExecutor.java
index ed23390..fb339e3 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByFloatExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByFloatExecutor.java
@@ -86,7 +86,7 @@ public class HIncrByFloatExecutor extends HashExecutor {
Coder.getErrorResponse(context.getByteBufAllocator(), ERROR_FIELD_NOT_USABLE));
return;
}
- Double value;
+ double value;
try {
value = Coder.stringToDouble(valueS);
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/LIndexExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/LIndexExecutor.java
index dd10e29..01c26fb 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/LIndexExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/list/LIndexExecutor.java
@@ -54,7 +54,7 @@ public class LIndexExecutor extends ListExecutor {
int listSize = keyRegion.size() - LIST_EMPTY_SIZE;
- Integer redisIndex;
+ int redisIndex;
try {
redisIndex = Coder.bytesToInt(indexArray);
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/DecrByExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/DecrByExecutor.java
index 603ed3c..a62a336 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/DecrByExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/DecrByExecutor.java
@@ -55,7 +55,7 @@ public class DecrByExecutor extends StringExecutor {
byte[] decrArray = commandElems.get(DECREMENT_INDEX);
String decrString = Coder.bytesToString(decrArray);
- Long decrement;
+ long decrement;
try {
decrement = Long.parseLong(decrString);
@@ -83,7 +83,7 @@ public class DecrByExecutor extends StringExecutor {
String stringValue = Coder.bytesToString(valueWrapper.toBytes());
- Long value;
+ long value;
try {
value = Long.parseLong(stringValue);
} catch (NumberFormatException e) {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/DecrExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/DecrExecutor.java
index fce698b..c1287dc 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/DecrExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/DecrExecutor.java
@@ -69,7 +69,7 @@ public class DecrExecutor extends StringExecutor {
*/
String stringValue = valueWrapper.toString();
- Long value;
+ long value;
try {
value = Long.parseLong(stringValue);
} catch (NumberFormatException e) {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/IncrByExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/IncrByExecutor.java
index bb49730..3e72d2b 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/IncrByExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/IncrByExecutor.java
@@ -54,7 +54,7 @@ public class IncrByExecutor extends StringExecutor {
*/
byte[] incrArray = commandElems.get(INCREMENT_INDEX);
- Long increment;
+ long increment;
try {
increment = Coder.bytesToLong(incrArray);
@@ -79,7 +79,7 @@ public class IncrByExecutor extends StringExecutor {
*/
String stringValue = Coder.bytesToString(valueWrapper.toBytes());
- Long value;
+ long value;
try {
value = Long.parseLong(stringValue);
} catch (NumberFormatException e) {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/IncrByFloatExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/IncrByFloatExecutor.java
index 221a080..8249a1a 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/IncrByFloatExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/IncrByFloatExecutor.java
@@ -68,7 +68,7 @@ public class IncrByFloatExecutor extends StringExecutor {
}
- Double increment;
+ double increment;
try {
increment = Coder.stringToDouble(doub);
@@ -94,7 +94,7 @@ public class IncrByFloatExecutor extends StringExecutor {
String stringValue = Coder.bytesToString(valueWrapper.toBytes());
- Double value;
+ double value;
try {
value = Coder.stringToDouble(stringValue);
} catch (NumberFormatException e) {
diff --git a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/IncrExecutor.java b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/IncrExecutor.java
index 5624275..5aa4565 100755
--- a/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/IncrExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/redis/internal/executor/string/IncrExecutor.java
@@ -64,7 +64,7 @@ public class IncrExecutor extends StringExecutor {
String stringValue = valueWrapper.toString();
- Long value;
+ long value;
try {
value = Long.parseLong(stringValue);
} catch (NumberFormatException e) {
diff --git a/geode-junit/src/main/java/parReg/query/unittest/NewPortfolio.java b/geode-junit/src/main/java/parReg/query/unittest/NewPortfolio.java
index 1b8ce2e..f1b80d3 100755
--- a/geode-junit/src/main/java/parReg/query/unittest/NewPortfolio.java
+++ b/geode-junit/src/main/java/parReg/query/unittest/NewPortfolio.java
@@ -146,11 +146,11 @@ public class NewPortfolio implements Serializable {
*/
protected Properties getProps() {
Properties props = new Properties();
- Double qty = rng.nextInt(MAX_QTY) * 100.00;
- Double mktValue = rng.nextDouble() * MAX_PRICE;
+ double qty = rng.nextInt(MAX_QTY) * 100.00;
+ double mktValue = rng.nextDouble() * MAX_PRICE;
- props.setProperty("qty", qty.toString());
- props.setProperty("mktValue", mktValue.toString());
+ props.setProperty("qty", String.valueOf(qty));
+ props.setProperty("mktValue", String.valueOf(mktValue));
return props;
}
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java
index 80dd2ee..cea5842 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java
@@ -1749,7 +1749,7 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
if (PulseConstants.NOTIFICATION_TYPE_SYSTEM_ALERT.equals(type)) {
Cluster.Alert alert = new Cluster.Alert();
- Long timeStamp = notification.getTimeStamp();
+ long timeStamp = notification.getTimeStamp();
Date date = new Date(timeStamp);
alert.setTimestamp(date);
String notificationSource = (String) notification.getUserData();
@@ -1770,7 +1770,7 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener {
cluster.addAlert(alert);
} else {
Cluster.Alert alert = new Cluster.Alert();
- Long timeStamp = notification.getTimeStamp();
+ long timeStamp = notification.getTimeStamp();
Date date = new Date(timeStamp);
alert.setTimestamp(date);
String notificationSource = (String) notification.getSource();
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterDetailsService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterDetailsService.java
index bdafc1f..9f6c3ce 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterDetailsService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterDetailsService.java
@@ -84,9 +84,9 @@ public class ClusterDetailsService implements PulseService {
responseJSON.put("clients", cluster.getClientConnectionCount());
responseJSON.put("locators", cluster.getLocatorCount());
responseJSON.put("totalRegions", cluster.getTotalRegionCount());
- Long heapSize = cluster.getTotalHeapSize();
+ long heapSize = cluster.getTotalHeapSize();
- Double heapS = heapSize.doubleValue() / 1024;
+ Double heapS = heapSize / 1024D;
responseJSON.put("totalHeap", TWO_PLACE_DECIMAL_FORMAT.format(heapS));
responseJSON.put("functions", cluster.getRunningFunctionCount());
responseJSON.put("uniqueCQs", cluster.getRegisteredCQCount());
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMembersRGraphService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMembersRGraphService.java
index 3968120..a7d1c0e 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMembersRGraphService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterMembersRGraphService.java
@@ -150,11 +150,11 @@ public class ClusterMembersRGraphService implements PulseService {
memberData.put("gemfireVersion", member.getGemfireVersion());
- Long currentHeap = member.getCurrentHeapSize();
- Long usedHeapSize = cluster.getUsedHeapSize();
+ long currentHeap = member.getCurrentHeapSize();
+ long usedHeapSize = cluster.getUsedHeapSize();
if (usedHeapSize > 0) {
- double heapUsage = (currentHeap.doubleValue() / usedHeapSize.doubleValue()) * 100;
+ double heapUsage = ((currentHeap * 1D) / usedHeapSize) * 100;
memberData.put(this.MEMORY_USAGE, TWO_PLACE_DECIMAL_FORMAT.format(heapUsage));
} else
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionService.java
index ca14924..5b721b5 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionService.java
@@ -145,14 +145,14 @@ public class ClusterRegionService implements PulseService {
regionJSON.put("memberNames", memberNameArray);
regionJSON.put("entryCount", reg.getSystemRegionEntryCount());
- Boolean persistent = reg.getPersistentEnabled();
+ boolean persistent = reg.getPersistentEnabled();
if (persistent) {
regionJSON.put("persistence", VALUE_ON);
} else {
regionJSON.put("persistence", VALUE_OFF);
}
- Boolean isEnableOffHeapMemory = reg.isEnableOffHeapMemory();
+ boolean isEnableOffHeapMemory = reg.isEnableOffHeapMemory();
if (isEnableOffHeapMemory) {
regionJSON.put("isEnableOffHeapMemory", VALUE_ON);
} else {
@@ -179,7 +179,7 @@ public class ClusterRegionService implements PulseService {
regionJSON.put("diskWritesTrend", mapper.valueToTree(
reg.getRegionStatisticTrend(Cluster.Region.REGION_STAT_DISK_WRITES_PER_SEC_TREND)));
regionJSON.put("emptyNodes", reg.getEmptyNode());
- Long entrySize = reg.getEntrySize();
+ long entrySize = reg.getEntrySize();
String entrySizeInMB = FOUR_PLACE_DECIMAL_FORMAT.format(entrySize / (1024f * 1024f));
if (entrySize < 0) {
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionsService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionsService.java
index 171031c..1528d17 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionsService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionsService.java
@@ -139,14 +139,14 @@ public class ClusterRegionsService implements PulseService {
regionJSON.put("memberNames", memberNameArray);
regionJSON.put("entryCount", reg.getSystemRegionEntryCount());
- Boolean persistent = reg.getPersistentEnabled();
+ boolean persistent = reg.getPersistentEnabled();
if (persistent) {
regionJSON.put("persistence", this.VALUE_ON);
} else {
regionJSON.put("persistence", this.VALUE_OFF);
}
- Boolean isEnableOffHeapMemory = reg.isEnableOffHeapMemory();
+ boolean isEnableOffHeapMemory = reg.isEnableOffHeapMemory();
if (isEnableOffHeapMemory) {
regionJSON.put("isEnableOffHeapMemory", this.VALUE_ON);
} else {
@@ -174,7 +174,7 @@ public class ClusterRegionsService implements PulseService {
regionJSON.put("diskWritesTrend", mapper.valueToTree(
reg.getRegionStatisticTrend(Cluster.Region.REGION_STAT_DISK_WRITES_PER_SEC_TREND)));
regionJSON.put("emptyNodes", reg.getEmptyNode());
- Long entrySize = reg.getEntrySize();
+ long entrySize = reg.getEntrySize();
String entrySizeInMB = FOUR_PLACE_DECIMAL_FORMAT.format(entrySize / (1024f * 1024f));
if (entrySize < 0) {
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionService.java
index 83ce08d..e81639e 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionService.java
@@ -207,7 +207,7 @@ public class ClusterSelectedRegionService implements PulseService {
reg.getRegionStatisticTrend(Cluster.Region.REGION_STAT_DISK_WRITES_PER_SEC_TREND)));
regionJSON.put("emptyNodes", reg.getEmptyNode());
- Long entrySize = reg.getEntrySize();
+ long entrySize = reg.getEntrySize();
String entrySizeInMB = FOUR_PLACE_DECIMAL_FORMAT.format(entrySize / (1024f * 1024f));
if (entrySize < 0) {
regionJSON.put(this.ENTRY_SIZE, PulseService.VALUE_NA);
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDetailsService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDetailsService.java
index 28cd2e4..5e06f28 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDetailsService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDetailsService.java
@@ -78,8 +78,8 @@ public class MemberDetailsService implements PulseService {
// Number of member clients
responseJSON.put("numClients", clusterMember.getMemberClientsHMap().size());
- Long diskUsageVal = clusterMember.getTotalDiskUsage();
- Double diskUsage = diskUsageVal.doubleValue() / 1024;
+ long diskUsageVal = clusterMember.getTotalDiskUsage();
+ double diskUsage = diskUsageVal / 1024D;
responseJSON.put("diskStorageUsed", TWO_PLACE_DECIMAL_FORMAT.format(diskUsage));
diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberRegionsService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberRegionsService.java
index 6a2f1a1..20e1054 100644
--- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberRegionsService.java
+++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberRegionsService.java
@@ -84,7 +84,7 @@ public class MemberRegionsService implements PulseService {
regionJSON.put("type", memberRegion.getRegionType());
regionJSON.put("entryCount", memberRegion.getSystemRegionEntryCount());
- Long entrySize = memberRegion.getEntrySize();
+ long entrySize = memberRegion.getEntrySize();
String entrySizeInMB = FOUR_PLACE_DECIMAL_FORMAT.format(entrySize / (1024f * 1024f));