You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by pr...@apache.org on 2018/01/31 20:08:28 UTC
[geode] branch develop updated: GEODE-4430: Remove unnecessary
modifiers from interfaces in geode-core:internal.cache
This is an automated email from the ASF dual-hosted git repository.
prhomberg pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 9438685 GEODE-4430: Remove unnecessary modifiers from interfaces in geode-core:internal.cache
9438685 is described below
commit 9438685cbf1440af9005c8935ed67cef4639d33e
Author: Patrick Rhomberg <Pu...@users.noreply.github.com>
AuthorDate: Wed Jan 31 12:08:26 2018 -0800
GEODE-4430: Remove unnecessary modifiers from interfaces in geode-core:internal.cache
* This closes #529
---
.../geode/internal/cache/AbstractRegionMap.java | 18 +--
.../internal/cache/CacheDistributionAdvisee.java | 10 +-
.../apache/geode/internal/cache/CacheObserver.java | 36 +++---
.../apache/geode/internal/cache/CacheService.java | 6 +-
.../geode/internal/cache/CachedDeserializable.java | 22 ++--
.../geode/internal/cache/ClientServerObserver.java | 24 ++--
.../geode/internal/cache/CompactableOplog.java | 9 +-
.../apache/geode/internal/cache/Conflatable.java | 12 +-
.../apache/geode/internal/cache/DiskStoreTask.java | 2 +-
.../internal/cache/DistTXCoordinatorInterface.java | 23 ++--
.../apache/geode/internal/cache/EntriesMap.java | 10 +-
.../apache/geode/internal/cache/ExpiryTask.java | 10 +-
.../geode/internal/cache/ExportDiskRegion.java | 4 +-
.../apache/geode/internal/cache/FilterProfile.java | 4 +-
.../apache/geode/internal/cache/ImageState.java | 64 ++++++-----
.../geode/internal/cache/InterestFilter.java | 10 +-
.../geode/internal/cache/InternalCacheEvent.java | 20 ++--
.../geode/internal/cache/InternalDataView.java | 10 +-
.../geode/internal/cache/LoaderHelperFactory.java | 4 +-
.../org/apache/geode/internal/cache/Oplog.java | 26 ++---
.../org/apache/geode/internal/cache/OplogSet.java | 8 +-
.../internal/cache/PRHARedundancyProvider.java | 38 ++++++-
.../cache/PartitionedRegionQueryEvaluator.java | 49 +++++++-
.../geode/internal/cache/RegionEntryFactory.java | 8 +-
.../apache/geode/internal/cache/RegionQueue.java | 32 +++---
.../geode/internal/cache/SerializationHelper.java | 4 +-
.../geode/internal/cache/TXEntryStateFactory.java | 6 +-
.../geode/internal/cache/TXStateInterface.java | 79 +++++++------
.../apache/geode/internal/cache/TXStateProxy.java | 40 +++----
.../geode/internal/cache/TransactionMessage.java | 14 +--
.../geode/internal/cache/TxEntryFactory.java | 4 +-
.../cache/control/InternalResourceManager.java | 16 +--
.../internal/cache/control/MemoryMonitor.java | 12 +-
.../cache/control/OffHeapMemoryMonitor.java | 16 +--
.../internal/cache/control/ResourceEvent.java | 6 +-
.../internal/cache/control/ResourceListener.java | 2 +-
.../internal/cache/control/ResourceMonitor.java | 6 +-
.../geode/internal/cache/entries/DiskEntry.java | 46 ++++----
.../internal/cache/entries/OffHeapRegionEntry.java | 4 +-
.../internal/cache/execute/AbstractExecution.java | 6 +-
.../internal/cache/execute/InternalExecution.java | 10 +-
.../execute/InternalRegionFunctionContext.java | 7 +-
.../cache/execute/InternalResultSender.java | 8 +-
.../cache/execute/MultiRegionFunctionContext.java | 4 +-
.../geode/internal/cache/extension/Extensible.java | 2 +-
.../internal/cache/ha/HAContainerWrapper.java | 18 +--
.../geode/internal/cache/locks/TXLockId.java | 10 +-
.../internal/cache/locks/TXRegionLockRequest.java | 8 +-
.../geode/internal/cache/partitioned/Bucket.java | 16 +--
.../internal/cache/partitioned/InternalPRInfo.java | 5 +-
.../partitioned/InternalPartitionDetails.java | 4 +-
.../cache/partitioned/OfflineMemberDetails.java | 4 +-
.../cache/partitioned/PREntriesIterator.java | 4 +-
.../partitioned/PartitionedRegionObserver.java | 6 +-
.../internal/cache/partitioned/RegionAdvisor.java | 29 ++++-
.../partitioned/rebalance/BucketOperator.java | 8 +-
.../rebalance/PartitionedRegionLoadModel.java | 7 +-
.../partitioned/rebalance/RebalanceDirector.java | 8 +-
.../cache/persistence/DiskInitFileInterpreter.java | 10 +-
.../cache/persistence/DiskRecoveryStore.java | 42 ++++---
.../internal/cache/persistence/DiskRegionView.java | 123 ++++++++++-----------
.../cache/persistence/PersistenceAdvisor.java | 32 +++---
.../cache/persistence/PersistenceAdvisorImpl.java | 18 ++-
.../persistence/PersistenceObserverHolder.java | 16 ++-
.../cache/persistence/PersistentMemberManager.java | 12 +-
.../cache/persistence/PersistentMemberView.java | 42 ++++---
.../cache/persistence/PersistentStateListener.java | 8 +-
.../UninterruptibleRandomAccessFile.java | 4 +-
.../internal/cache/persistence/query/IndexMap.java | 2 +-
.../cache/persistence/query/ResultBag.java | 2 +-
.../cache/persistence/query/ResultList.java | 2 +-
.../cache/persistence/query/ResultMap.java | 2 +-
.../cache/persistence/query/ResultSet.java | 2 +-
.../geode/internal/cache/tier/ClientHandShake.java | 12 +-
.../geode/internal/cache/tier/ConnectionProxy.java | 2 +-
.../cache/tier/sockets/CacheClientProxy.java | 2 +-
.../internal/cache/tier/sockets/ClientMessage.java | 2 +-
.../cache/tier/sockets/ClientUpdateMessage.java | 44 ++++----
.../tier/sockets/ClientUpdateMessageImpl.java | 16 ++-
.../cache/tier/sockets/CommBufferPool.java | 4 +-
.../internal/cache/tier/sockets/MessageStats.java | 8 +-
.../tier/sockets/OldClientSupportService.java | 8 +-
.../internal/cache/versions/VersionHolder.java | 4 +-
.../internal/cache/vmotion/VMotionObserver.java | 6 +-
.../cache/wan/DistributedSystemListener.java | 4 +-
.../cache/wan/GatewaySenderEventDispatcher.java | 10 +-
.../cache/wan/InternalGatewaySenderFactory.java | 13 +--
.../geode/internal/cache/xmlcache/Declarable2.java | 2 +-
.../internal/cache/xmlcache/PropertyResolver.java | 16 ++-
89 files changed, 710 insertions(+), 638 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
index c51f93b..8ac043c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
@@ -3424,23 +3424,23 @@ public abstract class AbstractRegionMap
public void updateEvictionCounter() {}
public interface ARMLockTestHook {
- public void beforeBulkLock(InternalRegion region);
+ void beforeBulkLock(InternalRegion region);
- public void afterBulkLock(InternalRegion region);
+ void afterBulkLock(InternalRegion region);
- public void beforeBulkRelease(InternalRegion region);
+ void beforeBulkRelease(InternalRegion region);
- public void afterBulkRelease(InternalRegion region);
+ void afterBulkRelease(InternalRegion region);
- public void beforeLock(InternalRegion region, CacheEvent event);
+ void beforeLock(InternalRegion region, CacheEvent event);
- public void afterLock(InternalRegion region, CacheEvent event);
+ void afterLock(InternalRegion region, CacheEvent event);
- public void beforeRelease(InternalRegion region, CacheEvent event);
+ void beforeRelease(InternalRegion region, CacheEvent event);
- public void afterRelease(InternalRegion region, CacheEvent event);
+ void afterRelease(InternalRegion region, CacheEvent event);
- public void beforeStateFlushWait();
+ void beforeStateFlushWait();
}
private ARMLockTestHook armLockTestHook;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisee.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisee.java
index 4ca7ed7..e0cddc8 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisee.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisee.java
@@ -32,21 +32,21 @@ public interface CacheDistributionAdvisee extends DistributionAdvisee {
*
* @return the <code>CacheDistributionAdvisor</code>
*/
- public CacheDistributionAdvisor getCacheDistributionAdvisor();
+ CacheDistributionAdvisor getCacheDistributionAdvisor();
/**
* Returns the <code>Cache</code> associated with this cache object.
*
* @return the Cache
*/
- public InternalCache getCache();
+ InternalCache getCache();
/**
* Returns the <code>RegionAttributes</code> associated with this advisee.
*
* @return the <code>RegionAttributes</code> of this advisee
*/
- public RegionAttributes getAttributes();
+ RegionAttributes getAttributes();
/**
* notifies the advisee that a new remote member has registered a profile showing that it is now
@@ -54,12 +54,12 @@ public interface CacheDistributionAdvisee extends DistributionAdvisee {
*
* @param profile the remote member's profile
*/
- public void remoteRegionInitialized(CacheProfile profile);
+ void remoteRegionInitialized(CacheProfile profile);
/**
* Allow this advisee to know the CreateRegionReplyProcessor that is creating it.
*
* @param processor the CreateRegionReplyProcessor that is creating the advisee
*/
- public default void registerCreateRegionReplyProcessor(CreateRegionReplyProcessor processor) {}
+ default void registerCreateRegionReplyProcessor(CreateRegionReplyProcessor processor) {}
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserver.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserver.java
index f2979e4..eadfac2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserver.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheObserver.java
@@ -53,19 +53,19 @@ public interface CacheObserver {
* ByteBuffer to the pool.
*
*/
- public void afterWritingBytes();
+ void afterWritingBytes();
/**
*
* Compacting is about to compact
*/
- public void beforeGoingToCompact();
+ void beforeGoingToCompact();
/**
* Just finished Compacting
*
*/
- public void afterHavingCompacted();
+ void afterHavingCompacted();
/**
* Callback just after calculating the conflated byte buffer. This function can get called only in
@@ -74,7 +74,7 @@ public interface CacheObserver {
* @param origBB Original ByteBuffer object for the operation without considering conflation
* @param conflatedBB Resultant ByteBuffer object after conflation
*/
- public void afterConflation(ByteBuffer origBB, ByteBuffer conflatedBB);
+ void afterConflation(ByteBuffer origBB, ByteBuffer conflatedBB);
/**
* Callback just after setting oplog offset . The Oplog Offset will be set to non negative number
@@ -87,7 +87,7 @@ public interface CacheObserver {
* in the Oplog for the operation & -1 for asynch mode of operation
*
*/
- public void afterSettingOplogOffSet(long offset);
+ void afterSettingOplogOffSet(long offset);
/**
* Callback given by the thread performing the operation which causes the switching of the Oplog.
@@ -95,7 +95,7 @@ public interface CacheObserver {
* function will get called before the compacter thread gets notified
*
*/
- public void beforeSwitchingOplog();
+ void beforeSwitchingOplog();
/**
* Callback given by the thread performing the operation which causes the switching of the Oplog.
@@ -105,12 +105,12 @@ public interface CacheObserver {
*
*
*/
- public void afterSwitchingOplog();
+ void afterSwitchingOplog();
/**
* Callback given by the thread which creates krfs.
*/
- public void afterKrfCreated();
+ void afterKrfCreated();
/**
* Callback given immediately before any thread invokes ComplexDiskRegion.OplogCompactor's
@@ -118,7 +118,7 @@ public interface CacheObserver {
* region.
*
*/
- public void beforeStoppingCompactor();
+ void beforeStoppingCompactor();
/**
* Callback given immediately after any thread invokes ComplexDiskRegion.OplogCompactor's
@@ -126,54 +126,54 @@ public interface CacheObserver {
* region.
*
*/
- public void afterStoppingCompactor();
+ void afterStoppingCompactor();
/**
* Callback given immediately after the ComplexDiskRegion.OplogCompactor's stopCompactor method
* signals the compactor to stop.
*
*/
- public void afterSignallingCompactor();
+ void afterSignallingCompactor();
/**
* Called when GII begins
*/
- public void afterMarkingGIIStarted();
+ void afterMarkingGIIStarted();
/**
* Called when GII ends
*/
- public void afterMarkingGIICompleted();
+ void afterMarkingGIICompleted();
/**
* Called after the Oplog.WriterThread (asynch writer thread) swaps the pendingFlushMap and
* pendingWriteMap for flushing.
*/
- public void afterSwitchingWriteAndFlushMaps();
+ void afterSwitchingWriteAndFlushMaps();
/**
* Invoked just before setting the LBHTree reference in the thread local.
*/
- public void beforeSettingDiskRef();
+ void beforeSettingDiskRef();
/**
* Invoked just after setting the LBHTree reference in the thread local.
*/
- public void afterSettingDiskRef();
+ void afterSettingDiskRef();
/**
* Invoked by the compactor thread just before deleting a compacted oplog
*
* @param compactedOplog
*/
- public void beforeDeletingCompactedOplog(Oplog compactedOplog);
+ void beforeDeletingCompactedOplog(Oplog compactedOplog);
/**
* Invoked just before deleting an empty oplog
*
* @param emptyOplog
*/
- public void beforeDeletingEmptyOplog(Oplog emptyOplog);
+ void beforeDeletingEmptyOplog(Oplog emptyOplog);
/**
* Invoked just before ShutdownAll operation
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheService.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheService.java
index 1cb7175..ffb4916 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheService.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheService.java
@@ -30,17 +30,17 @@ public interface CacheService {
* Services are initialized in random order, fairly early on in cache initialization. In
* particular, the cache.xml has not yet been parsed.
*/
- public void init(Cache cache);
+ void init(Cache cache);
/**
* Return the class or interface used to look up this service.
*/
- public Class<? extends CacheService> getInterface();
+ Class<? extends CacheService> getInterface();
/**
* Returns the MBean associated with this server
*
* @return the MBean associated with this server
*/
- public CacheServiceMBeanBase getMBean();
+ CacheServiceMBeanBase getMBean();
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CachedDeserializable.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CachedDeserializable.java
index 066c5b8..71beef7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CachedDeserializable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CachedDeserializable.java
@@ -35,7 +35,7 @@ public interface CachedDeserializable extends Sizeable {
*
* @return the raw byte[] that represents this cache value
*/
- public byte[] getSerializedValue();
+ byte[] getSerializedValue();
/**
* Gets a deserialized value for reading. Differs from getDeserializedValue by leaving the value
@@ -43,7 +43,7 @@ public interface CachedDeserializable extends Sizeable {
*
* @since GemFire 4.0
*/
- public Object getDeserializedForReading();
+ Object getDeserializedForReading();
/**
* Gets the string form of the cached object. If an exception is thrown while converting to a
@@ -52,7 +52,7 @@ public interface CachedDeserializable extends Sizeable {
* @return a string that represents the cached object.
* @since GemFire 6.6
*/
- public String getStringForm();
+ String getStringForm();
/**
* Always makes a copy of the deserialized object and returns it. Leaves the value in a form that
@@ -62,7 +62,7 @@ public interface CachedDeserializable extends Sizeable {
* @param re the region entry that owns this object or null if no owner
* @return the deserialized object for this cache value
*/
- public Object getDeserializedWritableCopy(Region r, RegionEntry re);
+ Object getDeserializedWritableCopy(Region r, RegionEntry re);
/**
* Returns the deserialized object for this cache value.
@@ -71,13 +71,13 @@ public interface CachedDeserializable extends Sizeable {
* @param re the region entry that owns this object or null if no owner
* @return the deserialized object for this cache value
*/
- public Object getDeserializedValue(Region r, RegionEntry re);
+ Object getDeserializedValue(Region r, RegionEntry re);
/**
* Return current value regardless of whether it is serialized or deserialized: if it was
* serialized than it is a byte[], otherwise it is not a byte[].
*/
- public Object getValue();
+ Object getValue();
/**
* Write out the value contained in this instance to the stream as a byte array (versus serialized
@@ -90,7 +90,7 @@ public interface CachedDeserializable extends Sizeable {
* @param out the stream to write on
* @throws IOException
*/
- public void writeValueAsByteArray(DataOutput out) throws IOException;
+ void writeValueAsByteArray(DataOutput out) throws IOException;
/**
* Sets the serialized value of the Object in the wrapper along with appropriate user bit & valid
@@ -99,21 +99,21 @@ public interface CachedDeserializable extends Sizeable {
*
* @param wrapper object of type BytesAndBitsForCompactor
*/
- public void fillSerializedValue(BytesAndBitsForCompactor wrapper, byte userBits);
+ void fillSerializedValue(BytesAndBitsForCompactor wrapper, byte userBits);
/**
* Return the size of the value, not including the overhead added by this wrapper class.
*/
- public int getValueSizeInBytes();
+ int getValueSizeInBytes();
/**
* Returns true if the value stored in this memory chunk is a serialized object. Returns false if
* it is a byte array.
*/
- public boolean isSerialized();
+ boolean isSerialized();
/**
* Return true if the value uses the java heap; false if not.
*/
- public boolean usesHeapForStorage();
+ boolean usesHeapForStorage();
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserver.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserver.java
index 1c4ebaa..37834c0 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserver.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserver.java
@@ -28,69 +28,69 @@ public interface ClientServerObserver {
/**
* This callback is called when now primary Ep is identified.
*/
- public void afterPrimaryIdentificationFromBackup(ServerLocation location);
+ void afterPrimaryIdentificationFromBackup(ServerLocation location);
/**
* This callback is called just before interest registartion
*/
- public void beforeInterestRegistration();
+ void beforeInterestRegistration();
/**
* This callback is called just after interest registartion
*/
- public void afterInterestRegistration();
+ void afterInterestRegistration();
/**
* This callback is called just before primary identification
*/
- public void beforePrimaryIdentificationFromBackup();
+ void beforePrimaryIdentificationFromBackup();
/**
* This callback is called just before Interest Recovery by DSM thread happens
*/
- public void beforeInterestRecovery();
+ void beforeInterestRecovery();
/**
* Invoked by CacheClientUpdater just before invoking endpointDied for fail over
*
* @param location ServerLocation which has failed
*/
- public void beforeFailoverByCacheClientUpdater(ServerLocation location);
+ void beforeFailoverByCacheClientUpdater(ServerLocation location);
/**
* Invoked before sending an instantiator message to server
*
* @param eventId
*/
- public void beforeSendingToServer(EventID eventId);
+ void beforeSendingToServer(EventID eventId);
/**
* Invoked after sending an instantiator message to server
*
* @param eventId
*/
- public void afterReceivingFromServer(EventID eventId);
+ void afterReceivingFromServer(EventID eventId);
/**
* This callback is called just before sending client ack to the primary servrer.
*/
- public void beforeSendingClientAck();
+ void beforeSendingClientAck();
/**
* Invoked after Message is created
*
* @param msg
*/
- public void afterMessageCreation(Message msg);
+ void afterMessageCreation(Message msg);
/**
* Invoked after Queue Destroy Message has been sent
*/
- public void afterQueueDestroyMessage();
+ void afterQueueDestroyMessage();
/**
* Invoked after a primary is recovered from a backup or new connection.
*/
- public void afterPrimaryRecovered(ServerLocation location);
+ void afterPrimaryRecovered(ServerLocation location);
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CompactableOplog.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CompactableOplog.java
index e0da134..9c38dcd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CompactableOplog.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CompactableOplog.java
@@ -26,12 +26,11 @@ import org.apache.geode.internal.cache.persistence.DiskRegionView;
*/
public interface CompactableOplog {
- public void prepareForCompact();
+ void prepareForCompact();
- public int compact(OplogCompactor compactor);
+ int compact(OplogCompactor compactor);
- public BytesAndBits getBytesAndBits(DiskRegionView dr, DiskId id, boolean faultIn,
- boolean bitOnly);
+ BytesAndBits getBytesAndBits(DiskRegionView dr, DiskId id, boolean faultIn, boolean bitOnly);
- public BytesAndBits getNoBuffer(DiskRegion dr, DiskId id);
+ BytesAndBits getNoBuffer(DiskRegion dr, DiskId id);
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/Conflatable.java b/geode-core/src/main/java/org/apache/geode/internal/cache/Conflatable.java
index 9d945d2..41ce253 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/Conflatable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/Conflatable.java
@@ -31,40 +31,40 @@ public interface Conflatable extends Serializable {
*
* @return whether the object should be conflated
*/
- public boolean shouldBeConflated();
+ boolean shouldBeConflated();
/**
* Returns the name of the region for this <code>Conflatable</code>
*
* @return the name of the region for this <code>Conflatable</code>
*/
- public String getRegionToConflate();
+ String getRegionToConflate();
/**
* Returns the key for this <code>Conflatable</code>
*
* @return the key for this <code>Conflatable</code>
*/
- public Object getKeyToConflate();
+ Object getKeyToConflate();
/**
* Returns the value for this <code>Conflatable</code>
*
* @return the value for this <code>Conflatable</code>
*/
- public Object getValueToConflate();
+ Object getValueToConflate();
/**
* Sets the latest value for this <code>Conflatable</code>
*
* @param value The latest value
*/
- public void setLatestValue(Object value);
+ void setLatestValue(Object value);
/**
* Return this event's identifier
*
* @return EventID object uniquely identifying the Event
*/
- public EventID getEventId();
+ EventID getEventId();
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreTask.java
index bf3a352..2dfd2c7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreTask.java
@@ -19,6 +19,6 @@ package org.apache.geode.internal.cache;
*/
public interface DiskStoreTask extends Runnable {
- public void taskCancelled();
+ void taskCancelled();
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCoordinatorInterface.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCoordinatorInterface.java
index 698d84d..8ba1c79 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCoordinatorInterface.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCoordinatorInterface.java
@@ -32,34 +32,33 @@ public interface DistTXCoordinatorInterface extends TXStateInterface {
/**
* Response for Precommit
*/
- public boolean getPreCommitResponse() throws UnsupportedOperationInTransactionException;
+ boolean getPreCommitResponse() throws UnsupportedOperationInTransactionException;
/**
* Response for Rollback
*/
- public boolean getRollbackResponse() throws UnsupportedOperationInTransactionException;
+ boolean getRollbackResponse() throws UnsupportedOperationInTransactionException;
- public ArrayList<DistTxEntryEvent> getPrimaryTransactionalOperations()
+ ArrayList<DistTxEntryEvent> getPrimaryTransactionalOperations()
throws UnsupportedOperationInTransactionException;
- public void addSecondaryTransactionalOperations(DistTxEntryEvent dtop)
+ void addSecondaryTransactionalOperations(DistTxEntryEvent dtop)
throws UnsupportedOperationInTransactionException;
- public void setPrecommitMessage(DistTXPrecommitMessage precommitMsg, DistributionManager dm)
+ void setPrecommitMessage(DistTXPrecommitMessage precommitMsg, DistributionManager dm)
throws UnsupportedOperationInTransactionException;
- public void setCommitMessage(DistTXCommitMessage commitMsg, DistributionManager dm)
+ void setCommitMessage(DistTXCommitMessage commitMsg, DistributionManager dm)
throws UnsupportedOperationInTransactionException;
- public void setRollbackMessage(DistTXRollbackMessage rollbackMsg, DistributionManager dm)
+ void setRollbackMessage(DistTXRollbackMessage rollbackMsg, DistributionManager dm)
throws UnsupportedOperationInTransactionException;
- public void gatherAffectedRegions(HashSet<LocalRegion> regionSet, boolean includePrimaryRegions,
+ void gatherAffectedRegions(HashSet<LocalRegion> regionSet, boolean includePrimaryRegions,
boolean includeRedundantRegions) throws UnsupportedOperationInTransactionException;
- public void gatherAffectedRegionsName(TreeSet<String> sortedRegionName,
- boolean includePrimaryRegions, boolean includeRedundantRegions)
- throws UnsupportedOperationInTransactionException;
+ void gatherAffectedRegionsName(TreeSet<String> sortedRegionName, boolean includePrimaryRegions,
+ boolean includeRedundantRegions) throws UnsupportedOperationInTransactionException;
- public void finalCleanup();
+ void finalCleanup();
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesMap.java
index e4246e6..e9a860c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesMap.java
@@ -18,7 +18,7 @@ package org.apache.geode.internal.cache;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentMap;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.EntryNotFoundException;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.internal.InternalStatisticsDisabledException;
@@ -33,7 +33,7 @@ public interface EntriesMap extends ConcurrentMap {
* 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.
@@ -82,14 +82,14 @@ public interface EntriesMap extends ConcurrentMap {
*
* @see LocalRegion#getValueInVM
*/
- public Object getValueInVM(Object key);
+ Object getValueInVM(Object key);
/**
* Returns the value of an entry as it resides on disk. For testing purposes only.
*
* @see LocalRegion#getValueOnDisk
*/
- public Object getValueOnDisk(Object key) throws EntryNotFoundException;
+ Object getValueOnDisk(Object key) throws EntryNotFoundException;
/**
* Fill in value, and isSerialized fields in this entry object (used for getInitialImage and sync
@@ -100,7 +100,7 @@ public interface EntriesMap extends ConcurrentMap {
* @return false if map entry not found
* @since GemFire 3.2.1
*/
- public boolean fillInValue(InitialImageOperation.Entry entry, DistributionManager mgr);
+ boolean fillInValue(InitialImageOperation.Entry entry, DistributionManager mgr);
/**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
index 6e2cc9c..524697e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
@@ -537,31 +537,31 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
/**
* Called after entry is schedule for expiration.
*/
- public void afterSchedule(ExpiryTask et);
+ void afterSchedule(ExpiryTask et);
/**
* Called after the given expiry task has run. This means that the time it was originally
* scheduled to run has elapsed and the scheduler has run the task. While running the task it
* may decide to expire it or reschedule it.
*/
- public void afterTaskRan(ExpiryTask et);
+ void afterTaskRan(ExpiryTask et);
/**
* Called after the given expiry task has been rescheduled. afterTaskRan can still be called on
* the same task. In some cases a task is rescheduled without expiring it. In others it is
* expired and rescheduled.
*/
- public void afterReschedule(ExpiryTask et);
+ void afterReschedule(ExpiryTask et);
/**
* Called after the given expiry task has expired.
*/
- public void afterExpire(ExpiryTask et);
+ void afterExpire(ExpiryTask et);
/**
* Called when task has been canceled
*/
- public void afterCancel(ExpiryTask et);
+ void afterCancel(ExpiryTask et);
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ExportDiskRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ExportDiskRegion.java
index 4fd59d0..0b29c21 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ExportDiskRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ExportDiskRegion.java
@@ -71,14 +71,14 @@ public class ExportDiskRegion extends ValidatingDiskRegion {
currentOplogEntries.clear();
}
- public static interface ExportWriter {
+ public interface ExportWriter {
/**
* Write a batch of entries to the export system. The value in RecoveredEntry is will not be
* null, so there is no need to fault in the value in the implementor
*
* @throws IOException
*/
- public void writeBatch(Map<Object, RecoveredEntry> entries) throws IOException;
+ void writeBatch(Map<Object, RecoveredEntry> entries) throws IOException;
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java
index 55f2852..377a764 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterProfile.java
@@ -2218,9 +2218,9 @@ public class FilterProfile implements DataSerializableFixedID {
/** Test Hook */
public interface TestHook {
- public void await();
+ void await();
- public void release();
+ void release();
}
@Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ImageState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ImageState.java
index f64a673..6c928e5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ImageState.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ImageState.java
@@ -14,11 +14,9 @@
*/
package org.apache.geode.internal.cache;
-import java.util.Collection;
import java.util.Iterator;
import java.util.Set;
-import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.cache.versions.RegionVersionVector;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.cache.versions.VersionTag;
@@ -29,69 +27,69 @@ import org.apache.geode.internal.cache.versions.VersionTag;
*/
public interface ImageState /* extends Lock */ {
- public boolean getRegionInvalidated();
+ boolean getRegionInvalidated();
- public void setRegionInvalidated(boolean b);
+ void setRegionInvalidated(boolean b);
- public void setInRecovery(boolean b);
+ void setInRecovery(boolean b);
- public boolean getInRecovery();
+ boolean getInRecovery();
- public void addDestroyedEntry(Object key);
+ void addDestroyedEntry(Object key);
- public void removeDestroyedEntry(Object key);
+ void removeDestroyedEntry(Object key);
- public boolean hasDestroyedEntry(Object key);
+ boolean hasDestroyedEntry(Object key);
- public java.util.Iterator getDestroyedEntries();
+ java.util.Iterator getDestroyedEntries();
/**
* returns count of entries that have been destroyed by concurrent operations while in token mode
*/
- public int getDestroyedEntriesCount();
+ int getDestroyedEntriesCount();
- public void setClearRegionFlag(boolean isClearOn, RegionVersionVector rvv);
+ void setClearRegionFlag(boolean isClearOn, RegionVersionVector rvv);
- public boolean getClearRegionFlag();
+ boolean getClearRegionFlag();
- public RegionVersionVector getClearRegionVersionVector();
+ RegionVersionVector getClearRegionVersionVector();
- public boolean wasRegionClearedDuringGII();
+ boolean wasRegionClearedDuringGII();
- public void addVersionTag(Object key, VersionTag<?> tag);
+ void addVersionTag(Object key, VersionTag<?> tag);
- public Iterator<VersionTagEntry> getVersionTags();
+ Iterator<VersionTagEntry> getVersionTags();
- public void addLeftMember(VersionSource<?> mbr);
+ void addLeftMember(VersionSource<?> mbr);
- public Set<VersionSource> getLeftMembers();
+ Set<VersionSource> getLeftMembers();
- public boolean hasLeftMembers();
+ boolean hasLeftMembers();
- public void lockGII();
+ void lockGII();
- public void unlockGII();
+ void unlockGII();
- public void readLockRI();
+ void readLockRI();
- public void readUnlockRI();
+ void readUnlockRI();
- public void writeLockRI();
+ void writeLockRI();
- public void writeUnlockRI();
+ void writeUnlockRI();
- public boolean isReplicate();
+ boolean isReplicate();
- public boolean isClient();
+ boolean isClient();
- public void init();
+ void init();
- public interface VersionTagEntry {
- public Object getKey();
+ interface VersionTagEntry {
+ Object getKey();
- public VersionSource getMemberID();
+ VersionSource getMemberID();
- public long getRegionVersion();
+ long getRegionVersion();
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InterestFilter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InterestFilter.java
index 23f33cc..73f94ae 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InterestFilter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InterestFilter.java
@@ -18,15 +18,15 @@ import org.apache.geode.cache.CacheCallback;
public interface InterestFilter extends CacheCallback {
- public boolean notifyOnCreate(InterestEvent event);
+ boolean notifyOnCreate(InterestEvent event);
- public boolean notifyOnUpdate(InterestEvent event);
+ boolean notifyOnUpdate(InterestEvent event);
- public boolean notifyOnDestroy(InterestEvent event);
+ boolean notifyOnDestroy(InterestEvent event);
- public boolean notifyOnInvalidate(InterestEvent event);
+ boolean notifyOnInvalidate(InterestEvent event);
- public boolean notifyOnRegister(InterestEvent event);
+ boolean notifyOnRegister(InterestEvent event);
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCacheEvent.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCacheEvent.java
index 2dc6faa..13ca9d0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCacheEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCacheEvent.java
@@ -29,7 +29,7 @@ public interface InternalCacheEvent extends CacheEvent {
*
* @return true if this event will generate user callbacks
*/
- public boolean isGenerateCallbacks();
+ boolean isGenerateCallbacks();
/**
* Answers true if this event is from a client
@@ -37,54 +37,54 @@ public interface InternalCacheEvent extends CacheEvent {
* @deprecated as of 5.7 use {@link #hasClientOrigin} instead.
*/
@Deprecated
- public boolean isBridgeEvent();
+ boolean isBridgeEvent();
/**
* Answers true if this event is from a client
*
* @since GemFire 5.7
*/
- public boolean hasClientOrigin();
+ boolean hasClientOrigin();
/**
* returns the ID associated with this event
*/
- public EventID getEventId();
+ EventID getEventId();
/**
* Returns the Operation type.
*
* @return eventType
*/
- public EnumListenerEvent getEventType();
+ EnumListenerEvent getEventType();
/**
* sets the event type
*
* @param operation the operation performed by this event
*/
- public void setEventType(EnumListenerEvent operation);
+ void setEventType(EnumListenerEvent operation);
/**
* returns the bridge context for the event, if any
*/
- public ClientProxyMembershipID getContext();
+ ClientProxyMembershipID getContext();
/**
* set the client routing information for this event
*
* @param info TODO
*/
- public void setLocalFilterInfo(FilterInfo info);
+ void setLocalFilterInfo(FilterInfo info);
/**
* get the local routing information for this event
*/
- public FilterInfo getLocalFilterInfo();
+ FilterInfo getLocalFilterInfo();
/**
* get the version tag for the event
*/
- public VersionTag getVersionTag();
+ VersionTag getVersionTag();
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalDataView.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalDataView.java
index bcc28ec..8bc3e56 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalDataView.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalDataView.java
@@ -245,11 +245,11 @@ public interface InternalDataView {
ClientProxyMembershipID requestingClient, EntryEventImpl clientEvent,
boolean returnTombstones) throws DataLocationException;
- abstract void checkSupportsRegionDestroy() throws UnsupportedOperationInTransactionException;
+ void checkSupportsRegionDestroy() throws UnsupportedOperationInTransactionException;
- abstract void checkSupportsRegionInvalidate() throws UnsupportedOperationInTransactionException;
+ void checkSupportsRegionInvalidate() throws UnsupportedOperationInTransactionException;
- abstract void checkSupportsRegionClear() throws UnsupportedOperationInTransactionException;
+ void checkSupportsRegionClear() throws UnsupportedOperationInTransactionException;
/**
* @param localRegion
@@ -259,10 +259,10 @@ public interface InternalDataView {
*/
Set getBucketKeys(LocalRegion localRegion, int bucketId, boolean allowTombstones);
- public void postPutAll(DistributedPutAllOperation putallOp, VersionedObjectList successfulPuts,
+ void postPutAll(DistributedPutAllOperation putallOp, VersionedObjectList successfulPuts,
LocalRegion region);
- public void postRemoveAll(DistributedRemoveAllOperation op, VersionedObjectList successfulOps,
+ void postRemoveAll(DistributedRemoveAllOperation op, VersionedObjectList successfulOps,
LocalRegion region);
Entry accessEntry(KeyInfo keyInfo, LocalRegion localRegion);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LoaderHelperFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LoaderHelperFactory.java
index 1c46b26..a0ffaab 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LoaderHelperFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LoaderHelperFactory.java
@@ -29,7 +29,7 @@ import org.apache.geode.cache.LoaderHelper;
* @since GemFire 5.0
*/
public interface LoaderHelperFactory {
- public LoaderHelper createLoaderHelper(Object key, Object callbackArgument,
- boolean netSearchAllowed, boolean netLoadAllowed, SearchLoadAndWriteProcessor searcher);
+ LoaderHelper createLoaderHelper(Object key, Object callbackArgument, boolean netSearchAllowed,
+ boolean netLoadAllowed, SearchLoadAndWriteProcessor searcher);
}
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 412789f..a5155dc 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
@@ -7395,40 +7395,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 {
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 7f59316..75cfcda 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
@@ -20,11 +20,11 @@ import org.apache.geode.internal.cache.entries.DiskEntry.Helper.ValueWrapper;
public interface OplogSet {
- public void create(InternalRegion region, DiskEntry entry, ValueWrapper value, boolean async);
+ void create(InternalRegion region, DiskEntry entry, ValueWrapper value, boolean async);
- public void modify(InternalRegion region, DiskEntry entry, ValueWrapper value, boolean async);
+ void modify(InternalRegion region, DiskEntry entry, ValueWrapper value, boolean async);
- public CompactableOplog getChild(long oplogId);
+ CompactableOplog getChild(long oplogId);
- public void remove(InternalRegion region, DiskEntry entry, boolean async, boolean isClear);
+ void remove(InternalRegion region, DiskEntry entry, boolean async, boolean isClear);
}
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 d551248..6442d66 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
@@ -15,7 +15,16 @@
package org.apache.geode.internal.cache;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.ScheduledFuture;
@@ -46,9 +55,28 @@ import org.apache.geode.internal.OneTaskOnlyExecutor;
import org.apache.geode.internal.cache.PartitionedRegion.RetryTimeKeeper;
import org.apache.geode.internal.cache.PartitionedRegionDataStore.CreateBucketResult;
import org.apache.geode.internal.cache.control.InternalResourceManager;
-import org.apache.geode.internal.cache.partitioned.*;
+import org.apache.geode.internal.cache.partitioned.Bucket;
+import org.apache.geode.internal.cache.partitioned.BucketBackupMessage;
+import org.apache.geode.internal.cache.partitioned.CreateBucketMessage;
+import org.apache.geode.internal.cache.partitioned.CreateMissingBucketsTask;
+import org.apache.geode.internal.cache.partitioned.EndBucketCreationMessage;
+import org.apache.geode.internal.cache.partitioned.FetchPartitionDetailsMessage;
import org.apache.geode.internal.cache.partitioned.FetchPartitionDetailsMessage.FetchPartitionDetailsResponse;
+import org.apache.geode.internal.cache.partitioned.InternalPRInfo;
+import org.apache.geode.internal.cache.partitioned.InternalPartitionDetails;
+import org.apache.geode.internal.cache.partitioned.LoadProbe;
+import org.apache.geode.internal.cache.partitioned.ManageBackupBucketMessage;
+import org.apache.geode.internal.cache.partitioned.ManageBucketMessage;
import org.apache.geode.internal.cache.partitioned.ManageBucketMessage.NodeResponse;
+import org.apache.geode.internal.cache.partitioned.OfflineMemberDetails;
+import org.apache.geode.internal.cache.partitioned.OfflineMemberDetailsImpl;
+import org.apache.geode.internal.cache.partitioned.PRLoad;
+import org.apache.geode.internal.cache.partitioned.PartitionMemberInfoImpl;
+import org.apache.geode.internal.cache.partitioned.PartitionRegionInfoImpl;
+import org.apache.geode.internal.cache.partitioned.PartitionedRegionRebalanceOp;
+import org.apache.geode.internal.cache.partitioned.RecoveryRunnable;
+import org.apache.geode.internal.cache.partitioned.RedundancyLogger;
+import org.apache.geode.internal.cache.partitioned.RegionAdvisor;
import org.apache.geode.internal.cache.partitioned.RegionAdvisor.PartitionProfile;
import org.apache.geode.internal.cache.partitioned.rebalance.CompositeDirector;
import org.apache.geode.internal.cache.partitioned.rebalance.FPRDirector;
@@ -810,11 +838,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) {
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 3438dfc..bad9d99 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
@@ -14,8 +14,21 @@
*/
package org.apache.geode.internal.cache;
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.LinkedBlockingQueue;
import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
@@ -23,14 +36,38 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.CopyHelper;
import org.apache.geode.SystemFailure;
-import org.apache.geode.cache.query.*;
-import org.apache.geode.cache.query.internal.*;
+import org.apache.geode.cache.query.QueryException;
+import org.apache.geode.cache.query.QueryExecutionLowMemoryException;
+import org.apache.geode.cache.query.QueryInvocationTargetException;
+import org.apache.geode.cache.query.SelectResults;
+import org.apache.geode.cache.query.Struct;
+import org.apache.geode.cache.query.internal.CompiledGroupBySelect;
+import org.apache.geode.cache.query.internal.CompiledSelect;
+import org.apache.geode.cache.query.internal.CompiledSortCriterion;
+import org.apache.geode.cache.query.internal.CompiledValue;
+import org.apache.geode.cache.query.internal.CumulativeNonDistinctResults;
+import org.apache.geode.cache.query.internal.DefaultQuery;
+import org.apache.geode.cache.query.internal.DefaultQueryService;
+import org.apache.geode.cache.query.internal.ExecutionContext;
import org.apache.geode.cache.query.internal.IndexTrackingQueryObserver.IndexInfo;
+import org.apache.geode.cache.query.internal.NWayMergeResults;
+import org.apache.geode.cache.query.internal.OrderByComparator;
+import org.apache.geode.cache.query.internal.PRQueryTraceInfo;
+import org.apache.geode.cache.query.internal.QueryExecutionContext;
+import org.apache.geode.cache.query.internal.QueryMonitor;
+import org.apache.geode.cache.query.internal.ResultsSet;
+import org.apache.geode.cache.query.internal.SortedResultsBag;
+import org.apache.geode.cache.query.internal.SortedStructBag;
+import org.apache.geode.cache.query.internal.StructSet;
import org.apache.geode.cache.query.internal.utils.PDXUtils;
import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.distributed.internal.*;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.distributed.internal.ReplyException;
+import org.apache.geode.distributed.internal.ReplyProcessor21;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.NanoTimer;
@@ -73,7 +110,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 =
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 85d0c9d..36d1db9 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();
}
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 bfb4291..a114c8e 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
@@ -17,7 +17,9 @@ package org.apache.geode.internal.cache;
import java.util.List;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.CacheException;
+import org.apache.geode.cache.CacheListener;
+import org.apache.geode.cache.Region;
/**
* Interface <code>RegionQueue</code> is an interface for queue implementations backed by regions.
@@ -30,7 +32,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 +43,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 +59,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 +72,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 +81,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 +91,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 +103,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 +119,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();
}
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);
}
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 e870cc9..b5db0c0 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
@@ -14,8 +14,6 @@
*/
package org.apache.geode.internal.cache;
-import org.apache.geode.internal.cache.RegionEntry;
-
/**
*
*
@@ -27,9 +25,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);
}
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 64304b4..bf1aecb 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
@@ -36,31 +36,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
@@ -68,41 +68,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 InternalCache getCache();
+ InternalCache 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);
/**
@@ -112,24 +111,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);
/**
@@ -141,10 +140,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);
/**
*
@@ -152,13 +151,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
@@ -166,58 +165,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();
}
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 c2e9a91..2d2ec67 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,30 +59,30 @@ public interface TXStateProxy extends TXStateInterface {
*
* @param sync
*/
- public void setSynchronizationRunnable(TXSynchronizationRunnable sync);
+ void setSynchronizationRunnable(TXSynchronizationRunnable sync);
- public TXSynchronizationRunnable getSynchronizationRunnable();
+ TXSynchronizationRunnable getSynchronizationRunnable();
/**
* Perform additional tasks required by the proxy to suspend a transaction
*/
- public void suspend();
+ void suspend();
/**
* Perform additional tasks required by the proxy 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
@@ -91,7 +91,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);
}
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 9f3347e..0ed46be 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();
}
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 78eacd1..7487173 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);
}
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 6978169..1f78c4c 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);
}
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 cbcd604..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();
- public default float getCriticalThreshold() {
+ default float getCriticalThreshold() {
return getThresholds().getCriticalThreshold();
}
- public default float getEvictionThreshold() {
+ default float getEvictionThreshold() {
return getThresholds().getEvictionThreshold();
}
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 ac6a34b..60a901c 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
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();
}
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 210f955..49a8820 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);
}
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 016eccc..88a54a3 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);
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/DiskEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/DiskEntry.java
index 504d133..8177b73 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/DiskEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/DiskEntry.java
@@ -85,52 +85,52 @@ public interface DiskEntry extends RegionEntry {
* @param context the value's context.
* @param value an entry value.
*/
- public void setValueWithContext(RegionEntryContext context, Object value);
+ void setValueWithContext(RegionEntryContext context, Object value);
/**
* In some cases we need to do something just before we drop the value from a DiskEntry that is
* being moved (i.e. overflowed) to disk.
*/
- public void handleValueOverflow(RegionEntryContext context);
+ void handleValueOverflow(RegionEntryContext context);
/**
* Returns true if the DiskEntry value is equal to {@link Token#DESTROYED},
* {@link Token#REMOVED_PHASE1}, or {@link Token#REMOVED_PHASE2}.
*/
- public boolean isRemovedFromDisk();
+ boolean isRemovedFromDisk();
/**
* Returns the id of this {@code DiskEntry}
*/
- public DiskId getDiskId();
+ DiskId getDiskId();
- public int updateAsyncEntrySize(EvictionController capacityController);
+ int updateAsyncEntrySize(EvictionController capacityController);
- public DiskEntry getPrev();
+ DiskEntry getPrev();
- public DiskEntry getNext();
+ DiskEntry getNext();
- public void setPrev(DiskEntry v);
+ void setPrev(DiskEntry v);
- public void setNext(DiskEntry v);
+ void setNext(DiskEntry v);
/**
* Used as the entry value if it was invalidated.
*/
- public static final byte[] INVALID_BYTES = new byte[0];
+ byte[] INVALID_BYTES = new byte[0];
/**
* Used as the entry value if it was locally invalidated.
*/
- public static final byte[] LOCAL_INVALID_BYTES = new byte[0];
+ byte[] LOCAL_INVALID_BYTES = new byte[0];
/**
* Used as the entry value if it was tombstone.
*/
- public static final byte[] TOMBSTONE_BYTES = new byte[0];
+ byte[] TOMBSTONE_BYTES = new byte[0];
/**
* A Helper class for performing functions common to all {@code DiskEntry}s.
*/
- public static class Helper {
+ class Helper {
private static final Logger logger = LogService.getLogger();
/**
@@ -487,21 +487,21 @@ public interface DiskEntry extends RegionEntry {
private static final ValueWrapper TOMBSTONE_VW =
new ByteArrayValueWrapper(true, TOMBSTONE_BYTES);
- public static interface ValueWrapper {
- public boolean isSerialized();
+ public interface ValueWrapper {
+ boolean isSerialized();
- public int getLength();
+ int getLength();
- public byte getUserBits();
+ byte getUserBits();
- public void sendTo(ByteBuffer bb, Flushable flushable) throws IOException;
+ void sendTo(ByteBuffer bb, Flushable flushable) throws IOException;
- public String getBytesAsString();
+ String getBytesAsString();
}
- public static interface Flushable {
- public void flush() throws IOException;
+ public interface Flushable {
+ void flush() throws IOException;
- public void flush(ByteBuffer bb, ByteBuffer chunkbb) throws IOException;
+ void flush(ByteBuffer bb, ByteBuffer chunkbb) throws IOException;
}
public static class ByteArrayValueWrapper implements ValueWrapper {
public final boolean isSerializedObject;
@@ -1629,7 +1629,7 @@ public interface DiskEntry extends RegionEntry {
* A marker object for an entry that has been recovered from disk. It is handled specially when it
* is placed in a region.
*/
- public static class RecoveredEntry {
+ class RecoveredEntry {
/** The disk id of the entry being recovered */
private final long recoveredKeyId;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/OffHeapRegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/OffHeapRegionEntry.java
index d162c55..2cd2def 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/OffHeapRegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/OffHeapRegionEntry.java
@@ -29,7 +29,7 @@ public interface OffHeapRegionEntry extends RegionEntry, Releasable {
*
* @return OFF_HEAP_ADDRESS
*/
- public long getAddress();
+ long getAddress();
/**
* OFF_HEAP_FIELD_WRITER
@@ -38,5 +38,5 @@ public interface OffHeapRegionEntry extends RegionEntry, Releasable {
* @param newAddr OFF_HEAP_ADDRESS
* @return newAddr OFF_HEAP_ADDRESS
*/
- public boolean setAddress(long expectedAddr, long newAddr);
+ boolean setAddress(long expectedAddr, long newAddr);
}
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 e694d14..41ab8eb 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;
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 eafe9be..b88c351 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);
}
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 f7a3a45..84bbc5b 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
@@ -20,7 +20,6 @@ import java.util.Set;
import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.Region;
-import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.RegionFunctionContext;
import org.apache.geode.cache.partition.PartitionRegionHelper;
import org.apache.geode.internal.cache.LocalDataSet;
@@ -42,7 +41,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 +54,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 +64,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);
}
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 e5944d4..f9277bd 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);
}
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 b87c2f6..ca617e7 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();
}
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 99e00a9..1045736 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();
}
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);
}
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 269d658..75b6966 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
@@ -17,19 +17,19 @@ package org.apache.geode.internal.cache.locks;
import org.apache.geode.distributed.internal.locks.DLockBatchId;
import org.apache.geode.distributed.internal.locks.LockGrantorId;
-import org.apache.geode.distributed.internal.membership.*;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
/** 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();
}
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 47a8e77..579a6ea 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,14 +23,14 @@ import org.apache.geode.DataSerializable;
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);
}
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 7fe5788..f7532b4 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, HasDiskRegion {
/**
* 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,12 +62,12 @@ public interface Bucket extends CacheDistributionAdvisee, HasDiskRegion {
* @return set of members
* @since GemFire 5.9
*/
- public Set/* InternalDistributedMembers */ getBucketOwners();
+ Set/* InternalDistributedMembers */ getBucketOwners();
- public PersistenceAdvisor getPersistenceAdvisor();
+ PersistenceAdvisor getPersistenceAdvisor();
/**
* Returns the parent {@link PartitionedRegion} of this bucket.
*/
- public PartitionedRegion getPartitionedRegion();
+ PartitionedRegion getPartitionedRegion();
}
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 fd3ce7e..f43c2c0 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
@@ -17,7 +17,6 @@ package org.apache.geode.internal.cache.partitioned;
import java.util.Set;
import org.apache.geode.cache.partition.PartitionRegionInfo;
-import org.apache.geode.internal.cache.persistence.PersistentMemberID;
/**
* Extends <code>PartitionRegionInfo</code> with internal-only methods.
@@ -30,10 +29,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();
}
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 ad3d8d1..89c5ca6 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);
}
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);
}
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 98a4033..8cff4d5 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();
}
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 b715dc6..793c8a3 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);
}
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 e1ff830..47246c4 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
@@ -18,7 +18,18 @@ package org.apache.geode.internal.cache.partitioned;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import java.util.*;
+import java.util.AbstractSet;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Queue;
+import java.util.Set;
+import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Semaphore;
@@ -28,7 +39,6 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.DataSerializable;
import org.apache.geode.DataSerializer;
-import org.apache.geode.InternalGemFireException;
import org.apache.geode.cache.InterestPolicy;
import org.apache.geode.cache.LowMemoryException;
import org.apache.geode.cache.Region;
@@ -38,10 +48,21 @@ import org.apache.geode.distributed.internal.ProfileListener;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.InternalDataSerializer;
-import org.apache.geode.internal.cache.*;
+import org.apache.geode.internal.cache.BucketAdvisor;
import org.apache.geode.internal.cache.BucketAdvisor.BucketProfile;
import org.apache.geode.internal.cache.BucketAdvisor.ServerBucketProfile;
+import org.apache.geode.internal.cache.BucketPersistenceAdvisor;
+import org.apache.geode.internal.cache.BucketRegion;
+import org.apache.geode.internal.cache.BucketServerLocation66;
+import org.apache.geode.internal.cache.CacheDistributionAdvisor;
+import org.apache.geode.internal.cache.EntryEventImpl;
+import org.apache.geode.internal.cache.FixedPartitionAttributesImpl;
+import org.apache.geode.internal.cache.InternalRegionArguments;
+import org.apache.geode.internal.cache.Node;
import org.apache.geode.internal.cache.PRHARedundancyProvider.DataStoreBuckets;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.internal.cache.PartitionedRegionStats;
+import org.apache.geode.internal.cache.ProxyBucketRegion;
import org.apache.geode.internal.cache.control.MemoryThresholds;
import org.apache.geode.internal.cache.control.ResourceAdvisor;
import org.apache.geode.internal.cache.persistence.PersistenceAdvisor;
@@ -1538,7 +1559,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.
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 09317be..adc17a8 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();
}
}
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 4de43ff..bb561eb 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 {
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 291c733..10cbe87 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();
}
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);
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 a9ce682..a356d72 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
@@ -18,7 +18,6 @@ import org.apache.geode.cache.DiskAccessException;
import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.internal.cache.RegionEntry;
import org.apache.geode.internal.cache.RegionMap;
import org.apache.geode.internal.cache.entries.DiskEntry;
import org.apache.geode.internal.cache.versions.RegionVersionHolder;
@@ -32,45 +31,44 @@ 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 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();
}
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 a7fa0f0..562ab77 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
@@ -17,7 +17,6 @@ package org.apache.geode.internal.cache.persistence;
import java.util.EnumSet;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.compression.Compressor;
import org.apache.geode.internal.cache.DiskId;
import org.apache.geode.internal.cache.DiskInitFile.DiskRegionFlag;
import org.apache.geode.internal.cache.DiskStoreImpl;
@@ -31,133 +30,133 @@ import org.apache.geode.internal.cache.versions.RegionVersionVector;
* Contract DiskInitFile needs a DiskRegion to provide.
*/
public interface DiskRegionView extends PersistentMemberView, RegionEntryContext, EvictableRegion {
- 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 void close();
+ void close();
}
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 205cef9..797af5a 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
@@ -18,7 +18,6 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.apache.geode.CancelCriterion;
import org.apache.geode.cache.persistence.ConflictingPersistentDataException;
import org.apache.geode.distributed.internal.ReplyException;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
@@ -33,7 +32,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 +92,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 +102,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 +126,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 +134,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 +146,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 +161,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();
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceAdvisorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceAdvisorImpl.java
index cb9adc3..a28b95a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceAdvisorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistenceAdvisorImpl.java
@@ -14,8 +14,14 @@
*/
package org.apache.geode.internal.cache.persistence;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import java.util.Map.Entry;
+import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.apache.logging.log4j.Logger;
@@ -25,8 +31,12 @@ import org.apache.geode.cache.RegionDestroyedException;
import org.apache.geode.cache.persistence.ConflictingPersistentDataException;
import org.apache.geode.cache.persistence.RevokedPersistentDataException;
import org.apache.geode.distributed.DistributedLockService;
-import org.apache.geode.distributed.internal.*;
import org.apache.geode.distributed.internal.DistributionAdvisor.Profile;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.MembershipListener;
+import org.apache.geode.distributed.internal.ProfileListener;
+import org.apache.geode.distributed.internal.ReplyException;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.CacheDistributionAdvisor;
import org.apache.geode.internal.cache.CacheDistributionAdvisor.CacheProfile;
@@ -1346,8 +1356,8 @@ public class PersistenceAdvisorImpl implements PersistenceAdvisor {
return online;
}
- public static interface PersistenceAdvisorObserver {
- public default void observe(String regionPath) {}
+ public interface PersistenceAdvisorObserver {
+ default void observe(String regionPath) {}
}
public static void setPersistenceAdvisorObserver(PersistenceAdvisorObserver o) {
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..4ebe6c3 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
@@ -14,8 +14,6 @@
*/
package org.apache.geode.internal.cache.persistence;
-import org.apache.geode.cache.Region;
-
/**
* Used for test hooks to during the persistence process.
*
@@ -39,39 +37,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);
}
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 e0f6173..be1f932 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 {
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 9c01ecf..511bfdd 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
@@ -14,9 +14,7 @@
*/
package org.apache.geode.internal.cache.persistence;
-import java.io.IOException;
import java.util.Set;
-import java.util.UUID;
import org.apache.geode.internal.cache.LocalRegion;
@@ -31,22 +29,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 +55,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 +74,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 +86,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 +94,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 +107,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();
}
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);
}
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 {
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 3132da8..6767f22 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
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 b51121d..0624251 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();
}
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 4552137..c08c053 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();
}
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 76dc149..fe201cd 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
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 49bf5e8..621801e 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();
}
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 4272593..eb8cca4 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,
+ void accept(OutputStream out, InputStream in, byte epType, int qSize,
CommunicationMode communicationMode, Principal principal) throws IOException;
}
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 99c68ce..7de068b 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();
}
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 5ba68b0..f915b0d 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
@@ -3018,7 +3018,7 @@ public class CacheClientProxy implements ClientSession {
}
public interface TestHook {
- public void doTestHook(String spot);
+ void doTestHook(String spot);
}
public static TestHook testHook;
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 9776af8..0493508 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;
}
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 8e4c2c0..c3ba428 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
@@ -15,8 +15,6 @@
package org.apache.geode.internal.cache.tier.sockets;
-import java.util.HashMap;
-
import org.apache.geode.internal.cache.EnumListenerEvent;
import org.apache.geode.internal.cache.tier.sockets.ClientUpdateMessageImpl.CqNameToOp;
import org.apache.geode.internal.cache.versions.VersionTag;
@@ -35,40 +33,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 +74,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 +92,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 +105,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();
}
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 9acc003..8efa406 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
@@ -39,12 +39,10 @@ import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.Sendable;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.CachedDeserializableFactory;
-import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.cache.EntryEventImpl.NewValueImporter;
import org.apache.geode.internal.cache.EnumListenerEvent;
import org.apache.geode.internal.cache.EventID;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.internal.cache.Token;
import org.apache.geode.internal.cache.WrappedCallbackArgument;
import org.apache.geode.internal.cache.ha.HAContainerRegion;
import org.apache.geode.internal.cache.tier.MessageType;
@@ -1437,22 +1435,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
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommBufferPool.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommBufferPool.java
index 37bebad..e05a552 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommBufferPool.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommBufferPool.java
@@ -26,11 +26,11 @@ public interface CommBufferPool {
* Set a comm buffer in a ThreadLocal.
*
*/
- public void setTLCommBuffer();
+ void setTLCommBuffer();
/**
* Release the ThreadLocal comm buffer back to the queue.
*
*/
- public void releaseTLCommBuffer();
+ void releaseTLCommBuffer();
}
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 ba7eef0..5950952 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);
}
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 968600d..13867e3 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);
}
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();
}
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);
}
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 c8d80fe..b848081 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);
}
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 402210b..86828ae 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,13 +22,13 @@ 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();
- public void shutDownAckReaderConnection();
+ void shutDownAckReaderConnection();
}
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);
}
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 0111446..f36bcad 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
@@ -31,6 +31,6 @@ public interface Declarable2 extends Declarable {
/**
* Returns the current configuration of this {@link Declarable}
*/
- public Properties getConfig();
+ Properties getConfig();
}
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 4e29aae..0ec8b1a 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
@@ -18,7 +18,6 @@
package org.apache.geode.internal.cache.xmlcache;
import java.util.IllegalFormatException;
-import java.util.Properties;
/**
* @since GemFire 6.6
@@ -26,10 +25,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 +39,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);
}
--
To stop receiving notification emails like this one, please contact
prhomberg@apache.org.