http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java index 14edad9..1d65579 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java @@ -107,7 +107,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask { } /** Return the absolute time when TTL expiration occurs, or 0 if not used */ - public final long getTTLExpirationTime() throws EntryNotFoundException { + public long getTTLExpirationTime() throws EntryNotFoundException { long ttl = getTTLAttributes().getTimeout(); long tilt = 0; if (ttl > 0) { @@ -120,7 +120,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask { } /** Return the absolute time when idle expiration occurs, or 0 if not used */ - public final long getIdleExpirationTime() throws EntryNotFoundException { + public long getIdleExpirationTime() throws EntryNotFoundException { long idle = getIdleAttributes().getTimeout(); long tilt = 0; if (idle > 0) { @@ -136,7 +136,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask { * Returns the number of milliseconds until this task should expire. The return value will never * be negative. */ - final long getExpiryMillis() throws EntryNotFoundException { + long getExpiryMillis() throws EntryNotFoundException { long extm = getExpirationTime() - getNow(); if (extm < 0L) return 0L; @@ -185,13 +185,13 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask { * * @since GemFire 5.0 */ - public final static void suspendExpiration() { + public static void suspendExpiration() { synchronized (suspendLock) { expirationSuspended = true; } } - public final static void permitExpiration() { + public static void permitExpiration() { synchronized (suspendLock) { expirationSuspended = false; suspendLock.notifyAll(); @@ -204,7 +204,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask { * * @since GemFire 5.0 */ - private final void waitOnExpirationSuspension() { + private void waitOnExpirationSuspension() { for (;;) { getLocalRegion().getCancelCriterion().checkCancelInProgress(null); synchronized (suspendLock) { @@ -227,7 +227,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask { } // for } - protected final boolean expire(boolean isPending) throws CacheException { + protected boolean expire(boolean isPending) throws CacheException { ExpirationAction action = getAction(); if (action == null) return false; @@ -268,12 +268,12 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask { return action != null && (action.isInvalidate() || action.isDestroy()); } - final LocalRegion getLocalRegion() { + LocalRegion getLocalRegion() { return this.region; } - protected final boolean expire(ExpirationAction action, boolean isPending) throws CacheException { + protected boolean expire(ExpirationAction action, boolean isPending) throws CacheException { if (action.isInvalidate()) return invalidate(); if (action.isDestroy())
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingOrderedReplyMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingOrderedReplyMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingOrderedReplyMessage.java index bae061e..1cc7eeb 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingOrderedReplyMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingOrderedReplyMessage.java @@ -53,7 +53,7 @@ public class FunctionStreamingOrderedReplyMessage extends FunctionStreamingReply return FUNCTION_STREAMING_ORDERED_REPLY_MESSAGE; } - final public int getProcessorType() { + public int getProcessorType() { return DistributionManager.SERIAL_EXECUTOR; } } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java index 03c14ab..8d28a53 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GridAdvisor.java @@ -379,7 +379,7 @@ public abstract class GridAdvisor extends DistributionAdvisor { /** * Basic idea is to base id off of host and port of GridProfile */ - public static final class GridProfileId implements ProfileId { + public static class GridProfileId implements ProfileId { private final GridProfile gp; @@ -387,15 +387,15 @@ public abstract class GridAdvisor extends DistributionAdvisor { this.gp = gp; } - public final InternalDistributedMember getMemberId() { + public InternalDistributedMember getMemberId() { return this.gp.getDistributedMember(); } - public final String getHost() { + public String getHost() { return this.gp.getHost(); } - public final int getPort() { + public int getPort() { return this.gp.getPort(); } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java index f80f971..4cf8f41 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java @@ -54,7 +54,7 @@ import org.apache.geode.internal.offheap.annotations.Released; * @since GemFire 4.3 * */ -public final class HARegion extends DistributedRegion { +public class HARegion extends DistributedRegion { private static final Logger logger = LogService.getLogger(); CachePerfStats haRegionStats; @@ -211,7 +211,7 @@ public final class HARegion extends DistributedRegion { } @Override - public final Object put(Object key, Object value, Object aCallbackArgument) + public Object put(Object key, Object value, Object aCallbackArgument) throws TimeoutException, CacheWriterException { checkReadiness(); @@ -291,7 +291,7 @@ public final class HARegion extends DistributedRegion { } @Override - final protected boolean shouldNotifyBridgeClients() { + protected boolean shouldNotifyBridgeClients() { return false; } @@ -323,7 +323,7 @@ public final class HARegion extends DistributedRegion { * Never genearte EventID for any Entry or Region operation on the HARegion */ @Override - final public boolean generateEventID() { + public boolean generateEventID() { return false; } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java index d6dc98f..fb5f0cf 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java @@ -1454,8 +1454,7 @@ public class InitialImageOperation { /** * This is the message that initiates a request for an image */ - public static final class RequestImageMessage extends DistributionMessage - implements MessageWithReply { + public static class RequestImageMessage extends DistributionMessage implements MessageWithReply { /** * a version vector is transmitted with the request if we are merely synchronizing with an @@ -2142,7 +2141,7 @@ public class InitialImageOperation { /** * This is the message thats sent to get Filter information. */ - public static final class RequestFilterInfoMessage extends DistributionMessage + public static class RequestFilterInfoMessage extends DistributionMessage implements MessageWithReply { /** @@ -2409,8 +2408,7 @@ public class InitialImageOperation { /** * This is the message thats sent to get RVV from GII provider. */ - public static final class RequestRVVMessage extends DistributionMessage - implements MessageWithReply { + public static class RequestRVVMessage extends DistributionMessage implements MessageWithReply { /** * Name of the region. @@ -2540,7 +2538,7 @@ public class InitialImageOperation { /** * This is the message thats sent to get RVV from GII provider. */ - public static final class RequestSyncMessage extends HighPriorityDistributionMessage { + public static class RequestSyncMessage extends HighPriorityDistributionMessage { /** * Name of the region. @@ -2633,7 +2631,7 @@ public class InitialImageOperation { } - public static final class ImageReplyMessage extends ReplyMessage { + public static class ImageReplyMessage extends ReplyMessage { /** the next entries in this chunk. Null means abort. */ protected List entries; @@ -2857,7 +2855,7 @@ public class InitialImageOperation { /** * Represents a key/value pair returned from a peer as part of an {@link InitialImageOperation} */ - public static final class Entry implements DataSerializableFixedID { + public static class Entry implements DataSerializableFixedID { /** * key for this entry. Null if "end of chunk" marker entry */ http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/InlineKeyHelper.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InlineKeyHelper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InlineKeyHelper.java index f86c92c..ce44f1f 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/InlineKeyHelper.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InlineKeyHelper.java @@ -33,7 +33,7 @@ public class InlineKeyHelper { * Given the number of longs used to encode the inline string return the maximum number of * characters that can be encoded into that many longs. */ - public static final int getMaxInlineStringKey(int longCount, boolean byteEncoded) { + public static int getMaxInlineStringKey(int longCount, boolean byteEncoded) { return (longCount * (byteEncoded ? 8 : 4)) - 1; } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegionArguments.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegionArguments.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegionArguments.java index ba9d1d8..58d1780 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegionArguments.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegionArguments.java @@ -34,7 +34,7 @@ import org.apache.geode.internal.cache.wan.AbstractGatewaySender; * * @since GemFire 4.2.3 */ -public final class InternalRegionArguments { +public class InternalRegionArguments { private boolean isUsedForPartitionedRegionAdmin; private boolean isUsedForSerialGatewaySenderQueue; private boolean isUsedForParallelGatewaySenderQueue; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateOperation.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateOperation.java index eceb194..30edda4 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateOperation.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateOperation.java @@ -159,7 +159,7 @@ public class InvalidateOperation extends DistributedCacheOperation { } } - public static final class InvalidateWithContextMessage extends InvalidateMessage { + public static class InvalidateWithContextMessage extends InvalidateMessage { transient ClientProxyMembershipID context; @Override http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateRegionOperation.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateRegionOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateRegionOperation.java index 24fedb6..9339456 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateRegionOperation.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateRegionOperation.java @@ -55,7 +55,7 @@ public class InvalidateRegionOperation extends DistributedCacheOperation { return false; } - public static final class InvalidateRegionMessage extends CacheOperationMessage { + public static class InvalidateRegionMessage extends CacheOperationMessage { protected EventID eventID; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/KeyInfo.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/KeyInfo.java b/geode-core/src/main/java/org/apache/geode/internal/cache/KeyInfo.java index 13edb33..aa7671e 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/KeyInfo.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/KeyInfo.java @@ -64,11 +64,11 @@ public class KeyInfo { this.key = keyInfo.key; } - public final Object getKey() { + public Object getKey() { return this.key; } - public final Object getCallbackArg() { + public Object getCallbackArg() { return this.callbackArg; } @@ -77,19 +77,19 @@ public class KeyInfo { return this.value; } - public final int getBucketId() { + public int getBucketId() { return this.bucketId; } - public final void setKey(Object key) { + public void setKey(Object key) { this.key = key; } - public final void setBucketId(int bucketId) { + public void setBucketId(int bucketId) { this.bucketId = bucketId; } - public final void setCallbackArg(Object callbackArg) { + public void setCallbackArg(Object callbackArg) { this.callbackArg = callbackArg; } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/LeafRegionEntry.cpp ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LeafRegionEntry.cpp b/geode-core/src/main/java/org/apache/geode/internal/cache/LeafRegionEntry.cpp index 596e031..cb3ce3b 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/LeafRegionEntry.cpp +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LeafRegionEntry.cpp @@ -246,7 +246,7 @@ public class LEAF_CLASS extends PARENT_CLASS { #else private volatile Object value; @Override - protected final Object getValueField() { + protected Object getValueField() { return this.value; } @Override @@ -263,7 +263,7 @@ public class LEAF_CLASS extends PARENT_CLASS { /** * @see HashEntry#getEntryHash() */ - public final int getEntryHash() { + public int getEntryHash() { return this.hash; } protected void setEntryHash(int v) { @@ -272,13 +272,13 @@ public class LEAF_CLASS extends PARENT_CLASS { /** * @see HashEntry#getNextEntry() */ - public final HashEntry<Object, Object> getNextEntry() { + public HashEntry<Object, Object> getNextEntry() { return this.next; } /** * @see HashEntry#setNextEntry */ - public final void setNextEntry(final HashEntry<Object, Object> n) { + public void setNextEntry(final HashEntry<Object, Object> n) { this.next = n; } #ifdef DISK @@ -302,7 +302,7 @@ public class LEAF_CLASS extends PARENT_CLASS { } } @Override - public final synchronized int updateAsyncEntrySize(EnableLRU capacityController) { + public synchronized int updateAsyncEntrySize(EnableLRU capacityController) { int oldSize = getEntrySize(); int newSize = capacityController.entrySize( getKeyForSizing(), null); setEntrySize(newSize); @@ -398,43 +398,37 @@ public class LEAF_CLASS extends PARENT_CLASS { // nothing needed for LRUs with no disk #endif } - public final synchronized int updateEntrySize(EnableLRU capacityController) { + public synchronized int updateEntrySize(EnableLRU capacityController) { return updateEntrySize(capacityController, _getValue()); // OFHEAP: _getValue ok w/o incing refcount because we are synced and only getting the size } // DO NOT modify this class. It was generated from LeafRegionEntry.cpp - public final synchronized int updateEntrySize(EnableLRU capacityController, + public synchronized int updateEntrySize(EnableLRU capacityController, Object value) { int oldSize = getEntrySize(); int newSize = capacityController.entrySize( getKeyForSizing(), value); setEntrySize(newSize); int delta = newSize - oldSize; - // if ( debug ) log( "updateEntrySize key=" + getKey() - // + (_getValue() == Token.INVALID ? " invalid" : - // (_getValue() == Token.LOCAL_INVALID ? "local_invalid" : - // (_getValue()==null ? " evicted" : " valid"))) - // + " oldSize=" + oldSize - // + " newSize=" + this.size ); return delta; } - public final boolean testRecentlyUsed() { + public boolean testRecentlyUsed() { return areAnyBitsSet(RECENTLY_USED); } @Override - public final void setRecentlyUsed() { + public void setRecentlyUsed() { setBits(RECENTLY_USED); } - public final void unsetRecentlyUsed() { + public void unsetRecentlyUsed() { clearBits(~RECENTLY_USED); } - public final boolean testEvicted() { + public boolean testEvicted() { return areAnyBitsSet(EVICTED); } - public final void setEvicted() { + public void setEvicted() { setBits(EVICTED); } - public final void unsetEvicted() { + public void unsetEvicted() { clearBits(~EVICTED); } @@ -443,35 +437,27 @@ public class LEAF_CLASS extends PARENT_CLASS { private LRUClockNode nextLRU; private LRUClockNode prevLRU; private int size; - public final void setNextLRUNode( LRUClockNode next ) { + public void setNextLRUNode( LRUClockNode next ) { this.nextLRU = next; } - public final LRUClockNode nextLRUNode() { + public LRUClockNode nextLRUNode() { return this.nextLRU; } - public final void setPrevLRUNode( LRUClockNode prev ) { + public void setPrevLRUNode( LRUClockNode prev ) { this.prevLRU = prev; } - public final LRUClockNode prevLRUNode() { + public LRUClockNode prevLRUNode() { return this.prevLRU; } - public final int getEntrySize() { + public int getEntrySize() { return this.size; } - protected final void setEntrySize(int size) { + protected void setEntrySize(int size) { this.size = size; } // DO NOT modify this class. It was generated from LeafRegionEntry.cpp -//@Override -//public StringBuilder appendFieldsToString(final StringBuilder sb) { -// StringBuilder result = super.appendFieldsToString(sb); -// result.append("; prev=").append(this.prevLRU==null?"null":"not null"); -// result.append("; next=").append(this.nextLRU==null?"null":"not null"); -// return result; -//} - @Override public Object getKeyForSizing() { #ifdef KEY_OBJECT @@ -489,8 +475,7 @@ public class LEAF_CLASS extends PARENT_CLASS { // stats code @Override - public final void updateStatsForGet(boolean hit, long time) - { + public void updateStatsForGet(boolean hit, long time) { setLastAccessed(time); if (hit) { incrementHitCount(); @@ -499,7 +484,7 @@ public class LEAF_CLASS extends PARENT_CLASS { } } @Override - protected final void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) { + protected void setLastModifiedAndAccessedTimes(long lastModified, long lastAccessed) { _setLastModified(lastModified); if (!DISABLE_ACCESS_TIME_UPDATE_ON_PUT) { setLastAccessed(lastAccessed); @@ -515,18 +500,18 @@ public class LEAF_CLASS extends PARENT_CLASS { = AtomicIntegerFieldUpdater.newUpdater(LEAF_CLASS.class, "missCount"); @Override - public final long getLastAccessed() throws InternalStatisticsDisabledException { + public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } private void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } @Override - public final long getHitCount() throws InternalStatisticsDisabledException { + public long getHitCount() throws InternalStatisticsDisabledException { return this.hitCount & 0xFFFFFFFFL; } @Override - public final long getMissCount() throws InternalStatisticsDisabledException { + public long getMissCount() throws InternalStatisticsDisabledException { return this.missCount & 0xFFFFFFFFL; } private void incrementHitCount() { @@ -536,7 +521,7 @@ public class LEAF_CLASS extends PARENT_CLASS { missCountUpdater.incrementAndGet(this); } @Override - public final void resetCounts() throws InternalStatisticsDisabledException { + public void resetCounts() throws InternalStatisticsDisabledException { hitCountUpdater.set(this,0); missCountUpdater.set(this,0); } @@ -544,7 +529,7 @@ public class LEAF_CLASS extends PARENT_CLASS { // DO NOT modify this class. It was generated from LeafRegionEntry.cpp @Override - public final void txDidDestroy(long currTime) { + public void txDidDestroy(long currTime) { setLastModified(currTime); setLastAccessed(currTime); this.hitCount = 0; @@ -662,14 +647,14 @@ public class LEAF_CLASS extends PARENT_CLASS { #ifdef KEY_OBJECT private final Object key; @Override - public final Object getKey() { + public Object getKey() { return this.key; } #elif defined(KEY_INT) private final int key; @Override - public final Object getKey() { + public Object getKey() { return this.key; } @Override @@ -683,7 +668,7 @@ public class LEAF_CLASS extends PARENT_CLASS { #elif defined(KEY_LONG) private final long key; @Override - public final Object getKey() { + public Object getKey() { return this.key; } @Override @@ -698,7 +683,7 @@ public class LEAF_CLASS extends PARENT_CLASS { private final long keyMostSigBits; private final long keyLeastSigBits; @Override - public final Object getKey() { + public Object getKey() { return new UUID(this.keyMostSigBits, this.keyLeastSigBits); } @Override @@ -722,7 +707,7 @@ public class LEAF_CLASS extends PARENT_CLASS { return (int) (this.bits1 >> 6) & 0x03; } @Override - public final Object getKey() { + public Object getKey() { int keylen = getKeyLength(); char[] chars = new char[keylen]; long tmpBits1 = this.bits1; @@ -788,7 +773,7 @@ public class LEAF_CLASS extends PARENT_CLASS { return (int) (this.bits1 >> 6) & 0x03; } @Override - public final Object getKey() { + public Object getKey() { int keylen = getKeyLength(); char[] chars = new char[keylen]; long tmpBits1 = this.bits1; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java index 2985fdb..8e7ec68 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java @@ -2496,7 +2496,7 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory, releaseLatch(this.initializationLatchBeforeGetInitialImage); } - final void releaseAfterGetInitialImageLatch() { + void releaseAfterGetInitialImageLatch() { if (logger.isDebugEnabled()) { logger.debug("Releasing Initialization Latch (after initial image) for {}", getFullPath()); } @@ -5562,7 +5562,7 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory, * @return false if ifNew is true and there is an existing key, or ifOld is true and there is no * existing entry; otherwise return true. */ - final boolean basicUpdate(final EntryEventImpl event, final boolean ifNew, final boolean ifOld, + boolean basicUpdate(final EntryEventImpl event, final boolean ifNew, final boolean ifOld, final long lastModified, final boolean overwriteDestroyed) throws TimeoutException, CacheWriterException { http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/Node.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/Node.java b/geode-core/src/main/java/org/apache/geode/internal/cache/Node.java index e2b5f1c..8062d26 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/Node.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/Node.java @@ -38,7 +38,7 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe * advertising that it never should receive a request to rebalance. * */ -public final class Node extends ExternalizableDSFID { +public class Node extends ExternalizableDSFID { private InternalDistributedMember memberId; public static final int NONE = 0; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntry.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntry.java index bfcf6ff..805b900 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntry.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntry.java @@ -203,12 +203,12 @@ public class NonLocalRegionEntry implements RegionEntry, VersionStamp { return this.key; } - public final Object getValue(RegionEntryContext context) { + public Object getValue(RegionEntryContext context) { return this.value; } @Override - public final Object getValueRetain(RegionEntryContext context) { + public Object getValueRetain(RegionEntryContext context) { return this.value; } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/OpType.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/OpType.java b/geode-core/src/main/java/org/apache/geode/internal/cache/OpType.java index ff36a57..4137af4 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/OpType.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/OpType.java @@ -23,7 +23,7 @@ package org.apache.geode.internal.cache; * * @since GemFire 6.6 */ -public final class OpType { +public class OpType { private OpType() {} http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/OverflowOplogSet.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/OverflowOplogSet.java b/geode-core/src/main/java/org/apache/geode/internal/cache/OverflowOplogSet.java index c6e918e..4074221 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/OverflowOplogSet.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/OverflowOplogSet.java @@ -57,7 +57,7 @@ public class OverflowOplogSet implements OplogSet { } @Override - public final void modify(LocalRegion lr, DiskEntry entry, ValueWrapper value, boolean async) { + public void modify(LocalRegion lr, DiskEntry entry, ValueWrapper value, boolean async) { DiskRegion dr = lr.getDiskRegion(); synchronized (this.overflowMap) { if (this.lastOverflowWrite != null) { @@ -157,11 +157,11 @@ public class OverflowOplogSet implements OplogSet { return new OverflowOplog(id, this, getDirectories()[idx], minSize); } - final void addOverflow(OverflowOplog oo) { + void addOverflow(OverflowOplog oo) { this.overflowMap.put(oo.getOplogId(), oo); } - final void removeOverflow(OverflowOplog oo) { + void removeOverflow(OverflowOplog oo) { if (!basicRemoveOverflow(oo)) { synchronized (this.compactableOverflowMap) { this.compactableOverflowMap.remove(oo.getOplogId()); @@ -169,7 +169,7 @@ public class OverflowOplogSet implements OplogSet { } } - final boolean basicRemoveOverflow(OverflowOplog oo) { + boolean basicRemoveOverflow(OverflowOplog oo) { if (this.lastOverflowWrite == oo) { this.lastOverflowWrite = null; } @@ -189,7 +189,7 @@ public class OverflowOplogSet implements OplogSet { } } - final private void removeOverflow(DiskRegion dr, DiskEntry entry) { + private void removeOverflow(DiskRegion dr, DiskEntry entry) { // find the overflow oplog that it is currently in and remove the entry from it DiskId id = entry.getDiskId(); synchronized (id) { @@ -223,13 +223,13 @@ public class OverflowOplogSet implements OplogSet { } } - public final OverflowOplog getChild(long oplogId) { + public OverflowOplog getChild(long oplogId) { // the oplog id is cast to an integer because the overflow // map uses integer oplog ids. return getChild((int) oplogId); } - public final OverflowOplog getChild(int oplogId) { + public OverflowOplog getChild(int oplogId) { OverflowOplog result = this.overflowMap.get(oplogId); if (result == null) { synchronized (this.compactableOverflowMap) { http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/PRQueryProcessor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PRQueryProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PRQueryProcessor.java index 0745975..0be8cf1 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/PRQueryProcessor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PRQueryProcessor.java @@ -480,7 +480,7 @@ public class PRQueryProcessor { /** * Status token placed in results stream to track completion of query results for a given bucket */ - public static final class EndOfBucket implements DataSerializableFixedID { + public static class EndOfBucket implements DataSerializableFixedID { private int bucketId; @@ -525,7 +525,7 @@ public class PRQueryProcessor { * */ @SuppressWarnings("synthetic-access") - private final class QueryTask implements Callable { + private class QueryTask implements Callable { private final DefaultQuery query; private final Object[] parameters; private final PartitionedRegionDataStore _prDs; @@ -574,7 +574,7 @@ public class PRQueryProcessor { * Encapsulates the result for the query on the bucket. * */ - private final class BucketQueryResult { + private class BucketQueryResult { private int _buk; private Exception _ex = null; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfig.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfig.java index b7f3e0b..7812a3d 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfig.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfig.java @@ -387,19 +387,19 @@ public class PartitionRegionConfig extends ExternalizableDSFID implements Versio return ea; } - public final ExpirationAttributes getEntryIdleTimeout() { + public ExpirationAttributes getEntryIdleTimeout() { return entryIdleTimeout; } - public final ExpirationAttributes getEntryTimeToLive() { + public ExpirationAttributes getEntryTimeToLive() { return entryTimeToLive; } - public final ExpirationAttributes getRegionIdleTimeout() { + public ExpirationAttributes getRegionIdleTimeout() { return regionIdleTimeout; } - public final ExpirationAttributes getRegionTimeToLive() { + public ExpirationAttributes getRegionTimeToLive() { return regionTimeToLive; } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java index bc51650..b171a95 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java @@ -2481,7 +2481,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats { * * @return a List of all entries gathered across all buckets in this data store */ - public final List getEntries() { + public List getEntries() { final ArrayList al = new ArrayList(); visitEntries(new EntryVisitor() { @Override @@ -2503,7 +2503,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats { * * @param validateOnly only perform bucket-to-node validation */ - public final void dumpEntries(final boolean validateOnly) { + public void dumpEntries(final boolean validateOnly) { if (logger.isDebugEnabled()) { logger.debug("[dumpEntries] dumping {}", this); } @@ -2519,7 +2519,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats { } } - public final void dumpBackingMaps() { + public void dumpBackingMaps() { if (logger.isDebugEnabled()) { logger.debug("Bucket maps in {}\n", this); } @@ -2550,7 +2550,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats { * <i>Test Method</i> Dump all the bucket names in this data store to the logger * */ - public final void dumpBuckets() { + public void dumpBuckets() { final StringBuffer buf = new StringBuffer("Buckets in ").append(this).append("\n"); visitBuckets(new BucketVisitor() { @Override @@ -2566,7 +2566,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats { * <i>Test Method</i> Return the list of all the bucket names in this data store. * */ - public final List getLocalBucketsListTestOnly() { + public List getLocalBucketsListTestOnly() { final List bucketList = new ArrayList(); visitBuckets(new BucketVisitor() { @Override @@ -2581,7 +2581,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats { * <i>Test Method</i> Return the list of all the primary bucket ids in this data store. * */ - public final List getLocalPrimaryBucketsListTestOnly() { + public List getLocalPrimaryBucketsListTestOnly() { final List primaryBucketList = new ArrayList(); visitBuckets(new BucketVisitor() { @Override @@ -2600,7 +2600,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats { * <i>Test Method</i> Return the list of all the non primary bucket ids in this data store. * */ - public final List getLocalNonPrimaryBucketsListTestOnly() { + public List getLocalNonPrimaryBucketsListTestOnly() { final List nonPrimaryBucketList = new ArrayList(); visitBuckets(new BucketVisitor() { @Override @@ -2621,7 +2621,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats { * @param bucketId the id of the bucket to dump * @param bucket the Region containing the bucket data */ - public final void dumpBucket(int bucketId, final LocalRegion bucket) { + public void dumpBucket(int bucketId, final LocalRegion bucket) { Integer buckId = Integer.valueOf(bucketId); visitBucket(buckId, bucket, new EntryVisitor() { final StringBuffer buf = new StringBuffer("Entries in bucket ").append(bucket).append("\n"); http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionStats.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionStats.java index 19cb3f2..d1dc1be 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionStats.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionStats.java @@ -738,7 +738,7 @@ public class PartitionedRegionStats { // messaging stats // ------------------------------------------------------------------------ - public final long startPartitionMessageProcessing() { + public long startPartitionMessageProcessing() { this.stats.incInt(partitionMessagesReceivedId, 1); return startTime(); } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/PersistentOplogSet.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PersistentOplogSet.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PersistentOplogSet.java index 036c740..c37eaa7 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/PersistentOplogSet.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PersistentOplogSet.java @@ -92,7 +92,7 @@ public class PersistentOplogSet implements OplogSet { /** * returns the active child */ - public final Oplog getChild() { + public Oplog getChild() { return this.child; } @@ -335,7 +335,7 @@ public class PersistentOplogSet implements OplogSet { } } - public final void recoverRegionsThatAreReady() { + public void recoverRegionsThatAreReady() { // The following sync also prevents concurrent recoveries by multiple regions // which is needed currently. synchronized (this.alreadyRecoveredOnce) { @@ -547,7 +547,7 @@ public class PersistentOplogSet implements OplogSet { } } - private final void initOplogEntryId() { + private void initOplogEntryId() { this.oplogEntryId.set(DiskStoreImpl.INVALID_ID); } @@ -555,7 +555,7 @@ public class PersistentOplogSet implements OplogSet { * Sets the last created oplogEntryId to the given value if and only if the given value is greater * than the current last created oplogEntryId */ - private final void updateOplogEntryId(long v) { + private void updateOplogEntryId(long v) { long curVal; do { curVal = this.oplogEntryId.get(); @@ -569,7 +569,7 @@ public class PersistentOplogSet implements OplogSet { /** * Returns the last created oplogEntryId. Returns INVALID_ID if no oplogEntryId has been created. */ - final long getOplogEntryId() { + long getOplogEntryId() { parent.initializeIfNeeded(); return this.oplogEntryId.get(); } @@ -581,7 +581,7 @@ public class PersistentOplogSet implements OplogSet { * * @return A disk id that can be used to access this key/value pair on disk */ - final long newOplogEntryId() { + long newOplogEntryId() { long result = this.oplogEntryId.incrementAndGet(); return result; } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/PoolStats.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PoolStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PoolStats.java index 37a0fe2..02860e6 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/PoolStats.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PoolStats.java @@ -198,39 +198,39 @@ public class PoolStats { return DistributionStats.getStatTime(); } - public final void setInitialContacts(int ic) { + public void setInitialContacts(int ic) { this._stats.setInt(_INITIAL_CONTACTS, ic); } - public final void setServerCount(int sc) { + public void setServerCount(int sc) { this._stats.setInt(_ENDPOINTS_KNOWN, sc); } - public final void setSubscriptionCount(int qc) { + public void setSubscriptionCount(int qc) { this._stats.setInt(_SUBSCRIPTION_SERVERS, qc); } - public final void setLocatorCount(int lc) { + public void setLocatorCount(int lc) { this._stats.setInt(_KNOWN_LOCATORS, lc); } - public final long getLocatorRequests() { + public long getLocatorRequests() { return this._stats.getLong(_REQUESTS_TO_LOCATOR); } - public final void incLocatorRequests() { + public void incLocatorRequests() { this._stats.incLong(_REQUESTS_TO_LOCATOR, 1); } - public final void incLocatorResponses() { + public void incLocatorResponses() { this._stats.incLong(_RESPONSES_FROM_LOCATOR, 1); } - public final void setLocatorRequests(long rl) { + public void setLocatorRequests(long rl) { this._stats.setLong(_REQUESTS_TO_LOCATOR, rl); } - public final void setLocatorResponses(long rl) { + public void setLocatorResponses(long rl) { this._stats.setLong(_RESPONSES_FROM_LOCATOR, rl); } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/PreferBytesCachedDeserializable.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PreferBytesCachedDeserializable.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PreferBytesCachedDeserializable.java index 428c982..c5ccd5b 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/PreferBytesCachedDeserializable.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PreferBytesCachedDeserializable.java @@ -33,7 +33,7 @@ import org.apache.geode.internal.lang.StringUtils; * @since GemFire 5.0.2 * */ -public final class PreferBytesCachedDeserializable +public class PreferBytesCachedDeserializable implements CachedDeserializable, DataSerializableFixedID { http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java index 9d4b5e2..cfc9fdd 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyBucketRegion.java @@ -57,7 +57,7 @@ import org.apache.geode.internal.logging.LogService; * * @since GemFire 5.1 */ -public final class ProxyBucketRegion implements Bucket { +public class ProxyBucketRegion implements Bucket { private static final Logger logger = LogService.getLogger(); private final int serialNumber; @@ -356,11 +356,11 @@ public final class ProxyBucketRegion implements Bucket { return this.advisor.getBucketRedundancy() + 1; } - public final int getBucketId() { + public int getBucketId() { return this.bid; } - public final int getId() { + public int getId() { return getBucketId(); } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java index efa580b..fedafc8 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java @@ -365,7 +365,7 @@ class ProxyRegionMap implements RegionMap { } @Override - public final boolean lruLimitExceeded(DiskRegionView drv) { + public boolean lruLimitExceeded(DiskRegionView drv) { return false; } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/RegionExpiryTask.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionExpiryTask.java index 1d334bc..065d966 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionExpiryTask.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionExpiryTask.java @@ -49,32 +49,32 @@ abstract class RegionExpiryTask extends ExpiryTask { } @Override - protected final long getLastAccessedTime() { + protected long getLastAccessedTime() { return getLocalRegion().getLastAccessedTime(); } @Override - protected final long getLastModifiedTime() { + protected long getLastModifiedTime() { return getLocalRegion().getLastModifiedTime(); } @Override - protected final boolean destroy(boolean isPending) throws CacheException { + protected boolean destroy(boolean isPending) throws CacheException { return getLocalRegion().expireRegion(this, true, true); } @Override - protected final boolean invalidate() throws TimeoutException { + protected boolean invalidate() throws TimeoutException { return getLocalRegion().expireRegion(this, true, false); } @Override - protected final boolean localDestroy() throws CacheException { + protected boolean localDestroy() throws CacheException { return getLocalRegion().expireRegion(this, false, true); } @Override - protected final boolean localInvalidate() { + protected boolean localInvalidate() { return getLocalRegion().expireRegion(this, false, false); } @@ -85,7 +85,7 @@ abstract class RegionExpiryTask extends ExpiryTask { } @Override - protected final void performTimeout() throws CacheException { + protected void performTimeout() throws CacheException { if (isCanceled) { return; } @@ -93,7 +93,7 @@ abstract class RegionExpiryTask extends ExpiryTask { } @Override - protected final void basicPerformTimeout(boolean isPending) throws CacheException { + protected void basicPerformTimeout(boolean isPending) throws CacheException { if (isCanceled) { return; } @@ -110,7 +110,7 @@ abstract class RegionExpiryTask extends ExpiryTask { } @Override - final protected void reschedule() throws CacheException { + protected void reschedule() throws CacheException { if (isCacheClosing() || getLocalRegion().isClosed() || getLocalRegion().isDestroyed() || !isExpirationAllowed()) { return; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/RegionIdleExpiryTask.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionIdleExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionIdleExpiryTask.java index c54da7f..dfc59cf 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionIdleExpiryTask.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionIdleExpiryTask.java @@ -58,7 +58,7 @@ class RegionIdleExpiryTask extends RegionExpiryTask { } @Override - protected final void addExpiryTask() { + protected void addExpiryTask() { getLocalRegion().addIdleExpiryTask(this); } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/RegionTTLExpiryTask.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionTTLExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionTTLExpiryTask.java index a59b391..96490e5 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionTTLExpiryTask.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionTTLExpiryTask.java @@ -60,7 +60,7 @@ class RegionTTLExpiryTask extends RegionExpiryTask { } @Override - protected final void addExpiryTask() { + protected void addExpiryTask() { getLocalRegion().addTTLExpiryTask(this); } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteContainsKeyValueMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteContainsKeyValueMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteContainsKeyValueMessage.java index debdfd2..49f3d6c 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteContainsKeyValueMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteContainsKeyValueMessage.java @@ -45,7 +45,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker; * * @since GemFire 6.5 */ -public final class RemoteContainsKeyValueMessage extends RemoteOperationMessageWithDirectReply { +public class RemoteContainsKeyValueMessage extends RemoteOperationMessageWithDirectReply { private static final Logger logger = LogService.getLogger(); private boolean valueCheck; @@ -164,7 +164,7 @@ public final class RemoteContainsKeyValueMessage extends RemoteOperationMessageW return flags; } - public static final class RemoteContainsKeyValueReplyMessage extends ReplyMessage { + public static class RemoteContainsKeyValueReplyMessage extends ReplyMessage { /** Propagated exception from remote node to operation initiator */ private boolean containsKeyValue; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteDestroyMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteDestroyMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteDestroyMessage.java index 0a55664..081044e 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteDestroyMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteDestroyMessage.java @@ -173,11 +173,11 @@ public class RemoteDestroyMessage extends RemoteOperationMessageWithDirectReply this.oldValBytes = valBytes; } - private final void setOldValObj(@Unretained(ENTRY_EVENT_OLD_VALUE) Object o) { + private void setOldValObj(@Unretained(ENTRY_EVENT_OLD_VALUE) Object o) { this.oldValObj = o; } - public final byte[] getOldValueBytes() { + public byte[] getOldValueBytes() { return this.oldValBytes; } @@ -523,19 +523,19 @@ public class RemoteDestroyMessage extends RemoteOperationMessageWithDirectReply buff.append("; hasOldValue= ").append(this.hasOldValue); } - protected final Object getKey() { + protected Object getKey() { return this.key; } - private final void setKey(Object key) { + private void setKey(Object key) { this.key = key; } - public final Operation getOperation() { + public Operation getOperation() { return this.op; } - protected final Object getCallbackArg() { + protected Object getCallbackArg() { return this.cbArg; } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchEntryMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchEntryMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchEntryMessage.java index ea26745..913836a 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchEntryMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchEntryMessage.java @@ -53,7 +53,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker; * * @since GemFire 5.1 */ -public final class RemoteFetchEntryMessage extends RemoteOperationMessage { +public class RemoteFetchEntryMessage extends RemoteOperationMessage { private static final Logger logger = LogService.getLogger(); private Object key; @@ -172,7 +172,7 @@ public final class RemoteFetchEntryMessage extends RemoteOperationMessage { * * @since GemFire 5.0 */ - public static final class FetchEntryReplyMessage extends ReplyMessage { + public static class FetchEntryReplyMessage extends ReplyMessage { /** Propagated exception from remote node to operation initiator */ private EntrySnapshot value; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchVersionMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchVersionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchVersionMessage.java index f0ef305..e2125ab 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchVersionMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteFetchVersionMessage.java @@ -47,7 +47,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker; * * @since GemFire 7.0 */ -public final class RemoteFetchVersionMessage extends RemoteOperationMessage { +public class RemoteFetchVersionMessage extends RemoteOperationMessage { private static final Logger logger = LogService.getLogger(); @@ -144,7 +144,7 @@ public final class RemoteFetchVersionMessage extends RemoteOperationMessage { * This message is used to send a reply for RemoteFetchVersionMessage. * */ - public static final class FetchVersionReplyMessage extends ReplyMessage { + public static class FetchVersionReplyMessage extends ReplyMessage { private VersionTag tag; /** for deserialization */ http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteGetMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteGetMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteGetMessage.java index 927697b..2837be4 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteGetMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteGetMessage.java @@ -57,7 +57,7 @@ import org.apache.geode.internal.util.BlobHelper; * * @since GemFire 6.5 */ -public final class RemoteGetMessage extends RemoteOperationMessageWithDirectReply { +public class RemoteGetMessage extends RemoteOperationMessageWithDirectReply { private static final Logger logger = LogService.getLogger(); private Object key; @@ -83,7 +83,7 @@ public final class RemoteGetMessage extends RemoteOperationMessageWithDirectRepl } @Override - final public int getProcessorType() { + public int getProcessorType() { return DistributionManager.SERIAL_EXECUTOR; } @@ -94,8 +94,8 @@ public final class RemoteGetMessage extends RemoteOperationMessageWithDirectRepl } @Override - protected final boolean operateOnRegion(final DistributionManager dm, LocalRegion r, - long startTime) throws RemoteOperationException { + protected boolean operateOnRegion(final DistributionManager dm, LocalRegion r, long startTime) + throws RemoteOperationException { if (logger.isTraceEnabled(LogMarker.DM)) { logger.trace(LogMarker.DM, "RemoteGetMessage operateOnRegion: {}", r.getFullPath()); } @@ -214,7 +214,7 @@ public final class RemoteGetMessage extends RemoteOperationMessageWithDirectRepl * * @since GemFire 6.5 */ - public static final class GetReplyMessage extends ReplyMessage { + public static class GetReplyMessage extends ReplyMessage { /** * The raw value in the cache which may be serialized to the output stream, if it is NOT already * a byte array http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteInvalidateMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteInvalidateMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteInvalidateMessage.java index 1af51e8..eea654d 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteInvalidateMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteInvalidateMessage.java @@ -54,7 +54,7 @@ import org.apache.geode.internal.offheap.annotations.Released; import static org.apache.geode.internal.cache.DistributedCacheOperation.VALUE_IS_BYTES; import static org.apache.geode.internal.cache.DistributedCacheOperation.VALUE_IS_SERIALIZED_OBJECT; -public final class RemoteInvalidateMessage extends RemoteDestroyMessage { +public class RemoteInvalidateMessage extends RemoteDestroyMessage { private static final Logger logger = LogService.getLogger(); @@ -261,7 +261,7 @@ public final class RemoteInvalidateMessage extends RemoteDestroyMessage { } - public static final class InvalidateReplyMessage extends ReplyMessage { + public static class InvalidateReplyMessage extends ReplyMessage { private VersionTag versionTag; private static final byte HAS_VERSION = 0x01; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutAllMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutAllMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutAllMessage.java index dc0f25c..0e9f8c5 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutAllMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutAllMessage.java @@ -65,7 +65,7 @@ import org.apache.geode.internal.offheap.annotations.Released; * * @since GemFire 6.5 */ -public final class RemotePutAllMessage extends RemoteOperationMessageWithDirectReply { +public class RemotePutAllMessage extends RemoteOperationMessageWithDirectReply { private static final Logger logger = LogService.getLogger(); private PutAllEntryData[] putAllData; @@ -261,7 +261,7 @@ public final class RemotePutAllMessage extends RemoteOperationMessageWithDirectR } @Override - public final void toData(DataOutput out) throws IOException { + public void toData(DataOutput out) throws IOException { super.toData(out); DataSerializer.writeObject(this.eventId, out); DataSerializer.writeObject(this.callbackArg, out); @@ -344,9 +344,8 @@ public final class RemotePutAllMessage extends RemoteOperationMessageWithDirectR * lastModified timestamp for last modification * @return If succeeds, return true, otherwise, throw exception */ - public final boolean doLocalPutAll(final LocalRegion r, - final InternalDistributedMember eventSender, long lastModified) - throws EntryExistsException, RemoteOperationException { + public boolean doLocalPutAll(final LocalRegion r, final InternalDistributedMember eventSender, + long lastModified) throws EntryExistsException, RemoteOperationException { final DistributedRegion dr = (DistributedRegion) r; // create a base event and a DPAO for PutAllMessage distributed btw redundant buckets @@ -427,7 +426,7 @@ public final class RemotePutAllMessage extends RemoteOperationMessageWithDirectR @Override - protected final void appendFields(StringBuffer buff) { + protected void appendFields(StringBuffer buff) { super.appendFields(buff); buff.append("; putAllDataCount=").append(putAllDataCount); if (this.bridgeContext != null) { @@ -439,7 +438,7 @@ public final class RemotePutAllMessage extends RemoteOperationMessageWithDirectR } } - public static final class PutAllReplyMessage extends ReplyMessage { + public static class PutAllReplyMessage extends ReplyMessage { /** Result of the PutAll operation */ // private PutAllResponseData[] responseData; private VersionedObjectList versions; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutMessage.java index acf77ba..4135752 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemotePutMessage.java @@ -66,7 +66,7 @@ import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.EN * * @since GemFire 6.5 */ -public final class RemotePutMessage extends RemoteOperationMessageWithDirectReply +public class RemotePutMessage extends RemoteOperationMessageWithDirectReply implements NewValueImporter, OldValueImporter { private static final Logger logger = LogService.getLogger(); @@ -412,30 +412,30 @@ public final class RemotePutMessage extends RemoteOperationMessageWithDirectRepl return processor; } - // public final boolean needsDirectAck() + // public boolean needsDirectAck() // { // return this.directAck; // } - // final public int getProcessorType() { + // public int getProcessorType() { // return DistributionManager.PARTITIONED_REGION_EXECUTOR; // } - public final Object getKey() { + public Object getKey() { return this.key; } - public final void setKey(Object key) { + public void setKey(Object key) { this.key = key; } - public final byte[] getValBytes() { + public byte[] getValBytes() { return this.valBytes; } - public final byte[] getOldValueBytes() { + public byte[] getOldValueBytes() { return this.oldValBytes; } @@ -460,16 +460,16 @@ public final class RemotePutMessage extends RemoteOperationMessageWithDirectRepl this.oldValObj = o; } - public final Object getCallbackArg() { + public Object getCallbackArg() { return this.cbArg; } - protected final Operation getOperation() { + protected Operation getOperation() { return this.op; } @Override - public final void setOperation(Operation operation) { + public void setOperation(Operation operation) { this.op = operation; } @@ -486,7 +486,7 @@ public final class RemotePutMessage extends RemoteOperationMessageWithDirectRepl } @Override - public final void fromData(DataInput in) throws IOException, ClassNotFoundException { + public void fromData(DataInput in) throws IOException, ClassNotFoundException { super.fromData(in); setKey(DataSerializer.readObject(in)); @@ -544,7 +544,7 @@ public final class RemotePutMessage extends RemoteOperationMessageWithDirectRepl } @Override - public final void toData(DataOutput out) throws IOException { + public void toData(DataOutput out) throws IOException { this.hasDelta = false; super.toData(out); DataSerializer.writeObject(getKey(), out); @@ -616,7 +616,7 @@ public final class RemotePutMessage extends RemoteOperationMessageWithDirectRepl * indefinitely for the acknowledgement */ @Override - protected final boolean operateOnRegion(DistributionManager dm, LocalRegion r, long startTime) + protected boolean operateOnRegion(DistributionManager dm, LocalRegion r, long startTime) throws EntryExistsException, RemoteOperationException { this.setInternalDs(r.getSystem());// set the internal DS. Required to // checked DS level delta-enabled property @@ -733,7 +733,7 @@ public final class RemotePutMessage extends RemoteOperationMessageWithDirectRepl } @Override - protected final void appendFields(StringBuffer buff) { + protected void appendFields(StringBuffer buff) { super.appendFields(buff); buff.append("; key=").append(getKey()).append("; value="); // buff.append(getValBytes()); @@ -768,15 +768,15 @@ public final class RemotePutMessage extends RemoteOperationMessageWithDirectRepl buff.append(this.applyDeltaBytes); } - public final InternalDistributedSystem getInternalDs() { + public InternalDistributedSystem getInternalDs() { return internalDs; } - public final void setInternalDs(InternalDistributedSystem internalDs) { + public void setInternalDs(InternalDistributedSystem internalDs) { this.internalDs = internalDs; } - public static final class PutReplyMessage extends ReplyMessage implements OldValueImporter { + public static class PutReplyMessage extends ReplyMessage implements OldValueImporter { static final byte FLAG_RESULT = 0x01; static final byte FLAG_HASVERSION = 0x02; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRegionOperation.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRegionOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRegionOperation.java index 4755fcf..b998fdf 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRegionOperation.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRegionOperation.java @@ -42,7 +42,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker; * * @since GemFire 7.0 */ -public final class RemoteRegionOperation extends RemoteOperationMessageWithDirectReply { +public class RemoteRegionOperation extends RemoteOperationMessageWithDirectReply { private static final Logger logger = LogService.getLogger(); private enum Operation { @@ -135,7 +135,7 @@ public final class RemoteRegionOperation extends RemoteOperationMessageWithDirec out.writeByte(this.op.ordinal()); } - public static final class RemoteRegionOperationReplyMessage extends ReplyMessage { + public static class RemoteRegionOperationReplyMessage extends ReplyMessage { /** * Empty constructor to conform to DataSerializable interface http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRemoveAllMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRemoveAllMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRemoveAllMessage.java index d30e8c1..d4d4c26 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRemoveAllMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RemoteRemoveAllMessage.java @@ -65,7 +65,7 @@ import org.apache.geode.internal.offheap.annotations.Released; * * @since GemFire 8.1 */ -public final class RemoteRemoveAllMessage extends RemoteOperationMessageWithDirectReply { +public class RemoteRemoveAllMessage extends RemoteOperationMessageWithDirectReply { private static final Logger logger = LogService.getLogger(); private RemoveAllEntryData[] removeAllData; @@ -253,7 +253,7 @@ public final class RemoteRemoveAllMessage extends RemoteOperationMessageWithDire } @Override - public final void toData(DataOutput out) throws IOException { + public void toData(DataOutput out) throws IOException { super.toData(out); DataSerializer.writeObject(this.eventId, out); DataSerializer.writeObject(this.callbackArg, out); @@ -333,8 +333,7 @@ public final class RemoteRemoveAllMessage extends RemoteOperationMessageWithDire * @param eventSender the endpoint server who received request from client * @return If succeeds, return true, otherwise, throw exception */ - public final boolean doLocalRemoveAll(final LocalRegion r, - final InternalDistributedMember eventSender) + public boolean doLocalRemoveAll(final LocalRegion r, final InternalDistributedMember eventSender) throws EntryExistsException, RemoteOperationException { final DistributedRegion dr = (DistributedRegion) r; @@ -417,7 +416,7 @@ public final class RemoteRemoveAllMessage extends RemoteOperationMessageWithDire @Override - protected final void appendFields(StringBuffer buff) { + protected void appendFields(StringBuffer buff) { super.appendFields(buff); buff.append("; removeAllDataCount=").append(removeAllDataCount); if (this.bridgeContext != null) { @@ -429,7 +428,7 @@ public final class RemoteRemoveAllMessage extends RemoteOperationMessageWithDire } } - public static final class RemoveAllReplyMessage extends ReplyMessage { + public static class RemoveAllReplyMessage extends ReplyMessage { /** Result of the RemoveAll operation */ private VersionedObjectList versions; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/RoleEventImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RoleEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RoleEventImpl.java index 9b2c5b1..bb015bf 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/RoleEventImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RoleEventImpl.java @@ -31,7 +31,7 @@ import org.apache.geode.distributed.internal.membership.InternalRole; * * @since GemFire 5.0 */ -public final class RoleEventImpl extends RegionEventImpl implements RoleEvent, DataSerializable { +public class RoleEventImpl extends RegionEventImpl implements RoleEvent, DataSerializable { private static final long serialVersionUID = 1306615015229258945L; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessor.java index 34f6b73..4e30a34 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessor.java @@ -1346,7 +1346,7 @@ public class SearchLoadAndWriteProcessor implements MembershipListener { * A QueryMessage is broadcast to every node that has the region defined, to find out who has a * valid copy of the requested object. */ - public static final class QueryMessage extends SerialDistributionMessage { + public static class QueryMessage extends SerialDistributionMessage { /** * The object id of the processor object on the initiator node. This will be communicated back @@ -1593,7 +1593,7 @@ public class SearchLoadAndWriteProcessor implements MembershipListener { * The ResponseMessage is a reply to a QueryMessage, and contains the object's value, if it is * below the byte limit, otherwise an indication of whether the sender has the value. */ - public static final class ResponseMessage extends HighPriorityDistributionMessage { + public static class ResponseMessage extends HighPriorityDistributionMessage { private Object key; @@ -1722,7 +1722,7 @@ public class SearchLoadAndWriteProcessor implements MembershipListener { /********************* NetSearchRequestMessage ***************************************/ - public static final class NetSearchRequestMessage extends PooledDistributionMessage { + public static class NetSearchRequestMessage extends PooledDistributionMessage { /** * The object id of the processor object on the initiator node. This will be communicated back @@ -1949,7 +1949,7 @@ public class SearchLoadAndWriteProcessor implements MembershipListener { * The NetSearchReplyMessage is a reply to a NetSearchRequestMessage, and contains the object's * value. */ - public static final class NetSearchReplyMessage extends HighPriorityDistributionMessage { + public static class NetSearchReplyMessage extends HighPriorityDistributionMessage { private static final byte SERIALIZED = 0x01; private static final byte REQUESTOR_TIMEOUT = 0x02; private static final byte AUTHORATIVE = 0x04; @@ -2105,7 +2105,7 @@ public class SearchLoadAndWriteProcessor implements MembershipListener { /******************************** NetLoadRequestMessage **********************/ - public static final class NetLoadRequestMessage extends PooledDistributionMessage { + public static class NetLoadRequestMessage extends PooledDistributionMessage { /** * The object id of the processor object on the initiator node. This will be communicated back @@ -2282,7 +2282,7 @@ public class SearchLoadAndWriteProcessor implements MembershipListener { /** * The NetLoadReplyMessage is a reply to a RequestMessage, and contains the object's value. */ - public static final class NetLoadReplyMessage extends HighPriorityDistributionMessage { + public static class NetLoadReplyMessage extends HighPriorityDistributionMessage { /** The gemfire id of the SearchLoadAndWrite object waiting for response */ private int processorId; @@ -2386,7 +2386,7 @@ public class SearchLoadAndWriteProcessor implements MembershipListener { /********************* NetWriteRequestMessage *******************************/ - public static final class NetWriteRequestMessage extends PooledDistributionMessage { + public static class NetWriteRequestMessage extends PooledDistributionMessage { /** * The object id of the processor object on the initiator node. This will be communicated back @@ -2587,7 +2587,7 @@ public class SearchLoadAndWriteProcessor implements MembershipListener { * The NetWriteReplyMessage is a reply to a NetWriteRequestMessage, and contains the success code * or exception that is propagated back to the requestor */ - public static final class NetWriteReplyMessage extends HighPriorityDistributionMessage { + public static class NetWriteReplyMessage extends HighPriorityDistributionMessage { /** The gemfire id of the SearchLoadAndWrite object waiting for response */ private int processorId; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java index a8f1edc..3ad1137 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/StateFlushOperation.java @@ -272,8 +272,7 @@ public class StateFlushOperation { * @see StateFlushOperation.StateStabilizedMessage * */ - public static final class StateMarkerMessage extends DistributionMessage - implements MessageWithReply { + public static class StateMarkerMessage extends DistributionMessage implements MessageWithReply { /** roll the membership version to force flushing of new ops */ public boolean flushNewOps; /** the member acting as the relay point */ @@ -525,7 +524,7 @@ public class StateFlushOperation { * @see StateFlushOperation.StateMarkerMessage * @since GemFire 5.0.1 */ - public static final class StateStabilizationMessage extends SerialDistributionMessage { + public static class StateStabilizationMessage extends SerialDistributionMessage { /** the member that requested StateStabilizedMessages */ protected DistributedMember requestingMember; /** the processor id for the requesting member */ @@ -673,7 +672,7 @@ public class StateFlushOperation { * @since GemFire 5.0.1 * */ - public static final class StateStabilizedMessage extends ReplyMessage { + public static class StateStabilizedMessage extends ReplyMessage { /** the member for whom this ack is being sent */ protected DistributedMember sendingMember; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntry.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntry.java index d9ef183..43165a7 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntry.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntry.java @@ -212,7 +212,7 @@ public class TXEntry implements Region.Entry { } } - private final TXEntryUserAttrState txReadUA(KeyInfo ki) { + private TXEntryUserAttrState txReadUA(KeyInfo ki) { TXRegionState txr = this.myTX.txReadRegion(this.localRegion); if (txr != null) { return txr.readEntryUserAttr(ki.getKey()); @@ -221,7 +221,7 @@ public class TXEntry implements Region.Entry { } } - protected final TXEntryUserAttrState txWriteUA(KeyInfo ki) { + protected TXEntryUserAttrState txWriteUA(KeyInfo ki) { TXRegionState txr = myTX.txWriteRegion(this.localRegion, ki); if (txr != null) { return txr.writeEntryUserAttr(ki.getKey(), this.localRegion); http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryState.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryState.java index f090ba4..2ee3a8c 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryState.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryState.java @@ -434,38 +434,38 @@ public class TXEntryState implements Releasable { return v; } - private final boolean isOpCreate() { + private boolean isOpCreate() { return this.op >= OP_CREATE_LI && this.op <= OP_LOCAL_CREATE; } - final boolean isOpCreateEvent() { + boolean isOpCreateEvent() { return isOpCreate(); } - private final boolean isOpPut() { + private boolean isOpPut() { return this.op >= OP_PUT; } - protected final boolean isOpPutEvent() { + protected boolean isOpPutEvent() { return isOpPut(); } - private final boolean isOpInvalidate() { + private boolean isOpInvalidate() { // Note that OP_CREATE_LI, OP_LLOAD_CREATE_LI, and OP_NLOAD_CREATE_LI // do not return true here because they are actually creates // with a value of LOCAL_INVALID locally and some other value remotely. return this.op <= OP_D_INVALIDATE && this.op >= OP_L_INVALIDATE; } - final boolean isOpInvalidateEvent() { + boolean isOpInvalidateEvent() { return isOpInvalidate(); } - private final boolean isOpDestroy() { + private boolean isOpDestroy() { return this.op <= OP_D_DESTROY && this.op >= OP_L_DESTROY; } - final boolean isOpDestroyEvent(LocalRegion r) { + boolean isOpDestroyEvent(LocalRegion r) { // Note that if the region is a proxy then we go ahead and distributed // the destroy because we can't eliminate it based on committed state return isOpDestroy() @@ -477,31 +477,31 @@ public class TXEntryState implements Releasable { * * @since GemFire 5.0 */ - final boolean isOpAnyEvent(LocalRegion r) { + boolean isOpAnyEvent(LocalRegion r) { return isOpPutEvent() || isOpCreateEvent() || isOpInvalidateEvent() || isOpDestroyEvent(r); } - final boolean isOpSearchOrLoad() { + boolean isOpSearchOrLoad() { return this.op >= OP_SEARCH_CREATE && this.op != OP_PUT && this.op != OP_LOCAL_CREATE; } - final boolean isOpSearch() { + boolean isOpSearch() { return this.op == OP_SEARCH_CREATE || this.op == OP_SEARCH_PUT; } - final boolean isOpLocalLoad() { + boolean isOpLocalLoad() { return this.op == OP_LLOAD_CREATE || this.op == OP_LLOAD_PUT; } - final boolean isOpNetLoad() { + boolean isOpNetLoad() { return this.op == OP_NLOAD_CREATE || this.op == OP_NLOAD_PUT; } - final boolean isOpLoad() { + boolean isOpLoad() { return isOpLocalLoad() || isOpNetLoad(); } - // private final boolean isLocalEventDistributed() + // private boolean isLocalEventDistributed() // { // return this.op == OP_D_DESTROY // || (this.op >= OP_D_INVALIDATE && this.op != OP_SEARCH_CREATE @@ -1490,11 +1490,11 @@ public class TXEntryState implements Releasable { return "<" + StringUtils.forceToString(o) + ">"; } - private final boolean didDestroy() { + private boolean didDestroy() { return this.destroy != DESTROY_NONE; } - private final boolean didDistributedDestroy() { + private boolean didDistributedDestroy() { return this.destroy == DESTROY_DISTRIBUTED; } @@ -1553,7 +1553,7 @@ public class TXEntryState implements Releasable { return isOpCreate(); } - private final void txApplyDestroyLocally(LocalRegion r, Object key, TXState txState) { + private void txApplyDestroyLocally(LocalRegion r, Object key, TXState txState) { boolean invokeCallbacks = isOpDestroyEvent(r); List<EntryEventImpl> pendingCallbacks = invokeCallbacks ? txState.getPendingCallbacks() : new ArrayList<EntryEventImpl>(); @@ -1571,7 +1571,7 @@ public class TXEntryState implements Releasable { // transaction listener that no destroy was done. } - private final void txApplyInvalidateLocally(LocalRegion r, Object key, Object newValue, + private void txApplyInvalidateLocally(LocalRegion r, Object key, Object newValue, boolean didDestroy, TXState txState) { try { r.txApplyInvalidate(key, newValue, didDestroy, txState.getTransactionId(), null, @@ -1583,7 +1583,7 @@ public class TXEntryState implements Releasable { } } - private final void txApplyPutLocally(LocalRegion r, Operation putOp, Object key, Object newValue, + private void txApplyPutLocally(LocalRegion r, Operation putOp, Object key, Object newValue, boolean didDestroy, TXState txState) { try { r.txApplyPut(putOp, key, newValue, didDestroy, txState.getTransactionId(), null, @@ -1929,7 +1929,7 @@ public class TXEntryState implements Releasable { * * @since GemFire 5.0 */ - public final class TxEntryEventImpl extends EntryEventImpl implements Comparable { + public class TxEntryEventImpl extends EntryEventImpl implements Comparable { /** * Creates a local tx entry event */
