http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl.java index 3c68ab0..0a02001 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl.java @@ -29,7 +29,7 @@ import org.apache.geode.internal.admin.StatAlertDefinition; * Implementation of {@link StatAlertDefinition}, represents threshold as data range * */ -public final class GaugeThresholdDecoratorImpl extends BaseDecoratorImpl +public class GaugeThresholdDecoratorImpl extends BaseDecoratorImpl implements DataSerializableFixedID { private static final long serialVersionUID = -8555077820685711783L;
http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/MultiAttrDefinitionImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/MultiAttrDefinitionImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/MultiAttrDefinitionImpl.java index c1414bb..506263c 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/MultiAttrDefinitionImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/MultiAttrDefinitionImpl.java @@ -30,7 +30,7 @@ import org.apache.geode.internal.admin.StatAlertDefinition; * Implementation of {@link StatAlertDefinition} This provides the definition for multiple statistic * */ -public final class MultiAttrDefinitionImpl implements StatAlertDefinition { +public class MultiAttrDefinitionImpl implements StatAlertDefinition { private static final long serialVersionUID = 2508805676076940969L; protected String _name; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl.java index 0abf142..c0d0f47 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl.java @@ -29,7 +29,7 @@ import org.apache.geode.internal.admin.StatAlertDefinition; * Implementation of {@link StatAlertDefinition}, represents threshold as number * */ -public final class NumberThresholdDecoratorImpl extends BaseDecoratorImpl +public class NumberThresholdDecoratorImpl extends BaseDecoratorImpl implements DataSerializableFixedID { private static final long serialVersionUID = -1799140125261894306L; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/SingleAttrDefinitionImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/SingleAttrDefinitionImpl.java b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/SingleAttrDefinitionImpl.java index 32222f0..50df697 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/SingleAttrDefinitionImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/admin/statalerts/SingleAttrDefinitionImpl.java @@ -29,7 +29,7 @@ import org.apache.geode.internal.admin.StatAlertDefinition; * Implementation of {@link StatAlertDefinition} This provides the definition for single statistic * */ -public final class SingleAttrDefinitionImpl implements StatAlertDefinition { +public class SingleAttrDefinitionImpl implements StatAlertDefinition { private static final long serialVersionUID = 3292417185742697896L; protected String name; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java index 554455d..81011d3 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractDiskRegion.java @@ -249,7 +249,7 @@ public abstract class AbstractDiskRegion implements DiskRegionView { this.versionVector = new DiskRegionVersionVector(ds.getDiskStoreID()); } - public final long getId() { + public long getId() { return this.id; } @@ -739,7 +739,7 @@ public abstract class AbstractDiskRegion implements DiskRegionView { this.readyForRecovery = false; } - public final boolean isReadyForRecovery() { + public boolean isReadyForRecovery() { // better name for this method would be isRecovering return this.readyForRecovery; } @@ -808,11 +808,11 @@ public abstract class AbstractDiskRegion implements DiskRegionView { * Returns true if this region maintains a backup of all its keys and values on disk. Returns * false if only values that will not fit in memory are written to disk. */ - public final boolean isBackup() { + public boolean isBackup() { return this.backup; } - protected final void setBackup(boolean v) { + protected void setBackup(boolean v) { this.backup = v; } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractLRURegionMap.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractLRURegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractLRURegionMap.java index a0e360f..bcaa0d0 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractLRURegionMap.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractLRURegionMap.java @@ -390,7 +390,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap { * * @return The total allowable size of this maps entries. */ - protected final long getLimit() { + protected long getLimit() { if (_getOwner() instanceof BucketRegion) { BucketRegion bucketRegion = (BucketRegion) _getOwner(); return bucketRegion.getLimit(); @@ -398,7 +398,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap { return _getLruList().stats().getLimit(); } - public final LRUStatistics getLRUStatistics() { + public LRUStatistics getLRUStatistics() { return _getLruList().stats(); } @@ -408,7 +408,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap { * * @return The current size of all the entries. */ - protected final long getTotalEntrySize() { + protected long getTotalEntrySize() { if (_getOwnerObject() instanceof BucketRegion) { BucketRegion bucketRegion = (BucketRegion) _getOwner(); return bucketRegion.getCounter(); @@ -417,7 +417,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap { } @Override - public final void lruUpdateCallback() { + public void lruUpdateCallback() { final boolean isDebugEnabled_LRU = logger.isTraceEnabled(LogMarker.LRU); if (getCallbackDisabled()) { @@ -638,7 +638,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap { */ // TODO this method acts as LRUupdateCallbacks // do we need to put it here are insert one level up - public final void updateStats() { + public void updateStats() { final int delta = getDelta(); resetThreadLocals(); if (logger.isTraceEnabled(LogMarker.LRU)) { @@ -652,7 +652,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap { } @Override - public final boolean disableLruUpdateCallback() { + public boolean disableLruUpdateCallback() { if (getCallbackDisabled()) { return false; } else { @@ -662,29 +662,29 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap { } @Override - public final void enableLruUpdateCallback() { + public void enableLruUpdateCallback() { setCallbackDisabled(false); } // TODO rebalancing these methods are new on the // rebalancing branch but never used??? - public final void disableLruUpdateCallbackForInline() { + public void disableLruUpdateCallbackForInline() { setCallbackDisabled(true); } - public final void enableLruUpdateCallbackForInline() { + public void enableLruUpdateCallbackForInline() { setCallbackDisabled(false); } @Override - public final void resetThreadLocals() { + public void resetThreadLocals() { mustRemove.set(null); lruDelta.set(null); callbackDisabled.set(null); } @Override - public final Set<VersionSource> clear(RegionVersionVector rvv) { + public Set<VersionSource> clear(RegionVersionVector rvv) { _getLruList().clear(rvv); return super.clear(rvv); } @@ -725,7 +725,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap { * */ @Override - protected final void lruEntryCreate(RegionEntry re) { + protected void lruEntryCreate(RegionEntry re) { LRUEntry e = (LRUEntry) re; // Assert.assertFalse(e._getValue() instanceof DiskEntry.RecoveredEntry) if (logger.isTraceEnabled(LogMarker.LRU)) { @@ -746,7 +746,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap { } @Override - protected final void lruEntryUpdate(RegionEntry re) { + protected void lruEntryUpdate(RegionEntry re) { final LRUEntry e = (LRUEntry) re; setDelta(e.updateEntrySize(_getCCHelper())); if (logger.isDebugEnabled()) { @@ -788,7 +788,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap { } @Override - protected final void lruEntryDestroy(RegionEntry re) { + protected void lruEntryDestroy(RegionEntry re) { final LRUEntry e = (LRUEntry) re; if (logger.isTraceEnabled(LogMarker.LRU)) { logger.trace(LogMarker.LRU, @@ -821,7 +821,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap { * Called by DiskEntry.Helper.faultInValue */ @Override - public final void lruEntryFaultIn(LRUEntry e) { + public void lruEntryFaultIn(LRUEntry e) { if (logger.isDebugEnabled()) { logger.debug("lruEntryFaultIn for key={} size={}", e.getKey(), e.getEntrySize()); } @@ -841,7 +841,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap { } @Override - public final void decTxRefCount(RegionEntry re) { + public void decTxRefCount(RegionEntry re) { LocalRegion lr = null; if (_isOwnerALocalRegion()) { lr = _getOwner(); @@ -850,7 +850,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap { } @Override - public final boolean lruLimitExceeded(DiskRegionView drv) { + public boolean lruLimitExceeded(DiskRegionView drv) { return _getCCHelper().lruLimitExceeded(_getLruList().stats(), drv); } @@ -860,7 +860,7 @@ public abstract class AbstractLRURegionMap extends AbstractRegionMap { } @Override - final boolean confirmEvictionDestroy(RegionEntry re) { + boolean confirmEvictionDestroy(RegionEntry re) { // We assume here that a LRURegionMap contains LRUEntries LRUEntry lruRe = (LRUEntry) re; if (lruRe.isInUseByTransaction() || lruRe.isDestroyed()) { http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntry.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntry.java index bdaf200..866ff03 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntry.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractOplogDiskRegionEntry.java @@ -54,29 +54,29 @@ public abstract class AbstractOplogDiskRegionEntry extends AbstractDiskRegionEnt } @Override - public final boolean fillInValue(LocalRegion r, InitialImageOperation.Entry entry, + public boolean fillInValue(LocalRegion r, InitialImageOperation.Entry entry, ByteArrayDataInput in, DM mgr) { return Helper.fillInValue(this, entry, r.getDiskRegion(), mgr, in, r); } @Override - public final boolean isOverflowedToDisk(LocalRegion r, DistributedRegion.DiskPosition dp) { + public boolean isOverflowedToDisk(LocalRegion r, DistributedRegion.DiskPosition dp) { return Helper.isOverflowedToDisk(this, r.getDiskRegion(), dp, r); } @Override - public final Object getValue(RegionEntryContext context) { + public Object getValue(RegionEntryContext context) { return Helper.faultInValue(this, (LocalRegion) context); // OFFHEAP returned to callers } @Override @Retained - public final Object getValueRetain(RegionEntryContext context) { + public Object getValueRetain(RegionEntryContext context) { return Helper.faultInValueRetain(this, (LocalRegion) context); } @Override - public final Object getValueInVMOrDiskWithoutFaultIn(LocalRegion owner) { + public Object getValueInVMOrDiskWithoutFaultIn(LocalRegion owner) { return Helper.getValueInVMOrDiskWithoutFaultIn(this, owner); } @@ -87,17 +87,17 @@ public abstract class AbstractOplogDiskRegionEntry extends AbstractDiskRegionEnt } @Override - public final Object getValueOnDisk(LocalRegion r) throws EntryNotFoundException { + public Object getValueOnDisk(LocalRegion r) throws EntryNotFoundException { return Helper.getValueOnDisk(this, r.getDiskRegion()); } @Override - public final Object getSerializedValueOnDisk(LocalRegion r) throws EntryNotFoundException { + public Object getSerializedValueOnDisk(LocalRegion r) throws EntryNotFoundException { return Helper.getSerializedValueOnDisk(this, r.getDiskRegion()); } @Override - public final Object getValueOnDiskOrBuffer(LocalRegion r) throws EntryNotFoundException { + public Object getValueOnDiskOrBuffer(LocalRegion r) throws EntryNotFoundException { // @todo darrel if value is Token.REMOVED || Token.DESTROYED throw // EntryNotFoundException return Helper.getValueOnDiskOrBuffer(this, r.getDiskRegion(), r); http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java index 0d03469..ac5fb37 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegion.java @@ -347,32 +347,32 @@ public abstract class AbstractRegion implements Region, RegionAttributes, Attrib EntryEventImpl clientEvent) throws TimeoutException, CacheLoaderException; @Override - public final void localDestroy(Object key) throws EntryNotFoundException { + public void localDestroy(Object key) throws EntryNotFoundException { localDestroy(key, null); } @Override - public final void destroyRegion() throws CacheWriterException, TimeoutException { + public void destroyRegion() throws CacheWriterException, TimeoutException { destroyRegion(null); } @Override - public final void invalidate(Object key) throws TimeoutException, EntryNotFoundException { + public void invalidate(Object key) throws TimeoutException, EntryNotFoundException { invalidate(key, null); } @Override - public final void localInvalidate(Object key) throws EntryNotFoundException { + public void localInvalidate(Object key) throws EntryNotFoundException { localInvalidate(key, null); } @Override - public final void localInvalidateRegion() { + public void localInvalidateRegion() { localInvalidateRegion(null); } @Override - public final void invalidateRegion() throws TimeoutException { + public void invalidateRegion() throws TimeoutException { invalidateRegion(null); } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java index e0fc27c..5dcf3bc 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java @@ -152,23 +152,23 @@ public abstract class AbstractRegionMap implements RegionMap { } @Override - public final void setEntryFactory(RegionEntryFactory f) { + public void setEntryFactory(RegionEntryFactory f) { this.entryFactory = f; } - public final RegionEntryFactory getEntryFactory() { + public RegionEntryFactory getEntryFactory() { return this.entryFactory; } - protected final void _setAttributes(Attributes a) { + protected void _setAttributes(Attributes a) { this.attr = a; } - public final Attributes getAttributes() { + public Attributes getAttributes() { return this.attr; } - protected final LocalRegion _getOwner() { + protected LocalRegion _getOwner() { return (LocalRegion) this.owner; } @@ -176,19 +176,19 @@ public abstract class AbstractRegionMap implements RegionMap { return this.owner instanceof LocalRegion; } - protected final Object _getOwnerObject() { + protected Object _getOwnerObject() { return this.owner; } - public final void setOwner(Object r) { + public void setOwner(Object r) { this.owner = r; } - protected final CustomEntryConcurrentHashMap<Object, Object> _getMap() { + protected CustomEntryConcurrentHashMap<Object, Object> _getMap() { return this.map; } - protected final void _setMap(CustomEntryConcurrentHashMap<Object, Object> m) { + protected void _setMap(CustomEntryConcurrentHashMap<Object, Object> m) { this.map = m; } @@ -221,7 +221,7 @@ public abstract class AbstractRegionMap implements RegionMap { return (Collection) _getMap().values(); } - public final boolean containsKey(Object key) { + public boolean containsKey(Object key) { RegionEntry re = getEntry(key); if (re == null) { return false; @@ -243,12 +243,12 @@ public abstract class AbstractRegionMap implements RegionMap { @Override - public final RegionEntry getEntryInVM(Object key) { + public RegionEntry getEntryInVM(Object key) { return (RegionEntry) _getMap().get(key); } - public final RegionEntry putEntryIfAbsent(Object key, RegionEntry re) { + public RegionEntry putEntryIfAbsent(Object key, RegionEntry re) { RegionEntry oldRe = (RegionEntry) _getMap().putIfAbsent(key, re); if (oldRe == null && (re instanceof OffHeapRegionEntry) && _isOwnerALocalRegion() && _getOwner().isThisRegionBeingClosedOrDestroyed()) { @@ -265,13 +265,13 @@ public abstract class AbstractRegionMap implements RegionMap { } @Override - public final RegionEntry getOperationalEntryInVM(Object key) { + public RegionEntry getOperationalEntryInVM(Object key) { RegionEntry re = (RegionEntry) _getMap().get(key); return re; } - public final void removeEntry(Object key, RegionEntry re, boolean updateStat) { + public void removeEntry(Object key, RegionEntry re, boolean updateStat) { if (re.isTombstone() && _getMap().get(key) == re) { logger.fatal( LocalizedMessage.create(LocalizedStrings.AbstractRegionMap_ATTEMPT_TO_REMOVE_TOMBSTONE), @@ -286,8 +286,8 @@ public abstract class AbstractRegionMap implements RegionMap { } } - public final void removeEntry(Object key, RegionEntry re, boolean updateStat, - EntryEventImpl event, final LocalRegion owner) { + public void removeEntry(Object key, RegionEntry re, boolean updateStat, EntryEventImpl event, + final LocalRegion owner) { boolean success = false; if (re.isTombstone() && _getMap().get(key) == re) { logger.fatal( @@ -304,7 +304,7 @@ public abstract class AbstractRegionMap implements RegionMap { } } - protected final void incEntryCount(int delta) { + protected void incEntryCount(int delta) { LocalRegion lr = _getOwner(); if (lr != null) { CachePerfStats stats = lr.getCachePerfStats(); @@ -314,7 +314,7 @@ public abstract class AbstractRegionMap implements RegionMap { } } - final void incClearCount(LocalRegion lr) { + void incClearCount(LocalRegion lr) { if (lr != null && !(lr instanceof HARegion)) { CachePerfStats stats = lr.getCachePerfStats(); if (stats != null) { @@ -640,7 +640,7 @@ public abstract class AbstractRegionMap implements RegionMap { } @Retained // Region entry may contain an off-heap value - public final RegionEntry initRecoveredEntry(Object key, DiskEntry.RecoveredEntry value) { + public RegionEntry initRecoveredEntry(Object key, DiskEntry.RecoveredEntry value) { boolean needsCallback = false; @Retained RegionEntry newRe = @@ -696,7 +696,7 @@ public abstract class AbstractRegionMap implements RegionMap { return newRe; } - public final RegionEntry updateRecoveredEntry(Object key, DiskEntry.RecoveredEntry value) { + public RegionEntry updateRecoveredEntry(Object key, DiskEntry.RecoveredEntry value) { boolean needsCallback = false; RegionEntry re = getEntry(key); if (re == null) { @@ -755,7 +755,7 @@ public abstract class AbstractRegionMap implements RegionMap { return re; } - public final boolean initialImagePut(final Object key, final long lastModified, Object newValue, + public boolean initialImagePut(final Object key, final long lastModified, Object newValue, final boolean wasRecovered, boolean deferLRUCallback, VersionTag entryVersion, InternalDistributedMember sender, boolean isSynchronizing) { boolean result = false; @@ -1023,7 +1023,7 @@ public abstract class AbstractRegionMap implements RegionMap { return true; } - public final boolean destroy(EntryEventImpl event, boolean inTokenMode, boolean duringRI, + public boolean destroy(EntryEventImpl event, boolean inTokenMode, boolean duringRI, boolean cacheWrite, boolean isEviction, Object expectedOldValue, boolean removeRecoveredEntry) throws CacheWriterException, EntryNotFoundException, TimeoutException { @@ -1555,7 +1555,7 @@ public abstract class AbstractRegionMap implements RegionMap { return false; } - public final void txApplyDestroy(Object key, TransactionId txId, TXRmtEvent txEvent, + public void txApplyDestroy(Object key, TransactionId txId, TXRmtEvent txEvent, boolean inTokenMode, boolean inRI, Operation op, EventID eventId, Object aCallbackArgument, List<EntryEventImpl> pendingCallbacks, FilterRoutingInfo filterRoutingInfo, ClientProxyMembershipID bridgeContext, boolean isOriginRemote, TXEntryState txEntryState, @@ -1858,8 +1858,8 @@ public abstract class AbstractRegionMap implements RegionMap { } } - public final boolean invalidate(EntryEventImpl event, boolean invokeCallbacks, - boolean forceNewEntry, boolean forceCallbacks) throws EntryNotFoundException { + public boolean invalidate(EntryEventImpl event, boolean invokeCallbacks, boolean forceNewEntry, + boolean forceCallbacks) throws EntryNotFoundException { final boolean isDebugEnabled = logger.isDebugEnabled(); final LocalRegion owner = _getOwner(); @@ -2344,11 +2344,11 @@ public abstract class AbstractRegionMap implements RegionMap { } } - public final void txApplyInvalidate(Object key, Object newValue, boolean didDestroy, - TransactionId txId, TXRmtEvent txEvent, boolean localOp, EventID eventId, - Object aCallbackArgument, List<EntryEventImpl> pendingCallbacks, - FilterRoutingInfo filterRoutingInfo, ClientProxyMembershipID bridgeContext, - TXEntryState txEntryState, VersionTag versionTag, long tailKey) { + public void txApplyInvalidate(Object key, Object newValue, boolean didDestroy, TransactionId txId, + TXRmtEvent txEvent, boolean localOp, EventID eventId, Object aCallbackArgument, + List<EntryEventImpl> pendingCallbacks, FilterRoutingInfo filterRoutingInfo, + ClientProxyMembershipID bridgeContext, TXEntryState txEntryState, VersionTag versionTag, + long tailKey) { // boolean didInvalidate = false; final LocalRegion owner = _getOwner(); @@ -3510,7 +3510,7 @@ public abstract class AbstractRegionMap implements RegionMap { /** create a callback event for applying a transactional change to the local cache */ @Retained - public static final EntryEventImpl createCBEvent(final LocalRegion re, Operation op, Object key, + public static EntryEventImpl createCBEvent(final LocalRegion re, Operation op, Object key, Object newValue, TransactionId txId, TXRmtEvent txEvent, EventID eventId, Object aCallbackArgument, FilterRoutingInfo filterRoutingInfo, ClientProxyMembershipID bridgeContext, TXEntryState txEntryState, VersionTag versionTag, @@ -3614,7 +3614,7 @@ public abstract class AbstractRegionMap implements RegionMap { } } - public final void writeSyncIfPresent(Object key, Runnable runner) { + public void writeSyncIfPresent(Object key, Runnable runner) { RegionEntry re = getEntry(key); if (re != null) { final boolean disabled = disableLruUpdateCallback(); @@ -3638,7 +3638,7 @@ public abstract class AbstractRegionMap implements RegionMap { } } - public final void removeIfDestroyed(Object key) { + public void removeIfDestroyed(Object key) { LocalRegion owner = _getOwner(); // boolean makeTombstones = owner.concurrencyChecksEnabled; DiskRegion dr = owner.getDiskRegion(); @@ -3732,7 +3732,7 @@ public abstract class AbstractRegionMap implements RegionMap { * * @param entry the entry to attempt to add to the system */ - protected final RegionEntry putEntryIfAbsentForTest(RegionEntry entry) { + protected RegionEntry putEntryIfAbsentForTest(RegionEntry entry) { return (RegionEntry) putEntryIfAbsent(entry.getKey(), entry); } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java index 26fdde5..14e276a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractUpdateOperation.java @@ -82,7 +82,7 @@ public abstract class AbstractUpdateOperation extends DistributedCacheOperation Boolean.getBoolean("GemFire.ALWAYS_REPLICATE_UPDATES"); /** @return whether we should do a local create for a remote one */ - private static final boolean shouldDoRemoteCreate(LocalRegion rgn, EntryEventImpl ev) { + private static boolean shouldDoRemoteCreate(LocalRegion rgn, EntryEventImpl ev) { DataPolicy dp = rgn.getAttributes().getDataPolicy(); if (!rgn.isAllEvents() || (dp.withReplication() && rgn.isInitialized() && ev.getOperation().isUpdate() && !rgn.concurrencyChecksEnabled // misordered CREATE and http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java index 7b35cb5..04a48d0 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java @@ -842,7 +842,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor { * * @return the member who is primary for this bucket */ - public final InternalDistributedMember getPrimary() { + public InternalDistributedMember getPrimary() { InternalDistributedMember primary = getExistingPrimary(); if (primary == null) { primary = waitForNewPrimary(); @@ -857,7 +857,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor { * @see #getPrimary() * @return the existing primary (if it is still in the view) otherwise null */ - private final InternalDistributedMember getExistingPrimary() { + private InternalDistributedMember getExistingPrimary() { return basicGetPrimaryMember(); } @@ -865,7 +865,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor { * If the current member is primary for this bucket return true, otherwise, give some time for the * current member to become primary and then return whether it is a primary (true/false). */ - public final boolean isPrimaryWithWait() { + public boolean isPrimaryWithWait() { if (this.isPrimary()) { return true; } @@ -884,7 +884,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor { * @see #getPrimary() * @return the new primary */ - private final InternalDistributedMember waitForNewPrimary() { + private InternalDistributedMember waitForNewPrimary() { DM dm = this.regionAdvisor.getDistributionManager(); DistributionConfig config = dm.getConfig(); // failure detection period @@ -2441,7 +2441,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor { /** * Profile information for a remote bucket hosted by cache servers. */ - public static final class ServerBucketProfile extends BucketProfile { + public static class ServerBucketProfile extends BucketProfile { public Set<BucketServerLocation66> bucketServerLocations; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java index 62a9bc7..886d678 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java @@ -99,14 +99,14 @@ public class BucketRegion extends DistributedRegion implements Bucket { */ private final AtomicLongWithTerminalState bytesInMemory = new AtomicLongWithTerminalState(); - public static final class RawValue { + public static class RawValue { private final Object rawValue; public RawValue(Object rawVal) { this.rawValue = rawVal; } - public final boolean isValueByteArray() { + public boolean isValueByteArray() { return this.rawValue instanceof byte[]; } @@ -1017,7 +1017,7 @@ public class BucketRegion extends DistributedRegion implements Bucket { } @Override - final void performExpiryTimeout(ExpiryTask expiryTask) throws CacheException { + void performExpiryTimeout(ExpiryTask expiryTask) throws CacheException { ExpiryTask task = expiryTask; boolean isEvictDestroy = isEntryEvictDestroyEnabled(); // Fix for bug 43805 - get the primary lock before @@ -1049,7 +1049,7 @@ public class BucketRegion extends DistributedRegion implements Bucket { && EvictionAction.LOCAL_DESTROY.equals(getEvictionAttributes().getAction()); } - protected final void processPendingSecondaryExpires() { + protected void processPendingSecondaryExpires() { ExpiryTask[] tasks; while (true) { // note we just keep looping until no more pendingExpires exist http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/BytesAndBitsForCompactor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BytesAndBitsForCompactor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BytesAndBitsForCompactor.java index 104cf18..0c8f5fb 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/BytesAndBitsForCompactor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BytesAndBitsForCompactor.java @@ -52,19 +52,19 @@ public class BytesAndBitsForCompactor { } - public final StoredObject getOffHeapData() { + public StoredObject getOffHeapData() { return this.offHeapData; } - public final byte[] getBytes() { + public byte[] getBytes() { return this.data; } - public final byte getBits() { + public byte getBits() { return this.userBits; } - public final int getValidLength() { + public int getValidLength() { return this.validLength; } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserverHolder.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserverHolder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserverHolder.java index 033f530..701c93e 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserverHolder.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserverHolder.java @@ -56,7 +56,7 @@ public class CacheObserverHolder { /** * Set the given observer to be notified of query events. Returns the current observer. */ - public static final CacheObserver setInstance(CacheObserver observer) { + public static CacheObserver setInstance(CacheObserver observer) { if (observer == null) observer = NO_OBSERVER; CacheObserver oldObserver = _instance; @@ -65,7 +65,7 @@ public class CacheObserverHolder { } /** Return the current QueryObserver instance */ - public static final CacheObserver getInstance() { + public static CacheObserver getInstance() { return _instance; } } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java index 6bfb0f3..ab53ca4 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerLauncher.java @@ -274,7 +274,7 @@ public class CacheServerLauncher { public static final String EVICTION_OFF_HEAP_PERCENTAGE = "eviction-off-heap-percentage"; protected static final String LOCK_MEMORY = ConfigurationProperties.LOCK_MEMORY; - protected final File processDirOption(final Map<String, Object> options, final String dirValue) + protected File processDirOption(final Map<String, Object> options, final String dirValue) throws FileNotFoundException { final File inputWorkingDirectory = new File(dirValue); http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/ClientRegionEventImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientRegionEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientRegionEventImpl.java index 2fef594..30168ff 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientRegionEventImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientRegionEventImpl.java @@ -32,7 +32,7 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID; * * @since GemFire 5.1 */ -public final class ClientRegionEventImpl extends RegionEventImpl { +public class ClientRegionEventImpl extends RegionEventImpl { /** * The originating membershipId of this event. http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverHolder.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverHolder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverHolder.java index 1aeb61b..3964cd7 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverHolder.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverHolder.java @@ -38,7 +38,7 @@ public class ClientServerObserverHolder { /** * Set the given observer to be notified of events. Returns the current observer. */ - public static final ClientServerObserver setInstance(ClientServerObserver observer) { + public static ClientServerObserver setInstance(ClientServerObserver observer) { Support.assertArg(observer != null, "setInstance expects a non-null argument!"); ClientServerObserver oldObserver = _instance; _instance = observer; @@ -46,7 +46,7 @@ public class ClientServerObserverHolder { } /** Return the current BridgeObserver instance */ - public static final ClientServerObserver getInstance() { + public static ClientServerObserver getInstance() { return _instance; } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/CloseCacheMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CloseCacheMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CloseCacheMessage.java index 03ef99b..6fe459e 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/CloseCacheMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CloseCacheMessage.java @@ -35,8 +35,7 @@ import org.apache.geode.internal.logging.LogService; */ /** Creates a new instance of CloseCacheMessage */ -public final class CloseCacheMessage extends HighPriorityDistributionMessage - implements MessageWithReply { +public class CloseCacheMessage extends HighPriorityDistributionMessage implements MessageWithReply { private static final Logger logger = LogService.getLogger(); private int processorId; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/CreateRegionProcessor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CreateRegionProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CreateRegionProcessor.java index 815b526..c1d1e77 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/CreateRegionProcessor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CreateRegionProcessor.java @@ -306,7 +306,7 @@ public class CreateRegionProcessor implements ProfileExchangeProcessor { } } - public static final class CreateRegionMessage extends HighPriorityDistributionMessage + public static class CreateRegionMessage extends HighPriorityDistributionMessage implements MessageWithReply { public boolean concurrencyChecksEnabled; @@ -768,7 +768,7 @@ public class CreateRegionProcessor implements ProfileExchangeProcessor { } } - public static final class CreateRegionReplyMessage extends ReplyMessage { + public static class CreateRegionReplyMessage extends ReplyMessage { protected CacheProfile profile; protected ArrayList bucketProfiles; protected Object eventState; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyOperation.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyOperation.java index 5132ec0..ad3f976 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyOperation.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyOperation.java @@ -217,7 +217,7 @@ public class DestroyOperation extends DistributedCacheOperation { } } - public static final class DestroyWithContextMessage extends DestroyMessage { + public static class DestroyWithContextMessage extends DestroyMessage { transient ClientProxyMembershipID context; public DestroyWithContextMessage() {} http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyPartitionedRegionMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyPartitionedRegionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyPartitionedRegionMessage.java index 5914ab5..0af8840 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyPartitionedRegionMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyPartitionedRegionMessage.java @@ -57,7 +57,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker; * * @since GemFire 5.0 */ -public final class DestroyPartitionedRegionMessage extends PartitionMessage { +public class DestroyPartitionedRegionMessage extends PartitionMessage { private static final Logger logger = LogService.getLogger(); private Object cbArg; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java index 3cc988f..53efa4f 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java @@ -466,12 +466,12 @@ public class DestroyRegionOperation extends DistributedCacheOperation { } } - public static final class DestroyRegionWithContextMessage extends DestroyRegionMessage { + public static class DestroyRegionWithContextMessage extends DestroyRegionMessage { protected transient Object context; @Override - final public RegionEventImpl createRegionEvent(DistributedRegion rgn) { + public RegionEventImpl createRegionEvent(DistributedRegion rgn) { return new ClientRegionEventImpl(rgn, getOperation(), this.callbackArg, true /* originRemote */, getSender(), (ClientProxyMembershipID) this.context); } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegion.java index f8b8289..7624399 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegion.java @@ -205,7 +205,7 @@ public class DiskRegion extends AbstractDiskRegion { } @Override - public final String getName() { + public String getName() { return this.name; } @@ -239,11 +239,11 @@ public class DiskRegion extends AbstractDiskRegion { * method does any work is when backup is true and recovery data was discovered when this disk * region was created. */ - final void initializeOwner(LocalRegion drs) { + void initializeOwner(LocalRegion drs) { getDiskStore().initializeOwner(drs); } - final void finishInitializeOwner(LocalRegion drs, GIIStatus giiStatus) { + void finishInitializeOwner(LocalRegion drs, GIIStatus giiStatus) { if (isReadyForRecovery()) { // this.scheduleCompaction(); if (GIIStatus.didFullGII(giiStatus)) { @@ -332,7 +332,7 @@ public class DiskRegion extends AbstractDiskRegion { }); } - public final boolean isOverflowEnabled() { + public boolean isOverflowEnabled() { return this.overflowEnabled; } @@ -345,7 +345,7 @@ public class DiskRegion extends AbstractDiskRegion { * completed successfully, resulting in the put operation to abort. * @throws IllegalArgumentException If <code>id</code> is less than zero */ - final void put(DiskEntry entry, LocalRegion region, ValueWrapper value, boolean async) + void put(DiskEntry entry, LocalRegion region, ValueWrapper value, boolean async) throws RegionClearedException { getDiskStore().put(region, entry, value, async); } @@ -356,7 +356,7 @@ public class DiskRegion extends AbstractDiskRegion { * * @see #getBytesAndBitsWithoutLock(DiskId, boolean, boolean) */ - final Object get(DiskId id) { + Object get(DiskId id) { return getDiskStore().get(this, id); } @@ -368,25 +368,25 @@ public class DiskRegion extends AbstractDiskRegion { * @param id DiskId object for the entry * @return value of the entry */ - final BytesAndBits getBytesAndBitsWithoutLock(DiskId id, boolean faultIn, boolean bitOnly) { + BytesAndBits getBytesAndBitsWithoutLock(DiskId id, boolean faultIn, boolean bitOnly) { return getDiskStore().getBytesAndBitsWithoutLock(this, id, faultIn, bitOnly); } /** * @since GemFire 3.2.1 */ - final BytesAndBits getBytesAndBits(DiskId id) { + BytesAndBits getBytesAndBits(DiskId id) { return getBytesAndBits(id, true); } - final BytesAndBits getBytesAndBits(DiskId id, boolean faultingIn) { + BytesAndBits getBytesAndBits(DiskId id, boolean faultingIn) { return getDiskStore().getBytesAndBits(this, id, faultingIn); } /** * @since GemFire 3.2.1 */ - final byte getBits(DiskId id) { + byte getBits(DiskId id) { return getDiskStore().getBits(this, id); } @@ -401,7 +401,7 @@ public class DiskRegion extends AbstractDiskRegion { * @return null if entry has nothing stored on disk (id == INVALID_ID) * @throws IllegalArgumentException If <code>id</code> is less than zero, no action is taken. */ - public final Object getNoBuffer(DiskId id) { + public Object getNoBuffer(DiskId id) { return getDiskStore().getNoBuffer(this, id); } @@ -413,11 +413,11 @@ public class DiskRegion extends AbstractDiskRegion { * @throws IllegalArgumentException If <code>id</code> is {@linkplain #INVALID_ID invalid}or is * less than zero, no action is taken. */ - final void remove(LocalRegion region, DiskEntry entry) throws RegionClearedException { + void remove(LocalRegion region, DiskEntry entry) throws RegionClearedException { getDiskStore().remove(region, entry, false, false); } - final void remove(LocalRegion region, DiskEntry entry, boolean async, boolean isClear) + void remove(LocalRegion region, DiskEntry entry, boolean async, boolean isClear) throws RegionClearedException { getDiskStore().remove(region, entry, async, isClear); } @@ -539,7 +539,7 @@ public class DiskRegion extends AbstractDiskRegion { /** * returns the active child */ - final Oplog testHook_getChild() { + Oplog testHook_getChild() { return getDiskStore().persistentOplogs.getChild(); } @@ -611,7 +611,7 @@ public class DiskRegion extends AbstractDiskRegion { /** ThreadLocal to be used for maintaining consistency during clear* */ private final ThreadLocal<Integer> childReference = new ThreadLocal<Integer>(); - final void incClearCount() { + void incClearCount() { this.clearCount.incrementAndGet(); } @@ -733,7 +733,7 @@ public class DiskRegion extends AbstractDiskRegion { return getOplogSet().getNextDir(); } - final long newOplogEntryId() { + long newOplogEntryId() { return getOplogSet().newOplogEntryId(); } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java index aeabbbc..67fcce8 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java @@ -593,7 +593,7 @@ public class DiskStoreImpl implements DiskStore { * Initializes the contents of any regions on this DiskStore that have been registered but are not * yet initialized. */ - final void initializeOwner(LocalRegion lr) { + void initializeOwner(LocalRegion lr) { DiskRegion dr = lr.getDiskRegion(); // We don't need to do recovery for overflow regions. if (!lr.getDataPolicy().withPersistence() || !dr.isRecreated()) { @@ -686,7 +686,7 @@ public class DiskStoreImpl implements DiskStore { * completed successfully, resulting in the put operation to abort. * @throws IllegalArgumentException If {@code id} is less than zero */ - final void put(LocalRegion region, DiskEntry entry, ValueWrapper value, boolean async) + void put(LocalRegion region, DiskEntry entry, ValueWrapper value, boolean async) throws RegionClearedException { DiskRegion dr = region.getDiskRegion(); DiskId id = entry.getDiskId(); @@ -754,7 +754,7 @@ public class DiskStoreImpl implements DiskStore { } } - final void putVersionTagOnly(LocalRegion region, VersionTag tag, boolean async) { + void putVersionTagOnly(LocalRegion region, VersionTag tag, boolean async) { DiskRegion dr = region.getDiskRegion(); // this method will only be called by backup oplog assert dr.isBackup(); @@ -792,7 +792,7 @@ public class DiskStoreImpl implements DiskStore { * {@linkplain DiskRegionStats statistics} * */ - final Object get(DiskRegion dr, DiskId id) { + Object get(DiskRegion dr, DiskId id) { acquireReadLock(dr); try { int count = 0; @@ -851,7 +851,7 @@ public class DiskStoreImpl implements DiskStore { * * @return an instance of BytesAndBits or Token.REMOVED_PHASE1 */ - final Object getRaw(DiskRegionView dr, DiskId id) { + Object getRaw(DiskRegionView dr, DiskId id) { if (dr.isRegionClosed()) { throw new RegionDestroyedException( LocalizedStrings.DiskRegion_THE_DISKREGION_HAS_BEEN_CLOSED_OR_DESTROYED @@ -926,7 +926,7 @@ public class DiskStoreImpl implements DiskStore { * @return value of the entry or CLEAR_BB if it is detected that the entry was removed by a * concurrent region clear. */ - final BytesAndBits getBytesAndBitsWithoutLock(DiskRegionView dr, DiskId id, boolean faultIn, + BytesAndBits getBytesAndBitsWithoutLock(DiskRegionView dr, DiskId id, boolean faultIn, boolean bitOnly) { long oplogId = id.getOplogId(); OplogSet oplogSet = getOplogSet(dr); @@ -943,7 +943,7 @@ public class DiskStoreImpl implements DiskStore { return oplog.getBytesAndBits(dr, id, faultIn, bitOnly); } - final BytesAndBits getBytesAndBits(DiskRegion dr, DiskId id, boolean faultingIn) { + BytesAndBits getBytesAndBits(DiskRegion dr, DiskId id, boolean faultingIn) { acquireReadLock(dr); try { if (dr.isRegionClosed()) { @@ -977,7 +977,7 @@ public class DiskStoreImpl implements DiskStore { /** * @since GemFire 3.2.1 */ - final byte getBits(DiskRegion dr, DiskId id) { + byte getBits(DiskRegion dr, DiskId id) { acquireReadLock(dr); try { if (dr.isRegionClosed()) { @@ -1016,7 +1016,7 @@ public class DiskStoreImpl implements DiskStore { * @return null if entry has nothing stored on disk (id == INVALID_ID) * @throws IllegalArgumentException If {@code id} is less than zero, no action is taken. */ - public final Object getNoBuffer(DiskRegion dr, DiskId id) { + public Object getNoBuffer(DiskRegion dr, DiskId id) { BytesAndBits bb = null; acquireReadLock(dr); try { @@ -1055,7 +1055,7 @@ public class DiskStoreImpl implements DiskStore { * @throws IllegalArgumentException If {@code id} is {@linkplain #INVALID_ID invalid}or is less * than zero, no action is taken. */ - final void remove(LocalRegion region, DiskEntry entry, boolean async, boolean isClear) + void remove(LocalRegion region, DiskEntry entry, boolean async, boolean isClear) throws RegionClearedException { DiskRegion dr = region.getDiskRegion(); if (!async) { @@ -2009,7 +2009,7 @@ public class DiskStoreImpl implements DiskStore { /** * Reads the oplogs files and loads them into regions that are ready to be recovered. */ - public final void recoverRegionsThatAreReady() { + public void recoverRegionsThatAreReady() { persistentOplogs.recoverRegionsThatAreReady(); } @@ -2052,7 +2052,7 @@ public class DiskStoreImpl implements DiskStore { private final boolean isCompactionPossible; - final boolean isCompactionPossible() { + boolean isCompactionPossible() { return this.isCompactionPossible; } @@ -2311,7 +2311,7 @@ public class DiskStoreImpl implements DiskStore { } } - final DiskAccessException getDiskAccessException() { + DiskAccessException getDiskAccessException() { return diskException.get(); } @@ -4728,11 +4728,11 @@ public class DiskStoreImpl implements DiskStore { oplogSet.updateDiskRegion(dr); } - public final Version getRecoveredGFVersion() { + public Version getRecoveredGFVersion() { return getRecoveredGFVersion(this.initFile); } - final Version getRecoveredGFVersion(DiskInitFile initFile) { + Version getRecoveredGFVersion(DiskInitFile initFile) { return initFile.currentRecoveredGFVersion(); } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DiskWriteAttributesImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskWriteAttributesImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskWriteAttributesImpl.java index a129eda..d5893d4 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskWriteAttributesImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskWriteAttributesImpl.java @@ -34,7 +34,7 @@ import java.util.Properties; * @since GemFire 5.1 */ @SuppressWarnings({"deprecation", "unused"}) -public final class DiskWriteAttributesImpl implements DiskWriteAttributes { +public class DiskWriteAttributesImpl implements DiskWriteAttributes { private static final long serialVersionUID = -4269181954992768424L; /** Are writes synchronous? */ http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DistPeerTXStateStub.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistPeerTXStateStub.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistPeerTXStateStub.java index be454e7..6411353 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistPeerTXStateStub.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistPeerTXStateStub.java @@ -39,8 +39,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings; * * */ -public final class DistPeerTXStateStub extends PeerTXStateStub - implements DistTXCoordinatorInterface { +public class DistPeerTXStateStub extends PeerTXStateStub implements DistTXCoordinatorInterface { private ArrayList<DistTxEntryEvent> primaryTransactionalOperations = null; private ArrayList<DistTxEntryEvent> secondaryTransactionalOperations = null; private DistTXPrecommitMessage precommitDistTxMsg = null; @@ -114,7 +113,7 @@ public final class DistPeerTXStateStub extends PeerTXStateStub return primaryTransactionalOperations; } - private final void addPrimaryTransactionalOperations(DistTxEntryEvent dtop) { + private void addPrimaryTransactionalOperations(DistTxEntryEvent dtop) { if (logger.isDebugEnabled()) { // [DISTTX] TODO Remove these logger.debug("DistPeerTXStateStub.addPrimaryTransactionalOperations add " + dtop @@ -129,7 +128,7 @@ public final class DistPeerTXStateStub extends PeerTXStateStub } @Override - public final void addSecondaryTransactionalOperations(DistTxEntryEvent dtop) + public void addSecondaryTransactionalOperations(DistTxEntryEvent dtop) throws UnsupportedOperationInTransactionException { secondaryTransactionalOperations.add(dtop); } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCommitMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCommitMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCommitMessage.java index e22e1d9..be401b9 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCommitMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCommitMessage.java @@ -171,7 +171,7 @@ public class DistTXCommitMessage extends TXMessage { * stub to the tx host. This is the reply to a {@link DistTXCommitMessage}. * */ - public static final class DistTXCommitReplyMessage extends ReplyMessage { + public static class DistTXCommitReplyMessage extends ReplyMessage { private transient TXCommitMessage commitMessage; /** @@ -274,7 +274,7 @@ public class DistTXCommitMessage extends TXMessage { * * [DISTTX] TODO see if need ReliableReplyProcessor21? departed members? */ - public static final class DistTxCommitReplyProcessor extends ReplyProcessor21 { + public static class DistTxCommitReplyProcessor extends ReplyProcessor21 { private HashMap<DistributedMember, DistTXCoordinatorInterface> msgMap; private Map<DistributedMember, TXCommitMessage> commitResponseMap; private transient TXId txIdent = null; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java index 0ab2cc3..88e84f8 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java @@ -56,7 +56,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker; /** * */ -public final class DistTXPrecommitMessage extends TXMessage { +public class DistTXPrecommitMessage extends TXMessage { private static final Logger logger = LogService.getLogger(); ArrayList<DistTxEntryEvent> secondaryTransactionalOperations; @@ -175,7 +175,7 @@ public final class DistTXPrecommitMessage extends TXMessage { /** * This is the reply to a {@link DistTXPrecommitMessage}. */ - public static final class DistTXPrecommitReplyMessage extends ReplyMessage { + public static class DistTXPrecommitReplyMessage extends ReplyMessage { private transient DistTxPrecommitResponse commitResponse; /** @@ -277,7 +277,7 @@ public final class DistTXPrecommitMessage extends TXMessage { * * [DISTTX] TODO see if need ReliableReplyProcessor21? departed members? */ - public static final class DistTxPrecommitReplyProcessor extends ReplyProcessor21 { + public static class DistTxPrecommitReplyProcessor extends ReplyProcessor21 { private HashMap<DistributedMember, DistTXCoordinatorInterface> msgMap; private Map<DistributedMember, DistTxPrecommitResponse> commitResponseMap; private transient TXId txIdent = null; @@ -465,7 +465,7 @@ public final class DistTXPrecommitMessage extends TXMessage { } } - public static final class DistTxPrecommitResponse implements DataSerializableFixedID { + public static class DistTxPrecommitResponse implements DataSerializableFixedID { private transient Boolean commitState; private transient ArrayList<ArrayList<DistTxThinEntryState>> distTxEventList; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java index d4f5943..9438fc2 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java @@ -52,7 +52,7 @@ import org.apache.geode.internal.logging.log4j.LogMarker; /** * */ -public final class DistTXRollbackMessage extends TXMessage { +public class DistTXRollbackMessage extends TXMessage { private static final Logger logger = LogService.getLogger(); @@ -132,7 +132,7 @@ public final class DistTXRollbackMessage extends TXMessage { /** * This is the reply to a {@link DistTXRollbackMessage}. */ - public static final class DistTXRollbackReplyMessage extends ReplyMessage { + public static class DistTXRollbackReplyMessage extends ReplyMessage { private transient Boolean rollbackState; /** @@ -283,7 +283,7 @@ public final class DistTXRollbackMessage extends TXMessage { * * [DISTTX] TODO see if need ReliableReplyProcessor21? departed members? */ - public static final class DistTxRollbackReplyProcessor extends ReplyProcessor21 { + public static class DistTxRollbackReplyProcessor extends ReplyProcessor21 { private HashMap<DistributedMember, DistTXCoordinatorInterface> msgMap; private Map<DistributedMember, Boolean> rollbackResponseMap; private transient TXId txIdent = null; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateOnCoordinator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateOnCoordinator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateOnCoordinator.java index a21e505..4517eb8 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateOnCoordinator.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXStateOnCoordinator.java @@ -31,8 +31,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings; * * */ -public final class DistTXStateOnCoordinator extends DistTXState - implements DistTXCoordinatorInterface { +public class DistTXStateOnCoordinator extends DistTXState implements DistTXCoordinatorInterface { private ArrayList<DistTxEntryEvent> primaryTransactionalOperations = null; private ArrayList<DistTxEntryEvent> secondaryTransactionalOperations = null; @@ -46,12 +45,12 @@ public final class DistTXStateOnCoordinator extends DistTXState secondaryTransactionalOperations = new ArrayList<DistTxEntryEvent>(); } - public final ArrayList<DistTxEntryEvent> getPrimaryTransactionalOperations() + public ArrayList<DistTxEntryEvent> getPrimaryTransactionalOperations() throws UnsupportedOperationInTransactionException { return primaryTransactionalOperations; } - private final void addPrimaryTransactionalOperations(DistTxEntryEvent dtop) { + private void addPrimaryTransactionalOperations(DistTxEntryEvent dtop) { if (logger.isDebugEnabled()) { // [DISTTX] TODO Remove these logger.debug("DistTXStateOnCoordinator.addPrimaryTransactionalOperations add " + dtop @@ -75,7 +74,7 @@ public final class DistTXStateOnCoordinator extends DistTXState } } - public final void addSecondaryTransactionalOperations(DistTxEntryEvent dtop) + public void addSecondaryTransactionalOperations(DistTxEntryEvent dtop) throws UnsupportedOperationInTransactionException { secondaryTransactionalOperations.add(dtop); } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java index 7ba7d0c..6c33c65 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedCacheOperation.java @@ -804,11 +804,11 @@ public abstract class DistributedCacheOperation { return getRegion().scope.isAck(); } - protected final DistributedRegion getRegion() { + protected DistributedRegion getRegion() { return (DistributedRegion) this.event.getRegion(); } - protected final EntryEventImpl getEvent() { + protected EntryEventImpl getEvent() { return (EntryEventImpl) this.event; } http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java index 9d10fc1..b00612a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java @@ -262,13 +262,13 @@ public class DistributedClearOperation extends DistributedCacheOperation { } - public static final class ClearRegionWithContextMessage extends ClearRegionMessage { + public static class ClearRegionWithContextMessage extends ClearRegionMessage { protected transient Object context; protected RegionVersionVector rvv; @Override - final public RegionEventImpl createRegionEvent(DistributedRegion rgn) { + public RegionEventImpl createRegionEvent(DistributedRegion rgn) { ClientRegionEventImpl event = new ClientRegionEventImpl(rgn, getOperation(), this.callbackArg, true /* originRemote */, getSender(), (ClientProxyMembershipID) this.context); http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java index 61542c4..c26cd56 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java @@ -268,7 +268,7 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation { /** * Data that represents a single entry being putall'd. */ - public static final class PutAllEntryData { + public static class PutAllEntryData { final Object key; @@ -398,7 +398,7 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation { * {@link PutAllPRMessage#toData(DataOutput)} <br> * {@link RemotePutAllMessage#toData(DataOutput)} <br> */ - public final void toData(final DataOutput out) throws IOException { + public void toData(final DataOutput out) throws IOException { Object key = this.key; final Object v = this.value; DataSerializer.writeObject(key, out); @@ -589,7 +589,7 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation { } } - public static final class EntryVersionsList extends ArrayList<VersionTag> + public static class EntryVersionsList extends ArrayList<VersionTag> implements DataSerializableFixedID, Externalizable { public EntryVersionsList() { http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java ---------------------------------------------------------------------- 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 41b2613..485835b 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 @@ -1969,7 +1969,7 @@ public class DistributedRegion extends LocalRegion implements CacheDistributionA super.basicLocalClear(rEvent); } - public final DistributionConfig getDistributionConfig() { + public DistributionConfig getDistributionConfig() { return getSystem().getDistributionManager().getConfig(); } @@ -3544,7 +3544,7 @@ public class DistributedRegion extends LocalRegion implements CacheDistributionA * Implementation of {@link ProfileVisitor} that selects a random replicated member from the * available ones for this region. */ - static final class GetRandomReplicate implements ProfileVisitor<DistributedMember> { + static class GetRandomReplicate implements ProfileVisitor<DistributedMember> { private boolean onlyPersistent = false; http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java index 9d85008..870e778 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java @@ -399,7 +399,7 @@ public class DistributedRegionFunctionStreamingMessage extends DistributionMessa } @Override - final public int getProcessorType() { + public int getProcessorType() { return DistributionManager.REGION_FUNCTION_EXECUTION_EXECUTOR; } @@ -421,7 +421,7 @@ public class DistributedRegionFunctionStreamingMessage extends DistributionMessa return txUniqId; } - public final InternalDistributedMember getMemberToMasqueradeAs() { + public InternalDistributedMember getMemberToMasqueradeAs() { if (txMemberId == null) { return getSender(); } else { http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java index 0c13b59..42bf10f 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java @@ -254,7 +254,7 @@ public class DistributedRemoveAllOperation extends AbstractUpdateOperation // TO /** * Data that represents a single entry being RemoveAll'd. */ - public static final class RemoveAllEntryData { + public static class RemoveAllEntryData { final Object key; @@ -369,7 +369,7 @@ public class DistributedRemoveAllOperation extends AbstractUpdateOperation // TO * {@link PutAllPRMessage#toData(DataOutput)} <br> * {@link RemotePutAllMessage#toData(DataOutput)} <br> */ - public final void toData(final DataOutput out) throws IOException { + public void toData(final DataOutput out) throws IOException { Object key = this.key; DataSerializer.writeObject(key, out); http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesSet.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesSet.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesSet.java index 76e9081..6d26c08 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesSet.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesSet.java @@ -61,7 +61,7 @@ public class EntriesSet extends AbstractSet { this.allowTombstones = allowTombstones; } - protected final void checkTX() { + protected void checkTX() { if (this.myTX != null) { if (!myTX.isInProgress()) { throw new IllegalStateException( http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java index ac4954a..185fde7 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java @@ -491,11 +491,11 @@ public class EntryEventImpl return result; } - private final boolean testEventFlag(short mask) { + private boolean testEventFlag(short mask) { return EventFlags.isSet(this.eventFlags, mask); } - private final void setEventFlag(short mask, boolean on) { + private void setEventFlag(short mask, boolean on) { this.eventFlags = EventFlags.set(this.eventFlags, mask, on); } @@ -603,19 +603,19 @@ public class EntryEventImpl return this.op.isEviction(); } - public final void setEvicted() { + public void setEvicted() { this.isEvicted = true; } - public final boolean isEvicted() { + public boolean isEvicted() { return this.isEvicted; } - public final boolean isPendingSecondaryExpireDestroy() { + public boolean isPendingSecondaryExpireDestroy() { return this.isPendingSecondaryExpireDestroy; } - public final void setPendingSecondaryExpireDestroy(boolean value) { + public void setPendingSecondaryExpireDestroy(boolean value) { this.isPendingSecondaryExpireDestroy = value; } @@ -670,7 +670,7 @@ public class EntryEventImpl * * @return null if no event id has been set */ - public final EventID getEventId() { + public EventID getEventId() { return this.eventID; } @@ -720,7 +720,7 @@ public class EntryEventImpl * * @return the value in the cache prior to this event. */ - public final Object getOldValue() { + public Object getOldValue() { try { if (isOriginRemote() && this.region.isProxy()) { return null; @@ -763,7 +763,7 @@ public class EntryEventImpl * Like getRawNewValue except that if the result is an off-heap reference then copy it to the * heap. Note: to prevent the heap copy use getRawNewValue instead */ - public final Object getRawNewValueAsHeapObject() { + public Object getRawNewValueAsHeapObject() { Object result = basicGetNewValue(); if (mayHaveOffHeapReferences()) { result = OffHeapHelper.copyIfNeeded(result); @@ -777,7 +777,7 @@ public class EntryEventImpl * lifetime of the EntryEventImpl instance that returned the value. Else return the raw form. */ @Unretained(ENTRY_EVENT_NEW_VALUE) - public final Object getRawNewValue() { + public Object getRawNewValue() { return basicGetNewValue(); } @@ -809,7 +809,7 @@ public class EntryEventImpl } @Unretained - protected final Object basicGetNewValue() { + protected Object basicGetNewValue() { Object result = this.newValue; if (!this.offHeapOk && isOffHeapReference(result)) { // this.region.getCache().getLogger().info("DEBUG new value already freed " + @@ -914,7 +914,7 @@ public class EntryEventImpl * Like getRawOldValue except that if the result is an off-heap reference then copy it to the * heap. To avoid the heap copy use getRawOldValue instead. */ - public final Object getRawOldValueAsHeapObject() { + public Object getRawOldValueAsHeapObject() { Object result = basicGetOldValue(); if (mayHaveOffHeapReferences()) { result = OffHeapHelper.copyIfNeeded(result); @@ -928,7 +928,7 @@ public class EntryEventImpl * lifetime of the EntryEventImpl instance that returned the value. Else return the raw form. */ @Unretained - public final Object getRawOldValue() { + public Object getRawOldValue() { return basicGetOldValue(); } @@ -936,7 +936,7 @@ public class EntryEventImpl * Just like getRawOldValue except if the raw old value is off-heap deserialize it. */ @Unretained(ENTRY_EVENT_OLD_VALUE) - public final Object getOldValueAsOffHeapDeserializedOrRaw() { + public Object getOldValueAsOffHeapDeserializedOrRaw() { Object result = basicGetOldValue(); if (mayHaveOffHeapReferences() && result instanceof StoredObject) { result = ((CachedDeserializable) result).getDeserializedForReading(); @@ -957,7 +957,7 @@ public class EntryEventImpl * * @return the value in the cache after this event. */ - public final Object getNewValue() { + public Object getNewValue() { boolean doCopyOnRead = getRegion().isCopyOnRead(); Object nv = basicGetNewValue(); @@ -1010,16 +1010,16 @@ public class EntryEventImpl private final Object offHeapLock = new Object(); - public final String getNewValueStringForm() { + public String getNewValueStringForm() { return StringUtils.forceToString(basicGetNewValue()); } - public final String getOldValueStringForm() { + public String getOldValueStringForm() { return StringUtils.forceToString(basicGetOldValue()); } /** Set a deserialized value */ - public final void setNewValue(@Retained(ENTRY_EVENT_NEW_VALUE) Object obj) { + public void setNewValue(@Retained(ENTRY_EVENT_NEW_VALUE) Object obj) { basicSetNewValue(obj); } @@ -1047,7 +1047,7 @@ public class EntryEventImpl /** * @see org.apache.geode.cache.CacheEvent#getRegion() */ - public final LocalRegion getRegion() { + public LocalRegion getRegion() { return region; } @@ -1179,7 +1179,7 @@ public class EntryEventImpl /** * Export the event's new value to the given importer. */ - public final void exportNewValue(NewValueImporter importer) { + public void exportNewValue(NewValueImporter importer) { final boolean prefersSerialized = importer.prefersNewSerialized(); if (prefersSerialized) { if (getCachedSerializedNewValue() != null) { @@ -1271,7 +1271,7 @@ public class EntryEventImpl /** * Export the event's old value to the given importer. */ - public final void exportOldValue(OldValueImporter importer) { + public void exportOldValue(OldValueImporter importer) { final boolean prefersSerialized = importer.prefersOldSerialized(); if (prefersSerialized) { if (this.oldValueBytes != null && this.oldValue instanceof CachedDeserializable) { @@ -1310,7 +1310,7 @@ public class EntryEventImpl * Just like getRawNewValue(true) except if the raw new value is off-heap deserialize it. */ @Unretained(ENTRY_EVENT_NEW_VALUE) - public final Object getNewValueAsOffHeapDeserializedOrRaw() { + public Object getNewValueAsOffHeapDeserializedOrRaw() { Object result = getRawNewValue(); if (mayHaveOffHeapReferences() && result instanceof StoredObject) { result = ((CachedDeserializable) result).getDeserializedForReading(); @@ -1352,7 +1352,7 @@ public class EntryEventImpl return result; } - public final Object getDeserializedValue() { + public Object getDeserializedValue() { final Object val = basicGetNewValue(); if (val instanceof CachedDeserializable) { return ((CachedDeserializable) val).getDeserializedForReading(); @@ -1361,7 +1361,7 @@ public class EntryEventImpl } } - public final byte[] getSerializedValue() { + public byte[] getSerializedValue() { if (this.newValueBytes == null) { final Object val; val = basicGetNewValue(); @@ -1392,7 +1392,7 @@ public class EntryEventImpl /** * @param isSynced true if RegionEntry currently under synchronization */ - private final void makeSerializedNewValue(boolean isSynced) { + private void makeSerializedNewValue(boolean isSynced) { Object obj = basicGetNewValue(); // ezoerner:20080611 In the case where there is an unapplied @@ -1448,7 +1448,7 @@ public class EntryEventImpl return this.cachedSerializedNewValue; } - public final void setSerializedNewValue(byte[] serializedValue) { + public void setSerializedNewValue(byte[] serializedValue) { Object newVal = null; if (serializedValue != null) { newVal = CachedDeserializableFactory.create(serializedValue); @@ -1880,11 +1880,11 @@ public class EntryEventImpl return tmp != null && tmp != Token.NOT_AVAILABLE; } - public final boolean hasOldValue() { + public boolean hasOldValue() { return this.oldValue != null && this.oldValue != Token.NOT_AVAILABLE; } - public final boolean isOldValueAToken() { + public boolean isOldValueAToken() { return this.oldValue instanceof Token; } @@ -2173,12 +2173,12 @@ public class EntryEventImpl | FLAG_INHIBIT_LISTENER_NOTIFICATION | FLAG_SERIALIZATION_DEFERRED | FLAG_FROM_SERVER | FLAG_FROM_RI_LOCAL_DESTROY | FLAG_INHIBIT_DISTRIBUTION | FLAG_REDESTROYED_TOMBSTONE); - protected static final boolean isSet(short flags, short mask) { + protected static boolean isSet(short flags, short mask) { return (flags & mask) != 0; } /** WARNING: Does not set the bit in place, returns new short with bit set */ - protected static final short set(short flags, short mask, boolean on) { + protected static short set(short flags, short mask, boolean on) { return (short) (on ? (flags | mask) : (flags & ~mask)); } } @@ -2187,7 +2187,7 @@ public class EntryEventImpl * @return null if old value is not serialized; otherwise returns a SerializedCacheValueImpl * containing the old value. */ - public final SerializedCacheValue<?> getSerializedOldValue() { + public SerializedCacheValue<?> getSerializedOldValue() { @Unretained(ENTRY_EVENT_OLD_VALUE) final Object tmp = basicGetOldValue(); if (tmp instanceof CachedDeserializable) { @@ -2525,7 +2525,7 @@ public class EntryEventImpl return result; } - public static final class SerializedCacheValueImpl + public static class SerializedCacheValueImpl implements SerializedCacheValue, CachedDeserializable, Sendable { private final EntryEventImpl event; @Unretained http://git-wip-us.apache.org/repos/asf/geode/blob/a4458531/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java index 254fc88..45df435 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java @@ -181,7 +181,7 @@ public class EntryExpiryTask 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/EvictionAttributesImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EvictionAttributesImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EvictionAttributesImpl.java index 33e4895..f569ff7 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/EvictionAttributesImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EvictionAttributesImpl.java @@ -47,7 +47,7 @@ import org.apache.geode.internal.cache.lru.MemLRUCapacityController; * * @since GemFire 5.0 */ -public final class EvictionAttributesImpl extends EvictionAttributes +public class EvictionAttributesImpl extends EvictionAttributes implements EvictionAttributesMutator { private static final long serialVersionUID = -6404395520499379715L; @@ -222,11 +222,11 @@ public final class EvictionAttributesImpl extends EvictionAttributes return this.algorithm.isLIFO(); } - public final boolean isLIFOEntry() { + public boolean isLIFOEntry() { return this.algorithm == EvictionAlgorithm.LIFO_ENTRY; } - public final boolean isLIFOMemory() { + public boolean isLIFOMemory() { return this.algorithm == EvictionAlgorithm.LIFO_MEMORY; }
