You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by nn...@apache.org on 2020/03/16 19:22:49 UTC

[geode] branch develop updated: GEODE-7864: Resolved all javadoc errors and warning in geode-core main (#4814)

This is an automated email from the ASF dual-hosted git repository.

nnag 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 4dd6a00  GEODE-7864: Resolved all javadoc errors and warning in geode-core main (#4814)
4dd6a00 is described below

commit 4dd6a003d09b52100243c46b53bbb01ac55fbc68
Author: Nabarun Nag <na...@users.noreply.github.com>
AuthorDate: Mon Mar 16 12:22:24 2020 -0700

    GEODE-7864: Resolved all javadoc errors and warning in geode-core main (#4814)
---
 .../main/java/org/apache/geode/SystemFailure.java  | 12 ++++----
 .../admin/internal/AdminDistributedSystemImpl.java |  3 +-
 .../apache/geode/admin/jmx/internal/AgentImpl.java |  2 +-
 .../java/org/apache/geode/cache/CacheWriter.java   |  2 +-
 .../java/org/apache/geode/cache/Operation.java     |  2 +-
 .../apache/geode/cache/RegionAccessException.java  |  2 +-
 .../geode/cache/RegionDistributionException.java   |  2 +-
 .../geode/cache/client/internal/Connection.java    |  1 +
 .../org/apache/geode/cache/execute/Function.java   |  4 +--
 .../internal/AbstractGroupOrRangeJunction.java     |  2 +-
 .../cache/query/internal/CompiledComparison.java   |  4 +--
 .../cache/query/internal/CqQueryVsdStats.java      |  2 +-
 .../cache/query/internal/ObjectIntHashMap.java     |  2 +-
 .../geode/cache/query/internal/PlanInfo.java       |  7 ++---
 .../cache/query/internal/SortedStructSet.java      |  4 +--
 .../cache/query/internal/index/HashIndexSet.java   |  2 +-
 .../query/internal/index/PartitionedIndex.java     |  2 +-
 .../apache/geode/cache/util/CqListenerAdapter.java |  2 +-
 .../apache/geode/cache/wan/GatewayReceiver.java    |  2 +-
 .../distributed/internal/DistributionConfig.java   |  4 +--
 .../internal/DistributionConfigImpl.java           |  5 ++--
 .../internal/FunctionExecutionPooledExecutor.java  |  4 +--
 .../distributed/internal/HealthMonitorImpl.java    |  8 ++---
 .../internal/InternalDistributedSystem.java        |  3 --
 .../internal/LonerDistributionManager.java         |  2 +-
 .../internal/PooledExecutorWithDMStats.java        |  2 +-
 .../geode/distributed/internal/StartupMessage.java |  4 ++-
 .../internal/StartupResponseMessage.java           |  2 +-
 .../distributed/internal/direct/DirectChannel.java |  2 +-
 .../distributed/internal/locks/DLockToken.java     |  1 -
 .../membership/InternalDistributedMember.java      |  1 -
 .../geode/examples/SimpleSecurityManager.java      |  4 +--
 .../org/apache/geode/internal/SystemAdmin.java     |  4 +--
 .../org/apache/geode/internal/SystemTimer.java     |  3 --
 .../org/apache/geode/internal/admin/GemFireVM.java | 15 ----------
 .../internal/cache/AbstractBucketRegionQueue.java  |  6 ++--
 .../apache/geode/internal/cache/AcceptHelper.java  |  3 +-
 .../apache/geode/internal/cache/BucketRegion.java  |  1 -
 .../geode/internal/cache/DistTXCommitMessage.java  |  4 +--
 .../internal/cache/DistTXPrecommitMessage.java     |  4 +--
 .../internal/cache/DistTXRollbackMessage.java      |  4 +--
 .../internal/cache/DistributedPutAllOperation.java |  2 +-
 .../cache/DistributedRemoveAllOperation.java       |  2 +-
 .../apache/geode/internal/cache/EntriesMap.java    | 10 +++----
 .../geode/internal/cache/EntryExpiryTask.java      |  2 +-
 .../apache/geode/internal/cache/ExpiryTask.java    |  5 ++--
 .../cache/ForceableLinkedBlockingQueue.java        | 32 ++++++++++++--------
 .../internal/cache/InitialImageOperation.java      |  7 +++--
 .../geode/internal/cache/InternalDataView.java     |  3 --
 .../geode/internal/cache/LoaderHelperFactory.java  |  8 ++---
 .../internal/cache/PartitionedRegionDataView.java  |  3 --
 .../geode/internal/cache/RegionExpiryTask.java     |  2 +-
 .../geode/internal/cache/TXBucketRegionState.java  |  3 --
 .../apache/geode/internal/cache/TXManagerImpl.java |  2 +-
 .../geode/internal/cache/TXStateInterface.java     |  3 --
 .../apache/geode/internal/cache/TXStateProxy.java  |  3 --
 .../geode/internal/cache/ValueByteWrapper.java     |  6 ----
 .../cache/WrappedRegionMembershipListener.java     |  5 ++--
 .../geode/internal/cache/entries/DiskEntry.java    |  2 +-
 .../cache/execute/FunctionExecutionNodePruner.java |  2 +-
 .../execute/metrics/FunctionServiceStats.java      |  2 +-
 .../internal/cache/ha/HARegionQueueStats.java      |  2 +-
 .../locks/TXLockUpdateParticipantsMessage.java     |  2 --
 .../PRFunctionStreamingResultCollector.java        |  2 +-
 .../cache/partitioned/RemoveIndexesMessage.java    | 17 -----------
 .../region/entry/RegionEntryFactoryBuilder.java    |  2 +-
 .../internal/cache/tier/sockets/AcceptorImpl.java  | 15 ++++++++--
 .../cache/tier/sockets/CacheClientProxy.java       | 16 ++++++----
 .../cache/tier/sockets/CacheClientProxyStats.java  |  2 +-
 .../tier/sockets/ClientDataSerializerMessage.java  |  5 ++--
 .../tier/sockets/ClientInstantiatorMessage.java    |  5 ++--
 .../cache/tier/sockets/MessageDispatcher.java      |  5 ----
 .../internal/cache/wan/GatewaySenderEventImpl.java |  2 +-
 .../internal/cache/wan/GatewaySenderStats.java     |  2 +-
 ...currentParallelGatewaySenderEventProcessor.java |  2 +-
 .../geode/internal/cache/xmlcache/CacheXml.java    |  6 ++--
 .../internal/cache/xmlcache/CacheXmlParser.java    |  2 +-
 .../cache/xmlcache/CacheXmlPropertyResolver.java   |  2 +-
 .../xmlcache/CacheXmlPropertyResolverHelper.java   |  6 ++--
 .../xmlcache/DiskStoreAttributesCreation.java      |  2 +-
 .../cache/xmlcache/ResourceManagerCreation.java    |  3 --
 .../concurrent/CompactConcurrentHashSet2.java      |  5 ----
 .../datasource/ConfiguredDataSourceProperties.java |  2 +-
 .../datasource/ConnectionPoolCacheImpl.java        |  2 +-
 .../internal/datasource/DataSourceFactory.java     |  2 +-
 .../i18n/AbstractStringIdResourceBundle.java       |  2 +-
 .../geode/internal/io/CompositeOutputStream.java   |  5 ++--
 .../apache/geode/internal/jndi/JNDIInvoker.java    |  2 +-
 .../geode/internal/jta/GlobalTransaction.java      | 29 +++++++++---------
 .../apache/geode/internal/jta/TransactionImpl.java | 13 ++++----
 .../geode/internal/jta/TransactionManagerImpl.java | 20 ++++++-------
 .../geode/internal/jta/UserTransactionImpl.java    | 35 ++++++++--------------
 .../org/apache/geode/internal/jta/XidImpl.java     |  7 ++---
 .../internal/offheap/MemoryAllocatorImpl.java      |  2 +-
 .../geode/internal/offheap/RefCountChangeInfo.java |  2 +-
 .../org/apache/geode/internal/util/IOUtils.java    |  2 +-
 .../geode/management/internal/MemberMessenger.java |  8 ++---
 .../management/internal/beans/MBeanAggregator.java |  2 +-
 .../management/internal/beans/MemberMBean.java     |  4 +--
 .../realizers/ConfigurationRealizer.java           |  1 +
 .../main/java/org/apache/geode/pdx/PdxWriter.java  |  3 +-
 .../apache/geode/pdx/internal/PdxReaderImpl.java   |  1 -
 .../cache/query/cq/internal/CqServiceImpl.java     |  2 +-
 103 files changed, 215 insertions(+), 285 deletions(-)

diff --git a/geode-core/src/main/java/org/apache/geode/SystemFailure.java b/geode-core/src/main/java/org/apache/geode/SystemFailure.java
index e04f594..e4d3771 100644
--- a/geode-core/src/main/java/org/apache/geode/SystemFailure.java
+++ b/geode-core/src/main/java/org/apache/geode/SystemFailure.java
@@ -14,6 +14,8 @@
  */
 package org.apache.geode;
 
+import org.jgroups.annotations.GuardedBy;
+
 import org.apache.geode.annotations.internal.MakeNotStatic;
 import org.apache.geode.annotations.internal.MutableForTesting;
 import org.apache.geode.internal.ExitCode;
@@ -279,9 +281,8 @@ public final class SystemFailure {
 
   /**
    * This is the watchdog thread
-   *
-   * @guarded.By {@link #failureSync}
    */
+  @GuardedBy("failureSync")
   @MakeNotStatic
   private static Thread watchDog;
 
@@ -439,9 +440,9 @@ public final class SystemFailure {
   /**
    * Spies on system statistics looking for low memory threshold
    *
-   * @guarded.By {@link #failureSync}
    * @see #minimumMemoryThreshold
    */
+  @GuardedBy("failureSync")
   @MakeNotStatic
   private static Thread proctor;
 
@@ -459,8 +460,8 @@ public final class SystemFailure {
    * failure.
    *
    * @see #setFailureMemoryThreshold(long)
-   * @guarded.By {@link #memorySync}
    */
+  @GuardedBy("memorySync")
   @MakeNotStatic
   private static long minimumMemoryThreshold = Long.getLong(
       GeodeGlossary.GEMFIRE_PREFIX + "SystemFailure.chronic_memory_threshold", 1048576);
@@ -544,9 +545,8 @@ public final class SystemFailure {
 
   /**
    * this is the last time we saw memory starvation
-   *
-   * @guarded.By {@link #memorySync}}}
    */
+  @GuardedBy("memorySync")
   @MakeNotStatic
   private static long firstStarveTime = NEVER_STARVED;
 
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
index 64b0880..66ff10f 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
@@ -41,6 +41,7 @@ import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
 
 import org.apache.logging.log4j.Logger;
+import org.jgroups.annotations.GuardedBy;
 
 import org.apache.geode.CancelException;
 import org.apache.geode.SystemFailure;
@@ -177,8 +178,8 @@ public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminD
    * This is volatile to allow SystemFailure to deliver fatal poison-pill to thisAdminDS without
    * waiting on synchronization.
    *
-   * @guarded.By CONNECTION_SYNC
    */
+  @GuardedBy("CONNECTION_SYNC")
   @MakeNotStatic
   private static volatile AdminDistributedSystemImpl thisAdminDS;
 
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java
index eeb1cb8..37b25e7 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java
@@ -93,7 +93,7 @@ public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
   /** JMX Service URL template for JMX/RMI Connector Server */
   private static final String JMX_SERVICE_URL = "service:jmx:rmi://{0}:{1}/jndi/rmi://{2}:{3}{4}";
 
-  /**
+  /*
    * Set third-party logging configration: MX4J, Jakarta Commons-Logging.
    */
   static {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheWriter.java b/geode-core/src/main/java/org/apache/geode/cache/CacheWriter.java
index dcff24c..c10088b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheWriter.java
@@ -101,7 +101,7 @@ public interface CacheWriter<K, V> extends CacheCallback {
    * cascading subregion destroys. This method is <em>not</em> called as a result of
    * {@link Region#close}, {@link Cache#close}, or {@link Region#localDestroyRegion()}. However, the
    * {@link Region#close} method is invoked regardless of whether a region is destroyed locally. A
-   * non-local region destroy results in an invocation of {@link #beforeRegionDestroy} followed by
+   * non-local region destroy results in an invocation of this method is followed by
    * an invocation of {@link Region#close}.
    * <p>
    * WARNING: This method should not destroy or create any regions itself or a deadlock will occur.
diff --git a/geode-core/src/main/java/org/apache/geode/cache/Operation.java b/geode-core/src/main/java/org/apache/geode/cache/Operation.java
index 312cc5c..a6b48a1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/Operation.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/Operation.java
@@ -64,7 +64,7 @@ public class Operation implements java.io.Serializable {
   private static final int OP_DETAILS_GUARANTEES_OLD_VALUE = 64;
   private static final int OP_DETAILS_REMOVEALL = 128;
 
-  /**
+  /*
    * TAKE NOTE!!! The order if the following static constructors calls must be maintained for
    * backwards compatibility. Any new operations need to be added to the end.
    */
diff --git a/geode-core/src/main/java/org/apache/geode/cache/RegionAccessException.java b/geode-core/src/main/java/org/apache/geode/cache/RegionAccessException.java
index 139faf6..c11c1f3 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/RegionAccessException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/RegionAccessException.java
@@ -36,7 +36,7 @@ public class RegionAccessException extends RegionRoleException {
 
   /**
    * Set of missing required roles causing access to the region to fail. missingRoles is transient
-   * to avoid NotSerializableException. See {@link #writeObject} and {@link #readObject} for custom
+   * to avoid NotSerializableException. See {@see #writeObject} and {@see #readObject} for custom
    * serialization.
    */
   private transient Set missingRoles = Collections.EMPTY_SET;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/RegionDistributionException.java b/geode-core/src/main/java/org/apache/geode/cache/RegionDistributionException.java
index b166310..a55aa54 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/RegionDistributionException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/RegionDistributionException.java
@@ -38,7 +38,7 @@ public class RegionDistributionException extends RegionRoleException {
 
   /**
    * Set of missing required roles causing access to the region to fail. failedRoles is transient to
-   * avoid NotSerializableException. See {@link #writeObject} and {@link #readObject} for custom
+   * avoid NotSerializableException. See {@see #writeObject} and {@see #readObject} for custom
    * serialization.
    */
   private transient Set failedRoles = Collections.EMPTY_SET;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/Connection.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/Connection.java
index 48c203d..827e02c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/Connection.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/Connection.java
@@ -21,6 +21,7 @@ import java.net.SocketException;
 import java.nio.ByteBuffer;
 
 import org.apache.geode.InternalGemFireException;
+import org.apache.geode.cache.client.internal.pooling.ConnectionDestroyedException;
 import org.apache.geode.distributed.internal.ServerLocation;
 import org.apache.geode.internal.cache.tier.sockets.ServerQueueStatus;
 
diff --git a/geode-core/src/main/java/org/apache/geode/cache/execute/Function.java b/geode-core/src/main/java/org/apache/geode/cache/execute/Function.java
index 33df3ef..97b9a8b 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/execute/Function.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/execute/Function.java
@@ -42,11 +42,11 @@ public interface Function<T> extends Identifiable<String> {
    * Specifies whether the function sends results while executing. The method returns false if no
    * result is expected.<br>
    * <p>
-   * If {@link Function#hasResult()} returns false, {@link ResultCollector#getResult()} throws
+   * If this method returns false, {@link ResultCollector#getResult()} throws
    * {@link FunctionException}.
    * </p>
    * <p>
-   * If {@link Function#hasResult()} returns true, {@link ResultCollector#getResult()} blocks and
+   * If this method returns true, {@link ResultCollector#getResult()} blocks and
    * waits for the result of function execution
    * </p>
    *
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractGroupOrRangeJunction.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractGroupOrRangeJunction.java
index 4d77d36..f555531 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractGroupOrRangeJunction.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractGroupOrRangeJunction.java
@@ -12,7 +12,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
+/*
  * Abstract Super class of the Group or Range Junction. The common functionality of Group or Range
  * Junction is present in this class.
  */
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledComparison.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledComparison.java
index 5c15366..9fde152 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledComparison.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledComparison.java
@@ -328,8 +328,8 @@ public class CompiledComparison extends AbstractCompiledValue
     return idxInfo[0]._index.getSizeEstimate(key, op, idxInfo[0]._matchLevel);
   }
 
-  /** **************** PRIVATE METHODS ************************** */
-  /**
+  /* **************** PRIVATE METHODS ************************** */
+  /*
    * evaluate as a filter, involving a single iterator. Use an index if possible.
    */
   // Invariant: the receiver is dependent on the current iterator.
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CqQueryVsdStats.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CqQueryVsdStats.java
index e45912c..6a0cdc1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CqQueryVsdStats.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CqQueryVsdStats.java
@@ -82,7 +82,7 @@ public class CqQueryVsdStats {
   /** Id for the queued CQ events size during execute with initial results */
   private static final int _queuedCqListenerEventsId;
 
-  /**
+  /*
    * Static initializer to create and initialize the <code>StatisticsType</code>
    */
   static {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java
index 8078032..80c7577 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/ObjectIntHashMap.java
@@ -406,7 +406,7 @@ public class ObjectIntHashMap implements Cloneable, Serializable {
     int hash = (key == null) ? 0 : hash(hashingStrategy.hashCode(key));
     int i = indexFor(hash, table.length);
 
-    /**
+    /*
      * Look for preexisting entry for key. This will never happen for clone or deserialize. It will
      * only happen for construction if the input Map is a sorted map whose ordering is inconsistent
      * w/ equals.
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/PlanInfo.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/PlanInfo.java
index 59209b8..b38150d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/PlanInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/PlanInfo.java
@@ -14,16 +14,15 @@
  */
 package org.apache.geode.cache.query.internal;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Encapsulates evaluation info about compiled values
  *
  * @version $Revision: 1.1 $
  * @since GemFire 4.1
  */
-
-import java.util.ArrayList;
-import java.util.List;
-
 class PlanInfo {
 
   boolean evalAsFilter = false;
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java
index 58fc83a..cf3005a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/SortedStructSet.java
@@ -122,7 +122,7 @@ public class SortedStructSet extends TreeSet
     return super.add(fieldValues);
   }
 
-  /**
+  /*
    * For internal use. Just add the Object[] values for a struct with same type
    *
    * public boolean addFieldValues(Object[] fieldValues) { //return super.add(fieldValues);
@@ -150,7 +150,7 @@ public class SortedStructSet extends TreeSet
     return super.contains(fieldValues);
   }
 
-  /**
+  /*
    * Does this set contain a Struct of the correct type with the specified values?
    *
    * public boolean containsFieldValues(Object[] fieldValues) { return super.contains(fieldValues);
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndexSet.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndexSet.java
index bbc0960..35edd17 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndexSet.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndexSet.java
@@ -576,7 +576,7 @@ public class HashIndexSet implements Set {
   }
 
   @Override
-  /**
+  /*
    * return true if no elements exist in the array that are non null or REMOVED tokens
    */
   public boolean isEmpty() {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PartitionedIndex.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PartitionedIndex.java
index 3400d9a..4300735 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PartitionedIndex.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PartitionedIndex.java
@@ -383,7 +383,7 @@ public class PartitionedIndex extends AbstractIndex {
     return false;
   }
 
-  /**
+  /*
    * Not supported on partitioned index.
    */
   /*
diff --git a/geode-core/src/main/java/org/apache/geode/cache/util/CqListenerAdapter.java b/geode-core/src/main/java/org/apache/geode/cache/util/CqListenerAdapter.java
index 4e8b3ad..cb83efa 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/util/CqListenerAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/util/CqListenerAdapter.java
@@ -15,7 +15,7 @@
 
 package org.apache.geode.cache.util;
 
-/**
+/*
  * Abstract class for CqListener. Utility class that implements all methods in
  * <code>CqListener</code> with empty implementations. Applications can subclass this class and only
  * override the methods of interest.
diff --git a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiver.java b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiver.java
index b91328c..282e21e 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiver.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/wan/GatewayReceiver.java
@@ -93,7 +93,7 @@ public interface GatewayReceiver {
    * Destroys this {@code GatewayReceiver}and removes the {@code GatewayReceiverMBean}
    * associated with this {@code GatewayReceiver}. This method does not remove
    * the {@code GatewayReceiver} from cluster configuration.
-   * The {@link #stop() stop} method should be called before calling {@link #destroy() destroy}
+   * The {@link #stop() stop} method should be called before calling destroy}
    *
    *
    * @throws GatewayReceiverException if {@code GatewayReceiver} has not been stopped before
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfig.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfig.java
index 89a19a6..3c66211 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfig.java
@@ -4356,7 +4356,7 @@ public interface DistributionConfig extends Config, LogConfig, StatisticsConfig
   /**
    * Sets the value of the {@link ConfigurationProperties#SERVER_SSL_TRUSTSTORE} property.
    *
-   * @deprecated Geode 1.0 use {@link #setServerSSLTrustStore(String)}
+   * @deprecated Geode 1.0 use {@link #setClusterSSLTrustStore(String)}
    */
   @Deprecated
   @ConfigAttributeSetter(name = SERVER_SSL_TRUSTSTORE)
@@ -4550,7 +4550,7 @@ public interface DistributionConfig extends Config, LogConfig, StatisticsConfig
    * Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_REQUIRE_AUTHENTICATION}
    * property.
    *
-   * @deprecated Geode 1.0 use {@link #setGatewaySSLRequireAuthentication(boolean)}
+   * @deprecated Geode 1.0 use {@link #setClusterSSLRequireAuthentication(boolean)}
    */
   @Deprecated
   @ConfigAttributeSetter(name = GATEWAY_SSL_REQUIRE_AUTHENTICATION)
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigImpl.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigImpl.java
index 047e6e0..3c15bfb 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfigImpl.java
@@ -89,6 +89,7 @@ import org.apache.geode.InternalGemFireException;
 import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.internal.ConfigSource;
 import org.apache.geode.internal.inet.LocalHostUtil;
+import org.apache.geode.internal.logging.LogWriterImpl;
 import org.apache.geode.internal.process.ProcessLauncherContext;
 import org.apache.geode.internal.security.SecurableCommunicationChannel;
 import org.apache.geode.security.AuthTokenEnabledComponents;
@@ -467,7 +468,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
   private boolean startDevRestApi = DEFAULT_START_DEV_REST_API;
 
   /**
-   * port on which {@link GemFireMemcachedServer} server is started
+   * port on which GemFireMemcachedServer server is started
    */
   private int memcachedPort;
 
@@ -487,7 +488,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
   private boolean distributedTransactions = DEFAULT_DISTRIBUTED_TRANSACTIONS;
 
   /**
-   * port on which {@link GeodeRedisServer} is started
+   * port on which GeodeRedisServer is started
    */
   private int redisPort = DEFAULT_REDIS_PORT;
 
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java
index 999b737..ae20b2f 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/FunctionExecutionPooledExecutor.java
@@ -271,7 +271,7 @@ public class FunctionExecutionPooledExecutor extends ThreadPoolExecutor {
    */
   public FunctionExecutionPooledExecutor(BlockingQueue<Runnable> q, int poolSize,
       PoolStatHelper stats, ThreadFactory tf, ThreadsMonitoring tMonitoring) {
-    /**
+    /*
      * How long an idle thread will wait, in milliseconds, before it is removed from its thread
      * pool. Default is (30000 * 60) ms (30 minutes). It is not static so it can be set at runtime
      * and pick up different values.
@@ -283,7 +283,7 @@ public class FunctionExecutionPooledExecutor extends ThreadPoolExecutor {
 
   public FunctionExecutionPooledExecutor(BlockingQueue<Runnable> q, int poolSize,
       PoolStatHelper stats, ThreadFactory tf, boolean forFnExec, ThreadsMonitoring tMonitoring) {
-    /**
+    /*
      * How long an idle thread will wait, in milliseconds, before it is removed from its thread
      * pool. Default is (30000 * 60) ms (30 minutes). It is not static so it can be set at runtime
      * and pick up different values.
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/HealthMonitorImpl.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/HealthMonitorImpl.java
index 09ce293..8c5e3fd 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/HealthMonitorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/HealthMonitorImpl.java
@@ -51,8 +51,8 @@ public class HealthMonitorImpl implements HealthMonitor, Runnable {
   @MakeNotStatic
   private static int idCtr = 0;
 
-  /********** Constructors *********/
-  /**
+  /* Constructors */
+  /*
    * Creates a health monitor given its owner, configuration, and its dm
    */
   public HealthMonitorImpl(InternalDistributedMember owner, GemFireHealthConfig config,
@@ -91,7 +91,7 @@ public class HealthMonitorImpl implements HealthMonitor, Runnable {
     }
   }
 
-  /********** HealthMonitorImpl public methods **********/
+  /* HealthMonitorImpl public methods */
   /**
    * Starts the monitor so that it will periodically do health checks.
    */
@@ -107,7 +107,7 @@ public class HealthMonitorImpl implements HealthMonitor, Runnable {
     this.t.start();
   }
 
-  /********** Runnable interface implementation **********/
+  /* Runnable interface implementation */
 
   @Override
   public void run() {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
index 823844f..5b369e7 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
@@ -881,9 +881,6 @@ public class InternalDistributedSystem extends DistributedSystem
   /**
    * Starts a locator in this JVM iff the distribution config wants one started.
    *
-   * @return the membershipLocatorArg if the distribution config has no locator specified;
-   *         otherwise starts a new InternalLocator and returns its associated MembershipLocator
-   *
    * @since GemFire 5.7
    * @param membershipLocatorArg on initial startup, a MembershipLocator provided explicitly by
    *        a caller, or null; on restart, the old MembershipLocator (from the previous instance of
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
index ee59fc9..f2e9f51 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/LonerDistributionManager.java
@@ -1463,7 +1463,7 @@ public class LonerDistributionManager implements DistributionManager {
   }
 
   @Override
-  /** returns the Threads Monitoring instance */
+  /* returns the Threads Monitoring instance */
   public ThreadsMonitoring getThreadMonitoring() {
     return this.threadMonitor;
   }
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java
index e6472b4..99eba72 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/PooledExecutorWithDMStats.java
@@ -144,7 +144,7 @@ public class PooledExecutorWithDMStats extends ThreadPoolExecutor {
   public PooledExecutorWithDMStats(BlockingQueue<Runnable> q, int poolSize, PoolStatHelper stats,
       ThreadFactory tf, ThreadsMonitoring tMonitoring,
       String systemPropertyPrefix) {
-    /**
+    /*
      * How long an idle thread will wait, in milliseconds, before it is removed from its thread
      * pool. Default is (30000 * 60) ms (30 minutes). It is not static so it can be set at runtime
      * and pick up different values.
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java
index 601feb4..ee5fcb4 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupMessage.java
@@ -35,6 +35,7 @@ import org.apache.geode.internal.InternalDataSerializer.SerializerAttributesHold
 import org.apache.geode.internal.InternalInstantiator;
 import org.apache.geode.internal.InternalInstantiator.InstantiatorAttributesHolder;
 import org.apache.geode.internal.inet.LocalHostUtil;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 import org.apache.geode.internal.serialization.DeserializationContext;
 import org.apache.geode.internal.serialization.SerializationContext;
 import org.apache.geode.internal.serialization.Version;
@@ -377,7 +378,8 @@ public class StartupMessage extends DistributionMessage implements AdminMessageT
   }
 
   /**
-   * Notes a problem that occurs while invoking {@link DataSerializableFixedID#fromData}.
+   * Notes a problem that occurs while invoking
+   * {@link DataSerializableFixedID#fromData(DataInput, DeserializationContext)}.
    */
   private void recordFromDataProblem(String s) {
     if (this.fromDataProblems == null) {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseMessage.java
index 27fe837..6b6607f 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/StartupResponseMessage.java
@@ -77,7 +77,7 @@ public class StartupResponseMessage extends DistributionMessage
     this.distributedSystemId = dm.getDistributedSystemId();
     this.redundancyZone = dm.getRedundancyZone(dm.getId());
 
-    /**
+    /*
      * To fix B39705, we have added the instance variables to initialize the information about the
      * instantiators. While preparing the response message, we populate this information.
      **/
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
index 4799270..1ab4bd5 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/direct/DirectChannel.java
@@ -251,7 +251,7 @@ public class DirectChannel {
     try {
       do {
         interrupted = Thread.interrupted() || interrupted;
-        /**
+        /*
          * Exceptions that happened during one attempt to send
          */
         if (retryInfo != null) {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockToken.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockToken.java
index 7bd558b..63ed486 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockToken.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockToken.java
@@ -299,7 +299,6 @@ public class DLockToken {
    * @param newLeaseId uniquely identifies the lease for this thread
    * @param newRecursion recursion count if lock has been re-entered
    * @param remoteThread identity of the leasing thread
-   * @return true if lease for this lock token is successfully granted
    */
   synchronized void grantLock(long newLeaseExpireTime, int newLeaseId, int newRecursion,
       RemoteThread remoteThread) {
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
index 46cadb5..ef6102e 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
@@ -172,7 +172,6 @@ public class InternalDistributedMember
    * @param groups the server groups / roles
    * @param attr durable client attributes, if any
    *
-   * @throws UnknownHostException if the given hostname cannot be resolved
    */
   public InternalDistributedMember(String host, int p, String n, String u, int vmKind,
       String[] groups, DurableClientAttributes attr) {
diff --git a/geode-core/src/main/java/org/apache/geode/examples/SimpleSecurityManager.java b/geode-core/src/main/java/org/apache/geode/examples/SimpleSecurityManager.java
index f7aac4e..97679ce 100644
--- a/geode-core/src/main/java/org/apache/geode/examples/SimpleSecurityManager.java
+++ b/geode-core/src/main/java/org/apache/geode/examples/SimpleSecurityManager.java
@@ -42,7 +42,7 @@ public class SimpleSecurityManager implements SecurityManager {
   }
 
   @Override
-  /**
+  /*
    * these following users will be authenticated:
    * 1. auth token defined as SimpleSecurityManager.VALID_TOKEN
    * 2. username and password that are the same
@@ -65,7 +65,7 @@ public class SimpleSecurityManager implements SecurityManager {
   }
 
   @Override
-  /**
+  /*
    * these following users will be authorized for the permission:
    * 1. All authtoken users will be authorized
    * 2. users with passwords, if the permission string (without the :) starts with the username,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/SystemAdmin.java b/geode-core/src/main/java/org/apache/geode/internal/SystemAdmin.java
index 75b7821..bcba5ad 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/SystemAdmin.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/SystemAdmin.java
@@ -194,10 +194,10 @@ public class SystemAdmin {
       throw new GemFireIOException("Unable to delete " + logFile.getAbsolutePath());
     }
     boolean treatAsPure = true;
-    /**
+    /*
      * A counter used by PureJava to determine when its waited too long to start the locator
      * process. countDown * 250 = how many seconds to wait before giving up.
-     **/
+     */
     int countDown = 60;
     // NYI: wait around until we can attach
     while (!ManagerInfo.isLocatorStarted(directory)) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/SystemTimer.java b/geode-core/src/main/java/org/apache/geode/internal/SystemTimer.java
index 9ce3525..1feba43 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/SystemTimer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/SystemTimer.java
@@ -81,10 +81,7 @@ public class SystemTimer {
 
   /**
    * List of all of the swarms in the system
-   *
-   * @guarded.By self
    */
-  // <T, HashMap<Object, ArrayList<WeakReference<SystemTimer>>>>
   @MakeNotStatic
   private static final HashMap allSwarms = new HashMap();
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java b/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java
index dca91b3..b7f0693 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/admin/GemFireVM.java
@@ -254,21 +254,6 @@ public interface GemFireVM {
    */
   void takeRegionSnapshot(String regionName, int snapshotId);
 
-  // /**
-  // * Clears any results of a snapshot request still waiting to be streamed back
-  // */
-  // public void flushSnapshots();
-
-
-  /**
-   * Returns the name given to the {@link org.apache.geode.GemFireConnection} of this process
-   */
-  // public String getName();
-
-  // /**
-  // * Returns true if a cache has been created.
-  // */
-  // public boolean hasCache();
   /**
    * The distribution ID if this VM. Its used to identify this VM by members if this VM's
    * distributed system.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
index 27cf365..fd8be1d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
@@ -114,7 +114,7 @@ public abstract class AbstractBucketRegionQueue extends BucketRegion {
 
   @Override
   protected void distributeUpdateOperation(EntryEventImpl event, long lastModified) {
-    /**
+    /*
      * no-op as there is no need to distribute this operation.
      */
   }
@@ -148,7 +148,7 @@ public abstract class AbstractBucketRegionQueue extends BucketRegion {
 
   @Override
   public void basicDestroyBeforeRemoval(RegionEntry entry, EntryEventImpl event) {
-    /**
+    /*
      * We are doing local destroy on this bucket. No need to send destroy operation to remote nodes.
      */
     if (logger.isDebugEnabled()) {
@@ -160,7 +160,7 @@ public abstract class AbstractBucketRegionQueue extends BucketRegion {
 
   @Override
   protected void distributeDestroyOperation(EntryEventImpl event) {
-    /**
+    /*
      * no-op as there is no need to distribute this operation.
      */
   }
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AcceptHelper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AcceptHelper.java
index 7ca8d06..f332e61 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AcceptHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AcceptHelper.java
@@ -16,8 +16,7 @@
 package org.apache.geode.internal.cache;
 
 
-/**
- *
+/*
  *
  * Helper class that holds values needed by the search optimizer to do its work.
  *
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java
index ac20526..d91786f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegion.java
@@ -1895,7 +1895,6 @@ public class BucketRegion extends DistributedRegion implements Bucket {
    * @param adjunctRecipients recipients that must unconditionally get the event
    * @param filterRoutingInfo routing information for all members having the region
    * @param processor the reply processor, or null if there isn't one
-   * @return the set of failed recipients
    */
   void performRemoveAllAdjunctMessaging(DistributedRemoveAllOperation op,
       Set cacheOpRecipients, Set<InternalDistributedMember> adjunctRecipients,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCommitMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCommitMessage.java
index 8cd7c7f..58a6d4e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCommitMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXCommitMessage.java
@@ -277,9 +277,7 @@ public class DistTXCommitMessage extends TXMessage {
    * Reply processor which collects all CommitReplyExceptions for Dist Tx and emits a detailed
    * failure exception if problems occur
    *
-   * @see TXCommitMessage.CommitReplyProcessor
-   *
-   *      [DISTTX] TODO see if need ReliableReplyProcessor21? departed members?
+   * [DISTTX] TODO see if need ReliableReplyProcessor21? departed members?
    */
   public static class DistTxCommitReplyProcessor extends ReplyProcessor21 {
     private HashMap<DistributedMember, DistTXCoordinatorInterface> msgMap;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java
index 29341c6..6a98fa6 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXPrecommitMessage.java
@@ -280,9 +280,7 @@ public class DistTXPrecommitMessage extends TXMessage {
    * Reply processor which collects all CommitReplyExceptions for Dist Tx and emits a detailed
    * failure exception if problems occur
    *
-   * @see TXCommitMessage.CommitReplyProcessor
-   *
-   *      [DISTTX] TODO see if need ReliableReplyProcessor21? departed members?
+   * [DISTTX] TODO see if need ReliableReplyProcessor21? departed members?
    */
   public static class DistTxPrecommitReplyProcessor extends ReplyProcessor21 {
     private HashMap<DistributedMember, DistTXCoordinatorInterface> msgMap;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java
index b4b56d1..f7e7176 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistTXRollbackMessage.java
@@ -276,9 +276,7 @@ public class DistTXRollbackMessage extends TXMessage {
    * Reply processor which collects all CommitReplyExceptions for Dist Tx and emits a detailed
    * failure exception if problems occur
    *
-   * @see TXCommitMessage.CommitReplyProcessor
-   *
-   *      [DISTTX] TODO see if need ReliableReplyProcessor21? departed members?
+   * [DISTTX] TODO see if need ReliableReplyProcessor21? departed members?
    */
   public static class DistTxRollbackReplyProcessor extends ReplyProcessor21 {
     private HashMap<DistributedMember, DistTXCoordinatorInterface> msgMap;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java
index 9d49bcf..74d7eef 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedPutAllOperation.java
@@ -1160,7 +1160,7 @@ public class DistributedPutAllOperation extends AbstractUpdateOperation {
           InternalDistributedMember id = rgn.getMyId();
           ev.setLocalFilterInfo(entry.filterRouting.getFilterInfo(id));
         }
-        /**
+        /*
          * Setting tailKey for the secondary bucket here. Tail key was update by the primary.
          */
         ev.setTailKey(entry.getTailKey());
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
index 28ad989..b3135d5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRemoveAllOperation.java
@@ -941,7 +941,7 @@ public class DistributedRemoveAllOperation extends AbstractUpdateOperation {
           InternalDistributedMember id = rgn.getMyId();
           ev.setLocalFilterInfo(entry.filterRouting.getFilterInfo(id));
         }
-        /**
+        /*
          * Setting tailKey for the secondary bucket here. Tail key was update by the primary.
          */
         ev.setTailKey(entry.getTailKey());
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesMap.java
index e9a860c..ba84a9b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntriesMap.java
@@ -34,25 +34,25 @@ public interface EntriesMap extends ConcurrentMap {
    * the map is constructed has no effect.
    */
   class Attributes {
-    /**
+    /*
      * The initial capacity. The implementation performs internal sizing to accommodate this many
      * elements.
      */
     // int initialCapacity = 16;
 
-    /** the load factor threshold, used to control resizing. */
+    /* the load factor threshold, used to control resizing. */
     // float loadFactor = 0.75f;
 
-    /**
+    /*
      * the estimated number of concurrently updating threads. The implementation performs internal
      * sizing to try to accommodate this many threads.
      */
     // int concurrencyLevel = 16;
 
-    /** whether "api" statistics are enabled */
+    /* whether "api" statistics are enabled */
     // boolean statisticsEnabled = false;
 
-    /** whether LRU stats are required */
+    /* whether LRU stats are required */
     // boolean lru = false;
   }
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
index fb8b60e..6d40959 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
@@ -15,7 +15,7 @@
 
 package org.apache.geode.internal.cache;
 
-/**
+/*
  * EntryExpiryTask represents a timeout event for a region entry.
  */
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
index 092fd95..deb6c6c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
@@ -18,6 +18,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.RejectedExecutionException;
 
 import org.apache.logging.log4j.Logger;
+import org.jgroups.annotations.GuardedBy;
 
 import org.apache.geode.CancelException;
 import org.apache.geode.InternalGemFireError;
@@ -186,9 +187,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
 
   protected abstract void basicPerformTimeout(boolean isPending) throws CacheException;
 
-  /**
-   * @guarded.By suspendLock
-   */
+  @GuardedBy("suspendLock")
   @MakeNotStatic
   private static boolean expirationSuspended = false;
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ForceableLinkedBlockingQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ForceableLinkedBlockingQueue.java
index 9a2e887..6cd3b5f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ForceableLinkedBlockingQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ForceableLinkedBlockingQueue.java
@@ -272,8 +272,8 @@ public class ForceableLinkedBlockingQueue<E> extends AbstractQueue<E>
    * Inserts the specified element at the tail of this queue, waiting if necessary for space to
    * become available.
    *
-   * @throws InterruptedException {@inheritDoc}
-   * @throws NullPointerException {@inheritDoc}
+   * @throws InterruptedException {@inheritDoc} when this method is unable to get the put lock
+   * @throws NullPointerException {@inheritDoc} when this method attempts to put null
    */
   @Override
   public void put(E e) throws InterruptedException {
@@ -337,8 +337,8 @@ public class ForceableLinkedBlockingQueue<E> extends AbstractQueue<E>
    *
    * @return {@code true} if successful, or {@code false} if the specified waiting time elapses
    *         before space is available.
-   * @throws InterruptedException {@inheritDoc}
-   * @throws NullPointerException {@inheritDoc}
+   * @throws InterruptedException {@inheritDoc} when this method is unable to acquire the put lock
+   * @throws NullPointerException {@inheritDoc} when this method attempts to insert null
    */
   @Override
   public boolean offer(E e, long timeout, TimeUnit unit) throws InterruptedException {
@@ -647,10 +647,14 @@ public class ForceableLinkedBlockingQueue<E> extends AbstractQueue<E>
   }
 
   /**
-   * @throws UnsupportedOperationException {@inheritDoc}
-   * @throws ClassCastException {@inheritDoc}
-   * @throws NullPointerException {@inheritDoc}
-   * @throws IllegalArgumentException {@inheritDoc}
+   * @throws UnsupportedOperationException if addition of elements
+   *         is not supported by the specified collection
+   * @throws ClassCastException if the class of an element of this queue
+   *         prevents it from being added to the specified collection
+   * @throws NullPointerException if the specified collection is null
+   * @throws IllegalArgumentException if the specified collection is this
+   *         queue, or some property of an element of this queue prevents
+   *         it from being added to the specified collection
    */
   @Override
   public int drainTo(Collection<? super E> c) {
@@ -658,10 +662,14 @@ public class ForceableLinkedBlockingQueue<E> extends AbstractQueue<E>
   }
 
   /**
-   * @throws UnsupportedOperationException {@inheritDoc}
-   * @throws ClassCastException {@inheritDoc}
-   * @throws NullPointerException {@inheritDoc}
-   * @throws IllegalArgumentException {@inheritDoc}
+   * @throws UnsupportedOperationException if addition of elements
+   *         is not supported by the specified collection
+   * @throws ClassCastException if the class of an element of this queue
+   *         prevents it from being added to the specified collection
+   * @throws NullPointerException if the specified collection is null
+   * @throws IllegalArgumentException if the specified collection is this
+   *         queue, or some property of an element of this queue prevents
+   *         it from being added to the specified collection
    */
   @Override
   public int drainTo(Collection<? super E> c, int maxElements) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
index e47a1c3..45e0568 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InitialImageOperation.java
@@ -255,7 +255,8 @@ public class InitialImageOperation {
    * @param targetReinitialized true if candidate should wait until initialized before responding
    * @param recoveredRVV recovered rvv
    * @return true if succeeded to get image
-   * @throws org.apache.geode.cache.TimeoutException
+   * @throws org.apache.geode.cache.TimeoutException when it is unable to get a reply within the
+   *         limit.
    */
   GIIStatus getFromOne(Set recipientSet, boolean targetReinitialized,
       CacheDistributionAdvisor.InitialImageAdvice advice, boolean recoveredFromDisk,
@@ -263,7 +264,7 @@ public class InitialImageOperation {
     final boolean isDebugEnabled = logger.isDebugEnabled();
 
     if (VMOTION_DURING_GII) {
-      /**
+      /*
        * TODO (ashetkar): recipientSet may contain more than one member. Ensure only the gii-source
        * member is vMotioned. The test hook may need to be placed at another point.
        */
@@ -3907,7 +3908,7 @@ public class InitialImageOperation {
             ex.getMessage(), ex);
       }
 
-      /**
+      /*
        * now that interest is in place we need to flush operations to the image provider
        */
       for (String regionName : regionsWithInterest) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalDataView.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalDataView.java
index f5de7e5..be9665f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalDataView.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalDataView.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- * File comment
- */
 package org.apache.geode.internal.cache;
 
 import java.util.Collection;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LoaderHelperFactory.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LoaderHelperFactory.java
index a0ffaab..c980077 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LoaderHelperFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LoaderHelperFactory.java
@@ -12,12 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- * The LoaderHelperFactory inspiration came from a need to allow Partitioned Regions to generate a
- * LoaderHelper that was outside the context of the Region the loader invoked from.
- *
- * @since GemFire 5.0
- */
 package org.apache.geode.internal.cache;
 
 import org.apache.geode.cache.LoaderHelper;
@@ -25,6 +19,8 @@ import org.apache.geode.cache.LoaderHelper;
 /**
  * The LoaderHelperFactory creates a LoaderHelper class which is used by a
  * {@link org.apache.geode.cache.CacheLoader}.
+ * The LoaderHelperFactory inspiration came from a need to allow Partitioned Regions to generate a
+ * LoaderHelper that was outside the context of the Region the loader invoked from.
  *
  * @since GemFire 5.0
  */
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataView.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataView.java
index e07201f..347a0dd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataView.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataView.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- * File comment
- */
 package org.apache.geode.internal.cache;
 
 import java.util.Set;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionExpiryTask.java
index d8865fa..9727912 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionExpiryTask.java
@@ -15,7 +15,7 @@
 
 package org.apache.geode.internal.cache;
 
-/**
+/*
  * RegionExpiryTask represents a timeout event for region expiration
  */
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXBucketRegionState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXBucketRegionState.java
index bd4bc42..e80bb4b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXBucketRegionState.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXBucketRegionState.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- * File comment
- */
 package org.apache.geode.internal.cache;
 
 public class TXBucketRegionState extends TXRegionState {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXManagerImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXManagerImpl.java
index 8c124a0..d8df8b2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXManagerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXManagerImpl.java
@@ -1238,7 +1238,7 @@ public class TXManagerImpl implements CacheTransactionManager, MembershipListene
   }
 
   @VisibleForTesting
-  /** remove the given TXStates for test */
+  /* remove the given TXStates for test */
   public void removeTransactions(Set<TXId> txIds, boolean distribute) {
     synchronized (this.hostedTXStates) {
       Iterator<Map.Entry<TXId, TXStateProxy>> iterator = this.hostedTXStates.entrySet().iterator();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateInterface.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateInterface.java
index 02d3f99..631a43c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateInterface.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateInterface.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- * File comment
- */
 package org.apache.geode.internal.cache;
 
 import java.util.Collection;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxy.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxy.java
index c147728..0c5898d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxy.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXStateProxy.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- * File comment
- */
 package org.apache.geode.internal.cache;
 
 import org.apache.geode.cache.client.internal.ServerRegionDataAccess;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ValueByteWrapper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ValueByteWrapper.java
index fe45eee..bedfed0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ValueByteWrapper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ValueByteWrapper.java
@@ -38,12 +38,6 @@ class ValueByteWrapper {
   }
 
   /**
-   * @return boolean returns true if the value bytes are a serialized object
-   *
-   *         boolean isSerialized() { return isSerialized; }
-   */
-
-  /**
    * @return byte[] returns the value bytes stored
    */
   byte[] getValueBytes() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/WrappedRegionMembershipListener.java b/geode-core/src/main/java/org/apache/geode/internal/cache/WrappedRegionMembershipListener.java
index d03fdfb..e45fa1c 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/WrappedRegionMembershipListener.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/WrappedRegionMembershipListener.java
@@ -14,6 +14,8 @@
  */
 package org.apache.geode.internal.cache;
 
+import org.jgroups.annotations.GuardedBy;
+
 import org.apache.geode.cache.EntryEvent;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionEvent;
@@ -32,9 +34,8 @@ class WrappedRegionMembershipListener implements RegionMembershipListener {
 
   /**
    * has initMembers been invoked?
-   *
-   * @guarded.By initLock
    */
+  @GuardedBy("initLock")
   private boolean initialized;
 
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/DiskEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/DiskEntry.java
index 7733db2..7b33d65 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/entries/DiskEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/entries/DiskEntry.java
@@ -1541,7 +1541,7 @@ public interface DiskEntry extends RegionEntry {
      * Removes the key/value pair in the given entry from disk
      *
      * @throws RegionClearedException If the operation is aborted due to a clear
-     * @see DiskRegion#remove
+     * @see DiskRegion#remove(InternalRegion, DiskEntry, boolean, boolean)
      */
     public static void removeFromDisk(DiskEntry entry, InternalRegion region, boolean isClear)
         throws RegionClearedException {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionExecutionNodePruner.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionExecutionNodePruner.java
index c42646f..dc7f960 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionExecutionNodePruner.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionExecutionNodePruner.java
@@ -85,7 +85,7 @@ public class FunctionExecutionNodePruner {
     int[] currentBucketArray = new int[buckets.size() + 1];
     currentBucketArray[0] = 0;
 
-    /**
+    /*
      * First Logic: Just implement the Greedy algorithm where you keep adding nodes which has the
      * biggest set of non-currentBucketSet. // Deterministic but it (almost)always chooses minimum
      * no of nodes to execute the function on.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/metrics/FunctionServiceStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/metrics/FunctionServiceStats.java
index dba8086..bbe417c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/metrics/FunctionServiceStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/metrics/FunctionServiceStats.java
@@ -117,7 +117,7 @@ public class FunctionServiceStats {
   private static final int _resultsReceived;
 
 
-  /**
+  /*
    * Static initializer to create and initialize the <code>StatisticsType</code>
    */
   static {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueueStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueueStats.java
index 71f73a0..dca6803 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueueStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueueStats.java
@@ -105,7 +105,7 @@ public class HARegionQueueStats {
   /** Id of the num sequence violated statistic */
   private static final int _numSequenceViolated;
 
-  /**
+  /*
    * Static initializer to create and initialize the <code>StatisticsType</code>
    */
   static {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockUpdateParticipantsMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockUpdateParticipantsMessage.java
index 24cfdf4..8674825 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockUpdateParticipantsMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockUpdateParticipantsMessage.java
@@ -39,8 +39,6 @@ import org.apache.geode.internal.serialization.SerializationContext;
  * Lessor (the origin VM of the transaction) crashes/departs before or while sending the
  * TXCommitMessage but after making the reservation for the transaction.
  *
- * @see org.apache.geode.internal.cache.TXCommitMessage#send(TXLockId)
- * @see org.apache.geode.internal.cache.TXCommitMessage#updateLockMembers
  * @see org.apache.geode.distributed.internal.locks.DLockGrantor#getLockBatch(Object)
  * @see org.apache.geode.distributed.internal.locks.DLockGrantor#updateLockBatch(Object,
  *      org.apache.geode.distributed.internal.locks.DLockBatch)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRFunctionStreamingResultCollector.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRFunctionStreamingResultCollector.java
index 713e119..ca09a2d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRFunctionStreamingResultCollector.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PRFunctionStreamingResultCollector.java
@@ -403,7 +403,7 @@ public class PRFunctionStreamingResultCollector extends FunctionStreamingResultC
       return;
     }
 
-    /**
+    /*
      * Below two cases should also be handled and not thrown exception Saving the exception
      * ForeceReattempt can also be added here? Also, if multipel nodes throw exception, one may
      * override another TODO: Wrap exception among each other or create a list of exceptions like
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveIndexesMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveIndexesMessage.java
index 77231f0..fc6d2d9 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveIndexesMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RemoveIndexesMessage.java
@@ -53,11 +53,6 @@ public class RemoveIndexesMessage extends PartitionMessage {
   private static final Logger logger = LogService.getLogger();
 
   /**
-   * Represents how many buckets had indexes and got removed.
-   */
-  // private int bucketIndexesRemoved;
-
-  /**
    * Name of the index to be removed.
    */
   private String indexName;
@@ -322,13 +317,6 @@ public class RemoveIndexesMessage extends PartitionMessage {
    */
   public static class RemoveIndexesResponse extends PartitionResponse {
 
-
-    /**
-     * Result of remove index.
-     */
-    // boolean result;
-
-
     /**
      * Number of buckets index removed.
      */
@@ -391,11 +379,6 @@ public class RemoveIndexesMessage extends PartitionMessage {
   public static class RemoveIndexesResult {
 
     /**
-     * Int representing number of total bucket indexes removed.
-     */
-    // private int numBucketIndexRemoved;
-
-    /**
      * Constructor.
      *
      * @param numBucketIndexRemoved number of total bucket indexes removed.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/region/entry/RegionEntryFactoryBuilder.java b/geode-core/src/main/java/org/apache/geode/internal/cache/region/entry/RegionEntryFactoryBuilder.java
index 8333b33..8e59013 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/region/entry/RegionEntryFactoryBuilder.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/region/entry/RegionEntryFactoryBuilder.java
@@ -58,7 +58,7 @@ public class RegionEntryFactoryBuilder {
     bitRepresentation |= withVersioning ? 8 : 0;
     bitRepresentation |= offHeap ? 16 : 0;
 
-    /**
+    /*
      * The bits represent all options |offHeap|versioning|disk|lru|stats|
      */
     switch (bitRepresentation) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java
index 201ef12..f15e518 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/AcceptorImpl.java
@@ -393,10 +393,21 @@ public class AcceptorImpl implements Acceptor, Runnable {
    * <p>
    * Initializes this acceptor thread to listen for connections on the given port.
    *
-   * @param gatewayReceiver the GatewayReceiver that will use this AcceptorImpl instance
-   * @param gatewayReceiverMetrics the GatewayReceiverMetrics to use for exposing metrics
    * @param port The port on which this acceptor listens for connections. If {@code 0}, a
    *        random port will be chosen.
+   * @param notifyBySubscription the bridges setting whether if it to be notified by subscription
+   * @param maximumMessageCount maximum message count setting in the Cache Client Notifier
+   * @param messageTimeToLive message time to live setting in the Cache Client Notifier
+   * @param connectionListener listener to detect if connect or disconnect events
+   * @param overflowAttributes overflow attributes of Cache Client Notifier
+   * @param tcpNoDelay TCP delay for the outgoing sockets
+   * @param serverConnectionFactory server connection factory for the client
+   * @param timeLimitMillis time limit to wait attemping to bind to a server socket
+   * @param socketCreatorSupplier socket creator for the server connection
+   * @param cacheClientNotifierProvider collection of cache client notifiers
+   * @param clientHealthMonitorProvider collection of clinet health monitors
+   * @param isGatewayReceiver flag to determine if member is gateway receiver
+   * @param statisticsClock maintains the JVM's clock
    * @param bindHostName The ip address or host name this acceptor listens on for connections. If
    *        {@code null} or "" then all local addresses are used
    * @param socketBufferSize The buffer size for server-side sockets
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
index f1fd2f1..89d9878 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
@@ -188,7 +188,7 @@ public class CacheClientProxy implements ClientSession {
    */
   protected static final int MESSAGE_OFFER_TIME = 0;
 
-  /**
+  /*
    * The default maximum message queue size
    */
   // protected static final int MESSAGE_QUEUE_SIZE_DEFAULT = 230000;
@@ -1898,15 +1898,19 @@ public class CacheClientProxy implements ClientSession {
         terminateDispatching(false);
         _cacheClientNotifier.statistics.incQueueDroppedCount();
 
-        /**
+        /*
          * Setting the expiration task to null again and cancelling existing one, if any. See
          * #50894.
          * <p/>
          * The message dispatcher may again set the expiry task in below path: <code>
-         *  org.apache.geode.internal.cache.tier.sockets.CacheClientProxy.scheduleDurableExpirationTask(CacheClientProxy.java:2020)
-         *  org.apache.geode.internal.cache.tier.sockets.CacheClientProxy.pauseDispatching(CacheClientProxy.java:924)
-         *  org.apache.geode.internal.cache.tier.sockets.CacheClientProxy$MessageDispatcher.pauseOrUnregisterProxy(CacheClientProxy.java:2813)
-         *  org.apache.geode.internal.cache.tier.sockets.CacheClientProxy$MessageDispatcher.run(CacheClientProxy.java:2692)
+         * org.apache.geode.internal.cache.tier.sockets.CacheClientProxy.
+         * scheduleDurableExpirationTask(CacheClientProxy.java:2020)
+         * org.apache.geode.internal.cache.tier.sockets.CacheClientProxy.pauseDispatching(
+         * CacheClientProxy.java:924)
+         * org.apache.geode.internal.cache.tier.sockets.CacheClientProxy$MessageDispatcher.
+         * pauseOrUnregisterProxy(CacheClientProxy.java:2813)
+         * org.apache.geode.internal.cache.tier.sockets.CacheClientProxy$MessageDispatcher.run(
+         * CacheClientProxy.java:2692)
          * </code>
          * <p/>
          * This is because message dispatcher may get an IOException with "Proxy closing due to
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyStats.java
index 82fb900..4337ce9 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxyStats.java
@@ -85,7 +85,7 @@ public class CacheClientProxyStats implements MessageStats {
   private static final int _cqCountId;
   private static final int _sentBytesId;
 
-  /**
+  /*
    * Static initializer to create and initialize the <code>StatisticsType</code>
    */
   static {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage.java
index 8742af5..71a69d2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage.java
@@ -23,6 +23,7 @@ import org.apache.geode.DataSerializer;
 import org.apache.geode.internal.cache.EnumListenerEvent;
 import org.apache.geode.internal.cache.EventID;
 import org.apache.geode.internal.cache.tier.MessageType;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 import org.apache.geode.internal.serialization.DeserializationContext;
 import org.apache.geode.internal.serialization.SerializationContext;
 import org.apache.geode.internal.serialization.Version;
@@ -159,7 +160,7 @@ public class ClientDataSerializerMessage extends ClientUpdateMessageImpl {
    * Writes an object to a <code>Datautput</code>.
    *
    * @throws IOException If this serializer cannot write an object to <code>out</code>.
-   * @see DataSerializableFixedID#fromData
+   * @see DataSerializableFixedID#toData(DataOutput, SerializationContext)
    */
   @Override
   public void toData(DataOutput out,
@@ -180,7 +181,7 @@ public class ClientDataSerializerMessage extends ClientUpdateMessageImpl {
    *
    * @throws IOException If this serializer cannot read an object from <code>in</code>.
    * @throws ClassNotFoundException If the class for an object being restored cannot be found.
-   * @see DataSerializableFixedID#toData
+   * @see DataSerializableFixedID#fromData(DataInput, DeserializationContext)
    */
   @Override
   public void fromData(DataInput in,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java
index 2d88cb5..988cb30 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage.java
@@ -24,6 +24,7 @@ import org.apache.geode.DataSerializer;
 import org.apache.geode.internal.cache.EnumListenerEvent;
 import org.apache.geode.internal.cache.EventID;
 import org.apache.geode.internal.cache.tier.MessageType;
+import org.apache.geode.internal.serialization.DataSerializableFixedID;
 import org.apache.geode.internal.serialization.DeserializationContext;
 import org.apache.geode.internal.serialization.SerializationContext;
 import org.apache.geode.internal.serialization.Version;
@@ -144,7 +145,7 @@ public class ClientInstantiatorMessage extends ClientUpdateMessageImpl {
    * Writes an object to a <code>Datautput</code>.
    *
    * @throws IOException If this serializer cannot write an object to <code>out</code>.
-   * @see DataSerializableFixedID#fromData
+   * @see DataSerializableFixedID#toData(DataOutput, SerializationContext)
    */
   @Override
   public void toData(DataOutput out,
@@ -165,7 +166,7 @@ public class ClientInstantiatorMessage extends ClientUpdateMessageImpl {
    *
    * @throws IOException If this serializer cannot read an object from <code>in</code>.
    * @throws ClassNotFoundException If the class for an object being restored cannot be found.
-   * @see DataSerializableFixedID#toData
+   * @see DataSerializableFixedID#fromData(DataInput, DeserializationContext)
    */
   @Override
   public void fromData(DataInput in,
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageDispatcher.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageDispatcher.java
index a0f91de..899b182 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageDispatcher.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/MessageDispatcher.java
@@ -95,11 +95,6 @@ public class MessageDispatcher extends LoggingThread {
   private volatile boolean _isStopped = true;
 
   /**
-   * guarded.By _pausedLock
-   */
-  // boolean _isPausedDispatcher = false;
-
-  /**
    * A lock object used to control pausing this dispatcher
    */
   protected final Object _pausedLock = new Object();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
index b2d1819..74c2785 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventImpl.java
@@ -922,7 +922,7 @@ public class GatewaySenderEventImpl
     if (this.substituteValue == null) {
       // If the value is already serialized, use it.
       this.valueIsObject = 0x01;
-      /**
+      /*
        * so ends up being stored in this.valueObj
        */
       @Retained(OffHeapIdentifier.GATEWAY_SENDER_EVENT_IMPL_VALUE)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderStats.java
index 94d4b1c..cf9cde4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderStats.java
@@ -161,7 +161,7 @@ public class GatewaySenderStats {
   /** Id of synchronization events provided */
   private static final int synchronizationEventsProvidedId;
 
-  /**
+  /*
    * Static initializer to create and initialize the <code>StatisticsType</code>
    */
   static {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java
index 0b5b5a8..e1fcbf7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java
@@ -79,7 +79,7 @@ public class ConcurrentParallelGatewaySenderEventProcessor
         sender.getDispatcherThreads());
 
     nDispatcher = sender.getDispatcherThreads();
-    /**
+    /*
      * We have to divide the buckets/shadowPRs here. So that the individual processors can start
      * with a set of events to deal with In case of shadowPR getting created it will have to attach
      * itself to one of the processors when they are created.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java
index 8cf1ceb..c492835 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXml.java
@@ -546,10 +546,10 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
   protected static final String KEY_INDEX = "key-index";
   /** The name of the index type attribute */
   protected static final String INDEX_TYPE = "type";
-  /** The name of the <code>hash-index</code> index type attribute */
-  /**
+  /* The name of the <code>hash-index</code> index type attribute */
+  /*
    * @deprecated Due to the overhead caused by rehashing while expanding the backing array, Hash
-   *             Index has been deprecated since Apache Geode 1.4.0. Use {@link CacheXml#FUNCTIONAL}
+   * Index has been deprecated since Apache Geode 1.4.0. Use {@link CacheXml#FUNCTIONAL}
    */
   @Deprecated
   protected static final String HASH_INDEX_TYPE = "hash";
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java
index 67e8ee0..82323f0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlParser.java
@@ -188,7 +188,7 @@ public class CacheXmlParser extends CacheXml implements ContentHandler {
    */
   public static CacheXmlParser parse(InputStream is) {
 
-    /**
+    /*
      * The API doc http://java.sun.com/javase/6/docs/api/org/xml/sax/InputSource.html for the SAX
      * InputSource says: "... standard processing of both byte and character streams is to close
      * them on as part of end-of-parse cleanup, so applications should not attempt to re-use such
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlPropertyResolver.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlPropertyResolver.java
index 053d5cf..6c8c2a0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlPropertyResolver.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlPropertyResolver.java
@@ -112,7 +112,7 @@ public class CacheXmlPropertyResolver implements PropertyResolver {
       if (helper == null) {
         helper = new CacheXmlPropertyResolverHelper(prefix, suffix);
       }
-      /**
+      /*
        * A <code>resolvedString</code> can be same as <code>stringWithPrefixAndSuffix</code> if
        * <code>ignoreUnresolvedProperties</code> is set true and we just return it as is.
        */
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlPropertyResolverHelper.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlPropertyResolverHelper.java
index a8be432..f61e846 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlPropertyResolverHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheXmlPropertyResolverHelper.java
@@ -97,13 +97,13 @@ public class CacheXmlPropertyResolverHelper {
           throw new IllegalArgumentException("Some still unresolved string " + replaceableString
               + " was replaced by resolver, leading to circular references.");
         }
-        /** Find the replacement using given <code>resolver</code> */
+        /* Find the replacement using given <code>resolver</code> */
         replaceableString =
             parseResolvablePropString(replaceableString, resolver, visitedReplaceableStrings);
         String replacement = resolver.resolveReplaceString(replaceableString);
 
         if (replacement != null) {
-          /**
+          /*
            * put replacement in <code>unparsedString</code> and call
            * <code>parseResolvablePropString</code> recursively to find more unparsedStrings in the
            * replaced value of given unparsedString.
@@ -112,7 +112,7 @@ public class CacheXmlPropertyResolverHelper {
           buf.replace(prefixIndex, suffixIndex + propertySuffix.length(), replacement);
           prefixIndex = buf.indexOf(propertyPrefix, prefixIndex + replacement.length());
         } else if (resolver.isIgnoreUnresolvedProperties()) {
-          /** Look for more replaceable strings in given <code>unparsedString</code>. */
+          /* Look for more replaceable strings in given <code>unparsedString</code>. */
           prefixIndex = buf.indexOf(propertyPrefix, suffixIndex + propertySuffix.length());
         } else {
           throw new IllegalArgumentException(
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/DiskStoreAttributesCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/DiskStoreAttributesCreation.java
index a2aac0d..3ff4376 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/DiskStoreAttributesCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/DiskStoreAttributesCreation.java
@@ -34,7 +34,7 @@ import org.apache.geode.internal.cache.UserSpecifiedDiskStoreAttributes;
 public class DiskStoreAttributesCreation extends UserSpecifiedDiskStoreAttributes
     implements Serializable, DiskStore {
 
-  /**
+  /*
    * An <code>AttributesFactory</code> for creating default <code>RegionAttribute</code>s
    */
   // private static final DiskStoreFactory defaultFactory = new DiskStoreFactoryImpl();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ResourceManagerCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ResourceManagerCreation.java
index dda0871..92f9c0f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ResourceManagerCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/ResourceManagerCreation.java
@@ -12,9 +12,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-/**
- * File comment
- */
 package org.apache.geode.internal.cache.xmlcache;
 
 import java.util.Set;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/concurrent/CompactConcurrentHashSet2.java b/geode-core/src/main/java/org/apache/geode/internal/concurrent/CompactConcurrentHashSet2.java
index a6453c7..287e6f4 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/concurrent/CompactConcurrentHashSet2.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/concurrent/CompactConcurrentHashSet2.java
@@ -1604,11 +1604,6 @@ public class CompactConcurrentHashSet2<V> extends AbstractSet<V> implements Set<
      *
      * @return null if added
      */
-    /**
-     * Finds or adds a node.
-     *
-     * @return null if added
-     */
     TreeNode<K> putTreeVal(int h, K k) {
       Class<?> kc = null;
       boolean searched = false;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/ConfiguredDataSourceProperties.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/ConfiguredDataSourceProperties.java
index 2fff243..a47182f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/ConfiguredDataSourceProperties.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/ConfiguredDataSourceProperties.java
@@ -200,7 +200,7 @@ public class ConfiguredDataSourceProperties implements Serializable {
       maxPoolSize = mxpoolSize;
   }
 
-  /**
+  /*
    * Sets the max idle time
    *
    */
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImpl.java
index 97be145..95f3446 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/ConnectionPoolCacheImpl.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.internal.datasource;
 
-/**
+/*
  * This class models a connection pool for non-transactional database connection. Extends the
  * AbstractPoolCache to inherit the pool bahavior.
  *
diff --git a/geode-core/src/main/java/org/apache/geode/internal/datasource/DataSourceFactory.java b/geode-core/src/main/java/org/apache/geode/internal/datasource/DataSourceFactory.java
index 8836b4f..39615ec 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/datasource/DataSourceFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/datasource/DataSourceFactory.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.internal.datasource;
 
-/**
+/*
  * This class models a datasource factory.The datasource factory has funtions to create 3 types of
  * datasources. 1) Basic datasource without any connection pooling. 2) Datasource with pooled
  * connections. 3) Datasource with pooled connection and transaction capabilities.
diff --git a/geode-core/src/main/java/org/apache/geode/internal/i18n/AbstractStringIdResourceBundle.java b/geode-core/src/main/java/org/apache/geode/internal/i18n/AbstractStringIdResourceBundle.java
index 3274ffc..6c75a4a 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/i18n/AbstractStringIdResourceBundle.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/i18n/AbstractStringIdResourceBundle.java
@@ -116,7 +116,7 @@ public class AbstractStringIdResourceBundle {
   }
 
   /**
-   * @param key StringId passed to {@link #getString java.util.ResourceBundle} for translation.
+   * @param key StringId passed for translation.
    * @return a String translated to the current {@link java.util.Locale}
    */
   public String getString(StringId key) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/io/CompositeOutputStream.java b/geode-core/src/main/java/org/apache/geode/internal/io/CompositeOutputStream.java
index fb4dc97..13b3114 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/io/CompositeOutputStream.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/io/CompositeOutputStream.java
@@ -133,7 +133,7 @@ public class CompositeOutputStream extends OutputStream implements Iterable<Outp
    * method of its underlying output stream.
    *
    * @exception IOException if an I/O error occurs.
-   * @see java.io.FilterOutputStream#out
+   * @see OutputStream#flush()
    */
   @Override
   public void flush() throws IOException {
@@ -150,8 +150,7 @@ public class CompositeOutputStream extends OutputStream implements Iterable<Outp
    * method, and then calls the <code>close</code> method of its underlying output stream.
    *
    * @exception IOException if an I/O error occurs.
-   * @see java.io.FilterOutputStream#flush()
-   * @see java.io.FilterOutputStream#out
+   * @see OutputStream#flush()
    */
   @Override
   public void close() throws IOException {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/jndi/JNDIInvoker.java b/geode-core/src/main/java/org/apache/geode/internal/jndi/JNDIInvoker.java
index a28ca5a..cb54ebd 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/jndi/JNDIInvoker.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jndi/JNDIInvoker.java
@@ -98,7 +98,7 @@ public class JNDIInvoker {
       {"java:comp/UserTransaction", "Orion, JTOM, BEA WebLogic"},
       // not sure about the following but leaving it for backwards compat
       {"javax.transaction.TransactionManager", "BEA WebLogic"}};
-  /** ************************************************* */
+  /* ************************************************* */
   /**
    * WebSphere 5.1 TransactionManagerFactory
    */
diff --git a/geode-core/src/main/java/org/apache/geode/internal/jta/GlobalTransaction.java b/geode-core/src/main/java/org/apache/geode/internal/jta/GlobalTransaction.java
index a123497..20c41ad 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/jta/GlobalTransaction.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jta/GlobalTransaction.java
@@ -14,18 +14,6 @@
  */
 package org.apache.geode.internal.jta;
 
-/**
- * <p>
- * GlobalTransaction is the JTA concept of a Global Transaction.
- * </p>
- *
- *
- * @since GemFire 4.0
- *
- * @deprecated as of Geode 1.2.0 user should use a third party JTA transaction manager to manage JTA
- *             transactions.
- */
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -43,6 +31,8 @@ import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 
+import org.jgroups.annotations.GuardedBy;
+
 import org.apache.geode.LogWriter;
 import org.apache.geode.SystemFailure;
 import org.apache.geode.annotations.internal.MakeNotStatic;
@@ -51,6 +41,17 @@ import org.apache.geode.distributed.DistributedSystemDisconnectedException;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
 
+/**
+ * <p>
+ * GlobalTransaction is the JTA concept of a Global Transaction.
+ * </p>
+ *
+ *
+ * @since GemFire 4.0
+ *
+ * @deprecated as of Geode 1.2.0 user should use a third party JTA transaction manager to manage JTA
+ *             transactions.
+ */
 @Deprecated
 public class GlobalTransaction {
 
@@ -549,8 +550,8 @@ public class GlobalTransaction {
    * String for current distributed system
    *
    * @see #IdsForId
-   * @guarded.By {@link #DmidMutex}
    */
+  @GuardedBy("DmidMutex")
   @MakeNotStatic
   private static String DMid = null;
 
@@ -558,8 +559,8 @@ public class GlobalTransaction {
    * Distributed system for given string
    *
    * @see #DMid
-   * @guarded.By {@link #DmidMutex}
    */
+  @GuardedBy("DmidMutex")
   @MakeNotStatic
   private static InternalDistributedSystem IdsForId = null;
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionImpl.java b/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionImpl.java
index 8147b04..69f28fc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionImpl.java
@@ -14,13 +14,6 @@
  */
 package org.apache.geode.internal.jta;
 
-/**
- * TransactionImpl implements the JTA Transaction interface.
- *
- * @deprecated as of Geode 1.2.0 user should use a third party JTA transaction manager to manage JTA
- *             transactions.
- */
-
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -36,6 +29,12 @@ import javax.transaction.xa.XAResource;
 
 import org.apache.geode.LogWriter;
 
+/**
+ * TransactionImpl implements the JTA Transaction interface.
+ *
+ * @deprecated as of Geode 1.2.0 user should use a third party JTA transaction manager to manage JTA
+ *             transactions.
+ */
 @Deprecated
 public class TransactionImpl implements Transaction {
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionManagerImpl.java b/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionManagerImpl.java
index bbc51a7..f1a66c5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionManagerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jta/TransactionManagerImpl.java
@@ -14,16 +14,6 @@
  */
 package org.apache.geode.internal.jta;
 
-/**
- * <p>
- * TransactionManager: A JTA compatible Transaction Manager.
- * </p>
- *
- * @since GemFire 4.1.1
- *
- * @deprecated as of Geode 1.2.0 user should use a third party JTA transaction manager instead.
- */
-
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.Comparator;
@@ -54,6 +44,16 @@ import org.apache.geode.annotations.internal.MakeNotStatic;
 import org.apache.geode.logging.internal.executors.LoggingThread;
 import org.apache.geode.logging.internal.log4j.api.LogService;
 
+/**
+ * <p>
+ * TransactionManager: A JTA compatible Transaction Manager.
+ * </p>
+ *
+ * @since GemFire 4.1.1
+ *
+ * @deprecated as of Geode 1.2.0 user should use a third party JTA transaction manager instead.
+ */
+
 @Deprecated
 public class TransactionManagerImpl implements TransactionManager, Serializable {
   private static final long serialVersionUID = 5033392316185449821L;
diff --git a/geode-core/src/main/java/org/apache/geode/internal/jta/UserTransactionImpl.java b/geode-core/src/main/java/org/apache/geode/internal/jta/UserTransactionImpl.java
index 6fb5e6b..49ad5d5 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/jta/UserTransactionImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jta/UserTransactionImpl.java
@@ -14,19 +14,6 @@
  */
 package org.apache.geode.internal.jta;
 
-/**
- * <p>
- * <code> UserTransactionImpl </code> is an implementation of UserTransaction interface. It is
- * hard-coded to <code> TransactionManagerImpl
- * </code>.
- * </p>
- *
- *
- * @since GemFire 4.0
- *
- * @deprecated as of Geode 1.2.0 user should use a third party JTA transaction manager to manage JTA
- *             transactions.
- */
 
 import java.io.Serializable;
 
@@ -41,6 +28,19 @@ import javax.transaction.UserTransaction;
 import org.apache.geode.LogWriter;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
 
+/**
+ * <p>
+ * <code> UserTransactionImpl </code> is an implementation of UserTransaction interface. It is
+ * hard-coded to <code> TransactionManagerImpl
+ * </code>.
+ * </p>
+ *
+ *
+ * @since GemFire 4.0
+ *
+ * @deprecated as of Geode 1.2.0 user should use a third party JTA transaction manager to manage JTA
+ *             transactions.
+ */
 @Deprecated
 public class UserTransactionImpl implements UserTransaction, Serializable {
   private static final long serialVersionUID = 2994652455204901910L;
@@ -58,20 +58,11 @@ public class UserTransactionImpl implements UserTransaction, Serializable {
   }
 
   /**
-   * has setTimeOutbeenCalled
-   */
-  // private boolean timeOutCalled = false;
-  /**
    * timeOut which is stored in case timeOut is called before begin
    */
   private int storedTimeOut = TransactionManagerImpl.DEFAULT_TRANSACTION_TIMEOUT;
 
   /**
-   * defaultTimeOut in seconds;
-   *
-   */
-  // private int defaultTimeOut = 600;
-  /**
    * Calls begin() of the transaction manager owning this user transaction
    *
    * @see javax.transaction.UserTransaction#begin()
diff --git a/geode-core/src/main/java/org/apache/geode/internal/jta/XidImpl.java b/geode-core/src/main/java/org/apache/geode/internal/jta/XidImpl.java
index 324cbea..39e5990 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/jta/XidImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/jta/XidImpl.java
@@ -14,6 +14,9 @@
  */
 package org.apache.geode.internal.jta;
 
+import javax.transaction.xa.XAException;
+import javax.transaction.xa.Xid;
+
 /**
  * <p>
  * XidImpl: A JTA compatible implementation of Xid
@@ -24,10 +27,6 @@ package org.apache.geode.internal.jta;
  * @deprecated as of Geode 1.2.0 user should use a third party JTA transaction manager to manage JTA
  *             transactions.
  */
-
-import javax.transaction.xa.XAException;
-import javax.transaction.xa.Xid;
-
 @Deprecated
 public class XidImpl implements Xid {
 
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocatorImpl.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocatorImpl.java
index ce5453a..75e2142 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocatorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/MemoryAllocatorImpl.java
@@ -281,7 +281,7 @@ public class MemoryAllocatorImpl implements MemoryAllocator {
     for (Object key : r.keySet()) {
       RegionEntry re = r.getRegionEntry(key);
       if (re != null) {
-        /**
+        /*
          * value could be GATEWAY_SENDER_EVENT_IMPL_VALUE or region entry value.
          */
         @Unretained(OffHeapIdentifier.GATEWAY_SENDER_EVENT_IMPL_VALUE)
diff --git a/geode-core/src/main/java/org/apache/geode/internal/offheap/RefCountChangeInfo.java b/geode-core/src/main/java/org/apache/geode/internal/offheap/RefCountChangeInfo.java
index 63595a3..6559e5b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/offheap/RefCountChangeInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/offheap/RefCountChangeInfo.java
@@ -19,7 +19,7 @@ import java.io.PrintStream;
 
 
 @SuppressWarnings("serial")
-/**
+/*
  * Used by MemoryAllocatorImpl to debug off-heap memory leaks.
  */
 public class RefCountChangeInfo extends Throwable {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/IOUtils.java b/geode-core/src/main/java/org/apache/geode/internal/util/IOUtils.java
index bd86a7d..1bb98a1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/IOUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/IOUtils.java
@@ -198,7 +198,7 @@ public abstract class IOUtils {
    * @param pathname a String indicating the name of the path.
    * @return a boolean indicating whether the path represented by name (pathname) actually exists in
    *         the file system of the localhost (system).
-   * @see org.apache.geode.internal.lang.StringUtils#isBlank(String)
+   * @see org.apache.geode.internal.lang.StringUtils#isNotBlank(CharSequence)
    * @see java.io.File#exists()
    */
   public static boolean isExistingPathname(final String pathname) {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/MemberMessenger.java b/geode-core/src/main/java/org/apache/geode/management/internal/MemberMessenger.java
index 64af0ea..b459940 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/MemberMessenger.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/MemberMessenger.java
@@ -42,8 +42,8 @@ public class MemberMessenger {
   /**
    * <pre>
    * Code path 1:  {@link FederatingManager#startManager()} ->
-   *               {@link FederatingManager#startManagingActivity()} ->
-   *               {@link FederatingManager.GIITask#call()} ->
+   *               FederatingManager.startManagingActivity() ->
+   *               FederatingManager.GIITask.call() ->
    *               {@code sendManagerInfo}
    * Recipient(s): {@link DistributionManager#getOtherDistributionManagerIds()}
    * When:         starting the manager
@@ -52,8 +52,8 @@ public class MemberMessenger {
    * <p>
    *
    * <pre>
-   * Code path 2:  {@link FederatingManager#addMember(DistributedMember)} ->
-   *               {@link FederatingManager.GIITask#call()} ->
+   * Code path 2:  FederatingManager.addMember(DistributedMember)} ->
+   *               FederatingManager.GIITask#call() ->
    *               {@code sendManagerInfo}
    * Recipient(s): one new member from membership listener
    * When:         new member joins
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MBeanAggregator.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MBeanAggregator.java
index fc1cdc9..d949daf 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MBeanAggregator.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MBeanAggregator.java
@@ -56,7 +56,7 @@ public class MBeanAggregator implements ProxyListener {
 
 
 
-  /**
+  /*
    * Static list of MBeans which are currently supported for aggregation
    */
   static {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBean.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBean.java
index c7d8428..d0380ef 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBean.java
@@ -425,12 +425,12 @@ public class MemberMBean extends NotificationBroadcasterSupport implements Membe
   }
 
   @Override
-  /**
+  /*
    * We don't expect any callers to call this code, but just in case, implementation is provided for
    * backward compatibility
    *
    * @deprecated since 1.4 use processCommand(String commandString, Map<String, String> env,
-   *             List<String> stagedFilePaths)
+   * List<String> stagedFilePaths)
    */
   public String processCommand(String commandString, Map<String, String> env, Byte[][] binaryData) {
     // save the binaryData into stagedFile first, and then call the new api
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/realizers/ConfigurationRealizer.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/realizers/ConfigurationRealizer.java
index 537159f..3b0ddd1 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/realizers/ConfigurationRealizer.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/realizers/ConfigurationRealizer.java
@@ -17,6 +17,7 @@
 package org.apache.geode.management.internal.configuration.realizers;
 
 import org.apache.geode.annotations.Experimental;
+import org.apache.geode.cache.configuration.CacheElement;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.management.api.RealizationResult;
 import org.apache.geode.management.configuration.AbstractConfiguration;
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/PdxWriter.java b/geode-core/src/main/java/org/apache/geode/pdx/PdxWriter.java
index 37866b8..6e4f0e3 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/PdxWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/PdxWriter.java
@@ -402,8 +402,7 @@ public interface PdxWriter {
    * Java Object[] is mapped to .NET System.Collections.Generic.List<Object>. For how each element
    * of the array is a mapped to .NET see {@link #writeObject(String, Object, boolean) writeObject}.
    * Note that this call may serialize elements that are not compatible with non-java languages. To
-   * ensure that only portable objects are serialized use
-   * {@link #writeObjectArray(String, Object[], boolean)}.
+   * ensure that only portable objects are serialized use this method
    *
    * @param fieldName the name of the field to write
    * @param value the value of the field to write
diff --git a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxReaderImpl.java b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxReaderImpl.java
index b4b7196..b4db35c 100644
--- a/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxReaderImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/pdx/internal/PdxReaderImpl.java
@@ -44,7 +44,6 @@ import org.apache.geode.pdx.internal.AutoSerializableManager.PdxFieldWrapper;
  * base class of our {@link PdxInstance} implementation. It is serializable because PdxInstance is.
  *
  * @since GemFire 6.6
- * @see InternalDataSerializer#readPdxSerializable(java.io.DataInput)
  */
 public class PdxReaderImpl implements InternalPdxReader, java.io.Serializable {
 
diff --git a/geode-cq/src/main/java/org/apache/geode/cache/query/cq/internal/CqServiceImpl.java b/geode-cq/src/main/java/org/apache/geode/cache/query/cq/internal/CqServiceImpl.java
index e93ed98..bf09bd7 100644
--- a/geode-cq/src/main/java/org/apache/geode/cache/query/cq/internal/CqServiceImpl.java
+++ b/geode-cq/src/main/java/org/apache/geode/cache/query/cq/internal/CqServiceImpl.java
@@ -727,7 +727,7 @@ public class CqServiceImpl implements CqService {
           if (!isRunning()) {
             // Not cache shutdown
             logger
-                .warn("Failed to close CQ %s %s",
+                .warn("Failed to close CQ {} : {}",
                     cqName, e.getMessage());
           }
           if (logger.isDebugEnabled()) {