You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by rm...@apache.org on 2014/05/11 21:43:32 UTC
svn commit: r1593843 [2/3] - in /commons/proper/jcs/trunk:
commons-jcs-core/src/main/java/org/apache/commons/jcs/
commons-jcs-core/src/main/java/org/apache/commons/jcs/access/
commons-jcs-core/src/main/java/org/apache/commons/jcs/access/behavior/
commo...
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPService.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPService.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPService.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPService.java Sun May 11 19:43:30 2014
@@ -43,7 +43,7 @@ import org.apache.commons.logging.LogFac
/**
* A lateral cache service implementation. Does not implement getGroupKey
*/
-public class LateralTCPService<K extends Serializable, V extends Serializable>
+public class LateralTCPService<K, V>
implements ICacheServiceNonLocal<K, V>, ILateralCacheObserver
{
/** The logger. */
@@ -471,7 +471,7 @@ public class LateralTCPService<K extends
* @throws IOException
*/
@Override
- public <KK extends Serializable, VV extends Serializable> void addCacheListener( String cacheName, ICacheListener<KK, VV> obj )
+ public <KK, VV> void addCacheListener( String cacheName, ICacheListener<KK, VV> obj )
throws IOException
{
// Empty
@@ -482,7 +482,7 @@ public class LateralTCPService<K extends
* @throws IOException
*/
@Override
- public <KK extends Serializable, VV extends Serializable> void addCacheListener( ICacheListener<KK, VV> obj )
+ public <KK, VV> void addCacheListener( ICacheListener<KK, VV> obj )
throws IOException
{
// Empty
@@ -494,7 +494,7 @@ public class LateralTCPService<K extends
* @throws IOException
*/
@Override
- public <KK extends Serializable, VV extends Serializable> void removeCacheListener( String cacheName, ICacheListener<KK, VV> obj )
+ public <KK, VV> void removeCacheListener( String cacheName, ICacheListener<KK, VV> obj )
throws IOException
{
// Empty
@@ -505,7 +505,7 @@ public class LateralTCPService<K extends
* @throws IOException
*/
@Override
- public <KK extends Serializable, VV extends Serializable> void removeCacheListener( ICacheListener<KK, VV> obj )
+ public <KK, VV> void removeCacheListener( ICacheListener<KK, VV> obj )
throws IOException
{
// Empty
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteAuxiliaryCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteAuxiliaryCache.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteAuxiliaryCache.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteAuxiliaryCache.java Sun May 11 19:43:30 2014
@@ -55,7 +55,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/** Abstract base for remote caches. I'm trying to break out and reuse common functionality. */
-public abstract class AbstractRemoteAuxiliaryCache<K extends Serializable, V extends Serializable>
+public abstract class AbstractRemoteAuxiliaryCache<K, V>
extends AbstractAuxiliaryCacheEventLogging<K, V>
implements IRemoteCacheClient<K, V>
{
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheListener.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheListener.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheListener.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheListener.java Sun May 11 19:43:30 2014
@@ -40,7 +40,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/** Shared listener base. */
-public abstract class AbstractRemoteCacheListener<K extends Serializable, V extends Serializable>
+public abstract class AbstractRemoteCacheListener<K, V>
implements IRemoteCacheListener<K, V>, Serializable
{
/** Don't change */
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java Sun May 11 19:43:30 2014
@@ -44,7 +44,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/** An abstract base for the No Wait Facade. Different implementations will failover differently. */
-public abstract class AbstractRemoteCacheNoWaitFacade<K extends Serializable, V extends Serializable>
+public abstract class AbstractRemoteCacheNoWaitFacade<K, V>
extends AbstractAuxiliaryCache<K, V>
{
/** For serialization. Don't change. */
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCache.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCache.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCache.java Sun May 11 19:43:30 2014
@@ -41,7 +41,7 @@ import org.apache.commons.logging.LogFac
* This handles gets, updates, and removes. It also initiates failover recovery when an error is
* encountered.
*/
-public class RemoteCache<K extends Serializable, V extends Serializable>
+public class RemoteCache<K, V>
extends AbstractRemoteAuxiliaryCache<K, V>
{
/** Don't change. */
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java Sun May 11 19:43:30 2014
@@ -46,8 +46,8 @@ public class RemoteCacheFactory
private String name;
/** store reference of facades to initiate failover */
- private static final HashMap<String, RemoteCacheNoWaitFacade<? extends Serializable, ? extends Serializable>> facades =
- new HashMap<String, RemoteCacheNoWaitFacade<? extends Serializable, ? extends Serializable>>();
+ private static final HashMap<String, RemoteCacheNoWaitFacade<?, ?>> facades =
+ new HashMap<String, RemoteCacheNoWaitFacade<?, ?>>();
/**
* For LOCAL clients we get a handle to all the failovers, but we do not register a listener
@@ -63,7 +63,7 @@ public class RemoteCacheFactory
* @return AuxiliaryCache
*/
@Override
- public <K extends Serializable, V extends Serializable> AuxiliaryCache<K, V> createCache(
+ public <K, V> AuxiliaryCache<K, V> createCache(
AuxiliaryCacheAttributes iaca, ICompositeCacheManager cacheMgr,
ICacheEventLogger cacheEventLogger, IElementSerializer elementSerializer )
{
@@ -183,7 +183,7 @@ public class RemoteCacheFactory
* The facades are what the cache hub talks to.
* @return Returns the facades.
*/
- public static HashMap<String, RemoteCacheNoWaitFacade<? extends Serializable, ? extends Serializable>> getFacades()
+ public static HashMap<String, RemoteCacheNoWaitFacade<?, ?>> getFacades()
{
return facades;
}
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java Sun May 11 19:43:30 2014
@@ -49,7 +49,7 @@ import org.apache.commons.logging.LogFac
* will try to connect to a failover until the primary is restored.
*
*/
-public class RemoteCacheFailoverRunner<K extends Serializable, V extends Serializable>
+public class RemoteCacheFailoverRunner<K, V>
implements Runnable
{
/** The logger */
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheListener.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheListener.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheListener.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheListener.java Sun May 11 19:43:30 2014
@@ -38,7 +38,7 @@ import org.apache.commons.logging.LogFac
* One listener is used per remote cache server. The same listener is used for all the regions that
* talk to a particular server.
*/
-public class RemoteCacheListener<K extends Serializable, V extends Serializable>
+public class RemoteCacheListener<K, V>
extends AbstractRemoteCacheListener<K, V>
implements IRemoteCacheConstants, Serializable, IRemoteCacheListener<K, V>
{
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java Sun May 11 19:43:30 2014
@@ -65,8 +65,8 @@ public class RemoteCacheManager
private int clients;
/** Contains instances of RemoteCacheNoWait managed by a RemoteCacheManager instance. */
- final Map<String, RemoteCacheNoWait<? extends Serializable, ? extends Serializable>> caches =
- new HashMap<String, RemoteCacheNoWait<? extends Serializable, ? extends Serializable>>();
+ final Map<String, RemoteCacheNoWait<?, ?>> caches =
+ new HashMap<String, RemoteCacheNoWait<?, ?>>();
/** The remote host */
final String host;
@@ -87,7 +87,7 @@ public class RemoteCacheManager
private final IElementSerializer elementSerializer;
/** Handle to the remote cache service; or a zombie handle if failed to connect. */
- private ICacheServiceNonLocal<? extends Serializable, ? extends Serializable> remoteService;
+ private ICacheServiceNonLocal<?, ?> remoteService;
/**
* Wrapper of the remote cache watch service; or wrapper of a zombie service if failed to
@@ -182,7 +182,7 @@ public class RemoteCacheManager
* @param listener The feature to be added to the RemoteCacheListener attribute
* @throws IOException
*/
- public <K extends Serializable, V extends Serializable> void addRemoteCacheListener( IRemoteCacheAttributes cattr, IRemoteCacheListener<K, V> listener )
+ public <K, V> void addRemoteCacheListener( IRemoteCacheAttributes cattr, IRemoteCacheListener<K, V> listener )
throws IOException
{
if ( cattr.isReceive() )
@@ -219,7 +219,7 @@ public class RemoteCacheManager
* @param listener
* @throws IOException
*/
- public <K extends Serializable, V extends Serializable> void removeRemoteCacheListener( IRemoteCacheAttributes cattr, IRemoteCacheListener<K, V> listener )
+ public <K, V> void removeRemoteCacheListener( IRemoteCacheAttributes cattr, IRemoteCacheListener<K, V> listener )
throws IOException
{
synchronized ( caches )
@@ -365,7 +365,7 @@ public class RemoteCacheManager
* @return The cache value
*/
@Override
- public <K extends Serializable, V extends Serializable> RemoteCacheNoWait<K, V> getCache( String cacheName )
+ public <K, V> RemoteCacheNoWait<K, V> getCache( String cacheName )
{
IRemoteCacheAttributes ca = (IRemoteCacheAttributes) remoteCacheAttributes.copy();
ca.setCacheName( cacheName );
@@ -382,7 +382,7 @@ public class RemoteCacheManager
* @param cattr
* @return The cache value
*/
- public <K extends Serializable, V extends Serializable> RemoteCacheNoWait<K, V> getCache( IRemoteCacheAttributes cattr )
+ public <K, V> RemoteCacheNoWait<K, V> getCache( IRemoteCacheAttributes cattr )
{
RemoteCacheNoWait<K, V> remoteCacheNoWait = null;
@@ -507,7 +507,7 @@ public class RemoteCacheManager
* @param remoteService
* @param remoteWatch
*/
- public void fixCaches( ICacheServiceNonLocal<? extends Serializable, ? extends Serializable> remoteService, IRemoteCacheObserver remoteWatch )
+ public void fixCaches( ICacheServiceNonLocal<?, ?> remoteService, IRemoteCacheObserver remoteWatch )
{
if ( log.isInfoEnabled() )
{
@@ -517,7 +517,7 @@ public class RemoteCacheManager
{
this.remoteService = remoteService;
this.remoteWatch.setCacheWatch( remoteWatch );
- for (RemoteCacheNoWait<? extends Serializable, ? extends Serializable> c : caches.values())
+ for (RemoteCacheNoWait<?, ?> c : caches.values())
{
c.fixCache( remoteService );
}
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java Sun May 11 19:43:30 2014
@@ -64,7 +64,7 @@ import org.apache.commons.logging.LogFac
* again. This is a better long term solution, but it requires some significant changes to the
* complicated worker queues.
*/
-public class RemoteCacheNoWait<K extends Serializable, V extends Serializable>
+public class RemoteCacheNoWait<K, V>
extends AbstractAuxiliaryCache<K, V>
{
/** log instance */
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java Sun May 11 19:43:30 2014
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac
* Typically, we only connect to one remote server per facade. We use a list of one
* RemoteCacheNoWait.
*/
-public class RemoteCacheNoWaitFacade<K extends Serializable, V extends Serializable>
+public class RemoteCacheNoWaitFacade<K, V>
extends AbstractRemoteCacheNoWaitFacade<K, V>
{
/** For serialization. Don't change. */
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/behavior/IRemoteCacheClient.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/behavior/IRemoteCacheClient.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/behavior/IRemoteCacheClient.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/behavior/IRemoteCacheClient.java Sun May 11 19:43:30 2014
@@ -32,7 +32,7 @@ import org.apache.commons.jcs.engine.beh
* <p>
* @author Aaron Smuts
*/
-public interface IRemoteCacheClient<K extends Serializable, V extends Serializable>
+public interface IRemoteCacheClient<K, V>
extends AuxiliaryCache<K, V>
{
/**
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/behavior/IRemoteCacheDispatcher.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/behavior/IRemoteCacheDispatcher.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/behavior/IRemoteCacheDispatcher.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/behavior/IRemoteCacheDispatcher.java Sun May 11 19:43:30 2014
@@ -41,7 +41,7 @@ public interface IRemoteCacheDispatcher
* @return RemoteCacheResponse
* @throws IOException
*/
- <K extends Serializable, V extends Serializable, T>
+ <K, V, T>
RemoteCacheResponse<T> dispatchRequest( RemoteCacheRequest<K, V> remoteCacheRequest )
throws IOException;
}
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/behavior/IRemoteCacheListener.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/behavior/IRemoteCacheListener.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/behavior/IRemoteCacheListener.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/behavior/IRemoteCacheListener.java Sun May 11 19:43:30 2014
@@ -29,7 +29,7 @@ import org.apache.commons.jcs.engine.beh
/**
* Listens for remote cache event notification ( rmi callback ).
*/
-public interface IRemoteCacheListener<K extends Serializable, V extends Serializable>
+public interface IRemoteCacheListener<K, V>
extends ICacheListener<K, V>, Remote
{
/**
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCache.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCache.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCache.java Sun May 11 19:43:30 2014
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFac
/**
* This uses an http client as the service.
*/
-public class RemoteHttpCache<K extends Serializable, V extends Serializable>
+public class RemoteHttpCache<K, V>
extends AbstractRemoteAuxiliaryCache<K, V>
{
/** Don't change. */
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheClient.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheClient.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheClient.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheClient.java Sun May 11 19:43:30 2014
@@ -35,7 +35,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/** This is the service used by the remote http auxiliary cache. */
-public class RemoteHttpCacheClient<K extends Serializable, V extends Serializable>
+public class RemoteHttpCacheClient<K, V>
implements IRemoteHttpCacheClient<K, V>
{
/** The Logger. */
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheDispatcher.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheDispatcher.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheDispatcher.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheDispatcher.java Sun May 11 19:43:30 2014
@@ -75,7 +75,7 @@ public class RemoteHttpCacheDispatcher
* @throws IOException
*/
@Override
- public <K extends Serializable, V extends Serializable, T>
+ public <K, V, T>
RemoteCacheResponse<T> dispatchRequest( RemoteCacheRequest<K, V> remoteCacheRequest )
throws IOException
{
@@ -128,7 +128,7 @@ public class RemoteHttpCacheDispatcher
* @param baseUrl
* @return String
*/
- protected <K extends Serializable, V extends Serializable> String addParameters( RemoteCacheRequest<K, V> remoteCacheRequest, String baseUrl )
+ protected <K, V> String addParameters( RemoteCacheRequest<K, V> remoteCacheRequest, String baseUrl )
{
StringBuilder url = new StringBuilder( baseUrl );
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheFactory.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheFactory.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheFactory.java Sun May 11 19:43:30 2014
@@ -47,8 +47,8 @@ public class RemoteHttpCacheFactory
private String name;
/** store reference of facades to initiate failover */
- private static final HashMap<String, RemoteCacheNoWaitFacade<? extends Serializable, ? extends Serializable>> facades =
- new HashMap<String, RemoteCacheNoWaitFacade<? extends Serializable, ? extends Serializable>>();
+ private static final HashMap<String, RemoteCacheNoWaitFacade<?, ?>> facades =
+ new HashMap<String, RemoteCacheNoWaitFacade<?, ?>>();
/**
* For LOCAL clients we get a handle to all the failovers, but we do not register a listener
@@ -64,7 +64,7 @@ public class RemoteHttpCacheFactory
* @return AuxiliaryCache
*/
@Override
- public <K extends Serializable, V extends Serializable> AuxiliaryCache<K, V> createCache( AuxiliaryCacheAttributes iaca, ICompositeCacheManager cacheMgr,
+ public <K, V> AuxiliaryCache<K, V> createCache( AuxiliaryCacheAttributes iaca, ICompositeCacheManager cacheMgr,
ICacheEventLogger cacheEventLogger, IElementSerializer elementSerializer )
{
RemoteHttpCacheAttributes rca = (RemoteHttpCacheAttributes) iaca;
@@ -113,7 +113,7 @@ public class RemoteHttpCacheFactory
* The facades are what the cache hub talks to.
* @return Returns the facades.
*/
- public static HashMap<String, RemoteCacheNoWaitFacade<? extends Serializable, ? extends Serializable>> getFacades()
+ public static HashMap<String, RemoteCacheNoWaitFacade<?, ?>> getFacades()
{
return facades;
}
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheManager.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheManager.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheManager.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheManager.java Sun May 11 19:43:30 2014
@@ -52,8 +52,8 @@ public class RemoteHttpCacheManager
private static RemoteHttpCacheManager instance;
/** Contains instances of RemoteCacheNoWait managed by a RemoteCacheManager instance. */
- static final Map<String, RemoteCacheNoWait<? extends Serializable, ? extends Serializable>> caches =
- new HashMap<String, RemoteCacheNoWait<? extends Serializable, ? extends Serializable>>();
+ static final Map<String, RemoteCacheNoWait<?, ?>> caches =
+ new HashMap<String, RemoteCacheNoWait<?, ?>>();
/** The configuration attributes. */
private IRemoteCacheAttributes remoteCacheAttributes;
@@ -147,7 +147,7 @@ public class RemoteHttpCacheManager
* @return The cache value
*/
@Override
- public <K extends Serializable, V extends Serializable> RemoteCacheNoWait<K, V> getCache( String cacheName )
+ public <K, V> RemoteCacheNoWait<K, V> getCache( String cacheName )
{
// TODO get some defaults!
// Perhaps we will need a manager per URL????
@@ -166,7 +166,7 @@ public class RemoteHttpCacheManager
* @param cattr
* @return The cache value
*/
- public <K extends Serializable, V extends Serializable> RemoteCacheNoWait<K, V> getCache( RemoteHttpCacheAttributes cattr )
+ public <K, V> RemoteCacheNoWait<K, V> getCache( RemoteHttpCacheAttributes cattr )
{
RemoteCacheNoWait<K, V> remoteCacheNoWait = null;
@@ -204,7 +204,7 @@ public class RemoteHttpCacheManager
* @param cattr
* @return IRemoteHttpCacheClient
*/
- protected <K extends Serializable, V extends Serializable> IRemoteHttpCacheClient<K, V> createRemoteHttpCacheClientForAttributes( RemoteHttpCacheAttributes cattr )
+ protected <K, V> IRemoteHttpCacheClient<K, V> createRemoteHttpCacheClientForAttributes( RemoteHttpCacheAttributes cattr )
{
IRemoteHttpCacheClient<K, V> client = OptionConverter.instantiateByClassName( cattr
.getRemoteHttpClientClassName(), null );
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheMonitor.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheMonitor.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheMonitor.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpCacheMonitor.java Sun May 11 19:43:30 2014
@@ -186,11 +186,11 @@ public class RemoteHttpCacheMonitor
}
// Make a copy
- Set<RemoteHttpCache<? extends Serializable, ? extends Serializable>> remoteCachesToExamine =
- new HashSet<RemoteHttpCache<? extends Serializable, ? extends Serializable>>();
+ Set<RemoteHttpCache<?, ?>> remoteCachesToExamine =
+ new HashSet<RemoteHttpCache<?, ?>>();
synchronized ( this )
{
- for (RemoteHttpCache<? extends Serializable, ? extends Serializable> remoteCache : this.remoteHttpCaches)
+ for (RemoteHttpCache<?, ?> remoteCache : this.remoteHttpCaches)
{
remoteCachesToExamine.add( remoteCache );
}
@@ -199,7 +199,7 @@ public class RemoteHttpCacheMonitor
// managed by the
// same RmicCacheManager instance are in error. So we fix
// them once and for all.
- for (RemoteHttpCache<? extends Serializable, ? extends Serializable> remoteCache : remoteCachesToExamine)
+ for (RemoteHttpCache<?, ?> remoteCache : remoteCachesToExamine)
{
try
{
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpClientListener.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpClientListener.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpClientListener.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/RemoteHttpClientListener.java Sun May 11 19:43:30 2014
@@ -26,7 +26,7 @@ import org.apache.commons.jcs.auxiliary.
import org.apache.commons.jcs.engine.behavior.ICompositeCacheManager;
/** Does nothing */
-public class RemoteHttpClientListener<K extends Serializable, V extends Serializable>
+public class RemoteHttpClientListener<K, V>
extends AbstractRemoteCacheListener<K, V>
{
/** Serial version */
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/behavior/IRemoteHttpCacheClient.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/behavior/IRemoteHttpCacheClient.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/behavior/IRemoteHttpCacheClient.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/http/client/behavior/IRemoteHttpCacheClient.java Sun May 11 19:43:30 2014
@@ -30,7 +30,7 @@ import org.apache.commons.jcs.engine.beh
* It's not entirely clear that this interface is needed. I simply wanted the initialization method.
* This could be added to the ICacheSerice method.
*/
-public interface IRemoteHttpCacheClient<K extends Serializable, V extends Serializable>
+public interface IRemoteHttpCacheClient<K, V>
extends ICacheServiceNonLocal<K, V>
{
/**
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServer.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServer.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServer.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheServer.java Sun May 11 19:43:30 2014
@@ -68,7 +68,7 @@ import org.apache.commons.logging.LogFac
* between the two servers. Since caches are usually high get and low put, this should allow you to
* scale.
*/
-public class RemoteCacheServer<K extends Serializable, V extends Serializable>
+public class RemoteCacheServer<K, V>
extends UnicastRemoteObject
implements ICacheServiceNonLocal<K, V>, IRemoteCacheObserver, ICacheServiceAdmin, Remote, Unreferenced
{
@@ -1273,7 +1273,7 @@ public class RemoteCacheServer<K extends
* <p>
* @param eventQMap
*/
- private static <KK extends Serializable, VV extends Serializable> void cleanupEventQMap( Map<Long, ICacheEventQueue<KK, VV>> eventQMap )
+ private static <KK, VV> void cleanupEventQMap( Map<Long, ICacheEventQueue<KK, VV>> eventQMap )
{
synchronized ( eventQMap )
{
@@ -1308,7 +1308,7 @@ public class RemoteCacheServer<K extends
*/
@Override
@SuppressWarnings("unchecked") // Need to cast to specific return type from getClusterListeners()
- public <KK extends Serializable, VV extends Serializable> void addCacheListener( String cacheName, ICacheListener<KK, VV> listener )
+ public <KK, VV> void addCacheListener( String cacheName, ICacheListener<KK, VV> listener )
throws IOException
{
if ( cacheName == null || listener == null )
@@ -1416,7 +1416,7 @@ public class RemoteCacheServer<K extends
* @throws IOException
*/
@Override
- public <KK extends Serializable, VV extends Serializable> void addCacheListener( ICacheListener<KK, VV> listener )
+ public <KK, VV> void addCacheListener( ICacheListener<KK, VV> listener )
throws IOException
{
for (String cacheName : cacheListenersMap.keySet())
@@ -1439,7 +1439,7 @@ public class RemoteCacheServer<K extends
* @throws IOException
*/
@Override
- public <KK extends Serializable, VV extends Serializable> void removeCacheListener( String cacheName, ICacheListener<KK, VV> listener )
+ public <KK, VV> void removeCacheListener( String cacheName, ICacheListener<KK, VV> listener )
throws IOException
{
removeCacheListener( cacheName, listener.getListenerId() );
@@ -1513,7 +1513,7 @@ public class RemoteCacheServer<K extends
* @throws IOException
*/
@Override
- public <KK extends Serializable, VV extends Serializable> void removeCacheListener( ICacheListener<KK, VV> listener )
+ public <KK, VV> void removeCacheListener( ICacheListener<KK, VV> listener )
throws IOException
{
for (String cacheName : cacheListenersMap.keySet())
@@ -1646,7 +1646,7 @@ public class RemoteCacheServer<K extends
* @param eventName
* @return ICacheEvent
*/
- private <T extends Serializable> ICacheEvent<T> createICacheEvent( String cacheName, T key, long requesterId, String eventName )
+ private <T> ICacheEvent<T> createICacheEvent( String cacheName, T key, long requesterId, String eventName )
{
if ( cacheEventLogger == null )
{
@@ -1676,7 +1676,7 @@ public class RemoteCacheServer<K extends
* <p>
* @param cacheEvent
*/
- protected <T extends Serializable> void logICacheEvent( ICacheEvent<T> cacheEvent )
+ protected <T> void logICacheEvent( ICacheEvent<T> cacheEvent )
{
if ( cacheEventLogger != null )
{
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/util/RemoteCacheRequestFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/util/RemoteCacheRequestFactory.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/util/RemoteCacheRequestFactory.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/util/RemoteCacheRequestFactory.java Sun May 11 19:43:30 2014
@@ -45,7 +45,7 @@ public class RemoteCacheRequestFactory
* @param requesterId
* @return RemoteHttpCacheRequest
*/
- public static <K extends Serializable, V extends Serializable> RemoteCacheRequest<K, V> createGetRequest( String cacheName, K key, long requesterId )
+ public static <K, V> RemoteCacheRequest<K, V> createGetRequest( String cacheName, K key, long requesterId )
{
RemoteCacheRequest<K, V> request = new RemoteCacheRequest<K, V>();
request.setCacheName( cacheName );
@@ -69,7 +69,7 @@ public class RemoteCacheRequestFactory
* @param requesterId
* @return RemoteHttpCacheRequest
*/
- public static <K extends Serializable, V extends Serializable> RemoteCacheRequest<K, V> createGetMatchingRequest( String cacheName, String pattern, long requesterId )
+ public static <K, V> RemoteCacheRequest<K, V> createGetMatchingRequest( String cacheName, String pattern, long requesterId )
{
RemoteCacheRequest<K, V> request = new RemoteCacheRequest<K, V>();
request.setCacheName( cacheName );
@@ -93,7 +93,7 @@ public class RemoteCacheRequestFactory
* @param requesterId
* @return RemoteHttpCacheRequest
*/
- public static <K extends Serializable, V extends Serializable> RemoteCacheRequest<K, V> createGetMultipleRequest( String cacheName, Set<K> keys, long requesterId )
+ public static <K, V> RemoteCacheRequest<K, V> createGetMultipleRequest( String cacheName, Set<K> keys, long requesterId )
{
RemoteCacheRequest<K, V> request = new RemoteCacheRequest<K, V>();
request.setCacheName( cacheName );
@@ -117,7 +117,7 @@ public class RemoteCacheRequestFactory
* @param requesterId
* @return RemoteHttpCacheRequest
*/
- public static <K extends Serializable, V extends Serializable> RemoteCacheRequest<K, V> createRemoveRequest( String cacheName, K key, long requesterId )
+ public static <K, V> RemoteCacheRequest<K, V> createRemoveRequest( String cacheName, K key, long requesterId )
{
RemoteCacheRequest<K, V> request = new RemoteCacheRequest<K, V>();
request.setCacheName( cacheName );
@@ -163,7 +163,7 @@ public class RemoteCacheRequestFactory
* @param requesterId
* @return RemoteHttpCacheRequest
*/
- public static <K extends Serializable, V extends Serializable> RemoteCacheRequest<K, V> createRemoveAllRequest( String cacheName, long requesterId )
+ public static <K, V> RemoteCacheRequest<K, V> createRemoveAllRequest( String cacheName, long requesterId )
{
RemoteCacheRequest<K, V> request = new RemoteCacheRequest<K, V>();
request.setCacheName( cacheName );
@@ -185,7 +185,7 @@ public class RemoteCacheRequestFactory
* @param requesterId
* @return RemoteHttpCacheRequest
*/
- public static <K extends Serializable, V extends Serializable> RemoteCacheRequest<K, V> createDisposeRequest( String cacheName, long requesterId )
+ public static <K, V> RemoteCacheRequest<K, V> createDisposeRequest( String cacheName, long requesterId )
{
RemoteCacheRequest<K, V> request = new RemoteCacheRequest<K, V>();
request.setCacheName( cacheName );
@@ -207,7 +207,7 @@ public class RemoteCacheRequestFactory
* @param requesterId
* @return RemoteHttpCacheRequest
*/
- public static <K extends Serializable, V extends Serializable> RemoteCacheRequest<K, V> createUpdateRequest( ICacheElement<K, V> cacheElement, long requesterId )
+ public static <K, V> RemoteCacheRequest<K, V> createUpdateRequest( ICacheElement<K, V> cacheElement, long requesterId )
{
RemoteCacheRequest<K, V> request = new RemoteCacheRequest<K, V>();
if ( cacheElement != null )
@@ -237,7 +237,7 @@ public class RemoteCacheRequestFactory
* @param requesterId
* @return RemoteHttpCacheRequest
*/
- public static <K extends Serializable, V extends Serializable> RemoteCacheRequest<K, V> createAliveCheckRequest( long requesterId )
+ public static <K, V> RemoteCacheRequest<K, V> createAliveCheckRequest( long requesterId )
{
RemoteCacheRequest<K, V> request = new RemoteCacheRequest<K, V>();
request.setRequesterId( requesterId );
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/value/RemoteCacheRequest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/value/RemoteCacheRequest.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/value/RemoteCacheRequest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/remote/value/RemoteCacheRequest.java Sun May 11 19:43:30 2014
@@ -30,7 +30,7 @@ import org.apache.commons.jcs.engine.beh
* Rather than creating sub object types, I created on object that has values for all types of
* requests.
*/
-public class RemoteCacheRequest<K extends Serializable, V extends Serializable>
+public class RemoteCacheRequest<K, V>
implements Serializable
{
/** Don't change. */
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/AbstractCacheEventQueue.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/AbstractCacheEventQueue.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/AbstractCacheEventQueue.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/AbstractCacheEventQueue.java Sun May 11 19:43:30 2014
@@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFac
/**
* An abstract base class to the different implementations
*/
-public abstract class AbstractCacheEventQueue<K extends Serializable, V extends Serializable>
+public abstract class AbstractCacheEventQueue<K, V>
implements ICacheEventQueue<K, V>
{
/** The logger. */
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheAdaptor.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheAdaptor.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheAdaptor.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheAdaptor.java Sun May 11 19:43:30 2014
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFac
* Used for Cache-to-Cache messaging purposes. These are used in the balking
* facades in the lateral and remote caches.
*/
-public class CacheAdaptor<K extends Serializable, V extends Serializable>
+public class CacheAdaptor<K, V>
implements ICacheListener<K, V>
{
/** The logger */
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheElement.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheElement.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheElement.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheElement.java Sun May 11 19:43:30 2014
@@ -19,15 +19,13 @@ package org.apache.commons.jcs.engine;
* under the License.
*/
-import java.io.Serializable;
-
import org.apache.commons.jcs.engine.behavior.ICacheElement;
import org.apache.commons.jcs.engine.behavior.IElementAttributes;
/**
* Generic element wrapper. Often stuffed inside another.
*/
-public class CacheElement<K extends Serializable, V extends Serializable>
+public class CacheElement<K, V>
implements ICacheElement<K, V>
{
/** Don't change */
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheElementSerialized.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheElementSerialized.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheElementSerialized.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheElementSerialized.java Sun May 11 19:43:30 2014
@@ -26,7 +26,7 @@ import org.apache.commons.jcs.engine.beh
import org.apache.commons.jcs.engine.behavior.IElementAttributes;
/** Either serialized value or the value should be null; */
-public class CacheElementSerialized<K extends Serializable, V extends Serializable>
+public class CacheElementSerialized<K, V>
extends CacheElement<K, V>
implements ICacheElementSerialized<K, V>
{
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheEventQueue.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheEventQueue.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheEventQueue.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheEventQueue.java Sun May 11 19:43:30 2014
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac
* thread, and kill the thread if the queue goes empty for a specified period, now set to 1 minute.
* If something comes in after that a new processor thread should be created.
*/
-public class CacheEventQueue<K extends Serializable, V extends Serializable>
+public class CacheEventQueue<K, V>
extends AbstractCacheEventQueue<K, V>
{
/** The logger. */
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheEventQueueFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheEventQueueFactory.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheEventQueueFactory.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheEventQueueFactory.java Sun May 11 19:43:30 2014
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFac
* <p>
* @author aaronsm
*/
-public class CacheEventQueueFactory<K extends Serializable, V extends Serializable>
+public class CacheEventQueueFactory<K, V>
{
/** The logger. */
private static final Log log = LogFactory.getLog( CacheEventQueueFactory.class );
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheListeners.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheListeners.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheListeners.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheListeners.java Sun May 11 19:43:30 2014
@@ -31,7 +31,7 @@ import org.apache.commons.jcs.engine.beh
* Used to associates a set of [cache listener to cache event queue] for a
* cache.
*/
-public class CacheListeners<K extends Serializable, V extends Serializable>
+public class CacheListeners<K, V>
{
/** The cache using the queue. */
public final ICache<K, V> cache;
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheWatchRepairable.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheWatchRepairable.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheWatchRepairable.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/CacheWatchRepairable.java Sun May 11 19:43:30 2014
@@ -46,8 +46,8 @@ public class CacheWatchRepairable
private ICacheObserver cacheWatch;
/** Map of cache regions. */
- private final Map<String, Set<ICacheListener<? extends Serializable, ? extends Serializable>>> cacheMap =
- new HashMap<String, Set<ICacheListener<? extends Serializable, ? extends Serializable>>>();
+ private final Map<String, Set<ICacheListener<?, ?>>> cacheMap =
+ new HashMap<String, Set<ICacheListener<?, ?>>>();
/**
* Replaces the underlying cache watch service and reattached all existing listeners to the new
@@ -60,10 +60,10 @@ public class CacheWatchRepairable
this.cacheWatch = cacheWatch;
synchronized ( cacheMap )
{
- for (Map.Entry<String, Set<ICacheListener<? extends Serializable, ? extends Serializable>>> entry : cacheMap.entrySet())
+ for (Map.Entry<String, Set<ICacheListener<?, ?>>> entry : cacheMap.entrySet())
{
String cacheName = entry.getKey();
- for (ICacheListener<? extends Serializable, ? extends Serializable> listener : entry.getValue())
+ for (ICacheListener<?, ?> listener : entry.getValue())
{
try
{
@@ -92,17 +92,17 @@ public class CacheWatchRepairable
* @throws IOException
*/
@Override
- public <K extends Serializable, V extends Serializable> void addCacheListener( String cacheName, ICacheListener<K, V> obj )
+ public <K, V> void addCacheListener( String cacheName, ICacheListener<K, V> obj )
throws IOException
{
// Record the added cache listener locally, regardless of whether the
// remote add-listener operation succeeds or fails.
synchronized ( cacheMap )
{
- Set<ICacheListener<? extends Serializable, ? extends Serializable>> listenerSet = cacheMap.get( cacheName );
+ Set<ICacheListener<?, ?>> listenerSet = cacheMap.get( cacheName );
if ( listenerSet == null )
{
- listenerSet = new HashSet<ICacheListener<? extends Serializable, ? extends Serializable>>();
+ listenerSet = new HashSet<ICacheListener<?, ?>>();
cacheMap.put( cacheName, listenerSet );
}
listenerSet.add( obj );
@@ -122,14 +122,14 @@ public class CacheWatchRepairable
* @throws IOException
*/
@Override
- public <K extends Serializable, V extends Serializable> void addCacheListener( ICacheListener<K, V> obj )
+ public <K, V> void addCacheListener( ICacheListener<K, V> obj )
throws IOException
{
// Record the added cache listener locally, regardless of whether the
// remote add-listener operation succeeds or fails.
synchronized ( cacheMap )
{
- for (Set<ICacheListener<? extends Serializable, ? extends Serializable>> listenerSet : cacheMap.values())
+ for (Set<ICacheListener<?, ?>> listenerSet : cacheMap.values())
{
listenerSet.add( obj );
}
@@ -150,7 +150,7 @@ public class CacheWatchRepairable
* @throws IOException
*/
@Override
- public <K extends Serializable, V extends Serializable> void removeCacheListener( String cacheName, ICacheListener<K, V> obj )
+ public <K, V> void removeCacheListener( String cacheName, ICacheListener<K, V> obj )
throws IOException
{
if ( log.isInfoEnabled() )
@@ -161,7 +161,7 @@ public class CacheWatchRepairable
// remove-listener operation succeeds or fails.
synchronized ( cacheMap )
{
- Set<ICacheListener<? extends Serializable, ? extends Serializable>> listenerSet = cacheMap.get( cacheName );
+ Set<ICacheListener<?, ?>> listenerSet = cacheMap.get( cacheName );
if ( listenerSet != null )
{
listenerSet.remove( obj );
@@ -175,7 +175,7 @@ public class CacheWatchRepairable
* @throws IOException
*/
@Override
- public <K extends Serializable, V extends Serializable> void removeCacheListener( ICacheListener<K, V> obj )
+ public <K, V> void removeCacheListener( ICacheListener<K, V> obj )
throws IOException
{
if ( log.isInfoEnabled() )
@@ -187,7 +187,7 @@ public class CacheWatchRepairable
// remove-listener operation succeeds or fails.
synchronized ( cacheMap )
{
- for (Set<ICacheListener<? extends Serializable, ? extends Serializable>> listenerSet : cacheMap.values())
+ for (Set<ICacheListener<?, ?>> listenerSet : cacheMap.values())
{
if ( log.isDebugEnabled() )
{
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/PooledCacheEventQueue.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/PooledCacheEventQueue.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/PooledCacheEventQueue.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/PooledCacheEventQueue.java Sun May 11 19:43:30 2014
@@ -43,7 +43,7 @@ import org.apache.commons.logging.LogFac
* more than a few threads at them will serve no purpose other than to saturate the IO interface. In
* light of this, having one thread per region seems unnecessary. This may prove to be false.
*/
-public class PooledCacheEventQueue<K extends Serializable, V extends Serializable>
+public class PooledCacheEventQueue<K, V>
extends AbstractCacheEventQueue<K, V>
{
/** The logger. */
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ZombieCacheService.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ZombieCacheService.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ZombieCacheService.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ZombieCacheService.java Sun May 11 19:43:30 2014
@@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFac
/**
* Zombie adapter for any cache service. Balks at every call.
*/
-public class ZombieCacheService<K extends Serializable, V extends Serializable>
+public class ZombieCacheService<K, V>
implements ICacheService<K, V>, IZombie
{
/** The logger. */
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ZombieCacheServiceNonLocal.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ZombieCacheServiceNonLocal.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ZombieCacheServiceNonLocal.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ZombieCacheServiceNonLocal.java Sun May 11 19:43:30 2014
@@ -42,7 +42,7 @@ import org.apache.commons.logging.LogFac
* <p>
* This originated in the remote cache.
*/
-public class ZombieCacheServiceNonLocal<K extends Serializable, V extends Serializable>
+public class ZombieCacheServiceNonLocal<K, V>
extends ZombieCacheService<K, V>
implements ICacheServiceNonLocal<K, V>
{
@@ -254,7 +254,7 @@ public class ZombieCacheServiceNonLocal<
/**
* A basic put event.
*/
- private static class PutEvent<K extends Serializable, V extends Serializable>
+ private static class PutEvent<K, V>
extends ZombieEvent
{
/** The element to put */
@@ -275,7 +275,7 @@ public class ZombieCacheServiceNonLocal<
/**
* A basic Remove event.
*/
- private static class RemoveEvent<K extends Serializable>
+ private static class RemoveEvent<K>
extends ZombieEvent
{
/** The key to remove */
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ZombieCacheWatch.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ZombieCacheWatch.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ZombieCacheWatch.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/ZombieCacheWatch.java Sun May 11 19:43:30 2014
@@ -38,7 +38,7 @@ public class ZombieCacheWatch
* @param obj The feature to be added to the CacheListener attribute
*/
@Override
- public <K extends Serializable, V extends Serializable> void addCacheListener( String cacheName, ICacheListener<K, V> obj )
+ public <K, V> void addCacheListener( String cacheName, ICacheListener<K, V> obj )
{
// empty
}
@@ -49,7 +49,7 @@ public class ZombieCacheWatch
* @param obj The feature to be added to the CacheListener attribute
*/
@Override
- public <K extends Serializable, V extends Serializable> void addCacheListener( ICacheListener<K, V> obj )
+ public <K, V> void addCacheListener( ICacheListener<K, V> obj )
{
// empty
}
@@ -59,7 +59,7 @@ public class ZombieCacheWatch
* @param obj
*/
@Override
- public <K extends Serializable, V extends Serializable> void removeCacheListener( String cacheName, ICacheListener<K, V> obj )
+ public <K, V> void removeCacheListener( String cacheName, ICacheListener<K, V> obj )
{
// empty
}
@@ -68,7 +68,7 @@ public class ZombieCacheWatch
* @param obj
*/
@Override
- public <K extends Serializable, V extends Serializable> void removeCacheListener( ICacheListener<K, V> obj )
+ public <K, V> void removeCacheListener( ICacheListener<K, V> obj )
{
// empty
}
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICache.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICache.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICache.java Sun May 11 19:43:30 2014
@@ -34,7 +34,7 @@ import org.apache.commons.jcs.engine.mat
* This allows for a suite of reusable components for accessing such structures, for example
* asynchronous access via an event queue.
*/
-public interface ICache<K extends Serializable, V extends Serializable>
+public interface ICache<K, V>
extends ICacheType
{
/**
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheElement.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheElement.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheElement.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheElement.java Sun May 11 19:43:30 2014
@@ -31,7 +31,7 @@ import java.io.Serializable;
* allowed to be spooled, etc.
*
*/
-public interface ICacheElement<K extends Serializable, V extends Serializable>
+public interface ICacheElement<K, V>
extends Serializable
{
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheElementSerialized.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheElementSerialized.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheElementSerialized.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheElementSerialized.java Sun May 11 19:43:30 2014
@@ -30,7 +30,7 @@ import java.io.Serializable;
*<p>
* @author Aaron Smuts
*/
-public interface ICacheElementSerialized<K extends Serializable, V extends Serializable>
+public interface ICacheElementSerialized<K, V>
extends ICacheElement<K, V>
{
/**
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheEventQueue.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheEventQueue.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheEventQueue.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheEventQueue.java Sun May 11 19:43:30 2014
@@ -28,7 +28,7 @@ import org.apache.commons.jcs.engine.sta
* Interface for a cache event queue. An event queue is used to propagate
* ordered cache events to one and only one target listener.
*/
-public interface ICacheEventQueue<K extends Serializable, V extends Serializable>
+public interface ICacheEventQueue<K, V>
{
enum QueueType
{
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheListener.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheListener.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheListener.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheListener.java Sun May 11 19:43:30 2014
@@ -28,7 +28,7 @@ import java.io.Serializable;
* Note: objects which implement this interface are local listeners to cache changes, whereas
* objects which implement IRmiCacheListener are remote listeners to cache changes.
*/
-public interface ICacheListener<K extends Serializable, V extends Serializable>
+public interface ICacheListener<K, V>
{
/**
* Notifies the subscribers for a cache entry update.
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheObserver.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheObserver.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheObserver.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheObserver.java Sun May 11 19:43:30 2014
@@ -41,7 +41,7 @@ public interface ICacheObserver
* object to notify for cache changes.
* @throws IOException
*/
- <K extends Serializable, V extends Serializable> void addCacheListener( String cacheName, ICacheListener<K, V> obj )
+ <K, V> void addCacheListener( String cacheName, ICacheListener<K, V> obj )
throws IOException;
//, CacheNotFoundException;
@@ -53,7 +53,7 @@ public interface ICacheObserver
* object to notify for all cache changes.
* @throws IOException
*/
- <K extends Serializable, V extends Serializable> void addCacheListener( ICacheListener<K, V> obj )
+ <K, V> void addCacheListener( ICacheListener<K, V> obj )
throws IOException;
/**
@@ -64,7 +64,7 @@ public interface ICacheObserver
* existing subscriber.
* @throws IOException
*/
- <K extends Serializable, V extends Serializable> void removeCacheListener( String cacheName, ICacheListener<K, V> obj )
+ <K, V> void removeCacheListener( String cacheName, ICacheListener<K, V> obj )
throws IOException;
/**
@@ -74,6 +74,6 @@ public interface ICacheObserver
* existing subscriber.
* @throws IOException
*/
- <K extends Serializable, V extends Serializable> void removeCacheListener( ICacheListener<K, V> obj )
+ <K, V> void removeCacheListener( ICacheListener<K, V> obj )
throws IOException;
}
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheService.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheService.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheService.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheService.java Sun May 11 19:43:30 2014
@@ -33,7 +33,7 @@ import org.apache.commons.jcs.access.exc
* Note: server which implements this interface provides a local cache service, whereas server which
* implements IRmiCacheService provides a remote cache service.
*/
-public interface ICacheService<K extends Serializable, V extends Serializable>
+public interface ICacheService<K, V>
{
/**
* Puts a cache item to the cache.
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheServiceNonLocal.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheServiceNonLocal.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheServiceNonLocal.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICacheServiceNonLocal.java Sun May 11 19:43:30 2014
@@ -32,7 +32,7 @@ import java.util.Set;
* <p>
* TODO consider not extending ICacheService
*/
-public interface ICacheServiceNonLocal<K extends Serializable, V extends Serializable>
+public interface ICacheServiceNonLocal<K, V>
extends Remote, ICacheService<K, V>
{
/**
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICompositeCacheManager.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICompositeCacheManager.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICompositeCacheManager.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/ICompositeCacheManager.java Sun May 11 19:43:30 2014
@@ -19,11 +19,10 @@ package org.apache.commons.jcs.engine.be
* under the License.
*/
-import java.io.Serializable;
-import java.util.Properties;
-
import org.apache.commons.jcs.engine.control.CompositeCache;
+import java.util.Properties;
+
/**
* I need the interface so I can plug in mock managers for testing.
*
@@ -37,7 +36,7 @@ public interface ICompositeCacheManager
* @param cacheName
* @return CompositeCache
*/
- <K extends Serializable, V extends Serializable> CompositeCache<K, V> getCache( String cacheName );
+ <K, V> CompositeCache<K, V> getCache( String cacheName );
/**
* This is exposed so other manager can get access to the props.
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/IElementSerializer.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/IElementSerializer.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/IElementSerializer.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/behavior/IElementSerializer.java Sun May 11 19:43:30 2014
@@ -36,7 +36,7 @@ public interface IElementSerializer
* @return byte[]
* @throws IOException
*/
- <T extends Serializable> byte[] serialize( T obj )
+ <T> byte[] serialize( T obj )
throws IOException;
/**
@@ -46,6 +46,6 @@ public interface IElementSerializer
* @throws IOException
* @throws ClassNotFoundException thrown if we don't know the object.
*/
- <T extends Serializable> T deSerialize( byte[] bytes )
+ <T> T deSerialize( byte[] bytes )
throws IOException, ClassNotFoundException;
}
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCache.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCache.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCache.java Sun May 11 19:43:30 2014
@@ -66,7 +66,7 @@ import org.apache.commons.logging.LogFac
* <p>
* This is the core of a JCS region. Hence, this simple class is the core of JCS.
*/
-public class CompositeCache<K extends Serializable, V extends Serializable>
+public class CompositeCache<K, V>
implements ICache<K, V>, IRequireScheduler
{
/** log instance */
@@ -448,7 +448,7 @@ public class CompositeCache<K extends Se
* <p>
* @param key
* @return element from the cache, or null if not present
- * @see org.apache.commons.jcs.engine.behavior.ICache#get(java.io.Serializable)
+ * @see org.apache.commons.jcs.engine.behavior.ICache#get(Object)
*/
@Override
public ICacheElement<K, V> get( K key )
@@ -1104,7 +1104,7 @@ public class CompositeCache<K extends Se
* <p>
* @param key
* @return true is it was removed
- * @see org.apache.commons.jcs.engine.behavior.ICache#remove(java.io.Serializable)
+ * @see org.apache.commons.jcs.engine.behavior.ICache#remove(Object)
*/
@Override
public boolean remove( K key )
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheConfigurator.java Sun May 11 19:43:30 2014
@@ -233,7 +233,7 @@ public class CompositeCacheConfigurator
*<p>
* @param props
*/
- protected <K extends Serializable, V extends Serializable> void parseSystemRegions( Properties props )
+ protected <K, V> void parseSystemRegions( Properties props )
{
Enumeration<?> en = props.propertyNames();
while ( en.hasMoreElements() )
@@ -259,7 +259,7 @@ public class CompositeCacheConfigurator
*<p>
* @param props
*/
- protected <K extends Serializable, V extends Serializable> void parseRegions( Properties props )
+ protected <K, V> void parseRegions( Properties props )
{
List<String> regionNames = new ArrayList<String>();
@@ -297,7 +297,7 @@ public class CompositeCacheConfigurator
* @param value
* @return CompositeCache
*/
- protected <K extends Serializable, V extends Serializable> CompositeCache<K, V> parseRegion(
+ protected <K, V> CompositeCache<K, V> parseRegion(
Properties props, String regName, String value )
{
return parseRegion( props, regName, value, null, REGION_PREFIX );
@@ -314,7 +314,7 @@ public class CompositeCacheConfigurator
* @param cca
* @return CompositeCache
*/
- protected <K extends Serializable, V extends Serializable> CompositeCache<K, V> parseRegion(
+ protected <K, V> CompositeCache<K, V> parseRegion(
Properties props, String regName, String value, ICompositeCacheAttributes cca )
{
return parseRegion( props, regName, value, cca, REGION_PREFIX );
@@ -330,7 +330,7 @@ public class CompositeCacheConfigurator
* @param regionPrefix
* @return CompositeCache
*/
- protected <K extends Serializable, V extends Serializable> CompositeCache<K, V> parseRegion(
+ protected <K, V> CompositeCache<K, V> parseRegion(
Properties props, String regName, String value,
ICompositeCacheAttributes cca, String regionPrefix )
{
@@ -529,7 +529,7 @@ public class CompositeCacheConfigurator
* @param regName the name of the region.
* @return AuxiliaryCache
*/
- protected <K extends Serializable, V extends Serializable> AuxiliaryCache<K, V> parseAuxiliary( Properties props, String auxName, String regName )
+ protected <K, V> AuxiliaryCache<K, V> parseAuxiliary( Properties props, String auxName, String regName )
{
AuxiliaryCache<K, V> auxCache;
@@ -619,7 +619,7 @@ public class CompositeCacheConfigurator
* @param auxPrefix - ex. AUXILIARY_PREFIX + auxName
* @return IKeyMatcher
*/
- public static <K extends Serializable> IKeyMatcher<K> parseKeyMatcher( Properties props, String auxPrefix )
+ public static <K> IKeyMatcher<K> parseKeyMatcher( Properties props, String auxPrefix )
{
// auxFactory was not previously initialized.
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java Sun May 11 19:43:30 2014
@@ -79,8 +79,8 @@ public class CompositeCacheManager
private static final String JMX_OBJECT_NAME = "org.apache.commons.jcs:type=JCSAdminBean";
/** Caches managed by this cache manager */
- private final Map<String, ICache<? extends Serializable, ? extends Serializable>> caches =
- new ConcurrentHashMap<String, ICache<? extends Serializable, ? extends Serializable>>();
+ private final Map<String, ICache<?, ?>> caches =
+ new ConcurrentHashMap<String, ICache<?, ?>>();
/** Number of clients accessing this cache manager */
private int clients;
@@ -531,7 +531,7 @@ public class CompositeCacheManager
* @return CompositeCache -- the cache region controller
*/
@Override
- public <K extends Serializable, V extends Serializable> CompositeCache<K, V> getCache( String cacheName )
+ public <K, V> CompositeCache<K, V> getCache( String cacheName )
{
return getCache( cacheName, this.defaultCacheAttr.copy() );
}
@@ -543,7 +543,7 @@ public class CompositeCacheManager
* @param cattr
* @return CompositeCache
*/
- public <K extends Serializable, V extends Serializable> CompositeCache<K, V> getCache( String cacheName, ICompositeCacheAttributes cattr )
+ public <K, V> CompositeCache<K, V> getCache( String cacheName, ICompositeCacheAttributes cattr )
{
cattr.setCacheName( cacheName );
return getCache( cattr, this.defaultElementAttr );
@@ -557,7 +557,7 @@ public class CompositeCacheManager
* @param attr
* @return CompositeCache
*/
- public <K extends Serializable, V extends Serializable> CompositeCache<K, V> getCache( String cacheName, ICompositeCacheAttributes cattr, IElementAttributes attr )
+ public <K, V> CompositeCache<K, V> getCache( String cacheName, ICompositeCacheAttributes cattr, IElementAttributes attr )
{
cattr.setCacheName( cacheName );
return getCache( cattr, attr );
@@ -569,7 +569,7 @@ public class CompositeCacheManager
* @param cattr
* @return CompositeCache
*/
- public <K extends Serializable, V extends Serializable> CompositeCache<K, V> getCache( ICompositeCacheAttributes cattr )
+ public <K, V> CompositeCache<K, V> getCache( ICompositeCacheAttributes cattr )
{
return getCache( cattr, this.defaultElementAttr );
}
@@ -588,7 +588,7 @@ public class CompositeCacheManager
* @return CompositeCache
*/
@SuppressWarnings("unchecked") // Need to cast because of common map for all caches
- public <K extends Serializable, V extends Serializable> CompositeCache<K, V> getCache( ICompositeCacheAttributes cattr, IElementAttributes attr )
+ public <K, V> CompositeCache<K, V> getCache( ICompositeCacheAttributes cattr, IElementAttributes attr )
{
CompositeCache<K, V> cache;
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/group/GroupAttrName.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/group/GroupAttrName.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/group/GroupAttrName.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/control/group/GroupAttrName.java Sun May 11 19:43:30 2014
@@ -24,7 +24,7 @@ import java.io.Serializable;
/**
* Description of the Class
*/
-public class GroupAttrName<T extends Serializable>
+public class GroupAttrName<T>
implements Serializable
{
/** Don't change */
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/logging/CacheEvent.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/logging/CacheEvent.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/logging/CacheEvent.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/logging/CacheEvent.java Sun May 11 19:43:30 2014
@@ -25,7 +25,7 @@ import java.util.Date;
import org.apache.commons.jcs.engine.logging.behavior.ICacheEvent;
/** It's returned from create and passed into log. */
-public class CacheEvent<K extends Serializable>
+public class CacheEvent<K>
implements ICacheEvent<K>
{
/** Don't change. */
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLogger.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLogger.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLogger.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLogger.java Sun May 11 19:43:30 2014
@@ -48,7 +48,7 @@ public class CacheEventLoggerDebugLogger
* @return ICacheEvent
*/
@Override
- public <T extends Serializable> ICacheEvent<T> createICacheEvent( String source, String region, String eventName,
+ public <T> ICacheEvent<T> createICacheEvent( String source, String region, String eventName,
String optionalDetails, T key )
{
ICacheEvent<T> event = new CacheEvent<T>();
@@ -93,7 +93,7 @@ public class CacheEventLoggerDebugLogger
* @param event
*/
@Override
- public <T extends Serializable> void logICacheEvent( ICacheEvent<T> event )
+ public <T> void logICacheEvent( ICacheEvent<T> event )
{
if ( log.isDebugEnabled() )
{
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/logging/behavior/ICacheEvent.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/logging/behavior/ICacheEvent.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/logging/behavior/ICacheEvent.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/logging/behavior/ICacheEvent.java Sun May 11 19:43:30 2014
@@ -22,7 +22,7 @@ package org.apache.commons.jcs.engine.lo
import java.io.Serializable;
/** Defines the common fields required by a cache event. */
-public interface ICacheEvent<K extends Serializable>
+public interface ICacheEvent<K>
extends Serializable
{
/**
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/logging/behavior/ICacheEventLogger.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/logging/behavior/ICacheEventLogger.java?rev=1593843&r1=1593842&r2=1593843&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/logging/behavior/ICacheEventLogger.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/engine/logging/behavior/ICacheEventLogger.java Sun May 11 19:43:30 2014
@@ -63,7 +63,7 @@ public interface ICacheEventLogger
* @param key - the cache key
* @return ICacheEvent
*/
- <T extends Serializable> ICacheEvent<T> createICacheEvent( String source, String region,
+ <T> ICacheEvent<T> createICacheEvent( String source, String region,
String eventName, String optionalDetails, T key );
/**
@@ -71,7 +71,7 @@ public interface ICacheEventLogger
* <p>
* @param event - the event created in createICacheEvent
*/
- <T extends Serializable> void logICacheEvent( ICacheEvent<T> event );
+ <T> void logICacheEvent( ICacheEvent<T> event );
/**
* Logs an event. These are internal application events that do not correspond to ICache calls.