geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prhomb...@apache.org
Subject [geode] branch develop updated: GEODE-4954, GEODE-4955: Remove trivial javadoc stubs and empty blocks: geode-core:internal.cache
Date Fri, 13 Apr 2018 17:10:25 GMT
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 f984c95  GEODE-4954, GEODE-4955: Remove trivial javadoc stubs and empty blocks: geode-core:internal.cache
f984c95 is described below

commit f984c95158dc1569bb692f185ba451f9325ea1ad
Author: Patrick Rhomberg <prhomberg@pivotal.io>
AuthorDate: Fri Apr 13 10:10:21 2018 -0700

    GEODE-4954, GEODE-4955: Remove trivial javadoc stubs and empty blocks: geode-core:internal.cache
---
 .../internal/cache/AbstractBucketRegionQueue.java  |  7 ---
 .../apache/geode/internal/cache/BucketAdvisor.java |  3 -
 .../internal/cache/BucketNotFoundException.java    |  6 --
 .../internal/cache/BucketPersistenceAdvisor.java   |  4 --
 .../geode/internal/cache/BucketRegionQueue.java    |  9 ---
 .../internal/cache/CacheDistributionAdvisor.java   |  1 -
 .../apache/geode/internal/cache/CacheObserver.java |  2 -
 .../geode/internal/cache/CacheServerImpl.java      |  1 -
 .../geode/internal/cache/CacheStatisticsImpl.java  |  4 --
 .../geode/internal/cache/CachedDeserializable.java |  1 -
 .../internal/cache/ClientRegionEventImpl.java      |  5 --
 .../geode/internal/cache/ClientServerObserver.java |  3 -
 .../cache/ClientServerObserverAdapter.java         |  3 -
 .../cache/ClientSubscriptionConfigImpl.java        |  4 --
 .../geode/internal/cache/CloseCacheMessage.java    |  5 --
 .../geode/internal/cache/ColocationLogger.java     |  2 -
 .../internal/cache/DestroyRegionOperation.java     |  3 -
 .../apache/geode/internal/cache/DiskRegion.java    |  1 -
 .../geode/internal/cache/DiskStoreAttributes.java  |  3 -
 .../apache/geode/internal/cache/DiskStoreTask.java |  3 -
 .../internal/cache/DiskWriteAttributesImpl.java    |  7 ---
 .../internal/cache/DistTXPrecommitMessage.java     |  6 --
 .../internal/cache/DistTXRollbackMessage.java      |  3 -
 .../internal/cache/DistributedClearOperation.java  |  6 --
 .../internal/cache/DistributedPutAllOperation.java | 10 ---
 .../cache/DistributedRemoveAllOperation.java       |  9 ---
 .../cache/DistributedTombstoneOperation.java       |  3 -
 .../geode/internal/cache/ExportDiskRegion.java     |  1 -
 .../cache/FixedPartitionAttributesImpl.java        |  3 -
 .../FunctionStreamingOrderedReplyMessage.java      |  4 --
 .../geode/internal/cache/GatewayEventFilter.java   |  4 --
 .../geode/internal/cache/GemFireCacheImpl.java     |  1 -
 .../org/apache/geode/internal/cache/HARegion.java  |  9 ---
 .../cache/InMemoryPersistentMemberView.java        |  3 -
 .../internal/cache/InitialImageOperation.java      |  5 --
 .../geode/internal/cache/InternalCacheEvent.java   |  1 -
 .../geode/internal/cache/InternalDataView.java     | 73 ----------------------
 .../cache/InvalidatePartitionedRegionMessage.java  |  9 ---
 .../internal/cache/InvalidateRegionOperation.java  |  4 --
 .../org/apache/geode/internal/cache/KeyInfo.java   |  6 --
 .../apache/geode/internal/cache/LocalDataSet.java  |  4 --
 .../apache/geode/internal/cache/LocalRegion.java   |  4 --
 .../cache/NonLocalRegionEntryWithStats.java        |  3 -
 .../internal/cache/PRContainsValueFunction.java    |  3 -
 .../internal/cache/PRHARedundancyProvider.java     | 11 ----
 .../cache/PartitionRegionConfigValidator.java      |  7 ---
 .../geode/internal/cache/PartitionedRegion.java    |  7 ---
 .../cache/PartitionedRegionBucketMgmtHelper.java   |  1 -
 .../internal/cache/PartitionedRegionDataStore.java | 24 -------
 .../internal/cache/PartitionedRegionException.java |  1 -
 .../internal/cache/PartitionedRegionHelper.java    |  1 -
 .../cache/PartitionedRegionQueryEvaluator.java     |  3 -
 .../internal/cache/PartitionedRegionStats.java     |  5 --
 .../geode/internal/cache/PoolManagerImpl.java      |  3 -
 .../geode/internal/cache/RegionEventImpl.java      | 12 ----
 .../geode/internal/cache/RegionIdleExpiryTask.java |  3 -
 .../apache/geode/internal/cache/RegionQueue.java   | 14 -----
 .../geode/internal/cache/RegionTTLExpiryTask.java  |  3 -
 .../cache/SearchLoadAndWriteProcessor.java         |  1 -
 .../cache/StoreAllCachedDeserializable.java        |  3 -
 .../geode/internal/cache/TXBucketRegionState.java  |  3 -
 .../org/apache/geode/internal/cache/TXEntry.java   |  3 -
 .../geode/internal/cache/TXEntryStateFactory.java  |  4 --
 .../geode/internal/cache/TXStateInterface.java     |  6 --
 .../apache/geode/internal/cache/TXStateProxy.java  |  2 -
 .../geode/internal/cache/TransactionMessage.java   |  3 -
 .../geode/internal/cache/TxEntryFactory.java       |  4 --
 .../cache/UpdateEntryVersionOperation.java         |  3 -
 .../internal/cache/VMCachedDeserializable.java     |  2 -
 .../geode/internal/cache/VersionTimestamp.java     |  3 -
 .../geode/internal/cache/control/FilterByPath.java |  3 -
 .../cache/control/InternalResourceManager.java     |  6 --
 .../geode/internal/cache/control/MemoryEvent.java  |  2 -
 .../internal/cache/control/MemoryThresholds.java   |  2 -
 .../geode/internal/cache/control/RegionFilter.java |  3 -
 .../internal/cache/control/ResourceEvent.java      |  3 -
 .../internal/cache/entries/OffHeapRegionEntry.java |  1 -
 .../entries/VersionedStatsDiskLRURegionEntry.java  |  3 -
 .../entries/VersionedStatsDiskRegionEntry.java     |  3 -
 .../entries/VersionedStatsLRURegionEntry.java      |  3 -
 .../entries/VersionedThinDiskLRURegionEntry.java   |  3 -
 .../cache/entries/VersionedThinRegionEntry.java    |  3 -
 .../cache/eviction/AbstractEvictionController.java |  1 -
 .../internal/cache/eviction/CountLRUEviction.java  |  1 -
 .../cache/eviction/MemoryLRUController.java        |  1 -
 .../internal/cache/execute/AbstractExecution.java  |  1 -
 .../cache/execute/BucketMovedException.java        |  4 --
 .../cache/execute/DefaultResultCollector.java      |  2 -
 .../DistributedRegionFunctionResultSender.java     |  2 -
 .../DistributedRegionFunctionResultWaiter.java     |  4 --
 .../cache/execute/FunctionExecutionNodePruner.java |  4 --
 .../cache/execute/FunctionServiceStats.java        |  1 -
 .../internal/cache/execute/FunctionStats.java      |  1 -
 .../execute/FunctionStreamingResultCollector.java  |  4 --
 .../internal/cache/execute/InternalExecution.java  |  1 -
 .../cache/execute/InternalFunctionException.java   |  4 --
 .../cache/execute/InternalFunctionService.java     |  6 --
 .../cache/execute/InternalResultSender.java        |  4 --
 .../cache/execute/MemberFunctionResultSender.java  |  8 ---
 .../cache/execute/MemberFunctionResultWaiter.java  |  4 --
 .../execute/MultiRegionFunctionResultWaiter.java   |  4 --
 .../PartitionedRegionFunctionResultSender.java     |  8 ---
 .../cache/execute/ServerFunctionExecutor.java      |  4 --
 .../ServerToClientFunctionResultSender.java        |  2 -
 .../cache/execute/StreamingFunctionOperation.java  |  2 -
 .../geode/internal/cache/ha/HAContainerMap.java    |  4 --
 .../geode/internal/cache/ha/HARegionQueue.java     |  3 -
 .../internal/cache/ha/HARegionQueueAttributes.java |  6 --
 .../geode/internal/cache/ha/ThreadIdentifier.java  |  2 -
 .../cache/partitioned/ColocatedRegionDetails.java  |  4 --
 .../cache/partitioned/CreateBucketMessage.java     |  1 -
 .../internal/cache/partitioned/DestroyMessage.java |  1 -
 .../partitioned/EndBucketCreationMessage.java      |  1 -
 .../cache/partitioned/FetchBulkEntriesMessage.java |  1 -
 .../cache/partitioned/FetchKeysMessage.java        |  5 --
 .../partitioned/FetchPartitionDetailsMessage.java  |  2 -
 .../internal/cache/partitioned/FlushMessage.java   |  3 -
 .../internal/cache/partitioned/GetMessage.java     |  3 -
 .../cache/partitioned/IdentityRequestMessage.java  |  1 -
 .../cache/partitioned/IndexCreationMsg.java        |  1 -
 .../cache/partitioned/InvalidateMessage.java       |  2 -
 .../partitioned/ManageBackupBucketMessage.java     |  2 -
 .../cache/partitioned/ManageBucketMessage.java     |  1 -
 .../cache/partitioned/OfflineMemberDetails.java    |  3 -
 .../partitioned/OfflineMemberDetailsImpl.java      |  3 -
 .../partitioned/PRUpdateEntryVersionMessage.java   | 12 ----
 .../PartitionMessageWithDirectReply.java           |  3 -
 .../partitioned/PartitionedRegionRebalanceOp.java  |  2 -
 .../internal/cache/partitioned/PutMessage.java     |  2 -
 .../cache/partitioned/RecoveryRunnable.java        |  3 -
 .../partitioned/RedundancyAlreadyMetException.java |  3 -
 .../cache/partitioned/RedundancyLogger.java        |  1 -
 .../internal/cache/partitioned/RegionAdvisor.java  |  6 --
 .../cache/partitioned/RemoveIndexesMessage.java    |  1 -
 .../partitioned/StreamingPartitionOperation.java   |  3 -
 .../cache/partitioned/rebalance/model/Member.java  |  1 -
 .../model/PartitionedRegionLoadModel.java          |  2 -
 .../cache/persistence/CanonicalIdHolder.java       |  1 -
 .../cache/persistence/DiskInitFileInterpreter.java | 59 -----------------
 .../cache/persistence/DiskInitFileParser.java      |  3 -
 .../internal/cache/persistence/DiskStoreID.java    |  3 -
 .../cache/persistence/MembershipFlushRequest.java  |  3 -
 .../cache/persistence/MembershipViewRequest.java   |  3 -
 .../cache/persistence/PRPersistentConfig.java      |  3 -
 .../cache/persistence/PersistenceAdvisor.java      |  5 --
 .../cache/persistence/PersistenceAdvisorImpl.java  |  3 -
 .../cache/persistence/PersistentMemberID.java      |  3 -
 .../cache/persistence/PersistentMemberManager.java |  3 -
 .../cache/persistence/PersistentMemberState.java   |  3 -
 .../cache/persistence/PersistentMemberView.java    |  1 -
 .../persistence/PersistentStateQueryMessage.java   |  3 -
 .../PrepareNewPersistentMemberMessage.java         |  3 -
 .../persistence/RemovePersistentMemberMessage.java |  3 -
 .../geode/internal/cache/snapshot/GFSnapshot.java  |  1 -
 .../cache/tier/sockets/CacheClientNotifier.java    |  1 -
 .../cache/tier/sockets/CacheClientProxy.java       |  4 --
 .../cache/tier/sockets/CacheServerHelper.java      |  3 -
 .../cache/tier/sockets/CacheServerStats.java       |  2 -
 .../tier/sockets/ClientDataSerializerMessage.java  |  5 --
 .../cache/tier/sockets/ClientHealthMonitor.java    |  1 -
 .../internal/cache/tier/sockets/ClientMessage.java |  1 -
 .../cache/tier/sockets/ClientTombstoneMessage.java |  4 --
 .../tier/sockets/ClientUpdateMessageImpl.java      |  6 --
 .../cache/tier/sockets/HAEventWrapper.java         |  4 --
 .../geode/internal/cache/tier/sockets/Message.java |  1 -
 .../cache/tier/sockets/ObjectPartList651.java      |  7 ---
 .../tier/sockets/OldClientSupportService.java      |  1 -
 .../tier/sockets/OriginalServerConnection.java     | 10 ---
 .../tier/sockets/SerializedObjectPartList.java     |  3 -
 .../cache/tier/sockets/ServerConnection.java       |  1 -
 .../cache/tier/sockets/VersionedObjectList.java    |  5 --
 .../cache/tier/sockets/command/ClearRegion.java    |  3 -
 .../cache/tier/sockets/command/ClientReady.java    |  3 -
 .../tier/sockets/command/CloseConnection.java      |  3 -
 .../cache/tier/sockets/command/CommitCommand.java  |  3 -
 .../cache/tier/sockets/command/Default.java        |  3 -
 .../cache/tier/sockets/command/Destroy70.java      |  6 --
 .../tier/sockets/command/ExecuteFunction70.java    |  3 -
 .../cache/tier/sockets/command/Invalid.java        |  3 -
 .../cache/tier/sockets/command/Invalidate70.java   |  3 -
 .../cache/tier/sockets/command/KeySet.java         |  3 -
 .../cache/tier/sockets/command/MakePrimary.java    |  3 -
 .../cache/tier/sockets/command/PeriodicAck.java    |  3 -
 .../internal/cache/tier/sockets/command/Ping.java  |  3 -
 .../internal/cache/tier/sockets/command/Put70.java |  6 --
 .../cache/tier/sockets/command/QueryGeode10.java   |  3 -
 .../command/QueryWithParametersGeode10.java        |  3 -
 .../sockets/command/RegisterInstantiators.java     |  3 -
 .../tier/sockets/command/RegisterInterest.java     |  3 -
 .../sockets/command/UnregisterInterestList.java    |  3 -
 .../geode/internal/cache/tx/DistTxEntryEvent.java  | 18 ------
 .../internal/cache/tx/PartitionedTXRegionStub.java |  1 -
 .../internal/cache/tx/RemoteFetchKeysMessage.java  |  6 --
 .../cache/tx/RemoteFetchVersionMessage.java        |  3 -
 .../geode/internal/cache/tx/RemoteGetMessage.java  |  1 -
 .../internal/cache/tx/TransactionalOperation.java  |  4 --
 .../ConcurrentCacheModificationException.java      |  3 -
 .../cache/versions/RegionVersionHolder.java        |  2 -
 .../cache/versions/RegionVersionVector.java        | 13 ----
 .../geode/internal/cache/versions/VersionTag.java  |  4 --
 .../internal/cache/wan/AbstractGatewaySender.java  |  6 --
 .../wan/AbstractGatewaySenderEventProcessor.java   |  5 --
 .../geode/internal/cache/wan/BatchException70.java |  1 -
 .../wan/GatewaySenderConfigurationException.java   |  3 -
 .../wan/GatewaySenderEventCallbackDispatcher.java  |  1 -
 .../internal/cache/wan/GatewaySenderEventImpl.java |  3 -
 .../ConcurrentParallelGatewaySenderQueue.java      |  3 -
 ...oncurrentSerialGatewaySenderEventProcessor.java | 10 ---
 .../cache/wan/serial/SerialGatewaySenderQueue.java |  9 ---
 .../internal/cache/xmlcache/BindingCreation.java   |  2 -
 .../cache/xmlcache/CacheServerCreation.java        |  3 -
 .../geode/internal/cache/xmlcache/CacheXml.java    | 27 --------
 .../internal/cache/xmlcache/CacheXmlGenerator.java |  4 --
 .../internal/cache/xmlcache/CacheXmlParser.java    | 12 ----
 .../cache/xmlcache/CacheXmlPropertyResolver.java   |  9 ---
 .../xmlcache/CacheXmlPropertyResolverHelper.java   |  9 ---
 .../xmlcache/DiskStoreAttributesCreation.java      |  5 --
 .../internal/cache/xmlcache/PropertyResolver.java  |  5 --
 .../cache/xmlcache/RegionAttributesCreation.java   |  5 --
 .../internal/cache/xmlcache/RegionCreation.java    | 11 ----
 .../cache/xmlcache/SerializerCreation.java         | 10 ---
 .../internal/cache/xmlcache/XmlGenerator.java      |  1 -
 222 files changed, 1003 deletions(-)

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
index 32dfb80..af62f74 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
@@ -372,10 +372,7 @@ public abstract class AbstractBucketRegionQueue extends BucketRegion {
    * sure that the value is in the Bucket before the eventSeqNumQueue is available for
    * peek/remove/take from other thread.
    *
-   * @param key
-   * @param value
    * @return boolean which shows whether the operation was successful or not.
-   * @throws ForceReattemptException
    */
   public boolean addToQueue(Object key, Object value) throws ForceReattemptException {
 
@@ -488,10 +485,6 @@ public abstract class AbstractBucketRegionQueue extends BucketRegion {
     return this.initialized;
   }
 
-  /**
-   *
-   * @param key
-   */
   public void addToFailedBatchRemovalMessageKeys(Object key) {
     failedBatchRemovalMessageKeys.add(key);
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java
index bfe7472..4708fd9 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java
@@ -488,7 +488,6 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
    * We can't call this method from BucketAdvisor.profileRemoved, because the primaryElector may not
    * actually host the bucket.
    *
-   * @param profile
    */
   public void checkForLostPrimaryElector(Profile profile) {
     // If the member that went away was in the middle of creating
@@ -680,7 +679,6 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
   /**
    * Only for local profile.
    *
-   * @param p
    */
   public synchronized void updateServerBucketProfile(BucketProfile p) {
     this.localProfile = p;
@@ -2725,7 +2723,6 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
      *
      * @param volunteeringTask the task to queue and then execute in waiting thread pool
      *
-     * @throws InterruptedException
      */
     private void execute(Runnable volunteeringTask) throws InterruptedException {
       // @todo: instead of having a semaphore and queue on RegionAdvisor
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketNotFoundException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketNotFoundException.java
index 4814e6f..7055fda 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketNotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketNotFoundException.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache;
 
 /**
@@ -25,9 +22,6 @@ package org.apache.geode.internal.cache;
 public class BucketNotFoundException extends ForceReattemptException {
   private static final long serialVersionUID = 2898657229184289911L;
 
-  /**
-   * @param message
-   */
   public BucketNotFoundException(String message) {
     super(message);
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketPersistenceAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketPersistenceAdvisor.java
index 42d758d..e3602d2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketPersistenceAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketPersistenceAdvisor.java
@@ -42,9 +42,6 @@ import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 import org.apache.geode.internal.logging.log4j.LogMarker;
 import org.apache.geode.internal.util.TransformUtils;
 
-/**
- *
- */
 public class BucketPersistenceAdvisor extends PersistenceAdvisorImpl {
 
   private static final Logger logger = LogService.getLogger();
@@ -322,7 +319,6 @@ public class BucketPersistenceAdvisor extends PersistenceAdvisorImpl {
   /**
    * Callers should have already verified that debug output is enabled.
    *
-   * @param infoMsg
    */
   public void dump(String infoMsg) {
     storage.getOnlineMembers();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegionQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegionQueue.java
index 4109384..07c32a1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegionQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegionQueue.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache;
 
 import java.util.ArrayList;
@@ -53,9 +50,6 @@ import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.offheap.OffHeapRegionEntryHelper;
 import org.apache.geode.internal.offheap.annotations.Released;
 
-/**
- *
- */
 public class BucketRegionQueue extends AbstractBucketRegionQueue {
 
   private static final Logger logger = LogService.getLogger();
@@ -502,7 +496,6 @@ public class BucketRegionQueue extends AbstractBucketRegionQueue {
    * It removes the first key from the queue.
    *
    * @return Returns the key for which value was destroyed.
-   * @throws ForceReattemptException
    */
   public Object remove() throws ForceReattemptException {
     Object key = this.eventSeqNumDeque.removeFirst();
@@ -516,8 +509,6 @@ public class BucketRegionQueue extends AbstractBucketRegionQueue {
    * It removes the first key from the queue.
    *
    * @return Returns the value.
-   * @throws InterruptedException
-   * @throws ForceReattemptException
    */
   public Object take() throws InterruptedException, ForceReattemptException {
     throw new UnsupportedOperationException();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisor.java
index ed52f28..d9efd55 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheDistributionAdvisor.java
@@ -643,7 +643,6 @@ public class CacheDistributionAdvisor extends DistributionAdvisor {
     }
 
     /**
-     * @param bits
      * @return true if the serialized message has a persistentID
      */
     private boolean hasPersistentID(int bits) {
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 eadfac2..1fa605b 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
@@ -164,14 +164,12 @@ public interface CacheObserver {
   /**
    * Invoked by the compactor thread just before deleting a compacted oplog
    *
-   * @param compactedOplog
    */
   void beforeDeletingCompactedOplog(Oplog compactedOplog);
 
   /**
    * Invoked just before deleting an empty oplog
    *
-   * @param emptyOplog
    */
   void beforeDeletingEmptyOplog(Oplog emptyOplog);
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
index 6f7f7ee..7237f42 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheServerImpl.java
@@ -655,7 +655,6 @@ public class CacheServerImpl extends AbstractCacheServer implements Distribution
   /**
    * Generates the name for the client subscription using the given id.
    *
-   * @return String
    * @since GemFire 5.7
    */
   public static String generateNameForClientMsgsRegion(int id) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheStatisticsImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheStatisticsImpl.java
index 1333a06..12f5fd4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheStatisticsImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheStatisticsImpl.java
@@ -18,10 +18,6 @@ package org.apache.geode.internal.cache;
 import org.apache.geode.cache.*;
 import org.apache.geode.internal.InternalStatisticsDisabledException;
 
-/**
- *
- *
- */
 class CacheStatisticsImpl implements CacheStatistics {
   private final InternalRegion region;
   private final RegionEntry regionEntry;
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 71beef7..4ccb64d 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
@@ -88,7 +88,6 @@ public interface CachedDeserializable extends Sizeable {
    * de-serialization until the last possible moment to provide better parallelism
    *
    * @param out the stream to write on
-   * @throws IOException
    */
   void writeValueAsByteArray(DataOutput out) throws IOException;
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientRegionEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientRegionEventImpl.java
index 184ae1a..cd82557 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientRegionEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientRegionEventImpl.java
@@ -44,11 +44,6 @@ public class ClientRegionEventImpl extends RegionEventImpl {
   /**
    * To be called from the Distributed Message without setting EventID
    *
-   * @param region
-   * @param op
-   * @param callbackArgument
-   * @param originRemote
-   * @param distributedMember
    */
   public ClientRegionEventImpl(LocalRegion region, Operation op, Object callbackArgument,
       boolean originRemote, DistributedMember distributedMember, ClientProxyMembershipID contx) {
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 37834c0..daa0e7c 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
@@ -60,14 +60,12 @@ public interface ClientServerObserver {
   /**
    * Invoked before sending an instantiator message to server
    *
-   * @param eventId
    */
   void beforeSendingToServer(EventID eventId);
 
   /**
    * Invoked after sending an instantiator message to server
    *
-   * @param eventId
    */
   void afterReceivingFromServer(EventID eventId);
 
@@ -79,7 +77,6 @@ public interface ClientServerObserver {
   /**
    * Invoked after Message is created
    *
-   * @param msg
    */
   void afterMessageCreation(Message msg);
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverAdapter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverAdapter.java
index 1d99721..83bbc76 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientServerObserverAdapter.java
@@ -56,7 +56,6 @@ public class ClientServerObserverAdapter implements ClientServerObserver {
   /**
    * Invoked before sending an instantiator message to server
    *
-   * @param eventId
    */
   public void beforeSendingToServer(EventID eventId) {
 
@@ -65,7 +64,6 @@ public class ClientServerObserverAdapter implements ClientServerObserver {
   /**
    * Invoked after sending an instantiator message to server
    *
-   * @param eventId
    */
   public void afterReceivingFromServer(EventID eventId) {
 
@@ -81,7 +79,6 @@ public class ClientServerObserverAdapter implements ClientServerObserver {
   /**
    * Invoked after Message is created
    *
-   * @param msg
    */
   public void afterMessageCreation(Message msg) {
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientSubscriptionConfigImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientSubscriptionConfigImpl.java
index cca7856..63a4822 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ClientSubscriptionConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ClientSubscriptionConfigImpl.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache;
 
 import org.apache.geode.cache.server.ClientSubscriptionConfig;
@@ -154,7 +151,6 @@ public class ClientSubscriptionConfigImpl implements ClientSubscriptionConfig {
   /**
    * Sets the disk store name for overflow
    *
-   * @param diskStoreName
    * @since GemFire prPersistSprint2
    */
   public void setDiskStoreName(String diskStoreName) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CloseCacheMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CloseCacheMessage.java
index 523eaf6..ea3fffe 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CloseCacheMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CloseCacheMessage.java
@@ -29,11 +29,6 @@ import org.apache.geode.distributed.internal.ReplyMessage;
 import org.apache.geode.internal.logging.LogService;
 
 
-/**
- *
- *
- */
-
 /** Creates a new instance of CloseCacheMessage */
 public class CloseCacheMessage extends HighPriorityDistributionMessage implements MessageWithReply {
   private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ColocationLogger.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ColocationLogger.java
index f397e40..7cf761e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ColocationLogger.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ColocationLogger.java
@@ -86,7 +86,6 @@ public class ColocationLogger implements Runnable {
    * Writes a log entry every SLEEP_PERIOD when there are missing colocated child regions for this
    * region.
    *
-   * @throws InterruptedException
    */
   private void run2() throws InterruptedException {
     boolean firstLogIteration = true;
@@ -144,7 +143,6 @@ public class ColocationLogger implements Runnable {
    * method performs an on-demand update of the list so if called between logging intervals the
    * returned list is current.
    *
-   * @return missingChildren
    */
   public List<String> updateAndGetMissingChildRegions() {
     synchronized (loggerLock) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java
index b5b2cd1..abe3b3f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DestroyRegionOperation.java
@@ -46,9 +46,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 
-/**
- *
- */
 public class DestroyRegionOperation extends DistributedCacheOperation {
 
   private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegion.java
index 18d6072..e3db212 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskRegion.java
@@ -430,7 +430,6 @@ public class DiskRegion extends AbstractDiskRegion {
   /**
    * Get serialized form of data off the disk
    *
-   * @param id
    * @since GemFire 5.7
    */
   public Object getSerializedData(DiskId id) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreAttributes.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreAttributes.java
index f5965e2..d494425 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreAttributes.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache;
 
 import java.io.File;
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 2dfd2c7..103136a 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
@@ -14,9 +14,6 @@
  */
 package org.apache.geode.internal.cache;
 
-/**
- *
- */
 public interface DiskStoreTask extends Runnable {
 
   void taskCancelled();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskWriteAttributesImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskWriteAttributesImpl.java
index c9bcd96..8193f79 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskWriteAttributesImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskWriteAttributesImpl.java
@@ -132,7 +132,6 @@ public class DiskWriteAttributesImpl implements DiskWriteAttributes {
    * <li>byte-threshold = 0 bytes
    * </ul>
    *
-   * @param properties
    *
    * @throws IllegalArgumentException If any of the properties specified are not in the expected
    *         format.
@@ -214,8 +213,6 @@ public class DiskWriteAttributesImpl implements DiskWriteAttributes {
    * Verifys if the propertyString passed is a valid boolean value or null else throws an
    * IllegalArgument exception
    *
-   * @param propertyString
-   * @param property
    * @throws IllegalArgumentException if the property string passed does not represent a boolean or
    *         null
    *
@@ -232,8 +229,6 @@ public class DiskWriteAttributesImpl implements DiskWriteAttributes {
    * Verifys if the string passed, is in a number format which is acceptable and returns the long
    * value of the string.
    *
-   * @param propertyString
-   * @param property
    * @return the long value of the string
    */
   private long verifyLongInString(String propertyString, String property) {
@@ -259,8 +254,6 @@ public class DiskWriteAttributesImpl implements DiskWriteAttributes {
    * Verifys if the string passed, is in a number format which is acceptable and returns the int
    * value of the string.
    *
-   * @param propertyString
-   * @param property
    * @return the int value of the string
    */
   private int verifyPercentInString(String propertyString, String property) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java
index b7ba749..1433aea 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java
@@ -53,9 +53,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LogMarker;
 
-/**
- *
- */
 public class DistTXPrecommitMessage extends TXMessage {
 
   private static final Logger logger = LogService.getLogger();
@@ -392,7 +389,6 @@ public class DistTXPrecommitMessage extends TXMessage {
      * Determine if the commit processing was incomplete, if so throw a detailed exception
      * indicating the source of the problem
      *
-     * @param msgMap
      */
     public void handlePotentialCommitFailure(
         HashMap<DistributedMember, DistTXCoordinatorInterface> msgMap) {
@@ -440,8 +436,6 @@ public class DistTXPrecommitMessage extends TXMessage {
     /**
      * Protected by (this)
      *
-     * @param member
-     * @param exceptions
      */
     public void addExceptionsFromMember(InternalDistributedMember member, Set exceptions) {
       for (Iterator iter = exceptions.iterator(); iter.hasNext();) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java
index 16a15cd..3770e79 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java
@@ -48,9 +48,6 @@ import org.apache.geode.internal.cache.tx.RemoteOperationMessage.RemoteOperation
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LogMarker;
 
-/**
- *
- */
 public class DistTXRollbackMessage extends TXMessage {
 
   private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java
index 9f06b06..ebabb4e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedClearOperation.java
@@ -29,10 +29,6 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
 import org.apache.geode.internal.cache.versions.RegionVersionVector;
 import org.apache.geode.internal.cache.versions.VersionTag;
 
-/**
- *
- *
- */
 public class DistributedClearOperation extends DistributedCacheOperation {
   public static enum OperationType {
     OP_LOCK_FOR_CLEAR, OP_CLEAR,
@@ -73,7 +69,6 @@ public class DistributedClearOperation extends DistributedCacheOperation {
    * obtain locks on version generation in other members have them do a state-flush back to this
    * member
    *
-   * @param recipients
    */
   public static void lockAndFlushToOthers(RegionEventImpl regionEvent,
       Set<InternalDistributedMember> recipients) {
@@ -111,7 +106,6 @@ public class DistributedClearOperation extends DistributedCacheOperation {
   /**
    * Creates new instance of DistributedClearOperation
    *
-   * @param recipients
    */
   private DistributedClearOperation(OperationType op, RegionEventImpl event,
       RegionVersionVector rvv, Set<InternalDistributedMember> recipients) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java
index 92bf72e..3fd97d1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java
@@ -641,7 +641,6 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation {
      * transmit them as nulls to cut costs, but have to do the swap on the receiving end (in the
      * client)
      *
-     * @param sender
      */
     public void replaceNullIDs(DistributedMember sender) {
       for (VersionTag versionTag : this) {
@@ -838,7 +837,6 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation {
    * Create PutAllPRMessage for notify only (to adjunct nodes)
    *
    * @param bucketId create message to send to this bucket
-   * @return PutAllPRMessage
    */
   public PutAllPRMessage createPRMessagesNotifyOnly(int bucketId) {
     final EntryEventImpl event = getBaseEvent();
@@ -1026,7 +1024,6 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation {
    * version tags are gathered from local operations and remote operation responses. This method
    * gathers all of them and stores them in the given list.
    *
-   * @param list
    */
   protected void fillVersionedObjectList(VersionedObjectList list) {
     for (PutAllEntryData entry : this.putAllData) {
@@ -1118,13 +1115,6 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation {
     /**
      * create an event for a PutAllEntryData element
      *
-     * @param entry
-     * @param sender
-     * @param context
-     * @param rgn
-     * @param possibleDuplicate
-     * @param needsRouting
-     * @param callbackArg
      * @return the event to be used in applying the element
      */
     @Retained
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
index d254e78..c0c4cf7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
@@ -610,7 +610,6 @@ public class DistributedRemoveAllOperation extends AbstractUpdateOperation {
    * Create RemoveAllPRMessage for notify only (to adjunct nodes)
    *
    * @param bucketId create message to send to this bucket
-   * @return RemoveAllPRMessage
    */
   public RemoveAllPRMessage createPRMessagesNotifyOnly(int bucketId) {
     final EntryEventImpl event = getBaseEvent();
@@ -798,7 +797,6 @@ public class DistributedRemoveAllOperation extends AbstractUpdateOperation {
    * version tags are gathered from local operations and remote operation responses. This method
    * gathers all of them and stores them in the given list.
    *
-   * @param list
    */
   protected void fillVersionedObjectList(VersionedObjectList list) {
     for (RemoveAllEntryData entry : this.removeAllData) {
@@ -906,13 +904,6 @@ public class DistributedRemoveAllOperation extends AbstractUpdateOperation {
     /**
      * create an event for a RemoveAllEntryData element
      *
-     * @param entry
-     * @param sender
-     * @param context
-     * @param rgn
-     * @param possibleDuplicate
-     * @param needsRouting
-     * @param callbackArg
      * @return the event to be used in applying the element
      */
     @Retained
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedTombstoneOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedTombstoneOperation.java
index dc8c7e4..47adee0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedTombstoneOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedTombstoneOperation.java
@@ -35,9 +35,6 @@ import org.apache.geode.internal.cache.FilterRoutingInfo.FilterInfo;
 import org.apache.geode.internal.cache.persistence.DiskStoreID;
 import org.apache.geode.internal.cache.versions.VersionSource;
 
-/**
- *
- */
 public class DistributedTombstoneOperation extends DistributedCacheOperation {
   private enum TOperation {
     GC,
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 0b29c21..a3036de 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
@@ -76,7 +76,6 @@ public class ExportDiskRegion extends ValidatingDiskRegion {
      * 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
      */
     void writeBatch(Map<Object, RecoveredEntry> entries) throws IOException;
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/FixedPartitionAttributesImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/FixedPartitionAttributesImpl.java
index c548bf5..3290045 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/FixedPartitionAttributesImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/FixedPartitionAttributesImpl.java
@@ -32,9 +32,6 @@ import org.apache.geode.distributed.internal.DistributionConfig;
 
 public class FixedPartitionAttributesImpl extends FixedPartitionAttributes
     implements DataSerializable {
-  /**
-   *
-   */
   private static final long serialVersionUID = 7435010874879693776L;
 
   /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingOrderedReplyMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingOrderedReplyMessage.java
index 2ca6e51..1f552d0 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingOrderedReplyMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/FunctionStreamingOrderedReplyMessage.java
@@ -23,10 +23,6 @@ import org.apache.geode.distributed.internal.ReplyException;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.logging.LogService;
 
-/**
- *
- *
- */
 public class FunctionStreamingOrderedReplyMessage extends FunctionStreamingReplyMessage {
   private static final Logger logger = LogService.getLogger();
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GatewayEventFilter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GatewayEventFilter.java
index 1cf639c..6d11ff0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GatewayEventFilter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GatewayEventFilter.java
@@ -14,10 +14,6 @@
  */
 package org.apache.geode.internal.cache;
 
-/**
- *
- *
- */
 public interface GatewayEventFilter {
   boolean enqueueEvent(EntryEventImpl event);
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index f8140ce..85c975d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -1028,7 +1028,6 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
   /**
    * Used by Hydra tests to get handle of Rest Agent
    *
-   * @return RestAgent
    */
   @Override
   public RestAgent getRestAgent() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java
index d6d0e2c..7246822 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/HARegion.java
@@ -121,7 +121,6 @@ public class HARegion extends DistributedRegion {
   /**
    * void implementation over-riding the method to allow localDestroy on mirrored regions
    *
-   * @param event
    */
   @Override
   protected void checkIfReplicatedAndLocalDestroy(EntryEventImpl event) {}
@@ -245,10 +244,7 @@ public class HARegion extends DistributedRegion {
    * @param cache the cache that owns this region
    * @param ra attributes of the region
    * @return an instance of an HARegion
-   * @throws TimeoutException
    * @throws RegionExistsException if a region of the same name exists in the same Cache
-   * @throws IOException
-   * @throws ClassNotFoundException
    */
   public static HARegion getInstance(String regionName, InternalCache cache, HARegionQueue hrq,
       RegionAttributes ra)
@@ -456,9 +452,7 @@ public class HARegion extends DistributedRegion {
    * Record cache event state for a potential initial image provider. This is used to install event
    * state when the sender is selected as initial image provider.
    *
-   * @param sender
    *
-   * @param eventState
    */
   @Override
   public void recordEventState(InternalDistributedMember sender, Map eventState) {
@@ -485,9 +479,6 @@ public class HARegion extends DistributedRegion {
 
   /** HARegions have their own advisors so that interest registration state can be tracked */
   public static class HARegionAdvisor extends CacheDistributionAdvisor {
-    /**
-     * @param region
-     */
     private HARegionAdvisor(CacheDistributionAdvisee region) {
       super(region);
     }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InMemoryPersistentMemberView.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InMemoryPersistentMemberView.java
index a6d0181..8c2a12d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InMemoryPersistentMemberView.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InMemoryPersistentMemberView.java
@@ -26,9 +26,6 @@ import org.apache.geode.internal.cache.persistence.PersistentMemberPattern;
 import org.apache.geode.internal.cache.persistence.PersistentMemberState;
 import org.apache.geode.internal.cache.persistence.PersistentMemberView;
 
-/**
- *
- */
 public class InMemoryPersistentMemberView implements PersistentMemberView {
   private Map<PersistentMemberID, PersistentMemberState> members =
       new ConcurrentHashMap<PersistentMemberID, PersistentMemberState>();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
index 58e05dc..e4e5278 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
@@ -235,7 +235,6 @@ public class InitialImageOperation {
    *
    * @param recipientSet list of candidates to fetch from
    * @param targetReinitialized true if candidate should wait until initialized before responding
-   * @param advice
    * @param recoveredRVV recovered rvv
    * @return true if succeeded to get image
    * @throws org.apache.geode.cache.TimeoutException
@@ -761,7 +760,6 @@ public class InitialImageOperation {
   /**
    * transfer interest/cq registrations from the image provider to this VM
    *
-   * @param recipient
    * @return whether the operation succeeded in transferring anything
    */
   private boolean requestFilterInfo(InternalDistributedMember recipient) {
@@ -1889,7 +1887,6 @@ public class InitialImageOperation {
      *
      * @param versionVector requester's region version vector
      * @param unfinishedKeys keys of unfinished operation (persistent region only)
-     * @param flowControl
      * @return true if finished all chunks, false if stopped early
      */
     protected boolean chunkEntries(DistributedRegion rgn, int chunkSizeInBytes,
@@ -3194,7 +3191,6 @@ public class InitialImageOperation {
      * transmit them as nulls to cut costs, but have to do the swap on the receiving end (in the
      * client)
      *
-     * @param sender
      */
     public void replaceNullIDs(DistributedMember sender) {
       for (VersionTag versionTag : versionTags) {
@@ -3683,7 +3679,6 @@ public class InitialImageOperation {
     /**
      * Registers the filters associated with this client on current cache region.
      *
-     * @param region
      */
     public void registerFilters(LocalRegion region) {
       CacheClientNotifier ccn = CacheClientNotifier.getInstance();
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 13ca9d0..40562d4 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
@@ -54,7 +54,6 @@ public interface InternalCacheEvent extends CacheEvent {
   /**
    * Returns the Operation type.
    *
-   * @return eventType
    */
   EnumListenerEvent getEventType();
 
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 8bc3e56..8559709 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
@@ -34,11 +34,6 @@ import org.apache.geode.internal.offheap.annotations.Retained;
 public interface InternalDataView {
 
   /**
-   * @param keyInfo
-   * @param localRegion
-   * @param updateStats
-   * @param disableCopyOnRead
-   * @param preferCD
    * @param clientEvent TODO
    * @param returnTombstones TODO
    * @param retainResult if true then the result may be a retained off-heap reference
@@ -50,8 +45,6 @@ public interface InternalDataView {
       boolean returnTombstones, boolean retainResult);
 
   /**
-   * @param event
-   * @param cacheWrite
    * @param expectedOldValue TODO
    * @throws EntryNotFoundException if the entry is not found in the view
    */
@@ -63,9 +56,6 @@ public interface InternalDataView {
    * Invalidate the entry
    *
    * @see Region#invalidate(Object)
-   * @param event
-   * @param invokeCallbacks
-   * @param forceNewEntry
    */
   void invalidateExistingEntry(EntryEventImpl event, boolean invokeCallbacks,
       boolean forceNewEntry);
@@ -73,47 +63,24 @@ public interface InternalDataView {
   /**
    * get the entry count
    *
-   * @param localRegion
    * @return the entry count
    */
   int entryCount(LocalRegion localRegion);
 
-  /**
-   * @param keyInfo
-   * @param localRegion
-   * @param rememberRead
-   * @return TODO
-   */
   Object getValueInVM(KeyInfo keyInfo, LocalRegion localRegion, boolean rememberRead);
 
   /**
-   * @param keyInfo
-   * @param localRegion
    * @return true if key exists, false otherwise
    */
   boolean containsKey(KeyInfo keyInfo, LocalRegion localRegion);
 
-  /**
-   * @param keyInfo
-   * @param localRegion
-   * @return TODO
-   */
   boolean containsValueForKey(KeyInfo keyInfo, LocalRegion localRegion);
 
-  /**
-   * @param keyInfo
-   * @param localRegion
-   * @param allowTombstones
-   * @return TODO
-   */
   Entry getEntry(KeyInfo keyInfo, LocalRegion localRegion, boolean allowTombstones);
 
   /**
    * get entry for the key. Called only on farside.
    *
-   * @param key
-   * @param localRegion
-   * @param allowTombstones
    * @return the entry on the remote data store
    */
   Entry getEntryOnRemote(KeyInfo key, LocalRegion localRegion, boolean allowTombstones)
@@ -123,12 +90,6 @@ public interface InternalDataView {
    * Put or create an entry in the data view.
    *
    * @param event specifies the new or updated value
-   * @param ifNew
-   * @param ifOld
-   * @param expectedOldValue
-   * @param requireOldValue
-   * @param overwriteDestroyed
-   * @param lastModified
    * @return true if operation updated existing data, otherwise false
    */
   boolean putEntry(EntryEventImpl event, boolean ifNew, boolean ifOld, Object expectedOldValue,
@@ -138,12 +99,6 @@ public interface InternalDataView {
    * Put or create an entry in the data view. Called only on the farside.
    *
    * @param event specifies the new or updated value
-   * @param ifNew
-   * @param ifOld
-   * @param expectedOldValue
-   * @param requireOldValue
-   * @param overwriteDestroyed
-   * @param lastModified
    * @return true if operation updated existing data, otherwise false
    */
   boolean putEntryOnRemote(EntryEventImpl event, boolean ifNew, boolean ifOld,
@@ -153,9 +108,7 @@ public interface InternalDataView {
   /**
    * Destroy an entry in the data view. Called only on the farside.
    *
-   * @param event
    * @param cacheWrite TODO
-   * @param expectedOldValue
    * @throws DataLocationException TODO
    */
   void destroyOnRemote(EntryEventImpl event, boolean cacheWrite, Object expectedOldValue)
@@ -164,10 +117,6 @@ public interface InternalDataView {
   /**
    * Invalidate an entry in the data view. Called only on farside.
    *
-   * @param event
-   * @param invokeCallbacks
-   * @param forceNewEntry
-   * @throws DataLocationException
    */
   void invalidateOnRemote(EntryEventImpl event, boolean invokeCallbacks, boolean forceNewEntry)
       throws DataLocationException;
@@ -179,11 +128,6 @@ public interface InternalDataView {
 
 
   /**
-   * @param key
-   * @param r
-   * @param isCreate
-   * @param generateCallbacks
-   * @param value
    * @param disableCopyOnRead if true then copy on read is disabled for this call
    * @param preferCD true if the preferred result form is CachedDeserializable
    * @param requestingClient the client making the request, or null if from a server
@@ -199,10 +143,6 @@ public interface InternalDataView {
 
   /**
    *
-   * @param key
-   * @param currRgn
-   * @param rememberReads
-   * @param allowTombstones
    * @return an Entry for the key
    */
   Object getEntryForIterator(KeyInfo key, LocalRegion currRgn, boolean rememberReads,
@@ -210,32 +150,21 @@ public interface InternalDataView {
 
   /**
    *
-   * @param keyInfo
-   * @param currRgn
-   * @param rememberReads
-   * @param allowTombstones
    * @return the key for the provided key
    */
   Object getKeyForIterator(KeyInfo keyInfo, LocalRegion currRgn, boolean rememberReads,
       boolean allowTombstones);
 
-  /**
-   * @param currRgn
-   */
   Set getAdditionalKeysForIterator(LocalRegion currRgn);
 
   /**
    *
-   * @param currRegion
    * @return set of keys in the region
    */
   Collection<?> getRegionKeysForIteration(LocalRegion currRegion);
 
   /**
    *
-   * @param localRegion
-   * @param key
-   * @param doNotLockEntry
    * @param requestingClient the client that made the request, or null if not from a client
    * @param clientEvent the client event, if any
    * @param returnTombstones TODO
@@ -252,8 +181,6 @@ public interface InternalDataView {
   void checkSupportsRegionClear() throws UnsupportedOperationInTransactionException;
 
   /**
-   * @param localRegion
-   * @param bucketId
    * @param allowTombstones whether to include destroyed entries in the result
    * @return Set of keys in the given bucket
    */
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidatePartitionedRegionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidatePartitionedRegionMessage.java
index 99937d0..98f414c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidatePartitionedRegionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidatePartitionedRegionMessage.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache;
 
 import java.io.DataInput;
@@ -30,16 +27,10 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.ReplyProcessor21;
 import org.apache.geode.internal.cache.partitioned.PartitionMessage;
 
-/**
- *
- */
 public class InvalidatePartitionedRegionMessage extends PartitionMessage {
 
   private Object callbackArg;
 
-  /**
-   *
-   */
   public InvalidatePartitionedRegionMessage() {}
 
   public InvalidatePartitionedRegionMessage(Set recipients, Object callbackArg, PartitionedRegion r,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateRegionOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateRegionOperation.java
index 2457cbd..478de83 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateRegionOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InvalidateRegionOperation.java
@@ -26,10 +26,6 @@ import org.apache.geode.distributed.internal.ClusterDistributionManager;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 
 
-/**
- *
- *
- */
 public class InvalidateRegionOperation extends DistributedCacheOperation {
 
   /** Creates new instance of InvalidateRegionOperation */
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/KeyInfo.java b/geode-core/src/main/java/org/apache/geode/internal/cache/KeyInfo.java
index 01bf26c..8cb7d02 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/KeyInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/KeyInfo.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache;
 
 import static org.apache.geode.internal.offheap.annotations.OffHeapIdentifier.ENTRY_EVENT_NEW_VALUE;
@@ -24,9 +21,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.offheap.annotations.Retained;
 import org.apache.geode.internal.offheap.annotations.Unretained;
 
-/**
- *
- */
 public class KeyInfo {
 
   // Rahul: This class should actually be renamed as RoutingInfo or BucketIdInfo
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalDataSet.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalDataSet.java
index f06a143..ab874d9 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalDataSet.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalDataSet.java
@@ -66,10 +66,6 @@ import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 
 
-/**
- *
- *
- */
 public class LocalDataSet implements Region, QueryExecutor {
 
   private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
index 708cc14..23f75c7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
@@ -1806,9 +1806,6 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
     return new NonTXEntry(re);
   }
 
-  /**
-   * @return boolean
-   */
   protected boolean isClosed() {
     return this.cache.isClosed();
   }
@@ -4644,7 +4641,6 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
    * Called by a thread that is doing region initialization. Causes the initialization Latch to be
    * bypassed by this thread.
    *
-   * @return oldLevel
    */
   public static int setThreadInitLevelRequirement(int level) {
     int oldLevel = threadInitLevelRequirement();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntryWithStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntryWithStats.java
index 0682d88..f2f6eeb 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntryWithStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/NonLocalRegionEntryWithStats.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache;
 
 import java.io.DataInput;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PRContainsValueFunction.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PRContainsValueFunction.java
index 3747d53..a75249d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PRContainsValueFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PRContainsValueFunction.java
@@ -21,9 +21,6 @@ import org.apache.geode.cache.execute.FunctionContext;
 import org.apache.geode.cache.execute.RegionFunctionContext;
 import org.apache.geode.internal.cache.execute.InternalFunction;
 
-/**
- *
- */
 public class PRContainsValueFunction implements InternalFunction {
 
   @Override
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 7bbed43..f098d72 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
@@ -312,7 +312,6 @@ public class PRHARedundancyProvider {
    *
    * @param bucketId The bucket we are working on
    * @param newBucketSize size to create it
-   * @param excludedMembers
    * @param alreadyUsed members who already seem to have the bucket
    * @param timeOut point at which to fail
    * @param allStores the set of data stores to choose from
@@ -1053,10 +1052,7 @@ public class PRHARedundancyProvider {
    * Creates bucket with ID bucketId on targetNode. This method will also create the bucket for all
    * of the child colocated PRs.
    *
-   * @param bucketId
-   * @param targetNMember
    * @param isRebalance true if bucket creation is directed by rebalancing
-   * @param replaceOfflineData
    * @return true if the bucket was sucessfully created
    */
   public boolean createBackupBucketOnMember(final int bucketId,
@@ -1157,9 +1153,6 @@ public class PRHARedundancyProvider {
   /**
    * Creates bucket with ID bucketId on targetNode.
    *
-   * @param bucketId
-   * @param targetNMember
-   * @param newBucketSize
    * @param forceCreation inform the targetMember it must attempt host the bucket, appropriately
    *        ignoring it's maximums
    * @return a response object
@@ -1258,9 +1251,6 @@ public class PRHARedundancyProvider {
    * case of primary it returns the same node whereas in case of secondary it will return the least
    * loaded datastore which is hosting the bucketid.
    *
-   * @param alreadyUsed
-   * @param bucketId
-   * @param prName
    * @return InternalDistributedMember colocated data store
    * @since GemFire 5.8Beta
    */
@@ -2166,7 +2156,6 @@ public class PRHARedundancyProvider {
      * @param expectedCount the number of bucket owners to wait for
      * @param expectedOwners the list of owners used when a departure is detected
      * @return if no problematic departures are detected, the primary
-     * @throws InterruptedException
      */
     public BucketMembershipObserverResults waitForOwnersGetPrimary(final int expectedCount,
         final Collection<InternalDistributedMember> expectedOwners, String partitionName)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfigValidator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfigValidator.java
index 726cea6..4e606a2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfigValidator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfigValidator.java
@@ -35,10 +35,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 
-/**
- *
- *
- */
 public class PartitionRegionConfigValidator {
 
   private static final Logger logger = LogService.getLogger();
@@ -453,9 +449,6 @@ public class PartitionRegionConfigValidator {
     }
   }
 
-  /**
-   * @param prconf
-   */
   public void validateFixedPABetweenDataStores(PartitionRegionConfig prconf) {
     boolean isDataStore = this.pr.localMaxMemory > 0;
     boolean isFixedPR = this.pr.fixedPAttrs != null;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
index 455087c..a7d0800 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
@@ -3836,7 +3836,6 @@ public class PartitionedRegion extends LocalRegion
   /**
    * Executes function on all bucket nodes
    *
-   * @return ResultCollector
    * @since GemFire 6.0
    */
   private ResultCollector executeOnAllBuckets(final Function function,
@@ -4830,7 +4829,6 @@ public class PartitionedRegion extends LocalRegion
   /**
    * This method returns Partitioned Region data store associated with this Partitioned Region
    *
-   * @return PartitionedRegionDataStore
    */
   public PartitionedRegionDataStore getDataStore() {
     return this.dataStore;
@@ -5036,7 +5034,6 @@ public class PartitionedRegion extends LocalRegion
    * This method returns PartitionedRegion associated with a PartitionedRegion ID from prIdToPR map.
    *
    * @param prid Partitioned Region ID
-   * @return PartitionedRegion
    */
   public static PartitionedRegion getPRFromId(int prid) throws PRLocallyDestroyedException {
     final Object o;
@@ -5113,7 +5110,6 @@ public class PartitionedRegion extends LocalRegion
   /**
    * This method returns prId
    *
-   * @return partitionedRegionId
    */
   public int getPRId() {
     return this.partitionedRegionId;
@@ -5133,7 +5129,6 @@ public class PartitionedRegion extends LocalRegion
   /**
    * This method returns total number of buckets for this PR
    *
-   * @return totalNumberOfBuckets
    */
   public int getTotalNumberOfBuckets() {
 
@@ -6612,7 +6607,6 @@ public class PartitionedRegion extends LocalRegion
    * Returns the lockname used by Distributed Lock service to clean the
    * {@code allPartitionedRegions}.
    *
-   * @return String
    */
   private String getLockNameForBucket2NodeModification(int bucketID) {
     return (getRegionIdentifier() + ":" + bucketID);
@@ -8188,7 +8182,6 @@ public class PartitionedRegion extends LocalRegion
   /**
    * Returns the a PartitionedIndex on this partitioned region.
    *
-   * @return Index
    */
   public PartitionedIndex getIndex(String indexName) {
     Iterator iter = this.indexes.values().iterator();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionBucketMgmtHelper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionBucketMgmtHelper.java
index e315e15..254f43e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionBucketMgmtHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionBucketMgmtHelper.java
@@ -31,7 +31,6 @@ public class PartitionedRegionBucketMgmtHelper {
   /**
    *
    * @param b Bucket to evaluate
-   * @param moveSource
    * @return true if it is allowed to be recovered
    * @since GemFire 5.9
    */
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
index d468ef4..dc8f151 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java
@@ -214,9 +214,6 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
   /**
    * This method creates a PartitionedRegionDataStore be invoking the PRDS Constructor.
    *
-   * @param cache
-   * @param pr
-   * @param pa
    * @return @throws PartitionedRegionException
    */
   static PartitionedRegionDataStore createDataStore(Cache cache, PartitionedRegion pr,
@@ -272,8 +269,6 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
    * Try to grab buckets for all the colocated regions /* In case we can't grab buckets there is no
    * going back
    *
-   * @param creationRequestor
-   * @param isDiskRecovery
    */
 
   protected CreateBucketResult grabFreeBucketRecursively(final int bucketId,
@@ -331,7 +326,6 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
    * @param moveSource Where we are moving the bucket from, if this is a move.
    * @param forceCreation avoid any checks (with in reason) which might prevent bucket creation
    * @param isRebalance true if bucket creation is directed by rebalancing
-   * @param replaceOffineData
    * @return true if successful
    */
   CreateBucketResult grabFreeBucket(final int possiblyFreeBucketId, final DistributedMember sender,
@@ -653,7 +647,6 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
    * This method creates bucket regions, based on redundancy level. If redundancy level is: a) = 1
    * it creates a local region b) >1 it creates a distributed region
    *
-   * @param bucketId
    * @return @throws CacheException
    */
   private BucketRegion createBucketRegion(int bucketId) {
@@ -1105,7 +1098,6 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
   /**
    * Return the size in bytes for a given bucket.
    *
-   * @param bucketId
    * @return size in bytes
    */
   public long getBucketSize(int bucketId) {
@@ -1123,10 +1115,8 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
   /**
    * Querys the buckets in this data store for query specified by queryPredicate.
    *
-   * @param query
    * @param parameters the parameters to be used to execute the query
    * @param buckets to be queried
-   * @param resultCollector
    * @throws QueryException TODO-javadocs
    */
   /*
@@ -1377,7 +1367,6 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
    * cleans up the localBucketRegion map to avoid any stale references to locally destroyed bucket
    * region.
    *
-   * @param removeBucketMapping
    */
   void cleanUp(boolean removeBucketMapping, boolean removeFromDisk) {
     if (logger.isDebugEnabled()) {
@@ -1756,7 +1745,6 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
    * @param key optional for error reporting; if none, no key available.
    * @param bucketId the bucket to fetch
    * @return the region
-   * @throws ForceReattemptException
    */
   public BucketRegion getInitializedBucketForId(Object key, Integer bucketId)
       throws ForceReattemptException {
@@ -1820,10 +1808,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
    * Fetch a BucketRegion, but do not return until it is initialized and the primary is known.
    *
    * @see #getInitializedBucketForId(Object, Integer)
-   * @param key
-   * @param bucketId
    * @return the initialized region
-   * @throws ForceReattemptException
    */
   public BucketRegion getInitializedBucketWithKnownPrimaryForId(Object key, Integer bucketId)
       throws ForceReattemptException {
@@ -1947,7 +1932,6 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
    * Returns value corresponding to this key.
    *
    * @param key the key to look for
-   * @param preferCD
    * @param requestingClient the client making the request, or null
    * @param clientEvent client's event (for returning version tag)
    * @param returnTombstones whether tombstones should be returned
@@ -1968,7 +1952,6 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
    * Returns value corresponding to this key.
    *
    * @param key the key to look for
-   * @param preferCD
    * @param requestingClient the client making the request, or null
    * @param clientEvent client's event (for returning version tag)
    * @param returnTombstones whether tombstones should be returned
@@ -2125,9 +2108,6 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
   /**
    * Handle a remote request for keys for the provided bucketId
    *
-   * @param bucketId
-   * @param interestType
-   * @param interestArg
    * @param allowTombstones whether to return destroyed entries
    * @return The <code>Set</code> of keys for bucketId or {@link Collections#EMPTY_SET}if no keys
    *         are present
@@ -2174,7 +2154,6 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
    * avoiding making copies of the returned set. The returned set can and should reflect concurrent
    * changes (no ConcurrentModificationExceptions).
    *
-   * @param bucketId
    * @param allowTombstones whether to include destroyed entries in the result
    * @return The <code>Set</code> of keys for bucketId or {@link Collections#EMPTY_SET} if no keys
    *         are present
@@ -2400,7 +2379,6 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
   /**
    * This calculates size of all the primary bucket regions for the list of bucketIds.
    *
-   * @param bucketIds
    * @return the size of all the primary bucket regions for the list of bucketIds.
    */
   public Map<Integer, SizeEntry> getSizeLocallyForBuckets(Collection<Integer> bucketIds) {
@@ -2837,7 +2815,6 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
    *
    * @param br the bucket that we are trying to operate on
    * @param isOriginRemote true the event we are processing has a remote origin.
-   * @param rde
    *
    */
   public void checkRegionDestroyedOnBucket(final BucketRegion br, final boolean isOriginRemote,
@@ -2938,7 +2915,6 @@ public class PartitionedRegionDataStore implements HasCachePerfStats {
   /**
    * Checks consistency of bucket and meta data before attempting to grab the bucket.
    *
-   * @param buckId
    * @return false if bucket should not be grabbed, else true. TODO prpersist - move this to
    *         BucketRegion
    */
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionException.java
index aa95d54..0aae8a2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionException.java
@@ -29,7 +29,6 @@ public class PartitionedRegionException extends CacheRuntimeException {
   /**
    * Creates a new instance of PartitionedRegionException
    *
-   * @param msg
    */
   public PartitionedRegionException(String msg) {
     super(msg);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionHelper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionHelper.java
index bbeb486..777edd4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionHelper.java
@@ -849,7 +849,6 @@ public class PartitionedRegionHelper {
   /**
    * Utility method to print a collection.
    *
-   * @return String
    */
   public static String printCollection(Collection c) {
     if (c != null) {
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 d81c2cf..b541d94 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
@@ -465,7 +465,6 @@ public class PartitionedRegionQueryEvaluator extends StreamingPartitionOperation
    * @throws QueryException if data loss is detected during the query, when the number of retries
    *         has exceeded the system wide maximum, or when there are logic errors that cause bucket
    *         data to be omitted from the results.
-   * @throws InterruptedException
    */
   public SelectResults queryBuckets(final TestHook th) throws QueryException, InterruptedException {
     final boolean isDebugEnabled = logger.isDebugEnabled();
@@ -778,7 +777,6 @@ public class PartitionedRegionQueryEvaluator extends StreamingPartitionOperation
   /**
    * Adds all counts from all member buckets to cumulative results.
    *
-   * @param limit
    */
   private void addTotalCountForMemberToResults(int limit) {
     int count = 0;
@@ -848,7 +846,6 @@ public class PartitionedRegionQueryEvaluator extends StreamingPartitionOperation
   }
 
   /**
-   * @param bucketIdsToConsider
    * @return Map of {@link InternalDistributedMember} to {@link ArrayList} of Integers
    */
   private Map<InternalDistributedMember, List<Integer>> buildNodeToBucketMapForBuckets(
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionStats.java
index 08434c9..f586220 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionStats.java
@@ -578,7 +578,6 @@ public class PartitionedRegionStats {
   /**
    * This method sets the end time for putAll and updates the counters
    *
-   * @param start
    */
   public void endPutAll(long start) {
     endPutAll(start, 1);
@@ -615,8 +614,6 @@ public class PartitionedRegionStats {
   /**
    * This method sets the end time for putAll and updates the counters
    *
-   * @param start
-   * @param numInc
    */
   public void endPutAll(long start, int numInc) {
     if (CachePerfStats.enableClockStats) {
@@ -965,8 +962,6 @@ public class PartitionedRegionStats {
   /**
    * This method sets the end time for update and updates the counters
    *
-   * @param start
-   * @param numInc
    */
   public void endGetEntry(long start, int numInc) {
     if (CachePerfStats.enableClockStats) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PoolManagerImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PoolManagerImpl.java
index 82f3178..0b71235 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PoolManagerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PoolManagerImpl.java
@@ -213,9 +213,6 @@ public class PoolManagerImpl {
     }
   }
 
-  /**
-   * @param instantiator
-   */
   public static void allPoolsRegisterInstantiator(Instantiator instantiator) {
     Instantiator[] instantiators = new Instantiator[1];
     instantiators[0] = instantiator;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEventImpl.java
index 2632410..fa2d734 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEventImpl.java
@@ -70,11 +70,6 @@ public class RegionEventImpl
   /**
    * Constructor which does not generate EventID
    *
-   * @param region
-   * @param op
-   * @param callbackArgument
-   * @param originRemote
-   * @param distributedMember
    */
   public RegionEventImpl(Region region, Operation op, Object callbackArgument, boolean originRemote,
       DistributedMember distributedMember) {
@@ -98,11 +93,6 @@ public class RegionEventImpl
   /**
    * Constructor which uses the eventID passed
    *
-   * @param region
-   * @param op
-   * @param callbackArgument
-   * @param originRemote
-   * @param distributedMember
    * @param eventID EventID used to create the RegionEvent
    */
   public RegionEventImpl(Region region, Operation op, Object callbackArgument, boolean originRemote,
@@ -241,7 +231,6 @@ public class RegionEventImpl
   /**
    * Returns the Operation type.
    *
-   * @return eventType
    */
   public EnumListenerEvent getEventType() {
     return this.eventType;
@@ -250,7 +239,6 @@ public class RegionEventImpl
   /**
    * Sets the operation type.
    *
-   * @param eventType
    */
   public void setEventType(EnumListenerEvent eventType) {
     this.eventType = eventType;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionIdleExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionIdleExpiryTask.java
index dfc59cf..539ee4d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionIdleExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionIdleExpiryTask.java
@@ -17,9 +17,6 @@ package org.apache.geode.internal.cache;
 
 import org.apache.geode.cache.*;
 
-/**
- *
- */
 class RegionIdleExpiryTask extends RegionExpiryTask {
 
   /** Creates a new instance of RegionIdleExpiryTask */
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 a114c8e..f325b7c 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
@@ -39,8 +39,6 @@ public interface RegionQueue {
    *
    * @param object The object to put onto the queue
    *
-   * @throws InterruptedException
-   * @throws CacheException
    * @return boolean whether object was successfully put onto the queue
    */
   boolean put(Object object) throws InterruptedException, CacheException;
@@ -56,8 +54,6 @@ public interface RegionQueue {
    *
    * @return The object taken
    *
-   * @throws CacheException
-   * @throws InterruptedException
    */
   Object take() throws CacheException, InterruptedException;
 
@@ -69,8 +65,6 @@ public interface RegionQueue {
    *
    * @return the <code>List</code> of objects taken from the queue
    *
-   * @throws CacheException
-   * @throws InterruptedException
    */
   List take(int batchSize) throws CacheException, InterruptedException;
 
@@ -78,8 +72,6 @@ public interface RegionQueue {
    * Removes a single object from the head of the queue without returning it. This method assumes
    * that the queue contains at least one object.
    *
-   * @throws InterruptedException
-   * @throws CacheException
    */
   void remove() throws InterruptedException, CacheException;
 
@@ -88,8 +80,6 @@ public interface RegionQueue {
    * if there are no objects on the queue.
    *
    * @return The object peeked
-   * @throws InterruptedException
-   * @throws CacheException
    */
   Object peek() throws InterruptedException, CacheException;
 
@@ -100,8 +90,6 @@ public interface RegionQueue {
    * @param batchSize The number of objects to peek from the queue
    *
    * @return The list of objects peeked
-   * @throws InterruptedException
-   * @throws CacheException
    */
   List peek(int batchSize) throws InterruptedException, CacheException;
 
@@ -115,8 +103,6 @@ public interface RegionQueue {
    * @param timeToWait The number of milliseconds to attempt to peek
    *
    * @return The list of objects peeked
-   * @throws InterruptedException
-   * @throws CacheException
    *
    */
   List peek(int batchSize, int timeToWait) throws InterruptedException, CacheException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionTTLExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionTTLExpiryTask.java
index 96490e5..e765571 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionTTLExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionTTLExpiryTask.java
@@ -17,9 +17,6 @@ package org.apache.geode.internal.cache;
 
 import org.apache.geode.cache.*;
 
-/**
- *
- */
 class RegionTTLExpiryTask extends RegionExpiryTask {
 
   /** Creates a new instance of RegionTTLExpiryTask */
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessor.java
index cb8fd90..78f1143 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/SearchLoadAndWriteProcessor.java
@@ -433,7 +433,6 @@ public class SearchLoadAndWriteProcessor implements MembershipListener {
    * that as the result netSearch failed, so all we can do at this point is do a load return result
    * from load
    *
-   * @param preferCD
    */
   private void searchAndLoad(EntryEventImpl event, TXStateInterface txState, Object localValue,
       boolean preferCD) throws CacheLoaderException, TimeoutException {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/StoreAllCachedDeserializable.java b/geode-core/src/main/java/org/apache/geode/internal/cache/StoreAllCachedDeserializable.java
index dea446e..1ac2b8b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/StoreAllCachedDeserializable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/StoreAllCachedDeserializable.java
@@ -64,9 +64,6 @@ public class StoreAllCachedDeserializable implements CachedDeserializable, DataS
     this.objValue = EntryEventImpl.deserialize(this.value);
   }
 
-  /**
-   * @param object
-   */
   public StoreAllCachedDeserializable(Object object) {
     this.objValue = object;
     this.value = EntryEventImpl.serialize(object);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXBucketRegionState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXBucketRegionState.java
index e20e9e4..bd4bc42 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXBucketRegionState.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXBucketRegionState.java
@@ -17,9 +17,6 @@
  */
 package org.apache.geode.internal.cache;
 
-/**
- *
- */
 public class TXBucketRegionState extends TXRegionState {
   private final PartitionedRegion pr;
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntry.java
index 0650748..feb7af1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXEntry.java
@@ -28,9 +28,6 @@ import org.apache.geode.internal.offheap.annotations.Unretained;
 /** ******************* Class Entry ***************************************** */
 
 public class TXEntry implements Region.Entry {
-  /**
-   *
-   */
   private final LocalRegion localRegion;
 
   protected final KeyInfo keyInfo;
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 b5db0c0..7a23bc5 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,10 +14,6 @@
  */
 package org.apache.geode.internal.cache;
 
-/**
- *
- *
- */
 public interface TXEntryStateFactory {
 
   /**
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 bf1aecb..e3bdcf2 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
@@ -105,17 +105,12 @@ public interface TXStateInterface extends Synchronization, InternalDataView {
       boolean forceNewEntry);
 
   /**
-   * @param region
-   * @param keyInfo
-   * @param allowTombstones
    * @return a Region.Entry if it exists either in committed state or in transactional state,
    *         otherwise returns null
    */
   Entry getEntry(final KeyInfo keyInfo, final LocalRegion region, boolean allowTombstones);
 
   /**
-   * @param keyInfo
-   * @param localRegion
    * @param updateStats TODO
    */
   Object getDeserializedValue(KeyInfo keyInfo, LocalRegion localRegion, boolean updateStats,
@@ -147,7 +142,6 @@ public interface TXStateInterface extends Synchronization, InternalDataView {
 
   /**
    *
-   * @param state
    * @return true if transaction is in progress and the given state has the same identity as this
    *         instance
    */
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 2d2ec67..f037a02 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
@@ -57,7 +57,6 @@ public interface TXStateProxy extends TXStateInterface {
    * establishes the synchronization thread used for client/server beforeCompletion/afterCompletion
    * processing
    *
-   * @param sync
    */
   void setSynchronizationRunnable(TXSynchronizationRunnable sync);
 
@@ -89,7 +88,6 @@ public interface TXStateProxy extends TXStateInterface {
    * single transaction. It becomes necessary to set the progress flag when the second request
    * arrives. When the requeset is processed, progress flag must be reset. see bug 43350
    *
-   * @param progress
    */
   void setInProgress(boolean progress);
 
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 0ed46be..c4ae22b 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
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache;
 
 import org.apache.geode.distributed.internal.DistributionMessage;
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 7487173..036b6bf 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
@@ -14,10 +14,6 @@
  */
 package org.apache.geode.internal.cache;
 
-/**
- *
- *
- */
 public interface TxEntryFactory {
   /**
    * Creates an instance of TXEntry.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateEntryVersionOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateEntryVersionOperation.java
index 1d3fdf4..3c74004 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateEntryVersionOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateEntryVersionOperation.java
@@ -42,9 +42,6 @@ import org.apache.geode.internal.offheap.annotations.Retained;
 public class UpdateEntryVersionOperation extends DistributedCacheOperation {
   private static final Logger logger = LogService.getLogger();
 
-  /**
-   * @param event
-   */
   public UpdateEntryVersionOperation(CacheEvent event) {
     super(event);
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMCachedDeserializable.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMCachedDeserializable.java
index ce8b357..998c6d9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMCachedDeserializable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMCachedDeserializable.java
@@ -74,8 +74,6 @@ public class VMCachedDeserializable implements CachedDeserializable, DataSeriali
    * Create a new instance with an object and it's size. Note the caller decides if objectSize is
    * the memory size or the serialized size.
    *
-   * @param object
-   * @param objectSize
    */
   public VMCachedDeserializable(Object object, int objectSize) {
     this.value = object;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionTimestamp.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionTimestamp.java
index c5dd768..e1d9b6b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionTimestamp.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionTimestamp.java
@@ -14,9 +14,6 @@
  */
 package org.apache.geode.internal.cache;
 
-/**
- *
- */
 public class VersionTimestamp {
 
   /** actual storage of version timestamp is in a scalar long value */
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/FilterByPath.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/FilterByPath.java
index 816d190..e04cf9d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/FilterByPath.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/FilterByPath.java
@@ -19,9 +19,6 @@ import java.util.Set;
 
 import org.apache.geode.cache.Region;
 
-/**
- *
- */
 public class FilterByPath implements RegionFilter {
 
   private final Set<String> included;
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 1f78c4c..0c6fb77 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
@@ -394,7 +394,6 @@ public class InternalResourceManager implements ResourceManager {
    * particular region. This observer is called even the "rebalancing" is actually redundancy
    * recovery for a particular region.
    *
-   * @param observer
    */
   public static void setResourceObserver(ResourceObserver observer) {
     if (observer == null) {
@@ -418,28 +417,24 @@ public class InternalResourceManager implements ResourceManager {
     /**
      * Indicates that rebalancing has started on a given region.
      *
-     * @param region
      */
     void rebalancingStarted(Region region);
 
     /**
      * Indicates that rebalancing has finished on a given region.
      *
-     * @param region
      */
     void rebalancingFinished(Region region);
 
     /**
      * Indicates that recovery has started on a given region.
      *
-     * @param region
      */
     void recoveryStarted(Region region);
 
     /**
      * Indicates that recovery has finished on a given region.
      *
-     * @param region
      */
     void recoveryFinished(Region region);
 
@@ -448,7 +443,6 @@ public class InternalResourceManager implements ResourceManager {
      * will not be executed because there is already an existing recovery operation waiting to
      * happen on this region.
      *
-     * @param region
      */
     void recoveryConflated(PartitionedRegion region);
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryEvent.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryEvent.java
index ad1a0a5..5679188 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryEvent.java
@@ -19,8 +19,6 @@ import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.internal.cache.control.InternalResourceManager.ResourceType;
 import org.apache.geode.internal.cache.control.MemoryThresholds.MemoryState;
 
-/**
- */
 public class MemoryEvent implements ResourceEvent {
   private final ResourceType type;
   private final MemoryState state;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryThresholds.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryThresholds.java
index 40d84eb..eda3c02 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryThresholds.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/MemoryThresholds.java
@@ -266,7 +266,6 @@ public class MemoryThresholds {
    *
    * @param in DataInput from which to read the data
    * @return a new instance of Thresholds
-   * @throws IOException
    */
   public static MemoryThresholds fromData(DataInput in) throws IOException {
     long maxMemoryBytes = in.readLong();
@@ -279,7 +278,6 @@ public class MemoryThresholds {
    * Write the state of this to the DataOutput
    *
    * @param out DataOutput on which to write internal state
-   * @throws IOException
    */
   public void toData(DataOutput out) throws IOException {
     out.writeLong(this.maxMemoryBytes);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/RegionFilter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/RegionFilter.java
index 12d12cf..9a0b510 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/RegionFilter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/RegionFilter.java
@@ -16,9 +16,6 @@ package org.apache.geode.internal.cache.control;
 
 import org.apache.geode.cache.Region;
 
-/**
- *
- */
 public interface RegionFilter {
   boolean include(Region<?, ?> region);
 }
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 0e3bec0..09c6412 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
@@ -18,9 +18,6 @@ package org.apache.geode.internal.cache.control;
 import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.internal.cache.control.InternalResourceManager.ResourceType;
 
-/**
- *
- */
 public interface ResourceEvent {
   ResourceType getType();
 
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 2cd2def..d4fd604 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
@@ -27,7 +27,6 @@ public interface OffHeapRegionEntry extends RegionEntry, Releasable {
   /**
    * OFF_HEAP_FIELD_READER
    *
-   * @return OFF_HEAP_ADDRESS
    */
   long getAddress();
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntry.java
index 71d3a51..48bc0a0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskLRURegionEntry.java
@@ -17,9 +17,6 @@ package org.apache.geode.internal.cache.entries;
 import org.apache.geode.internal.cache.RegionEntryContext;
 import org.apache.geode.internal.cache.versions.VersionStamp;
 
-/**
- *
- */
 public abstract class VersionedStatsDiskLRURegionEntry extends VMStatsDiskLRURegionEntry
     implements VersionStamp {
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntry.java
index 64c11fc..0a89bfc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsDiskRegionEntry.java
@@ -17,9 +17,6 @@ package org.apache.geode.internal.cache.entries;
 import org.apache.geode.internal.cache.RegionEntryContext;
 import org.apache.geode.internal.cache.versions.VersionStamp;
 
-/**
- *
- */
 public abstract class VersionedStatsDiskRegionEntry extends VMStatsDiskRegionEntry
     implements VersionStamp {
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntry.java
index a7d9b17..7fd4749 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedStatsLRURegionEntry.java
@@ -17,9 +17,6 @@ package org.apache.geode.internal.cache.entries;
 import org.apache.geode.internal.cache.RegionEntryContext;
 import org.apache.geode.internal.cache.versions.VersionStamp;
 
-/**
- *
- */
 public abstract class VersionedStatsLRURegionEntry extends VMStatsLRURegionEntry
     implements VersionStamp {
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntry.java
index 43d8ea2..66c9c7d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinDiskLRURegionEntry.java
@@ -17,9 +17,6 @@ package org.apache.geode.internal.cache.entries;
 import org.apache.geode.internal.cache.RegionEntryContext;
 import org.apache.geode.internal.cache.versions.VersionStamp;
 
-/**
- *
- */
 public abstract class VersionedThinDiskLRURegionEntry extends VMThinDiskLRURegionEntry
     implements VersionStamp {
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntry.java
index 64dfbf7..4d3727a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/VersionedThinRegionEntry.java
@@ -17,9 +17,6 @@ package org.apache.geode.internal.cache.entries;
 import org.apache.geode.internal.cache.RegionEntryContext;
 import org.apache.geode.internal.cache.versions.VersionStamp;
 
-/**
- *
- */
 public abstract class VersionedThinRegionEntry extends VMThinRegionEntry implements VersionStamp {
 
   protected VersionedThinRegionEntry(RegionEntryContext context, Object value) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/eviction/AbstractEvictionController.java b/geode-core/src/main/java/org/apache/geode/internal/cache/eviction/AbstractEvictionController.java
index 2ffd8e9..85be05e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/eviction/AbstractEvictionController.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/eviction/AbstractEvictionController.java
@@ -100,7 +100,6 @@ public abstract class AbstractEvictionController implements EvictionController {
    * Creates a new {@code AbstractEvictionController} with the given {@linkplain EvictionAction
    * eviction action}.
    *
-   * @param evictionCounters
    */
   protected AbstractEvictionController(EvictionCounters evictionCounters,
       EvictionAction evictionAction, EvictionAlgorithm algorithm) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/eviction/CountLRUEviction.java b/geode-core/src/main/java/org/apache/geode/internal/cache/eviction/CountLRUEviction.java
index 0dfbc08..fffe079 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/eviction/CountLRUEviction.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/eviction/CountLRUEviction.java
@@ -36,7 +36,6 @@ public class CountLRUEviction extends AbstractEvictionController {
   /**
    * Creates an LRU capacity controller that allows the given number of maximum entries.
    *
-   * @param evictionCounters
    *
    * @param maximumEntries The maximum number of entries allowed in the region whose capacity this
    *        controller controls. Once there are {@code capacity} entries in a region, this
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/eviction/MemoryLRUController.java b/geode-core/src/main/java/org/apache/geode/internal/cache/eviction/MemoryLRUController.java
index 31b84e6..02710e3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/eviction/MemoryLRUController.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/eviction/MemoryLRUController.java
@@ -43,7 +43,6 @@ public class MemoryLRUController extends SizeLRUController {
   /**
    * Create an instance of the capacity controller the given settings.
    *
-   * @param evictionCounters
    *
    * @param megabytes the amount of memory allowed in this region specified in megabytes.<br>
    *        <p>
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 3db0475..b7753c4 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
@@ -451,7 +451,6 @@ public abstract class AbstractExecution implements InternalExecution {
    * Returns the function attributes defined by the functionId, returns null if no function is found
    * for the specified functionId
    *
-   * @param functionId
    * @return byte[]
    * @throws FunctionException if functionID passed is null
    * @since GemFire 6.6
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/BucketMovedException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/BucketMovedException.java
index 73e724e..b6f1e64 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/BucketMovedException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/BucketMovedException.java
@@ -22,7 +22,6 @@ public class BucketMovedException extends GemFireException {
   /**
    * Creates new function exception with given error message.
    *
-   * @param msg
    * @since GemFire 6.0
    */
   public BucketMovedException(String msg) {
@@ -32,8 +31,6 @@ public class BucketMovedException extends GemFireException {
   /**
    * Creates new function exception with given error message and optional nested exception.
    *
-   * @param msg
-   * @param cause
    * @since GemFire 6.0
    */
   public BucketMovedException(String msg, Throwable cause) {
@@ -43,7 +40,6 @@ public class BucketMovedException extends GemFireException {
   /**
    * Creates new function exception given throwable as a cause and source of error message.
    *
-   * @param cause
    * @since GemFire 6.0
    */
   public BucketMovedException(Throwable cause) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DefaultResultCollector.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DefaultResultCollector.java
index 26ff355..05d4500 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DefaultResultCollector.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DefaultResultCollector.java
@@ -41,8 +41,6 @@ public class DefaultResultCollector implements ResultCollector {
   /**
    * Adds a single function execution result from a remote node to the ResultCollector
    *
-   * @param distributedMember
-   * @param resultOfSingleExecution
    */
   public synchronized void addResult(DistributedMember distributedMember,
       Object resultOfSingleExecution) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionResultSender.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionResultSender.java
index abe73a5..8827220 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionResultSender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionResultSender.java
@@ -50,8 +50,6 @@ public class DistributedRegionFunctionResultSender implements InternalResultSend
   /**
    * Have to combine next two construcotr in one and make a new class which will send Results back.
    *
-   * @param msg
-   * @param dm
    */
   public DistributedRegionFunctionResultSender(DistributionManager dm,
       DistributedRegionFunctionStreamingMessage msg, Function function) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionResultWaiter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionResultWaiter.java
index 2ea5358..9817e02 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionResultWaiter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/DistributedRegionFunctionResultWaiter.java
@@ -25,10 +25,6 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.cache.DistributedRegionFunctionStreamingMessage;
 
-/**
- *
- *
- */
 public class DistributedRegionFunctionResultWaiter extends StreamingFunctionOperation {
 
   private Set filter;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionExecutionNodePruner.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionExecutionNodePruner.java
index 52eaa7f..870d4a7 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionExecutionNodePruner.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionExecutionNodePruner.java
@@ -32,10 +32,6 @@ import org.apache.geode.internal.cache.PartitionedRegionHelper;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 
-/**
- *
- *
- */
 public class FunctionExecutionNodePruner {
   public static final Logger logger = LogService.getLogger();
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionServiceStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionServiceStats.java
index aee8371..b03b99e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionServiceStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionServiceStats.java
@@ -395,7 +395,6 @@ public class FunctionServiceStats {
   /**
    * Increments the "_functionExecutionException" and decrements "_functionExecutionsRunningId"
    *
-   * @param haveResult
    */
   public void endFunctionExecutionWithException(boolean haveResult) {
     // Decrement function Executions running.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionStats.java
index 2e05c91..46b6cb2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionStats.java
@@ -439,7 +439,6 @@ public class FunctionStats {
    * Increments the "_functionExecutionException" and decrements "_functionExecutionsRunningId" and
    * decrement "_functionExecutionHasResultRunningId"
    *
-   * @param haveResult
    */
   public void endFunctionExecutionWithException(boolean haveResult) {
     // Decrement function Executions running.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionStreamingResultCollector.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionStreamingResultCollector.java
index 572c811..05a05a0 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionStreamingResultCollector.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionStreamingResultCollector.java
@@ -49,10 +49,6 @@ import org.apache.geode.internal.cache.PrimaryBucketException;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 
-/**
- *
- *
- */
 public class FunctionStreamingResultCollector extends ReplyProcessor21 implements ResultCollector {
 
   private static final Logger logger = LogService.getLogger();
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 b88c351..ecb088f 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
@@ -50,7 +50,6 @@ public interface InternalExecution extends Execution {
    * If true, function execution waits for all exceptions from target nodes <br>
    * If false, function execution returns when first exception is occurred.
    *
-   * @param setWaitOnException
    */
   void setWaitOnExceptionFlag(boolean setWaitOnException);
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionException.java
index 06a35d0..b76d76a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionException.java
@@ -44,7 +44,6 @@ public class InternalFunctionException extends FunctionException {
   /**
    * Creates new internal function exception with given error message.
    *
-   * @param msg
    */
   public InternalFunctionException(String msg) {
     super(msg);
@@ -53,8 +52,6 @@ public class InternalFunctionException extends FunctionException {
   /**
    * Creates new internal function exception with given error message and optional nested exception.
    *
-   * @param msg
-   * @param cause
    */
   public InternalFunctionException(String msg, Throwable cause) {
     super(msg, cause);
@@ -63,7 +60,6 @@ public class InternalFunctionException extends FunctionException {
   /**
    * Creates new internal function exception given throwable as a cause and source of error message.
    *
-   * @param cause
    */
   public InternalFunctionException(Throwable cause) {
     super(cause);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionService.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionService.java
index 05463a1..4f32ab4 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionService.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionService.java
@@ -57,7 +57,6 @@ public class InternalFunctionService {
    *
    * @see MultiRegionFunctionContext
    *
-   * @param regions
    *
    */
   public static Execution onRegions(Set<Region> regions) {
@@ -87,7 +86,6 @@ public class InternalFunctionService {
   }
 
   /**
-   * @param region
    * @return true if the method is called on a region has a {@link Pool}.
    * @since GemFire 6.0
    */
@@ -111,7 +109,6 @@ public class InternalFunctionService {
    * @param groups optional list of GemFire configuration property "groups" (see
    *        <a href="../../distributed/DistributedSystem.html#groups"> <code>groups</code></a>) on
    *        which to execute the function. Function will be executed on all servers of each group
-   * @return Execution
    * @since GemFire 7.0
    */
   public static Execution onServers(RegionService regionService, String... groups) {
@@ -131,7 +128,6 @@ public class InternalFunctionService {
    * @param groups optional list of GemFire configuration property "groups" (see
    *        <a href="../../distributed/DistributedSystem.html#groups"> <code>groups</code></a>) on
    *        which to execute the function. Function will be executed on one server of each group
-   * @return Execution
    * @since GemFire 7.0
    */
   public static Execution onServer(RegionService regionService, String... groups) {
@@ -150,7 +146,6 @@ public class InternalFunctionService {
    * @param groups optional list of GemFire configuration property "groups" (see
    *        <a href="../../distributed/DistributedSystem.html#groups"> <code>groups</code></a>) on
    *        which to execute the function. Function will be executed on all servers of each group
-   * @return Execution
    * @since GemFire 7.0
    */
   public static Execution onServers(Pool pool, String... groups) {
@@ -169,7 +164,6 @@ public class InternalFunctionService {
    * @param groups optional list of GemFire configuration property "groups" (see
    *        <a href="../../distributed/DistributedSystem.html#groups"> <code>groups</code></a>) on
    *        which to execute the function. Function will be executed on one server of each group
-   * @return Execution
    * @since GemFire 7.0
    */
   public static Execution onServer(Pool pool, String... groups) {
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 f9277bd..555c92c 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
@@ -16,10 +16,6 @@ package org.apache.geode.internal.cache.execute;
 
 import org.apache.geode.cache.execute.ResultSender;
 
-/**
- *
- *
- */
 public interface InternalResultSender extends ResultSender<Object> {
 
   void enableOrderedResultStreming(boolean enable);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionResultSender.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionResultSender.java
index ea9e5aa..6ba62e1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionResultSender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionResultSender.java
@@ -29,10 +29,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 
-/**
- *
- *
- */
 public class MemberFunctionResultSender implements InternalResultSender {
 
   private static final Logger logger = LogService.getLogger();
@@ -59,8 +55,6 @@ public class MemberFunctionResultSender implements InternalResultSender {
   /**
    * Have to combine next two construcotr in one and make a new class which will send Results back.
    *
-   * @param msg
-   * @param dm
    */
   public MemberFunctionResultSender(DistributionManager dm, MemberFunctionStreamingMessage msg,
       Function function) {
@@ -73,8 +67,6 @@ public class MemberFunctionResultSender implements InternalResultSender {
   /**
    * Have to combine next two construcotr in one and make a new class which will send Results back.
    *
-   * @param dm
-   * @param rc
    */
   public MemberFunctionResultSender(DistributionManager dm, ResultCollector rc, Function function,
       boolean onlyLocal, boolean onlyRemote, ServerToClientFunctionResultSender sender) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionResultWaiter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionResultWaiter.java
index 09fcc0e..46f29aa 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionResultWaiter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MemberFunctionResultWaiter.java
@@ -25,10 +25,6 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.cache.MemberFunctionStreamingMessage;
 
-/**
- *
- *
- */
 public class MemberFunctionResultWaiter extends StreamingFunctionOperation {
 
   public MemberFunctionResultWaiter(InternalDistributedSystem sys, ResultCollector rc,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionResultWaiter.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionResultWaiter.java
index 959f032..f29aba5 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionResultWaiter.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/MultiRegionFunctionResultWaiter.java
@@ -26,10 +26,6 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.cache.MemberFunctionStreamingMessage;
 
-/**
- *
- *
- */
 public class MultiRegionFunctionResultWaiter extends StreamingFunctionOperation {
 
   private Map<InternalDistributedMember, Set<String>> memberToRegions = null;;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionResultSender.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionResultSender.java
index 0768fc0..441043b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionResultSender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/PartitionedRegionFunctionResultSender.java
@@ -77,10 +77,6 @@ public class PartitionedRegionFunctionResultSender implements InternalResultSend
   /**
    * Have to combine next two constructor in one and make a new class which will send Results back.
    *
-   * @param msg
-   * @param dm
-   * @param pr
-   * @param time
    */
   public PartitionedRegionFunctionResultSender(DistributionManager dm, PartitionedRegion pr,
       long time, PartitionedRegionFunctionStreamingMessage msg, Function function,
@@ -98,10 +94,6 @@ public class PartitionedRegionFunctionResultSender implements InternalResultSend
   /**
    * Have to combine next two constructor in one and make a new class which will send Results back.
    *
-   * @param dm
-   * @param partitionedRegion
-   * @param time
-   * @param rc
    */
   public PartitionedRegionFunctionResultSender(DistributionManager dm,
       PartitionedRegion partitionedRegion, long time, ResultCollector rc,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerFunctionExecutor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerFunctionExecutor.java
index 1905b2b..b08e11e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerFunctionExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerFunctionExecutor.java
@@ -33,10 +33,6 @@ import org.apache.geode.internal.cache.TXManagerImpl;
 import org.apache.geode.internal.cache.execute.util.SynchronizedResultCollector;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 
-/**
- *
- *
- */
 public class ServerFunctionExecutor extends AbstractExecution {
 
   private PoolImpl pool;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerToClientFunctionResultSender.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerToClientFunctionResultSender.java
index 2ea8b61..a50a6d7 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerToClientFunctionResultSender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerToClientFunctionResultSender.java
@@ -36,8 +36,6 @@ import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 import org.apache.geode.internal.security.AuthorizeRequestPP;
 
-/**
- */
 public class ServerToClientFunctionResultSender implements ResultSender {
   private static final Logger logger = LogService.getLogger();
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/StreamingFunctionOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/StreamingFunctionOperation.java
index 26257b4..a821dda 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/StreamingFunctionOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/StreamingFunctionOperation.java
@@ -26,8 +26,6 @@ import org.apache.geode.distributed.internal.DistributionMessage;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 
-/**
- */
 public abstract class StreamingFunctionOperation {
 
   protected final InternalDistributedSystem sys;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HAContainerMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HAContainerMap.java
index c00e0e3..99b40ea 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HAContainerMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HAContainerMap.java
@@ -68,10 +68,6 @@ public class HAContainerMap implements HAContainerWrapper {
     return haRegionNameToProxy.remove(haName);
   }
 
-  /**
-   * @param key
-   * @return Object
-   */
   public Object getKey(Object key) {
     Entry entry = (Entry) map.get(key);
     return (entry == null) ? null : entry.getKey();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java
index 688d681..630bdea 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java
@@ -1107,7 +1107,6 @@ public class HARegionQueue implements RegionQueue {
    * with the cq stats Expiry can call this for now as durable client expires would shut down the cq
    * anyways if anything goes wrong
    *
-   * @param position
    */
   private void destroyFromQueue(Object key) {
     Object event = this.region.get(key);
@@ -1686,7 +1685,6 @@ public class HARegionQueue implements RegionQueue {
   /**
    * Used for testing purposes only
    *
-   * @return Set
    */
   Set getAvalaibleIds() {
     acquireReadLock();
@@ -2752,7 +2750,6 @@ public class HARegionQueue implements RegionQueue {
      * put operations are not blocked while the QRM thread is iterating over the map contained in
      * MapWrapper & the put operations will continue using the new internal Ma.
      *
-     * @return List
      */
     protected List createMessageList() {
       Map.Entry entry = null;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueueAttributes.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueueAttributes.java
index bf0e81b..a3613ae 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueueAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueueAttributes.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.ha;
 
 import org.apache.geode.distributed.internal.DistributionConfig;
@@ -45,9 +42,6 @@ public class HARegionQueueAttributes {
 
   private int expiryTime = DEFAULT_EXPIRY_TIME;
 
-  /**
-   *
-   */
   private int blockingQueueCapacity =
       Integer.getInteger(BLOCKING_QUEUE_CAPACITY, DEFAULT_BLOCKING_QUEUE_CAPACITY).intValue();
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/ThreadIdentifier.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/ThreadIdentifier.java
index f6ea9ca..6102302 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/ThreadIdentifier.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/ThreadIdentifier.java
@@ -255,7 +255,6 @@ public class ThreadIdentifier implements DataSerializable {
   /**
    * Checks if the input thread id is a WAN_TYPE thread id
    *
-   * @param tid
    * @return whether the input thread id is a WAN_TYPE thread id
    */
   public static boolean isWanTypeThreadID(long tid) {
@@ -304,7 +303,6 @@ public class ThreadIdentifier implements DataSerializable {
   /**
    * checks to see if the membership id of this identifier is the same as in the argument
    *
-   * @param other
    * @return whether the two IDs are from the same member
    */
   public boolean isSameMember(ThreadIdentifier other) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetails.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetails.java
index 5fe1967..a5d2369 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetails.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ColocatedRegionDetails.java
@@ -46,7 +46,6 @@ public class ColocatedRegionDetails implements DataSerializable {
   /**
    * Returns the canonical name of the host machine
    *
-   * @return parent
    */
   public String getHost() {
     return host;
@@ -55,7 +54,6 @@ public class ColocatedRegionDetails implements DataSerializable {
   /**
    * Returns the name of the {@link DistributedMember}
    *
-   * @return parent
    */
   public String getMember() {
     return member;
@@ -64,7 +62,6 @@ public class ColocatedRegionDetails implements DataSerializable {
   /**
    * Returns the name of the parent region of a colocated pair
    *
-   * @return parent
    */
   public String getParent() {
     return parent;
@@ -73,7 +70,6 @@ public class ColocatedRegionDetails implements DataSerializable {
   /**
    * Returns the name of the child region of a colocated pair
    *
-   * @return child
    */
   public String getChild() {
     return child;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateBucketMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateBucketMessage.java
index f35a9f6..bd15607 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateBucketMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/CreateBucketMessage.java
@@ -174,7 +174,6 @@ public class CreateBucketMessage extends PartitionMessage {
    * Assists the toString method in reporting the contents of this message
    *
    * @see PartitionMessage#toString()
-   * @param buff
    */
   @Override
   protected void appendFields(StringBuilder buff) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyMessage.java
index 471ff2a..1ab948c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/DestroyMessage.java
@@ -411,7 +411,6 @@ public class DestroyMessage extends PartitionMessageWithDirectReply {
    * Assists the toString method in reporting the contents of this message
    *
    * @see PartitionMessage#toString()
-   * @param buff
    */
   @Override
   protected void appendFields(StringBuilder buff) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/EndBucketCreationMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/EndBucketCreationMessage.java
index 21f72b8..c81519f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/EndBucketCreationMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/EndBucketCreationMessage.java
@@ -54,7 +54,6 @@ public class EndBucketCreationMessage extends PartitionMessage {
   /**
    * Sends a message to make the recipient primary for the bucket.
    *
-   * @param acceptedMembers
    *
    * @param newPrimary the member to to become primary
    * @param pr the PartitionedRegion of the bucket
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchBulkEntriesMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchBulkEntriesMessage.java
index 7dc8da0..0916e37 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchBulkEntriesMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchBulkEntriesMessage.java
@@ -105,7 +105,6 @@ public class FetchBulkEntriesMessage extends PartitionMessage {
    * @param r the PartitionedRegion that contains the bucket
    * @param bucketIds the identity of the buckets that contain the entries to be returned
    * @param regex the regular expression to be evaluated for selecting keys
-   * @param allowTombstones
    * @return the processor used to read the returned entries
    * @throws ForceReattemptException if the peer is no longer available
    */
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessage.java
index 6c7e420..0ae339b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchKeysMessage.java
@@ -111,11 +111,6 @@ public class FetchKeysMessage extends PartitionMessage {
 
   /**
    *
-   * @param recipient
-   * @param r
-   * @param bucketId
-   * @param itype
-   * @param arg
    * @return the FetchKeysResponse
    * @throws ForceReattemptException if the peer is no longer available
    */
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessage.java
index fd62718..f611647 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessage.java
@@ -67,7 +67,6 @@ public class FetchPartitionDetailsMessage extends PartitionMessage {
    *
    * @param recipients the members to fetch PartitionMemberDetails from
    * @param region the PartitionedRegion to fetch member details for
-   * @param fetchOfflineMembers
    * @return the processor used to fetch the PartitionMemberDetails
    */
   public static FetchPartitionDetailsResponse send(Set<InternalDistributedMember> recipients,
@@ -188,7 +187,6 @@ public class FetchPartitionDetailsMessage extends PartitionMessage {
     /**
      * Send an ack
      *
-     * @param offlineDetails
      */
     public static void send(InternalDistributedMember recipient, int processorId,
         PartitionMemberInfoImpl details, DistributionManager dm,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FlushMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FlushMessage.java
index 02f586f..38a4e20 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FlushMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/FlushMessage.java
@@ -110,9 +110,6 @@ public class FlushMessage extends SerialDistributionMessage implements MessageWi
    * operations originating from the primary {@link Scope#DISTRIBUTED_NO_ACK do not require an
    * acknowldgement}
    *
-   * @param primary
-   * @param p
-   * @param bucketId
    * @return a processor on which to wait for the flush operation to complete
    */
   public static ReplyProcessor21 send(InternalDistributedMember primary, PartitionedRegion p,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/GetMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/GetMessage.java
index 515c2e3..6a419cb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/GetMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/GetMessage.java
@@ -376,7 +376,6 @@ public class GetMessage extends PartitionMessageWithDirectReply {
      * @param val the raw value that will eventually be serialized
      * @param replySender distribution manager used to send the reply
      * @param versionTag the version of the object
-     * @throws ForceReattemptException
      */
     public static void send(InternalDistributedMember recipient, int processorId, RawValue val,
         ReplySender replySender, VersionTag versionTag) throws ForceReattemptException {
@@ -526,7 +525,6 @@ public class GetMessage extends PartitionMessageWithDirectReply {
      * De-seralize the value, if the value isn't already a byte array, this method should be called
      * in the context of the requesting thread for the best scalability
      *
-     * @param preferCD
      * @see EntryEventImpl#deserialize(byte[])
      * @return the value object
      */
@@ -576,7 +574,6 @@ public class GetMessage extends PartitionMessageWithDirectReply {
 
 
     /**
-     * @param preferCD
      * @return Object associated with the key that was sent in the get message
      * @throws ForceReattemptException if the peer is no longer available
      */
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IdentityRequestMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IdentityRequestMessage.java
index 2b8f97b..262cc86 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IdentityRequestMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IdentityRequestMessage.java
@@ -120,7 +120,6 @@ public class IdentityRequestMessage extends DistributionMessage implements Messa
    * {@link org.apache.geode.internal.cache.Node}. The <code>IdentityResponse</code> is used to
    * fetch the highest current identity value.
    *
-   * @param recipients
    * @return the response object to wait upon
    */
   public static IdentityResponse send(Set recipients, InternalDistributedSystem is) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IndexCreationMsg.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IndexCreationMsg.java
index 3ef2b59..fd711f3 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IndexCreationMsg.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/IndexCreationMsg.java
@@ -533,7 +533,6 @@ public class IndexCreationMsg extends PartitionMessage {
     /**
      * Returns a map of index names and number of buckets indexed
      *
-     * @return indexBucketsMap
      */
     public Map<String, Integer> getIndexBucketsMap() {
       return this.indexBucketsMap;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InvalidateMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InvalidateMessage.java
index c6ee021..ef6ec57 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InvalidateMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/InvalidateMessage.java
@@ -148,8 +148,6 @@ public class InvalidateMessage extends DestroyMessage {
    * It is very important that this message does NOT cause any deadlocks as the sender will wait
    * indefinitely for the acknowledgement
    *
-   * @throws EntryExistsException
-   * @throws DataLocationException
    */
   @Override
   protected boolean operateOnPartitionedRegion(ClusterDistributionManager dm, PartitionedRegion r,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketMessage.java
index 60f9837..08d8164 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBackupBucketMessage.java
@@ -96,7 +96,6 @@ public class ManageBackupBucketMessage extends PartitionMessage {
    * @param r the PartitionedRegion to which the bucket belongs
    * @param bucketId the unique identifier of the bucket
    * @param isRebalance true if directed by full rebalance operation
-   * @param replaceOfflineData
    * @param moveSource If this is a bucket move.
    * @param forceCreation ignore checks which may cause the bucket not to be created
    * @return the processor used to fetch the returned Node if any
@@ -194,7 +193,6 @@ public class ManageBackupBucketMessage extends PartitionMessage {
    * Assists the toString method in reporting the contents of this message
    *
    * @see PartitionMessage#toString()
-   * @param buff
    */
   @Override
   protected void appendFields(StringBuilder buff) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBucketMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBucketMessage.java
index d22ac50..8e4098f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBucketMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/ManageBucketMessage.java
@@ -191,7 +191,6 @@ public class ManageBucketMessage extends PartitionMessage {
    * Assists the toString method in reporting the contents of this message
    *
    * @see PartitionMessage#toString()
-   * @param buff
    */
   @Override
   protected void appendFields(StringBuilder buff) {
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 dc89ff5..3f127ac 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
@@ -23,9 +23,6 @@ import java.util.Set;
 import org.apache.geode.DataSerializable;
 import org.apache.geode.internal.cache.persistence.PersistentMemberID;
 
-/**
- *
- */
 public interface OfflineMemberDetails extends DataSerializable {
 
   OfflineMemberDetails EMPTY_DETAILS = new OfflineMemberDetails() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/OfflineMemberDetailsImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/OfflineMemberDetailsImpl.java
index f367b22..ec1b54b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/OfflineMemberDetailsImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/OfflineMemberDetailsImpl.java
@@ -25,9 +25,6 @@ import org.apache.geode.DataSerializable;
 import org.apache.geode.internal.InternalDataSerializer;
 import org.apache.geode.internal.cache.persistence.PersistentMemberID;
 
-/**
- *
- */
 public class OfflineMemberDetailsImpl
     implements OfflineMemberDetails, Serializable, DataSerializable {
   private Set<PersistentMemberID>[] offlineMembers;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRUpdateEntryVersionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRUpdateEntryVersionMessage.java
index 076ad2d..e25d3c6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRUpdateEntryVersionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRUpdateEntryVersionMessage.java
@@ -73,22 +73,11 @@ public class PRUpdateEntryVersionMessage extends PartitionMessageWithDirectReply
   /** for deserialization */
   public PRUpdateEntryVersionMessage() {}
 
-  /**
-   * @param recipients
-   * @param regionId
-   * @param processor
-   */
   public PRUpdateEntryVersionMessage(Collection<InternalDistributedMember> recipients, int regionId,
       DirectReplyProcessor processor) {
     super(recipients, regionId, processor);
   }
 
-  /**
-   * @param recipients
-   * @param regionId
-   * @param processor
-   * @param event
-   */
   public PRUpdateEntryVersionMessage(Set recipients, int regionId, DirectReplyProcessor processor,
       EntryEventImpl event) {
     super(recipients, regionId, processor, event);
@@ -200,7 +189,6 @@ public class PRUpdateEntryVersionMessage extends PartitionMessageWithDirectReply
    * Assists the toString method in reporting the contents of this message
    *
    * @see PartitionMessage#toString()
-   * @param buff
    */
 
   @Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessageWithDirectReply.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessageWithDirectReply.java
index 5303940..3992191 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessageWithDirectReply.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionMessageWithDirectReply.java
@@ -70,9 +70,6 @@ public abstract class PartitionMessageWithDirectReply extends PartitionMessage
     this.processor = processor;
   }
 
-  /**
-   * @param original
-   */
   public PartitionMessageWithDirectReply(PartitionMessageWithDirectReply original,
       EntryEventImpl event) {
     super(original);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOp.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOp.java
index 21630da..7135e66 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOp.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionRebalanceOp.java
@@ -430,8 +430,6 @@ public class PartitionedRegionRebalanceOp {
    * Build a model of the load on the partitioned region, which can determine which buckets to move,
    * etc.
    *
-   * @param detailsMap
-   * @param resourceManager
    */
   private PartitionedRegionLoadModel buildModel(BucketOperator operator,
       Map<PartitionedRegion, InternalPRInfo> detailsMap, InternalResourceManager resourceManager) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutMessage.java
index 7a92980..9f71920 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutMessage.java
@@ -293,8 +293,6 @@ public class PutMessage extends PartitionMessageWithDirectReply implements NewVa
    * @param filterInfo all client routing information
    * @param r the region affected by the event
    * @param event the event that prompted this action
-   * @param ifNew
-   * @param ifOld
    * @param processor the processor to reply to
    * @return members that could not be notified
    */
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RecoveryRunnable.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RecoveryRunnable.java
index a32012c..39cc0be 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RecoveryRunnable.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RecoveryRunnable.java
@@ -28,9 +28,6 @@ public abstract class RecoveryRunnable implements Runnable {
 
   protected final PRHARedundancyProvider redundancyProvider;
 
-  /**
-   * @param prhaRedundancyProvider
-   */
   public RecoveryRunnable(PRHARedundancyProvider prhaRedundancyProvider) {
     redundancyProvider = prhaRedundancyProvider;
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RedundancyAlreadyMetException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RedundancyAlreadyMetException.java
index d1e43b7..ef9508c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RedundancyAlreadyMetException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RedundancyAlreadyMetException.java
@@ -16,9 +16,6 @@ package org.apache.geode.internal.cache.partitioned;
 
 import org.apache.geode.GemFireException;
 
-/**
- *
- */
 public class RedundancyAlreadyMetException extends GemFireException {
   private static final long serialVersionUID = -1876426827930995062L;
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RedundancyLogger.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RedundancyLogger.java
index fb0a821..1dea3f7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RedundancyLogger.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RedundancyLogger.java
@@ -74,7 +74,6 @@ public class RedundancyLogger extends RecoveryRunnable implements PersistentStat
   /**
    * Creates a new RedundancyLogger.
    *
-   * @param prhaRedundancyProvider
    */
   public RedundancyLogger(PRHARedundancyProvider prhaRedundancyProvider) {
     super(prhaRedundancyProvider);
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 e97eee6..b1b2c72 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
@@ -449,7 +449,6 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
   /**
    * Iterates over all buckets and marks them sick if the given member hosts the bucket.
    *
-   * @param member
    * @param sick true if the bucket should be marked sick, false if healthy
    */
   public void markBucketsOnMember(DistributedMember member, boolean sick) {
@@ -488,9 +487,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
    * throws LowMemoryException if the given bucket is hosted on a member which has crossed the
    * ResourceManager threshold.
    *
-   * @param bucketId
    * @param key for bucketId used in exception
-   * @throws LowMemoryException
    */
   public void checkIfBucketSick(final int bucketId, final Object key) throws LowMemoryException {
     if (MemoryThresholds.isLowMemoryExceptionDisabled()) {
@@ -841,7 +838,6 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
    * Returns the list of all FixedPartitionAttributes defined across all members of given
    * partitioned region for a given FixedPartitionAttributes
    *
-   * @param fpa
    * @return the list of same partitions defined on other nodes(can be primary or secondary)
    */
   public List<FixedPartitionAttributesImpl> adviseSameFPAs(final FixedPartitionAttributesImpl fpa) {
@@ -900,7 +896,6 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
   /**
    * TODO remove this when Primary Bucket impl. is permanently in place
    *
-   * @param limitNodeList
    * @return the node??
    */
   public Node adviseSmallestDataStore(final List limitNodeList) {
@@ -1210,7 +1205,6 @@ public class RegionAdvisor extends CacheDistributionAdvisor {
    * Get the most recent primary node for the bucketId. Returns null if no primary can be found
    * within {@link DistributionConfig#getMemberTimeout}.
    *
-   * @param bucketId
    * @return the Node managing the primary copy of the bucket
    */
   public InternalDistributedMember getPrimaryMemberForBucket(int bucketId) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveIndexesMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveIndexesMessage.java
index c198218..e87639b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveIndexesMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveIndexesMessage.java
@@ -349,7 +349,6 @@ public class RemoveIndexesMessage extends PartitionMessage {
     /**
      * Waits for the response from the members for remove indexes call on this system.
      *
-     * @throws ForceReattemptException
      */
     public RemoveIndexesResult waitForResults() throws CacheException, ForceReattemptException {
       waitForCacheException();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperation.java
index 59838f6..f2775c4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/StreamingPartitionOperation.java
@@ -306,9 +306,6 @@ public abstract class StreamingPartitionOperation extends StreamingOperation {
       return status.trackMessage(m);
     }
 
-    /**
-     * @param notReceivedMembers
-     */
     public void removeFailedSenders(Set notReceivedMembers) {
       for (Iterator i = notReceivedMembers.iterator(); i.hasNext();) {
         removeMember((InternalDistributedMember) i.next(), true);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/model/Member.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/model/Member.java
index f8f8be0..ec410e1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/model/Member.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/model/Member.java
@@ -56,7 +56,6 @@ public class Member implements Comparable<Member> {
   }
 
   /**
-   * @param bucket
    * @param sourceMember the member we will be moving this bucket off of
    * @param checkZone true if we should not put two copies of a bucket on two nodes with the same
    *        IP address.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/model/PartitionedRegionLoadModel.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/model/PartitionedRegionLoadModel.java
index c86200a..9a17bb6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/model/PartitionedRegionLoadModel.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/model/PartitionedRegionLoadModel.java
@@ -166,9 +166,7 @@ public class PartitionedRegionLoadModel {
    * least as many members as child regions; it may have more. If the parent has more members than
    * child regions those members will be considered invalid.
    *
-   * @param region
    * @param memberDetailSet A set of details about each member.
-   * @param offlineDetails
    */
   public void addRegion(String region,
       Collection<? extends InternalPartitionDetails> memberDetailSet,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/CanonicalIdHolder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/CanonicalIdHolder.java
index 48a969e..055cabb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/CanonicalIdHolder.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/CanonicalIdHolder.java
@@ -72,7 +72,6 @@ public class CanonicalIdHolder {
   /**
    * Create an id of the given object.
    *
-   * @param object
    * @return the id generated for this object.
    */
   public int createId(Object object) {
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 b3ba610..b1aa08f 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
@@ -21,101 +21,42 @@ import org.apache.geode.internal.Version;
 import org.apache.geode.internal.cache.DiskInitFile.DiskRegionFlag;
 import org.apache.geode.internal.cache.versions.RegionVersionHolder;
 
-/**
- *
- */
 public interface DiskInitFileInterpreter {
 
   boolean isClosing();
 
   String getNameForError();
 
-  /**
-   * @param id
-   * @param c
-   * @param ic
-   */
   void cmnInstantiatorId(int id, Class c, Class ic);
 
-  /**
-   * @param id
-   * @param cn
-   * @param icn
-   */
   void cmnInstantiatorId(int id, String cn, String icn);
 
-  /**
-   * @param dsc
-   */
   void cmnDataSerializerId(Class dsc);
 
-  /**
-   * @param drId
-   * @param pmid
-   */
   void cmnOnlineMemberId(long drId, PersistentMemberID pmid);
 
-  /**
-   * @param drId
-   * @param pmid
-   */
   void cmnOfflineMemberId(long drId, PersistentMemberID pmid);
 
   void cmdOfflineAndEqualMemberId(long drId, PersistentMemberID pmid);
 
-  /**
-   * @param drId
-   * @param pmid
-   */
   void cmnRmMemberId(long drId, PersistentMemberID pmid);
 
-  /**
-   * @param drId
-   * @param pmid
-   */
   void cmnAddMyInitializingPMID(long drId, PersistentMemberID pmid);
 
-  /**
-   * @param drId
-   */
   void cmnMarkInitialized(long drId);
 
-  /**
-   * @param drId
-   * @param regName
-   */
   void cmnCreateRegion(long drId, String regName);
 
-  /**
-   * @param drId
-   */
   void cmnBeginDestroyRegion(long drId);
 
-  /**
-   * @param drId
-   */
   void cmnEndDestroyRegion(long drId);
 
-  /**
-   * @param drId
-   */
   void cmnBeginPartialDestroyRegion(long drId);
 
-  /**
-   * @param drId
-   */
   void cmnEndPartialDestroyRegion(long drId);
 
-  /**
-   * @param drId
-   * @param clearOplogEntryId
-   */
   void cmnClearRegion(long drId, long clearOplogEntryId);
 
-  /**
-   * @param drId
-   * @param clearRVV
-   */
   void cmnClearRegion(long drId,
       ConcurrentHashMap<DiskStoreID, RegionVersionHolder<DiskStoreID>> clearRVV);
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java
index d0d959b..177274a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskInitFileParser.java
@@ -47,9 +47,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LogMarker;
 
-/**
- *
- */
 public class DiskInitFileParser {
   private static final Logger logger = LogService.getLogger();
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskStoreID.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskStoreID.java
index 41c9cf0..601d248 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskStoreID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskStoreID.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.persistence;
 
 import java.io.DataInput;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/MembershipFlushRequest.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/MembershipFlushRequest.java
index 2f7a11a..7f47397 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/MembershipFlushRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/MembershipFlushRequest.java
@@ -37,9 +37,6 @@ import org.apache.geode.internal.cache.LocalRegion;
 import org.apache.geode.internal.cache.PartitionedRegion;
 import org.apache.geode.internal.cache.ProxyBucketRegion;
 
-/**
- *
- */
 public class MembershipFlushRequest extends PooledDistributionMessage implements MessageWithReply {
 
   private String regionPath;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/MembershipViewRequest.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/MembershipViewRequest.java
index 92f9f0a..b03c83b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/MembershipViewRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/MembershipViewRequest.java
@@ -43,9 +43,6 @@ import org.apache.geode.internal.cache.PartitionedRegionHelper;
 import org.apache.geode.internal.cache.partitioned.Bucket;
 import org.apache.geode.internal.logging.LogService;
 
-/**
- *
- */
 public class MembershipViewRequest extends DistributionMessage implements MessageWithReply {
 
   private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PRPersistentConfig.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PRPersistentConfig.java
index c81eb8e..b58ef12 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PRPersistentConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PRPersistentConfig.java
@@ -14,9 +14,6 @@
  */
 package org.apache.geode.internal.cache.persistence;
 
-/**
- *
- */
 public class PRPersistentConfig {
   private final int totalNumBuckets;
   private final String colocatedWith;
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 797af5a..1ca82e4 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
@@ -23,9 +23,6 @@ import org.apache.geode.distributed.internal.ReplyException;
 import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
 import org.apache.geode.internal.cache.CacheDistributionAdvisor;
 
-/**
- *
- */
 public interface PersistenceAdvisor {
 
   /**
@@ -141,7 +138,6 @@ public interface PersistenceAdvisor {
   /**
    * Check to see if the other members know about the current member .
    *
-   * @param replicates
    * @throws ConflictingPersistentDataException if the other members were not part of the same
    *         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.
@@ -157,7 +153,6 @@ public interface PersistenceAdvisor {
    *
    * This method will block until the latest member is online.
    *
-   * @param recoverFromDisk
    * @throws ConflictingPersistentDataException if there are active members which are not based on
    *         the state that is persisted in this member.
    */
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 3938dce..35ca50d 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
@@ -50,9 +50,6 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
 import org.apache.geode.internal.process.StartupStatus;
 import org.apache.geode.internal.util.TransformUtils;
 
-/**
- *
- */
 public class PersistenceAdvisorImpl implements PersistenceAdvisor {
 
   private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberID.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberID.java
index 9aad1d7..7baae21 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberID.java
@@ -23,9 +23,6 @@ import org.apache.geode.DataSerializable;
 import org.apache.geode.DataSerializer;
 import org.apache.geode.internal.cache.versions.VersionSource;
 
-/**
- *
- */
 public class PersistentMemberID implements DataSerializable {
   private static final long serialVersionUID = 7037022320499508045L;
 
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 957954b..ad76547 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
@@ -32,9 +32,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 
-/**
- *
- */
 public class PersistentMemberManager {
   private static final Logger logger = LogService.getLogger();
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberState.java
index 72a7bbb..8f23058 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberState.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentMemberState.java
@@ -18,9 +18,6 @@ import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
-/**
- *
- */
 public enum PersistentMemberState {
   OFFLINE, ONLINE, EQUAL, REVOKED;
 
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 511bfdd..df27463 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
@@ -72,7 +72,6 @@ public interface PersistentMemberView {
    * Indicate that the member no longer persists the region and can be removed. This is only called
    * after this member is online.
    *
-   * @param persistentID
    */
   void memberRemoved(PersistentMemberID persistentID);
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentStateQueryMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentStateQueryMessage.java
index 31c20d7..7dc6772 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentStateQueryMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PersistentStateQueryMessage.java
@@ -44,9 +44,6 @@ import org.apache.geode.internal.cache.PartitionedRegionHelper;
 import org.apache.geode.internal.cache.partitioned.Bucket;
 import org.apache.geode.internal.logging.LogService;
 
-/**
- *
- */
 public class PersistentStateQueryMessage extends HighPriorityDistributionMessage
     implements MessageWithReply {
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PrepareNewPersistentMemberMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PrepareNewPersistentMemberMessage.java
index 23cb979..7235215 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PrepareNewPersistentMemberMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/PrepareNewPersistentMemberMessage.java
@@ -42,9 +42,6 @@ import org.apache.geode.internal.cache.PartitionedRegionHelper;
 import org.apache.geode.internal.cache.partitioned.Bucket;
 import org.apache.geode.internal.logging.LogService;
 
-/**
- *
- */
 public class PrepareNewPersistentMemberMessage extends HighPriorityDistributionMessage
     implements MessageWithReply {
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/RemovePersistentMemberMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/RemovePersistentMemberMessage.java
index f6c281e..b62b595 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/RemovePersistentMemberMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/RemovePersistentMemberMessage.java
@@ -42,9 +42,6 @@ import org.apache.geode.internal.cache.PartitionedRegionHelper;
 import org.apache.geode.internal.cache.partitioned.Bucket;
 import org.apache.geode.internal.logging.LogService;
 
-/**
- *
- */
 public class RemovePersistentMemberMessage extends HighPriorityDistributionMessage
     implements MessageWithReply {
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/GFSnapshot.java b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/GFSnapshot.java
index bfeb53f..54d4666 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/GFSnapshot.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/snapshot/GFSnapshot.java
@@ -111,7 +111,6 @@ public class GFSnapshot {
    *
    * @param snapshot the snapshot file
    * @param region the region name
-   * @param cache
    * @return the callback to allow the invoker to provide the snapshot entries
    * @throws IOException error writing the snapshot file
    */
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
index 6c993bd..b4b15aa 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
@@ -672,7 +672,6 @@ public class CacheClientNotifier {
   /**
    * Adds or updates entry in the dispatched message map when client sends an ack.
    *
-   * @return success
    */
   public boolean processDispatchedMessage(ClientProxyMembershipID proxyId, EventID eid) {
     boolean success = false;
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 4c3cbea..15317da 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
@@ -1540,7 +1540,6 @@ public class CacheClientProxy implements ClientSession {
   /**
    * Delivers the message to the client representing this client proxy.
    *
-   * @param conflatable
    */
   protected void deliverMessage(Conflatable conflatable) {
     ThreadState state = this.securityService.bindSubject(this.subject);
@@ -1673,7 +1672,6 @@ public class CacheClientProxy implements ClientSession {
    * Initializes the message dispatcher thread. The <code>MessageDispatcher</code> processes the
    * message queue.
    *
-   * @throws CacheException
    */
   public void initializeMessageDispatcher() throws CacheException {
     this.messageDispatcherInit = true; // Initialization process.
@@ -2249,7 +2247,6 @@ public class CacheClientProxy implements ClientSession {
      * @param proxy The <code>CacheClientProxy</code> for which this dispatcher is processing
      *        messages
      * @param name thread name for this dispatcher
-     * @throws CacheException
      */
     protected MessageDispatcher(CacheClientProxy proxy, String name) throws CacheException {
       super(LoggingThreadGroup.createThreadGroup(name, logger), name);
@@ -2702,7 +2699,6 @@ public class CacheClientProxy implements ClientSession {
      *
      * @param clientMessage The <code>ClientMessage</code> to send to the client
      *
-     * @throws IOException
      */
     protected boolean dispatchMessage(ClientMessage clientMessage) throws IOException {
       boolean isDispatched = false;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheServerHelper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheServerHelper.java
index b0d8b61..8f1a66a 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheServerHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheServerHelper.java
@@ -103,7 +103,6 @@ public class CacheServerHelper {
   /**
    * The logic used here is based on java's DataInputStream.writeUTF() from the version 1.6.0_10.
    *
-   * @param s
    * @return byte[]
    */
   public static byte[] toUTF(String s) {
@@ -114,8 +113,6 @@ public class CacheServerHelper {
   /**
    * The logic used here is based on java's DataInputStream.readUTF() from the version 1.6.0_10.
    *
-   * @param bytearr
-   * @return String
    */
   public static String fromUTF(byte[] bytearr) {
     int utflen = bytearr.length;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheServerStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheServerStats.java
index 1d674a9..c25233b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheServerStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheServerStats.java
@@ -232,8 +232,6 @@ public class CacheServerStats implements MessageStats {
    * Add a convinience method to pass in a StatisticsFactory for Statistics construction. Helpful
    * for local Statistics operations
    *
-   * @param statisticsFactory
-   * @param ownerName
    */
   public CacheServerStats(StatisticsFactory statisticsFactory, String ownerName, String typeName,
       StatisticDescriptor[] descriptors) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage.java
index bf00657..1b6a35c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage.java
@@ -25,10 +25,6 @@ import org.apache.geode.internal.cache.EnumListenerEvent;
 import org.apache.geode.internal.cache.EventID;
 import org.apache.geode.internal.cache.tier.MessageType;
 
-/**
- *
- *
- */
 public class ClientDataSerializerMessage extends ClientUpdateMessageImpl {
   private byte[][] serializedDataSerializer;
 
@@ -62,7 +58,6 @@ public class ClientDataSerializerMessage extends ClientUpdateMessageImpl {
    *        if conflation is not enabled, or it could be a conflated value if conflation is enabled.
    * @return a <code>Message</code> generated from the fields of this
    *         <code>ClientDataSerializerMessage</code>
-   * @throws IOException
    * @see org.apache.geode.internal.cache.tier.sockets.Message
    */
   @Override
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitor.java
index baa75f5..454497f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitor.java
@@ -298,7 +298,6 @@ public class ClientHealthMonitor {
    * that is inherited from the TXManagerImpl. If that setting is non-positive we expire the states
    * immediately
    *
-   * @param proxyID
    */
   private void expireTXStates(ClientProxyMembershipID proxyID) {
     final TXManagerImpl txMgr = (TXManagerImpl) this._cache.getCacheTransactionManager();
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 0493508..5bef40b 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
@@ -35,7 +35,6 @@ public interface ClientMessage extends Conflatable, DataSerializableFixedID {
    * @param proxy the proxy that is dispatching this message
    * @return a <code>Message</code> generated from the fields of this
    *         <code>ClientUpdateMessage</code>
-   * @throws IOException
    * @see org.apache.geode.internal.cache.tier.sockets.Message
    */
   Message getMessage(CacheClientProxy proxy, boolean notify) throws IOException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientTombstoneMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientTombstoneMessage.java
index 7d2667a..99b4122 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientTombstoneMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientTombstoneMessage.java
@@ -28,10 +28,6 @@ import org.apache.geode.internal.cache.LocalRegion;
 import org.apache.geode.internal.cache.tier.MessageType;
 import org.apache.geode.internal.cache.versions.VersionSource;
 
-/**
- *
- *
- */
 public class ClientTombstoneMessage extends ClientUpdateMessageImpl {
 
   enum TOperation {
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 5b94a15..bc33dd2 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
@@ -336,7 +336,6 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N
    *        if conflation is not enabled, or it could be a conflated value if conflation is enabled.
    * @return a <code>Message</code> generated from the fields of this
    *         <code>ClientUpdateMessage</code>
-   * @throws IOException
    * @see org.apache.geode.internal.cache.tier.sockets.Message
    */
 
@@ -1010,7 +1009,6 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N
   /**
    * Returns the cqs for the given client.
    *
-   * @return cqNames
    */
   public String[] getCqs(ClientProxyMembershipID clientId) {
     String[] cqNames = null;
@@ -1031,8 +1029,6 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N
   /**
    * Add cqs for the given client.
    *
-   * @param clientId
-   * @param filteredCqs
    */
   public void addClientCqs(ClientProxyMembershipID clientId, CqNameToOp filteredCqs) {
     if (this._clientCqs == null) {
@@ -1089,7 +1085,6 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N
   }
 
   /**
-   * @param eventId
    * @see HAEventWrapper#fromData(DataInput)
    * @see HAContainerRegion#get(Object)
    */
@@ -1100,7 +1095,6 @@ public class ClientUpdateMessageImpl implements ClientUpdateMessage, Sizeable, N
   }
 
   /**
-   * @param clientCqs
    * @see HAEventWrapper#fromData(DataInput)
    * @see HAContainerRegion#get(Object)
    */
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HAEventWrapper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HAEventWrapper.java
index 1977c9e..9a31992 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HAEventWrapper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HAEventWrapper.java
@@ -112,7 +112,6 @@ public class HAEventWrapper implements Conflatable, DataSerializableFixedID, Siz
   /**
    * Parameterized constructor.
    *
-   * @param event
    */
   public HAEventWrapper(ClientUpdateMessage event) {
     this.regionName = event.getRegionName();
@@ -124,9 +123,6 @@ public class HAEventWrapper implements Conflatable, DataSerializableFixedID, Siz
     this.clientCqs = ((ClientUpdateMessageImpl) event).getClientCqs();
   }
 
-  /**
-   * @param eventId
-   */
   public HAEventWrapper(EventID eventId) {
     this.eventIdentifier = eventId;
     this.clientUpdateMessage = new ClientUpdateMessageImpl(EnumListenerEvent.AFTER_CREATE,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Message.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Message.java
index 8e2afa2..ea14bb2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Message.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Message.java
@@ -1117,7 +1117,6 @@ public class Message {
    * socket
    *
    * @param timeoutMillis timeout setting for reading the header (0 = no timeout)
-   * @throws IOException
    */
   public void receiveWithHeaderReadTimeout(int timeoutMillis) throws IOException {
     if (this.socket != null) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartList651.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartList651.java
index 887baf0..649ac88 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartList651.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ObjectPartList651.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.tier.sockets;
 
 import java.io.DataInput;
@@ -38,10 +35,6 @@ public class ObjectPartList651 extends ObjectPartList {
     super();
   }
 
-  /**
-   * @param maximumchunksize
-   * @param b
-   */
   public ObjectPartList651(int maximumchunksize, boolean b) {
     super(maximumchunksize, b);
   }
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 13867e3..060c25b 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
@@ -38,7 +38,6 @@ public interface OldClientSupportService extends CacheService {
   /**
    * Process a class name read from a serialized object of unknown origin
    *
-   * @param name
    * @return the class name to use
    */
   String processIncomingClassName(String name);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/OriginalServerConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/OriginalServerConnection.java
index d2a7384..56700e4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/OriginalServerConnection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/OriginalServerConnection.java
@@ -40,16 +40,6 @@ public class OriginalServerConnection extends ServerConnection {
    * Creates a new <code>ServerConnection</code> that processes messages received from an edge
    * client over a given <code>Socket</code>.
    *
-   * @param socket
-   * @param internalCache
-   * @param helper
-   * @param stats
-   * @param hsTimeout
-   * @param socketBufferSize
-   * @param communicationModeStr
-   * @param communicationMode
-   * @param acceptor
-   * @param securityService
    */
   public OriginalServerConnection(Socket socket, InternalCache internalCache,
       CachedRegionHelper helper, CacheServerStats stats, int hsTimeout, int socketBufferSize,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/SerializedObjectPartList.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/SerializedObjectPartList.java
index f11e837..af51aa2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/SerializedObjectPartList.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/SerializedObjectPartList.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.tier.sockets;
 
 import java.io.DataInput;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
index 4e633f2..ccfb00d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
@@ -1150,7 +1150,6 @@ public abstract class ServerConnection implements Runnable {
    * MessageType of the messages (typically internal commands) which do not need to participate in
    * security should be added in the following if block.
    *
-   * @return Part
    * @see AbstractOp#processSecureBytes(Connection, Message)
    * @see AbstractOp#needsUserId()
    * @see AbstractOp#sendMessage(Connection)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/VersionedObjectList.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/VersionedObjectList.java
index 41f7fb5..1b870fb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/VersionedObjectList.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/VersionedObjectList.java
@@ -153,7 +153,6 @@ public class VersionedObjectList extends ObjectPartList implements Externalizabl
    * a server may have null IDs because they were operations performed by that server. We transmit
    * them as nulls to cut costs, but have to do the swap on the receiving end (in the client)
    *
-   * @param sender
    */
   public void replaceNullIDs(DistributedMember sender) {
     for (VersionTag versionTag : versionTags) {
@@ -172,9 +171,6 @@ public class VersionedObjectList extends ObjectPartList implements Externalizabl
    * Add a part for a destroyed or missing entry. If the version tag is not null this represents a
    * tombstone.
    *
-   * @param key
-   * @param value
-   * @param version
    */
   public void addObjectPartForAbsentKey(Object key, Object value, VersionTag version) {
     addPart(key, value, KEY_NOT_AT_SERVER, version);
@@ -237,7 +233,6 @@ public class VersionedObjectList extends ObjectPartList implements Externalizabl
   /**
    * save the current key/tag pairs in the given map
    *
-   * @param vault
    */
   public void saveVersions(Map<Object, VersionTag> vault) {
     Iterator it = this.iterator();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java
index c856acb..c37ca4b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClearRegion.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.tier.sockets.command;
 
 import java.io.IOException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java
index 425989e..759b5b4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ClientReady.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.tier.sockets.command;
 
 import java.io.IOException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java
index a0527f5..8b5b280 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CloseConnection.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.tier.sockets.command;
 
 import java.io.IOException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java
index 2ab92e4..936e9fb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommand.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.tier.sockets.command;
 
 import java.io.IOException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java
index 6070cd7..e6183d8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Default.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.tier.sockets.command;
 
 import java.io.IOException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy70.java
index f072508..c09793e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy70.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.tier.sockets.command;
 
 import java.io.IOException;
@@ -27,9 +24,6 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
 import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
 import org.apache.geode.internal.cache.versions.VersionTag;
 
-/**
- *
- */
 public class Destroy70 extends Destroy65 {
   private static final Destroy70 singleton = new Destroy70();
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java
index 20f8fd4..bb4711a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/ExecuteFunction70.java
@@ -38,9 +38,6 @@ import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.security.SecurityService;
 
-/**
- *
- */
 public class ExecuteFunction70 extends ExecuteFunction66 {
 
   private static final ExecuteFunction70 singleton = new ExecuteFunction70();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java
index e3b1fa7..6ca8099 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalid.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.tier.sockets.command;
 
 import java.io.IOException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate70.java
index 7dfe925..e9b63ea 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Invalidate70.java
@@ -25,9 +25,6 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
 import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
 import org.apache.geode.internal.cache.versions.VersionTag;
 
-/**
- *
- */
 public class Invalidate70 extends Invalidate {
 
   private static final Invalidate70 singleton = new Invalidate70();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java
index 9c18e3b..63bfb89 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/KeySet.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.tier.sockets.command;
 
 import java.io.IOException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java
index dce247b..87dafff 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/MakePrimary.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.tier.sockets.command;
 
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java
index f9091da..c30cc5e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/PeriodicAck.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.tier.sockets.command;
 
 import java.io.IOException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java
index 8de4257..70f641d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Ping.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.tier.sockets.command;
 
 import java.io.IOException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put70.java
index 353a6be..e717c7a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/Put70.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.tier.sockets.command;
 
 import java.io.IOException;
@@ -27,9 +24,6 @@ import org.apache.geode.internal.cache.tier.sockets.Message;
 import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
 import org.apache.geode.internal.cache.versions.VersionTag;
 
-/**
- *
- */
 public class Put70 extends Put65 {
 
   private static final Put70 singleton = new Put70();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/QueryGeode10.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/QueryGeode10.java
index fd35073..f4e1da3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/QueryGeode10.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/QueryGeode10.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.tier.sockets.command;
 
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/QueryWithParametersGeode10.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/QueryWithParametersGeode10.java
index 5ee2473..bd1a1a4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/QueryWithParametersGeode10.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/QueryWithParametersGeode10.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.tier.sockets.command;
 
 import org.apache.geode.cache.query.SelectResults;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInstantiators.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInstantiators.java
index 442977e..d8d6c48 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInstantiators.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInstantiators.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.tier.sockets.command;
 
 import java.io.IOException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java
index 5a4cc1c..225e8f3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.tier.sockets.command;
 
 import java.io.IOException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java
index 6c184e4..c845a9c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestList.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.tier.sockets.command;
 
 import java.io.IOException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/DistTxEntryEvent.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/DistTxEntryEvent.java
index a4ff33e..eb8e46a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/DistTxEntryEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/DistTxEntryEvent.java
@@ -121,10 +121,6 @@ public class DistTxEntryEvent extends EntryEventImpl {
     }
   }
 
-  /**
-   * @param out
-   * @throws IOException
-   */
   private void putAllToData(DataOutput out) throws IOException {
     DataSerializer.writeInteger(this.putAllOp.putAllDataSize, out);
     EntryVersionsList versionTags = new EntryVersionsList(this.putAllOp.putAllDataSize);
@@ -146,11 +142,6 @@ public class DistTxEntryEvent extends EntryEventImpl {
     }
   }
 
-  /**
-   * @param in
-   * @throws IOException
-   * @throws ClassNotFoundException
-   */
   private void putAllFromData(DataInput in) throws IOException, ClassNotFoundException {
     int putAllSize = DataSerializer.readInteger(in);
     PutAllEntryData[] putAllEntries = new PutAllEntryData[putAllSize];
@@ -177,10 +168,6 @@ public class DistTxEntryEvent extends EntryEventImpl {
     this.putAllOp.setPutAllEntryData(putAllEntries);
   }
 
-  /**
-   * @param out
-   * @throws IOException
-   */
   private void removeAllToData(DataOutput out) throws IOException {
     DataSerializer.writeInteger(this.removeAllOp.removeAllDataSize, out);
 
@@ -204,11 +191,6 @@ public class DistTxEntryEvent extends EntryEventImpl {
     }
   }
 
-  /**
-   * @param in
-   * @throws IOException
-   * @throws ClassNotFoundException
-   */
   private void removeAllFromData(DataInput in) throws IOException, ClassNotFoundException {
     int removeAllSize = DataSerializer.readInteger(in);
     final RemoveAllEntryData[] removeAllData = new RemoveAllEntryData[removeAllSize];
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/PartitionedTXRegionStub.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/PartitionedTXRegionStub.java
index c029175..162abc2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/PartitionedTXRegionStub.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/PartitionedTXRegionStub.java
@@ -269,7 +269,6 @@ public class PartitionedTXRegionStub extends AbstractPeerTXRegionStub {
 
 
   /**
-   * @param e
    * @return true if the cause of the FRE is a BucketNotFoundException
    */
   private boolean isBucketNotFoundException(ForceReattemptException e) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemoteFetchKeysMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemoteFetchKeysMessage.java
index 9abc8b5..8f08f34 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemoteFetchKeysMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemoteFetchKeysMessage.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.tx;
 
 import java.io.ByteArrayInputStream;
@@ -90,8 +87,6 @@ public class RemoteFetchKeysMessage extends RemoteOperationMessage {
   }
 
   /**
-   * @param currRegion
-   * @param target
    * @return the response
    */
   public static FetchKeysResponse send(LocalRegion currRegion, DistributedMember target) {
@@ -375,7 +370,6 @@ public class RemoteFetchKeysMessage extends RemoteOperationMessage {
     }
 
     /**
-     * @param msg
      * @return true if done processing
      */
     boolean processChunk(RemoteFetchKeysReplyMessage msg) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemoteFetchVersionMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemoteFetchVersionMessage.java
index 14b1eaa..4e9237f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemoteFetchVersionMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemoteFetchVersionMessage.java
@@ -62,9 +62,6 @@ public class RemoteFetchVersionMessage extends RemoteOperationMessage {
   /**
    * Send RemoteFetchVersionMessage to the recipient for the given key
    *
-   * @param recipient
-   * @param r
-   * @param key
    * @return the processor used to fetch the VersionTag for the key
    * @throws RemoteOperationException if the member is no longer available
    */
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemoteGetMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemoteGetMessage.java
index 9c52bf5..bc6c840 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemoteGetMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/RemoteGetMessage.java
@@ -352,7 +352,6 @@ public class RemoteGetMessage extends RemoteOperationMessageWithDirectReply {
      * De-seralize the value, if the value isn't already a byte array, this method should be called
      * in the context of the requesting thread for the best scalability
      *
-     * @param preferCD
      * @see EntryEventImpl#deserialize(byte[])
      * @return the value object
      */
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/TransactionalOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/TransactionalOperation.java
index 9f19eca..337cabb 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tx/TransactionalOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tx/TransactionalOperation.java
@@ -19,9 +19,6 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-/**
- *
- */
 public class TransactionalOperation {
   public static enum ServerRegionOperation {
     CONTAINS_KEY,
@@ -39,7 +36,6 @@ public class TransactionalOperation {
     REMOVE_ALL;
 
     /**
-     * @param op
      * @return true if the key associated with this op should be locked on clients locally; false
      *         otherwise
      */
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/ConcurrentCacheModificationException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/ConcurrentCacheModificationException.java
index 09bd830..9a7e10d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/ConcurrentCacheModificationException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/ConcurrentCacheModificationException.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.versions;
 
 import java.util.ConcurrentModificationException;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionHolder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionHolder.java
index 6efdb0c..6c7a5ac 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionHolder.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionHolder.java
@@ -71,7 +71,6 @@ public class RegionVersionHolder<T> implements Cloneable, DataSerializable {
    * This contructor should only be used for cloning a RegionVersionHolder or initializing and
    * invalid version holder (with version -1)
    *
-   * @param ver
    */
   public RegionVersionHolder(long ver) {
     this.version = ver;
@@ -749,7 +748,6 @@ public class RegionVersionHolder<T> implements Cloneable, DataSerializable {
    * Canonicalize an ordered set of exceptions. In the canonical form, none of the RVVExceptions
    * have any received versions.
    *
-   * @param exceptions
    * @return The canonicalized set of exceptions.
    */
   protected List<RVVException> canonicalExceptions(List<RVVException> exceptions) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionVector.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionVector.java
index 811e948..3a87b77 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionVector.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RegionVersionVector.java
@@ -293,7 +293,6 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
   /**
    * locks against new version generation and returns the current region version number
    *
-   * @param regionPath
    */
   public long lockForClear(String regionPath, DistributionManager dm,
       InternalDistributedMember locker) {
@@ -323,7 +322,6 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
    * This schedules a thread that owns the version-generation write-lock for this vector. The method
    * unlockVersionGeneration notifies the thread to release the lock and terminate its run.
    *
-   * @param regionPath
    * @param dm the distribution manager - used to obtain an executor to hold the thread
    * @param locker the member requesting the lock (currently not used)
    */
@@ -725,7 +723,6 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
    * current version holder if it dominates the version holder we already have. This method will
    * called once for each oplog we recover.
    *
-   * @param latestOplog
    */
   @edu.umd.cs.findbugs.annotations.SuppressWarnings(
       value = "ML_SYNC_ON_FIELD_TO_GUARD_CHANGING_THAT_FIELD",
@@ -871,7 +868,6 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
    * This marks the given entry as departed, making it eligible to be removed during an operation
    * like DistributedRegion.synchronizeWith()
    *
-   * @param id
    */
   protected void markDepartedMember(T id) {
     synchronized (this.memberToVersion) {
@@ -887,7 +883,6 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
    * its Region that have not been removed from the argument's Region. If this is the case, then a
    * delta GII may leave entries in the other RVV's Region that should be deleted.
    *
-   * @param other
    * @return true if there have been tombstone removals in this vector's Region that were not done
    *         in the argument's region
    */
@@ -1089,8 +1084,6 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
    * Remove any exceptions for the given member that are older than the given version. This is used
    * after a synchronization operation to get rid of unneeded history.
    *
-   * @param mbr
-   * @param version
    */
   public void removeExceptionsFor(DistributedMember mbr, long version) {
     RegionVersionHolder<T> holder = this.memberToVersion.get(mbr);
@@ -1141,7 +1134,6 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
    * after deserializing a version tag or RVV the IDs in it should be replaced with references to
    * IDs returned by this method. This vastly reduces the memory footprint of tags/stamps/rvvs
    *
-   * @param id
    * @return the canonical reference
    */
   public T getCanonicalId(T id) {
@@ -1240,8 +1232,6 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
    * region-version of any tombstone reaped. Any older versions are then immediately eligible for
    * reaping.
    *
-   * @param mbr
-   * @param regionVersion
    */
   public void recordGCVersion(T mbr, long regionVersion) {
     if (mbr == null) {
@@ -1275,7 +1265,6 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
   /**
    * record all of the GC versions in the given vector
    *
-   * @param other
    */
   public void recordGCVersions(RegionVersionVector<T> other) {
     assert other.memberToGCVersion != null : "incoming gc version set is null";
@@ -1290,8 +1279,6 @@ public abstract class RegionVersionVector<T extends VersionSource<?>>
    * that a clear or GC has been received that should have wiped out the operation this version
    * stamp represents, but this operation had not yet been received
    *
-   * @param mbr
-   * @param gcVersion
    * @return true if the given version should be rejected
    */
   public boolean isTombstoneTooOld(T mbr, long gcVersion) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionTag.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionTag.java
index 2d515a3..b79e285 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionTag.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionTag.java
@@ -216,7 +216,6 @@ public abstract class VersionTag<T extends VersionSource>
   /**
    * Set canonical ID objects into this version tag using the DM's cache of IDs
    *
-   * @param distributionManager
    */
   public void setCanonicalIDs(DistributionManager distributionManager) {}
 
@@ -271,7 +270,6 @@ public abstract class VersionTag<T extends VersionSource>
   /**
    * set or clear the flag that this tag was blessed by a conflict resolver
    *
-   * @param flag
    * @return this tag
    */
   public VersionTag setAllowedByResolver(boolean flag) {
@@ -299,7 +297,6 @@ public abstract class VersionTag<T extends VersionSource>
    * replace null member IDs with the given identifier. This is used to incorporate version
    * information into the cache that has been received from another VM
    *
-   * @param id
    */
   public void replaceNullIDs(VersionSource id) {
     if (this.memberID == null) {
@@ -456,7 +453,6 @@ public abstract class VersionTag<T extends VersionSource>
   /**
    * Creates a version tag of the appropriate type, based on the member id
    *
-   * @param memberId
    */
   public static VersionTag create(VersionSource memberId) {
     VersionTag tag;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
index 034d810..0fef764 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
@@ -821,8 +821,6 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
   /**
    * Check if this event can be distributed by senders.
    *
-   * @param event
-   * @param stats
    * @return boolean True if the event is allowed.
    */
   private boolean checkForDistribution(EntryEventImpl event, GatewaySenderStats stats) {
@@ -1061,7 +1059,6 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
    * Removes the EntryEventImpl, whose tailKey matches with the provided tailKey, from
    * tmpQueueEvents.
    *
-   * @param tailKey
    */
   public boolean removeFromTempQueueEvents(Object tailKey) {
     synchronized (this.queuedEventsSync) {
@@ -1225,9 +1222,6 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
     return region;
   }
 
-  /**
-   * @param clonedEvent
-   */
   protected abstract void setModifiedEventId(EntryEventImpl clonedEvent);
 
   public static class DefaultGatewayEventFilter
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
index 34d511c..baaabd0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
@@ -145,10 +145,6 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
    */
   private int batchSize;
 
-  /**
-   * @param createThreadGroup
-   * @param string
-   */
   public AbstractGatewaySenderEventProcessor(LoggingThreadGroup createThreadGroup, String string,
       GatewaySender sender) {
     super(createThreadGroup, string);
@@ -896,7 +892,6 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
   /**
    * Mark all PDX types as requiring dispatch so that they will be sent over the connection again.
    *
-   * @param remotePdxSize
    */
   public void checkIfPdxNeedsResend(int remotePdxSize) {
     InternalCache cache = this.sender.getCache();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/BatchException70.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/BatchException70.java
index 2028c2c..fb11be7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/BatchException70.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/BatchException70.java
@@ -39,7 +39,6 @@ public class BatchException70 extends GemFireCheckedException {
   /**
    * Required for serialization
    *
-   * @param l
    */
   public BatchException70(List<BatchException70> l) {
     super(l.get(0).getMessage());
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderConfigurationException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderConfigurationException.java
index e58be44..1e94a60 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderConfigurationException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderConfigurationException.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.wan;
 
 /**
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackDispatcher.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackDispatcher.java
index 8c5e718..bab1022 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackDispatcher.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackDispatcher.java
@@ -141,7 +141,6 @@ public class GatewaySenderEventCallbackDispatcher implements GatewaySenderEventD
    *
    * @param events The <code>List</code> of events to send
    *
-   * @throws GatewaySenderException
    */
   protected boolean dispatchBatch(List events) throws GatewaySenderException {
     if (events.isEmpty()) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
index a391238..7c74957 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
@@ -231,7 +231,6 @@ public class GatewaySenderEventImpl
    * @param event The <code>CacheEvent</code> on which this <code>GatewayEventImpl</code> is based
    * @param substituteValue The value to be enqueued instead of the value in the event.
    *
-   * @throws IOException
    */
   @Retained
   public GatewaySenderEventImpl(EnumListenerEvent operation, CacheEvent event,
@@ -254,7 +253,6 @@ public class GatewaySenderEventImpl
    * @param substituteValue The value to be enqueued instead of the value in the event.
    * @param initialize Whether to initialize this instance
    *
-   * @throws IOException
    */
   @Retained
   public GatewaySenderEventImpl(EnumListenerEvent operation, CacheEvent ce, Object substituteValue,
@@ -1011,7 +1009,6 @@ public class GatewaySenderEventImpl
   /**
    * Return the EventSequenceID of the Event
    *
-   * @return EventSequenceID
    */
   public EventSequenceID getEventSequenceID() {
     return new EventSequenceID(id.getMembershipID(), id.getThreadID(), id.getSequenceID());
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderQueue.java
index b8d15e9..cc77bd9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderQueue.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.wan.parallel;
 
 import java.util.List;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessor.java
index e7beb07..ec01fd9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessor.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.wan.serial;
 
 import java.io.IOException;
@@ -54,10 +51,6 @@ import org.apache.geode.internal.logging.LoggingThreadGroup;
 import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 import org.apache.geode.internal.offheap.annotations.Released;
 
-/**
- *
- *
- */
 public class ConcurrentSerialGatewaySenderEventProcessor
     extends AbstractGatewaySenderEventProcessor {
 
@@ -72,9 +65,6 @@ public class ConcurrentSerialGatewaySenderEventProcessor
 
   private final Set<RegionQueue> queues;
 
-  /**
-   * @param sender
-   */
   public ConcurrentSerialGatewaySenderEventProcessor(AbstractGatewaySender sender) {
     super(LoggingThreadGroup
         .createThreadGroup("Event Processor for GatewaySender_" + sender.getId(), logger),
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
index 322a28a..e0ec752 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
@@ -665,8 +665,6 @@ public class SerialGatewaySenderQueue implements RegionQueue {
   /**
    * returns true if key a is before key b. This test handles keys that have wrapped around
    *
-   * @param a
-   * @param b
    */
   private boolean before(long a, long b) {
     // a is before b if a < b or a>b and a MAXIMUM_KEY/2 larger than b
@@ -690,7 +688,6 @@ public class SerialGatewaySenderQueue implements RegionQueue {
   /**
    * Finds the next object after the last key peeked
    *
-   * @throws CacheException
    */
   private Long getCurrentKey() {
     long currentKey;
@@ -769,7 +766,6 @@ public class SerialGatewaySenderQueue implements RegionQueue {
    * will be stored.
    *
    * @return the value of the tail key
-   * @throws CacheException
    */
   private long getTailKey() throws CacheException {
     long tlKey;
@@ -794,7 +790,6 @@ public class SerialGatewaySenderQueue implements RegionQueue {
   /**
    * Increments the value of the tail key by one.
    *
-   * @throws CacheException
    */
   private void incrementTailKey() throws CacheException {
     this.tailKey.set(inc(this.tailKey.get()));
@@ -815,7 +810,6 @@ public class SerialGatewaySenderQueue implements RegionQueue {
    * SerialGatewaySender.handleFailover. So there's a possibility we can consolidate that code with
    * this method and iterate over the region once.
    *
-   * @throws CacheException
    */
   private void initializeKeys() throws CacheException {
     if (tailKey.get() != -1) {
@@ -878,7 +872,6 @@ public class SerialGatewaySenderQueue implements RegionQueue {
    * queue.
    *
    * @return the value of the head key
-   * @throws CacheException
    */
   private long getHeadKey() throws CacheException {
     long hKey;
@@ -902,7 +895,6 @@ public class SerialGatewaySenderQueue implements RegionQueue {
   /**
    * Increments the value of the head key by one.
    *
-   * @throws CacheException
    */
   private void updateHeadKey(long destroyedKey) throws CacheException {
     this.headKey = inc(destroyedKey);
@@ -1055,7 +1047,6 @@ public class SerialGatewaySenderQueue implements RegionQueue {
     /**
      * Constructor : Creates and initializes the thread
      *
-     * @param c
      */
     public BatchRemovalThread(InternalCache c) {
       this.setDaemon(true);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/BindingCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/BindingCreation.java
index d158cb2..fb5b9b8 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/BindingCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/BindingCreation.java
@@ -41,7 +41,6 @@ public class BindingCreation {
   /**
    * This function returns the VendorSpecific data Map
    *
-   * @return List
    */
   List getVendorSpecificList() {
     return this.vendorSpecificList;
@@ -50,7 +49,6 @@ public class BindingCreation {
   /**
    * This function returns the Gemfire Specific data Map
    *
-   * @return Map
    */
   Map getGFSpecificMap() {
     return this.gfSpecific;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheServerCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheServerCreation.java
index a2dd8bd..07c2685 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheServerCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheServerCreation.java
@@ -53,8 +53,6 @@ public class CacheServerCreation extends AbstractCacheServer {
   /**
    * Constructor for retaining bridge server information during auto-reconnect
    *
-   * @param cache
-   * @param other
    */
   public CacheServerCreation(InternalCache cache, CacheServer other) {
     super(cache);
@@ -195,7 +193,6 @@ public class CacheServerCreation extends AbstractCacheServer {
    * compare returning <code>true</code>. If a port is specified, return the proper comparison.
    *
    * @param other CacheServer
-   * @return
    */
   private boolean isCacheServerPortEquals(CacheServer other) {
     return (this.getPort() == 0) ? true : this.getPort() == other.getPort();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java
index a373313..3390b93 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java
@@ -769,7 +769,6 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
    * Given a public id, attempt to resolve it to a DTD. Returns an <code>InputSoure</code> for the
    * DTD.
    *
-   * @throws IOException
    */
   public InputSource resolveEntity(String name, String publicId, String baseURI, String systemId)
       throws SAXException, IOException {
@@ -864,11 +863,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
   /**
    * Resolve entity using discovered {@link EntityResolver2}s.
    *
-   * @param publicId
-   * @param systemId
    * @return {@link InputSource} for resolved entity if found, otherwise null.
-   * @throws IOException
-   * @throws SAXException
    * @since GemFire 8.1
    */
   private InputSource resolveEntityByEntityResolvers(String name, String publicId, String baseURI,
@@ -908,8 +903,6 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
 
   /**
    *
-   * @param attributes
-   * @param name
    * @return String value for named attribute or null if attribute not defined.
    * @since GemFire 8.1
    */
@@ -919,9 +912,6 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
 
   /**
    *
-   * @param attributes
-   * @param name
-   * @param defaultValue
    * @return String value for named attribute or <code>defaultValue</code> if attribute not defined.
    * @since GemFire 8.1
    */
@@ -936,8 +926,6 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
 
   /**
    *
-   * @param attributes
-   * @param name
    * @return Integer value for named attribute or null if attribute not defined.
    * @since GemFire 8.1
    */
@@ -947,9 +935,6 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
 
   /**
    *
-   * @param attributes
-   * @param name
-   * @param defaultValue
    * @return Integer value for named attribute or <code>defaultValue</code> if attribute not
    *         defined.
    * @since GemFire 8.1
@@ -965,8 +950,6 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
 
   /**
    *
-   * @param attributes
-   * @param name
    * @return Boolean value for named attribute or null if attribute not defined.
    * @since GemFire 8.1
    */
@@ -976,9 +959,6 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
 
   /**
    *
-   * @param attributes
-   * @param name
-   * @param defaultValue
    * @return Boolean value for named attribute or <code>defaultValue</code> if attribute not
    *         defined.
    * @since GemFire 8.1
@@ -994,9 +974,6 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
 
   /**
    *
-   * @param attributes
-   * @param name
-   * @param clazz
    * @return Enum value for named attribute or null if attribute not defined.
    * @since GemFire 8.1
    */
@@ -1007,10 +984,6 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
 
   /**
    *
-   * @param attributes
-   * @param name
-   * @param clazz
-   * @param defaultValue
    * @return Enum value for named attribute or <code>defaultValue</code> if attribute not defined.
    * @since GemFire 8.1
    */
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlGenerator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlGenerator.java
index 58832d2..ab22d0b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlGenerator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlGenerator.java
@@ -849,7 +849,6 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
   /**
    * Generates the <code>serializer-registration</code> element.
    *
-   * @throws SAXException
    */
   private void generateSerializerRegistration() throws SAXException {
     final SerializerCreation sc = this.creation.getSerializerCreation();
@@ -882,9 +881,6 @@ public class CacheXmlGenerator extends CacheXml implements XMLReader {
     handler.endElement("", TOP_SERIALIZER_REGISTRATION, TOP_SERIALIZER_REGISTRATION);
   }
 
-  /**
-   * @throws SAXException
-   */
   private void generateFunctionService() throws SAXException {
     Collection<Function> functions = Collections.emptyList();
     if (this.cache instanceof CacheCreation) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java
index 4ea2b14..5705498 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java
@@ -1931,8 +1931,6 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
    *
    * @throws CacheXmlException Something goes wrong while instantiating or initializing the
    *         declarable
-   * @param cache
-   * @param stack
    */
   public static Declarable createDeclarable(CacheCreation cache, Stack<Object> stack) {
     Properties props = new Properties();
@@ -2114,10 +2112,6 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
    * <code>region-attributes</code>. Allow any combination of attributes to be provided. Use the
    * default values for any attribute that is not provided.
    *
-   * @param atts
-   */
-  /**
-   * @param atts
    */
   private void startLRUEntryCount(Attributes atts) {
     final String maximum = atts.getValue(MAXIMUM);
@@ -2139,7 +2133,6 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
    * the attributes to be missing. Store the attributes on the stack anticipating the declaration of
    * an {@link ObjectSizer}.
    *
-   * @param atts
    */
   private void startLRUMemorySize(Attributes atts) {
     String lruAction = atts.getValue(ACTION);
@@ -2184,7 +2177,6 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
    * Create an <code>lru-heap-percentage</code> eviction controller, assigning it to the enclosed
    * <code>region-attributes</code>
    *
-   * @param atts
    */
   private void startLRUHeapPercentage(Attributes atts) {
     final String lruAction = atts.getValue(ACTION);
@@ -2871,7 +2863,6 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
   /**
    * Add a marker string to look for when in endPartitionProperties
    *
-   * @param atts
    * @param localOrGlobal either the string LOCAL_PROPERTIES or GLOBAL_PROPERTIES
    */
   private void startPartitionProperties(Attributes atts, String localOrGlobal) {
@@ -3207,9 +3198,6 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
     return (GatewaySenderFactory) a;
   }
 
-  /**
-   *
-   */
   private void endPdxSerializer() {
     Declarable d = createDeclarable();
     if (!(d instanceof PdxSerializer)) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlPropertyResolver.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlPropertyResolver.java
index 372cc31..fc0022a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlPropertyResolver.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlPropertyResolver.java
@@ -66,7 +66,6 @@ public class CacheXmlPropertyResolver implements PropertyResolver {
    * Sets <code>propertyOverridden</code> with one of the constants specified in this
    * {@link CacheXmlPropertyResolver} class.
    *
-   * @param propertyOverridden
    */
   public void setPropertyOverridden(int propertyOverridden) {
     this.propertyOverridden = propertyOverridden;
@@ -86,8 +85,6 @@ public class CacheXmlPropertyResolver implements PropertyResolver {
    * is found then {@link IllegalArgumentException} would be thrown based on
    * <code>ignoreUnresolvedProperties</code> flag being set by {@link CacheXmlParser}.
    *
-   * @param replaceString
-   * @return resolvedString
    */
   public String resolveReplaceString(String replaceString) {
     String replacement = null;
@@ -106,12 +103,6 @@ public class CacheXmlPropertyResolver implements PropertyResolver {
     return replacement;
   }
 
-  /**
-   * @param stringWithPrefixAndSuffix
-   * @param prefix
-   * @param suffix
-   * @return string
-   */
   public String processUnresolvableString(String stringWithPrefixAndSuffix, String prefix,
       String suffix) {
     String resolvedString = null;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlPropertyResolverHelper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlPropertyResolverHelper.java
index 43f1b17..a3559cf 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlPropertyResolverHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlPropertyResolverHelper.java
@@ -56,10 +56,6 @@ public class CacheXmlPropertyResolverHelper {
 
   private String prefixForSuffix = DEFAULT_PREFIX_FOR_SUFFIX;
 
-  /**
-   * @param propPrefix
-   * @param propSuffix
-   */
   public CacheXmlPropertyResolverHelper(String propPrefix, String propSuffix) {
     if (propPrefix != null && propSuffix != null) {
       String validPrefix = validSuffixAndPrefixes.get(propSuffix);
@@ -78,8 +74,6 @@ public class CacheXmlPropertyResolverHelper {
    * Parses the given string which are supposed to be like ${} for system and/or Gemfire properties
    * to be replaced. This will return property.name from ${property.name}.
    *
-   * @param unparsedString
-   * @return parsedString
    */
   protected String parseResolvablePropString(String unparsedString, PropertyResolver resolver,
       Set<String> visitedReplaceableStrings) {
@@ -135,9 +129,6 @@ public class CacheXmlPropertyResolverHelper {
    * Finds index of suffix in a string from a specified index. Like finds index of "}" in string
    * "${my.prop.name}" starting from index 2, which is 14.
    *
-   * @param buf
-   * @param index
-   * @return suffix
    */
   private int findSuffixIndex(StringBuilder buf, int index) {
     int inNestedProperty = 0;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/DiskStoreAttributesCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/DiskStoreAttributesCreation.java
index 9a4b561..97a8550 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/DiskStoreAttributesCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/DiskStoreAttributesCreation.java
@@ -102,8 +102,6 @@ public class DiskStoreAttributesCreation extends UserSpecifiedDiskStoreAttribute
   /**
    * returns true if two long[] are equal
    *
-   * @param array1
-   * @param array2
    * @return true if equal
    */
   private boolean equal(long[] array1, long[] array2) {
@@ -122,8 +120,6 @@ public class DiskStoreAttributesCreation extends UserSpecifiedDiskStoreAttribute
   /**
    * returns true if two int[] are equal
    *
-   * @param array1
-   * @param array2
    * @return true if equal
    */
   private boolean equal(int[] array1, int[] array2) {
@@ -315,7 +311,6 @@ public class DiskStoreAttributesCreation extends UserSpecifiedDiskStoreAttribute
   /**
    * Checks if directories exist
    *
-   * @param disk_dirs
    */
   private void checkIfDirectoriesExist(File[] disk_dirs) {
     // for (int i=0; i < disk_dirs.length; i++) {
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 0ec8b1a..895ddb7 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
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.xmlcache;
 
 import java.util.IllegalFormatException;
@@ -36,8 +33,6 @@ public interface PropertyResolver {
    * is found then {@link IllegalFormatException} would be thrown based on
    * <code>ignoreUnresolvedProperties</code> flag being set by {@link CacheXmlParser}.
    *
-   * @param replaceString
-   * @return resolvedString
    */
   String resolveReplaceString(String replaceString);
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionAttributesCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionAttributesCreation.java
index 4b4d070..92e9dd0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionAttributesCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionAttributesCreation.java
@@ -308,8 +308,6 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
   /**
    * returns true if two long[] are equal
    *
-   * @param array1
-   * @param array2
    * @return true if equal
    */
   private boolean equal(long[] array1, long[] array2) {
@@ -328,8 +326,6 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
   /**
    * returns true if two int[] are equal
    *
-   * @param array1
-   * @param array2
    * @return true if equal
    */
   private boolean equal(int[] array1, int[] array2) {
@@ -1010,7 +1006,6 @@ public class RegionAttributesCreation extends UserSpecifiedRegionAttributes
   /**
    * Checks if directories exist
    *
-   * @param diskDirs
    */
   private void checkIfDirectoriesExist(File[] diskDirs) {
     for (int i = 0; i < diskDirs.length; i++) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionCreation.java
index b8c550a..418c285 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/RegionCreation.java
@@ -144,9 +144,6 @@ public class RegionCreation implements Region, Extensible<Region<?, ?>> {
    * Fills in the state (that is, adds entries and creates subregions) of a given
    * <code>Region</code> based on the description provided by this <code>RegionCreation</code>.
    *
-   * @throws TimeoutException
-   * @throws CacheWriterException
-   * @throws RegionExistsException
    */
   private void fillIn(Region region)
       throws TimeoutException, CacheWriterException, RegionExistsException {
@@ -224,9 +221,6 @@ public class RegionCreation implements Region, Extensible<Region<?, ?>> {
    * Creates a root {@link Region} in a given <code>Cache</code> based on the description provided
    * by this <code>RegionCreation</code>.
    *
-   * @throws TimeoutException
-   * @throws CacheWriterException
-   * @throws RegionExistsException
    */
   void createRoot(Cache cache)
       throws TimeoutException, CacheWriterException, RegionExistsException {
@@ -260,7 +254,6 @@ public class RegionCreation implements Region, Extensible<Region<?, ?>> {
    * Called by CacheXmlParser to add the IndexCreationData object to the list. It is called when
    * functional element is encounetered
    *
-   * @param icd
    */
   void addIndexData(IndexCreationData icd) {
     this.indexes.add(icd);
@@ -270,10 +263,6 @@ public class RegionCreation implements Region, Extensible<Region<?, ?>> {
    * Creates a {@link Region} with the given parent using the description provided by this
    * <code>RegionCreation</code>.
    *
-   * @throws TimeoutException
-   * @throws CacheWriterException
-   * @throws RegionExistsException
-   * @throws IllegalStateException
    */
   void create(Region parent) throws TimeoutException, CacheWriterException, RegionExistsException {
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerializerCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerializerCreation.java
index a6744ab..278b8fc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerializerCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/SerializerCreation.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package org.apache.geode.internal.cache.xmlcache;
 
 import java.util.HashMap;
@@ -30,9 +27,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LocalizedMessage;
 
-/**
- *
- */
 public class SerializerCreation {
   private static final Logger logger = LogService.getLogger();
 
@@ -42,10 +36,6 @@ public class SerializerCreation {
   public static class InstantiatorImpl extends Instantiator {
     private Class m_class;
 
-    /**
-     * @param c
-     * @param classId
-     */
     public InstantiatorImpl(Class<? extends DataSerializable> c, int classId) {
       super(c, classId);
       m_class = c;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGenerator.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGenerator.java
index a973e6b..ea9be93 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGenerator.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/XmlGenerator.java
@@ -49,7 +49,6 @@ public interface XmlGenerator<T> {
    * Generate XML configuration to the given {@link CacheXmlGenerator}.
    *
    * @param cacheXmlGenerator to generate configuration to.
-   * @throws SAXException
    * @since GemFire 8.1
    */
   void generate(CacheXmlGenerator cacheXmlGenerator) throws SAXException;

-- 
To stop receiving notification emails like this one, please contact
prhomberg@apache.org.

Mime
View raw message