No need for blank Javadoc lines between Javadoc @ tags
diff --git a/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/LateralGroupCacheJGListener.java b/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/LateralGroupCacheJGListener.java
index 7ba04ae..a95c7cd 100644
--- a/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/LateralGroupCacheJGListener.java
+++ b/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/LateralGroupCacheJGListener.java
@@ -48,7 +48,6 @@
     /**
      * Gets the instance attribute of the LateralGroupCacheJGListener class
      * @param ilca
-     *
      * @return The instance value
      */
     public static ILateralCacheListener getInstance( ILateralCacheAttributes ilca )
diff --git a/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/utils/JGSocketOpener.java b/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/utils/JGSocketOpener.java
index 9758055..c57f0a1 100644
--- a/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/utils/JGSocketOpener.java
+++ b/auxiliary-builds/jdk14/src/java/org/apache/commons/jcs/auxiliary/lateral/javagroups/utils/JGSocketOpener.java
@@ -69,7 +69,6 @@
      * Constructor for the SocketOpener object
      * @param lca
      * @param groupName
-     *
      * @param host
      * @param port
      */
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/admin/JCSAdminBean.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/admin/JCSAdminBean.java
index 98fc472..e0f5e7b 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/admin/JCSAdminBean.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/admin/JCSAdminBean.java
@@ -320,7 +320,6 @@
      *
      * @param cacheName
      * @param key
-     *
      * @throws IOException
      */
     @Override
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/admin/JCSJMXBean.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/admin/JCSJMXBean.java
index aeedaed..142038e 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/admin/JCSJMXBean.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/admin/JCSJMXBean.java
@@ -84,7 +84,6 @@
      *
      * @param cacheName
      * @param key
-     *
      * @throws IOException
      */
     void removeItem(String cacheName, String key) throws IOException;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskElementDescriptor.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskElementDescriptor.java
index 8ec39f9..312961f 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskElementDescriptor.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskElementDescriptor.java
@@ -55,7 +55,6 @@
      *

      * @param key the key

      * @param blocks the data

-     *

      * @since 3.1

      */

     public BlockDiskElementDescriptor(final K key, final int[] blocks)

diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/dsfactory/SharedPoolDataSourceFactory.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/dsfactory/SharedPoolDataSourceFactory.java
index a513149..364fad1 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/dsfactory/SharedPoolDataSourceFactory.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/dsfactory/SharedPoolDataSourceFactory.java
@@ -76,7 +76,6 @@
      *

      * @param dataSource the dataSource to initialize, not null.

      * @param config where to read the settings from, not null.

-     *

      * @throws SQLException if a property set fails.

      */

     private static void initJdbc2Pool(final InstanceKeyDataSource dataSource, final JDBCDiskCacheAttributes config)

diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java
index 5117c9c..2ba90b6 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java
@@ -67,7 +67,6 @@
      * @param attr  ITCPLateralCacheAttributes
      * @param cacheMgr the composite cache manager
      * @param serializer the serializer to use when receiving
-     *
      * @return the listener if created, else null
      */
     private static <K, V> ILateralCacheListener<K, V> createListener( final ITCPLateralCacheAttributes attr,
@@ -321,7 +320,6 @@
      * @param <V> cache value type
      * @param lca configuration for the creation of a new service instance
      * @param elementSerializer the serializer to use when sending or receiving
-     *
      * @return ICacheServiceNonLocal&lt;K, V&gt;
      * @since 3.1
      */
@@ -380,7 +378,6 @@
      * @param cacheManager a reference to the global cache manager
      * @param cacheEventLogger Reference to the cache event logger for auxiliary cache creation
      * @param elementSerializer Reference to the cache element serializer for auxiliary cache
-     *
      * @return The instance value
      */
     private LateralTCPDiscoveryListener getDiscoveryListener(final ITCPLateralCacheAttributes ilca,
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheFactory.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheFactory.java
index 260e7f3..f23b44c 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheFactory.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheFactory.java
@@ -178,7 +178,6 @@
      * Host and Port uniquely identify a manager instance.
      * <p>
      * @param cattr
-     *
      * @return The instance value or null if no such manager exists
      */
     public RemoteCacheManager getManager( final IRemoteCacheAttributes cattr )
@@ -204,7 +203,6 @@
      * @param cacheMgr the cache manager
      * @param cacheEventLogger the event logger
      * @param elementSerializer the serializer to use for sending and receiving
-     *
      * @return The instance value, never null
      */
     public RemoteCacheManager getManager( final IRemoteCacheAttributes cattr,
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/AbstractHttpClient.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/AbstractHttpClient.java
index 71e409d..56ca062 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/AbstractHttpClient.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/AbstractHttpClient.java
@@ -107,7 +107,6 @@
      * Execute the web service call
      * <p>
      * @param builder builder for the post request
-     *
      * @return the call response
      *
      * @throws IOException on i/o error
@@ -136,7 +135,6 @@
      * <p>
      * @param request http request
      * @param httpState result of execution
-     *
      * @throws IOException
      */
     protected abstract void postProcessWebserviceCall( HttpUriRequest request, HttpResponse httpState )
@@ -146,7 +144,6 @@
      * Called before the execute call on the client.
      * <p>
      * @param requestBuilder http method request builder
-     *
      * @throws IOException
      */
     protected abstract void preProcessWebserviceCall( RequestBuilder requestBuilder )
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheDispatcher.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheDispatcher.java
index 16fbba2..4850187 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheDispatcher.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheDispatcher.java
@@ -111,7 +111,6 @@
      * <p>
      * @param request http request
      * @param httpState result of execution
-     *
      * @throws IOException
      */
     @Override
@@ -125,7 +124,6 @@
      * Called before the execute call on the client.
      * <p>
      * @param requestBuilder http method request builder
-     *
      * @throws IOException
      */
     @Override
@@ -141,7 +139,6 @@
      * @param requestAsByteArray request body
      * @param remoteCacheRequest the cache request
      * @param url target url
-     *
      * @return byte[] - the response
      *
      * @throws IOException
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServer.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServer.java
index ecc5892..bd8daf5 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServer.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServer.java
@@ -103,7 +103,6 @@
      * <p>
      * @param prop the configuration object.
      * @return The cache hub configured with this configuration.
-     *
      * @throws CacheException if the configuration cannot be loaded
      */
     private static CompositeCacheManager createCacheManager( final Properties prop ) throws CacheException
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServerFactory.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServerFactory.java
index 3d8b7dd..fee7921 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServerFactory.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServerFactory.java
@@ -229,7 +229,6 @@
      * @param config the configuration properties
      * @param port the local port
      * @return the admin object instance
-     *
      * @throws Exception if lookup fails
      */
     private static ICacheServiceAdmin lookupCacheServiceAdmin(final Properties config, final int port) throws Exception
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/behavior/ICacheObserver.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/behavior/ICacheObserver.java
index 4667516..3b43c1f 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/behavior/ICacheObserver.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/behavior/ICacheObserver.java
@@ -66,7 +66,6 @@
     /**
      * Unsubscribes from the specified cache.
      * @param cacheName
-     *
      * @param obj
      *            existing subscriber.
      * @throws IOException
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCache.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCache.java
index fbcd5dd..719c2d6 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCache.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCache.java
@@ -576,7 +576,6 @@
      * Gets a set of the keys for all elements in the cache
      * <p>
      * @param localOnly true if only memory keys are requested
-     *
      * @return A set of the key type
      */
     public Set<K> getKeySet(final boolean localOnly)
@@ -996,7 +995,6 @@
      * Determine if the element is expired based on the values of the element attributes
      *
      * @param element the element
-     *
      * @return true if the element is expired
      */
     public boolean isExpired(final ICacheElement<K, V> element)
@@ -1013,7 +1011,6 @@
      * @param timestamp the timestamp to compare to
      * @param eventMaxlife the event to fire in case the max life time is exceeded
      * @param eventIdle the event to fire in case the idle time is exceeded
-     *
      * @return true if the element is expired
      */
     public boolean isExpired(final ICacheElement<K, V> element, final long timestamp,
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheConfigurator.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheConfigurator.java
index 3478618..71fc94a 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheConfigurator.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheConfigurator.java
@@ -226,7 +226,6 @@
      * @param props Configuration properties
      * @param regName the region name
      * @param defaultCCAttr the default cache attributes
-     *
      * @return ICompositeCacheAttributes
      */
     protected ICompositeCacheAttributes parseCompositeCacheAttributes( final Properties props,
@@ -242,7 +241,6 @@
      * @param regName the region name
      * @param defaultCCAttr the default cache attributes
      * @param regionPrefix the region prefix
-     *
      * @return ICompositeCacheAttributes
      */
     protected ICompositeCacheAttributes parseCompositeCacheAttributes( final Properties props,
@@ -283,7 +281,6 @@
      * @param regName the region name
      * @param defaultEAttr the default element attributes
      * @param regionPrefix the region prefix
-     *
      * @return IElementAttributes
      */
     protected IElementAttributes parseElementAttributes( final Properties props, final String regName,
@@ -351,7 +348,6 @@
      * @param ccm Cache hub
      * @param regName Name of the cache region
      * @param auxiliaries Comma separated list of auxiliaries
-     *
      * @return CompositeCache
      */
     protected <K, V> CompositeCache<K, V> parseRegion(
@@ -370,7 +366,6 @@
      * @param regName Name of the cache region
      * @param auxiliaries Comma separated list of auxiliaries
      * @param cca Cache configuration
-     *
      * @return CompositeCache
      */
     protected <K, V> CompositeCache<K, V> parseRegion(
@@ -389,7 +384,6 @@
      * @param auxiliaries Comma separated list of auxiliaries
      * @param cca Cache configuration
      * @param regionPrefix Prefix for the region
-     *
      * @return CompositeCache
      */
     protected <K, V> CompositeCache<K, V> parseRegion(
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheManager.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheManager.java
index 7e2bbd6..595d857 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheManager.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheManager.java
@@ -484,7 +484,6 @@
      *
      * @param auxName the auxiliary name
      * @param cacheName the region name
-     *
      * @return the cache instance
      */
     @Override
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryManager.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryManager.java
index 7dfe71c..90ad53c 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryManager.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryManager.java
@@ -72,7 +72,6 @@
      * @param updTTL
      * @param cacheMgr
      * @param serializer
-     *
      * @return UDPDiscoveryService
      * @since 3.1
      */
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/RemovalTestUtil.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/RemovalTestUtil.java
index 368815c..325a4ce 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/RemovalTestUtil.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/RemovalTestUtil.java
@@ -89,7 +89,6 @@
      *
      * @param start
      * @param end
-     *
      * @throws Exception
      *                Description of the Exception
      */
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheRandomConcurrentTestUtil.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheRandomConcurrentTestUtil.java
index 0506b49..578e50a 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheRandomConcurrentTestUtil.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheRandomConcurrentTestUtil.java
@@ -42,7 +42,6 @@
      * @param range
      * @param numOps
      * @param testNum
-     *
      * @throws Exception
      *                If an error occurs
      */
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheRandomConcurrentTestUtil.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheRandomConcurrentTestUtil.java
index ada697e..4018dca 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheRandomConcurrentTestUtil.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheRandomConcurrentTestUtil.java
@@ -40,7 +40,6 @@
      * @param range
      * @param numOps
      * @param testNum
-     *
      * @throws Exception
      *                If an error occurs
      */
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/HsqlSetupUtil.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/HsqlSetupUtil.java
index 4da1f0f..60a33da 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/HsqlSetupUtil.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/HsqlSetupUtil.java
@@ -45,7 +45,6 @@
      *
      * @param testProperties test database properties
      * @param testDBName name of the test database
-     *
      * @return a connection to the database
      *
      * @throws Exception
@@ -71,7 +70,6 @@
      * <p>
      * @param cConn
      * @param tableName
-     *
      * @throws SQLException if database problems occur
      */
     public static void setupTable( final Connection cConn, final String tableName ) throws SQLException
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPConcurrentRandomTestUtil.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPConcurrentRandomTestUtil.java
index 24a6a7f..24771ac 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPConcurrentRandomTestUtil.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPConcurrentRandomTestUtil.java
@@ -60,7 +60,6 @@
      * @param range

      * @param numOps

      * @param testNum

-     *

      * @throws Exception

      *                If an error occurs

      */

diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPFilterRemoveHashCodeUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPFilterRemoveHashCodeUnitTest.java
index 401de5a..3318672 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPFilterRemoveHashCodeUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPFilterRemoveHashCodeUnitTest.java
@@ -64,7 +64,6 @@
      *            Name of the region to access

      * @param numOps

      * @param testNum

-     *

      * @throws Exception

      *                If an error occurs

      */

diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/TestRemoteCacheFactory.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/TestRemoteCacheFactory.java
index 9c6fc7d..2e70505 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/TestRemoteCacheFactory.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/TestRemoteCacheFactory.java
@@ -74,7 +74,6 @@
      * Host and Port uniquely identify a manager instance.
      * <p>
      * @param cattr
-     *
      * @return The instance value or null if no such manager exists
      */
     @Override
@@ -101,7 +100,6 @@
      * @param cacheMgr the cache manager
      * @param cacheEventLogger the event logger
      * @param elementSerializer the serializer to use for sending and receiving
-     *
      * @return The instance value, never null
      */
     @Override