http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUEntry.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUEntry.java index 53be97d..944bd66 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUEntry.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUEntry.java @@ -25,7 +25,7 @@ public interface LRUEntry extends LRUClockNode, RegionEntry { * If the key is stored as an Object then returns that object; but if the key is stored as * primitives then returns null. */ - public Object getKeyForSizing(); + Object getKeyForSizing(); - public void setDelayedDiskId(LocalRegion r); + void setDelayedDiskId(LocalRegion r); }
http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUMapCallbacks.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUMapCallbacks.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUMapCallbacks.java index 0b1cc6f..7d8a24b 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUMapCallbacks.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/LRUMapCallbacks.java @@ -30,27 +30,27 @@ public interface LRUMapCallbacks { * is made. This will then perform the lru removals, or region.localDestroy() calls to make up for * the recent addition. */ - public void lruUpdateCallback(); + void lruUpdateCallback(); - public void lruUpdateCallback(int n); + void lruUpdateCallback(int n); /** * Disables lruUpdateCallback in calling thread * * @return false if it's already disabled */ - public boolean disableLruUpdateCallback(); + boolean disableLruUpdateCallback(); /** * Enables lruUpdateCallback in calling thread */ - public void enableLruUpdateCallback(); + void enableLruUpdateCallback(); /** * if an exception occurs between an LRUEntriesMap put and the call to lruUpdateCallback, then * this must be called to allow the thread to continue to work with other regions. */ - public void resetThreadLocals(); + void resetThreadLocals(); /** * Return true if the lru has exceeded its limit and needs to evict. Note that this method is @@ -58,12 +58,12 @@ public interface LRUMapCallbacks { * * @param drv the disk region whose limit is checked */ - public boolean lruLimitExceeded(DiskRegionView drv); + boolean lruLimitExceeded(DiskRegionView drv); - public void lruCloseStats(); + void lruCloseStats(); /** * Called when an entry is faulted in from disk. */ - public void lruEntryFaultIn(LRUEntry entry); + void lruEntryFaultIn(LRUEntry entry); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/lru/Sizeable.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/Sizeable.java b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/Sizeable.java index 27a3c50..b2672cf 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/lru/Sizeable.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/lru/Sizeable.java @@ -49,12 +49,12 @@ package org.apache.geode.internal.cache.lru; public interface Sizeable { /** The overhead of an object in the VM in bytes */ - public static final int PER_OBJECT_OVERHEAD = 8; // TODO for a 64bit jvm with small oops this is - // 12; for other 64bit jvms it is 16 + int PER_OBJECT_OVERHEAD = 8; // TODO for a 64bit jvm with small oops this is + // 12; for other 64bit jvms it is 16 /** * Returns the size (in bytes) of this object including the {@link #PER_OBJECT_OVERHEAD}. */ - public int getSizeInBytes(); + int getSizeInBytes(); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/Bucket.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/Bucket.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/Bucket.java index 9c31697..2a087fe 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/Bucket.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/Bucket.java @@ -30,31 +30,31 @@ public interface Bucket extends CacheDistributionAdvisee { /** * Returns the distribution and metadata <code>BucketAdvisor</code> for this bucket. */ - public BucketAdvisor getBucketAdvisor(); + BucketAdvisor getBucketAdvisor(); /** * Returns the serial number which identifies the static order in which this bucket was created in * relation to other regions or other instances of this bucket during the life of this JVM. */ - public int getSerialNumber(); + int getSerialNumber(); /** * Returns true if this member is the primary for this bucket. */ - public boolean isPrimary(); + boolean isPrimary(); /** * Returns true if this bucket is currently backed by a * {@link org.apache.geode.internal.cache.BucketRegion}. */ - public boolean isHosting(); + boolean isHosting(); /** * Returns the bucket id used to uniquely identify the bucket in its partitioned region * * @return the unique identity of the bucket */ - public int getId(); + int getId(); /** * Report members that are currently hosting the bucket @@ -62,14 +62,14 @@ public interface Bucket extends CacheDistributionAdvisee { * @return set of members * @since GemFire 5.9 */ - public Set/* InternalDistributedMembers */ getBucketOwners(); + Set/* InternalDistributedMembers */ getBucketOwners(); - public PersistenceAdvisor getPersistenceAdvisor(); + PersistenceAdvisor getPersistenceAdvisor(); - public DiskRegion getDiskRegion(); + DiskRegion getDiskRegion(); /** * Returns the parent {@link PartitionedRegion} of this bucket. */ - public PartitionedRegion getPartitionedRegion(); + PartitionedRegion getPartitionedRegion(); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InternalPRInfo.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InternalPRInfo.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InternalPRInfo.java index 523536e..8ea6247 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InternalPRInfo.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InternalPRInfo.java @@ -30,10 +30,10 @@ public interface InternalPRInfo extends PartitionRegionInfo, Comparable<Internal * * @return set of member details configured for storage space */ - public Set<InternalPartitionDetails> getInternalPartitionDetails(); + Set<InternalPartitionDetails> getInternalPartitionDetails(); /** * Returns a set of members that host a bucket, but are currently offline. */ - public OfflineMemberDetails getOfflineMembers(); + OfflineMemberDetails getOfflineMembers(); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InternalPartitionDetails.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InternalPartitionDetails.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InternalPartitionDetails.java index aa75dbe..898f937 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InternalPartitionDetails.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InternalPartitionDetails.java @@ -29,7 +29,7 @@ public interface InternalPartitionDetails * * @return the load for the partitioned region */ - public PRLoad getPRLoad(); + PRLoad getPRLoad(); /** * Returns the size of the bucket in bytes. @@ -37,6 +37,6 @@ public interface InternalPartitionDetails * @param bucketId the identity of the bucket from 0 to number of buckets -1 * @return the size of the bucket in bytes */ - public long getBucketSize(int bucketId); + long getBucketSize(int bucketId); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/OfflineMemberDetails.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/OfflineMemberDetails.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/OfflineMemberDetails.java index c5b8678..dc89ff5 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/OfflineMemberDetails.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/OfflineMemberDetails.java @@ -28,7 +28,7 @@ import org.apache.geode.internal.cache.persistence.PersistentMemberID; */ public interface OfflineMemberDetails extends DataSerializable { - public static final OfflineMemberDetails EMPTY_DETAILS = new OfflineMemberDetails() { + OfflineMemberDetails EMPTY_DETAILS = new OfflineMemberDetails() { public Set<PersistentMemberID> getOfflineMembers(int bucketId) { return Collections.emptySet(); } @@ -38,5 +38,5 @@ public interface OfflineMemberDetails extends DataSerializable { public void toData(DataOutput out) throws IOException {} }; - public Set<PersistentMemberID> getOfflineMembers(int bucketId); + Set<PersistentMemberID> getOfflineMembers(int bucketId); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PREntriesIterator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PREntriesIterator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PREntriesIterator.java index 28f3cfe..3e21cec 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PREntriesIterator.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PREntriesIterator.java @@ -29,10 +29,10 @@ public interface PREntriesIterator<T> extends Iterator<T> { /** * @return the PartitionedRegion being iterated */ - public PartitionedRegion getPartitionedRegion(); + PartitionedRegion getPartitionedRegion(); /** * @return int bucket ID of the bucket in which the Local Entry resides. */ - public int getBucketId(); + int getBucketId(); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserver.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserver.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserver.java index 7e0d714..c5c0700 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserver.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionObserver.java @@ -28,12 +28,12 @@ public interface PartitionedRegionObserver { /** * This callback is called just before calculating starting bucket id on datastore */ - public void beforeCalculatingStartingBucketId(); + void beforeCalculatingStartingBucketId(); - public void beforeBucketCreation(PartitionedRegion region, int bucketId); + void beforeBucketCreation(PartitionedRegion region, int bucketId); /** * Called after a bucket region is created, but before it is added to the map of buckets. */ - public void beforeAssignBucket(PartitionedRegion partitionedRegion, int bucketId); + void beforeAssignBucket(PartitionedRegion partitionedRegion, int bucketId); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RegionAdvisor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RegionAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RegionAdvisor.java index c473d2d..20d056e 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RegionAdvisor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RegionAdvisor.java @@ -1555,7 +1555,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor { * A visitor interface for the buckets of this region used by * {@link RegionAdvisor#accept(BucketVisitor, Object)}. */ - public static interface BucketVisitor<T> { + public interface BucketVisitor<T> { /** * Visit a given {@link ProxyBucketRegion} accumulating the results in the given aggregate. http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperator.java index d5e1eea..3aa4a0b 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperator.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/BucketOperator.java @@ -75,7 +75,7 @@ public interface BucketOperator { * Wait for any pending asynchronous operations that this thread submitted earlier to complete. * Currently only createRedundantBucket may be asynchronous. */ - public void waitForOperations(); + void waitForOperations(); /** * Callbacks for asnychonous operations. These methods will be invoked when an ansynchronous @@ -85,9 +85,9 @@ public interface BucketOperator { * * They will be completed when createRedundantBucket or waitForOperations is called. */ - public interface Completion { - public void onSuccess(); + interface Completion { + void onSuccess(); - public void onFailure(); + void onFailure(); } } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java index 46c55a0..24479bc 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel.java @@ -1528,15 +1528,14 @@ public class PartitionedRegionLoadModel { } } - public static interface AddressComparor { + public interface AddressComparor { - public boolean enforceUniqueZones(); + boolean enforceUniqueZones(); /** * Return true if the two addresses are equivalent */ - public boolean areSameZone(InternalDistributedMember member1, - InternalDistributedMember member2); + boolean areSameZone(InternalDistributedMember member1, InternalDistributedMember member2); } public static enum RefusalReason { http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/RebalanceDirector.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/RebalanceDirector.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/RebalanceDirector.java index ff530c6..f05cc58 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/RebalanceDirector.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/RebalanceDirector.java @@ -35,20 +35,20 @@ public interface RebalanceDirector { * * @return true if the rebalance should continue. */ - public boolean isRebalanceNecessary(boolean redundancyImpaired, boolean withPersistence); + boolean isRebalanceNecessary(boolean redundancyImpaired, boolean withPersistence); /** * Initialize the director with the model of the PR. This model is gathered from the peers and * passed to this callback before the rebalancing starts. The director can build any initial state * it needs from the model at this point. */ - public void initialize(PartitionedRegionLoadModel model); + void initialize(PartitionedRegionLoadModel model); /** * Called when a membership change has invalidated the old model and created a new model. The * director should switch to the new model and reinitialize it's state as appropriate. */ - public void membershipChanged(PartitionedRegionLoadModel model); + void membershipChanged(PartitionedRegionLoadModel model); /** * Perform one step of the rebalancing process. This step may be to create a redundant bucket, @@ -65,5 +65,5 @@ public interface RebalanceDirector { * @return true we were able to make progress or at least attempt an operation, false if there is * no more rebalancing work to be done. */ - public boolean nextStep(); + boolean nextStep(); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileInterpreter.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileInterpreter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileInterpreter.java index 727629d..b3ba610 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileInterpreter.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileInterpreter.java @@ -119,15 +119,15 @@ public interface DiskInitFileInterpreter { void cmnClearRegion(long drId, ConcurrentHashMap<DiskStoreID, RegionVersionHolder<DiskStoreID>> clearRVV); - public void cmnCrfCreate(long oplogId); + void cmnCrfCreate(long oplogId); - public void cmnDrfCreate(long oplogId); + void cmnDrfCreate(long oplogId); - public boolean cmnCrfDelete(long oplogId); + boolean cmnCrfDelete(long oplogId); - public boolean cmnDrfDelete(long oplogId); + boolean cmnDrfDelete(long oplogId); - public void cmnRegionConfig(long drId, byte lruAlgorithm, byte lruAction, int lruLimit, + void cmnRegionConfig(long drId, byte lruAlgorithm, byte lruAction, int lruLimit, int concurrencyLevel, int initialCapacity, float loadFactor, boolean statisticsEnabled, boolean isBucket, EnumSet<DiskRegionFlag> flags, String partitionName, int startingBucketId, String compressorClassName, boolean offHeap); http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskRecoveryStore.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskRecoveryStore.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskRecoveryStore.java index f898df4..5a02c75 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskRecoveryStore.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskRecoveryStore.java @@ -35,47 +35,46 @@ import org.apache.geode.internal.cache.versions.VersionTag; * @since GemFire prPersistSprint3 */ public interface DiskRecoveryStore { - public DiskRegionView getDiskRegionView(); + DiskRegionView getDiskRegionView(); - public DiskEntry getDiskEntry(Object key); + DiskEntry getDiskEntry(Object key); - public void foreachRegionEntry(LocalRegion.RegionEntryCallback callback); + void foreachRegionEntry(LocalRegion.RegionEntryCallback callback); - public DiskEntry initializeRecoveredEntry(Object key, DiskEntry.RecoveredEntry re); + DiskEntry initializeRecoveredEntry(Object key, DiskEntry.RecoveredEntry re); - public DiskEntry updateRecoveredEntry(Object key, DiskEntry.RecoveredEntry re); + DiskEntry updateRecoveredEntry(Object key, DiskEntry.RecoveredEntry re); - public void destroyRecoveredEntry(Object key); + void destroyRecoveredEntry(Object key); - public boolean lruLimitExceeded(); + boolean lruLimitExceeded(); - public void copyRecoveredEntries(RegionMap rm); + void copyRecoveredEntries(RegionMap rm); - public void updateSizeOnFaultIn(Object key, int newSize, int bytesOnDisk); + void updateSizeOnFaultIn(Object key, int newSize, int bytesOnDisk); - public int calculateValueSize(Object val); + int calculateValueSize(Object val); - public int calculateRegionEntryValueSize(RegionEntry re); + int calculateRegionEntryValueSize(RegionEntry re); - public RegionMap getRegionMap(); + RegionMap getRegionMap(); - public void handleDiskAccessException(DiskAccessException dae); + void handleDiskAccessException(DiskAccessException dae); - public EvictionAttributes getEvictionAttributes(); + EvictionAttributes getEvictionAttributes(); - public void initializeStats(long numEntriesInVM, long numOverflowOnDisk, - long numOverflowBytesOnDisk); + void initializeStats(long numEntriesInVM, long numOverflowOnDisk, long numOverflowBytesOnDisk); - public void recordRecoveredGCVersion(VersionSource member, long gcVersion); + void recordRecoveredGCVersion(VersionSource member, long gcVersion); - public void recordRecoveredVersonHolder(VersionSource member, RegionVersionHolder versionHolder, + void recordRecoveredVersonHolder(VersionSource member, RegionVersionHolder versionHolder, boolean latestOplog); - public void recordRecoveredVersionTag(VersionTag tag); + void recordRecoveredVersionTag(VersionTag tag); - public long getVersionForMember(VersionSource member); + long getVersionForMember(VersionSource member); - public void setRVVTrusted(boolean rvvTrusted); + void setRVVTrusted(boolean rvvTrusted); - public DiskStoreImpl getDiskStore(); + DiskStoreImpl getDiskStore(); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskRegionView.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskRegionView.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskRegionView.java index 540f408..91c56d1 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskRegionView.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskRegionView.java @@ -30,135 +30,135 @@ import org.apache.geode.internal.cache.versions.RegionVersionVector; * Contract DiskInitFile needs a DiskRegion to provide. */ public interface DiskRegionView extends PersistentMemberView, RegionEntryContext { - public DiskStoreImpl getDiskStore(); + DiskStoreImpl getDiskStore(); - public String getName(); + String getName(); - public long getId(); + long getId(); - public long getClearOplogEntryId(); + long getClearOplogEntryId(); - public void setClearOplogEntryId(long v); + void setClearOplogEntryId(long v); - public RegionVersionVector getClearRVV(); + RegionVersionVector getClearRVV(); - public void setClearRVV(RegionVersionVector clearRVV); + void setClearRVV(RegionVersionVector clearRVV); - public PersistentMemberID addMyInitializingPMID(PersistentMemberID pmid); + PersistentMemberID addMyInitializingPMID(PersistentMemberID pmid); - public void markInitialized(); + void markInitialized(); - public boolean addOnlineMember(PersistentMemberID pmid); + boolean addOnlineMember(PersistentMemberID pmid); - public boolean addOfflineMember(PersistentMemberID pmid); + boolean addOfflineMember(PersistentMemberID pmid); - public boolean addOfflineAndEqualMember(PersistentMemberID pmid); + boolean addOfflineAndEqualMember(PersistentMemberID pmid); - public boolean rmOnlineMember(PersistentMemberID pmid); + boolean rmOnlineMember(PersistentMemberID pmid); - public boolean rmEqualMember(PersistentMemberID pmid); + boolean rmEqualMember(PersistentMemberID pmid); - public boolean rmOfflineMember(PersistentMemberID pmid); + boolean rmOfflineMember(PersistentMemberID pmid); - public void markBeginDestroyRegion(); + void markBeginDestroyRegion(); - public void markBeginDestroyDataStorage(); + void markBeginDestroyDataStorage(); - public void markEndDestroyDataStorage(); + void markEndDestroyDataStorage(); - public void markEndDestroyRegion(); + void markEndDestroyRegion(); - public boolean isBackup(); + boolean isBackup(); - public boolean hasConfigChanged(); + boolean hasConfigChanged(); - public void setConfigChanged(boolean v); + void setConfigChanged(boolean v); - public void setConfig(byte lruAlgorithm, byte lruAction, int lruLimit, int concurrencyLevel, + void setConfig(byte lruAlgorithm, byte lruAction, int lruLimit, int concurrencyLevel, int initialCapacity, float loadFactor, boolean statisticsEnabled, boolean isBucket, EnumSet<DiskRegionFlag> flags, String partitionName, int startingBucketId, String compressorClassName, boolean offHeap); - public byte getLruAlgorithm(); + byte getLruAlgorithm(); - public byte getLruAction(); + byte getLruAction(); - public int getLruLimit(); + int getLruLimit(); - public int getConcurrencyLevel(); + int getConcurrencyLevel(); - public int getInitialCapacity(); + int getInitialCapacity(); - public float getLoadFactor(); + float getLoadFactor(); - public boolean getStatisticsEnabled(); + boolean getStatisticsEnabled(); - public boolean isBucket(); + boolean isBucket(); - public EnumSet<DiskRegionFlag> getFlags(); + EnumSet<DiskRegionFlag> getFlags(); - public String getPartitionName(); + String getPartitionName(); - public int getStartingBucketId(); + int getStartingBucketId(); /** * Return true if this region has data in disk to allow it be be recovered. Return false if it is * a brand new region that has not yet written data to disk. */ - public boolean isRecreated(); + boolean isRecreated(); - public void prepareForRecovery(); + void prepareForRecovery(); - public RegionMap getRecoveredEntryMap(); + RegionMap getRecoveredEntryMap(); - public boolean isReadyForRecovery(); + boolean isReadyForRecovery(); - public int getRecoveredEntryCount(); + int getRecoveredEntryCount(); - public void incRecoveredEntryCount(); + void incRecoveredEntryCount(); - public void initRecoveredEntryCount(); + void initRecoveredEntryCount(); - public void copyExistingRegionMap(LocalRegion drs); + void copyExistingRegionMap(LocalRegion drs); - public void incNumOverflowOnDisk(long delta); + void incNumOverflowOnDisk(long delta); - public void incNumEntriesInVM(long delta); + void incNumEntriesInVM(long delta); - public long getNumOverflowOnDisk(); + long getNumOverflowOnDisk(); - public long getNumOverflowBytesOnDisk(); + long getNumOverflowBytesOnDisk(); - public long getNumEntriesInVM(); + long getNumEntriesInVM(); - public void acquireReadLock(); + void acquireReadLock(); - public Object getRaw(DiskId did); + Object getRaw(DiskId did); - public void releaseReadLock(); + void releaseReadLock(); - public boolean didClearCountChange(); + boolean didClearCountChange(); - public CancelCriterion getCancelCriterion(); + CancelCriterion getCancelCriterion(); - public boolean isSync(); + boolean isSync(); /** Update stats */ - public void endRead(long start, long end, long bytesRead); + void endRead(long start, long end, long bytesRead); - public boolean isRegionClosed(); + boolean isRegionClosed(); - public void incNumOverflowBytesOnDisk(long overflowBytesOnDiskDelta); + void incNumOverflowBytesOnDisk(long overflowBytesOnDiskDelta); - public RegionVersionVector getRegionVersionVector(); + RegionVersionVector getRegionVersionVector(); - public boolean isEntriesMapIncompatible(); + boolean isEntriesMapIncompatible(); - public String getCompressorClassName(); + String getCompressorClassName(); - public void oplogRecovered(long oplogId); + void oplogRecovered(long oplogId); - public boolean getOffHeap(); + boolean getOffHeap(); - public void close(); + void close(); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceAdvisor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceAdvisor.java index 1b846a2..cf3c64b 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceAdvisor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceAdvisor.java @@ -33,7 +33,7 @@ public interface PersistenceAdvisor { * This should be called before performing a profile exchange for the region, but after the * persistent data has been read. */ - public void initialize(); + void initialize(); /** * Try to acquire the distributed lock which members must grab for in the case of a tie. Whoever @@ -93,8 +93,7 @@ public interface PersistenceAdvisor { * * @param replicate the replicate to initialize from. */ - public void updateMembershipView(InternalDistributedMember replicate, - boolean targetReinitializing); + void updateMembershipView(InternalDistributedMember replicate, boolean targetReinitializing); /** * Indicate that the current member is online. @@ -104,13 +103,13 @@ public interface PersistenceAdvisor { * creation. * */ - public void setOnline(boolean didGII, boolean atomicCreation, PersistentMemberID newId); + void setOnline(boolean didGII, boolean atomicCreation, PersistentMemberID newId); /** * Indicate that the current member has started the initialization process. This creates a new * persistent ID for this member and notifies other members about it. */ - public void setInitializing(PersistentMemberID newId); + void setInitializing(PersistentMemberID newId); /** * Called when a peer is about to come online. @@ -128,7 +127,7 @@ public interface PersistenceAdvisor { * Called when a peer returns that it has closed the cache or region when a region operation was * in flight. */ - public void markMemberOffline(InternalDistributedMember member, PersistentMemberID id); + void markMemberOffline(InternalDistributedMember member, PersistentMemberID id); /** * If this member was initializing when it crashed or is currently in the process of becoming @@ -136,9 +135,9 @@ public interface PersistenceAdvisor { */ PersistentMemberID getInitializingID(); - public void close(); + void close(); - public Set<PersistentMemberID> getPersistedMembers(); + Set<PersistentMemberID> getPersistedMembers(); /** * Check to see if the other members know about the current member . @@ -148,10 +147,10 @@ public interface PersistenceAdvisor { * distributed system as the persistent data on in this VM. * @return true if we detected that we actually have the same data on disk as another member. */ - public boolean checkMyStateOnMembers(Set<InternalDistributedMember> replicates) + boolean checkMyStateOnMembers(Set<InternalDistributedMember> replicates) throws ReplyException, InterruptedException, ConflictingPersistentDataException; - public void releaseTieLock(); + void releaseTieLock(); /** * Returns the member id of the member who has the latest copy of the persistent region. This may @@ -163,27 +162,27 @@ public interface PersistenceAdvisor { * @throws ConflictingPersistentDataException if there are active members which are not based on * the state that is persisted in this member. */ - public CacheDistributionAdvisor.InitialImageAdvice getInitialImageAdvice( + CacheDistributionAdvisor.InitialImageAdvice getInitialImageAdvice( CacheDistributionAdvisor.InitialImageAdvice previousAdvice, boolean recoverFromDisk); /** * Returns true if this member used to host data. */ - public boolean wasHosting(); + boolean wasHosting(); /* * Persist members to be offline and equal * * @param Map<InternalDistributedMember, PersistentMemberID> map of current online members */ - public void persistMembersOfflineAndEqual(Map<InternalDistributedMember, PersistentMemberID> map); + void persistMembersOfflineAndEqual(Map<InternalDistributedMember, PersistentMemberID> map); /** * Generate a new persistent id for this region. */ - public PersistentMemberID generatePersistentID(); + PersistentMemberID generatePersistentID(); - public DiskStoreID getDiskStoreID(); + DiskStoreID getDiskStoreID(); - public boolean isOnline(); + boolean isOnline(); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceObserverHolder.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceObserverHolder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceObserverHolder.java index 2152597..65b32ee 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceObserverHolder.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceObserverHolder.java @@ -39,39 +39,39 @@ public class PersistenceObserverHolder { } - public static interface PersistenceObserver { + public interface PersistenceObserver { /** * Fired just before we persist that a member is offline. Returning false indicates that we * should not persist the change. */ - public boolean memberOffline(String regionName, PersistentMemberID persistentID); + boolean memberOffline(String regionName, PersistentMemberID persistentID); /** * Fired after we persist that a member is offline. */ - public void afterPersistedOffline(String fullPath, PersistentMemberID persistentID); + void afterPersistedOffline(String fullPath, PersistentMemberID persistentID); /** * Fired just before we persist that a member is online. Returning false indicates that we * should not persist the change. */ - public boolean memberOnline(String regionName, PersistentMemberID persistentID); + boolean memberOnline(String regionName, PersistentMemberID persistentID); /** * Fired after we persist that a member is online. */ - public void afterPersistedOnline(String fullPath, PersistentMemberID persistentID); + void afterPersistedOnline(String fullPath, PersistentMemberID persistentID); /** * Fired just before we persist that a member no longer hosts a region. Returning false * indicates that we should not persist the change. */ - public boolean memberRemoved(String regionName, PersistentMemberID persistentID); + boolean memberRemoved(String regionName, PersistentMemberID persistentID); /** * Fired after we persist that a member no longer hosts the region. */ - public void afterRemovePersisted(String fullPath, PersistentMemberID persistentID); + void afterRemovePersisted(String fullPath, PersistentMemberID persistentID); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberManager.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberManager.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberManager.java index fac5f36..75d24a8 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberManager.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberManager.java @@ -207,26 +207,26 @@ public class PersistentMemberManager { } } - public static interface MemberRevocationListener { - public void revoked(PersistentMemberPattern pattern); + public interface MemberRevocationListener { + void revoked(PersistentMemberPattern pattern); /** * Add the persistent id(s) of this listener to the passed in set. */ - public void addPersistentIDs(Set<PersistentMemberID> localData); + void addPersistentIDs(Set<PersistentMemberID> localData); /** * Return true if this is a listener for a resource that matches the persistent member pattern * in question. */ - public boolean matches(PersistentMemberPattern pattern); + boolean matches(PersistentMemberPattern pattern); /** * Return the set of member ids which this resource knows are missing */ - public Set<PersistentMemberID> getMissingMemberIds(); + Set<PersistentMemberID> getMissingMemberIds(); - public String getRegionPath(); + String getRegionPath(); } public class PendingRevokeListener implements MembershipListener { http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberView.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberView.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberView.java index 6813cd8..abf2262 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberView.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberView.java @@ -31,22 +31,22 @@ public interface PersistentMemberView { /** * @return the set of online members. */ - public abstract Set<PersistentMemberID> getOnlineMembers(); + Set<PersistentMemberID> getOnlineMembers(); /** * @return the set of offline members */ - public abstract Set<PersistentMemberID> getOfflineMembers(); + Set<PersistentMemberID> getOfflineMembers(); /** * @return the set of offline and equal members */ - public abstract Set<PersistentMemberID> getOfflineAndEqualMembers(); + Set<PersistentMemberID> getOfflineAndEqualMembers(); /** * Retrieve the persisted ID of the current member. */ - public abstract PersistentMemberID getMyPersistentID(); + PersistentMemberID getMyPersistentID(); /** * Indicate that this member is now online, and initialize it with the list of offline and online @@ -57,18 +57,18 @@ public interface PersistentMemberView { /** * Indicate that a member is offline. This is only called after this member is online. */ - public abstract void memberOffline(PersistentMemberID persistentID); + void memberOffline(PersistentMemberID persistentID); /** * Indicate that a member is offline, and has the same data on disk as the current member. This is * only called after this member is online. */ - public abstract void memberOfflineAndEqual(PersistentMemberID persistentID); + void memberOfflineAndEqual(PersistentMemberID persistentID); /** * Indicate that a new member is online. This is only called after this member is online. */ - public abstract void memberOnline(PersistentMemberID persistentID); + void memberOnline(PersistentMemberID persistentID); /** * Indicate that the member no longer persists the region and can be removed. This is only called @@ -76,11 +76,11 @@ public interface PersistentMemberView { * * @param persistentID */ - public void memberRemoved(PersistentMemberID persistentID); + void memberRemoved(PersistentMemberID persistentID); - public abstract PersistentMemberID generatePersistentID(); + PersistentMemberID generatePersistentID(); - public abstract void setInitializing(PersistentMemberID newId); + void setInitializing(PersistentMemberID newId); /** * Indicate that we are about to destroy this region. This method will be called before @@ -88,7 +88,7 @@ public interface PersistentMemberView { * It will remove all data from disk for this region and remove the membership view. It must keep * the PersistentID. */ - public abstract void beginDestroy(LocalRegion region); + void beginDestroy(LocalRegion region); /** * Indicate that we are about to partially destroy this region. It is used to stop hosting a @@ -96,7 +96,7 @@ public interface PersistentMemberView { * crash during distribution, we can recover and complete the partial destroy. It will remove all * data from disk for this region. It must keep the PersistentID and the membership view. */ - public abstract void beginDestroyDataStorage(); + void beginDestroyDataStorage(); /** * This method is called to finish either setAboutToDestroy or setAboutToPartialDestroy. @@ -109,23 +109,23 @@ public interface PersistentMemberView { * * This method should NOT prevent this disk region from being initialized later. */ - public abstract void endDestroy(LocalRegion region); + void endDestroy(LocalRegion region); - public abstract PersistentMemberID getMyInitializingID(); + PersistentMemberID getMyInitializingID(); - public abstract boolean wasAboutToDestroy(); + boolean wasAboutToDestroy(); - public abstract boolean wasAboutToDestroyDataStorage(); + boolean wasAboutToDestroyDataStorage(); /** * This method is used to complete a destroy that was pending when a member crashed. This method * applies the destroy operation, but it leaves the DiskRegion in a usable (empty) state. */ - public abstract void finishPendingDestroy(); + void finishPendingDestroy(); - public abstract DiskStoreID getDiskStoreID(); + DiskStoreID getDiskStoreID(); - public abstract void memberRevoked(PersistentMemberPattern pattern); + void memberRevoked(PersistentMemberPattern pattern); - public abstract Set<PersistentMemberPattern> getRevokedMembers(); + Set<PersistentMemberPattern> getRevokedMembers(); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentStateListener.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentStateListener.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentStateListener.java index aa379e5..5f0c290 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentStateListener.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentStateListener.java @@ -17,7 +17,7 @@ package org.apache.geode.internal.cache.persistence; import org.apache.geode.distributed.internal.membership.InternalDistributedMember; public interface PersistentStateListener { - public static class PersistentStateAdapter implements PersistentStateListener { + class PersistentStateAdapter implements PersistentStateListener { public void memberOffline(InternalDistributedMember member, PersistentMemberID persistentID) {} @@ -26,9 +26,9 @@ public interface PersistentStateListener { public void memberRemoved(PersistentMemberID persistentID, boolean revoked) {} } - public void memberOnline(InternalDistributedMember member, PersistentMemberID persistentID); + void memberOnline(InternalDistributedMember member, PersistentMemberID persistentID); - public void memberOffline(InternalDistributedMember member, PersistentMemberID persistentID); + void memberOffline(InternalDistributedMember member, PersistentMemberID persistentID); - public void memberRemoved(PersistentMemberID persistentID, boolean revoked); + void memberRemoved(PersistentMemberID persistentID, boolean revoked); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/RestoreScript.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/RestoreScript.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/RestoreScript.java index 3076e04..7175bb6 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/RestoreScript.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/RestoreScript.java @@ -141,7 +141,7 @@ public class RestoreScript { return false; } - private static interface ScriptGenerator { + private interface ScriptGenerator { void writePreamble(PrintWriter writer); http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/UninterruptibleRandomAccessFile.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/UninterruptibleRandomAccessFile.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/UninterruptibleRandomAccessFile.java index 8f7c334..413f1aa 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/UninterruptibleRandomAccessFile.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/UninterruptibleRandomAccessFile.java @@ -92,8 +92,8 @@ public class UninterruptibleRandomAccessFile { return this.raf.length(); } - private static interface FileOperation { - public long doOp(FileChannel channel) throws IOException; + private interface FileOperation { + long doOp(FileChannel channel) throws IOException; } private class UninterruptibleFileChannelImpl implements UninterruptibleFileChannel { http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/IndexMap.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/IndexMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/IndexMap.java index d79919b..476306d 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/IndexMap.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/IndexMap.java @@ -147,7 +147,7 @@ public interface IndexMap { * Destroy the index map and remove all data from disk. Once a map is destroyed, it will not be * recovered. */ - public void destroy(); + void destroy(); /** * A single entry in an index http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultBag.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultBag.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultBag.java index e572acd..6e99e4a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultBag.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultBag.java @@ -51,5 +51,5 @@ public interface ResultBag { /** * Close the result set and free up any resources on disk associated with the result set. */ - public void close(); + void close(); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultList.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultList.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultList.java index 4d4ee24..0c26cb2 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultList.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultList.java @@ -46,6 +46,6 @@ public interface ResultList { /** * Close the result list and free up any resources on disk associated with the result set. */ - public void close(); + void close(); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultMap.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultMap.java index 5ca0430..d512798 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultMap.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultMap.java @@ -61,7 +61,7 @@ public interface ResultMap { /** * return true if this map contains the given key */ - public boolean containsKey(Object e); + boolean containsKey(Object e); /** * Return all of the IndexEntries in the range between start and end. If end < start, this will http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultSet.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultSet.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultSet.java index f7bb7b4..7365c4a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultSet.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/query/ResultSet.java @@ -52,5 +52,5 @@ public interface ResultSet { /** * Close the result set and free up any resources on disk associated with the result set. */ - public void close(); + void close(); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/tier/ClientHandShake.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/ClientHandShake.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/ClientHandShake.java index f7a39f3..b48c99b 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/ClientHandShake.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/ClientHandShake.java @@ -29,16 +29,16 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID; * @since GemFire 5.7 */ public interface ClientHandShake { - public boolean isOK(); + boolean isOK(); - public byte getCode(); + byte getCode(); - public ClientProxyMembershipID getMembership(); + ClientProxyMembershipID getMembership(); - public int getClientReadTimeout(); + int getClientReadTimeout(); - public Version getVersion(); + Version getVersion(); - public void accept(OutputStream out, InputStream in, byte epType, int qSize, - byte communicationMode, Principal principal) throws IOException; + void accept(OutputStream out, InputStream in, byte epType, int qSize, byte communicationMode, + Principal principal) throws IOException; } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/tier/ConnectionProxy.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/ConnectionProxy.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/ConnectionProxy.java index d867f9a..2671ca6 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/ConnectionProxy.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/ConnectionProxy.java @@ -29,5 +29,5 @@ public interface ConnectionProxy { * * @since GemFire 5.7 */ - public static final Version VERSION = Version.CURRENT.getGemFireVersion(); + Version VERSION = Version.CURRENT.getGemFireVersion(); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java index d7e3548..211da4a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java @@ -3062,7 +3062,7 @@ public class CacheClientProxy implements ClientSession { } public interface TestHook { - public void doTestHook(String spot); + void doTestHook(String spot); } public static TestHook testHook; http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMessage.java index 6d9f38d..9023a3f 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientMessage.java @@ -38,5 +38,5 @@ public interface ClientMessage extends Conflatable, DataSerializableFixedID { * @throws IOException * @see org.apache.geode.internal.cache.tier.sockets.Message */ - public Message getMessage(CacheClientProxy proxy, boolean notify) throws IOException; + Message getMessage(CacheClientProxy proxy, boolean notify) throws IOException; } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessage.java index c54ffa8..43795fa 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessage.java @@ -35,40 +35,40 @@ public interface ClientUpdateMessage extends ClientMessage { * * @return the region name that was updated */ - public String getRegionName(); + String getRegionName(); /** * Set the region name that was updated. */ - public void setRegionName(String regionName); + void setRegionName(String regionName); /** * Returns the new value. * * @return the new value */ - public Object getValue(); + Object getValue(); /** * Returns the new value. * * @return the new value */ - public boolean valueIsObject(); + boolean valueIsObject(); /** * Returns the key that was updated. * * @return the key that was updated */ - public Object getKeyOfInterest(); + Object getKeyOfInterest(); /** * Returns the operation * * @return the operation performed by this message */ - public EnumListenerEvent getOperation(); + EnumListenerEvent getOperation(); /** @@ -76,17 +76,17 @@ public interface ClientUpdateMessage extends ClientMessage { * * @return the membership Id of the originator of the event. */ - public ClientProxyMembershipID getMembershipId(); + ClientProxyMembershipID getMembershipId(); /** * Returns whether the message satisfies cqs. * * @return boolean true if cq info is present. */ - public boolean hasCqs(); + boolean hasCqs(); - public CqNameToOp getClientCq(ClientProxyMembershipID clientId); + CqNameToOp getClientCq(ClientProxyMembershipID clientId); /** * Returns whether the message satisfies CQs for the given clientId. @@ -94,12 +94,12 @@ public interface ClientUpdateMessage extends ClientMessage { * @param clientId ClientProxyMembershipID * @return boolean true if CQ info is present for the given proxy. */ - public boolean hasCqs(ClientProxyMembershipID clientId); + boolean hasCqs(ClientProxyMembershipID clientId); /** * Returns the version of the region entry affected by this operation on the server */ - public VersionTag getVersionTag(); + VersionTag getVersionTag(); /** * Returns true if the message satisfies the interest list registered by the given client. @@ -107,67 +107,67 @@ public interface ClientUpdateMessage extends ClientMessage { * @param clientId ClientProxyMembershipID * @return true if the given client is interested in this message */ - public boolean isClientInterested(ClientProxyMembershipID clientId); + boolean isClientInterested(ClientProxyMembershipID clientId); /** * Returns whether the message is due to a result of net load. * * @return boolean true if the event is due to net load. */ - public boolean isNetLoad(); + boolean isNetLoad(); /** * Sets the isNetLoad flag. * * @param isNetLoad boolean true if the event is due to net load. */ - public void setIsNetLoad(boolean isNetLoad); + void setIsNetLoad(boolean isNetLoad); /** * Returns whether this <code>ClientUpdateMessage</code>'s operation is AFTER_CREATE. * * @return whether this <code>ClientUpdateMessage</code>'s operation is AFTER_CREATE */ - public boolean isCreate(); + boolean isCreate(); /** * Returns whether this <code>ClientUpdateMessage</code>'s operation is AFTER_UPDATE. * * @return whether this <code>ClientUpdateMessage</code>'s operation is AFTER_UPDATE */ - public boolean isUpdate(); + boolean isUpdate(); /** * Returns whether this <code>ClientUpdateMessage</code>'s operation is AFTER_DESTROY. * * @return whether this <code>ClientUpdateMessage</code>'s operation is AFTER_DESTROY */ - public boolean isDestroy(); + boolean isDestroy(); /** * Returns whether this <code>ClientUpdateMessage</code>'s operation is AFTER_INVALIDATE. * * @return whether this <code>ClientUpdateMessage</code>'s operation is AFTER_INVALIDATE */ - public boolean isInvalidate(); + boolean isInvalidate(); /** * Returns whether this <code>ClientUpdateMessage</code>'s operation is AFTER_REGION_DESTROY. * * @return whether this <code>ClientUpdateMessage</code>'s operation is AFTER_REGION_DESTROY */ - public boolean isDestroyRegion(); + boolean isDestroyRegion(); /** * Returns whether this <code>ClientUpdateMessage</code>'s operation is AFTER_REGION_CLEAR. * * @return whether this <code>ClientUpdateMessage</code>'s operation is AFTER_REGION_CLEAR */ - public boolean isClearRegion(); + boolean isClearRegion(); /** * @return whether this message can be sent without going through an authorization check */ - public boolean needsNoAuthorizationCheck(); + boolean needsNoAuthorizationCheck(); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl.java index 6bbe7b8..5066fb0 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl.java @@ -1442,22 +1442,22 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N * Replaces what used to be a HashMap<String, Integer>. */ public interface CqNameToOp extends Sendable { - public boolean isEmpty(); + boolean isEmpty(); /** * Returns true if calling add would fail. */ - public boolean isFull(); + boolean isFull(); - public void addToMessage(Message message); + void addToMessage(Message message); - public int size(); + int size(); - public String[] getNames(); + String[] getNames(); - public void add(String name, Integer op); + void add(String name, Integer op); - public void delete(String name); + void delete(String name); } /** * Contains either zero or one String to int tuples. This is a common case and this impl has a http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageStats.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageStats.java index 6db29b1..f3a41eb 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageStats.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageStats.java @@ -21,11 +21,11 @@ package org.apache.geode.internal.cache.tier.sockets; * @since GemFire 5.0.2 */ public interface MessageStats { - public void incReceivedBytes(long v); + void incReceivedBytes(long v); - public void incSentBytes(long v); + void incSentBytes(long v); - public void incMessagesBeingReceived(int bytes); + void incMessagesBeingReceived(int bytes); - public void decMessagesBeingReceived(int bytes); + void decMessagesBeingReceived(int bytes); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/OldClientSupportService.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/OldClientSupportService.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/OldClientSupportService.java index a8b157e..48ec351 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/OldClientSupportService.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/OldClientSupportService.java @@ -33,7 +33,7 @@ public interface OldClientSupportService extends CacheService { * @param clientVersion the version of the client * @return the exception to give the client */ - public Throwable getThrowable(Throwable theThrowable, Version clientVersion); + Throwable getThrowable(Throwable theThrowable, Version clientVersion); /** * Process a class name read from a serialized object of unknown origin @@ -41,7 +41,7 @@ public interface OldClientSupportService extends CacheService { * @param name * @return the class name to use */ - public String processIncomingClassName(String name); + String processIncomingClassName(String name); /** * Process a class name read from a serialized object @@ -50,7 +50,7 @@ public interface OldClientSupportService extends CacheService { * @param in the source of the class name * @return the adjusted class name */ - public String processIncomingClassName(String name, DataInput in); + String processIncomingClassName(String name, DataInput in); /** * Process a class name being written to a serialized form @@ -59,5 +59,5 @@ public interface OldClientSupportService extends CacheService { * @param out the consumer of the class name * @return the adjusted class name */ - public String processOutgoingClassName(String name, DataOutput out); + String processOutgoingClassName(String name, DataOutput out); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionHolder.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionHolder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionHolder.java index 5871e4c..4c77d1b 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionHolder.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionHolder.java @@ -46,9 +46,9 @@ public interface VersionHolder<T extends VersionSource> { int getDistributedSystemId(); /** get rvv internal high byte. Used by region entries for transferring to storage */ - public short getRegionVersionHighBytes(); + short getRegionVersionHighBytes(); /** get rvv internal low bytes. Used by region entries for transferring to storage */ - public int getRegionVersionLowBytes(); + int getRegionVersionLowBytes(); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionSource.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionSource.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionSource.java index a53f999..bc0a085 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionSource.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionSource.java @@ -33,6 +33,6 @@ import org.apache.geode.internal.DataSerializableFixedID; */ public interface VersionSource<T> extends DataSerializableFixedID, Comparable<T> { - public void writeEssentialData(DataOutput out) throws IOException; + void writeEssentialData(DataOutput out) throws IOException; } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionStamp.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionStamp.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionStamp.java index b747f80..44753b5 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionStamp.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionStamp.java @@ -67,7 +67,7 @@ public interface VersionStamp<T extends VersionSource> extends VersionHolder<T> * * @param event */ - public void processVersionTag(EntryEvent event); + void processVersionTag(EntryEvent event); /** * Perform a versioning check with the given GII information. Throws a @@ -81,12 +81,12 @@ public interface VersionStamp<T extends VersionSource> extends VersionHolder<T> * @param sender the identifier of the member providing the entry * @param checkConflicts true if conflict checks should be performed */ - public void processVersionTag(LocalRegion r, VersionTag<T> tag, boolean isTombstoneFromGII, + void processVersionTag(LocalRegion r, VersionTag<T> tag, boolean isTombstoneFromGII, boolean hasDelta, VersionSource thisVM, InternalDistributedMember sender, boolean checkConflicts); /** * return true if this stamp has valid entry/region version information, false if not */ - public boolean hasValidVersion(); + boolean hasValidVersion(); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/vmotion/VMotionObserver.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/vmotion/VMotionObserver.java b/geode-core/src/main/java/org/apache/geode/internal/cache/vmotion/VMotionObserver.java index a4a04f5..5ea9be4 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/vmotion/VMotionObserver.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/vmotion/VMotionObserver.java @@ -27,15 +27,15 @@ public interface VMotionObserver { /** * This callback is called just before CQ registration on the server */ - public void vMotionBeforeCQRegistration(); + void vMotionBeforeCQRegistration(); /** * This callback is called just before register Interest on the server */ - public void vMotionBeforeRegisterInterest(); + void vMotionBeforeRegisterInterest(); /** * This callback is called before a request for GII is sent. */ - public void vMotionDuringGII(Set recipientSet, LocalRegion region); + void vMotionDuringGII(Set recipientSet, LocalRegion region); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/wan/DistributedSystemListener.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/DistributedSystemListener.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/DistributedSystemListener.java index 7d9817b..e695b45 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/DistributedSystemListener.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/DistributedSystemListener.java @@ -24,8 +24,8 @@ public interface DistributedSystemListener { // remoteDSId is the distributed-system-id of the distributed system that has joined existing // sites - public void addedDistributedSystem(int remoteDsId); + void addedDistributedSystem(int remoteDsId); // This is invoked when user explicitly removed the distributed system from the membership - public void removedDistributedSystem(int remoteDsId); + void removedDistributedSystem(int remoteDsId); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventDispatcher.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventDispatcher.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventDispatcher.java index 5bb5333..b56bd29 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventDispatcher.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventDispatcher.java @@ -22,11 +22,11 @@ import java.util.List; */ public interface GatewaySenderEventDispatcher { - public boolean dispatchBatch(List events, boolean removeFromQueueOnException, boolean isRetry); + boolean dispatchBatch(List events, boolean removeFromQueueOnException, boolean isRetry); - public boolean isRemoteDispatcher(); + boolean isRemoteDispatcher(); - public boolean isConnectedToRemote(); + boolean isConnectedToRemote(); - public void stop(); + void stop(); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/wan/InternalGatewaySenderFactory.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/InternalGatewaySenderFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/InternalGatewaySenderFactory.java index 276d79d..f2690f8 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/InternalGatewaySenderFactory.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/InternalGatewaySenderFactory.java @@ -21,16 +21,15 @@ import org.apache.geode.cache.wan.GatewaySenderFactory; public interface InternalGatewaySenderFactory extends GatewaySenderFactory { - public GatewaySenderFactory setForInternalUse(boolean b); + GatewaySenderFactory setForInternalUse(boolean b); - public GatewaySenderFactory addAsyncEventListener(AsyncEventListener listener); + GatewaySenderFactory addAsyncEventListener(AsyncEventListener listener); - public GatewaySenderFactory setBucketSorted(boolean bucketSorted); + GatewaySenderFactory setBucketSorted(boolean bucketSorted); - public GatewaySender create(String senderIdFromAsyncEventQueueId); + GatewaySender create(String senderIdFromAsyncEventQueueId); - public void configureGatewaySender(GatewaySender senderCreation); + void configureGatewaySender(GatewaySender senderCreation); - public GatewaySenderFactory setLocatorDiscoveryCallback( - LocatorDiscoveryCallback myLocatorCallback); + GatewaySenderFactory setLocatorDiscoveryCallback(LocatorDiscoveryCallback myLocatorCallback); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/Declarable2.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/Declarable2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/Declarable2.java index d2d8feb..332dc36 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/Declarable2.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/Declarable2.java @@ -30,6 +30,6 @@ public interface Declarable2 extends Declarable { /** * Returns the current configuration of this {@link Declarable} */ - public Properties getConfig(); + Properties getConfig(); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/PropertyResolver.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/PropertyResolver.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/PropertyResolver.java index 9879b6a..b0d8cb5 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/PropertyResolver.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/PropertyResolver.java @@ -26,10 +26,10 @@ import java.util.Properties; public interface PropertyResolver { /** If system properties are overridden by Gemfire properties */ - public static final int SYSTEM_PROPERTIES_OVERRIDE = 0; + int SYSTEM_PROPERTIES_OVERRIDE = 0; /** if system properties are not overridden by any other properties */ - public static final int NO_SYSTEM_PROPERTIES_OVERRIDE = 1; + int NO_SYSTEM_PROPERTIES_OVERRIDE = 1; /** * Resolves the given property string either from system properties or given properties. and @@ -40,14 +40,13 @@ public interface PropertyResolver { * @param replaceString * @return resolvedString */ - public String resolveReplaceString(String replaceString); + String resolveReplaceString(String replaceString); - public boolean isIgnoreUnresolvedProperties(); + boolean isIgnoreUnresolvedProperties(); - public int getPropertyOverridden(); + int getPropertyOverridden(); - public String processUnresolvableString(String stringWithPrefixAndSuffix, String prefix, - String suffix); + String processUnresolvableString(String stringWithPrefixAndSuffix, String prefix, String suffix); - public String processUnresolvableString(String string); + String processUnresolvableString(String string); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/concurrent/AL.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/concurrent/AL.java b/geode-core/src/main/java/org/apache/geode/internal/concurrent/AL.java index 35ff4d5..364e2b5 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/concurrent/AL.java +++ b/geode-core/src/main/java/org/apache/geode/internal/concurrent/AL.java @@ -26,14 +26,14 @@ public interface AL { * * @return the current value */ - public long get(); + long get(); /** * Sets to the given value. * * @param newValue the new value */ - public void set(long newValue); + void set(long newValue); /** * Atomically sets to the given value and returns the old value. @@ -41,7 +41,7 @@ public interface AL { * @param newValue the new value * @return the previous value */ - public long getAndSet(long newValue); + long getAndSet(long newValue); /** * Atomically sets the value to the given updated value if the current value {@code ==} the @@ -52,7 +52,7 @@ public interface AL { * @return true if successful. False return indicates that the actual value was not equal to the * expected value. */ - public boolean compareAndSet(long expect, long update); + boolean compareAndSet(long expect, long update); /** * Atomically sets the value to the given updated value if the current value {@code ==} the @@ -66,21 +66,21 @@ public interface AL { * @param update the new value * @return true if successful. */ - public boolean weakCompareAndSet(long expect, long update); + boolean weakCompareAndSet(long expect, long update); /** * Atomically increments by one the current value. * * @return the previous value */ - public long getAndIncrement(); + long getAndIncrement(); /** * Atomically decrements by one the current value. * * @return the previous value */ - public long getAndDecrement(); + long getAndDecrement(); /** * Atomically adds the given value to the current value. @@ -88,21 +88,21 @@ public interface AL { * @param delta the value to add * @return the previous value */ - public long getAndAdd(long delta); + long getAndAdd(long delta); /** * Atomically increments by one the current value. * * @return the updated value */ - public long incrementAndGet(); + long incrementAndGet(); /** * Atomically decrements by one the current value. * * @return the updated value */ - public long decrementAndGet(); + long decrementAndGet(); /** * Atomically adds the given value to the current value. @@ -110,7 +110,7 @@ public interface AL { * @param delta the value to add * @return the updated value */ - public long addAndGet(long delta); + long addAndGet(long delta); /** * Atomically sets the value to the given updated value if the given value {@code >} the current @@ -119,5 +119,5 @@ public interface AL { * * @param update */ - public boolean setIfGreater(long update); + boolean setIfGreater(long update); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapCallback.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapCallback.java b/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapCallback.java index 08e4126..9ad06d0 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapCallback.java +++ b/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapCallback.java @@ -36,13 +36,13 @@ public interface MapCallback<K, V, C, P> { /** * Token to return from {@link #removeValue} to indicate that remove has to be aborted. */ - public static final Object ABORT_REMOVE_TOKEN = new Object(); + Object ABORT_REMOVE_TOKEN = new Object(); /** * Token object to indicate that {@link #removeValue} does not need to compare against provided * value before removing from segment. */ - public static final Object NO_OBJECT_TOKEN = new Object(); + Object NO_OBJECT_TOKEN = new Object(); /** * Create a new instance of the value object given the key and provided parameters for @@ -54,7 +54,7 @@ public interface MapCallback<K, V, C, P> { * * @return the new value to be inserted in the map */ - public V newValue(K key, C context, P createParams, MapResult result); + V newValue(K key, C context, P createParams, MapResult result); /** * Invoked when an existing value in map is read by the <code>create</code> method in custom map @@ -68,7 +68,7 @@ public interface MapCallback<K, V, C, P> { * @return updated value to be put in the map, if non-null; if null then retry the map operation * internally */ - public V updateValue(K key, V oldValue, C context, P params); + V updateValue(K key, V oldValue, C context, P params); /** * Invoked after put is successful with the result of {@link #updateValue}. @@ -78,19 +78,19 @@ public interface MapCallback<K, V, C, P> { * @param newValue the new value to be replaced * @param context any callback argument passed to put overload */ - public void afterUpdate(K key, K mapKey, V newValue, C context); + void afterUpdate(K key, K mapKey, V newValue, C context); /** * Returns true if {@link #updateValue} should be invoked else false. */ - public boolean requiresUpdateValue(); + boolean requiresUpdateValue(); /** * Invoked when an existing value in map is read by read ops. * * @param oldValue the value read by create that will be returned */ - public void oldValueRead(V oldValue); + void oldValueRead(V oldValue); /** * Check if the existing value should be removed by the custom <code>remove</code> methods that @@ -106,7 +106,7 @@ public interface MapCallback<K, V, C, P> { * @param context any context in which this method has been invoked * @param removeParams parameters, if any, to be passed for cleanup of the object */ - public Object removeValue(Object key, Object value, V existingValue, C context, P removeParams); + Object removeValue(Object key, Object value, V existingValue, C context, P removeParams); /** * Invoked after removal of an entry. Some implementations (CustomEntryConcurrentHashMap) will @@ -121,7 +121,7 @@ public interface MapCallback<K, V, C, P> { * @param context any context in which this method has been invoked * @param removeParams parameters, if any, to be passed for cleanup of the object */ - public void postRemove(Object key, Object value, V existingValue, C context, P removeParams); + void postRemove(Object key, Object value, V existingValue, C context, P removeParams); /** * Invoked when an existing value in map is read by the <code>replace</code> method in custom map @@ -137,7 +137,7 @@ public interface MapCallback<K, V, C, P> { * @return updated value to be actually put in the map, if non-null; if null then retry the map * operation internally */ - public V replaceValue(K key, V oldValue, V existingValue, V newValue, C context, P params); + V replaceValue(K key, V oldValue, V existingValue, V newValue, C context, P params); /** * Invoked after the node is found and just before the replace. The replace may still either @@ -148,7 +148,7 @@ public interface MapCallback<K, V, C, P> { * @param context any context argument passed to replace * @param params any callback parameters passed to the replace method */ - public Object beforeReplace(K mapKey, V newValue, C context, P params); + Object beforeReplace(K mapKey, V newValue, C context, P params); /** * Invoked after replace is successful and passing it the result of {@link #beforeReplace}. @@ -159,7 +159,7 @@ public interface MapCallback<K, V, C, P> { * @param context any context argument passed to replace overload * @param params any callback parameters passed to the replace method */ - public void afterReplace(K mapKey, V newValue, Object beforeResult, C context, P params); + void afterReplace(K mapKey, V newValue, Object beforeResult, C context, P params); /** * Invoked after replace fails and passing it the result of {@link #beforeReplace}. @@ -170,7 +170,7 @@ public interface MapCallback<K, V, C, P> { * @param context any context argument passed to replace overload * @param params any callback parameters passed to the replace method */ - public void onReplaceFailed(K mapKey, V newValue, Object beforeResult, C context, P params); + void onReplaceFailed(K mapKey, V newValue, Object beforeResult, C context, P params); /** * Invoked after replace or delete fails at the end, passing it the intermediate values that were @@ -188,11 +188,10 @@ public interface MapCallback<K, V, C, P> { * * @return value to be returned as result of operation ignoring failure (or null for failure) */ - public V onOperationFailed(K key, Object oldValue, V updatedValue, V newValue, C context, - P params); + V onOperationFailed(K key, Object oldValue, V updatedValue, V newValue, C context, P params); /** * Invoked by some implementations like ConcurrentTHashSet to in its toArray. */ - public void onToArray(C context); + void onToArray(C context); } http://git-wip-us.apache.org/repos/asf/geode/blob/f7396e4c/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapResult.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapResult.java b/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapResult.java index f493858..1e5518f 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapResult.java +++ b/geode-core/src/main/java/org/apache/geode/internal/concurrent/MapResult.java @@ -29,10 +29,10 @@ public interface MapResult { * create methods. Default for MapResult is assumed to be true if this method was not invoked by * {@link MapCallback} explicitly. */ - public void setNewValueCreated(boolean created); + void setNewValueCreated(boolean created); /** * Result set by {@link #setNewValueCreated(boolean)}. Default is required to be true. */ - public boolean isNewValueCreated(); + boolean isNewValueCreated(); }
