You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2016/07/26 10:40:21 UTC
svn commit: r1754104 -
/turbine/fulcrum/trunk/cache/src/java/org/apache/fulcrum/cache/impl/JCSCacheService.java
Author: tv
Date: Tue Jul 26 10:40:21 2016
New Revision: 1754104
URL: http://svn.apache.org/viewvc?rev=1754104&view=rev
Log:
Generify
Modified:
turbine/fulcrum/trunk/cache/src/java/org/apache/fulcrum/cache/impl/JCSCacheService.java
Modified: turbine/fulcrum/trunk/cache/src/java/org/apache/fulcrum/cache/impl/JCSCacheService.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/cache/src/java/org/apache/fulcrum/cache/impl/JCSCacheService.java?rev=1754104&r1=1754103&r2=1754104&view=diff
==============================================================================
--- turbine/fulcrum/trunk/cache/src/java/org/apache/fulcrum/cache/impl/JCSCacheService.java (original)
+++ turbine/fulcrum/trunk/cache/src/java/org/apache/fulcrum/cache/impl/JCSCacheService.java Tue Jul 26 10:40:21 2016
@@ -68,7 +68,7 @@ public class JCSCacheService extends Abs
/**
* Instance of the JCS cache
*/
- private GroupCacheAccess<String, CachedObject> cacheManager;
+ private GroupCacheAccess<String, CachedObject<?>> cacheManager;
/**
* JCS region to use
@@ -150,9 +150,10 @@ public class JCSCacheService extends Abs
* @see org.apache.fulcrum.cache.GlobalCacheService#getObject(java.lang.String)
*/
@Override
- public CachedObject getObject(String id) throws ObjectExpiredException
+ public <T> CachedObject<T> getObject(String id) throws ObjectExpiredException
{
- CachedObject obj = this.cacheManager.getFromGroup(id, group);
+ @SuppressWarnings("unchecked")
+ CachedObject<T> obj = (CachedObject<T>)this.cacheManager.getFromGroup(id, group);
if (obj == null)
{
@@ -164,7 +165,7 @@ public class JCSCacheService extends Abs
{
if (obj instanceof RefreshableCachedObject)
{
- RefreshableCachedObject rco = (RefreshableCachedObject) obj;
+ RefreshableCachedObject<?> rco = (RefreshableCachedObject<?>) obj;
if (rco.isUntouched())
{
// Do not refresh an object that has exceeded TimeToLive
@@ -192,7 +193,7 @@ public class JCSCacheService extends Abs
if (obj instanceof RefreshableCachedObject)
{
// notify it that it's being accessed.
- RefreshableCachedObject rco = (RefreshableCachedObject) obj;
+ RefreshableCachedObject<?> rco = (RefreshableCachedObject<?>) obj;
rco.touch();
}
@@ -204,7 +205,7 @@ public class JCSCacheService extends Abs
* org.apache.fulcrum.cache.CachedObject)
*/
@Override
- public void addObject(String id, CachedObject o)
+ public <T> void addObject(String id, CachedObject<T> o)
{
try
{
@@ -265,13 +266,13 @@ public class JCSCacheService extends Abs
* @see org.apache.fulcrum.cache.GlobalCacheService#getCachedObjects()
*/
@Override
- public List<CachedObject> getCachedObjects()
+ public List<CachedObject<?>> getCachedObjects()
{
- ArrayList<CachedObject> values = new ArrayList<CachedObject>();
+ ArrayList<CachedObject<?>> values = new ArrayList<CachedObject<?>>();
for (String key : this.cacheManager.getGroupKeys(group))
{
- CachedObject o = this.cacheManager.getFromGroup(key, group);
+ CachedObject<?> o = this.cacheManager.getFromGroup(key, group);
if (o != null)
{
values.add(o);
@@ -306,7 +307,7 @@ public class JCSCacheService extends Abs
for (String key : this.cacheManager.getGroupKeys(group))
{
- CachedObject o = this.cacheManager.getFromGroup(key, group);
+ CachedObject<?> o = this.cacheManager.getFromGroup(key, group);
if (o == null)
{
removeObject(key);
@@ -315,7 +316,7 @@ public class JCSCacheService extends Abs
{
if (o instanceof RefreshableCachedObject)
{
- RefreshableCachedObject rco = (RefreshableCachedObject) o;
+ RefreshableCachedObject<?> rco = (RefreshableCachedObject<?>) o;
if (rco.isUntouched())
{
this.cacheManager.removeFromGroup(key, group);