http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java b/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java index 7bf1a9d..6338eef 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java @@ -7334,40 +7334,40 @@ public class Oplog implements CompactableOplog, Flushable { * Used as the value in the regionMap. Tracks information about what the region has in this oplog. */ public interface DiskRegionInfo { - public DiskRegionView getDiskRegion(); + DiskRegionView getDiskRegion(); - public int addLiveEntriesToList(KRFEntry[] liveEntries, int idx); + int addLiveEntriesToList(KRFEntry[] liveEntries, int idx); - public void addLive(DiskEntry de); + void addLive(DiskEntry de); - public void update(DiskEntry entry); + void update(DiskEntry entry); - public void replaceLive(DiskEntry old, DiskEntry de); + void replaceLive(DiskEntry old, DiskEntry de); - public boolean rmLive(DiskEntry de, Oplog oplog); + boolean rmLive(DiskEntry de, Oplog oplog); - public DiskEntry getNextLiveEntry(); + DiskEntry getNextLiveEntry(); - public void setDiskRegion(DiskRegionView dr); + void setDiskRegion(DiskRegionView dr); - public long clear(RegionVersionVector rvv); + long clear(RegionVersionVector rvv); /** * Return true if we are the first guy to set it to true */ - public boolean testAndSetUnrecovered(); + boolean testAndSetUnrecovered(); - public boolean getUnrecovered(); + boolean getUnrecovered(); /** * Return true if we are the first guy to set it to false */ - public boolean testAndSetRecovered(DiskRegionView dr); + boolean testAndSetRecovered(DiskRegionView dr); /** * Callback to indicate that this oplog has created a krf. */ - public void afterKrfCreated(); + void afterKrfCreated(); } public abstract static class AbstractDiskRegionInfo implements DiskRegionInfo {
http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/OplogSet.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/OplogSet.java b/geode-core/src/main/java/org/apache/geode/internal/cache/OplogSet.java index 73c2677..24d9194 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/OplogSet.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/OplogSet.java @@ -19,11 +19,11 @@ import org.apache.geode.internal.cache.DiskEntry.Helper.ValueWrapper; public interface OplogSet { - public void create(LocalRegion region, DiskEntry entry, ValueWrapper value, boolean async); + void create(LocalRegion region, DiskEntry entry, ValueWrapper value, boolean async); - public void modify(LocalRegion region, DiskEntry entry, ValueWrapper value, boolean async); + void modify(LocalRegion region, DiskEntry entry, ValueWrapper value, boolean async); - public CompactableOplog getChild(long oplogId); + CompactableOplog getChild(long oplogId); - public void remove(LocalRegion region, DiskEntry entry, boolean async, boolean isClear); + void remove(LocalRegion region, DiskEntry entry, boolean async, boolean isClear); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/PRHARedundancyProvider.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PRHARedundancyProvider.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PRHARedundancyProvider.java index f8e2108..946e16c 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/PRHARedundancyProvider.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PRHARedundancyProvider.java @@ -809,11 +809,11 @@ public class PRHARedundancyProvider { /** * Test observer to help reproduce #42429. */ - public static interface EndBucketCreationObserver { + public interface EndBucketCreationObserver { - public void afterEndBucketCreationMessageSend(PartitionedRegion pr, int bucketId); + void afterEndBucketCreationMessageSend(PartitionedRegion pr, int bucketId); - public void afterEndBucketCreation(PartitionedRegion pr, int bucketId); + void afterEndBucketCreation(PartitionedRegion pr, int bucketId); } public void endBucketCreationLocally(int bucketId, InternalDistributedMember newPrimary) { http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluator.java index 94c7641..4380058 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluator.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluator.java @@ -71,7 +71,7 @@ public class PartitionedRegionQueryEvaluator extends StreamingPartitionOperation * @since GemFire 6.0 */ public interface TestHook { - public void hook(final int spot) throws RuntimeException; + void hook(final int spot) throws RuntimeException; } private static final int MAX_PR_QUERY_RETRIES = http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntry.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntry.java index fe0c190..39c4a25 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntry.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntry.java @@ -62,7 +62,7 @@ public interface RegionEntry { * entry or the time it was last modified with an Update. In 7.0 and later releases it also * reflects invalidate and destroy. */ - public long getLastModified(); + long getLastModified(); /** * Returns true if getLastAccessed, getHitCount, and getMissCount can be called without throwing @@ -70,20 +70,20 @@ public interface RegionEntry { * * @since GemFire 6.0 */ - public boolean hasStats(); + boolean hasStats(); - public long getLastAccessed() throws InternalStatisticsDisabledException; + long getLastAccessed() throws InternalStatisticsDisabledException; - public long getHitCount() throws InternalStatisticsDisabledException; + long getHitCount() throws InternalStatisticsDisabledException; - public long getMissCount() throws InternalStatisticsDisabledException; + long getMissCount() throws InternalStatisticsDisabledException; - public void updateStatsForPut(long lastModifiedTime, long lastAccessedTime); + void updateStatsForPut(long lastModifiedTime, long lastAccessedTime); /** * @return the version information for this entry */ - public VersionStamp getVersionStamp(); + VersionStamp getVersionStamp(); /** * @param member the member performing the change, or null if it's this member @@ -92,7 +92,7 @@ public interface RegionEntry { * @param event the event causing this change * @return a new version tag for this entry (null if versions not supported) */ - public VersionTag generateVersionTag(VersionSource member, boolean withDelta, LocalRegion region, + VersionTag generateVersionTag(VersionSource member, boolean withDelta, LocalRegion region, EntryEventImpl event); /** @@ -102,23 +102,23 @@ public interface RegionEntry { * * This is done within the RegionEntry synchronization lock. */ - public boolean dispatchListenerEvents(EntryEventImpl event) throws InterruptedException; + boolean dispatchListenerEvents(EntryEventImpl event) throws InterruptedException; /** * Used to mark an LRU entry as having been recently used. */ - public void setRecentlyUsed(); + void setRecentlyUsed(); - public void updateStatsForGet(boolean hit, long time); + void updateStatsForGet(boolean hit, long time); /** * Resets any entry state as needed for a transaction that did a destroy to this entry. * * @param currTime Current Cache Time. */ - public void txDidDestroy(long currTime); + void txDidDestroy(long currTime); - public void resetCounts() throws InternalStatisticsDisabledException; + void resetCounts() throws InternalStatisticsDisabledException; /** * this is done instead of removePhase2 if the entry needs to be kept for concurrency control @@ -127,7 +127,7 @@ public interface RegionEntry { * @param version whether the operation is from another member or local * @throws RegionClearedException */ - public void makeTombstone(LocalRegion r, VersionTag version) throws RegionClearedException; + void makeTombstone(LocalRegion r, VersionTag version) throws RegionClearedException; /** * Mark this entry as being in the process of removal from the map that contains it by setting its @@ -139,32 +139,32 @@ public interface RegionEntry { * @throws RegionClearedException If operation got aborted due to a clear * */ - public void removePhase1(LocalRegion r, boolean clear) throws RegionClearedException; + void removePhase1(LocalRegion r, boolean clear) throws RegionClearedException; /** * Mark this entry as having been removed from the map that contained it by setting its value to * Token.REMOVED_PHASE2 */ - public void removePhase2(); + void removePhase2(); /** * Returns true if this entry does not exist. This is true if removal has started (value == * Token.REMOVED_PHASE1) or has completed (value == Token.REMOVED_PHASE2). */ - public boolean isRemoved(); + boolean isRemoved(); /** * Returns true if this entry does not exist and will not be resurrected (value == * Token.REMOVED_PHASE2) */ - public boolean isRemovedPhase2(); + boolean isRemovedPhase2(); /** * Returns true if this entry is a tombstone, meaning that it has been removed but is being * retained for concurrent modification detection. Tombstones may be resurrected just like an * entry that is in REMOVED_PHASE1 state. */ - public boolean isTombstone(); + boolean isTombstone(); /** * Fill in value, and isSerialized fields in this entry object (used for getInitialImage and sync @@ -178,7 +178,7 @@ public interface RegionEntry { * @return false if map entry not found * @since GemFire 3.2.1 */ - public boolean fillInValue(LocalRegion r, + boolean fillInValue(LocalRegion r, @Retained(ABSTRACT_REGION_ENTRY_FILL_IN_VALUE) InitialImageOperation.Entry entry, ByteArrayDataInput in, DM mgr); @@ -187,33 +187,32 @@ public interface RegionEntry { * * @param dp if overflowed then the position of the value is set in dp */ - public boolean isOverflowedToDisk(LocalRegion r, DistributedRegion.DiskPosition dp); + boolean isOverflowedToDisk(LocalRegion r, DistributedRegion.DiskPosition dp); /** * Gets the key for this entry. */ - public Object getKey(); + Object getKey(); /** * Gets the value for this entry. For DiskRegions, faults in value and returns it */ - public Object getValue(RegionEntryContext context); + Object getValue(RegionEntryContext context); /** * Just like getValue but the result may be a retained off-heap reference. */ @Retained - public Object getValueRetain(RegionEntryContext context); + Object getValueRetain(RegionEntryContext context); @Released - public void setValue(RegionEntryContext context, @Unretained Object value) - throws RegionClearedException; + void setValue(RegionEntryContext context, @Unretained Object value) throws RegionClearedException; /** * This flavor of setValue was added so that the event could be passed down to Helper.writeToDisk. * The event can be used to cache the serialized form of the value we are writing. See bug 43781. */ - public void setValue(RegionEntryContext context, Object value, EntryEventImpl event) + void setValue(RegionEntryContext context, Object value, EntryEventImpl event) throws RegionClearedException; /** @@ -228,18 +227,18 @@ public interface RegionEntry { * @return possible OFF_HEAP_OBJECT (caller must release) */ @Retained - public Object _getValueRetain(RegionEntryContext context, boolean decompress); + Object _getValueRetain(RegionEntryContext context, boolean decompress); /** Gets the value field of this entry. */ @Unretained - public Object _getValue(); + Object _getValue(); /** * Returns a tokenized form of the value. If the value can not be represented as a token then * Token.NOT_A_TOKEN is returned. */ - public Token getValueAsToken(); + Token getValueAsToken(); /** * Set the value of this entry and perform checks to see if a GC task needs to be scheduled. @@ -248,7 +247,7 @@ public interface RegionEntry { * @param event the cache event that caused this change * @throws RegionClearedException thrown if the region is concurrently cleared */ - public void setValueWithTombstoneCheck(@Unretained Object value, EntryEvent event) + void setValueWithTombstoneCheck(@Unretained Object value, EntryEvent event) throws RegionClearedException; /** @@ -258,7 +257,7 @@ public interface RegionEntry { * @since GemFire 8.0 */ @Retained - public Object getTransformedValue(); + Object getTransformedValue(); /** * Returns the value of an entry as it resides in the VM. @@ -268,14 +267,14 @@ public interface RegionEntry { * * @see LocalRegion#getValueInVM */ - public Object getValueInVM(RegionEntryContext context); + Object getValueInVM(RegionEntryContext context); /** * Returns the value of an entry as it resides on disk. For testing purposes only. * * @see LocalRegion#getValueOnDisk */ - public Object getValueOnDisk(LocalRegion r) throws EntryNotFoundException; + Object getValueOnDisk(LocalRegion r) throws EntryNotFoundException; /** * Returns the value of an entry as it resides on buffer or disk. For asynch mode a value is not @@ -285,7 +284,7 @@ public interface RegionEntry { * @see LocalRegion#getValueOnDisk */ - public Object getValueOnDiskOrBuffer(LocalRegion r) throws EntryNotFoundException; + Object getValueOnDiskOrBuffer(LocalRegion r) throws EntryNotFoundException; @@ -293,7 +292,7 @@ public interface RegionEntry { * Used to modify an existing RegionEntry when processing the values obtained during a * getInitialImage. */ - public boolean initialImagePut(LocalRegion region, long lastModified, Object newValue, + boolean initialImagePut(LocalRegion region, long lastModified, Object newValue, boolean wasRecovered, boolean acceptedVersionTag) throws RegionClearedException; /** @@ -305,9 +304,8 @@ public interface RegionEntry { * INVALID key if currently nonexistant // or invalidate if current recovered. // // must * write-synchronize to protect agains puts from other // threads running this method */ - public boolean initialImageInit(LocalRegion region, long lastModified, Object newValue, - boolean create, boolean wasRecovered, boolean acceptedVersionTag) - throws RegionClearedException; + boolean initialImageInit(LocalRegion region, long lastModified, Object newValue, boolean create, + boolean wasRecovered, boolean acceptedVersionTag) throws RegionClearedException; /** * @param expectedOldValue only succeed with destroy if current value is equal to expectedOldValue @@ -316,22 +314,21 @@ public interface RegionEntry { * @return true if destroy was done; false if not */ @Released - public boolean destroy(LocalRegion region, EntryEventImpl event, boolean inTokenMode, - boolean cacheWrite, @Unretained Object expectedOldValue, boolean forceDestroy, - boolean removeRecoveredEntry) + boolean destroy(LocalRegion region, EntryEventImpl event, boolean inTokenMode, boolean cacheWrite, + @Unretained Object expectedOldValue, boolean forceDestroy, boolean removeRecoveredEntry) throws CacheWriterException, EntryNotFoundException, TimeoutException, RegionClearedException; /** * @return true if entry's value came from a netsearch * @since GemFire 6.5 */ - public boolean getValueWasResultOfSearch(); + boolean getValueWasResultOfSearch(); /** * @param v true if entry's value should be marked as having been the result of a netsearch. * @since GemFire 6.5 */ - public void setValueResultOfSearch(boolean v); + void setValueResultOfSearch(boolean v); /** * Get the serialized bytes from disk. This method only looks for the value on the disk, ignoring @@ -341,13 +338,13 @@ public interface RegionEntry { * @return the serialized value from disk * @since GemFire 5.7 */ - public Object getSerializedValueOnDisk(LocalRegion localRegion); + Object getSerializedValueOnDisk(LocalRegion localRegion); /** * Gets the value for this entry. For DiskRegions, unlike {@link #getValue(RegionEntryContext)} * this will not fault in the value rather return a temporary copy. */ - public Object getValueInVMOrDiskWithoutFaultIn(LocalRegion owner); + Object getValueInVMOrDiskWithoutFaultIn(LocalRegion owner); /** * Gets the value for this entry. For DiskRegions, unlike {@link #getValue(RegionEntryContext)} @@ -355,7 +352,7 @@ public interface RegionEntry { * kept off heap (and compressed) if possible. */ @Retained - public Object getValueOffHeapOrDiskWithoutFaultIn(LocalRegion owner); + Object getValueOffHeapOrDiskWithoutFaultIn(LocalRegion owner); /** * RegionEntry is underUpdate as soon as RegionEntry lock is help by an update thread to put a new @@ -364,7 +361,7 @@ public interface RegionEntry { * * @return true if RegionEntry is under update during cache put operation. */ - public boolean isUpdateInProgress(); + boolean isUpdateInProgress(); /** * Sets RegionEntry updateInProgress flag when put is happening for an existing Region.Entry. @@ -372,7 +369,7 @@ public interface RegionEntry { * * @param underUpdate */ - public void setUpdateInProgress(final boolean underUpdate); + void setUpdateInProgress(final boolean underUpdate); /** * Event containing this RegionEntry is being passed through dispatchListenerEvent for @@ -381,7 +378,7 @@ public interface RegionEntry { * * @return true if Event is being dispatched to CacheListeners. */ - public boolean isCacheListenerInvocationInProgress(); + boolean isCacheListenerInvocationInProgress(); /** * Sets RegionEntry isCacheListenerInvoked flag when put is happening for a Region.Entry. Called @@ -389,74 +386,74 @@ public interface RegionEntry { * * @param isListenerInvoked */ - public void setCacheListenerInvocationInProgress(final boolean isListenerInvoked); + void setCacheListenerInvocationInProgress(final boolean isListenerInvoked); /** * Returns true if the entry value is null. */ - public boolean isValueNull(); + boolean isValueNull(); /** * Returns true if the entry value is equal to {@link Token#INVALID} or * {@link Token#LOCAL_INVALID}. */ - public boolean isInvalid(); + boolean isInvalid(); /** * Returns true if the entry value is equal to {@link Token#DESTROYED}. */ - public boolean isDestroyed(); + boolean isDestroyed(); /** * Returns true if the entry value is equal to {@link Token#DESTROYED} or * {@link Token#REMOVED_PHASE1} or {@link Token#REMOVED_PHASE2} or {@link Token#TOMBSTONE}. */ - public boolean isDestroyedOrRemoved(); + boolean isDestroyedOrRemoved(); /** * Returns true if the entry value is equal to {@link Token#DESTROYED} or * {@link Token#REMOVED_PHASE1} or {@link Token#REMOVED_PHASE2}. */ - public boolean isDestroyedOrRemovedButNotTombstone(); + boolean isDestroyedOrRemovedButNotTombstone(); /** * @see Token#isInvalidOrRemoved(Object) */ - public boolean isInvalidOrRemoved(); + boolean isInvalidOrRemoved(); /** * Sets the entry value to null. */ - public void setValueToNull(); + void setValueToNull(); - public void returnToPool(); + void returnToPool(); - public boolean isInUseByTransaction(); + boolean isInUseByTransaction(); - public void setInUseByTransaction(final boolean v); + void setInUseByTransaction(final boolean v); /** * Increments the number of transactions that are currently referencing this node. */ - public void incRefCount(); + void incRefCount(); /** * Decrements the number of transactions that are currently referencing this node. * * @param lr the local region that owns this region entry; null if no local region owner */ - public void decRefCount(NewLRUClockHand lruList, LocalRegion lr); + void decRefCount(NewLRUClockHand lruList, LocalRegion lr); /** * Clear the number of transactions that are currently referencing this node and returns to LRU * list */ - public void resetRefCount(NewLRUClockHand lruList); + void resetRefCount(NewLRUClockHand lruList); @Retained(ABSTRACT_REGION_ENTRY_PREPARE_VALUE_FOR_CACHE) - public Object prepareValueForCache(RegionEntryContext r, Object val, boolean isEntryUpdate); + Object prepareValueForCache(RegionEntryContext r, Object val, boolean isEntryUpdate); @Retained(ABSTRACT_REGION_ENTRY_PREPARE_VALUE_FOR_CACHE) - public Object prepareValueForCache(RegionEntryContext r, Object val, EntryEventImpl event, + Object prepareValueForCache(RegionEntryContext r, Object val, EntryEventImpl event, boolean isEntryUpdate); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntryContext.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntryContext.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntryContext.java index 2ed674f..a0a4222 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntryContext.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntryContext.java @@ -23,18 +23,17 @@ import org.apache.geode.compression.Compressor; * @since GemFire 8.0 */ public interface RegionEntryContext extends HasCachePerfStats { - public static final String DEFAULT_COMPRESSION_PROVIDER = - "org.apache.geode.compression.SnappyCompressor"; + String DEFAULT_COMPRESSION_PROVIDER = "org.apache.geode.compression.SnappyCompressor"; /** * Returns the compressor to be used by this region entry when storing the entry value. * * @return null if no compressor is assigned or available for the entry. */ - public Compressor getCompressor(); + Compressor getCompressor(); /** * Returns true if region entries are stored off heap. */ - public boolean getOffHeap(); + boolean getOffHeap(); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntryFactory.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntryFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntryFactory.java index c30d0c8..037c09d 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntryFactory.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntryFactory.java @@ -29,21 +29,21 @@ public interface RegionEntryFactory { * * @return the created entry */ - public RegionEntry createEntry(RegionEntryContext context, Object key, Object value); + RegionEntry createEntry(RegionEntryContext context, Object key, Object value); /** * @return the Class that each entry, of this factory, is an instance of */ - public Class getEntryClass(); + Class getEntryClass(); /** * @return return the versioned equivalent of this RegionEntryFactory */ - public RegionEntryFactory makeVersioned(); + RegionEntryFactory makeVersioned(); /** * Return the equivalent on heap version of this entry factory. This is used for creating * temporary region entries that shouldn't be stored off heap. */ - public RegionEntryFactory makeOnHeap(); + RegionEntryFactory makeOnHeap(); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/RegionListener.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionListener.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionListener.java index 607e86a..9495d4f 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionListener.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionListener.java @@ -35,11 +35,11 @@ public interface RegionListener { * modifications. InternalRegionArguments *may* be modified, but only if you are sure the caller * is not going to reuse the InternalRegionArguments for something else. */ - public RegionAttributes beforeCreate(Region parent, String regionName, RegionAttributes attrs, + RegionAttributes beforeCreate(Region parent, String regionName, RegionAttributes attrs, InternalRegionArguments internalRegionArgs); /** * Invoked after a region is created. */ - public void afterCreate(Region region); + void afterCreate(Region region); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMap.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMap.java index 7ecabd7..67ab8f4 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMap.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMap.java @@ -48,7 +48,7 @@ public interface RegionMap extends LRUMapCallbacks { * Parameter object used to facilitate construction of an EntriesMap. Modification of fields after * the map is constructed has no effect. */ - static class Attributes { + class Attributes { /** * The initial capacity. The implementation performs internal sizing to accommodate this many * elements. @@ -71,48 +71,48 @@ public interface RegionMap extends LRUMapCallbacks { // boolean lru = false; } - public RegionEntryFactory getEntryFactory(); + RegionEntryFactory getEntryFactory(); /** * This method should be called before region is initialized to ensure there is no mix of region * entries */ - public void setEntryFactory(RegionEntryFactory f); + void setEntryFactory(RegionEntryFactory f); /** * Gets the attributes that this map was created with. */ - public Attributes getAttributes(); + Attributes getAttributes(); /** * Tells this map what region owns it. */ - public void setOwner(Object r); + void setOwner(Object r); - public void changeOwner(LocalRegion r); + void changeOwner(LocalRegion r); - public int size(); + int size(); - public boolean isEmpty(); + boolean isEmpty(); /** * @return number of entries cached in the backing CHM */ - public int sizeInVM(); + int sizeInVM(); - public Set keySet(); + Set keySet(); /** * Returns a collection of RegionEntry instances. */ - public Collection<RegionEntry> regionEntries(); + Collection<RegionEntry> regionEntries(); /** * Returns a collection of RegionEntry instances from memory only. */ - public Collection<RegionEntry> regionEntriesInVM(); + Collection<RegionEntry> regionEntriesInVM(); - public boolean containsKey(Object key); + boolean containsKey(Object key); /** * fetches the entry from the backing ConcurrentHashMap @@ -120,9 +120,9 @@ public interface RegionMap extends LRUMapCallbacks { * @param key * @return the RegionEntry from memory or disk */ - public RegionEntry getEntry(Object key); + RegionEntry getEntry(Object key); - public RegionEntry putEntryIfAbsent(Object key, RegionEntry re); + RegionEntry putEntryIfAbsent(Object key, RegionEntry re); /** * fetches the entry from the backing ConcurrentHashMap. @@ -130,7 +130,7 @@ public interface RegionMap extends LRUMapCallbacks { * @param key * @return the RegionEntry from memory */ - public RegionEntry getEntryInVM(Object key); + RegionEntry getEntryInVM(Object key); /** * fetches the entry from the backing ConcurrentHashMap only if the entry is considered to be in @@ -139,7 +139,7 @@ public interface RegionMap extends LRUMapCallbacks { * @param key * @return the RegionEntry in operational data */ - public RegionEntry getOperationalEntryInVM(Object key); + RegionEntry getOperationalEntryInVM(Object key); // /** // * Removes any entry associated with <code>key</code>. @@ -158,7 +158,7 @@ public interface RegionMap extends LRUMapCallbacks { * Clear the region and, if the parameter rvv is not null, return a collection of the IDs of * version sources that are still in the map when the operation completes. */ - public Set<VersionSource> clear(RegionVersionVector rvv); + Set<VersionSource> clear(RegionVersionVector rvv); /** * Used by disk regions when recovering data from backup. Currently this "put" is done at a very @@ -166,7 +166,7 @@ public interface RegionMap extends LRUMapCallbacks { * * @return the created RegionEntry or null if entry already existed */ - public RegionEntry initRecoveredEntry(Object key, DiskEntry.RecoveredEntry value); + RegionEntry initRecoveredEntry(Object key, DiskEntry.RecoveredEntry value); /** * Used by disk regions when recovering data from backup and initRecoveredEntry has already been @@ -175,7 +175,7 @@ public interface RegionMap extends LRUMapCallbacks { * * @return the updated RegionEntry */ - public RegionEntry updateRecoveredEntry(Object key, DiskEntry.RecoveredEntry value); + RegionEntry updateRecoveredEntry(Object key, DiskEntry.RecoveredEntry value); /** * Used to modify an existing RegionEntry or create a new one when processing the values obtained @@ -186,9 +186,9 @@ public interface RegionMap extends LRUMapCallbacks { * @param sender the sender of the initial image, if IIO. Not needed on clients * @param forceValue TODO */ - public boolean initialImagePut(Object key, long lastModified, Object newValue, - boolean wasRecovered, boolean deferLRUCallback, VersionTag entryVersion, - InternalDistributedMember sender, boolean forceValue); + boolean initialImagePut(Object key, long lastModified, Object newValue, boolean wasRecovered, + boolean deferLRUCallback, VersionTag entryVersion, InternalDistributedMember sender, + boolean forceValue); /** * Destroy an entry the map. @@ -207,8 +207,8 @@ public interface RegionMap extends LRUMapCallbacks { * @see CacheCallback * @see AbstractLRURegionMap */ - public boolean destroy(EntryEventImpl event, boolean inTokenMode, boolean duringRI, - boolean cacheWrite, boolean isEviction, Object expectedOldValue, boolean removeRecoveredEntry) + boolean destroy(EntryEventImpl event, boolean inTokenMode, boolean duringRI, boolean cacheWrite, + boolean isEviction, Object expectedOldValue, boolean removeRecoveredEntry) throws CacheWriterException, EntryNotFoundException, TimeoutException; /** @@ -219,10 +219,10 @@ public interface RegionMap extends LRUMapCallbacks { * mode in that it doesn't leave an Invalid token in the cache. * @return true if invalidate was done */ - public boolean invalidate(EntryEventImpl event, boolean invokeCallbacks, boolean forceNewEntry, + boolean invalidate(EntryEventImpl event, boolean invokeCallbacks, boolean forceNewEntry, boolean forceCallbacks) throws EntryNotFoundException; - public void evictValue(Object key); + void evictValue(Object key); /** * @param event the event object for this operation, with the exception that the oldValue @@ -242,7 +242,7 @@ public interface RegionMap extends LRUMapCallbacks { * because there is a DESTROYED token present then the entry flag blockedDestroyed is set. * @return null if put was not done; otherwise reference to put entry */ - public RegionEntry basicPut(EntryEventImpl event, long lastModified, boolean ifNew, boolean ifOld, + RegionEntry basicPut(EntryEventImpl event, long lastModified, boolean ifNew, boolean ifOld, Object expectedOldValue, boolean requireOldValue, boolean overwriteDestroyed) throws CacheWriterException, TimeoutException; @@ -250,13 +250,13 @@ public interface RegionMap extends LRUMapCallbacks { * Write synchronizes the given entry and invokes the runable while holding the lock. Does nothing * if the entry does not exist. */ - public void writeSyncIfPresent(Object key, Runnable runner); + void writeSyncIfPresent(Object key, Runnable runner); /** * Remove the entry with the given key if it has been marked as destroyed This is currently used * in the cleanup phase of getInitialImage. */ - public void removeIfDestroyed(Object key); + void removeIfDestroyed(Object key); /** * @param key the key of the entry to destroy @@ -277,8 +277,8 @@ public interface RegionMap extends LRUMapCallbacks { * @param tailKey when not -1, it is the tailKey generated on near-side to be associated with * entry on far-side for WAN */ - public void txApplyDestroy(Object key, TransactionId rmtOrigin, TXRmtEvent event, - boolean inTokenMode, boolean inRI, Operation op, EventID eventId, Object aCallbackArgument, + void txApplyDestroy(Object key, TransactionId rmtOrigin, TXRmtEvent event, boolean inTokenMode, + boolean inRI, Operation op, EventID eventId, Object aCallbackArgument, List<EntryEventImpl> pendingCallbacks, FilterRoutingInfo filterRoutingInfo, ClientProxyMembershipID bridgeContext, boolean isOperationRemote, TXEntryState txEntryState, VersionTag versionTag, long tailKey); @@ -299,11 +299,11 @@ public interface RegionMap extends LRUMapCallbacks { * @param tailKey when not -1, it is the tailKey generated on near-side to be associated with * entry on far-side for WAN */ - public void txApplyInvalidate(Object key, Object newValue, boolean didDestroy, - TransactionId rmtOrigin, TXRmtEvent event, boolean localOp, EventID eventId, - Object aCallbackArgument, List<EntryEventImpl> pendingCallbacks, - FilterRoutingInfo filterRoutingInfo, ClientProxyMembershipID bridgeContext, - TXEntryState txEntryState, VersionTag versionTag, long tailKey); + void txApplyInvalidate(Object key, Object newValue, boolean didDestroy, TransactionId rmtOrigin, + TXRmtEvent event, boolean localOp, EventID eventId, Object aCallbackArgument, + List<EntryEventImpl> pendingCallbacks, FilterRoutingInfo filterRoutingInfo, + ClientProxyMembershipID bridgeContext, TXEntryState txEntryState, VersionTag versionTag, + long tailKey); /** * @param putOp describes the operation that did the put @@ -321,7 +321,7 @@ public interface RegionMap extends LRUMapCallbacks { * @param tailKey when not -1, it is the tailKey generated on near-side to be associated with * entry on far-side for WAN */ - public void txApplyPut(Operation putOp, Object key, Object newValue, boolean didDestroy, + void txApplyPut(Operation putOp, Object key, Object newValue, boolean didDestroy, TransactionId rmtOrigin, TXRmtEvent event, EventID eventId, Object aCallbackArgument, List<EntryEventImpl> pendingCallbacks, FilterRoutingInfo filterRoutingInfo, ClientProxyMembershipID bridgeContext, TXEntryState txEntryState, VersionTag versionTag, @@ -330,16 +330,16 @@ public interface RegionMap extends LRUMapCallbacks { /** * removes the given key if the enclosing RegionEntry is still in this map */ - public void removeEntry(Object key, RegionEntry value, boolean updateStats); + void removeEntry(Object key, RegionEntry value, boolean updateStats); /** * Removes the given key if the enclosing RegionEntry is still in this map for the given * EntryEvent */ - public void removeEntry(Object key, RegionEntry re, boolean updateStat, EntryEventImpl event, + void removeEntry(Object key, RegionEntry re, boolean updateStat, EntryEventImpl event, LocalRegion owner); - public void copyRecoveredEntries(RegionMap rm); + void copyRecoveredEntries(RegionMap rm); /** * Removes an entry that was previously destroyed and made into a tombstone. @@ -350,7 +350,7 @@ public interface RegionMap extends LRUMapCallbacks { * @param isScheduledTombstone TODO * @return true if the tombstone entry was removed from the entry map */ - public boolean removeTombstone(RegionEntry re, VersionHolder destroyedVersion, boolean isEviction, + boolean removeTombstone(RegionEntry re, VersionHolder destroyedVersion, boolean isEviction, boolean isScheduledTombstone); /** @@ -360,22 +360,22 @@ public interface RegionMap extends LRUMapCallbacks { * @param destroyedVersion the version that was destroyed * @return true of the tombstone is no longer needed (entry was resurrected or evicted) */ - public boolean isTombstoneNotNeeded(RegionEntry re, int destroyedVersion); + boolean isTombstoneNotNeeded(RegionEntry re, int destroyedVersion); - public void updateEntryVersion(EntryEventImpl event); + void updateEntryVersion(EntryEventImpl event); /** * Decrements the transaction reference count. Some features, like eviction and expiration, will * not modify an entry while it is referenced by a transaction. */ - public void decTxRefCount(RegionEntry e); + void decTxRefCount(RegionEntry e); - public void close(); + void close(); default void lockRegionForAtomicTX(LocalRegion r) {} default void unlockRegionForAtomicTX(LocalRegion r) {} - public ARMLockTestHook getARMLockTestHook(); + ARMLockTestHook getARMLockTestHook(); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/RegionQueue.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionQueue.java index 36684cd..5061b97 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionQueue.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionQueue.java @@ -30,7 +30,7 @@ public interface RegionQueue { /** * A token used to signify this is a WAN queue. It is set in the callback argument. */ - public static final String WAN_QUEUE_TOKEN = "WAN_QUEUE_TOKEN"; + String WAN_QUEUE_TOKEN = "WAN_QUEUE_TOKEN"; /** * Puts an object onto the tail of the queue @@ -41,12 +41,12 @@ public interface RegionQueue { * @throws CacheException * @return boolean whether object was successfully put onto the queue */ - public boolean put(Object object) throws InterruptedException, CacheException; + boolean put(Object object) throws InterruptedException, CacheException; /** * Returns the underlying region that backs this queue. */ - public Region getRegion(); + Region getRegion(); /** * Takes the first object from the head of the queue. This method returns null if there are no @@ -57,7 +57,7 @@ public interface RegionQueue { * @throws CacheException * @throws InterruptedException */ - public Object take() throws CacheException, InterruptedException; + Object take() throws CacheException, InterruptedException; /** * Takes up to batchSize number of objects from the head of the queue. As soon as it gets a null @@ -70,7 +70,7 @@ public interface RegionQueue { * @throws CacheException * @throws InterruptedException */ - public List take(int batchSize) throws CacheException, InterruptedException; + List take(int batchSize) throws CacheException, InterruptedException; /** * Removes a single object from the head of the queue without returning it. This method assumes @@ -79,7 +79,7 @@ public interface RegionQueue { * @throws InterruptedException * @throws CacheException */ - public void remove() throws InterruptedException, CacheException; + void remove() throws InterruptedException, CacheException; /** * Peeks the first object from the head of the queue without removing it. This method returns null @@ -89,7 +89,7 @@ public interface RegionQueue { * @throws InterruptedException * @throws CacheException */ - public Object peek() throws InterruptedException, CacheException; + Object peek() throws InterruptedException, CacheException; /** * Peeks up to batchSize number of objects from the head of the queue without removing them. As @@ -101,7 +101,7 @@ public interface RegionQueue { * @throws InterruptedException * @throws CacheException */ - public List peek(int batchSize) throws InterruptedException, CacheException; + List peek(int batchSize) throws InterruptedException, CacheException; /** * Peeks either a batchSize number of elements from the queue or until timeToWait milliseconds @@ -117,29 +117,29 @@ public interface RegionQueue { * @throws CacheException * */ - public List peek(int batchSize, int timeToWait) throws InterruptedException, CacheException; + List peek(int batchSize, int timeToWait) throws InterruptedException, CacheException; /** * Returns the size of the queue * * @return the size of the queue */ - public int size(); + int size(); /** * Add a <code>CacheListener</code> to the queue * * @param listener The <code>CacheListener</code> to add */ - public void addCacheListener(CacheListener listener); + void addCacheListener(CacheListener listener); /** * Remove the <code>CacheListener</code> from the queue */ - public void removeCacheListener(); + void removeCacheListener(); // TODO:Asif: Remove this method. Added this justto make it compilable - public void remove(int top) throws CacheException; + void remove(int top) throws CacheException; - public void close(); + void close(); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/SerializationHelper.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/SerializationHelper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/SerializationHelper.java index 737b55d..7398dd3 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/SerializationHelper.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/SerializationHelper.java @@ -16,8 +16,8 @@ package org.apache.geode.internal.cache; public interface SerializationHelper { - public byte[] convertObject2Bytes(Object obj); + byte[] convertObject2Bytes(Object obj); - public Object convertBytes2Object(byte[] objBytes); + Object convertBytes2Object(byte[] objBytes); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryStateFactory.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryStateFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryStateFactory.java index 2ca0867..59911fa 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryStateFactory.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntryStateFactory.java @@ -27,9 +27,9 @@ public interface TXEntryStateFactory { * * @return the created entry */ - public TXEntryState createEntry(); + TXEntryState createEntry(); - public TXEntryState createEntry(RegionEntry re, Object vId, Object pendingValue, Object entryKey, + TXEntryState createEntry(RegionEntry re, Object vId, Object pendingValue, Object entryKey, TXRegionState txrs, boolean isDistributed); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateInterface.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateInterface.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateInterface.java index 3bafeba..41b908f 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateInterface.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateInterface.java @@ -38,31 +38,31 @@ import org.apache.geode.internal.cache.tx.TransactionalOperation.ServerRegionOpe */ public interface TXStateInterface extends Synchronization, InternalDataView { - public TransactionId getTransactionId(); + TransactionId getTransactionId(); /** * Used by transaction operations that are doing a read operation on the specified region. * * @return the TXRegionState for the given LocalRegion or null if no state exists */ - public TXRegionState readRegion(LocalRegion r); + TXRegionState readRegion(LocalRegion r); /** * Used by transaction operations that are doing a write operation on the specified region. * * @return the TXRegionState for the given LocalRegion */ - public TXRegionState writeRegion(LocalRegion r); + TXRegionState writeRegion(LocalRegion r); /** * Returns a nanotimer timestamp that marks when begin was called on this transaction. */ - public long getBeginTime(); + long getBeginTime(); /** * Returns the number of changes this transaction would have made if it successfully committed. */ - public int getChanges(); + int getChanges(); /** * Determines if a transaction is in progress. Transactions are in progress until they commit or @@ -70,41 +70,40 @@ public interface TXStateInterface extends Synchronization, InternalDataView { * * @return true if this transaction has completed. */ - public boolean isInProgress(); + boolean isInProgress(); /** * Returns the next modification serial number. Note this method is not thread safe but does not * need to be since a single thread owns a transaction. */ - public int nextModSerialNum(); + int nextModSerialNum(); /** * Return true if mod counts for this transaction can not be represented by a byte * * @since GemFire 5.0 */ - public boolean needsLargeModCount(); + boolean needsLargeModCount(); /* * Only applicable for Distributed transaction. */ - public void precommit() - throws CommitConflictException, UnsupportedOperationInTransactionException; + void precommit() throws CommitConflictException, UnsupportedOperationInTransactionException; - public void commit() throws CommitConflictException; + void commit() throws CommitConflictException; - public void rollback(); + void rollback(); - public List getEvents(); + List getEvents(); /** Implement TransactionEvent's getCache */ - public Cache getCache(); + Cache getCache(); - public Collection<LocalRegion> getRegions(); + Collection<LocalRegion> getRegions(); - public void invalidateExistingEntry(final EntryEventImpl event, boolean invokeCallbacks, + void invalidateExistingEntry(final EntryEventImpl event, boolean invokeCallbacks, boolean forceNewEntry); /** @@ -114,24 +113,24 @@ public interface TXStateInterface extends Synchronization, InternalDataView { * @return a Region.Entry if it exists either in committed state or in transactional state, * otherwise returns null */ - public Entry getEntry(final KeyInfo keyInfo, final LocalRegion region, boolean allowTombstones); + Entry getEntry(final KeyInfo keyInfo, final LocalRegion region, boolean allowTombstones); /** * @param keyInfo * @param localRegion * @param updateStats TODO */ - public Object getDeserializedValue(KeyInfo keyInfo, LocalRegion localRegion, boolean updateStats, + Object getDeserializedValue(KeyInfo keyInfo, LocalRegion localRegion, boolean updateStats, boolean disableCopyOnRead, boolean preferCD, EntryEventImpl clientEvent, boolean returnTombstones, boolean retainResult); - public TXEvent getEvent(); + TXEvent getEvent(); - public TXRegionState txWriteRegion(final LocalRegion localRegion, final KeyInfo entryKey); + TXRegionState txWriteRegion(final LocalRegion localRegion, final KeyInfo entryKey); - public TXRegionState txReadRegion(LocalRegion localRegion); + TXRegionState txReadRegion(LocalRegion localRegion); - public boolean txPutEntry(final EntryEventImpl event, boolean ifNew, boolean requireOldValue, + boolean txPutEntry(final EntryEventImpl event, boolean ifNew, boolean requireOldValue, boolean checkResources, Object expectedOldValue); /** @@ -143,10 +142,10 @@ public interface TXStateInterface extends Synchronization, InternalDataView { * @return a txEntryState or null if the entry doesn't exist in the transaction and/or committed * state. */ - public TXEntryState txReadEntry(KeyInfo entryKey, LocalRegion localRegion, boolean rememberRead, + TXEntryState txReadEntry(KeyInfo entryKey, LocalRegion localRegion, boolean rememberRead, boolean createTxEntryIfAbsent); - public void rmRegion(LocalRegion r); + void rmRegion(LocalRegion r); /** * @@ -154,13 +153,13 @@ public interface TXStateInterface extends Synchronization, InternalDataView { * @return true if transaction is in progress and the given state has the same identity as this * instance */ - public boolean isInProgressAndSameAs(TXStateInterface state); + boolean isInProgressAndSameAs(TXStateInterface state); /** * * @return true if callbacks should be fired for this TXState */ - public boolean isFireCallbacks(); + boolean isFireCallbacks(); /** * On the remote node, the tx can potentially be accessed by multiple threads, specially with @@ -168,58 +167,58 @@ public interface TXStateInterface extends Synchronization, InternalDataView { * * @return the lock to be used */ - public ReentrantLock getLock(); + ReentrantLock getLock(); - public boolean isRealDealLocal(); + boolean isRealDealLocal(); - public boolean isMemberIdForwardingRequired(); + boolean isMemberIdForwardingRequired(); - public InternalDistributedMember getOriginatingMember(); + InternalDistributedMember getOriginatingMember(); - public TXCommitMessage getCommitMessage(); + TXCommitMessage getCommitMessage(); /** * perform additional tasks to suspend a transaction */ - public void suspend(); + void suspend(); /** * perform additional tasks to resume a suspended transaction */ - public void resume(); + void resume(); /** * record a transactional operation for possible later replay */ - public void recordTXOperation(ServerRegionDataAccess region, ServerRegionOperation op, Object key, + void recordTXOperation(ServerRegionDataAccess region, ServerRegionOperation op, Object key, Object arguments[]); - public void close(); + void close(); /* * Determine if its TxState or not */ - public boolean isTxState(); + boolean isTxState(); /* * Determine if is TxStateStub or not */ - public boolean isTxStateStub(); + boolean isTxStateStub(); /* * Determine if is TxStateProxy or not */ - public boolean isTxStateProxy(); + boolean isTxStateProxy(); /* * Is class related to Distributed Transaction, and not colocated transaction */ - public boolean isDistTx(); + boolean isDistTx(); /* * Is class meant for Coordinator for Distributed Transaction * * Will be true for DistTXCoordinatorInterface */ - public boolean isCreatedOnDistTxCoordinator(); + boolean isCreatedOnDistTxCoordinator(); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxy.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxy.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxy.java index d392c41..951fbe1 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxy.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxy.java @@ -29,29 +29,29 @@ import org.apache.geode.internal.cache.tx.TransactionalOperation.ServerRegionOpe */ public interface TXStateProxy extends TXStateInterface { - public void checkJTA(String errmsg) throws IllegalStateException; + void checkJTA(String errmsg) throws IllegalStateException; - public void setIsJTA(boolean isJTA); + void setIsJTA(boolean isJTA); - public TXId getTxId(); + TXId getTxId(); - public TXManagerImpl getTxMgr(); + TXManagerImpl getTxMgr(); - public void setLocalTXState(TXStateInterface state); + void setLocalTXState(TXStateInterface state); - public void setTarget(DistributedMember target); + void setTarget(DistributedMember target); - public DistributedMember getTarget(); + DistributedMember getTarget(); - public boolean isCommitOnBehalfOfRemoteStub(); + boolean isCommitOnBehalfOfRemoteStub(); - public boolean setCommitOnBehalfOfRemoteStub(boolean requestedByOwner); + boolean setCommitOnBehalfOfRemoteStub(boolean requestedByOwner); - public boolean isOnBehalfOfClient(); + boolean isOnBehalfOfClient(); - public boolean isJCATransaction(); + boolean isJCATransaction(); - public void setJCATransaction(); + void setJCATransaction(); /** * establishes the synchronization thread used for client/server beforeCompletion/afterCompletion @@ -59,32 +59,32 @@ public interface TXStateProxy extends TXStateInterface { * * @param sync */ - public void setSynchronizationRunnable(TXSynchronizationRunnable sync); + void setSynchronizationRunnable(TXSynchronizationRunnable sync); - public TXSynchronizationRunnable getSynchronizationRunnable(); + TXSynchronizationRunnable getSynchronizationRunnable(); /** * Called by {@link TXManagerImpl#internalSuspend()} to perform additional tasks required to * suspend a transaction */ - public void suspend(); + void suspend(); /** * Called by {@link TXManagerImpl#internalResume(TXStateProxy)} to perform additional tasks * required to resume a transaction */ - public void resume(); + void resume(); /** * record a client-side transactional operation for possible later replay */ - public void recordTXOperation(ServerRegionDataAccess proxy, ServerRegionOperation op, Object key, + void recordTXOperation(ServerRegionDataAccess proxy, ServerRegionOperation op, Object key, Object[] arguments); /** * @return the number of operations performed in this transaction */ - public int operationCount(); + int operationCount(); /** * During client transaction failover, it is possible to get two Commit (rollback) requests for a @@ -93,7 +93,7 @@ public interface TXStateProxy extends TXStateInterface { * * @param progress */ - public void setInProgress(boolean progress); + void setInProgress(boolean progress); - public void updateProxyServer(InternalDistributedMember proxy); + void updateProxyServer(InternalDistributedMember proxy); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/TransactionMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TransactionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TransactionMessage.java index a9970c2..33912cd 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/TransactionMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TransactionMessage.java @@ -30,14 +30,14 @@ public interface TransactionMessage { * * @return the unique transaction id per sender */ - public int getTXUniqId(); + int getTXUniqId(); /** * Returns the member id of the originating member for this transaction * * @return memberId of tx originator */ - public InternalDistributedMember getMemberToMasqueradeAs(); + InternalDistributedMember getMemberToMasqueradeAs(); /** @@ -46,30 +46,30 @@ public interface TransactionMessage { * * @return true if this message can start a remote transaction, false otherwise */ - public boolean canStartRemoteTransaction(); + boolean canStartRemoteTransaction(); /** * @see DistributionMessage#getSender() * @return the sender of this message */ - public InternalDistributedMember getSender(); + InternalDistributedMember getSender(); /** * Gets the MemberId of the originating member of the transaction that this message is a part of. * * @return the memberId of the client that started this transaction, or null if not from client */ - public InternalDistributedMember getTXOriginatorClient(); + InternalDistributedMember getTXOriginatorClient(); /** * Messages that do not want to participate in transactions return false. e.g. * <code>ManageBucketMessage</code> */ - public boolean canParticipateInTransaction(); + boolean canParticipateInTransaction(); /** * Messages that participate in distributed transaction return true, others return false */ - public boolean isTransactionDistributed(); + boolean isTransactionDistributed(); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/TxEntryFactory.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TxEntryFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TxEntryFactory.java index 22a9458..217ecd0 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/TxEntryFactory.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TxEntryFactory.java @@ -24,9 +24,9 @@ public interface TxEntryFactory { * * @return the created entry */ - public TXEntry createEntry(LocalRegion localRegion, KeyInfo key, TXStateInterface tx); + TXEntry createEntry(LocalRegion localRegion, KeyInfo key, TXStateInterface tx); - public TXEntry createEntry(LocalRegion localRegion, KeyInfo key, TXStateInterface tx, + TXEntry createEntry(LocalRegion localRegion, KeyInfo key, TXStateInterface tx, boolean rememberReads); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/control/InternalResourceManager.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/InternalResourceManager.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/InternalResourceManager.java index 48cb34e..ac640b4 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/InternalResourceManager.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/InternalResourceManager.java @@ -414,34 +414,34 @@ public class InternalResourceManager implements ResourceManager { /** * For testing only. Receives callbacks for resource related events. */ - public static interface ResourceObserver { + public interface ResourceObserver { /** * Indicates that rebalancing has started on a given region. * * @param region */ - public void rebalancingStarted(Region region); + void rebalancingStarted(Region region); /** * Indicates that rebalancing has finished on a given region. * * @param region */ - public void rebalancingFinished(Region region); + void rebalancingFinished(Region region); /** * Indicates that recovery has started on a given region. * * @param region */ - public void recoveryStarted(Region region); + void recoveryStarted(Region region); /** * Indicates that recovery has finished on a given region. * * @param region */ - public void recoveryFinished(Region region); + void recoveryFinished(Region region); /** * Indicated that a membership event triggered a recovery operation, but the recovery operation @@ -450,7 +450,7 @@ public class InternalResourceManager implements ResourceManager { * * @param region */ - public void recoveryConflated(PartitionedRegion region); + void recoveryConflated(PartitionedRegion region); /** * Indicates that a bucket is being moved from the source member to the target member. @@ -460,7 +460,7 @@ public class InternalResourceManager implements ResourceManager { * @param source the member the bucket is moving from * @param target the member the bucket is moving to */ - public void movingBucket(Region region, int bucketId, DistributedMember source, + void movingBucket(Region region, int bucketId, DistributedMember source, DistributedMember target); /** @@ -471,7 +471,7 @@ public class InternalResourceManager implements ResourceManager { * @param source the member the bucket primary is moving from * @param target the member the bucket primary is moving to */ - public void movingPrimary(Region region, int bucketId, DistributedMember source, + void movingPrimary(Region region, int bucketId, DistributedMember source, DistributedMember target); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryMonitor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryMonitor.java index 45d60f6..8e84dce 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryMonitor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryMonitor.java @@ -20,19 +20,19 @@ import org.apache.geode.internal.cache.control.MemoryThresholds.MemoryState; * A resource monitor that monitors memory. */ public interface MemoryMonitor extends ResourceMonitor { - public MemoryState getState(); + MemoryState getState(); - public MemoryThresholds getThresholds(); + MemoryThresholds getThresholds(); - public long getBytesUsed(); + long getBytesUsed(); - public boolean hasEvictionThreshold(); + boolean hasEvictionThreshold(); - default public float getCriticalThreshold() { + default float getCriticalThreshold() { return getThresholds().getCriticalThreshold(); } - default public float getEvictionThreshold() { + default float getEvictionThreshold() { return getThresholds().getEvictionThreshold(); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/control/OffHeapMemoryMonitor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/OffHeapMemoryMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/OffHeapMemoryMonitor.java index 17d22ea..bbb62a5 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/OffHeapMemoryMonitor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/OffHeapMemoryMonitor.java @@ -142,16 +142,16 @@ public class OffHeapMemoryMonitor implements MemoryMonitor, MemoryUsageListener /** * Used by unit tests to be notified when OffHeapMemoryMonitor does something. */ - public static interface OffHeapMemoryMonitorObserver { + public interface OffHeapMemoryMonitorObserver { /** * Called at the beginning of updateMemoryUsed. * * @param bytesUsed the number of bytes of off-heap memory currently used * @param willSendEvent true if an event will be sent to the OffHeapMemoryUsageListener. */ - public void beginUpdateMemoryUsed(long bytesUsed, boolean willSendEvent); + void beginUpdateMemoryUsed(long bytesUsed, boolean willSendEvent); - public void afterNotifyUpdateMemoryUsed(long bytesUsed); + void afterNotifyUpdateMemoryUsed(long bytesUsed); /** * Called at the beginning of updateStateAndSendEvent. @@ -159,14 +159,14 @@ public class OffHeapMemoryMonitor implements MemoryMonitor, MemoryUsageListener * @param bytesUsed the number of bytes of off-heap memory currently used * @param willSendEvent true if an event will be sent to the OffHeapMemoryUsageListener. */ - public void beginUpdateStateAndSendEvent(long bytesUsed, boolean willSendEvent); + void beginUpdateStateAndSendEvent(long bytesUsed, boolean willSendEvent); - public void updateStateAndSendEventBeforeProcess(long bytesUsed, MemoryEvent event); + void updateStateAndSendEventBeforeProcess(long bytesUsed, MemoryEvent event); - public void updateStateAndSendEventBeforeAbnormalProcess(long bytesUsed, MemoryEvent event); + void updateStateAndSendEventBeforeAbnormalProcess(long bytesUsed, MemoryEvent event); - public void updateStateAndSendEventIgnore(long bytesUsed, MemoryState oldState, - MemoryState newState, long mostRecentBytesUsed, boolean deliverNextAbnormalEvent); + void updateStateAndSendEventIgnore(long bytesUsed, MemoryState oldState, MemoryState newState, + long mostRecentBytesUsed, boolean deliverNextAbnormalEvent); } @Override http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceEvent.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceEvent.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceEvent.java index 12db985..0e3bec0 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceEvent.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceEvent.java @@ -22,9 +22,9 @@ import org.apache.geode.internal.cache.control.InternalResourceManager.ResourceT * */ public interface ResourceEvent { - public ResourceType getType(); + ResourceType getType(); - public boolean isLocal(); + boolean isLocal(); - public DistributedMember getMember(); + DistributedMember getMember(); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceListener.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceListener.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceListener.java index 581da33..df7fb71 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceListener.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceListener.java @@ -27,5 +27,5 @@ public interface ResourceListener<T extends ResourceEvent> { * * @param event the resource event */ - public void onEvent(T event); + void onEvent(T event); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceMonitor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceMonitor.java index fffefc8..bed1336 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceMonitor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/ResourceMonitor.java @@ -32,17 +32,17 @@ interface ResourceMonitor { * @param listeners Set of listeners of notify. * @param event Event to send to the listeners. */ - public void notifyListeners(final Set<ResourceListener> listeners, final ResourceEvent event); + void notifyListeners(final Set<ResourceListener> listeners, final ResourceEvent event); /** * Ask the monitor to stop monitoring. */ - public void stopMonitoring(); + void stopMonitoring(); /** * Populate the fields in the profile that are appropriate for this monitor. * * @param profile The profile to populate. */ - public void fillInProfile(final ResourceManagerProfile profile); + void fillInProfile(final ResourceManagerProfile profile); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/execute/AbstractExecution.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/AbstractExecution.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/AbstractExecution.java index 399d91f..e7ec241 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/AbstractExecution.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/AbstractExecution.java @@ -80,11 +80,11 @@ public abstract class AbstractExecution implements InternalExecution { */ protected Collection<InternalDistributedMember> executionNodes = null; - public static interface ExecutionNodesListener { + public interface ExecutionNodesListener { - public void afterExecutionNodesSet(AbstractExecution execution); + void afterExecutionNodesSet(AbstractExecution execution); - public void reset(); + void reset(); } protected ExecutionNodesListener executionNodesListener = null; http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalExecution.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalExecution.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalExecution.java index 7e1f17b..528f55e 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalExecution.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalExecution.java @@ -30,7 +30,7 @@ import org.apache.geode.cache.execute.ResultCollector; */ public interface InternalExecution extends Execution { - public InternalExecution withMemberMappedArgument(MemberMappedArgument argument); + InternalExecution withMemberMappedArgument(MemberMappedArgument argument); /** * Specifies a filter of bucketIDs for selecting the GemFire members to execute the function on. @@ -44,7 +44,7 @@ public interface InternalExecution extends Execution { * {@link FunctionService#onRegion(org.apache.geode.cache.Region)} * @since Geode 1.0 */ - public InternalExecution withBucketFilter(Set<Integer> bucketIDs); + InternalExecution withBucketFilter(Set<Integer> bucketIDs); /** * If true, function execution waits for all exceptions from target nodes <br> @@ -52,7 +52,7 @@ public interface InternalExecution extends Execution { * * @param setWaitOnException */ - public void setWaitOnExceptionFlag(boolean setWaitOnException); + void setWaitOnExceptionFlag(boolean setWaitOnException); /** * Sets the exception delivery flag. If set, all exceptions will be forwarded directly to the @@ -62,7 +62,7 @@ public interface InternalExecution extends Execution { * * @param forward true if all exceptions should be forwarded to the <code>ResultCollector</code> */ - public void setForwardExceptions(boolean forward); + void setForwardExceptions(boolean forward); /** * If true, allows results of function execution on groups to be collected in presence of member @@ -73,5 +73,5 @@ public interface InternalExecution extends Execution { * * @param ignore true to collect results */ - public void setIgnoreDepartedMembers(boolean ignore); + void setIgnoreDepartedMembers(boolean ignore); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalRegionFunctionContext.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalRegionFunctionContext.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalRegionFunctionContext.java index 2406ca6..338d73e 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalRegionFunctionContext.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalRegionFunctionContext.java @@ -42,7 +42,7 @@ public interface InternalRegionFunctionContext extends RegionFunctionContext { * * @return a region for efficient reads or null if the region is not a partitioned region */ - public <K, V> Region<K, V> getLocalDataSet(Region<K, V> r); + <K, V> Region<K, V> getLocalDataSet(Region<K, V> r); /** * Return a map of {@link PartitionAttributesFactory#setColocatedWith(String)} colocated Regions @@ -55,7 +55,7 @@ public interface InternalRegionFunctionContext extends RegionFunctionContext { * * @return an unmodifiable map of {@linkplain Region#getFullPath() region name} to {@link Region} */ - public Map<String, LocalDataSet> getColocatedLocalDataSets(); + Map<String, LocalDataSet> getColocatedLocalDataSets(); /** * Get the set of bucket IDs for this node as specified by the {@link #getFilter()} method of the @@ -65,5 +65,5 @@ public interface InternalRegionFunctionContext extends RegionFunctionContext { * * @return the set of bucket IDs for this node in this function context for the given region */ - public <K, V> Set<Integer> getLocalBucketSet(Region<K, V> region); + <K, V> Set<Integer> getLocalBucketSet(Region<K, V> region); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalResultSender.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalResultSender.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalResultSender.java index e273008..1236f70 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalResultSender.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalResultSender.java @@ -22,11 +22,11 @@ import org.apache.geode.cache.execute.ResultSender; */ public interface InternalResultSender extends ResultSender<Object> { - public void enableOrderedResultStreming(boolean enable); + void enableOrderedResultStreming(boolean enable); - public boolean isLocallyExecuted(); + boolean isLocallyExecuted(); - public boolean isLastResultReceived(); + boolean isLastResultReceived(); - public void setException(Throwable t); + void setException(Throwable t); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionContext.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionContext.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionContext.java index 9066746..8062504 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionContext.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionContext.java @@ -29,7 +29,7 @@ import org.apache.geode.cache.execute.FunctionContext; */ public interface MultiRegionFunctionContext extends FunctionContext { - public Set<Region> getRegions(); + Set<Region> getRegions(); /** * Returns a boolean to identify whether this is a re-execute. Returns true if it is a re-execute @@ -40,6 +40,6 @@ public interface MultiRegionFunctionContext extends FunctionContext { * @since GemFire 6.5 * @see Function#isHA() */ - public boolean isPossibleDuplicate(); + boolean isPossibleDuplicate(); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/extension/Extensible.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/extension/Extensible.java b/geode-core/src/main/java/org/apache/geode/internal/cache/extension/Extensible.java index dfc7442..e095a25 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/extension/Extensible.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/extension/Extensible.java @@ -34,6 +34,6 @@ public interface Extensible<T> { * @return {@link ExtensionPoint} for this object. * @since GemFire 8.1 */ - public ExtensionPoint<T> getExtensionPoint(); + ExtensionPoint<T> getExtensionPoint(); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HAContainerWrapper.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HAContainerWrapper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HAContainerWrapper.java index ce59ff7..feca40e 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HAContainerWrapper.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HAContainerWrapper.java @@ -25,21 +25,21 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID; */ public interface HAContainerWrapper extends Map { - public void cleanUp(); + void cleanUp(); - public Object getEntry(Object key); + Object getEntry(Object key); - public Object getKey(Object key); + Object getKey(Object key); - public String getName(); + String getName(); - public ClientProxyMembershipID getProxyID(String haRegionName); + ClientProxyMembershipID getProxyID(String haRegionName); - public Object putProxy(String haRegionName, CacheClientProxy proxy); + Object putProxy(String haRegionName, CacheClientProxy proxy); - public Object removeProxy(String haRegionName); + Object removeProxy(String haRegionName); - public CacheClientProxy getProxy(String haRegionName); + CacheClientProxy getProxy(String haRegionName); - public Object putIfAbsent(Object key, Object value); + Object putIfAbsent(Object key, Object value); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockId.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockId.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockId.java index 0dbba24..3ef0b56 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockId.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockId.java @@ -22,15 +22,15 @@ import org.apache.geode.distributed.internal.membership.*; /** Specifies a set of keys to try-lock within the scope of a region */ public interface TXLockId extends DLockBatchId { /** Gets the member id of the owner of this lock */ - public InternalDistributedMember getMemberId(); + InternalDistributedMember getMemberId(); /** Gets the count that identifies the lock id in this member */ - public int getCount(); + int getCount(); /** Sets the lock grantor id that granted this lock */ - public void setLockGrantorId(LockGrantorId lockGrantorId); + void setLockGrantorId(LockGrantorId lockGrantorId); /** Gets the lock grantor id that granted this lock */ - public LockGrantorId getLockGrantorId(); + LockGrantorId getLockGrantorId(); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXRegionLockRequest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXRegionLockRequest.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXRegionLockRequest.java index b8e1990..d67d80a 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXRegionLockRequest.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXRegionLockRequest.java @@ -23,15 +23,15 @@ import java.util.Set; public interface TXRegionLockRequest extends DataSerializable { /** The full path of the region containing the entries to try-lock */ - public String getRegionFullPath(); + String getRegionFullPath(); /** The entries to try-lock. Returns a set of <code>Object</code> names */ - public Set getKeys(); + Set getKeys(); /** add the key to be locked */ - public void addEntryKey(Object key); + void addEntryKey(Object key); /** add the set of keys to be locked */ - public void addEntryKeys(Set<Object> s); + void addEntryKeys(Set<Object> s); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/lru/EnableLRU.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/EnableLRU.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/EnableLRU.java index 5beae60..f7213a7 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/EnableLRU.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/EnableLRU.java @@ -30,86 +30,86 @@ public interface EnableLRU { /** * return the size of an entry or its worth when constraining the size of an LRU EntriesMap. */ - public int entrySize(Object key, Object value) throws IllegalArgumentException; + int entrySize(Object key, Object value) throws IllegalArgumentException; /** * return the limit for the accumulated entrySize which triggers disposal. */ - public long limit(); + long limit(); /** setup stats for this LRU type, if reset is true, initialize counter on stats to zero. */ - public LRUStatistics initStats(Object region, StatisticsFactory sf); + LRUStatistics initStats(Object region, StatisticsFactory sf); /** return the eviction controller instance this came from */ - public EvictionAlgorithm getEvictionAlgorithm(); + EvictionAlgorithm getEvictionAlgorithm(); /** return the stats object for this eviction controller */ - public LRUStatistics getStats(); + LRUStatistics getStats(); /** * Returns the {@linkplain EvictionAction action} to take when the LRU entry is evicted. */ - public EvictionAction getEvictionAction(); + EvictionAction getEvictionAction(); /** * Returns the statistics for this LRU algorithm */ - public StatisticsType getStatisticsType(); + StatisticsType getStatisticsType(); /** * Returns the name of the statistics for this LRU algorithm */ - public String getStatisticsName(); + String getStatisticsName(); /** * Returns the id of the "limit" statistic for this LRU algorithm's statistics */ - public int getLimitStatId(); + int getLimitStatId(); /** * Returns the id of the "counter" statistic for this LRU algorithm's statistics. */ - public int getCountStatId(); + int getCountStatId(); /** * Returns the id of the "evictions" statistic for this LRU algorithm's statistics. */ - public int getEvictionsStatId(); + int getEvictionsStatId(); /** * Returns the id of the "destroys" statistic for this LRU algorithm's statistics. */ - public int getDestroysStatId(); + int getDestroysStatId(); /** * Returns the id of the "destroysLimit" statistic for this LRU algorithm's statistics */ - public int getDestroysLimitStatId(); + int getDestroysLimitStatId(); /** * Returns the id of the "evaluations" statistic for this LRU algorithm's statistics. */ - public int getEvaluationsStatId(); + int getEvaluationsStatId(); /** * Returns the id of the "greedyReturns" statistic for this LRU algorith'ms statistics * * @return the id */ - public int getGreedyReturnsStatId(); + int getGreedyReturnsStatId(); /** * Returns whether or not there is enough room to accommodate data of the given size based on the * given <code>LRUStatistics</code>. */ - public boolean mustEvict(LRUStatistics stats, Region region, int delta); + boolean mustEvict(LRUStatistics stats, Region region, int delta); /** * Envoked after an entry has been evicted */ - public void afterEviction(); + void afterEviction(); - public boolean lruLimitExceeded(LRUStatistics lruStatistics, DiskRegionView drv); + boolean lruLimitExceeded(LRUStatistics lruStatistics, DiskRegionView drv); } http://git-wip-us.apache.org/repos/asf/geode/blob/7c7b577e/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUClockNode.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUClockNode.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUClockNode.java index b157038..e6f517d 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUClockNode.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUClockNode.java @@ -17,16 +17,16 @@ package org.apache.geode.internal.cache.lru; public interface LRUClockNode { - public void setNextLRUNode(LRUClockNode next); + void setNextLRUNode(LRUClockNode next); - public void setPrevLRUNode(LRUClockNode prev); + void setPrevLRUNode(LRUClockNode prev); - public LRUClockNode nextLRUNode(); + LRUClockNode nextLRUNode(); - public LRUClockNode prevLRUNode(); + LRUClockNode prevLRUNode(); /** compute the new entry size and return the delta from the previous entry size */ - public int updateEntrySize(EnableLRU ccHelper); + int updateEntrySize(EnableLRU ccHelper); /** * compute the new entry size and return the delta from the previous entry size @@ -34,19 +34,19 @@ public interface LRUClockNode { * @param value then entry's value * @since GemFire 6.1.2.9 */ - public int updateEntrySize(EnableLRU ccHelper, Object value); + int updateEntrySize(EnableLRU ccHelper, Object value); - public int getEntrySize(); + int getEntrySize(); - public boolean testRecentlyUsed(); + boolean testRecentlyUsed(); - public void setRecentlyUsed(); + void setRecentlyUsed(); - public void unsetRecentlyUsed(); + void unsetRecentlyUsed(); - public void setEvicted(); + void setEvicted(); - public void unsetEvicted(); + void unsetEvicted(); - public boolean testEvicted(); + boolean testEvicted(); }
