You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by pr...@apache.org on 2018/04/13 16:37:23 UTC

[geode] branch develop updated: GEODE-4954, GEODE-4955: Remove trivial javadoc stubs and empty blocks: geode-core tests (#1782)

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 865a7c7  GEODE-4954, GEODE-4955: Remove trivial javadoc stubs and empty blocks: geode-core tests (#1782)
865a7c7 is described below

commit 865a7c730788ce7b05026780812c02202d265e10
Author: Patrick Rhomberg <pr...@pivotal.io>
AuthorDate: Fri Apr 13 09:37:17 2018 -0700

    GEODE-4954, GEODE-4955: Remove trivial javadoc stubs and empty blocks: geode-core tests (#1782)
---
 .../java/batterytest/greplogs/ExpectedStrings.java |  6 ----
 .../test/java/org/apache/geode/TXJUnitTest.java    |  6 ----
 .../java/org/apache/geode/TestDataSerializer.java  |  6 ----
 .../geode/cache/ConnectionPoolDUnitTest.java       |  5 ---
 .../apache/geode/cache/RegionFactoryJUnitTest.java |  1 -
 .../AutoConnectionSourceImplJUnitTest.java         |  4 ---
 .../internal/ConnectionPoolImplJUnitTest.java      |  3 --
 .../internal/LocatorLoadBalancingDUnitTest.java    |  6 ----
 .../cache/client/internal/LocatorTestBase.java     |  3 --
 .../client/internal/QueueManagerJUnitTest.java     |  3 --
 .../management/MXMemoryPoolListenerExample.java    |  6 ----
 .../management/MemoryThresholdsDUnitTest.java      |  8 -----
 .../MemoryThresholdsOffHeapDUnitTest.java          |  1 -
 .../org/apache/geode/cache/query/PerfQuery.java    |  3 --
 .../apache/geode/cache/query/QueryJUnitTest.java   |  3 --
 .../geode/cache/query/QueryServiceJUnitTest.java   |  3 --
 .../apache/geode/cache/query/QueryTestUtils.java   |  6 ----
 .../geode/cache/query/TypedIteratorJUnitTest.java  |  3 --
 .../java/org/apache/geode/cache/query/Utils.java   |  3 --
 .../cache/query/cq/dunit/CqQueryTestListener.java  |  3 --
 .../org/apache/geode/cache/query/data/City.java    |  3 --
 .../geode/cache/query/data/CollectionHolder.java   |  3 --
 .../geode/cache/query/data/ComparableWrapper.java  |  3 --
 .../org/apache/geode/cache/query/data/Country.java |  3 --
 .../apache/geode/cache/query/data/District.java    |  3 --
 .../org/apache/geode/cache/query/data/Numbers.java |  3 --
 .../org/apache/geode/cache/query/data/Quote.java   |  3 --
 .../apache/geode/cache/query/data/Restricted.java  |  3 --
 .../org/apache/geode/cache/query/data/State.java   |  3 --
 .../org/apache/geode/cache/query/data/Student.java |  4 ---
 .../org/apache/geode/cache/query/data/Vehicle.java |  4 ---
 .../org/apache/geode/cache/query/data/Village.java |  3 --
 .../cache/query/dunit/CqTimeTestListener.java      |  3 --
 .../geode/cache/query/dunit/GroupByDUnitImpl.java  |  4 ---
 .../dunit/GroupByPartitionedQueryDUnitTest.java    |  4 ---
 .../cache/query/dunit/GroupByQueryDUnitTest.java   |  4 ---
 .../NonDistinctOrderByPartitionedDUnitTest.java    |  4 ---
 .../PdxLocalQueryVersionedClassDUnitTest.java      |  1 -
 .../geode/cache/query/dunit/PdxQueryDUnitTest.java |  6 ----
 .../dunit/QueryDataInconsistencyDUnitTest.java     |  4 ---
 .../dunit/QueryUsingFunctionContextDUnitTest.java  | 19 ------------
 .../cache/query/dunit/QueryUsingPoolDUnitTest.java |  1 -
 .../functional/ComparisonOperatorsJUnitTest.java   |  3 --
 .../cache/query/functional/CountStarJUnitTest.java |  3 --
 ...tinctResultsWithDupValuesInRegionJUnitTest.java |  6 ----
 .../functional/GroupByPartitionedJUnitTest.java    |  4 ---
 .../functional/GroupByReplicatedJUnitTest.java     |  4 ---
 .../functional/IUMRCompositeIteratorJUnitTest.java |  3 --
 .../functional/IUMRSingleRegionJUnitTest.java      |  2 --
 ...IndependentOperandsInWhereClause2JUnitTest.java |  3 --
 .../query/functional/IndexCreationJUnitTest.java   |  2 --
 .../IndexMaintenanceAsynchJUnitTest.java           |  3 --
 .../query/functional/IndexOperatorJUnitTest.java   |  3 --
 .../functional/IndexPrimaryKeyUsageJUnitTest.java  |  3 --
 .../IndexUsageInNestedQueryJUnitTest.java          |  3 --
 .../IndexWithSngleFrmAndMultCondQryJUnitTest.java  |  3 --
 .../functional/IteratorTypeDefEmpJUnitTest.java    |  3 --
 .../query/functional/IteratorTypeDefJUnitTest.java |  3 --
 .../IteratorTypeDefaultTypesJUnitTest.java         |  3 --
 .../query/functional/LimitClauseJUnitTest.java     |  8 -----
 .../functional/LogicalOperatorsJUnitTest.java      |  3 --
 .../functional/MultiRegionIndexUsageJUnitTest.java |  2 --
 .../functional/NegativeNumberQueriesJUnitTest.java |  2 --
 .../NonDistinctOrderByPartitionedJUnitTest.java    |  4 ---
 .../NonDistinctOrderByReplicatedJUnitTest.java     |  4 ---
 .../NonDistinctOrderByTestImplementation.java      |  4 ---
 .../query/functional/NumericQueryJUnitTest.java    |  2 --
 .../functional/OrderByPartitionedJUnitTest.java    |  4 ---
 .../functional/OrderByTestImplementation.java      |  4 ---
 .../functional/ParameterBindingJUnitTest.java      |  3 --
 .../functional/QRegionInterfaceJUnitTest.java      |  3 --
 .../QueryREUpdateInProgressJUnitTest.java          |  3 --
 .../query/functional/QueryUndefinedJUnitTest.java  |  3 --
 .../query/functional/SelectToDateJUnitTest.java    |  4 ---
 .../functional/StructMemberAccessJUnitTest.java    |  2 --
 .../internal/CompiledGroupBySelectJUnitTest.java   |  4 ---
 .../CompiledJunctionInternalsJUnitTest.java        |  4 ---
 .../query/internal/ExecutionContextJUnitTest.java  |  4 ---
 .../internal/ProjectionAttributeJUnitTest.java     |  4 ---
 .../cache/query/internal/QCompilerJUnitTest.java   |  4 ---
 .../QueryFromClauseCanonicalizationJUnitTest.java  |  3 --
 .../cache/query/internal/QueryTraceJUnitTest.java  | 10 ------
 .../ResultsCollectionWrapperLimitJUnitTest.java    |  3 --
 .../internal/StructBagLimitBehaviourJUnitTest.java |  3 --
 .../AsyncIndexUpdaterThreadShutdownJUnitTest.java  |  3 --
 .../index/AsynchIndexMaintenanceJUnitTest.java     |  3 --
 ...ncurrentIndexInitOnOverflowRegionDUnitTest.java | 12 --------
 ...ntIndexOperationsOnOverflowRegionDUnitTest.java | 18 -----------
 ...exUpdateWithInplaceObjectModFalseDUnitTest.java |  3 --
 .../ConcurrentIndexUpdateWithoutWLDUnitTest.java   |  3 --
 .../internal/index/CopyOnReadIndexJUnitTest.java   | 26 ----------------
 .../index/IndexCreationInternalsJUnitTest.java     |  3 --
 .../cache/query/internal/index/IndexJUnitTest.java |  2 --
 .../internal/index/IndexMaintainceJUnitTest.java   |  3 --
 .../internal/index/IndexStatisticsJUnitTest.java   | 13 --------
 .../index/IndexTrackingQueryObserverDUnitTest.java |  7 -----
 .../index/IndexTrackingQueryObserverJUnitTest.java |  6 ----
 .../IndexedMergeEquiJoinScenariosJUnitTest.java    |  3 --
 ...ProgRegionCreationIndexUpdateTypeJUnitTest.java |  4 ---
 .../partitioned/PRIndexStatisticsJUnitTest.java    | 14 ---------
 .../query/partitioned/PRInvalidQueryJUnitTest.java |  2 --
 .../partitioned/PRQueryCacheClosedJUnitTest.java   |  3 --
 .../query/partitioned/PRQueryDUnitHelper.java      | 36 ----------------------
 .../cache/query/partitioned/PRQueryJUnitTest.java  |  3 --
 .../partitioned/PRQueryNumThreadsJUnitTest.java    |  3 --
 .../partitioned/PRQueryRegionClosedJUnitTest.java  |  3 --
 .../PRQueryRegionDestroyedJUnitTest.java           |  3 --
 .../query/transaction/QueryAndJtaJUnitTest.java    |  1 -
 .../cache/snapshot/ParallelSnapshotDUnitTest.java  |  1 -
 .../geode/cache30/ClientServerCCEDUnitTest.java    |  1 -
 ...stributedNoAckAsyncOverflowRegionDUnitTest.java |  4 ---
 .../geode/cache30/DistAckMapMethodsDUnitTest.java  |  5 ---
 ...DistributedAckPersistentRegionCCEDUnitTest.java |  3 --
 .../cache30/DistributedAckRegionCCEDUnitTest.java  |  3 --
 .../geode/cache30/GlobalRegionCCEDUnitTest.java    |  3 --
 .../cache30/LRUEvictionControllerDUnitTest.java    |  1 -
 .../cache30/MemLRUEvictionControllerDUnitTest.java |  2 --
 .../org/apache/geode/cache30/RegionTestCase.java   |  2 --
 .../geode/cache30/RemoveAllMultiVmDUnitTest.java   |  3 --
 .../ShorteningExpirationTimeRegressionTest.java    |  3 --
 .../apache/geode/cache30/TestPdxSerializer.java    |  3 --
 .../geode/codeAnalysis/CompiledClassUtils.java     |  1 -
 .../DistributedLockServiceDUnitTest.java           | 10 ------
 .../distributed/DistributedMemberDUnitTest.java    |  2 --
 .../apache/geode/distributed/LocatorJUnitTest.java |  1 -
 .../LocatorLoadSnapshotIntegrationTest.java        |  1 -
 .../membership/gms/GMSMemberJUnitTest.java         |  1 -
 .../membership/gms/MembershipManagerHelper.java    |  1 -
 .../gms/membership/GMSJoinLeaveJUnitTest.java      |  2 --
 ...ackwardCompatibilitySerializationDUnitTest.java |  5 ---
 .../internal/ClassNotFoundExceptionDUnitTest.java  |  6 ----
 .../internal/cache/BucketRegionQueueHelper.java    |  3 --
 ...tMessagesRegionCreationAndDestroyJUnitTest.java |  1 -
 .../cache/ClientServerTransactionCCEDUnitTest.java |  3 --
 .../cache/ConcurrentDestroySubRegionDUnitTest.java |  6 ----
 ...urrentFlushingAndRegionOperationsJUnitTest.java |  5 ---
 .../cache/CustomerIDPartitionResolver.java         |  3 --
 .../internal/cache/DeltaFaultInDUnitTest.java      |  3 --
 .../internal/cache/DeltaPropagationDUnitTest.java  |  3 --
 .../cache/DeltaPropagationStatsDUnitTest.java      | 12 --------
 .../geode/internal/cache/DeltaSizingDUnitTest.java |  6 ----
 .../geode/internal/cache/GIIDeltaDUnitTest.java    |  8 -----
 .../internal/cache/GIIFlowControlDUnitTest.java    |  6 ----
 .../cache/HAOverflowMemObjectSizerDUnitTest.java   |  4 ---
 .../cache/InterruptClientServerDUnitTest.java      |  1 -
 .../geode/internal/cache/InterruptsDUnitTest.java  |  1 -
 .../geode/internal/cache/IteratorDUnitTest.java    |  6 ----
 .../LIFOEvictionAlgoEnabledRegionJUnitTest.java    |  1 -
 .../internal/cache/MapInterface2JUnitTest.java     |  4 ---
 .../geode/internal/cache/OplogJUnitTest.java       |  2 --
 .../cache/PartitionedRegionCreationJUnitTest.java  |  1 -
 .../PartitionedRegionInvalidateDUnitTest.java      |  3 --
 ...nedRegionSingleHopWithServerGroupDUnitTest.java |  3 --
 .../cache/PartitionedRegionStatsJUnitTest.java     |  6 ----
 .../cache/PartitionedRegionTestHelper.java         | 10 ------
 .../internal/cache/RegionEntryFlagsJUnitTest.java  |  3 --
 .../geode/internal/cache/SizingFlagDUnitTest.java  |  7 -----
 .../internal/cache/SystemFailureDUnitTest.java     | 10 ------
 .../internal/cache/TXManagerImplJUnitTest.java     |  2 --
 .../org/apache/geode/internal/cache/TestUtils.java |  3 --
 .../internal/cache/TombstoneCreationJUnitTest.java |  1 -
 .../cache/TransactionsWithDeltaDUnitTest.java      |  6 ----
 .../internal/cache/UpdateVersionJUnitTest.java     |  3 --
 .../control/MemoryMonitorOffHeapJUnitTest.java     |  2 --
 .../cache/control/RebalanceOperationDUnitTest.java | 16 ----------
 ...skRegionOverflowAsyncRollingOpLogJUnitTest.java |  2 --
 ...iskRegionOverflowSyncRollingOpLogJUnitTest.java |  5 ---
 .../cache/execute/CustomerIDPartitionResolver.java |  3 --
 .../execute/LocalDataSetIndexingDUnitTest.java     |  4 ---
 .../execute/MemberFunctionExecutionDUnitTest.java  |  7 -----
 .../execute/MyFunctionExecutionException.java      |  4 ---
 ...lientServerFunctionExecutionNoAckDUnitTest.java |  3 --
 .../cache/execute/PRColocationDUnitTest.java       |  4 ---
 .../cache/execute/PRTransactionDUnitTest.java      |  1 -
 .../geode/internal/cache/execute/data/CustId.java  |  3 --
 .../internal/cache/execute/data/Customer.java      |  3 --
 .../geode/internal/cache/execute/data/Order.java   |  3 --
 .../geode/internal/cache/execute/data/OrderId.java |  3 --
 .../internal/cache/execute/data/Shipment.java      |  3 --
 .../internal/cache/execute/data/ShipmentId.java    |  3 --
 .../mock/AlterMockCacheExtensionFunction.java      |  2 --
 .../mock/AlterMockRegionExtensionFunction.java     |  3 --
 .../mock/CreateMockCacheExtensionFunction.java     |  2 --
 .../mock/CreateMockRegionExtensionFunction.java    |  3 --
 .../mock/DestroyMockCacheExtensionFunction.java    |  2 --
 .../mock/DestroyMockRegionExtensionFunction.java   |  2 --
 .../ha/BlockingHARQAddOperationJUnitTest.java      | 12 --------
 .../cache/ha/BlockingHARQStatsJUnitTest.java       |  8 -----
 .../internal/cache/ha/HAConflationDUnitTest.java   |  4 ---
 .../geode/internal/cache/ha/HAExpiryDUnitTest.java |  2 --
 .../geode/internal/cache/ha/HARegionDUnitTest.java |  9 ------
 .../cache/ha/HARegionQueueStatsJUnitTest.java      |  9 ------
 .../geode/internal/cache/ha/PutAllDUnitTest.java   |  1 -
 .../geode/internal/cache/ha/StatsBugDUnitTest.java |  1 -
 .../cache/ha/TestBlockingHARegionQueue.java        |  3 --
 .../cache/partitioned/Bug39356DUnitTest.java       |  3 --
 .../cache/partitioned/Bug51400DUnitTest.java       |  3 --
 .../cache/partitioned/ElidedPutAllDUnitTest.java   |  3 --
 .../partitioned/PartitionResolverDUnitTest.java    |  6 ----
 .../PartitionedRegionLoaderWriterDUnitTest.java    |  3 --
 .../PartitionedRegionMetaDataCleanupDUnitTest.java |  3 --
 ...sistentColocatedPartitionedRegionDUnitTest.java | 11 -------
 .../PersistentPartitionedRegionDUnitTest.java      |  6 ----
 .../PersistentRecoveryOrderDUnitTest.java          |  6 ----
 .../PersistentRecoveryOrderOldConfigDUnitTest.java |  3 --
 .../rollingupgrade/RollingUpgrade2DUnitTest.java   |  1 -
 .../cache/tier/sockets/AcceptorImplDUnitTest.java  |  1 -
 .../tier/sockets/ClientConflationDUnitTest.java    |  2 --
 .../sockets/ClientInterestNotifyDUnitTest.java     |  2 --
 .../tier/sockets/ClientServerMiscDUnitTest.java    |  2 --
 .../cache/tier/sockets/ConflationDUnitTest.java    |  6 ----
 .../DataSerializerPropagationDUnitTest.java        |  7 -----
 .../sockets/ForceInvalidateEvictionDUnitTest.java  |  3 --
 .../tier/sockets/HAInterestPart2DUnitTest.java     |  1 -
 .../sockets/InterestResultPolicyDUnitTest.java     |  1 -
 .../tier/sockets/NewRegionAttributesDUnitTest.java |  1 -
 .../sockets/RegisterInterestKeysDUnitTest.java     |  3 --
 .../tier/sockets/ReliableMessagingDUnitTest.java   |  1 -
 .../tier/sockets/UnregisterInterestDUnitTest.java  |  8 -----
 .../versions/RegionVersionHolderJUnitTest.java     |  3 --
 .../AsyncEventQueueValidationsJUnitTest.java       |  3 --
 .../ConcurrentAsyncEventQueueDUnitTest.java        |  3 --
 .../CommonParallelAsyncEventQueueDUnitTest.java    |  3 --
 .../CompressionRegionConfigDUnitTest.java          |  2 --
 .../datasource/ConnectionPoolingJUnitTest.java     |  4 ---
 .../org/apache/geode/internal/jta/CacheUtils.java  |  3 --
 .../org/apache/geode/internal/jta/JTAUtils.java    |  4 ---
 .../org/apache/geode/internal/jta/SyncImpl.java    |  2 --
 .../internal/jta/TransactionImplJUnitTest.java     |  2 --
 .../internal/jta/UserTransactionImplJUnitTest.java |  2 --
 .../MemoryAllocatorFillPatternIntegrationTest.java |  2 --
 .../MemoryAllocatorFillPatternJUnitTest.java       |  3 --
 .../geode/internal/size/ObjectTraverserPerf.java   |  3 --
 .../internal/stats50/AtomicStatsJUnitTest.java     |  4 ---
 .../org/apache/geode/management/MBeanUtil.java     | 14 ---------
 .../bean/stats/AsyncEventQueueStatsJUnitTest.java  |  4 ---
 .../bean/stats/CacheServerStatsJUnitTest.java      |  2 --
 .../management/bean/stats/DiskStatsJUnitTest.java  |  2 --
 .../bean/stats/GatewayMBeanBridgeJUnitTest.java    |  2 --
 .../bean/stats/GatewayReceiverStatsJUnitTest.java  |  2 --
 .../bean/stats/MemberLevelStatsJUnitTest.java      |  2 --
 .../utils/XmlUtilsAddNewNodeJUnitTest.java         | 10 ------
 .../configuration/utils/XmlUtilsJUnitTest.java     |  3 --
 .../org/apache/geode/management/model/Item.java    | 11 -------
 .../org/apache/geode/management/model/Order.java   | 13 --------
 .../apache/geode/pdx/PdxAttributesJUnitTest.java   |  4 ---
 .../geode/pdx/PdxDeserializationDUnitTest.java     |  2 --
 .../org/apache/geode/pdx/PdxInstanceJUnitTest.java |  3 --
 .../org/apache/geode/pdx/PdxStringJUnitTest.java   |  1 -
 .../java/org/apache/geode/pdx/SimpleClass2.java    |  3 --
 .../geode/sequence/GemfireSequenceDisplay.java     |  8 -----
 .../org/apache/geode/sequence/HydraLineMapper.java |  3 --
 .../org/apache/geode/sequence/SequenceDiagram.java |  3 --
 .../java/org/apache/geode/test/dunit/Jitter.java   |  1 -
 .../geode/test/dunit/standalone/ChildVM.java       |  3 --
 .../test/dunit/standalone/ProcessManager.java      |  3 --
 .../apache/geode/test/golden/GoldenTestCase.java   |  2 --
 .../java/parReg/query/unittest/NewPortfolio.java   |  3 --
 258 files changed, 1060 deletions(-)

diff --git a/geode-core/src/test/java/batterytest/greplogs/ExpectedStrings.java b/geode-core/src/test/java/batterytest/greplogs/ExpectedStrings.java
index 193301d..813c32b 100644
--- a/geode-core/src/test/java/batterytest/greplogs/ExpectedStrings.java
+++ b/geode-core/src/test/java/batterytest/greplogs/ExpectedStrings.java
@@ -12,18 +12,12 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- *
- */
 package batterytest.greplogs;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
 
-/**
- *
- */
 public class ExpectedStrings {
 
   private ExpectedStrings() {}
diff --git a/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java b/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java
index d6a9eb0..17c736f 100644
--- a/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/TXJUnitTest.java
@@ -6782,7 +6782,6 @@ public class TXJUnitTest {
   /**
    * make sure that we do not expose BucketRegion on transactionListener events
    *
-   * @throws Exception
    */
   @Test
   public void testInternalRegionNotExposed() throws Exception {
@@ -6814,7 +6813,6 @@ public class TXJUnitTest {
   /**
    * make sure that we throw an UnsupportedOperationInTransactionException
    *
-   * @throws Exception
    */
   @Test
   public void testPutAllSupported() throws Exception {
@@ -6844,7 +6842,6 @@ public class TXJUnitTest {
   /**
    * make sure that we throw an UnsupportedOperationInTransactionException
    *
-   * @throws Exception
    */
   @Test
   public void testGetAllSupported() throws Exception {
@@ -6872,7 +6869,6 @@ public class TXJUnitTest {
   /**
    * make sure that we throw an UnsupportedOperationInTransactionException
    *
-   * @throws Exception
    */
   @Test
   public void testDestroyRegionNotSupported() throws Exception {
@@ -6927,7 +6923,6 @@ public class TXJUnitTest {
   /**
    * make sure that we throw an UnsupportedOperationInTransactionException
    *
-   * @throws Exception
    */
   @Test
   public void testInvalidateRegionNotSupported() throws Exception {
@@ -6976,7 +6971,6 @@ public class TXJUnitTest {
   /**
    * make sure that we throw an UnsupportedOperationInTransactionException
    *
-   * @throws Exception
    */
   @Test
   public void testClearRegionNotSupported() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/TestDataSerializer.java b/geode-core/src/test/java/org/apache/geode/TestDataSerializer.java
index 9580a7d..a40f4f1 100644
--- a/geode-core/src/test/java/org/apache/geode/TestDataSerializer.java
+++ b/geode-core/src/test/java/org/apache/geode/TestDataSerializer.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;
 
 import java.io.DataInput;
@@ -23,9 +20,6 @@ import java.io.IOException;
 
 import org.apache.geode.internal.cache.tier.sockets.DataSerializerPropagationDUnitTest;
 
-/**
- *
- */
 public class TestDataSerializer extends DataSerializer {
 
   static {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
index 4a7dfc7..189de8a 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/ConnectionPoolDUnitTest.java
@@ -341,7 +341,6 @@ public class ConnectionPoolDUnitTest extends JUnit4CacheTestCase {
    * and returns {@link org.apache.geode.cache.Operation#LOCAL_LOAD_CREATE} for
    * {@link CacheEvent#getOperation()}
    *
-   * @param r
    * @return fake entry event
    */
   protected static EntryEvent createFakeyEntryEvent(final Region r) {
@@ -709,7 +708,6 @@ public class ConnectionPoolDUnitTest extends JUnit4CacheTestCase {
    * value and one client connected to each server reading values. If the bug exists, the clients
    * will get null sometimes.
    *
-   * @throws InterruptedException
    */
   @Test
   public void test003Bug36684() throws CacheException, InterruptedException {
@@ -3116,7 +3114,6 @@ public class ConnectionPoolDUnitTest extends JUnit4CacheTestCase {
   /**
    * Accessed by reflection DO NOT REMOVE
    *
-   * @return
    */
   protected static int getCacheServerPort() {
     return bridgeServerPort;
@@ -4332,7 +4329,6 @@ public class ConnectionPoolDUnitTest extends JUnit4CacheTestCase {
    * Note: This test re-creates Distributed Systems for its own purposes and uses a Loner
    * distributed systems to isolate the Bridge Client.
    *
-   * @throws Exception
    */
   @Test
   public void test028DynamicRegionCreation() throws Exception {
@@ -5396,7 +5392,6 @@ public class ConnectionPoolDUnitTest extends JUnit4CacheTestCase {
   /**
    * Test that the "notify by subscription" attribute is unique for each BridgeServer and Gateway
    *
-   * @throws Exception
    */
   /*
    * public void test035NotifyBySubscriptionIsolation() throws Exception { final String name =
diff --git a/geode-core/src/test/java/org/apache/geode/cache/RegionFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/RegionFactoryJUnitTest.java
index cc8c6b9..66dcf37 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/RegionFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/RegionFactoryJUnitTest.java
@@ -396,7 +396,6 @@ public class RegionFactoryJUnitTest {
   /**
    * Ensure that the RegionFactory set methods mirrors those found in RegionAttributes
    *
-   * @throws Exception
    */
   @Test
   public void testAttributesFactoryConformance() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
index 39c1b07..81ffe03 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
@@ -77,9 +77,6 @@ import org.apache.geode.management.membership.ClientMembershipListener;
 import org.apache.geode.test.junit.categories.ClientServerTest;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 
-/**
- *
- */
 @SuppressWarnings("deprecation")
 @Category({IntegrationTest.class, ClientServerTest.class})
 public class AutoConnectionSourceImplJUnitTest {
@@ -301,7 +298,6 @@ public class AutoConnectionSourceImplJUnitTest {
   /**
    * This tests that discovery works even after one of two locators was shut down
    *
-   * @throws Exception
    */
   @Test
   public void test_DiscoverLocators_whenOneLocatorWasShutdown() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java
index e6f2429..0c82c7b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/ConnectionPoolImplJUnitTest.java
@@ -43,9 +43,6 @@ import org.apache.geode.internal.AvailablePortHelper;
 import org.apache.geode.test.junit.categories.ClientServerTest;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 
-/**
- *
- */
 @Category({IntegrationTest.class, ClientServerTest.class})
 public class ConnectionPoolImplJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
index 72de9b5..bdc4d6c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorLoadBalancingDUnitTest.java
@@ -60,9 +60,6 @@ import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.junit.categories.ClientServerTest;
 import org.apache.geode.test.junit.categories.DistributedTest;
 
-/**
- *
- */
 @Category({DistributedTest.class, ClientServerTest.class})
 public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
 
@@ -179,7 +176,6 @@ public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
    * Test to make sure the bridge servers communicate their updated load to the controller when the
    * load on the bridge server changes.
    *
-   * @throws Exception
    */
   @Test
   public void testLoadMessaging() throws Exception {
@@ -231,7 +227,6 @@ public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
   /**
    * Test to make sure that the locator balancing load between two servers.
    *
-   * @throws Exception
    */
   @Test
   public void testBalancing() throws Exception {
@@ -296,7 +291,6 @@ public class LocatorLoadBalancingDUnitTest extends LocatorTestBase {
    * Test that the locator balances load between three servers with intersecting server groups.
    * Server: 1 2 3 Groups: a a,b b
    *
-   * @throws Exception
    */
   @Test
   public void testIntersectingServerGroups() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java
index 2194932..4b8296b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java
@@ -57,9 +57,6 @@ import org.apache.geode.test.dunit.SerializableRunnable;
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
 
-/**
- *
- */
 public abstract class LocatorTestBase extends JUnit4DistributedTestCase {
   protected static final String CACHE_KEY = "CACHE";
   protected static final String LOCATOR_KEY = "LOCATOR";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
index 6f0d29d..799ffd5 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
@@ -50,9 +50,6 @@ import org.apache.geode.internal.util.StopWatch;
 import org.apache.geode.test.junit.categories.ClientServerTest;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 
-/**
- *
- */
 @Category({IntegrationTest.class, ClientServerTest.class})
 public class QueueManagerJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/management/MXMemoryPoolListenerExample.java b/geode-core/src/test/java/org/apache/geode/cache/management/MXMemoryPoolListenerExample.java
index d29c142..fd78731 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/management/MXMemoryPoolListenerExample.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/management/MXMemoryPoolListenerExample.java
@@ -49,9 +49,6 @@ public class MXMemoryPoolListenerExample implements NotificationListener {
   private AtomicBoolean critical = new AtomicBoolean();
   private final LogWriter logger;
 
-  /**
-   * @param ds
-   */
   public MXMemoryPoolListenerExample(DistributedSystem ds) {
     this.logger = ds.getLogWriter();
   }
@@ -156,9 +153,6 @@ public class MXMemoryPoolListenerExample implements NotificationListener {
       this.criticalState = critical;
     }
 
-    /**
-     * @param percentTenured
-     */
     public MemoryHog consumeMemory(final int percentTenured) {
       final long maxSecondsToRun = 180;
       final LogWriter logger = this.cache.getLogger();
diff --git a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
index 4f00717..815f75b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsDUnitTest.java
@@ -235,7 +235,6 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
   /**
    * test that puts in a server are rejected when a remote VM crosses critical threshold
    *
-   * @throws Exception
    */
   private void doDistributedRegionRemotePutRejection(boolean localDestroy, boolean cacheClose)
       throws Exception {
@@ -339,7 +338,6 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
   /**
    * test that puts in a client are rejected when a remote VM crosses critical threshold
    *
-   * @throws Exception
    */
   @Test
   public void testDistributedRegionRemoteClientPutRejection() throws Exception {
@@ -383,7 +381,6 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
    * test that disabling threshold does not cause remote event and remote DISABLED events are
    * delivered
    *
-   * @throws Exception
    */
   @Test
   public void testDisabledThresholds() throws Exception {
@@ -437,7 +434,6 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
   /**
    * Make sure appropriate events are delivered when moving between states.
    *
-   * @throws Exception
    */
   @Test
   public void testEventDelivery() throws Exception {
@@ -1517,7 +1513,6 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
    * events useWaitCriterion must be true
    *
    * @param vm the vm where verification should take place
-   * @param state
    * @param value the expected value
    * @param useWaitCriterion must be true for remote events
    */
@@ -1817,7 +1812,6 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
    * Test that LocalRegion cache Loads are not stored in the Region if the VM is in a critical
    * state, then test that they are allowed once the VM is no longer critical
    *
-   * @throws Exception
    */
   @Test
   public void testLRLoadRejection() throws Exception {
@@ -1943,7 +1937,6 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
    * the local VM is in a critical state. Once the VM has moved to a safe state then test that they
    * are allowed.
    *
-   * @throws Exception
    */
   @Test
   public void testDRLoadRejection() throws Exception {
@@ -2156,7 +2149,6 @@ public class MemoryThresholdsDUnitTest extends ClientServerTestCase {
    * Test that a Partitioned Region loader invocation is rejected if the VM with the bucket is in a
    * critical state.
    *
-   * @throws Exception
    */
   @Test
   public void testPRLoadRejection() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java
index 2fd803c..7316c44 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/management/MemoryThresholdsOffHeapDUnitTest.java
@@ -429,7 +429,6 @@ public class MemoryThresholdsOffHeapDUnitTest extends ClientServerTestCase {
   /**
    * test that puts in a server are rejected when a remote VM crosses critical threshold
    *
-   * @throws Exception
    */
   private void doDistributedRegionRemotePutRejection(boolean localDestroy, boolean cacheClose)
       throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/PerfQuery.java b/geode-core/src/test/java/org/apache/geode/cache/query/PerfQuery.java
index f12e7a6..4c9a7bd 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/PerfQuery.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/PerfQuery.java
@@ -34,9 +34,6 @@ import org.apache.geode.cache.query.internal.ResultsSet;
 import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.internal.NanoTimer;
 
-/**
- *
- */
 public class PerfQuery {
   private static int NUM_ITERATIONS = 20000;
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/QueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/QueryJUnitTest.java
index f742ae2..f834c4a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/QueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/QueryJUnitTest.java
@@ -53,9 +53,6 @@ import org.apache.geode.cache.query.internal.index.IndexProtocol;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- *
- */
 @FixMethodOrder(NAME_ASCENDING)
 @Category({IntegrationTest.class, OQLQueryTest.class})
 public class QueryJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/QueryServiceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/QueryServiceJUnitTest.java
index c280b1e..e3caea3 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/QueryServiceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/QueryServiceJUnitTest.java
@@ -35,9 +35,6 @@ import org.apache.geode.cache.query.data.Portfolio;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- *
- */
 @Category({IntegrationTest.class, OQLQueryTest.class})
 public class QueryServiceJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtils.java b/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtils.java
index cf3a0fc..3e027de 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtils.java
@@ -1703,8 +1703,6 @@ public class QueryTestUtils implements Serializable {
   /**
    * Execute queries by removing any DISTINCT clause if present
    *
-   * @param vm
-   * @param qarr
    */
   public void executeQueriesWithoutDistinct(VM vm, final String qarr[]) {
     vm.invoke(new CacheSerializableRunnable("Executing query without distinct") {
@@ -1717,7 +1715,6 @@ public class QueryTestUtils implements Serializable {
   /**
    * Execute queries by removing any DISTINCT clause if present
    *
-   * @param qarr
    */
   public Object[] executeQueriesWithoutDistinct(String qarr[]) {
     QueryService qs = cache.getQueryService();
@@ -1744,8 +1741,6 @@ public class QueryTestUtils implements Serializable {
   /**
    * Execute queries by adding a DISTINCT clause if not present
    *
-   * @param vm
-   * @param qarr
    */
   public void executeQueriesWithDistinct(VM vm, final String qarr[]) {
     vm.invoke(new CacheSerializableRunnable("Executing query with distinct") {
@@ -1758,7 +1753,6 @@ public class QueryTestUtils implements Serializable {
   /**
    * Execute queries by adding a DISTINCT clause if not present
    *
-   * @param qarr
    */
   public Object[] executeQueriesWithDistinct(String qarr[]) {
     QueryService qs = cache.getQueryService();
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/TypedIteratorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/TypedIteratorJUnitTest.java
index d9d550f..8446ed9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/TypedIteratorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/TypedIteratorJUnitTest.java
@@ -35,9 +35,6 @@ import org.apache.geode.cache.query.data.Portfolio;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- *
- */
 @Category({IntegrationTest.class, OQLQueryTest.class})
 public class TypedIteratorJUnitTest {
   Region region;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/Utils.java b/geode-core/src/test/java/org/apache/geode/cache/query/Utils.java
index 6f9cb35..6da2f75 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/Utils.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/Utils.java
@@ -29,9 +29,6 @@ import org.apache.geode.cache.query.data.Portfolio;
 import org.apache.geode.cache.query.data.PortfolioData;
 import org.apache.geode.cache.query.data.Position;
 
-/**
- *
- */
 public class Utils {
   public static String printResult(Object r) {
     StringBuffer sb = new StringBuffer();
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryTestListener.java b/geode-core/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryTestListener.java
index 9c4cb8a..df745ae 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryTestListener.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/cq/dunit/CqQueryTestListener.java
@@ -30,9 +30,6 @@ import org.apache.geode.cache.query.CqStatusListener;
 import org.apache.geode.test.dunit.Wait;
 import org.apache.geode.test.dunit.WaitCriterion;
 
-/**
- *
- */
 public class CqQueryTestListener implements CqStatusListener {
   protected final LogWriter logger;
   protected volatile int eventCreateCount = 0;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/City.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/City.java
index f5d4e3e..a27f38f 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/City.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/City.java
@@ -21,9 +21,6 @@
 
 package org.apache.geode.cache.query.data;
 
-/**
- *
- */
 import java.io.*;
 
 public class City implements Serializable {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/CollectionHolder.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/CollectionHolder.java
index 41cfb04..e9f1a8a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/CollectionHolder.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/CollectionHolder.java
@@ -26,9 +26,6 @@ import java.util.Arrays;
 
 import org.apache.geode.*;
 
-/**
- *
- */
 public class CollectionHolder implements Serializable, DataSerializable {
 
   public String[] arr;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/ComparableWrapper.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/ComparableWrapper.java
index 9ccc78c..3252bc3 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/ComparableWrapper.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/ComparableWrapper.java
@@ -23,9 +23,6 @@ package org.apache.geode.cache.query.data;
 
 import java.io.Serializable;
 
-/**
- *
- */
 public class ComparableWrapper implements Comparable, Serializable {
   private int val;
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/Country.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/Country.java
index 1ae16b6..3495e86 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/Country.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/Country.java
@@ -23,9 +23,6 @@ package org.apache.geode.cache.query.data;
 import java.io.*;
 import java.util.*;
 
-/**
- *
- */
 public class Country implements Serializable {
   public String name;
   public String continent;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/District.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/District.java
index 05454ad..cb96df8 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/District.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/District.java
@@ -24,9 +24,6 @@ package org.apache.geode.cache.query.data;
 import java.io.*;
 import java.util.Set;
 
-/**
- *
- */
 public class District implements Serializable {
   public String name;
   public Set cities;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/Numbers.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/Numbers.java
index 5c1ebf0..39105e5 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/Numbers.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/Numbers.java
@@ -20,9 +20,6 @@
 
 package org.apache.geode.cache.query.data;
 
-/**
- *
- */
 import java.io.Serializable;
 
 public class Numbers implements Serializable {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/Quote.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/Quote.java
index 91d947c..8b60246 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/Quote.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/Quote.java
@@ -20,9 +20,6 @@
 
 package org.apache.geode.cache.query.data;
 
-/**
- *
- */
 import java.io.Serializable;
 import java.util.*;
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/Restricted.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/Restricted.java
index 8852a5f..ce44485 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/Restricted.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/Restricted.java
@@ -20,9 +20,6 @@
 
 package org.apache.geode.cache.query.data;
 
-/**
- *
- */
 import java.io.Serializable;
 
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/State.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/State.java
index dee29f8..dba3fd7 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/State.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/State.java
@@ -25,9 +25,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-/**
- *
- */
 public class State implements Serializable {
   public String name;
   public String zone;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/Student.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/Student.java
index 5eace01..0424640 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/Student.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/Student.java
@@ -23,10 +23,6 @@ package org.apache.geode.cache.query.data;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- *
- *
- */
 public class Student {
 
   private static int counter = 0;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/Vehicle.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/Vehicle.java
index 8f549b9..64c5bb9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/Vehicle.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/Vehicle.java
@@ -20,10 +20,6 @@
 
 package org.apache.geode.cache.query.data;
 
-/**
- *
- */
-
 // Added for the Test IUMRCompositeIteratorTest
 public class Vehicle {
   public String[] arr;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/data/Village.java b/geode-core/src/test/java/org/apache/geode/cache/query/data/Village.java
index 3fbdbf8..6bc9bec 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/data/Village.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/data/Village.java
@@ -20,9 +20,6 @@
 
 package org.apache.geode.cache.query.data;
 
-/**
- *
- */
 import java.io.*;
 
 public class Village implements Serializable {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CqTimeTestListener.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CqTimeTestListener.java
index c24673b..ce1902f 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CqTimeTestListener.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/CqTimeTestListener.java
@@ -26,9 +26,6 @@ import org.apache.geode.cache.query.data.Portfolio;
 import org.apache.geode.test.dunit.Wait;
 import org.apache.geode.test.dunit.WaitCriterion;
 
-/**
- *
- */
 public class CqTimeTestListener implements CqListener {
   protected final LogWriter logger;
   protected volatile int eventCreateCount = 0;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByDUnitImpl.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByDUnitImpl.java
index b08cd87..3cb2200 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByDUnitImpl.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByDUnitImpl.java
@@ -28,10 +28,6 @@ import org.apache.geode.test.dunit.SerializableRunnable;
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
 
-/**
- *
- *
- */
 public abstract class GroupByDUnitImpl extends JUnit4CacheTestCase implements GroupByTestInterface {
 
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java
index 659378a..6f5ca06 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByPartitionedQueryDUnitTest.java
@@ -27,10 +27,6 @@ import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.junit.categories.DistributedTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- *
- *
- */
 @Category({DistributedTest.class, OQLQueryTest.class})
 public class GroupByPartitionedQueryDUnitTest extends GroupByDUnitImpl {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByQueryDUnitTest.java
index 2f64ce6..949397c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/GroupByQueryDUnitTest.java
@@ -44,10 +44,6 @@ import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
 import org.apache.geode.test.junit.categories.DistributedTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- *
- *
- */
 @Category({DistributedTest.class, OQLQueryTest.class})
 public class GroupByQueryDUnitTest extends JUnit4CacheTestCase {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java
index 0bd6cbf..3d698bd 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/NonDistinctOrderByPartitionedDUnitTest.java
@@ -33,10 +33,6 @@ import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.junit.categories.DistributedTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- *
- *
- */
 @Category({DistributedTest.class, OQLQueryTest.class})
 public class NonDistinctOrderByPartitionedDUnitTest extends NonDistinctOrderByDUnitImpl {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxLocalQueryVersionedClassDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxLocalQueryVersionedClassDUnitTest.java
index 14bf66b..959ae4e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxLocalQueryVersionedClassDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxLocalQueryVersionedClassDUnitTest.java
@@ -49,7 +49,6 @@ public class PdxLocalQueryVersionedClassDUnitTest extends PDXQueryTestBase {
    * Testing the isRemote flag which could be inconsistent when bind queries are being executed in
    * multiple threads. Bug #49662 is caused because of this inconsistent behavior.
    *
-   * @throws Exception
    */
   @Test
   public void testIsRemoteFlagForRemoteQueries() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryDUnitTest.java
index 1febfd2..15b7874 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/PdxQueryDUnitTest.java
@@ -2553,7 +2553,6 @@ public class PdxQueryDUnitTest extends PDXQueryTestBase {
    * populated. This map is used to search a field for a class in different versions (PdxTypes) This
    * test verifies that the map is being updated by the cacheListener
    *
-   * @throws CacheException
    */
   @Test
   public void testLocalMapInPeerTypePdxRegistry() throws CacheException {
@@ -2684,7 +2683,6 @@ public class PdxQueryDUnitTest extends PDXQueryTestBase {
   /**
    * Test to query a field that is not present in the Pdx object but has a get method
    *
-   * @throws CacheException
    */
   @Test
   public void testPdxInstanceWithMethodButNoField() throws CacheException {
@@ -2831,7 +2829,6 @@ public class PdxQueryDUnitTest extends PDXQueryTestBase {
    * Test to query a field that is not present in the Pdx object but is present in some other
    * version of the pdx instance
    *
-   * @throws CacheException
    */
   @Test
   public void testPdxInstanceFieldInOtherVersion() throws CacheException {
@@ -3069,7 +3066,6 @@ public class PdxQueryDUnitTest extends PDXQueryTestBase {
    * client1 had registered interest to server2, hence gets the pdx objects for both versions Test
    * local query on client1 Test if client1 fetched pdxtypes from server
    *
-   * @throws CacheException
    */
   @Test
   public void testClientForFieldInOtherVersion() throws CacheException {
@@ -3208,7 +3204,6 @@ public class PdxQueryDUnitTest extends PDXQueryTestBase {
    * Test to query a field that is not present in the Pdx object Also the implicit method is absent
    * in the class
    *
-   * @throws CacheException
    */
   @Test
   public void testPdxInstanceNoFieldNoMethod() throws CacheException {
@@ -3299,7 +3294,6 @@ public class PdxQueryDUnitTest extends PDXQueryTestBase {
    * Test query execution when default values of {@link FieldType} are used. This happens when one
    * version of Pdx object does not have a field but other version has.
    *
-   * @throws Exception
    */
   @Test
   public void testDefaultValuesInPdxFieldTypes() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
index 5c006b9..20d3a78 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
@@ -543,10 +543,6 @@ public class QueryDataInconsistencyDUnitTest extends JUnit4CacheTestCase {
   /**
    * This function puts portfolio objects into the created Region (PR or Local) *
    *
-   * @param regionName
-   * @param portfolio
-   * @param to
-   * @param from
    * @return cacheSerializable object
    */
   public CacheSerializableRunnable getCacheSerializableRunnableForPRPuts(final String regionName,
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
index c8e04db..840370a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingFunctionContextDUnitTest.java
@@ -290,9 +290,6 @@ public class QueryUsingFunctionContextDUnitTest extends JUnit4CacheTestCase {
 
   }
 
-  /**
-   *
-   */
   @Test
   public void testQueriesWithFilterKeysOnPRLocalAndRemote() {
 
@@ -328,9 +325,6 @@ public class QueryUsingFunctionContextDUnitTest extends JUnit4CacheTestCase {
     });
   }
 
-  /**
-  *
-  */
   @Test
   public void testQueriesWithFilterKeysOnPRLocalAndRemoteWithBucketDestroy() {
 
@@ -393,9 +387,6 @@ public class QueryUsingFunctionContextDUnitTest extends JUnit4CacheTestCase {
 
   }
 
-  /**
-   *
-   */
   @Test
   public void testQueriesWithFilterKeysOnPRWithBucketDestroy() {
     IgnoredException.addIgnoredException("QueryInvocationTargetException");
@@ -913,9 +904,6 @@ public class QueryUsingFunctionContextDUnitTest extends JUnit4CacheTestCase {
   /**
    * Run query using a function executed by client on a region on server with filter.
    *
-   * @param function
-   * @param regionName
-   * @param filter
    * @return ArrayList of results
    */
   public static ArrayList runQueryOnClientUsingFunction(Function function, String regionName,
@@ -959,9 +947,6 @@ public class QueryUsingFunctionContextDUnitTest extends JUnit4CacheTestCase {
   /**
    * Runs a {@link LocalDataSet} query on a single server.
    *
-   * @param func
-   * @param filter
-   * @param query
    * @return results in a List
    */
   private ArrayList runLDSQueryOnClientUsingFunc(Function func, Set filter, String query) {
@@ -1010,10 +995,6 @@ public class QueryUsingFunctionContextDUnitTest extends JUnit4CacheTestCase {
   /**
    * This function puts portfolio objects into the created Region (PR or Local) *
    *
-   * @param regionName
-   * @param portfolio
-   * @param to
-   * @param from
    * @return cacheSerializable object
    */
   public CacheSerializableRunnable getCacheSerializableRunnableForPRPuts(final String regionName,
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
index 3d241a3..2ab395a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
@@ -1375,7 +1375,6 @@ public class QueryUsingPoolDUnitTest extends JUnit4CacheTestCase {
   /**
    * This the dunit test for the bug no : 36969
    *
-   * @throws Exception
    */
 
   @Test
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/ComparisonOperatorsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/ComparisonOperatorsJUnitTest.java
index 3f85b3c..126c823 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/ComparisonOperatorsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/ComparisonOperatorsJUnitTest.java
@@ -39,9 +39,6 @@ import org.apache.geode.cache.query.data.Portfolio;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- *
- */
 @Category({IntegrationTest.class, OQLQueryTest.class})
 public class ComparisonOperatorsJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/CountStarJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/CountStarJUnitTest.java
index 6216a27..6a6debc 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/CountStarJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/CountStarJUnitTest.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.cache.query.functional;
 
 import static org.junit.Assert.*;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java
index 5de3f9f..bdf6bf7 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/DistinctResultsWithDupValuesInRegionJUnitTest.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.cache.query.functional;
 
 import static org.junit.Assert.*;
@@ -36,9 +33,6 @@ import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- *
- */
 @Category({IntegrationTest.class, OQLQueryTest.class})
 public class DistinctResultsWithDupValuesInRegionJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByPartitionedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByPartitionedJUnitTest.java
index a037ed5..14f0d60 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByPartitionedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByPartitionedJUnitTest.java
@@ -23,10 +23,6 @@ import org.apache.geode.cache.query.CacheUtils;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- *
- *
- */
 @Category({IntegrationTest.class, OQLQueryTest.class})
 public class GroupByPartitionedJUnitTest extends GroupByTestImpl {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java
index a21d96e..170c24e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/GroupByReplicatedJUnitTest.java
@@ -21,10 +21,6 @@ import org.apache.geode.cache.query.CacheUtils;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- *
- *
- */
 @Category({IntegrationTest.class, OQLQueryTest.class})
 public class GroupByReplicatedJUnitTest extends GroupByTestImpl {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRCompositeIteratorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRCompositeIteratorJUnitTest.java
index f86350a..2062379 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRCompositeIteratorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRCompositeIteratorJUnitTest.java
@@ -50,9 +50,6 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLIndexTest;
 
-/**
- *
- */
 @Category({IntegrationTest.class, OQLIndexTest.class})
 public class IUMRCompositeIteratorJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRSingleRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRSingleRegionJUnitTest.java
index 6722796..2fcf45d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRSingleRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IUMRSingleRegionJUnitTest.java
@@ -40,8 +40,6 @@ import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLIndexTest;
 
-/**
- */
 @Category({IntegrationTest.class, OQLIndexTest.class})
 public class IUMRSingleRegionJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndependentOperandsInWhereClause2JUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndependentOperandsInWhereClause2JUnitTest.java
index 738d679..37426c8 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndependentOperandsInWhereClause2JUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndependentOperandsInWhereClause2JUnitTest.java
@@ -42,9 +42,6 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- *
- */
 @Category({IntegrationTest.class, OQLQueryTest.class})
 public class IndependentOperandsInWhereClause2JUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java
index 1f465c3..c3b5071 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java
@@ -20,8 +20,6 @@
  */
 
 
-/**
- */
 package org.apache.geode.cache.query.functional;
 
 import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java
index de06082..e806e13 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexMaintenanceAsynchJUnitTest.java
@@ -47,9 +47,6 @@ import org.apache.geode.test.dunit.WaitCriterion;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLIndexTest;
 
-/**
- *
- */
 @Category({IntegrationTest.class, OQLIndexTest.class})
 public class IndexMaintenanceAsynchJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOperatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOperatorJUnitTest.java
index dbf780c..b39ec12 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOperatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexOperatorJUnitTest.java
@@ -38,9 +38,6 @@ import org.apache.geode.cache.query.data.Portfolio;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLIndexTest;
 
-/**
- *
- */
 @Category({IntegrationTest.class, OQLIndexTest.class})
 public class IndexOperatorJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexPrimaryKeyUsageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexPrimaryKeyUsageJUnitTest.java
index 5e296dd..f03011c 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexPrimaryKeyUsageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexPrimaryKeyUsageJUnitTest.java
@@ -46,9 +46,6 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLIndexTest;
 
-/**
- *
- */
 @Category({IntegrationTest.class, OQLIndexTest.class})
 public class IndexPrimaryKeyUsageJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUsageInNestedQueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUsageInNestedQueryJUnitTest.java
index 9d0ffa7..6406495 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUsageInNestedQueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexUsageInNestedQueryJUnitTest.java
@@ -42,9 +42,6 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLIndexTest;
 
-/**
- *
- */
 @Category({IntegrationTest.class, OQLIndexTest.class})
 public class IndexUsageInNestedQueryJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java
index 4d31cf3..d30c752 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java
@@ -19,9 +19,6 @@
  */
 
 
-/**
- *
- */
 package org.apache.geode.cache.query.functional;
 
 import static org.junit.Assert.assertEquals;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java
index 3565cf3..735c668 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefEmpJUnitTest.java
@@ -17,9 +17,6 @@
  *
  * Created on April 11, 2005, 11:56 AM
  */
-/*
- *
- */
 package org.apache.geode.cache.query.functional;
 
 import static org.junit.Assert.fail;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefJUnitTest.java
index dcdbec1..bf51442 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefJUnitTest.java
@@ -17,9 +17,6 @@
  *
  * Created on April 7, 2005, 12:40 PM
  */
-/*
- *
- */
 package org.apache.geode.cache.query.functional;
 
 import static org.junit.Assert.fail;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefaultTypesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefaultTypesJUnitTest.java
index 962df01..71039d8 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefaultTypesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IteratorTypeDefaultTypesJUnitTest.java
@@ -18,9 +18,6 @@
  * Created on April 12, 2005, 3:52 PM
  */
 
-/**
- *
- */
 package org.apache.geode.cache.query.functional;
 
 import static org.junit.Assert.fail;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java
index 4cde2ad..15d82e1 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.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.cache.query.functional;
 
 import static org.junit.Assert.assertEquals;
@@ -53,9 +50,6 @@ import org.apache.geode.internal.cache.LocalRegion;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- *
- */
 @Category({IntegrationTest.class, OQLQueryTest.class})
 public class LimitClauseJUnitTest {
 
@@ -1770,9 +1764,7 @@ public class LimitClauseJUnitTest {
   /*
    * helper method to test against a compact range index
    *
-   * @param query
    *
-   * @throws Exception
    */
   private SelectResults helpTestIndexForQuery(String query, String indexedExpression,
       String regionPath, Object[] params) throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/LogicalOperatorsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/LogicalOperatorsJUnitTest.java
index 88be289..6ee3318 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/LogicalOperatorsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/LogicalOperatorsJUnitTest.java
@@ -35,9 +35,6 @@ import org.apache.geode.cache.query.data.Portfolio;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- *
- */
 @Category({IntegrationTest.class, OQLQueryTest.class})
 public class LogicalOperatorsJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultiRegionIndexUsageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
index ec3c563..0306887 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
@@ -42,8 +42,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLIndexTest;
 
 // TODO:TEST clean this up and add assertions
-/**
- */
 @Category({IntegrationTest.class, OQLIndexTest.class})
 public class MultiRegionIndexUsageJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NegativeNumberQueriesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NegativeNumberQueriesJUnitTest.java
index db45933..dd33a49 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NegativeNumberQueriesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NegativeNumberQueriesJUnitTest.java
@@ -37,8 +37,6 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
 // TODO:TEST clean this up and add assertions
-/**
- */
 @Category({IntegrationTest.class, OQLQueryTest.class})
 public class NegativeNumberQueriesJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByPartitionedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByPartitionedJUnitTest.java
index 3846e2f..bfa8c0d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByPartitionedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByPartitionedJUnitTest.java
@@ -37,10 +37,6 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- *
- *
- */
 @Category({IntegrationTest.class, OQLQueryTest.class})
 public class NonDistinctOrderByPartitionedJUnitTest extends NonDistinctOrderByTestImplementation {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByReplicatedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByReplicatedJUnitTest.java
index 0116572..9ea5492 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByReplicatedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByReplicatedJUnitTest.java
@@ -46,10 +46,6 @@ import org.apache.geode.cache.query.types.ObjectType;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- *
- *
- */
 @Category({IntegrationTest.class, OQLQueryTest.class})
 public class NonDistinctOrderByReplicatedJUnitTest extends NonDistinctOrderByTestImplementation {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByTestImplementation.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByTestImplementation.java
index 59b5893..5bd7580 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByTestImplementation.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NonDistinctOrderByTestImplementation.java
@@ -42,10 +42,6 @@ import org.apache.geode.cache.query.data.Position;
 import org.apache.geode.cache.query.internal.QueryObserverAdapter;
 import org.apache.geode.cache.query.internal.QueryObserverHolder;
 
-/**
- *
- *
- */
 public abstract class NonDistinctOrderByTestImplementation {
 
   @Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NumericQueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NumericQueryJUnitTest.java
index e1746d2..24858ac 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/NumericQueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/NumericQueryJUnitTest.java
@@ -311,9 +311,7 @@ public class NumericQueryJUnitTest {
   /*
    * helper method to test against a functional index
    *
-   * @param query
    *
-   * @throws Exception
    */
   private SelectResults helpTestFunctionalIndexForQuery(String query, String indexedExpression,
       String regionPath) throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java
index e5f3f9e..57d65696 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByPartitionedJUnitTest.java
@@ -45,10 +45,6 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- *
- *
- */
 @Category({IntegrationTest.class, OQLQueryTest.class})
 public class OrderByPartitionedJUnitTest extends OrderByTestImplementation {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByTestImplementation.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByTestImplementation.java
index e3734af..0f277ec 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByTestImplementation.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/OrderByTestImplementation.java
@@ -49,10 +49,6 @@ import org.apache.geode.cache.query.internal.DefaultQuery;
 import org.apache.geode.cache.query.internal.QueryObserverAdapter;
 import org.apache.geode.cache.query.internal.QueryObserverHolder;
 
-/**
- *
- *
- */
 public abstract class OrderByTestImplementation {
 
   @Before
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/ParameterBindingJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/ParameterBindingJUnitTest.java
index 446d9ad..0b45e6f 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/ParameterBindingJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/ParameterBindingJUnitTest.java
@@ -45,9 +45,6 @@ import org.apache.geode.cache.query.data.Portfolio;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- *
- */
 @Category({IntegrationTest.class, OQLQueryTest.class})
 public class ParameterBindingJUnitTest {
   String regionName = "Portfolios";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/QRegionInterfaceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/QRegionInterfaceJUnitTest.java
index 0fea8d0..a613c48 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/QRegionInterfaceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/QRegionInterfaceJUnitTest.java
@@ -38,9 +38,6 @@ import org.apache.geode.cache.query.data.Portfolio;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- *
- */
 @Category({IntegrationTest.class, OQLQueryTest.class})
 public class QRegionInterfaceJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryREUpdateInProgressJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryREUpdateInProgressJUnitTest.java
index 538d1d3..d528a3b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryREUpdateInProgressJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryREUpdateInProgressJUnitTest.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.cache.query.functional;
 
 import static org.apache.geode.cache.query.Utils.createPortfoliosAndPositions;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryUndefinedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryUndefinedJUnitTest.java
index 7181a96..8411e35 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryUndefinedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/QueryUndefinedJUnitTest.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.cache.query.functional;
 
 import static org.junit.Assert.assertEquals;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/SelectToDateJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/SelectToDateJUnitTest.java
index bf17c04..a402451 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/SelectToDateJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/SelectToDateJUnitTest.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.cache.query.functional;
 
 import static org.junit.Assert.*;
@@ -183,7 +180,6 @@ public class SelectToDateJUnitTest {
   /**
    * Each month will have exactly 20 entries with a matching date Code borrowed from shobhit's test
    *
-   * @throws ParseException
    */
   private void createLocalRegion() throws ParseException {
     Cache cache = CacheUtils.getCache();
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/StructMemberAccessJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/StructMemberAccessJUnitTest.java
index acea532..ba617e9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/StructMemberAccessJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/StructMemberAccessJUnitTest.java
@@ -47,8 +47,6 @@ import org.apache.geode.cache.query.types.StructType;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- */
 @Category({IntegrationTest.class, OQLQueryTest.class})
 public class StructMemberAccessJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java
index 1337893..14afc9f 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledGroupBySelectJUnitTest.java
@@ -33,10 +33,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- *
- *
- */
 @Category({IntegrationTest.class, OQLQueryTest.class})
 public class CompiledGroupBySelectJUnitTest {
   private Region rgn;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledJunctionInternalsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledJunctionInternalsJUnitTest.java
index 6a29703..a578ca0 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledJunctionInternalsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/CompiledJunctionInternalsJUnitTest.java
@@ -52,10 +52,6 @@ import org.apache.geode.internal.cache.LocalRegion;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- *
- *
- */
 @Category({IntegrationTest.class, OQLQueryTest.class})
 public class CompiledJunctionInternalsJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ExecutionContextJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ExecutionContextJUnitTest.java
index 7155982..ffd29a4 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ExecutionContextJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ExecutionContextJUnitTest.java
@@ -46,10 +46,6 @@ import org.apache.geode.test.dunit.ThreadUtils;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- *
- *
- */
 @Category({IntegrationTest.class, OQLQueryTest.class})
 public class ExecutionContextJUnitTest {
   boolean failure = false;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ProjectionAttributeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ProjectionAttributeJUnitTest.java
index 0cc4cce..c4f3e3e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ProjectionAttributeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ProjectionAttributeJUnitTest.java
@@ -48,10 +48,6 @@ import org.apache.geode.cache.query.types.StructType;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- *
- *
- */
 @Category({IntegrationTest.class, OQLQueryTest.class})
 public class ProjectionAttributeJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QCompilerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QCompilerJUnitTest.java
index 9560bb8..1c2163c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QCompilerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QCompilerJUnitTest.java
@@ -38,10 +38,6 @@ import org.apache.geode.cache.query.internal.parse.OQLLexerTokenTypes;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- *
- *
- */
 @Category({IntegrationTest.class, OQLQueryTest.class})
 public class QCompilerJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryFromClauseCanonicalizationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryFromClauseCanonicalizationJUnitTest.java
index 274a80d..f5c15e9 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryFromClauseCanonicalizationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryFromClauseCanonicalizationJUnitTest.java
@@ -40,9 +40,6 @@ import org.apache.geode.cache.query.data.Portfolio;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- *
- */
 @Category({IntegrationTest.class, OQLQueryTest.class})
 public class QueryFromClauseCanonicalizationJUnitTest {
   Region region = null;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryTraceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryTraceJUnitTest.java
index 682d284..3a844f4 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryTraceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/QueryTraceJUnitTest.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.cache.query.internal;
 
 import static org.junit.Assert.assertEquals;
@@ -47,9 +44,6 @@ import org.apache.geode.cache.query.internal.index.PartitionedIndex;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLQueryTest;
 
-/**
- *
- */
 @Category({IntegrationTest.class, OQLQueryTest.class})
 public class QueryTraceJUnitTest {
 
@@ -76,7 +70,6 @@ public class QueryTraceJUnitTest {
   /**
    * Tests tracing on queries with <TRACE> or <trace> tag.
    *
-   * @throws Exception
    */
   @Test
   public void testTraceOnPartitionedRegionWithTracePrefix() throws Exception {
@@ -155,7 +148,6 @@ public class QueryTraceJUnitTest {
   /**
    * negative testing: if <TRACE> is in comments not tracing is done.
    *
-   * @throws Exception
    */
   @Test
   public void testNegTraceOnPartitionedRegionWithTracePrefix() throws Exception {
@@ -197,7 +189,6 @@ public class QueryTraceJUnitTest {
   /**
    * negative testing: if <TRACE> is in comments not tracing is done.
    *
-   * @throws Exception
    */
   @Test
   public void testNegTraceOnLocalRegionWithTracePrefix() throws Exception {
@@ -237,7 +228,6 @@ public class QueryTraceJUnitTest {
   /**
    * No Query comments
    *
-   * @throws Exception
    */
   @Test
   public void testTraceOnPartitionedRegionWithTracePrefixNoComments() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapperLimitJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapperLimitJUnitTest.java
index 80185c0..1e098c3 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapperLimitJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/ResultsCollectionWrapperLimitJUnitTest.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.cache.query.internal;
 
 import static org.junit.Assert.*;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructBagLimitBehaviourJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructBagLimitBehaviourJUnitTest.java
index 4fd0541..dc7c53d 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructBagLimitBehaviourJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/StructBagLimitBehaviourJUnitTest.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.cache.query.internal;
 
 import static org.junit.Assert.*;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java
index b47dcf0..61e7838 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.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.cache.query.internal.index;
 
 import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java
index b94d8d6..94e6a8a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/AsynchIndexMaintenanceJUnitTest.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.cache.query.internal.index;
 
 import static org.junit.Assert.*;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
index b33b73b..e55308e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexInitOnOverflowRegionDUnitTest.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.cache.query.internal.index;
 
 import static org.junit.Assert.*;
@@ -59,9 +56,6 @@ import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
 import org.apache.geode.test.junit.categories.DistributedTest;
 import org.apache.geode.test.junit.categories.OQLIndexTest;
 
-/**
- *
- */
 @Category({DistributedTest.class, OQLIndexTest.class})
 public class ConcurrentIndexInitOnOverflowRegionDUnitTest extends JUnit4CacheTestCase {
 
@@ -89,9 +83,6 @@ public class ConcurrentIndexInitOnOverflowRegionDUnitTest extends JUnit4CacheTes
     return properties;
   }
 
-  /**
-  *
-  */
   @Test
   public void testAsyncIndexInitDuringEntryDestroyAndQueryOnRR() {
     Host host = Host.getHost(0);
@@ -196,9 +187,6 @@ public class ConcurrentIndexInitOnOverflowRegionDUnitTest extends JUnit4CacheTes
     ThreadUtils.join(asyncInv1, 30 * 1000);
   }
 
-  /**
-  *
-  */
   @Test
   public void testAsyncIndexInitDuringEntryPutUsingClientOnRR() {
     Host host = Host.getHost(0);
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java
index 51bc00c..1c1947a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexOperationsOnOverflowRegionDUnitTest.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.cache.query.internal.index;
 
 import static org.junit.Assert.*;
@@ -183,9 +180,6 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends JUnit4Ca
     ThreadUtils.join(asyncInv1, 30 * 1000);
   }
 
-  /**
-   *
-   */
   @Test
   public void testAsyncIndexInitDuringEntryDestroyAndQueryOnPR() {
     Host host = Host.getHost(0);
@@ -290,9 +284,6 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends JUnit4Ca
     ThreadUtils.join(asyncInv1, 30 * 1000);
   }
 
-  /**
-  *
-  */
   @Test
   public void testAsyncIndexInitDuringEntryDestroyAndQueryOnPersistentRR() {
     Host host = Host.getHost(0);
@@ -394,9 +385,6 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends JUnit4Ca
     ThreadUtils.join(asyncInv1, 30 * 1000);
   }
 
-  /**
-  *
-  */
   @Test
   public void testAsyncIndexInitDuringEntryDestroyAndQueryOnPersistentPR() {
     Host host = Host.getHost(0);
@@ -498,9 +486,6 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends JUnit4Ca
     ThreadUtils.join(asyncInv1, 30 * 1000);
   }
 
-  /**
-  *
-  */
   @Test
   public void testAsyncIndexInitDuringEntryDestroyAndQueryOnNonOverflowRR() {
     Host host = Host.getHost(0);
@@ -596,9 +581,6 @@ public class ConcurrentIndexOperationsOnOverflowRegionDUnitTest extends JUnit4Ca
     ThreadUtils.join(asyncInv1, 30 * 1000);
   }
 
-  /**
-  *
-  */
   @Test
   public void testAsyncIndexInitDuringEntryDestroyAndQueryOnOnNonOverflowPR() {
     Host host = Host.getHost(0);
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
index 2f27e16..48601b6 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithInplaceObjectModFalseDUnitTest.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.cache.query.internal.index;
 
 import static org.junit.Assert.*;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
index 8671653..d4d0d05 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ConcurrentIndexUpdateWithoutWLDUnitTest.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.cache.query.internal.index;
 
 import static org.junit.Assert.*;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
index e15e258..2e7263e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
@@ -31,10 +31,6 @@ import org.apache.geode.cache.query.data.Position;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLIndexTest;
 
-/**
- *
- *
- */
 @Category({IntegrationTest.class, OQLIndexTest.class})
 public class CopyOnReadIndexJUnitTest {
 
@@ -79,8 +75,6 @@ public class CopyOnReadIndexJUnitTest {
 
   /**
    *
-   * @param region
-   * @param numObjects
    * @param objectsAndResultsMultiplier number of similar objects to put into the cache so that
    *        results from queries will be satisfied by the multiple
    */
@@ -303,16 +297,6 @@ public class CopyOnReadIndexJUnitTest {
         objectsAndResultsMultiplier, true, true);
   }
 
-  /**
-   *
-   * @param queries
-   * @param expectedResults
-   * @param numObjects
-   * @param objectsAndResultsMultiplier
-   * @param hasIndex
-   * @param isPR
-   * @throws Exception
-   */
   private void helpExecuteQueriesCopyOnRead(String[] queries, int[] expectedResults, int numObjects,
       int objectsAndResultsMultiplier, boolean hasIndex, boolean isPR) throws Exception {
     Region region = utils.getCache().getRegion("/" + regionName);
@@ -327,16 +311,6 @@ public class CopyOnReadIndexJUnitTest {
     }
   }
 
-  /**
-   *
-   * @param queries
-   * @param expectedResults
-   * @param numObjects
-   * @param objectsAndResultsMultiplier
-   * @param hasIndex
-   * @param isPR
-   * @throws Exception
-   */
   private void helpExecuteQueriesCopyOnReadFalse(String[] queries, int[] expectedResults,
       int numObjects, int objectsAndResultsMultiplier, boolean hasIndex, boolean isPR)
       throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexCreationInternalsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexCreationInternalsJUnitTest.java
index 671c37b..8546379 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexCreationInternalsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexCreationInternalsJUnitTest.java
@@ -46,9 +46,6 @@ import org.apache.geode.test.dunit.ThreadUtils;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLIndexTest;
 
-/**
- *
- */
 @Category({IntegrationTest.class, OQLIndexTest.class})
 public class IndexCreationInternalsJUnitTest {
   protected String childThreadName1 = "";
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexJUnitTest.java
index be40e95..3c52c7a 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexJUnitTest.java
@@ -36,8 +36,6 @@ import org.apache.geode.cache.query.data.Portfolio;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLIndexTest;
 
-/**
- */
 @Category({IntegrationTest.class, OQLIndexTest.class})
 public class IndexJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintainceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintainceJUnitTest.java
index 2271eb4..6b06aca 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintainceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexMaintainceJUnitTest.java
@@ -52,9 +52,6 @@ import org.apache.geode.test.dunit.ThreadUtils;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLIndexTest;
 
-/**
- *
- */
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @Category({IntegrationTest.class, OQLIndexTest.class})
 public class IndexMaintainceJUnitTest {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexStatisticsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexStatisticsJUnitTest.java
index 6a01c08..e9fdfd7 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexStatisticsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexStatisticsJUnitTest.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.cache.query.internal.index;
 
 import static org.junit.Assert.assertEquals;
@@ -44,9 +41,6 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLIndexTest;
 
-/**
- *
- */
 @Category({IntegrationTest.class, OQLIndexTest.class})
 public class IndexStatisticsJUnitTest {
 
@@ -88,7 +82,6 @@ public class IndexStatisticsJUnitTest {
   /**
    * Test RenageIndex IndexStatistics for keys, values, updates and uses.
    *
-   * @throws Exception
    */
   @Test
   public void testStatsForRangeIndex() throws Exception {
@@ -211,7 +204,6 @@ public class IndexStatisticsJUnitTest {
   /**
    * Test CompactRenageIndex IndexStatistics for keys, values, updates and uses.
    *
-   * @throws Exception
    */
   @Test
   public void testStatsForCompactRangeIndex() throws Exception {
@@ -334,7 +326,6 @@ public class IndexStatisticsJUnitTest {
   /**
    * Test CompactMapRenageIndex IndexStatistics for keys, values, updates and uses.
    *
-   * @throws Exception
    */
   @Test
   public void testStatsForCompactMapRangeIndex() throws Exception {
@@ -410,7 +401,6 @@ public class IndexStatisticsJUnitTest {
   /**
    * Test MapRenageIndex IndexStatistics for keys, values, updates and uses.
    *
-   * @throws Exception
    */
   @Test
   public void testStatsForMapRangeIndex() throws Exception {
@@ -488,7 +478,6 @@ public class IndexStatisticsJUnitTest {
   /**
    * Test RenageIndex IndexStatistics for keys, values, updates and uses.
    *
-   * @throws Exception
    */
   @Test
   public void testStatsForRangeIndexBeforeRegionCreation() throws Exception {
@@ -565,7 +554,6 @@ public class IndexStatisticsJUnitTest {
   /**
    * Test CompactRenageIndex IndexStatistics for keys, values, updates and uses.
    *
-   * @throws Exception
    */
   @Test
   public void testStatsForCompactRangeIndexBeforeRegionCreation() throws Exception {
@@ -641,7 +629,6 @@ public class IndexStatisticsJUnitTest {
   /**
    * Test MapRenageIndex IndexStatistics for keys, values, updates and uses.
    *
-   * @throws Exception
    */
   @Test
   public void testStatsForMapRangeIndexBeforeRegionCreation() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
index aaf5039..36349cb 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverDUnitTest.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.cache.query.internal.index;
 
 import static org.junit.Assert.*;
@@ -55,9 +52,6 @@ import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
 import org.apache.geode.test.junit.categories.DistributedTest;
 import org.apache.geode.test.junit.categories.OQLIndexTest;
 
-/**
- *
- */
 @Category({DistributedTest.class, OQLIndexTest.class})
 public class IndexTrackingQueryObserverDUnitTest extends JUnit4CacheTestCase {
 
@@ -138,7 +132,6 @@ public class IndexTrackingQueryObserverDUnitTest extends JUnit4CacheTestCase {
   /**
    * CReates a PR on a VM with NUM_BKTS buckets.
    *
-   * @param vm
    */
   private void createPR(VM vm) {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java
index dbc2995..e7e2dde 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexTrackingQueryObserverJUnitTest.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.cache.query.internal.index;
 
 import static org.junit.Assert.assertEquals;
@@ -42,9 +39,6 @@ import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLIndexTest;
 
-/**
- *
- */
 @Category({IntegrationTest.class, OQLIndexTest.class})
 public class IndexTrackingQueryObserverJUnitTest {
   static QueryService qs;
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexedMergeEquiJoinScenariosJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexedMergeEquiJoinScenariosJUnitTest.java
index a8b1b9a..d1b1532 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexedMergeEquiJoinScenariosJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/IndexedMergeEquiJoinScenariosJUnitTest.java
@@ -48,9 +48,6 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLIndexTest;
 
-/**
- *
- */
 @Category({IntegrationTest.class, OQLIndexTest.class})
 public class IndexedMergeEquiJoinScenariosJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
index 12d81c7..2f0b7ef 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
@@ -39,10 +39,6 @@ import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLIndexTest;
 
-/**
- *
- *
- */
 @Category({IntegrationTest.class, OQLIndexTest.class})
 public class ProgRegionCreationIndexUpdateTypeJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRIndexStatisticsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRIndexStatisticsJUnitTest.java
index 3e85a21..95fc104 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRIndexStatisticsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRIndexStatisticsJUnitTest.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.cache.query.partitioned;
 
 import static org.junit.Assert.assertEquals;
@@ -42,9 +39,6 @@ import org.apache.geode.internal.cache.PartitionedRegion;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.OQLIndexTest;
 
-/**
- *
- */
 @Category({IntegrationTest.class, OQLIndexTest.class})
 public class PRIndexStatisticsJUnitTest {
 
@@ -103,7 +97,6 @@ public class PRIndexStatisticsJUnitTest {
   /**
    * Test RenageIndex IndexStatistics for keys, values, updates and uses.
    *
-   * @throws Exception
    */
   @Test
   public void testStatsForRangeIndex() throws Exception {
@@ -173,7 +166,6 @@ public class PRIndexStatisticsJUnitTest {
   /**
    * Test CompactRenageIndex IndexStatistics for keys, values, updates and uses.
    *
-   * @throws Exception
    */
   @Test
   public void testStatsForCompactRangeIndex() throws Exception {
@@ -243,7 +235,6 @@ public class PRIndexStatisticsJUnitTest {
   /**
    * Test CompactMapRenageIndex IndexStatistics for keys, values, updates and uses.
    *
-   * @throws Exception
    */
   @Test
   public void testStatsForCompactMapRangeIndex() throws Exception {
@@ -315,7 +306,6 @@ public class PRIndexStatisticsJUnitTest {
   /**
    * Test MapRenageIndex IndexStatistics for keys, values, updates and uses.
    *
-   * @throws Exception
    */
   @Test
   public void testStatsForMapRangeIndex() throws Exception {
@@ -391,7 +381,6 @@ public class PRIndexStatisticsJUnitTest {
   /**
    * Test RenageIndex IndexStatistics for keys, values, updates and uses.
    *
-   * @throws Exception
    */
   @Test
   public void testStatsForRangeIndexBeforeRegionCreation() throws Exception {
@@ -469,7 +458,6 @@ public class PRIndexStatisticsJUnitTest {
   /**
    * Test CompactRenageIndex IndexStatistics for keys, values, updates and uses.
    *
-   * @throws Exception
    */
   @Test
   public void testStatsForCompactRangeIndexBeforeRegionCreation() throws Exception {
@@ -546,7 +534,6 @@ public class PRIndexStatisticsJUnitTest {
   /**
    * Test MapRenageIndex IndexStatistics for keys, values, updates and uses.
    *
-   * @throws Exception
    */
   @Test
   public void testStatsForCompactMapRangeIndexBeforeRegionCreation() throws Exception {
@@ -627,7 +614,6 @@ public class PRIndexStatisticsJUnitTest {
   /**
    * Test MapRenageIndex IndexStatistics for keys, values, updates and uses.
    *
-   * @throws Exception
    */
   @Test
   public void testStatsForMapRangeIndexBeforeRegionCreation() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryJUnitTest.java
index a054d90..d68eca0 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRInvalidQueryJUnitTest.java
@@ -47,8 +47,6 @@ public class PRInvalidQueryJUnitTest {
   /**
    * Populates the region with the Objects stores in the data Object array.
    *
-   * @param region
-   * @param data
    */
   private void populateData(Region region, Object[] data) {
     logger.info("PRInvalidQueryJUnitTest#populateData: Populating Data to the region");
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java
index 6b8bfba..5c30328 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryCacheClosedJUnitTest.java
@@ -84,7 +84,6 @@ public class PRQueryCacheClosedJUnitTest {
    * 5. Recreates the cache after a delay of 1500ms
    *
    *
-   * @throws Exception
    */
   @Test
   public void testQueryOnSingleDataStoreWithCacheClose() throws Exception {
@@ -234,8 +233,6 @@ public class PRQueryCacheClosedJUnitTest {
   /**
    * Populates the region with the Objects stores in the data Object array.
    *
-   * @param region
-   * @param data
    */
   private void populateData(Region region, Object[] data) {
     logger.info("PRQueryCacheClosedJUnitTest#populateData: Populating Data in the PR Region ");
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java
index 6391a32..d70b9c3 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java
@@ -203,8 +203,6 @@ public class PRQueryDUnitHelper implements Serializable {
   /**
    * This function creates a appropriate region PR given the scope & the redundancy parameters *
    *
-   * @param regionName
-   * @param redundancy
    * @return cacheSerializable object
    */
   public CacheSerializableRunnable getCacheSerializableRunnableForPRCreate(final String regionName,
@@ -246,10 +244,6 @@ public class PRQueryDUnitHelper implements Serializable {
    * This function creates a colocated pair of PR's given the scope & the redundancy parameters for
    * the parent *
    *
-   * @param regionName
-   * @param redundancy
-   * @param constraint
-   * @param makePersistent
    * @return cacheSerializable object
    */
   public CacheSerializableRunnable getCacheSerializableRunnableForColocatedPRCreate(
@@ -313,10 +307,6 @@ public class PRQueryDUnitHelper implements Serializable {
    * This function creates the parent region of colocated pair of PR's given the scope & the
    * redundancy parameters for the parent *
    *
-   * @param regionName
-   * @param redundancy
-   * @param constraint
-   * @param makePersistent
    * @return cacheSerializable object
    */
   public CacheSerializableRunnable getCacheSerializableRunnableForColocatedParentCreate(
@@ -374,10 +364,6 @@ public class PRQueryDUnitHelper implements Serializable {
    * This function creates the parent region of colocated pair of PR's given the scope & the
    * redundancy parameters for the parent *
    *
-   * @param regionName
-   * @param redundancy
-   * @param constraint
-   * @param isPersistent
    * @return cacheSerializable object
    */
   public CacheSerializableRunnable getCacheSerializableRunnableForColocatedChildCreate(
@@ -515,9 +501,6 @@ public class PRQueryDUnitHelper implements Serializable {
   /**
    * This function creates a colocated region PR given the oher colocated region.
    *
-   * @param regionName
-   * @param redundancy
-   * @param coloRegionName
    * @return cacheSerializable object
    */
 
@@ -567,10 +550,6 @@ public class PRQueryDUnitHelper implements Serializable {
   /**
    * This function puts portfolio objects into the created Region (PR or Local) *
    *
-   * @param regionName
-   * @param portfolio
-   * @param to
-   * @param from
    * @return cacheSerializable object
    */
   public CacheSerializableRunnable getCacheSerializableRunnableForPRPuts(final String regionName,
@@ -593,9 +572,6 @@ public class PRQueryDUnitHelper implements Serializable {
    * like, invalidate, destroy and create are performed in random manner based on
    * {@link Random#nextInt(int)}.
    *
-   * @param regionName
-   * @param to
-   * @param from
    * @return cacheSerializable object
    */
   public CacheSerializableRunnable getCacheSerializableRunnableForPRRandomOps(
@@ -655,10 +631,6 @@ public class PRQueryDUnitHelper implements Serializable {
   /**
    * This function puts portfolio objects into the created Region (PR or Local) *
    *
-   * @param regionName
-   * @param portfolio
-   * @param to
-   * @param from
    * @return cacheSerializable object
    */
   public CacheSerializableRunnable getCacheSerializableRunnableForPRDuplicatePuts(
@@ -678,10 +650,6 @@ public class PRQueryDUnitHelper implements Serializable {
   /**
    * This function puts portfolio objects into the created Region (PR or Local) *
    *
-   * @param regionName
-   * @param portfolio
-   * @param to
-   * @param from
    * @return cacheSerializable object
    */
   public CacheSerializableRunnable getCacheSerializableRunnableForPRPutsKeyValue(
@@ -1437,7 +1405,6 @@ public class PRQueryDUnitHelper implements Serializable {
   /**
    * This function creates a Accessor node region on the given PR given the scope parameter.
    *
-   * @param regionName
    * @return cacheSerializable object
    */
 
@@ -1534,7 +1501,6 @@ public class PRQueryDUnitHelper implements Serializable {
    * same query on the local region <br>
    * 3. Compares the appropriate resultSet <br>
    *
-   * @param regionName
    *
    *
    * @return cacheSerializable object
@@ -1816,7 +1782,6 @@ public class PRQueryDUnitHelper implements Serializable {
    * Creats a partiotioned region using an xml file descriptions.
    *
    *
-   * @return CacheSerializable
    *
    */
   public CacheSerializableRunnable getCacheSerializableRunnableForPRCreate(
@@ -1922,7 +1887,6 @@ public class PRQueryDUnitHelper implements Serializable {
    * Cacheserializable runnable which removes all the index on a partitioned region
    *
    * @param name name of the partitioned regions
-   * @return CacheSerializableRunnable
    */
 
   public CacheSerializableRunnable getCacheSerializableRunnableForRemoveIndex(final String name,
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryJUnitTest.java
index 83168a9..bfb03fa 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryJUnitTest.java
@@ -60,7 +60,6 @@ public class PRQueryJUnitTest {
    * 1. Creates a PR with redundancy=0 on a single VM. 2. Puts some test Objects in cache. 3. Fires
    * queries on the data and verifies the result.
    *
-   * @throws Exception
    */
   @Test
   public void testQueryOnSingleDataStore() throws Exception {
@@ -176,8 +175,6 @@ public class PRQueryJUnitTest {
   /**
    * Populates the region with the Objects stores in the data Object array.
    *
-   * @param region
-   * @param data
    */
   private void populateData(Region region, Object[] data) {
     for (int j = 0; j < data.length; j++) {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryNumThreadsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryNumThreadsJUnitTest.java
index ea35e22..a7fe67c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryNumThreadsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryNumThreadsJUnitTest.java
@@ -57,7 +57,6 @@ public class PRQueryNumThreadsJUnitTest {
    * 1. Creates a PR with redundancy=0 on a single VM. 2. Puts some test Objects in cache. 3. Fires
    * queries on the data and verifies the result.
    *
-   * @throws Exception
    */
   @Test
   public void testQueryOnSingleDataStore() throws Exception {
@@ -141,8 +140,6 @@ public class PRQueryNumThreadsJUnitTest {
   /**
    * Populates the region with the Objects stores in the data Object array.
    *
-   * @param region
-   * @param data
    */
   private void populateData(Region region, Object[] data) {
     for (int j = 0; j < data.length; j++) {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java
index 997dde9..bf90e5b 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionClosedJUnitTest.java
@@ -74,7 +74,6 @@ public class PRQueryRegionClosedJUnitTest {
    * 4. Create another Thread and call Region#close() on the PR region.<br>
    *
    *
-   * @throws Exception
    */
   @Test
   public void testQueryingWithRegionClose() throws Exception {
@@ -225,8 +224,6 @@ public class PRQueryRegionClosedJUnitTest {
   /**
    * Populates the region with the Objects stores in the data Object array.
    *
-   * @param region
-   * @param data
    */
   private void populateData(Region region, Object[] data) {
     logger.info("PRQueryRegionClosedJUnitTest#populateData: Populating Data in the PR Region ");
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java
index 050a7e1..1305d0b 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryRegionDestroyedJUnitTest.java
@@ -76,7 +76,6 @@ public class PRQueryRegionDestroyedJUnitTest {
    * 4. Create another Thread and call Region#destroyRegion() on the PR region.<br>
    *
    *
-   * @throws Exception
    */
   @Test
   public void testQueryOnSingleDataStore() throws Exception {
@@ -223,8 +222,6 @@ public class PRQueryRegionDestroyedJUnitTest {
   /**
    * Populates the region with the Objects stores in the data Object array.
    *
-   * @param region
-   * @param data
    */
   private void populateData(Region region, Object[] data) {
     logger.info("PRQueryRegionDestroyedJUnitTest#populateData: Populating Data in the PR Region ");
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/transaction/QueryAndJtaJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/transaction/QueryAndJtaJUnitTest.java
index c963a69..9a34095 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/transaction/QueryAndJtaJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/transaction/QueryAndJtaJUnitTest.java
@@ -268,7 +268,6 @@ public class QueryAndJtaJUnitTest {
   /**
    * verify that queries on indexes work with transaction
    *
-   * @throws Exception
    */
   @Test
   public void testIndexOnCommitForPut() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/cache/snapshot/ParallelSnapshotDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/snapshot/ParallelSnapshotDUnitTest.java
index a662f53..cc95a72 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/snapshot/ParallelSnapshotDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/snapshot/ParallelSnapshotDUnitTest.java
@@ -103,7 +103,6 @@ public class ParallelSnapshotDUnitTest extends JUnit4CacheTestCase {
    * This test ensures that parallel import succeeds even when each node does not have a file to
    * import (import cluster larger than export one)
    *
-   * @throws Exception
    */
   @Test
   public void testImportOnLargerCluster() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java
index c2b5aff..62a96ae 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientServerCCEDUnitTest.java
@@ -112,7 +112,6 @@ public class ClientServerCCEDUnitTest extends JUnit4CacheTestCase {
    * the same key in a region which, in the servers, has Scope.GLOBAL. There should be no conflation
    * and each operation should obtain a lock.
    *
-   * @throws Exception
    */
   @Test
   public void testClientEventsAreNotConflatedByGlobalRegionOnServer() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java
index b8a322b..e0fc412 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckAsyncOverflowRegionDUnitTest.java
@@ -26,10 +26,6 @@ import org.apache.geode.cache.RegionAttributes;
 import org.apache.geode.cache.Scope;
 import org.apache.geode.test.junit.categories.DistributedTest;
 
-/**
- *
- *
- */
 @Category(DistributedTest.class)
 public class DiskDistributedNoAckAsyncOverflowRegionDUnitTest
     extends DiskDistributedNoAckRegionTestCase {
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistAckMapMethodsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistAckMapMethodsDUnitTest.java
index a996f48..749161c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/DistAckMapMethodsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/DistAckMapMethodsDUnitTest.java
@@ -390,11 +390,6 @@ public class DistAckMapMethodsDUnitTest extends JUnit4DistributedTestCase { // T
 
 
   // following is the implementation of the methods of Map to use in dunit test cases.
-  /*
-   *
-   *
-   */
-
   public static Object putMethod(Object ob) {
     Object obj = null;
     try {
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEDUnitTest.java
index 0d53bf1..0d57517 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckPersistentRegionCCEDUnitTest.java
@@ -13,9 +13,6 @@
  * the License.
  */
 
-/**
- *
- */
 package org.apache.geode.cache30;
 
 import org.junit.Ignore;
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java
index ac96819..f73e8d8 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/DistributedAckRegionCCEDUnitTest.java
@@ -13,9 +13,6 @@
  * the License.
  */
 
-/**
- *
- */
 package org.apache.geode.cache30;
 
 import static org.apache.geode.distributed.ConfigurationProperties.*;
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java
index 5a6fb82..84e3a2b 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/GlobalRegionCCEDUnitTest.java
@@ -13,9 +13,6 @@
  * the License.
  */
 
-/**
- *
- */
 package org.apache.geode.cache30;
 
 import static org.apache.geode.distributed.ConfigurationProperties.*;
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/LRUEvictionControllerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/LRUEvictionControllerDUnitTest.java
index 064e294..fb73c17 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/LRUEvictionControllerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/LRUEvictionControllerDUnitTest.java
@@ -308,7 +308,6 @@ public class LRUEvictionControllerDUnitTest extends JUnit4CacheTestCase {
    * Create two regions, one a "feed" that performs transactions which are replicated to a region
    * with an Entry LRU set to one Asserts that the LRU rules are observed
    *
-   * @throws Exception
    */
   @Test
   public void testReplicationAndTransactions() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/MemLRUEvictionControllerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/MemLRUEvictionControllerDUnitTest.java
index 15c3ba0..262598f 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/MemLRUEvictionControllerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/MemLRUEvictionControllerDUnitTest.java
@@ -144,7 +144,6 @@ public class MemLRUEvictionControllerDUnitTest extends JUnit4CacheTestCase {
   /**
    * Make sure that we only size a class the first time we see the class instance.
    *
-   * @throws CacheException
    */
   @Test
   public void testSizeClassesOnce() throws CacheException {
@@ -229,7 +228,6 @@ public class MemLRUEvictionControllerDUnitTest extends JUnit4CacheTestCase {
    * Validate that a custom {@link ObjectSizer} is called, configured propertly, and actually limits
    * the size of the <code>Region</code>.
    *
-   * @throws Exception
    */
   @Test
   public void testCustomObjectSizer() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java
index e4c2a04..588dda3 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java
@@ -250,7 +250,6 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
   /**
    * Indicate whether subregions are supported
    *
-   * @return
    */
   protected boolean supportsSubregions() {
     return true;
@@ -3364,7 +3363,6 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
   /**
    * Verify that accessing an entry resets its idle time
    *
-   * @throws Exception
    */
   @Test
   public void testEntryIdleReset() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RemoveAllMultiVmDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/RemoveAllMultiVmDUnitTest.java
index 01e3cd9..93f9c03 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/RemoveAllMultiVmDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/RemoveAllMultiVmDUnitTest.java
@@ -46,9 +46,6 @@ import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
 import org.apache.geode.test.junit.categories.DistributedTest;
 
-/**
- *
- */
 @Category(DistributedTest.class)
 public class RemoveAllMultiVmDUnitTest extends JUnit4DistributedTestCase { // TODO: reformat
 
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ShorteningExpirationTimeRegressionTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ShorteningExpirationTimeRegressionTest.java
index af0c6b4..7be4976 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/ShorteningExpirationTimeRegressionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ShorteningExpirationTimeRegressionTest.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.cache30;
 
 import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/TestPdxSerializer.java b/geode-core/src/test/java/org/apache/geode/cache30/TestPdxSerializer.java
index 488b72e..aed4075 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/TestPdxSerializer.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/TestPdxSerializer.java
@@ -21,9 +21,6 @@ import org.apache.geode.pdx.PdxReader;
 import org.apache.geode.pdx.PdxSerializer;
 import org.apache.geode.pdx.PdxWriter;
 
-/**
- *
- */
 public class TestPdxSerializer implements PdxSerializer, Declarable2 {
 
   private Properties properties;
diff --git a/geode-core/src/test/java/org/apache/geode/codeAnalysis/CompiledClassUtils.java b/geode-core/src/test/java/org/apache/geode/codeAnalysis/CompiledClassUtils.java
index 318dbac..468eff9 100644
--- a/geode-core/src/test/java/org/apache/geode/codeAnalysis/CompiledClassUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/codeAnalysis/CompiledClassUtils.java
@@ -42,7 +42,6 @@ public class CompiledClassUtils {
    * Parse the given class files and return a map of name->Dclass. Any IO exceptions are consumed by
    * this method and written to stderr.
    *
-   * @param classFiles
    * @return the parsed classes
    */
   public static Map<String, CompiledClass> parseClassFiles(List<File> classFiles) {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java
index 19853dd..823c288 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/DistributedLockServiceDUnitTest.java
@@ -399,8 +399,6 @@ public class DistributedLockServiceDUnitTest extends JUnit4DistributedTestCase {
   /**
    * Accessed by reflection. DO NOT REMOVE
    *
-   * @param i
-   * @return
    */
   public static Integer get_count_testFairness(Integer i) {
     return new Integer(count_testFairness[i.intValue()]);
@@ -427,8 +425,6 @@ public class DistributedLockServiceDUnitTest extends JUnit4DistributedTestCase {
   /**
    * Accessed via reflection. DO NOT REMOVE
    *
-   * @param serviceName
-   * @return
    */
   public static InternalDistributedMember identifyLockGrantor(String serviceName) {
     DLockService service = (DLockService) DistributedLockService.getServiceNamed(serviceName);
@@ -442,8 +438,6 @@ public class DistributedLockServiceDUnitTest extends JUnit4DistributedTestCase {
   /**
    * Accessed via reflection. DO NOT REMOVE.
    *
-   * @param serviceName
-   * @return
    */
   public static Boolean isLockGrantor(String serviceName) {
     DLockService service = (DLockService) DistributedLockService.getServiceNamed(serviceName);
@@ -456,7 +450,6 @@ public class DistributedLockServiceDUnitTest extends JUnit4DistributedTestCase {
   /**
    * Accessed via reflection. DO NOT REMOVE.
    *
-   * @param serviceName
    */
   protected static void becomeLockGrantor(String serviceName) {
     DLockService service = (DLockService) DistributedLockService.getServiceNamed(serviceName);
@@ -2332,9 +2325,6 @@ public class DistributedLockServiceDUnitTest extends JUnit4DistributedTestCase {
   /**
    * Accessed via reflection. DO NOT REMOVE
    *
-   * @param serviceName
-   * @param name
-   * @return
    */
   protected static Boolean lock(String serviceName, Object name) {
     DistributedLockService service = DistributedLockService.getServiceNamed(serviceName);
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java
index a6b5a0e..e235f19 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/DistributedMemberDUnitTest.java
@@ -253,7 +253,6 @@ public class DistributedMemberDUnitTest extends JUnit4DistributedTestCase {
    *
    * This test ensures that a partial ID (with no "name") is equal to its equivalent non-partial ID.
    *
-   * @throws Exception
    */
   @Test
   public void testMemberNameIgnoredInPartialID() throws Exception {
@@ -273,7 +272,6 @@ public class DistributedMemberDUnitTest extends JUnit4DistributedTestCase {
    * This test ensures that the membership manager can detect and replace a partial ID with one that
    * is not partial
    *
-   * @throws Exception
    */
   @Test
   public void testPartialIDInMessageReplacedWithFullID() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java
index 7e10742..1baa266 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java
@@ -110,7 +110,6 @@ public class LocatorJUnitTest {
   /**
    * GEODE-4176: locator creates "locator0view.dat" file when started with port 0
    *
-   * @throws Exception
    */
   @Test
   public void testThatLocatorDoesNotCreateFileWithZeroPort() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotIntegrationTest.java
index be54bc4..603affc 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/LocatorLoadSnapshotIntegrationTest.java
@@ -38,7 +38,6 @@ public class LocatorLoadSnapshotIntegrationTest {
    * A basic test of concurrent functionality. Starts a number of threads making requests and
    * expects the load to be balanced between three servers.
    *
-   * @throws InterruptedException
    */
   @Test
   public void testConcurrentBalancing() throws InterruptedException {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
index 9dde5df..4f3f02a 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java
@@ -195,7 +195,6 @@ public class GMSMemberJUnitTest {
    * This must be backward-compatible with Geode 1.0 (Version.GFE_90)
    * </p>
    *
-   * @throws Exception
    */
   @Test
   public void testGMSMemberBackwardCompatibility() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/MembershipManagerHelper.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/MembershipManagerHelper.java
index 64c4de4..2b5352c 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/MembershipManagerHelper.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/MembershipManagerHelper.java
@@ -48,7 +48,6 @@ public class MembershipManagerHelper {
    * Note that part of beSickMember's processing is to interrupt and stop any reader threads. A slow
    * listener in a reader thread should eat this interrupt.
    *
-   * @param sys
    */
   public static void beSickMember(DistributedSystem sys) {
     ((Manager) getMembershipManager(sys)).beSick();
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
index 0443b32..bcd658b 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
@@ -319,7 +319,6 @@ public class GMSJoinLeaveJUnitTest {
   /**
    * prepares and install a view
    *
-   * @throws IOException
    */
   private void prepareAndInstallView(InternalDistributedMember coordinator,
       List<InternalDistributedMember> members) throws IOException {
@@ -866,7 +865,6 @@ public class GMSJoinLeaveJUnitTest {
    * If a locator is started and sends out a view to take control of the cluster another member that
    * is also in the process of sending out a view should relinquish control to the new locator.
    *
-   * @throws Exception
    */
   @Test
   public void testCoordinatorGetsConflictingViewFromLocator() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
index 843a036..3a1d503 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/BackwardCompatibilitySerializationDUnitTest.java
@@ -81,7 +81,6 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
    * Test if correct toData/toDataPreXXX is called when changes are made to the TestMessage in 66
    * and 70 and version of peer is 56
    *
-   * @throws Exception
    */
   @Test
   public void testToDataFromHigherVersionToLower() throws Exception {
@@ -96,7 +95,6 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
    * Test if correct toData/toDataXXX is called when changes are made to the TestMessage in 66 and
    * 70 and version of peer is 70
    *
-   * @throws Exception
    */
   @Test
   public void testToDataFromLowerVersionToHigher() throws Exception {
@@ -110,7 +108,6 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
    * Test if correct fromData/fromDataXXX is called when changes are made to the TestMessage in 66
    * and 70 and version of peer is 70
    *
-   * @throws Exception
    */
   @Test
   public void testFromDataFromHigherVersionToLower() throws Exception {
@@ -127,7 +124,6 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
    * Test if correct fromData/fromDataXXX is called when changes are made to the TestMessage in 66
    * and 70 and version of peer is 56
    *
-   * @throws Exception
    */
   @Test
   public void testFromDataFromLowerVersionToHigher() throws Exception {
@@ -144,7 +140,6 @@ public class BackwardCompatibilitySerializationDUnitTest extends JUnit4CacheTest
    * Test if all messages implement toDataPreXXX and fromDataPreXXX if the message has been upgraded
    * in any of the versions
    *
-   * @throws Exception
    */
   @Test
   public void testAllMessages() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/ClassNotFoundExceptionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/ClassNotFoundExceptionDUnitTest.java
index 1b47865..0c79cab 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/ClassNotFoundExceptionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/ClassNotFoundExceptionDUnitTest.java
@@ -48,15 +48,9 @@ import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
 import org.apache.geode.test.junit.categories.DistributedTest;
 
-/**
- *
- */
 @Category(DistributedTest.class)
 public class ClassNotFoundExceptionDUnitTest extends JUnit4CacheTestCase {
 
-  /**
-   * @param name
-   */
   public ClassNotFoundExceptionDUnitTest() {
     super();
   }
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionQueueHelper.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionQueueHelper.java
index c316de6..bad3b7d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionQueueHelper.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionQueueHelper.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.mockito.Mockito.mock;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
index de202fa..ca13db4 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
@@ -67,7 +67,6 @@ public class ClientMessagesRegionCreationAndDestroyJUnitTest {
   /**
    * Create and attach bridge server to cache
    *
-   * @throws IOException
    */
 
   private void attachBridgeServer() throws IOException {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionCCEDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionCCEDUnitTest.java
index c7a3a5c..c7f5c51 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionCCEDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ClientServerTransactionCCEDUnitTest.java
@@ -60,9 +60,6 @@ public class ClientServerTransactionCCEDUnitTest extends ClientServerTransaction
     IgnoredException.addIgnoredException("Socket Closed");
   }
 
-  /**
-   *
-   */
   private static final long serialVersionUID = -6785438240204988439L;
 
   public ClientServerTransactionCCEDUnitTest() {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentDestroySubRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentDestroySubRegionDUnitTest.java
index a3b0e61..36c3a2f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentDestroySubRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentDestroySubRegionDUnitTest.java
@@ -33,9 +33,6 @@ import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
 import org.apache.geode.test.junit.categories.DistributedTest;
 
-/**
- *
- */
 @Category(DistributedTest.class)
 public class ConcurrentDestroySubRegionDUnitTest extends JUnit4CacheTestCase {
 
@@ -47,9 +44,6 @@ public class ConcurrentDestroySubRegionDUnitTest extends JUnit4CacheTestCase {
     disconnectAllFromDS();
   }
 
-  /**
-   * @param name
-   */
   public ConcurrentDestroySubRegionDUnitTest() {
     super();
   }
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentFlushingAndRegionOperationsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentFlushingAndRegionOperationsJUnitTest.java
index a266649..3715283 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentFlushingAndRegionOperationsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ConcurrentFlushingAndRegionOperationsJUnitTest.java
@@ -41,7 +41,6 @@ public class ConcurrentFlushingAndRegionOperationsJUnitTest extends DiskRegionTe
    *
    * The test ensures that put is not done twice by using a alreadyComeHere boolean.
    *
-   * @param region
    */
   void putBeforeFlush(final Region region) {
     alreadyComeHere = false;
@@ -73,7 +72,6 @@ public class ConcurrentFlushingAndRegionOperationsJUnitTest extends DiskRegionTe
    *
    *
    *
-   * @param region
    */
   void getBeforeFlush(final Region region) {
     alreadyComeHere = false;
@@ -100,7 +98,6 @@ public class ConcurrentFlushingAndRegionOperationsJUnitTest extends DiskRegionTe
   /**
    * the entry which is about to be flushed is deleted
    *
-   * @param region
    */
   void delBeforeFlush(final Region region) {
     alreadyComeHere = false;
@@ -146,7 +143,6 @@ public class ConcurrentFlushingAndRegionOperationsJUnitTest extends DiskRegionTe
    * thread. A 3000 ms wait is done to ensure that the separate thread has successfully closed the
    * region
    *
-   * @param region
    */
   void closeBeforeFlush(final Region region) {
     hasBeenNotified = false;
@@ -190,7 +186,6 @@ public class ConcurrentFlushingAndRegionOperationsJUnitTest extends DiskRegionTe
    * A region close is done after flush is over. The close is done in a separate thread and a 3000
    * ms wait is put to ensure that the separate thread has closed the region
    *
-   * @param region
    */
   void closeAfterFlush(final Region region) {
     hasBeenNotified = false;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/CustomerIDPartitionResolver.java b/geode-core/src/test/java/org/apache/geode/internal/cache/CustomerIDPartitionResolver.java
index 5c077bb..19ae77b 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/CustomerIDPartitionResolver.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/CustomerIDPartitionResolver.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.Serializable;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaFaultInDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaFaultInDUnitTest.java
index 8fe08cb..948b109 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaFaultInDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaFaultInDUnitTest.java
@@ -42,9 +42,6 @@ import org.apache.geode.test.junit.categories.DistributedTest;
 public class DeltaFaultInDUnitTest extends JUnit4CacheTestCase {
 
 
-  /**
-   * @param name
-   */
   public DeltaFaultInDUnitTest() {
     super();
   }
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java
index 1716aab..f81b1f0 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaPropagationDUnitTest.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.distributed.ConfigurationProperties.CONFLATE_EVENTS;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaPropagationStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaPropagationStatsDUnitTest.java
index c337f5b..12817df 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaPropagationStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaPropagationStatsDUnitTest.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.distributed.ConfigurationProperties.*;
@@ -120,7 +117,6 @@ public class DeltaPropagationStatsDUnitTest extends JUnit4DistributedTestCase {
   /**
    * No error or resending of delta.
    *
-   * @throws Exception
    */
   @Test
   public void testS2CDeltaPropagationCleanStats() throws Exception {
@@ -147,7 +143,6 @@ public class DeltaPropagationStatsDUnitTest extends JUnit4DistributedTestCase {
   /**
    * Simulates error in fromDelta() and toDelta()
    *
-   * @throws Exception
    */
   @Test
   public void testS2CDeltaPropagationFailedStats1() throws Exception {
@@ -177,7 +172,6 @@ public class DeltaPropagationStatsDUnitTest extends JUnit4DistributedTestCase {
   /**
    * Simulates old value null, entry null, InvalidDeltaExeption
    *
-   * @throws Exception
    */
   @Ignore("TODO")
   @Test
@@ -186,7 +180,6 @@ public class DeltaPropagationStatsDUnitTest extends JUnit4DistributedTestCase {
   /**
    * No error or resending of delta.
    *
-   * @throws Exception
    */
   @Test
   public void testP2PDeltaPropagationCleanStats() throws Exception {
@@ -216,7 +209,6 @@ public class DeltaPropagationStatsDUnitTest extends JUnit4DistributedTestCase {
   /**
    * Simulates error in fromDelta()
    *
-   * @throws Exception
    */
   @Test
   public void testP2PDeltaPropagationFailedStats1() throws Exception {
@@ -252,7 +244,6 @@ public class DeltaPropagationStatsDUnitTest extends JUnit4DistributedTestCase {
   /**
    * Simulates old value null, entry null
    *
-   * @throws Exception
    */
   @Ignore("TODO")
   @Test
@@ -261,7 +252,6 @@ public class DeltaPropagationStatsDUnitTest extends JUnit4DistributedTestCase {
   /**
    * No error or resending of delta.
    *
-   * @throws Exception
    */
   @Test
   public void testC2SDeltaPropagationCleanStats() throws Exception {
@@ -293,7 +283,6 @@ public class DeltaPropagationStatsDUnitTest extends JUnit4DistributedTestCase {
   /**
    * Simulates error in fromDelta() and toDelta()
    *
-   * @throws Exception
    */
   @Test
   public void testC2SDeltaPropagationFailedStats1() throws Exception {
@@ -324,7 +313,6 @@ public class DeltaPropagationStatsDUnitTest extends JUnit4DistributedTestCase {
   /**
    * Simulates old value null, entry null
    *
-   * @throws Exception
    */
   @Ignore("TODO")
   @Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaSizingDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaSizingDUnitTest.java
index 2867541..10fdbca 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaSizingDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DeltaSizingDUnitTest.java
@@ -40,15 +40,9 @@ import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
 import org.apache.geode.test.junit.categories.DistributedTest;
 
-/**
- *
- */
 @Category(DistributedTest.class)
 public class DeltaSizingDUnitTest extends JUnit4CacheTestCase {
 
-  /**
-   * @param name
-   */
   public DeltaSizingDUnitTest() {
     super();
   }
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
index 534267a..725863d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/GIIDeltaDUnitTest.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.junit.Assert.*;
@@ -67,9 +64,6 @@ public class GIIDeltaDUnitTest extends JUnit4CacheTestCase {
   protected IgnoredException expectedEx;
   static Object giiSyncObject = new Object();
 
-  /**
-   * @param name
-   */
   public GIIDeltaDUnitTest() {
     super();
   }
@@ -1921,7 +1915,6 @@ public class GIIDeltaDUnitTest extends JUnit4CacheTestCase {
    * Test the case where a member has an untrusted RVV and still initializes from the local data.
    * See bug 48066
    *
-   * @throws Throwable
    */
   @Test
   public void testRecoverFromUntrustedRVV() throws Throwable {
@@ -1997,7 +1990,6 @@ public class GIIDeltaDUnitTest extends JUnit4CacheTestCase {
    * Test case to make sure that if a tombstone GC occurs during a full GII, we still have the
    * correct RVV on the GII recipient at the end.
    *
-   * @throws Throwable
    */
   @Category(FlakyTest.class) // GEODE-1137: orphaned AsyncInvocations, time sensitive, GC,
                              // waitForCriterion, thread unsafe test hooks/observers, expiration
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/GIIFlowControlDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/GIIFlowControlDUnitTest.java
index 7b2cc28..a6508a0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/GIIFlowControlDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/GIIFlowControlDUnitTest.java
@@ -45,9 +45,6 @@ import org.apache.geode.test.dunit.WaitCriterion;
 import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
 import org.apache.geode.test.junit.categories.DistributedTest;
 
-/**
- *
- */
 @Category(DistributedTest.class)
 public class GIIFlowControlDUnitTest extends JUnit4CacheTestCase {
 
@@ -57,9 +54,6 @@ public class GIIFlowControlDUnitTest extends JUnit4CacheTestCase {
   private static int origNumChunks = InitialImageOperation.CHUNK_PERMITS;
   protected static FlowControlObserver observer;
 
-  /**
-   * @param name
-   */
   public GIIFlowControlDUnitTest() {
     super();
   }
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/HAOverflowMemObjectSizerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
index 7bf3fbc..1ca8dc2 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/HAOverflowMemObjectSizerDUnitTest.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.distributed.ConfigurationProperties.*;
@@ -273,7 +270,6 @@ public class HAOverflowMemObjectSizerDUnitTest extends JUnit4DistributedTestCase
   /**
    * perform put on server region that will put entries on CMR region
    *
-   * @param lowerLimit
    * @param higerlimit - lower and upper limit on put
    */
   public static void performPut(Long lowerLimit, Long higerlimit) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/InterruptClientServerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/InterruptClientServerDUnitTest.java
index f6fb8d4..76844e4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/InterruptClientServerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/InterruptClientServerDUnitTest.java
@@ -75,7 +75,6 @@ public class InterruptClientServerDUnitTest extends JUnit4CacheTestCase {
   /**
    * A simple test case that we are actually persisting with a PR.
    *
-   * @throws Throwable
    */
   @Test
   public void testClientPutWithInterrupt() throws Throwable {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/InterruptsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/InterruptsDUnitTest.java
index 51c2659..40f5808 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/InterruptsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/InterruptsDUnitTest.java
@@ -68,7 +68,6 @@ public class InterruptsDUnitTest extends JUnit4CacheTestCase {
   /**
    * A simple test case that we are actually persisting with a PR.
    *
-   * @throws Throwable
    */
   @Test
   public void testDRPutWithInterrupt() throws Throwable {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/IteratorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/IteratorDUnitTest.java
index 2f105e9..7d185e5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/IteratorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/IteratorDUnitTest.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.junit.Assert.*;
@@ -39,9 +36,6 @@ import org.apache.geode.test.junit.categories.DistributedTest;
 @Category(DistributedTest.class)
 public class IteratorDUnitTest extends JUnit4CacheTestCase {
 
-  /**
-   * @param name
-   */
   public IteratorDUnitTest() {
     super();
   }
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
index 3b5d7d7..2512114 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
@@ -75,7 +75,6 @@ public class LIFOEvictionAlgoEnabledRegionJUnitTest {
   /**
    * Method for intializing the VM and create region with LIFO attached
    *
-   * @throws Exception
    */
   private static void initializeVM() throws Exception {
     Properties props = new Properties();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/MapInterface2JUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/MapInterface2JUnitTest.java
index 9d29796..484a7d9 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/MapInterface2JUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/MapInterface2JUnitTest.java
@@ -42,10 +42,6 @@ import org.apache.geode.internal.util.StopWatch;
 import org.apache.geode.test.dunit.ThreadUtils;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 
-/**
- *
- *
- */
 @Category(IntegrationTest.class)
 public class MapInterface2JUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogJUnitTest.java
index 1b920da..e5491b0 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogJUnitTest.java
@@ -466,8 +466,6 @@ public class OplogJUnitTest extends DiskRegionTestingBase {
 
   }
 
-  /**
-   */
   @Test
   public void testConflation() throws Exception {
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java
index abdd811..423e7cc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionCreationJUnitTest.java
@@ -312,7 +312,6 @@ public class PartitionedRegionCreationJUnitTest {
    * (4) Test if PARTITIONED_REGION_CONFIG_NAME exist and isDistributedAck and the mirror type is
    * MirrorType.KEYS_VALUES.
    *
-   * @throws RegionExistsException
    */
   @Test
   public void test002PartionedRegionInitialization() throws RegionExistsException {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionInvalidateDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionInvalidateDUnitTest.java
index e7ecf64..aac95d4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionInvalidateDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionInvalidateDUnitTest.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.junit.Assert.*;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
index 2f2a974..4b09750 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.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.distributed.ConfigurationProperties.*;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsJUnitTest.java
index e497d1e..61e6221 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsJUnitTest.java
@@ -46,9 +46,6 @@ import org.apache.geode.cache.PartitionedRegionStorageException;
 import org.apache.geode.cache.RegionExistsException;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 
-/**
- *
- */
 @Category(IntegrationTest.class)
 public class PartitionedRegionStatsJUnitTest {
   private static final File DISK_DIR = new File("PRStatsTest");
@@ -113,7 +110,6 @@ public class PartitionedRegionStatsJUnitTest {
    * This test verifies that PR statistics are working properly for single/multiple
    * PartitionedRegions on single node.
    *
-   * @throws Exception
    */
   @Test
   public void testStats() throws Exception {
@@ -266,7 +262,6 @@ public class PartitionedRegionStatsJUnitTest {
    * This test verifies that PR statistics are working properly for single/multiple
    * PartitionedRegions on single node.
    *
-   * @throws Exception
    */
   @Test
   public void testOverflowStats() throws Exception {
@@ -288,7 +283,6 @@ public class PartitionedRegionStatsJUnitTest {
    * This test verifies that PR statistics are working properly for single/multiple
    * PartitionedRegions on single node.
    *
-   * @throws Exception
    */
   @Test
   public void testPersistOverflowStats() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTestHelper.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTestHelper.java
index 06fb8dd..0f9c827 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTestHelper.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionTestHelper.java
@@ -44,9 +44,6 @@ public class PartitionedRegionTestHelper
    * This method creates a partitioned region with all the default values. The cache created is a
    * loner, so this is only suitable for single VM tests.
    *
-   * @param regionname
-   * @return region
-   * @throws RegionExistsException
    */
 
   public static Region createPartionedRegion(String regionname) throws RegionExistsException {
@@ -179,9 +176,6 @@ public class PartitionedRegionTestHelper
   /**
    * This function is used to create serializable object for the partition region test.
    *
-   * @param name
-   * @param id
-   * @return
    */
   public static SerializableObject createPRSerializableObject(String name, int id) {
     Object obj = new SerializableObject(name, id);
@@ -193,7 +187,6 @@ public class PartitionedRegionTestHelper
    * This method creates cache. The cache created is a loner, so this is only suitable for single VM
    * tests.
    *
-   * @return
    */
   public static synchronized InternalCache createCache() {
     if (cache == null) {
@@ -227,8 +220,6 @@ public class PartitionedRegionTestHelper
   /**
    * This method is used to return existing region.
    *
-   * @param PRName
-   * @return
    */
   public static Region getExistingRegion(String PRName) {
     createCache();
@@ -239,7 +230,6 @@ public class PartitionedRegionTestHelper
    * Gets the log writer for the The cache created is a loner, so this is only suitable for single
    * VM tests.
    *
-   * @return LogWriter
    */
   public static LogWriter getLogger() {
     return createCache().getLogger();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/RegionEntryFlagsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/RegionEntryFlagsJUnitTest.java
index 3270ef2..7846de0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/RegionEntryFlagsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/RegionEntryFlagsJUnitTest.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.junit.Assert.*;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/SizingFlagDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/SizingFlagDUnitTest.java
index 3b8f477..1e1b903 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/SizingFlagDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/SizingFlagDUnitTest.java
@@ -68,9 +68,6 @@ import org.apache.geode.test.junit.categories.DistributedTest;
 @Category(DistributedTest.class)
 public class SizingFlagDUnitTest extends JUnit4CacheTestCase {
 
-  /**
-   * @param name
-   */
   public SizingFlagDUnitTest() {
     super();
   }
@@ -647,10 +644,6 @@ public class SizingFlagDUnitTest extends JUnit4CacheTestCase {
     }
   }
 
-  /**
-   * @param vm0
-   * @return
-   */
   private long getSizeFromPRStats(VM vm0) {
     return (Long) vm0.invoke(new SerializableCallable() {
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/SystemFailureDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/SystemFailureDUnitTest.java
index e874f29..77ddef0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/SystemFailureDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/SystemFailureDUnitTest.java
@@ -90,8 +90,6 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
 
   /**
    * @see OutOfMemoryError
-   * @throws CacheException
-   * @throws InterruptedException
    */
   @Ignore("TODO")
   @Test
@@ -112,8 +110,6 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
 
   /**
    * @see OutOfMemoryError
-   * @throws CacheException
-   * @throws InterruptedException
    */
   @Ignore("TODO")
   @Test
@@ -135,8 +131,6 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
 
   /**
    * @see OutOfMemoryError
-   * @throws CacheException
-   * @throws InterruptedException
    */
   @Ignore("TODO")
   @Test
@@ -158,8 +152,6 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
 
   /**
    * @see InternalError
-   * @throws CacheException
-   * @throws InterruptedException
    */
   @Ignore("TODO")
   @Test
@@ -179,8 +171,6 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
 
   /**
    * @see UnknownError
-   * @throws CacheException
-   * @throws InterruptedException
    */
   @Ignore("TODO")
   @Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplJUnitTest.java
index 73745f9..ad2f299 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplJUnitTest.java
@@ -70,7 +70,6 @@ public class TXManagerImplJUnitTest {
   /**
    * two threads suspend and resume a single transaction, while making changes.
    *
-   * @throws Exception
    */
   @Test
   public void testSuspendResume() throws Exception {
@@ -254,7 +253,6 @@ public class TXManagerImplJUnitTest {
   /**
    * test that timeout of Long.MAX_VALUE does not return immediately
    *
-   * @throws Exception
    */
   @Test
   public void testWaitForever() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TestUtils.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TestUtils.java
index 0237b52..d3dde21 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TestUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TestUtils.java
@@ -18,9 +18,6 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-/**
- *
- */
 public class TestUtils {
   public static <T> Set<T> asSet(T... objects) {
     return new HashSet<T>(Arrays.asList(objects));
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TombstoneCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TombstoneCreationJUnitTest.java
index 6de8cbe..604685e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TombstoneCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TombstoneCreationJUnitTest.java
@@ -87,7 +87,6 @@ public class TombstoneCreationJUnitTest {
    * before a Destroy thread gets it. The Destroy thread did not apply its operation but threw an
    * EntryNotFoundException. It is supposed to create a Tombstone.
    *
-   * @throws Exception
    */
   @Test
   public void testConcurrentCreateAndDestroy() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/TransactionsWithDeltaDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/TransactionsWithDeltaDUnitTest.java
index c4f0e5a..6c8bf54 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/TransactionsWithDeltaDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/TransactionsWithDeltaDUnitTest.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.distributed.ConfigurationProperties.*;
@@ -49,9 +46,6 @@ import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
 import org.apache.geode.test.junit.categories.DistributedTest;
 
-/**
- *
- */
 @Category(DistributedTest.class)
 public class TransactionsWithDeltaDUnitTest extends JUnit4CacheTestCase {
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/UpdateVersionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/UpdateVersionJUnitTest.java
index 470557a..1a6b029 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/UpdateVersionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/UpdateVersionJUnitTest.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.distributed.ConfigurationProperties.MCAST_PORT;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
index 8fdde17..6b431f2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
@@ -34,8 +34,6 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 
-/**
- */
 @Category(IntegrationTest.class)
 public class MemoryMonitorOffHeapJUnitTest {
   private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java
index 4695a52..6224379 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/control/RebalanceOperationDUnitTest.java
@@ -453,7 +453,6 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
    * Test that we correctly use the redundancy-zone property to determine where to place redundant
    * copies of a buckets.
    *
-   * @param simulate
    */
   public void enforceZone(final boolean simulate) {
 
@@ -815,11 +814,6 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
     return doRebalance(simulate, manager, null, null);
   }
 
-  /**
-   * @param simulate
-   * @param manager
-   * @return
-   */
   private RebalanceResults doRebalance(final boolean simulate, ResourceManager manager,
       Set<String> includes, Set<String> excludes) {
     RebalanceResults results = null;
@@ -1658,7 +1652,6 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
   /**
    * Check to make sure that we balance buckets between two hosts with no redundancy.
    *
-   * @param simulate
    */
   public void moveBucketsNoRedundancy(final boolean simulate) {
     Host host = Host.getHost(0);
@@ -1789,7 +1782,6 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
   /**
    * Check to make sure that we balance buckets between two hosts with no redundancy.
    *
-   * @param simulate
    */
   public void filterRegions(final boolean simulate) {
     Host host = Host.getHost(0);
@@ -2383,7 +2375,6 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
    * Test to make sure that we move buckets to balance between three hosts with a redundancy of 1
    * and two colocated regions. Makes sure that the buckets stay colocated when we move them.
    *
-   * @param simulate
    */
   public void moveBucketsColocatedRegions(final boolean simulate) {
     Host host = Host.getHost(0);
@@ -2506,7 +2497,6 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
   /**
    * Test to make sure that moving primaries waits for a put
    *
-   * @throws Exception
    */
   @Test
   public void testWaitForPut() throws Exception {
@@ -2520,7 +2510,6 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
   /**
    * Test to make sure that moving primaries waits for a put
    *
-   * @throws Exception
    */
   @Test
   public void testWaitForInvalidate() throws Exception {
@@ -2534,7 +2523,6 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
   /**
    * Test to make sure that moving primaries waits for a put
    *
-   * @throws Exception
    */
   @Test
   public void testWaitForDestroy() throws Exception {
@@ -2548,7 +2536,6 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
   /**
    * Test to make sure that moving primaries waits for a put
    *
-   * @throws Exception
    */
   @Test
   public void testWaitForCacheLoader() throws Exception {
@@ -2564,7 +2551,6 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
   /**
    * Test to ensure that we wait for in progress write operations before moving a primary.
    *
-   * @throws Exception
    */
   public void runTestWaitForOperation(final Operation op) throws Exception {
     Host host = Host.getHost(0);
@@ -2996,7 +2982,6 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
   /**
    * Check to make sure that we balance buckets between two hosts with no redundancy.
    *
-   * @param simulate
    */
   public void balanceBucketsByCount(final boolean simulate) {
     Host host = Host.getHost(0);
@@ -3120,7 +3105,6 @@ public class RebalanceOperationDUnitTest extends JUnit4CacheTestCase {
   /**
    * Test to ensure that we wait for in progress write operations before moving a primary.
    *
-   * @throws CancellationException
    */
   public void moveBucketsWithUnrecoveredValuesRedundancy(final boolean simulate) {
     Host host = Host.getHost(0);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowAsyncRollingOpLogJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowAsyncRollingOpLogJUnitTest.java
index 5f6bcda..a3d634b 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowAsyncRollingOpLogJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowAsyncRollingOpLogJUnitTest.java
@@ -191,8 +191,6 @@ public class DiskRegionOverflowAsyncRollingOpLogJUnitTest extends DiskRegionTest
   /**
    * getLRUStats
    *
-   * @param region1
-   * @return
    */
   protected EvictionCounters getLRUStats(Region region1) {
     return ((LocalRegion) region1).getEvictionController().getCounters();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowSyncRollingOpLogJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowSyncRollingOpLogJUnitTest.java
index b3d7c74..fb11f95 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowSyncRollingOpLogJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/diskPerf/DiskRegionOverflowSyncRollingOpLogJUnitTest.java
@@ -177,11 +177,6 @@ public class DiskRegionOverflowSyncRollingOpLogJUnitTest extends DiskRegionTesti
 
   }
 
-  /**
-   *
-   * @param region1
-   * @return
-   */
   protected EvictionCounters getLRUStats(Region region1) {
     return ((LocalRegion) region1).getEvictionController().getCounters();
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/CustomerIDPartitionResolver.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/CustomerIDPartitionResolver.java
index 14f7603..ae006fc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/CustomerIDPartitionResolver.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/CustomerIDPartitionResolver.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.execute;
 
 import java.io.Serializable;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetIndexingDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetIndexingDUnitTest.java
index 3d21bfb..b33cc52 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetIndexingDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/LocalDataSetIndexingDUnitTest.java
@@ -54,10 +54,6 @@ import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
 import org.apache.geode.test.junit.categories.DistributedTest;
 import org.apache.geode.test.junit.categories.FunctionServiceTest;
 
-/**
- *
- *
- */
 @Category({DistributedTest.class, FunctionServiceTest.class})
 public class LocalDataSetIndexingDUnitTest extends JUnit4CacheTestCase {
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
index 79cef38..9eebcc1 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
@@ -88,7 +88,6 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
   /**
    * Test the execution of function on all memebers haveResults = true
    *
-   * @throws Exception
    */
   @Test
   public void testRemoteMultiKeyExecution() throws Exception {
@@ -134,7 +133,6 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
   /**
    * Test the execution of function on all memebers haveResults = true
    *
-   * @throws Exception
    */
   @Test
   public void testRemoteMultiKeyExecution_InlineFunction() throws Exception {
@@ -221,7 +219,6 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
   /**
    * Test the execution of function on all memebers haveResults = false
    *
-   * @throws Exception
    */
   @Test
   public void testRemoteMultiKeyExecutionNoResult() throws Exception {
@@ -232,7 +229,6 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
   /**
    * Test the execution of function on local memebers haveResults = true
    *
-   * @throws Exception
    */
   @Test
   public void testRemoteMultiKeyExecutiononLocalMember() throws Exception {
@@ -243,7 +239,6 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
   /**
    * Test the execution of function on local memebers haveResults = true
    *
-   * @throws Exception
    */
   @Test
   public void testRemoteMultiKeyExecutiononLocalMember_InlineFunction() throws Exception {
@@ -255,7 +250,6 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
   /**
    * Test the execution of function on other memebers haveResults = true
    *
-   * @throws Exception
    */
   @Test
   public void testRemoteMultiKeyExecutiononOtherMembers() throws Exception {
@@ -266,7 +260,6 @@ public class MemberFunctionExecutionDUnitTest extends JUnit4CacheTestCase {
   /**
    * Test the execution of function on other memebers haveResults = true
    *
-   * @throws Exception
    */
   @Test
   public void testRemoteMultiKeyExecutiononOtherMembers_InlineFunction() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MyFunctionExecutionException.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MyFunctionExecutionException.java
index 06f2b07..97fea75 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MyFunctionExecutionException.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MyFunctionExecutionException.java
@@ -26,7 +26,6 @@ public class MyFunctionExecutionException extends RuntimeException {
   /**
    * Creates new exception with given error message.
    *
-   * @param msg
    */
   public MyFunctionExecutionException(String msg) {
     super(msg);
@@ -35,8 +34,6 @@ public class MyFunctionExecutionException extends RuntimeException {
   /**
    * Creates new exception with given error message and optional nested exception.
    *
-   * @param msg
-   * @param cause
    */
   public MyFunctionExecutionException(String msg, Throwable cause) {
     super(msg, cause);
@@ -45,7 +42,6 @@ public class MyFunctionExecutionException extends RuntimeException {
   /**
    * Creates new exception given Throwable as a cause and source of error message.
    *
-   * @param cause
    */
   public MyFunctionExecutionException(Throwable cause) {
     super(cause);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
index eb123a2..2d398ca 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerFunctionExecutionNoAckDUnitTest.java
@@ -36,9 +36,6 @@ import org.apache.geode.test.junit.categories.FunctionServiceTest;
 
 @Category({DistributedTest.class, ClientServerTest.class, FunctionServiceTest.class})
 public class PRClientServerFunctionExecutionNoAckDUnitTest extends PRClientServerTestBase {
-  /**
-   *
-   */
   private static final String TEST_FUNCTION1 = TestFunction.TEST_FUNCTION1;
 
   Boolean isByName = null;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java
index 2eb737f..c8a9393 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java
@@ -1278,7 +1278,6 @@ public class PRColocationDUnitTest extends JUnit4CacheTestCase {
    * Member 2: PR2 is not colocated <br>
    * Should throw IllegalStateException
    *
-   * @throws Throwable
    */
   @Test
   public void testColocationPartitionedRegionWithNullColocationSpecifiedOnOneNode()
@@ -1427,7 +1426,6 @@ public class PRColocationDUnitTest extends JUnit4CacheTestCase {
   /**
    * Confirm that the redundancy must be the same for colocated partitioned regions
    *
-   * @throws Exception
    */
   @Test
   public void testRedundancyRestriction() throws Exception {
@@ -1462,7 +1460,6 @@ public class PRColocationDUnitTest extends JUnit4CacheTestCase {
    * Tests to make sure that a VM will not make copies of any buckets for a region until all of the
    * colocated regions are created.
    *
-   * @throws Throwable
    */
   @Test
   public void testColocatedPRRedundancyRecovery() throws Throwable {
@@ -1779,7 +1776,6 @@ public class PRColocationDUnitTest extends JUnit4CacheTestCase {
    * A parent region is populated with buckets. Then the child region is created simultaneously on
    * several nodes.
    *
-   * @throws Throwable
    */
   @Test
   public void testSimulaneousChildRegionCreation() throws Throwable {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java
index ad7b9b5..bfb53d5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRTransactionDUnitTest.java
@@ -903,7 +903,6 @@ public class PRTransactionDUnitTest extends PRColocationDUnitTest {
   /**
    * verify that 10 orders are created for each customer
    *
-   * @throws ClassNotFoundException
    */
   public static void validatePRTXInCacheListener() throws ClassNotFoundException {
     PartitionedRegion customerPartitionedregion = null;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/CustId.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/CustId.java
index 8ef1a5c..d643762 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/CustId.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/CustId.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.execute.data;
 
 import java.io.DataInput;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Customer.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Customer.java
index 46c4d85..7774ab1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Customer.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Customer.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.execute.data;
 
 import java.io.DataInput;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Order.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Order.java
index 3d1c8b5..85121e0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Order.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Order.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.execute.data;
 
 import java.io.DataInput;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/OrderId.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/OrderId.java
index 151441f..d5c1faf 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/OrderId.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/OrderId.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.execute.data;
 
 import java.io.DataInput;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Shipment.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Shipment.java
index 8de72e0..f7b873b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Shipment.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Shipment.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.execute.data;
 
 import java.io.DataInput;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/ShipmentId.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/ShipmentId.java
index 7bdfcdf..803b3c1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/ShipmentId.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/ShipmentId.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.execute.data;
 
 import java.io.DataInput;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AlterMockCacheExtensionFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AlterMockCacheExtensionFunction.java
index b5b03ba..7f11e00 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AlterMockCacheExtensionFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AlterMockCacheExtensionFunction.java
@@ -83,8 +83,6 @@ public class AlterMockCacheExtensionFunction implements Function, DataSerializab
   }
 
   /**
-   * @param value
-   * @return
    * @since GemFire 8.1
    */
   public static Object[] toArgs(final String value) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AlterMockRegionExtensionFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AlterMockRegionExtensionFunction.java
index 78fb50e..255f151 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AlterMockRegionExtensionFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/AlterMockRegionExtensionFunction.java
@@ -96,9 +96,6 @@ public class AlterMockRegionExtensionFunction implements Function, DataSerializa
   }
 
   /**
-   * @param regionName
-   * @param value
-   * @return
    * @since GemFire 8.1
    */
   public static Object[] toArgs(final String regionName, final String value) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/CreateMockCacheExtensionFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/CreateMockCacheExtensionFunction.java
index 5fec492..bb8a12f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/CreateMockCacheExtensionFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/CreateMockCacheExtensionFunction.java
@@ -80,8 +80,6 @@ public class CreateMockCacheExtensionFunction implements Function, DataSerializa
   }
 
   /**
-   * @param value
-   * @return
    * @since GemFire 8.1
    */
   public static Object[] toArgs(final String value) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/CreateMockRegionExtensionFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/CreateMockRegionExtensionFunction.java
index 05597eb..50542c0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/CreateMockRegionExtensionFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/CreateMockRegionExtensionFunction.java
@@ -93,9 +93,6 @@ public class CreateMockRegionExtensionFunction implements Function, DataSerializ
   }
 
   /**
-   * @param regionName
-   * @param value
-   * @return
    * @since GemFire 8.1
    */
   public static Object[] toArgs(final String regionName, final String value) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java
index f8d8918..a414442 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/DestroyMockCacheExtensionFunction.java
@@ -82,8 +82,6 @@ public class DestroyMockCacheExtensionFunction implements Function, DataSerializ
   }
 
   /**
-   * @param value
-   * @return
    * @since GemFire 8.1
    */
   public static Object[] toArgs(final String value) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/DestroyMockRegionExtensionFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/DestroyMockRegionExtensionFunction.java
index 08db27d..17e09c5 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/DestroyMockRegionExtensionFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/DestroyMockRegionExtensionFunction.java
@@ -92,8 +92,6 @@ public class DestroyMockRegionExtensionFunction implements Function, DataSeriali
   }
 
   /**
-   * @param regionName
-   * @return
    * @since GemFire 8.1
    */
   public static Object[] toArgs(final String regionName) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java
index e9eabc6..9c3c1e5 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQAddOperationJUnitTest.java
@@ -47,10 +47,6 @@ public class BlockingHARQAddOperationJUnitTest extends HARQAddOperationJUnitTest
    * Creates Blocking HA region-queue object
    *
    * @return Blocking HA region-queue object
-   * @throws IOException
-   * @throws ClassNotFoundException
-   * @throws CacheException
-   * @throws InterruptedException
    */
   protected HARegionQueue createHARegionQueue(String name)
       throws IOException, ClassNotFoundException, CacheException, InterruptedException {
@@ -63,10 +59,6 @@ public class BlockingHARQAddOperationJUnitTest extends HARQAddOperationJUnitTest
    * Creates Blocking HA region-queue object
    *
    * @return Blocking HA region-queue object
-   * @throws IOException
-   * @throws ClassNotFoundException
-   * @throws CacheException
-   * @throws InterruptedException
    */
   protected HARegionQueue createHARegionQueue(String name, HARegionQueueAttributes attrs)
       throws IOException, ClassNotFoundException, CacheException, InterruptedException {
@@ -78,7 +70,6 @@ public class BlockingHARQAddOperationJUnitTest extends HARQAddOperationJUnitTest
   /**
    * Tests the take() functionality of <code>BlockingHARegionQueue<code> with conflation disabled.
    *
-   * @throws Exception
    */
   @Test
   public void testBlockingTakeConflationDisabled() throws Exception {
@@ -91,7 +82,6 @@ public class BlockingHARQAddOperationJUnitTest extends HARQAddOperationJUnitTest
   /**
    * Tests the take() functionality of <code>BlockingHARegionQueue<code> with conflation enabled.
    *
-   * @throws Exception
    *
    */
   @Test
@@ -110,7 +100,6 @@ public class BlockingHARQAddOperationJUnitTest extends HARQAddOperationJUnitTest
    * 3)Do a put into the queue and verify that the take thread returns with the same object.
    *
    * @param conflationEnabled - whether conflation is enabled or not
-   * @throws Exception
    *
    */
   public void doBlockingTake(boolean conflationEnabled) throws Exception {
@@ -156,7 +145,6 @@ public class BlockingHARQAddOperationJUnitTest extends HARQAddOperationJUnitTest
    * 4)Verify both both take() threads return with an object by ensuring that the size of the list
    * containing return objects is two.<br>
    *
-   * @throws Exception
    *
    */
   @Test
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQStatsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQStatsJUnitTest.java
index 0b0fc56..75361e5 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQStatsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARQStatsJUnitTest.java
@@ -36,10 +36,6 @@ public class BlockingHARQStatsJUnitTest extends HARegionQueueStatsJUnitTest {
    *
    * @param name - name of the underlying region for region-queue
    * @return the BlockingHARegionQueue instance
-   * @throws IOException
-   * @throws ClassNotFoundException
-   * @throws CacheException
-   * @throws InterruptedException
    */
   protected HARegionQueue createHARegionQueue(String name)
       throws IOException, ClassNotFoundException, CacheException, InterruptedException {
@@ -54,10 +50,6 @@ public class BlockingHARQStatsJUnitTest extends HARegionQueueStatsJUnitTest {
    * @param name - name of the underlying region for region-queue
    * @param attrs - attributes for the BlockingHARegionQueue
    * @return the BlockingHARegionQueue instance
-   * @throws IOException
-   * @throws ClassNotFoundException
-   * @throws CacheException
-   * @throws InterruptedException
    */
   protected HARegionQueue createHARegionQueue(String name, HARegionQueueAttributes attrs)
       throws IOException, ClassNotFoundException, CacheException, InterruptedException {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAConflationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAConflationDUnitTest.java
index d7f11fb..881d444 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAConflationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAConflationDUnitTest.java
@@ -129,7 +129,6 @@ public class HAConflationDUnitTest extends JUnit4CacheTestCase {
   /**
    * In this test do a create & then update on same key , the client should receive 2 calabcks.
    *
-   * @throws Exception
    */
 
   @Test
@@ -146,7 +145,6 @@ public class HAConflationDUnitTest extends JUnit4CacheTestCase {
    * In this test do create , then update & update. The client should receive 2 callbacks , one for
    * create & one for the last update.
    *
-   * @throws Exception
    */
   @Test
   public void testConflationUpdate() throws Exception {
@@ -170,7 +168,6 @@ public class HAConflationDUnitTest extends JUnit4CacheTestCase {
    * In this test do create , then update, update, invalidate. The client should receive 3
    * callbacks, one for create one for the last update and one for the invalidate.
    *
-   * @throws Exception
    */
   @Test
   public void testConflationCreateUpdateInvalidate() throws Exception {
@@ -189,7 +186,6 @@ public class HAConflationDUnitTest extends JUnit4CacheTestCase {
    * In this test do a create , update , update & destroy. The client should receive 3 callbacks (
    * craete , conflated update & destroy).
    *
-   * @throws Exception
    */
   @Test
   public void testConflationCreateUpdateDestroy() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java
index 450f7b8..c15d33c 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HAExpiryDUnitTest.java
@@ -172,7 +172,6 @@ public class HAExpiryDUnitTest extends JUnit4DistributedTestCase {
   /**
    * This function checks the regionqueue size before expiration. size should be > 0.
    *
-   * @throws Exception
    */
   public static void checkSizeBeforeExpiration() throws Exception {
     HARegion regionForQueue = (HARegion) cache
@@ -198,7 +197,6 @@ public class HAExpiryDUnitTest extends JUnit4DistributedTestCase {
   /**
    * This function checks the regionqueue size After expiration. size should be = 0.
    *
-   * @throws Exception
    */
   public static void checkSizeAfterExpiration() throws Exception {
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java
index aeac374..17ea933 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionDUnitTest.java
@@ -80,8 +80,6 @@ public class HARegionDUnitTest extends JUnit4DistributedTestCase {
   /**
    * create cache
    *
-   * @return
-   * @throws Exception
    */
   private InternalCache createCache() throws Exception {
     Properties props = new Properties();
@@ -207,7 +205,6 @@ public class HARegionDUnitTest extends JUnit4DistributedTestCase {
   /**
    * create a client with 2 regions sharing a common writer
    *
-   * @throws Exception
    */
 
   public static void createRegion() throws Exception {
@@ -223,12 +220,6 @@ public class HARegionDUnitTest extends JUnit4DistributedTestCase {
 
   // private static int counter = 0;
 
-  /**
-   *
-   *
-   * @throws Exception
-   */
-
   public static void createRegionQueue() throws Exception {
     HARegionDUnitTest test = new HARegionDUnitTest();
     cache = test.createCache();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java
index 53468bc..a76d3b2 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueStatsJUnitTest.java
@@ -78,10 +78,6 @@ public class HARegionQueueStatsJUnitTest {
    *
    * @param name - name of the underlying region for region-queue
    * @return the HARegionQueue instance
-   * @throws IOException
-   * @throws ClassNotFoundException
-   * @throws CacheException
-   * @throws InterruptedException
    */
   protected HARegionQueue createHARegionQueue(String name)
       throws IOException, ClassNotFoundException, CacheException, InterruptedException {
@@ -96,10 +92,6 @@ public class HARegionQueueStatsJUnitTest {
    * @param name - name of the underlying region for region-queue
    * @param attrs - attributes for the HARegionQueue
    * @return the HARegionQueue instance
-   * @throws IOException
-   * @throws ClassNotFoundException
-   * @throws CacheException
-   * @throws InterruptedException
    */
   protected HARegionQueue createHARegionQueue(String name, HARegionQueueAttributes attrs)
       throws IOException, ClassNotFoundException, CacheException, InterruptedException {
@@ -426,7 +418,6 @@ public class HARegionQueueStatsJUnitTest {
    * 5)Verify that eventsEnqued stats is same as the queue size ( i.e. eventsEnqued stats is not
    * updated for duplicate events.)
    *
-   * @throws Exception
    */
   @Test
   public void testSequenceViolationStats() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/PutAllDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/PutAllDUnitTest.java
index 1c9e972..52a5a5a 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/PutAllDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/PutAllDUnitTest.java
@@ -338,7 +338,6 @@ public class PutAllDUnitTest extends JUnit4DistributedTestCase {
    * entry (on the client side) and returns the eventId stored in the map 6) verifies the equality
    * of the two event ids
    *
-   * @throws Exception
    */
   @Test
   public void testPutAll() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/StatsBugDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/StatsBugDUnitTest.java
index 20f3bcc..e039b46 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/StatsBugDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/StatsBugDUnitTest.java
@@ -301,7 +301,6 @@ public class StatsBugDUnitTest extends JUnit4DistributedTestCase {
   /**
    * Prepopulate the client with the entries that will be done by cache-servers
    *
-   * @throws Exception
    */
   public static void prepopulateClient() throws Exception {
     doEntryOperations(primaryPrefix);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/TestBlockingHARegionQueue.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/TestBlockingHARegionQueue.java
index 45100a3..2bc8724 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/TestBlockingHARegionQueue.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/TestBlockingHARegionQueue.java
@@ -51,8 +51,6 @@ public class TestBlockingHARegionQueue extends HARegionQueue.TestOnlyHARegionQue
   /**
    * Does a put and a notifyAll() multiple threads can possibly be waiting on this queue to put
    *
-   * @throws CacheException
-   * @throws InterruptedException
    *
    * @return boolean whether object was successfully put onto the queue
    */
@@ -75,7 +73,6 @@ public class TestBlockingHARegionQueue extends HARegionQueue.TestOnlyHARegionQue
    * blocking peek. This method will not return till it has acquired a legitimate object from teh
    * queue.
    *
-   * @throws InterruptedException
    */
 
   public Object peek() throws InterruptedException {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug39356DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug39356DUnitTest.java
index c65a198..d6b9ee8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug39356DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug39356DUnitTest.java
@@ -142,9 +142,6 @@ public class Bug39356DUnitTest extends JUnit4CacheTestCase {
   protected class MyRegionObserver extends DistributionMessageObserver implements Serializable {
     private final VM vm0;
 
-    /**
-     * @param vm0
-     */
     MyRegionObserver(VM vm0) {
       this.vm0 = vm0;
     }
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug51400DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug51400DUnitTest.java
index 428ba5c..907b28c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug51400DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug51400DUnitTest.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.partitioned;
 
 import static org.apache.geode.distributed.ConfigurationProperties.*;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ElidedPutAllDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ElidedPutAllDUnitTest.java
index 8e10dd3..14cfa3b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ElidedPutAllDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/ElidedPutAllDUnitTest.java
@@ -44,9 +44,6 @@ import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
 import org.apache.geode.test.junit.categories.DistributedTest;
 
 
-/**
- *
- */
 @Category(DistributedTest.class)
 public class ElidedPutAllDUnitTest extends JUnit4CacheTestCase {
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java
index e8febe7..6505638 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionResolverDUnitTest.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.partitioned;
 
 import static org.junit.Assert.*;
@@ -69,9 +66,6 @@ public class PartitionResolverDUnitTest extends JUnit4CacheTestCase {
   VM datastore1;
   VM datastore2;
 
-  /**
-   * @param name
-   */
   public PartitionResolverDUnitTest() {
     super();
   }
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java
index 7525fa0..fa79fa1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionLoaderWriterDUnitTest.java
@@ -55,9 +55,6 @@ public class PartitionedRegionLoaderWriterDUnitTest extends JUnit4CacheTestCase
 
   private static Cache cache;
 
-  /**
-   * @param name
-   */
   public PartitionedRegionLoaderWriterDUnitTest() {
     super();
   }
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java
index 912485e..4805585 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PartitionedRegionMetaDataCleanupDUnitTest.java
@@ -33,9 +33,6 @@ import org.apache.geode.test.dunit.Wait;
 import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
 import org.apache.geode.test.junit.categories.DistributedTest;
 
-/**
- *
- */
 @Category(DistributedTest.class)
 public class PartitionedRegionMetaDataCleanupDUnitTest extends JUnit4CacheTestCase {
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
index 4abc7a3..b38edb8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
@@ -1609,7 +1609,6 @@ public class PersistentColocatedPartitionedRegionDUnitTest
    * Test that if we replace an offline member, even if colocated regions are in different disk
    * stores, we still keep our metadata consistent.
    *
-   * @throws Throwable
    */
   @Test
   public void testReplaceOfflineMemberAndRestartTwoDiskStores() throws Throwable {
@@ -1671,7 +1670,6 @@ public class PersistentColocatedPartitionedRegionDUnitTest
    * in the child PR the other members ended up waiting for the child bucket to be created in the
    * member that discarded it's offline data.
    *
-   * @throws Throwable
    */
   public void replaceOfflineMemberAndRestart(SerializableRunnable createPRs) throws Throwable {
     disconnectAllFromDS();
@@ -1895,7 +1893,6 @@ public class PersistentColocatedPartitionedRegionDUnitTest
    * In this test case, we're creating the child PR later, after the parent buckets have already
    * been completely created.
    *
-   * @throws Throwable
    */
   public void replaceOfflineMemberAndRestartCreateColocatedPRLate(
       SerializableRunnable createParentPR, SerializableRunnable createChildPR) throws Throwable {
@@ -2000,7 +1997,6 @@ public class PersistentColocatedPartitionedRegionDUnitTest
   /**
    * Test what happens when we crash in the middle of satisfying redundancy for a colocated bucket.
    *
-   * @throws Throwable
    */
   // This test method is disabled because it is failing
   // periodically and causing cruise control failures
@@ -2356,7 +2352,6 @@ public class PersistentColocatedPartitionedRegionDUnitTest
   /**
    * Test that a user is not allowed to change the colocation of a PR with persistent data.
    *
-   * @throws Throwable
    */
   @Category(FlakyTest.class) // GEODE-900: disk dependency, filesystem sensitive
   @Test
@@ -2604,7 +2599,6 @@ public class PersistentColocatedPartitionedRegionDUnitTest
    * Create three PRs on a VM, named region1, region2, and region3. The colocated with attribute
    * describes which region region3 should be colocated with.
    *
-   * @param colocatedWith
    */
   private void createColocatedPRs(final String colocatedWith) {
     Cache cache = getCache();
@@ -2634,7 +2628,6 @@ public class PersistentColocatedPartitionedRegionDUnitTest
    * Test for bug 43570. Rebalance a persistent parent PR before we recover the persistent child PR
    * from disk.
    *
-   * @throws Throwable
    */
   public void rebalanceWithOfflineChildRegion(SerializableRunnable createParentPR,
       SerializableRunnable createChildPR) throws Throwable {
@@ -2704,8 +2697,6 @@ public class PersistentColocatedPartitionedRegionDUnitTest
    *
    * @param createParentPR {@link SerializableRunnable} for creating the parent region on one member
    * @param createChildPR {@link SerializableRunnable} for creating the child region on one member
-   * @param concurrentCheckData
-   * @throws Throwable
    */
   public void regionGetWithOfflineChild(SerializableRunnable createParentPR,
       SerializableRunnable createChildPR, boolean concurrentCheckData) throws Throwable {
@@ -2799,8 +2790,6 @@ public class PersistentColocatedPartitionedRegionDUnitTest
    *
    * @param createParentPR {@link SerializableRunnable} for creating the parent region on one member
    * @param createChildPR {@link SerializableRunnable} for creating the child region on one member
-   * @param concurrentCreateData
-   * @throws Throwable
    */
   public void regionPutWithOfflineChild(SerializableRunnable createParentPR,
       SerializableRunnable createChildPR, boolean concurrentCreateData) throws Throwable {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
index 325496d..168a42c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
@@ -236,7 +236,6 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
   /**
    * Test to make sure that we can recover from a complete system shutdown with redundancy 0
    *
-   * @throws Throwable
    */
   @Test
   public void testTotalRecoverRedundancy0() throws Throwable {
@@ -246,7 +245,6 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
   /**
    * Test to make sure that we can recover from a complete system shutdown with redundancy 1
    *
-   * @throws Throwable
    */
   @Test
   public void testTotalRecoverRedundancy1() throws Throwable {
@@ -919,7 +917,6 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
   /**
    * Test to make sure that we recreate a bucket if a member is revoked
    *
-   * @throws Throwable
    */
   @Test
   public void testRevokedMemberRedundancy1() throws Throwable {
@@ -997,7 +994,6 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
    * Test to make sure that we recreate a bucket if a member is revoked, and that we do it
    * immediately if recovery delay is set to 0.
    *
-   * @throws Throwable
    */
   @Test
   public void testRevokedMemberRedundancy1ImmediateRecovery() throws Throwable {
@@ -1809,7 +1805,6 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
    * A test to make sure that we allow the PR to be used after at least one copy of every bucket is
    * recovered, but before the secondaries are initialized.
    *
-   * @throws Throwable
    */
   @Test
   public void testAllowRegionUseBeforeRedundancyRecovery() throws Throwable {
@@ -1981,7 +1976,6 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
    * In this test case, we bring the GII down before we bring the source back up, to make sure the
    * source still discovers that the GII target is no longer hosting the bucket.
    *
-   * @throws InterruptedException
    */
   @Test
   public void testCrashDuringBucketGII2() throws InterruptedException {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
index 8042c59..2346bc4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
@@ -156,7 +156,6 @@ public class PersistentRecoveryOrderDUnitTest extends PersistentReplicatedTestBa
   /**
    * Tests to make sure that we stop waiting for a member that we revoke.
    *
-   * @throws Exception
    */
   @Test
   public void testRevokeAMember() throws Exception {
@@ -292,7 +291,6 @@ public class PersistentRecoveryOrderDUnitTest extends PersistentReplicatedTestBa
    * Tests to make sure that we can revoke a member before initialization, and that member will stay
    * revoked
    *
-   * @throws Exception
    */
   @Test
   public void testRevokeAHostBeforeInitialization() throws Exception {
@@ -388,7 +386,6 @@ public class PersistentRecoveryOrderDUnitTest extends PersistentReplicatedTestBa
   /**
    * Test which members show up in the list of members we're waiting on.
    *
-   * @throws Exception
    */
   @Test
   public void testWaitingMemberList() throws Exception {
@@ -527,7 +524,6 @@ public class PersistentRecoveryOrderDUnitTest extends PersistentReplicatedTestBa
   /**
    * Use Case AB are alive A crashes. B crashes. B starts up. It should not wait for A.
    *
-   * @throws Exception
    */
   @Test
   public void testDontWaitForOldMember() throws Exception {
@@ -559,7 +555,6 @@ public class PersistentRecoveryOrderDUnitTest extends PersistentReplicatedTestBa
    * Tests that if two members crash simultaneously, they negotiate which member should initialize
    * with what is on disk and which member should copy data from that member.
    *
-   * @throws Exception
    */
   @Test
   public void testSimultaneousCrash() throws Exception {
@@ -1442,7 +1437,6 @@ public class PersistentRecoveryOrderDUnitTest extends PersistentReplicatedTestBa
   /**
    * Tests to make sure that we stop waiting for a member that we revoke.
    *
-   * @throws Exception
    */
   @Test
   public void testCompactFromAdmin() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderOldConfigDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderOldConfigDUnitTest.java
index 3241482..37140e7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderOldConfigDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentRecoveryOrderOldConfigDUnitTest.java
@@ -30,9 +30,6 @@ import org.apache.geode.test.dunit.SerializableRunnable;
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.junit.categories.DistributedTest;
 
-/**
- *
- */
 @Category(DistributedTest.class)
 public class PersistentRecoveryOrderOldConfigDUnitTest extends PersistentRecoveryOrderDUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
index e0d838d..1ef4920 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
@@ -1860,7 +1860,6 @@ public class RollingUpgrade2DUnitTest extends JUnit4DistributedTestCase {
   /**
    * Get the port that the standard dunit locator is listening on.
    *
-   * @return
    */
   public static String getDUnitLocatorAddress() {
     return Host.getHost(0).getHostName();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplDUnitTest.java
index d2618e3..33466be 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImplDUnitTest.java
@@ -232,7 +232,6 @@ public class AcceptorImplDUnitTest extends JUnit4DistributedTestCase {
 
   /**
    *
-   * @param cache
    * @return the cache's Acceptor, if there is exactly one CacheServer. Otherwise null.
    */
   public AcceptorImpl getAcceptorImplFromCache(GemFireCache cache) {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java
index ed8e923..542d089 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientConflationDUnitTest.java
@@ -172,7 +172,6 @@ public class ClientConflationDUnitTest extends JUnit4DistributedTestCase {
   /**
    * create client 2 with 2 regions each with a unique writer and unique listeners
    *
-   * @throws Exception
    */
   public static void createClientCache(String host, Integer port, String conflation)
       throws Exception {
@@ -383,7 +382,6 @@ public class ClientConflationDUnitTest extends JUnit4DistributedTestCase {
   /**
    * create a server cache and start the server
    *
-   * @throws Exception
    */
   public static Integer createServerCache() throws Exception {
     Properties props = new Properties();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
index 2c73979..3c59199 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
@@ -296,7 +296,6 @@ public class ClientInterestNotifyDUnitTest extends JUnit4DistributedTestCase {
   /**
    * create client with 3 regions each with a unique listener
    *
-   * @throws Exception
    */
   public static void createClientCache(String host, Integer port, /* String nbs, */
       String name) throws Exception {
@@ -406,7 +405,6 @@ public class ClientInterestNotifyDUnitTest extends JUnit4DistributedTestCase {
   /**
    * create a server cache and start the server
    *
-   * @throws Exception
    */
   public static Integer createServerCache() throws Exception {
     ClientInterestNotifyDUnitTest test = new ClientInterestNotifyDUnitTest();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
index 1faff98..db30bb0 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
@@ -684,7 +684,6 @@ public class ClientServerMiscDUnitTest extends JUnit4CacheTestCase {
    * to both of the regions Region interests AL_KEYS on both the regions,
    * notify-by-subscription=true . The CCP should have both the regions in interest list.
    *
-   * @throws Exception
    */
 
   @Test
@@ -733,7 +732,6 @@ public class ClientServerMiscDUnitTest extends JUnit4CacheTestCase {
    * Disconnect DS1. Create a DistributedSystem (DS2). Create a Region with pool, it attempts to
    * register interest using DS2 memberid, gets NPE.
    *
-   * @throws Exception
    */
   @Test
   public void testSystemCanBeCycledWithAnInitializedPool() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java
index 06d9924..3284afa 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ConflationDUnitTest.java
@@ -180,7 +180,6 @@ public class ConflationDUnitTest extends JUnit4DistributedTestCase {
   /**
    * create a client with 2 regions sharing a common writer
    *
-   * @throws Exception
    */
 
   public static void createClientCache1CommonWriter(String host, Integer port) throws Exception {
@@ -197,7 +196,6 @@ public class ConflationDUnitTest extends JUnit4DistributedTestCase {
   /**
    * create a client with 2 regions sharing a common writer
    *
-   * @throws Exception
    */
 
 
@@ -216,7 +214,6 @@ public class ConflationDUnitTest extends JUnit4DistributedTestCase {
   /**
    * create client 2 with 2 regions with sharing a common writer and having a common listener
    *
-   * @throws Exception
    */
   public static void createClientCache2CommonWriter(String host, Integer port) throws Exception {
     ConflationDUnitTest test = new ConflationDUnitTest();
@@ -309,7 +306,6 @@ public class ConflationDUnitTest extends JUnit4DistributedTestCase {
   /**
    * create a client with 2 regions each having its own writer
    *
-   * @throws Exception
    */
 
   public static void createClientCache1UniqueWriter(String host, Integer port) throws Exception {
@@ -328,7 +324,6 @@ public class ConflationDUnitTest extends JUnit4DistributedTestCase {
   /**
    * create client 2 with 2 regions each with a unique writer but both having a common listener
    *
-   * @throws Exception
    */
   public static void createClientCache2UniqueWriter(String host, Integer port) throws Exception {
     ConflationDUnitTest test = new ConflationDUnitTest();
@@ -553,7 +548,6 @@ public class ConflationDUnitTest extends JUnit4DistributedTestCase {
   /**
    * create a server cache and start the server
    *
-   * @throws Exception
    */
   public static Integer createServerCache() throws Exception {
     ConflationDUnitTest test = new ConflationDUnitTest();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DataSerializerPropagationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DataSerializerPropagationDUnitTest.java
index 29a177c..5852ed4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DataSerializerPropagationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/DataSerializerPropagationDUnitTest.java
@@ -774,9 +774,6 @@ public class DataSerializerPropagationDUnitTest extends JUnit4DistributedTestCas
   /**
    * This method creates the server cache
    *
-   * @param maxThreads
-   * @return
-   * @throws Exception
    */
   public static Integer createServerCacheTwo(Integer maxThreads) throws Exception {
     new DataSerializerPropagationDUnitTest().createCache(new Properties());
@@ -798,9 +795,6 @@ public class DataSerializerPropagationDUnitTest extends JUnit4DistributedTestCas
   /**
    * This method creates the server cache
    *
-   * @param maxThreads
-   * @return
-   * @throws Exception
    */
   public static Integer createServerCacheOne(Integer maxThreads) throws Exception {
     new DataSerializerPropagationDUnitTest().createCache(new Properties());
@@ -834,7 +828,6 @@ public class DataSerializerPropagationDUnitTest extends JUnit4DistributedTestCas
   /**
    * sets the EventId value in the VM
    *
-   * @param eventID
    */
   public static void setEventId(EventID eventID) {
     eventId = eventID;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java
index 8124ca8..e725661 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ForceInvalidateEvictionDUnitTest.java
@@ -56,9 +56,6 @@ import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
 import org.apache.geode.test.junit.categories.ClientSubscriptionTest;
 import org.apache.geode.test.junit.categories.DistributedTest;
 
-/**
- *
- */
 @Category({DistributedTest.class, ClientSubscriptionTest.class})
 public class ForceInvalidateEvictionDUnitTest extends JUnit4CacheTestCase {
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
index ceac1c7..582aa1d 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
@@ -260,7 +260,6 @@ public class HAInterestPart2DUnitTest extends HAInterestTestCase {
    * Bug Test for Bug # 35945 A java level Deadlock between acquireConnection and RegionEntry during
    * processRecoveredEndpoint by Dead Server Monitor Thread.
    *
-   * @throws Exception
    */
   @Test
   public void testBug35945() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
index ee8fb23..19a719d 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
@@ -204,7 +204,6 @@ public class InterestResultPolicyDUnitTest extends JUnit4DistributedTestCase {
    * Creates cache instance
    *
    * @param props - properties of the distributed system
-   * @return cache
    * @throws Exception - thrown if any problem occurs while connecting to distributed system or
    *         creating cache
    */
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
index c731181..915d543 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/NewRegionAttributesDUnitTest.java
@@ -126,7 +126,6 @@ public class NewRegionAttributesDUnitTest extends JUnit4DistributedTestCase {
    * Creates cache instance
    *
    * @param props - properties of the distributed system
-   * @return cache
    * @throws Exception - thrown if any problem occurs while connecting to distributed system or
    *         creating cache
    */
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
index 851755a..704b220 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
@@ -200,9 +200,6 @@ public class RegisterInterestKeysDUnitTest extends JUnit4DistributedTestCase {
   }
 
 
-  /**
-   *
-   */
   public static void registerKeysK1() {
     try {
       Region r = cache.getRegion(Region.SEPARATOR + REGION_NAME);
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
index 7f534d8..b217de1 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
@@ -125,7 +125,6 @@ public class ReliableMessagingDUnitTest extends JUnit4DistributedTestCase {
   /**
    * Wait for acknowledgment from client, verify creation time is correct
    *
-   * @throws Exception
    */
   public static void waitForClientAck() throws Exception {
     final long maxWaitTime = 30000;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
index 88d0df6..2469358 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UnregisterInterestDUnitTest.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 static org.apache.geode.distributed.ConfigurationProperties.*;
@@ -104,7 +101,6 @@ public class UnregisterInterestDUnitTest extends JUnit4DistributedTestCase {
    *
    * See bug #47619
    *
-   * @throws Exception
    */
   @Test
   public void testUnregisterInterestAllKeys() throws Exception {
@@ -126,7 +122,6 @@ public class UnregisterInterestDUnitTest extends JUnit4DistributedTestCase {
    *
    * See bug #47619
    *
-   * @throws Exception
    */
   @Test
   public void testUnregisterInterestKeys() throws Exception {
@@ -148,7 +143,6 @@ public class UnregisterInterestDUnitTest extends JUnit4DistributedTestCase {
    *
    * See bug #47619
    *
-   * @throws Exception
    */
   @Test
   public void testUnregisterInterestPatterns() throws Exception {
@@ -171,7 +165,6 @@ public class UnregisterInterestDUnitTest extends JUnit4DistributedTestCase {
    *
    * See bug #47717
    *
-   * @throws Exception
    */
   @Test
   public void testUnregisterInterestKeysInvForOneClientDoesNotAffectOtherClient() throws Exception {
@@ -198,7 +191,6 @@ public class UnregisterInterestDUnitTest extends JUnit4DistributedTestCase {
    *
    * See bug #47717
    *
-   * @throws Exception
    */
   @Test
   public void testUnregisterInterestRegexInvForOneClientDoesNotAffectOtherClient()
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java
index fe29f65..61b85ac 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionHolderJUnitTest.java
@@ -1854,9 +1854,6 @@ public class RegionVersionHolderJUnitTest {
    * Return true if bs1 dominates bs2 - meaning that at least all of the bits set in bs2 are set in
    * bs1.
    *
-   * @param bs1
-   * @param bs2
-   * @return
    */
   private boolean dominates(BitSet bs1, BitSet bs2) {
     // bs1 dominates bs2 if it has set at least all of the bits in bs1.
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
index 67dbc6f..639cf44 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.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.asyncqueue;
 
 import static junitparams.JUnitParamsRunner.$;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java
index 8803827..e475a69 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentAsyncEventQueueDUnitTest.java
@@ -27,9 +27,6 @@ import org.apache.geode.test.dunit.AsyncInvocation;
 import org.apache.geode.test.junit.categories.AEQTest;
 import org.apache.geode.test.junit.categories.DistributedTest;
 
-/**
- *
- */
 @Category({DistributedTest.class, AEQTest.class})
 public class ConcurrentAsyncEventQueueDUnitTest extends AsyncEventQueueTestBase {
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java
index 399fd35..e15da64 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/misc/CommonParallelAsyncEventQueueDUnitTest.java
@@ -25,9 +25,6 @@ import org.apache.geode.test.dunit.IgnoredException;
 import org.apache.geode.test.junit.categories.AEQTest;
 import org.apache.geode.test.junit.categories.DistributedTest;
 
-/**
- *
- */
 @Category({DistributedTest.class, AEQTest.class})
 public class CommonParallelAsyncEventQueueDUnitTest extends AsyncEventQueueTestBase {
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionConfigDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionConfigDUnitTest.java
index e23c218..c5a0679 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionConfigDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/compression/CompressionRegionConfigDUnitTest.java
@@ -80,7 +80,6 @@ public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
   /**
    * Sanity check using two peers sharing a replicated region.
    *
-   * @throws Exception
    */
   @Test
   public void testReplicateRegion() throws Exception {
@@ -96,7 +95,6 @@ public class CompressionRegionConfigDUnitTest extends JUnit4CacheTestCase {
   /**
    * Sanity check for two peers sharing a persisted replicated region.
    *
-   * @throws Exception
    */
   @Test
   public void testReplicatePersistentRegion() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolingJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolingJUnitTest.java
index 6ee3a33..3a20c27 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolingJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/datasource/ConnectionPoolingJUnitTest.java
@@ -44,10 +44,6 @@ import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.util.test.TestUtil;
 
-/**
- *
- *
- */
 @Category(IntegrationTest.class)
 public class ConnectionPoolingJUnitTest {
   private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/CacheUtils.java b/geode-core/src/test/java/org/apache/geode/internal/jta/CacheUtils.java
index 936e542..178a549 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/CacheUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/CacheUtils.java
@@ -40,9 +40,6 @@ import org.apache.geode.cache.query.QueryService;
 import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.util.test.TestUtil;
 
-/**
- *
- */
 public class CacheUtils {
   public static DistributedSystem ds;
   static Cache cache;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/JTAUtils.java b/geode-core/src/test/java/org/apache/geode/internal/jta/JTAUtils.java
index 1bfc7d1..7ef3721 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/JTAUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/JTAUtils.java
@@ -20,10 +20,6 @@
 
 package org.apache.geode.internal.jta;
 
-/**
- *
- */
-
 import java.sql.*;
 import java.util.*;
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/SyncImpl.java b/geode-core/src/test/java/org/apache/geode/internal/jta/SyncImpl.java
index 3e0a7b8..277d187 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/SyncImpl.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/SyncImpl.java
@@ -17,8 +17,6 @@ package org.apache.geode.internal.jta;
 
 import javax.transaction.Synchronization;
 
-/*
- */
 public class SyncImpl implements Synchronization {
   public boolean befCompletion = false;
   public boolean aftCompletion = false;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionImplJUnitTest.java
index c11f8ab..dab98b2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/TransactionImplJUnitTest.java
@@ -32,8 +32,6 @@ import org.junit.experimental.categories.Category;
 import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 
-/**
- */
 @Category(IntegrationTest.class)
 public class TransactionImplJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/jta/UserTransactionImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/jta/UserTransactionImplJUnitTest.java
index d02dab4..81397b1 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/jta/UserTransactionImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/jta/UserTransactionImplJUnitTest.java
@@ -32,8 +32,6 @@ import org.junit.experimental.categories.Category;
 import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 
-/**
- */
 @Category(IntegrationTest.class)
 public class UserTransactionImplJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternIntegrationTest.java
index 9ef58ad..7e71fca 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternIntegrationTest.java
@@ -109,7 +109,6 @@ public class MemoryAllocatorFillPatternIntegrationTest {
    * tiny Chunks for one minute. This, of course, exercises many aspects of the MemoryAllocatorImpl
    * and its helper classes.
    *
-   * @throws Exception
    */
   @Test
   public void testFillPatternAdvancedForTinyAllocations() throws Exception {
@@ -131,7 +130,6 @@ public class MemoryAllocatorFillPatternIntegrationTest {
    * huge Chunks for one minute. This, of course, exercises many aspects of the MemoryAllocatorImpl
    * and its helper classes.
    *
-   * @throws Exception
    */
   @Test
   public void testFillPatternAdvancedForHugeAllocations() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternJUnitTest.java
index 4611b46..877e64b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/MemoryAllocatorFillPatternJUnitTest.java
@@ -80,7 +80,6 @@ public class MemoryAllocatorFillPatternJUnitTest {
   /**
    * This tests the fill pattern for a single tiny Chunk allocation.
    *
-   * @throws Exception
    */
   @Test
   public void testFillPatternBasicForTinyAllocations() throws Exception {
@@ -90,7 +89,6 @@ public class MemoryAllocatorFillPatternJUnitTest {
   /**
    * This tests the fill pattern for a single huge Chunk allocation.
    *
-   * @throws Exception
    */
   @Test
   public void testFillPatternBasicForHugeAllocations() throws Exception {
@@ -145,7 +143,6 @@ public class MemoryAllocatorFillPatternJUnitTest {
    * This tests that fill validation is working properly on newly created fragments after a
    * defragmentation.
    *
-   * @throws Exception
    */
   @Test
   public void testFillPatternAfterDefragmentation() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/internal/size/ObjectTraverserPerf.java b/geode-core/src/test/java/org/apache/geode/internal/size/ObjectTraverserPerf.java
index c01cb54..a73011e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/size/ObjectTraverserPerf.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/size/ObjectTraverserPerf.java
@@ -23,9 +23,6 @@ import org.apache.geode.DataSerializer;
 import org.apache.geode.internal.HeapDataOutputStream;
 import org.apache.geode.internal.Version;
 
-/**
- *
- */
 public class ObjectTraverserPerf {
 
   private static final int ITERATIONS = 1000;
diff --git a/geode-core/src/test/java/org/apache/geode/internal/stats50/AtomicStatsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/stats50/AtomicStatsJUnitTest.java
index 35ce9d4..85c7165 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/stats50/AtomicStatsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/stats50/AtomicStatsJUnitTest.java
@@ -33,9 +33,6 @@ import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 
-/**
- *
- */
 @Category(IntegrationTest.class)
 public class AtomicStatsJUnitTest {
 
@@ -43,7 +40,6 @@ public class AtomicStatsJUnitTest {
    * Test for bug 41340. Do two gets at the same time of a dirty stat, and make sure we get the
    * correct value for the stat.
    *
-   * @throws Throwable
    */
   @Test
   public void testConcurrentGets() throws Throwable {
diff --git a/geode-core/src/test/java/org/apache/geode/management/MBeanUtil.java b/geode-core/src/test/java/org/apache/geode/management/MBeanUtil.java
index fe50ad4..186edca 100644
--- a/geode-core/src/test/java/org/apache/geode/management/MBeanUtil.java
+++ b/geode-core/src/test/java/org/apache/geode/management/MBeanUtil.java
@@ -46,9 +46,7 @@ public class MBeanUtil {
   /**
    * Utility Method to obtain MemberMXBean proxy reference for a particular Member
    *
-   * @param member
    * @return a reference to MemberMXBean
-   * @throws Exception
    */
   public static MemberMXBean getMemberMbeanProxy(DistributedMember member) throws Exception {
     MemberMXBean bean = null;
@@ -86,9 +84,7 @@ public class MBeanUtil {
   /**
    * Utility Method to obtain CacheServerMXBean proxy reference for a particular Member
    *
-   * @param member
    * @return a reference to CacheServerMXBean
-   * @throws Exception
    */
   public static CacheServerMXBean getCacheServerMbeanProxy(DistributedMember member, int port)
       throws Exception {
@@ -132,9 +128,7 @@ public class MBeanUtil {
    * Utility Method to obtain LockServiceMXBean proxy reference for a particular lock service on a
    * Member
    *
-   * @param member
    * @return a reference to LockServiceMXBean
-   * @throws Exception
    */
   public static LockServiceMXBean getLockServiceMbeanProxy(DistributedMember member,
       String lockServiceName) throws Exception {
@@ -177,9 +171,7 @@ public class MBeanUtil {
   /**
    * Utility Method to obtain RegionMXBean proxy reference for a particular region on a member
    *
-   * @param member
    * @return a reference to RegionMXBean
-   * @throws Exception
    */
   public static RegionMXBean getRegionMbeanProxy(DistributedMember member, String regionPath)
       throws Exception {
@@ -228,7 +220,6 @@ public class MBeanUtil {
    * @param member distributed member
    * @param gatwaySenderId sender id
    * @return a reference to GatewaySenderMXBean
-   * @throws Exception
    */
   public static GatewaySenderMXBean getGatewaySenderMbeanProxy(DistributedMember member,
       String gatwaySenderId) throws Exception {
@@ -276,7 +267,6 @@ public class MBeanUtil {
    * @param member distributed member
    * @param queueId Queue id
    * @return a reference to AsyncEventQueueMXBean
-   * @throws Exception
    */
   public static AsyncEventQueueMXBean getAsyncEventQueueMBeanProxy(DistributedMember member,
       String queueId) throws Exception {
@@ -322,7 +312,6 @@ public class MBeanUtil {
    *
    * @param member distributed member
    * @return a reference to GatewayReceiverMXBean
-   * @throws Exception
    */
   public static GatewayReceiverMXBean getGatewayReceiverMbeanProxy(DistributedMember member)
       throws Exception {
@@ -368,7 +357,6 @@ public class MBeanUtil {
    *
    * @param regionName name of the region
    * @return a reference to DistributedRegionMXBean
-   * @throws Exception
    */
   public static DistributedRegionMXBean getDistributedRegionMbean(final String regionName,
       final int expectedMembers) throws Exception {
@@ -404,7 +392,6 @@ public class MBeanUtil {
    *
    * @param lockServiceName name of the lock service
    * @return a reference to DistributedLockServiceMXBean
-   * @throws Exception
    */
   public static DistributedLockServiceMXBean getDistributedLockMbean(final String lockServiceName,
       final int expectedMembers) throws Exception {
@@ -438,7 +425,6 @@ public class MBeanUtil {
    *
    * @param member distributed member
    * @return a reference to GatewayReceiverMXBean
-   * @throws Exception
    */
   public static LocatorMXBean getLocatorMbeanProxy(DistributedMember member) throws Exception {
 
diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/AsyncEventQueueStatsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/bean/stats/AsyncEventQueueStatsJUnitTest.java
index c4d0b7c..48ca857 100644
--- a/geode-core/src/test/java/org/apache/geode/management/bean/stats/AsyncEventQueueStatsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/bean/stats/AsyncEventQueueStatsJUnitTest.java
@@ -24,10 +24,6 @@ import org.apache.geode.cache.asyncqueue.internal.AsyncEventQueueStats;
 import org.apache.geode.management.internal.beans.AsyncEventQueueMBeanBridge;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 
-/**
- *
- *
- */
 @Category(IntegrationTest.class)
 public class AsyncEventQueueStatsJUnitTest extends MBeanStatsTestCase {
 
diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/CacheServerStatsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/bean/stats/CacheServerStatsJUnitTest.java
index 4606a45..2d696d8 100644
--- a/geode-core/src/test/java/org/apache/geode/management/bean/stats/CacheServerStatsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/bean/stats/CacheServerStatsJUnitTest.java
@@ -25,8 +25,6 @@ import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
 import org.apache.geode.management.internal.beans.CacheServerBridge;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 
-/**
- */
 @Category(IntegrationTest.class)
 public class CacheServerStatsJUnitTest extends MBeanStatsTestCase {
 
diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/DiskStatsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/bean/stats/DiskStatsJUnitTest.java
index 5f2314c..0a84e7a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/bean/stats/DiskStatsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/bean/stats/DiskStatsJUnitTest.java
@@ -26,8 +26,6 @@ import org.apache.geode.internal.cache.DiskStoreStats;
 import org.apache.geode.management.internal.beans.DiskStoreMBeanBridge;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 
-/**
- */
 @Category(IntegrationTest.class)
 public class DiskStatsJUnitTest extends MBeanStatsTestCase {
 
diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/GatewayMBeanBridgeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/bean/stats/GatewayMBeanBridgeJUnitTest.java
index 5bfed27..6371b6f 100644
--- a/geode-core/src/test/java/org/apache/geode/management/bean/stats/GatewayMBeanBridgeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/bean/stats/GatewayMBeanBridgeJUnitTest.java
@@ -27,8 +27,6 @@ import org.apache.geode.internal.cache.wan.GatewaySenderStats;
 import org.apache.geode.management.internal.beans.GatewaySenderMBeanBridge;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 
-/**
- */
 @Category(IntegrationTest.class)
 public class GatewayMBeanBridgeJUnitTest extends MBeanStatsTestCase {
 
diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/GatewayReceiverStatsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/bean/stats/GatewayReceiverStatsJUnitTest.java
index 1cdbf0b..2d43d07 100644
--- a/geode-core/src/test/java/org/apache/geode/management/bean/stats/GatewayReceiverStatsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/bean/stats/GatewayReceiverStatsJUnitTest.java
@@ -25,8 +25,6 @@ import org.apache.geode.internal.cache.wan.GatewayReceiverStats;
 import org.apache.geode.management.internal.beans.GatewayReceiverMBeanBridge;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 
-/**
- */
 @Category(IntegrationTest.class)
 public class GatewayReceiverStatsJUnitTest extends MBeanStatsTestCase {
 
diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/MemberLevelStatsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/bean/stats/MemberLevelStatsJUnitTest.java
index e430b49..6187630 100644
--- a/geode-core/src/test/java/org/apache/geode/management/bean/stats/MemberLevelStatsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/bean/stats/MemberLevelStatsJUnitTest.java
@@ -41,8 +41,6 @@ import org.apache.geode.management.ManagementService;
 import org.apache.geode.management.internal.beans.MemberMBeanBridge;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 
-/**
- */
 @Category(IntegrationTest.class)
 public class MemberLevelStatsJUnitTest extends MBeanStatsTestCase {
   @Rule
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
index 558759f..8e190c4 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
@@ -91,8 +91,6 @@ public class XmlUtilsAddNewNodeJUnitTest {
    * <code>name</code> attribute, <code>region</code>. It should be added after other
    * <code>region</code> elements.
    *
-   * @throws Exception
-   * @throws XPathExpressionException
    * @since GemFire 8.1
    */
   @Test
@@ -144,7 +142,6 @@ public class XmlUtilsAddNewNodeJUnitTest {
    * not have a name or id attribute, <code>jndi-bindings</code>. It should be added between
    * <code>pdx</code> and <code>region</code> elements.
    *
-   * @throws Exception
    * @since GemFire 8.1
    */
   @Test
@@ -181,7 +178,6 @@ public class XmlUtilsAddNewNodeJUnitTest {
    * collision with test:region, it should not collide with the similarly named cache:region
    * element.
    *
-   * @throws Exception
    * @since GemFire 8.1
    */
   @Test
@@ -221,7 +217,6 @@ public class XmlUtilsAddNewNodeJUnitTest {
    * <code>name</code> attribute, <code>region</code>. It should replace existing
    * <code>region</code> element with same <code>name</code>.
    *
-   * @throws Exception
    * @since GemFire 8.1
    */
   @Test
@@ -256,7 +251,6 @@ public class XmlUtilsAddNewNodeJUnitTest {
    * Tests {@link XmlUtils#addNewNode(Document, XmlEntity)} with {@link CacheXml} element that does
    * not have a name or id attribute, <code>pdx</code>. It should replace <code>pdx</code> element.
    *
-   * @throws Exception
    * @since GemFire 8.1
    */
   @Test
@@ -291,7 +285,6 @@ public class XmlUtilsAddNewNodeJUnitTest {
    * have a name or id attribute, <code>test:cache</code>. It should replace the existing
    * <code>test:cache</code> element.
    *
-   * @throws Exception
    * @since GemFire 8.1
    */
   @Test
@@ -328,7 +321,6 @@ public class XmlUtilsAddNewNodeJUnitTest {
    * <code>name</code> attribute, <code>region</code>. It should remove existing <code>region</code>
    * element with same <code>name</code>.
    *
-   * @throws Exception
    * @since GemFire 8.1
    */
   @Test
@@ -358,7 +350,6 @@ public class XmlUtilsAddNewNodeJUnitTest {
    * not have a name or id attribute, <code>pdx</code>. It should remove the existing
    * <code>pdx</code> element.
    *
-   * @throws Exception
    * @since GemFire 8.1
    */
   @Test
@@ -387,7 +378,6 @@ public class XmlUtilsAddNewNodeJUnitTest {
    * have a name or id attribute, <code>test:cache</code>. It should remove the existing
    * <code>test:cache</code> element.
    *
-   * @throws Exception
    * @since GemFire 8.1
    */
   @Test
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsJUnitTest.java
index 6001626..9a4468e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/utils/XmlUtilsJUnitTest.java
@@ -115,9 +115,6 @@ public class XmlUtilsJUnitTest {
     assertEquals(0, schemaLocationMap.size());
   }
 
-  /**
-   *
-   */
   @Test
   public void testQuerySingleElement() throws Exception {
     final Document doc = XmlUtils.createDocumentFromReader(new InputStreamReader(
diff --git a/geode-core/src/test/java/org/apache/geode/management/model/Item.java b/geode-core/src/test/java/org/apache/geode/management/model/Item.java
index 208b6bc..f4a876d 100644
--- a/geode-core/src/test/java/org/apache/geode/management/model/Item.java
+++ b/geode-core/src/test/java/org/apache/geode/management/model/Item.java
@@ -16,9 +16,6 @@ package org.apache.geode.management.model;
 
 import java.io.Serializable;
 
-/**
- *
- */
 public class Item implements Serializable {
   private static final long serialVersionUID = -1174387683312780907L;
   private Order order;
@@ -67,16 +64,8 @@ public class Item implements Serializable {
     this.itemDescription = itemDescription;
   }
 
-  /**
-   *
-   */
   public Item() {}
 
-  /**
-   * @param order
-   * @param itemId
-   * @param itemDescription
-   */
   public Item(Order order, String itemId, String itemDescription) {
     super();
     this.order = order;
diff --git a/geode-core/src/test/java/org/apache/geode/management/model/Order.java b/geode-core/src/test/java/org/apache/geode/management/model/Order.java
index 5c51e1c..5ea6172 100644
--- a/geode-core/src/test/java/org/apache/geode/management/model/Order.java
+++ b/geode-core/src/test/java/org/apache/geode/management/model/Order.java
@@ -18,9 +18,6 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 
-/**
- *
- */
 public class Order implements Serializable {
   private static final long serialVersionUID = 2049641616996906290L;
   private String id;
@@ -54,24 +51,14 @@ public class Order implements Serializable {
     this.items = items;
   }
 
-  /**
-   * @param item
-   */
   public void addItem(Item item) {
     this.items.add(item);
   }
 
-  /**
-   *
-   */
   public Order() {
     this.items = new ArrayList<Item>();
   }
 
-  /**
-   * @param id
-   * @param items
-   */
   public Order(String id, Collection<Item> items) {
     super();
     this.id = id;
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java
index d4645af..9a8aa1a 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java
@@ -57,9 +57,6 @@ import org.apache.geode.pdx.internal.PeerTypeRegistration;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.SerializationTest;
 
-/**
- *
- */
 @Category({IntegrationTest.class, SerializationTest.class})
 public class PdxAttributesJUnitTest {
 
@@ -386,7 +383,6 @@ public class PdxAttributesJUnitTest {
   /**
    * Test that loner VMs lazily determine if they are a client or a peer.
    *
-   * @throws Exception
    */
   @Test
   public void testLazyLoner() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxDeserializationDUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxDeserializationDUnitTest.java
index c03e25d..c8f8b02 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxDeserializationDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxDeserializationDUnitTest.java
@@ -123,8 +123,6 @@ public class PdxDeserializationDUnitTest extends JUnit4CacheTestCase {
    *
    * If an operation causes a deserialization in the disallow VM, this test will fail.
    *
-   * @param operationVM
-   * @param disallowDeserializationVM
    */
   private void doTest(VM operationVM, VM disallowDeserializationVM) {
     Host host = Host.getHost(0);
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java
index ba303f2..c5bf061 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxInstanceJUnitTest.java
@@ -40,9 +40,6 @@ import org.apache.geode.pdx.internal.PdxInstanceFactoryImpl;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.SerializationTest;
 
-/**
- *
- */
 @Category({IntegrationTest.class, SerializationTest.class})
 public class PdxInstanceJUnitTest {
 
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxStringJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxStringJUnitTest.java
index 0f86975..845be43 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxStringJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxStringJUnitTest.java
@@ -161,7 +161,6 @@ public class PdxStringJUnitTest {
    * this test verifies that pdxstream with pdxType.Object tyep for string and checks whether we
    * create PdxString or not
    *
-   * @throws Exception
    */
   @Test
   public void testJSONFieldNameAsPdxString() throws Exception {
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/SimpleClass2.java b/geode-core/src/test/java/org/apache/geode/pdx/SimpleClass2.java
index c410010..e931ca5 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/SimpleClass2.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/SimpleClass2.java
@@ -14,9 +14,6 @@
  */
 package org.apache.geode.pdx;
 
-/**
- *
- */
 public class SimpleClass2 extends SimpleClass {
 
   public SimpleClass2() {
diff --git a/geode-core/src/test/java/org/apache/geode/sequence/GemfireSequenceDisplay.java b/geode-core/src/test/java/org/apache/geode/sequence/GemfireSequenceDisplay.java
index 201e2c0..a88d852 100644
--- a/geode-core/src/test/java/org/apache/geode/sequence/GemfireSequenceDisplay.java
+++ b/geode-core/src/test/java/org/apache/geode/sequence/GemfireSequenceDisplay.java
@@ -46,8 +46,6 @@ import org.apache.geode.internal.sequencelog.model.GraphID;
 import org.apache.geode.internal.sequencelog.model.GraphSet;
 import org.apache.geode.internal.sequencelog.model.Vertex;
 
-/**
- */
 public class GemfireSequenceDisplay {
 
   private JLabel selectedGraphsLabel;
@@ -63,8 +61,6 @@ public class GemfireSequenceDisplay {
    * Create the GUI and show it. For thread safety, this method should be invoked from the
    * event-dispatching thread.
    *
-   * @param graphs
-   * @param lineMapper
    */
   private void createAndShowGUI(final GraphSet graphs, LineMapper lineMapper) {
     // Create and set up the window.
@@ -302,10 +298,6 @@ public class GemfireSequenceDisplay {
     return graphs;
   }
 
-  /**
-   * @param files
-   * @return
-   */
   private static LineMapper getLineMapper(File[] files) {
     if (HydraLineMapper.isInHydraRun(files)) {
       return new HydraLineMapper(files);
diff --git a/geode-core/src/test/java/org/apache/geode/sequence/HydraLineMapper.java b/geode-core/src/test/java/org/apache/geode/sequence/HydraLineMapper.java
index 851ee26..400449d 100644
--- a/geode-core/src/test/java/org/apache/geode/sequence/HydraLineMapper.java
+++ b/geode-core/src/test/java/org/apache/geode/sequence/HydraLineMapper.java
@@ -26,9 +26,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 
-/**
- *
- */
 public class HydraLineMapper implements LineMapper {
   private static final Pattern VM_NAME_PATTERN = Pattern.compile("(vm_\\d+).*_(\\d+)(_end)?\\.log");
   private static final Pattern DISK_DIR_PATTERN = Pattern.compile("vm_(\\d+).*_disk_1");
diff --git a/geode-core/src/test/java/org/apache/geode/sequence/SequenceDiagram.java b/geode-core/src/test/java/org/apache/geode/sequence/SequenceDiagram.java
index c7bf4f4..22781d7 100644
--- a/geode-core/src/test/java/org/apache/geode/sequence/SequenceDiagram.java
+++ b/geode-core/src/test/java/org/apache/geode/sequence/SequenceDiagram.java
@@ -28,9 +28,6 @@ import javax.swing.*;
  */
 public class SequenceDiagram extends JPanel {
 
-  /**
-  *
-  */
   private static final Color HIGHLIGHT_COLOR = Color.RED;
 
   private final List<String> lineNames;
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/Jitter.java b/geode-core/src/test/java/org/apache/geode/test/dunit/Jitter.java
index f0e9acc..7bd3601 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/Jitter.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/Jitter.java
@@ -35,7 +35,6 @@ class Jitter {
    * <code>intervalMillis</code> milliseconds. If jittering is disabled then the value returned will
    * be equal to intervalMillis.
    *
-   * @param intervalMillis
    * @return adjust milliseconds to use as interval for WaitCriteria polling
    */
   static long jitterInterval(long intervalMillis) {
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ChildVM.java b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ChildVM.java
index 442e354..fe3277b 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ChildVM.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ChildVM.java
@@ -25,9 +25,6 @@ import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
 import org.apache.geode.test.dunit.standalone.DUnitLauncher.MasterRemote;
 
-/**
- *
- */
 public class ChildVM {
 
   private static boolean stopMainLoop = false;
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
index fd15bc3..f6f98c7 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
@@ -41,9 +41,6 @@ import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.InternalLocator;
 import org.apache.geode.test.dunit.VM;
 
-/**
- *
- */
 public class ProcessManager {
   private int namingPort;
   private Map<Integer, ProcessHolder> processes = new HashMap<>();
diff --git a/geode-core/src/test/java/org/apache/geode/test/golden/GoldenTestCase.java b/geode-core/src/test/java/org/apache/geode/test/golden/GoldenTestCase.java
index af8b814..f4e06b9 100644
--- a/geode-core/src/test/java/org/apache/geode/test/golden/GoldenTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/test/golden/GoldenTestCase.java
@@ -69,7 +69,6 @@ public abstract class GoldenTestCase {
   /**
    * Override this for additional set up.
    *
-   * @throws Exception
    */
   public void subSetUp() throws Exception {
     // override me
@@ -78,7 +77,6 @@ public abstract class GoldenTestCase {
   /**
    * Override this for additional tear down after destroying all processes and printing output.
    *
-   * @throws Exception
    */
   public void subTearDown() throws Exception {
     // override me
diff --git a/geode-core/src/test/java/parReg/query/unittest/NewPortfolio.java b/geode-core/src/test/java/parReg/query/unittest/NewPortfolio.java
index 3db9f89..0c220f3 100755
--- a/geode-core/src/test/java/parReg/query/unittest/NewPortfolio.java
+++ b/geode-core/src/test/java/parReg/query/unittest/NewPortfolio.java
@@ -47,8 +47,6 @@ public class NewPortfolio implements Serializable {
   /**
    * Constructor to randomly populate the portfolio.
    *
-   * @param name
-   * @param id
    */
   public NewPortfolio(String name, int id) {
     myVersion = "tests/parReg.query.NewPortfolio";
@@ -141,7 +139,6 @@ public class NewPortfolio implements Serializable {
   /**
    * To provide random values to populate a position.
    *
-   * @return
    */
   protected Properties getProps() {
     Properties props = new Properties();

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