You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2014/04/03 02:16:10 UTC
svn commit: r1584224 - in
/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs: engine/
engine/control/ engine/control/event/ engine/logging/ engine/memory/
utils/access/ utils/discovery/
Author: sebb
Date: Thu Apr 3 00:16:10 2014
New Revision: 1584224
URL: http://svn.apache.org/r1584224
Log:
Add missing Java 1.6 @Override annotations
Modified:
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/EventQueueConcurrentLoadTest.java
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/MockCacheServiceNonLocal.java
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/CompositeCacheDiskUsageUnitTest.java
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/MockCompositeCacheManager.java
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/MockElementSerializer.java
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/event/ElementEventHandlerMockImpl.java
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/event/SimpleEventHandlingUnitTest.java
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/logging/MockCacheEventLogger.java
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/MockMemoryCache.java
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/access/JCSWorkerUnitTest.java
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/MockDiscoveryListener.java
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/EventQueueConcurrentLoadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/EventQueueConcurrentLoadTest.java?rev=1584224&r1=1584223&r2=1584224&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/EventQueueConcurrentLoadTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/EventQueueConcurrentLoadTest.java Thu Apr 3 00:16:10 2014
@@ -311,6 +311,7 @@ public class EventQueueConcurrentLoadTes
* @param item
* @throws IOException
*/
+ @Override
public void handlePut( ICacheElement<K, V> item )
throws IOException
{
@@ -325,6 +326,7 @@ public class EventQueueConcurrentLoadTes
* @param key
* @throws IOException
*/
+ @Override
public void handleRemove( String cacheName, K key )
throws IOException
{
@@ -339,6 +341,7 @@ public class EventQueueConcurrentLoadTes
* @param cacheName
* @throws IOException
*/
+ @Override
public void handleRemoveAll( String cacheName )
throws IOException
{
@@ -350,6 +353,7 @@ public class EventQueueConcurrentLoadTes
* @param cacheName
* @throws IOException
*/
+ @Override
public void handleDispose( String cacheName )
throws IOException
{
@@ -361,6 +365,7 @@ public class EventQueueConcurrentLoadTes
* @param id
* @throws IOException
*/
+ @Override
public void setListenerId( long id )
throws IOException
{
@@ -372,6 +377,7 @@ public class EventQueueConcurrentLoadTes
* @return 0
* @throws IOException
*/
+ @Override
public long getListenerId()
throws IOException
{
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/MockCacheServiceNonLocal.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/MockCacheServiceNonLocal.java?rev=1584224&r1=1584223&r2=1584224&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/MockCacheServiceNonLocal.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/MockCacheServiceNonLocal.java Thu Apr 3 00:16:10 2014
@@ -67,6 +67,7 @@ public class MockCacheServiceNonLocal<K
* @param requesterId - identity of requester
* @return null
*/
+ @Override
public ICacheElement<K, V> get( String cacheName, K key, long requesterId )
{
lastGetKey = key;
@@ -77,6 +78,7 @@ public class MockCacheServiceNonLocal<K
* @param cacheName
* @return empty set
*/
+ @Override
public Set<K> getKeySet( String cacheName )
{
return new HashSet<K>();
@@ -89,6 +91,7 @@ public class MockCacheServiceNonLocal<K
* @param key
* @param requesterId - identity of requester
*/
+ @Override
public void remove( String cacheName, K key, long requesterId )
{
lastRemoveKey = key;
@@ -101,6 +104,7 @@ public class MockCacheServiceNonLocal<K
* @param requesterId - identity of requester
* @throws IOException
*/
+ @Override
public void removeAll( String cacheName, long requesterId )
throws IOException
{
@@ -113,6 +117,7 @@ public class MockCacheServiceNonLocal<K
* @param item
* @param requesterId - identity of requester
*/
+ @Override
public void update( ICacheElement<K, V> item, long requesterId )
{
lastUpdate = item;
@@ -125,6 +130,7 @@ public class MockCacheServiceNonLocal<K
* <p>
* @param cacheName
*/
+ @Override
public void dispose( String cacheName )
{
return;
@@ -135,6 +141,7 @@ public class MockCacheServiceNonLocal<K
* @param key
* @return null
*/
+ @Override
public ICacheElement<K, V> get( String cacheName, K key )
{
return get( cacheName, key, 0 );
@@ -143,6 +150,7 @@ public class MockCacheServiceNonLocal<K
/**
* Do nothing.
*/
+ @Override
public void release()
{
return;
@@ -154,6 +162,7 @@ public class MockCacheServiceNonLocal<K
* @param cacheName
* @param key
*/
+ @Override
public void remove( String cacheName, K key )
{
lastRemoveKey = key;
@@ -164,6 +173,7 @@ public class MockCacheServiceNonLocal<K
* <p>
* @param cacheName
*/
+ @Override
public void removeAll( String cacheName )
{
lastRemoveAllCacheName = cacheName;
@@ -174,6 +184,7 @@ public class MockCacheServiceNonLocal<K
* <p>
* @param item
*/
+ @Override
public void update( ICacheElement<K, V> item )
{
lastUpdate = item;
@@ -185,6 +196,7 @@ public class MockCacheServiceNonLocal<K
* @param requesterId - identity of requester
* @return empty map
*/
+ @Override
public Map<K, ICacheElement<K, V>> getMultiple( String cacheName, Set<K> keys, long requesterId )
{
lastGetMultipleKeys = keys;
@@ -196,6 +208,7 @@ public class MockCacheServiceNonLocal<K
* @param keys
* @return empty map
*/
+ @Override
public Map<K, ICacheElement<K, V>> getMultiple( String cacheName, Set<K> keys )
{
return getMultiple( cacheName, keys, 0 );
@@ -209,6 +222,7 @@ public class MockCacheServiceNonLocal<K
* @return an empty map
* @throws IOException
*/
+ @Override
public Map<K, ICacheElement<K, V>> getMatching( String cacheName, String pattern )
throws IOException
{
@@ -222,6 +236,7 @@ public class MockCacheServiceNonLocal<K
* @return Map
* @throws IOException
*/
+ @Override
public Map<K, ICacheElement<K, V>> getMatching( String cacheName, String pattern, long requesterId )
throws IOException
{
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/CompositeCacheDiskUsageUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/CompositeCacheDiskUsageUnitTest.java?rev=1584224&r1=1584223&r2=1584224&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/CompositeCacheDiskUsageUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/CompositeCacheDiskUsageUnitTest.java Thu Apr 3 00:16:10 2014
@@ -332,6 +332,7 @@ public class CompositeCacheDiskUsageUnit
* @param ce
* @throws IOException
*/
+ @Override
public void update( ICacheElement<K, V> ce )
throws IOException
{
@@ -344,6 +345,7 @@ public class CompositeCacheDiskUsageUnit
* @return ICacheElement
* @throws IOException
*/
+ @Override
public ICacheElement<K, V> get( K key )
throws IOException
{
@@ -357,6 +359,7 @@ public class CompositeCacheDiskUsageUnit
* @return a map of K key to ICacheElement<K, V> element, or an empty map if there is
* no data in cache for any of these keys
*/
+ @Override
public Map<K, ICacheElement<K, V>> getMultiple(Set<K> keys)
{
return new HashMap<K, ICacheElement<K, V>>();
@@ -367,6 +370,7 @@ public class CompositeCacheDiskUsageUnit
* @return false
* @throws IOException
*/
+ @Override
public boolean remove( K key )
throws IOException
{
@@ -374,6 +378,7 @@ public class CompositeCacheDiskUsageUnit
}
/** @throws IOException */
+ @Override
public void removeAll()
throws IOException
{
@@ -381,6 +386,7 @@ public class CompositeCacheDiskUsageUnit
}
/** @throws IOException */
+ @Override
public void dispose()
throws IOException
{
@@ -388,18 +394,21 @@ public class CompositeCacheDiskUsageUnit
}
/** @return 0 */
+ @Override
public int getSize()
{
return 0;
}
/** @return 0 */
+ @Override
public CacheStatus getStatus()
{
return CacheStatus.ALIVE;
}
/** @return null */
+ @Override
public String getCacheName()
{
return null;
@@ -409,6 +418,7 @@ public class CompositeCacheDiskUsageUnit
* @return null
* @throws IOException
*/
+ @Override
public Set<K> getKeySet( )
throws IOException
{
@@ -416,12 +426,14 @@ public class CompositeCacheDiskUsageUnit
}
/** @return null */
+ @Override
public IStats getStatistics()
{
return null;
}
/** @return null */
+ @Override
public String getStats()
{
return null;
@@ -433,6 +445,7 @@ public class CompositeCacheDiskUsageUnit
* @see org.apache.commons.jcs.engine.behavior.ICacheType#getCacheType()
* @return cacheType
*/
+ @Override
public CacheType getCacheType()
{
return cacheType;
@@ -441,6 +454,7 @@ public class CompositeCacheDiskUsageUnit
/**
* @return Returns the AuxiliaryCacheAttributes.
*/
+ @Override
public AuxiliaryCacheAttributes getAuxiliaryCacheAttributes()
{
return null;
@@ -479,6 +493,7 @@ public class CompositeCacheDiskUsageUnit
* @return Collections.EMPTY_MAP;
* @throws IOException
*/
+ @Override
public Map<K, ICacheElement<K, V>> getMatching(String pattern)
throws IOException
{
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/MockCompositeCacheManager.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/MockCompositeCacheManager.java?rev=1584224&r1=1584223&r2=1584224&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/MockCompositeCacheManager.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/MockCompositeCacheManager.java Thu Apr 3 00:16:10 2014
@@ -40,6 +40,7 @@ public class MockCompositeCacheManager
* @param cacheName
* @return Returns a CompositeCache
*/
+ @Override
@SuppressWarnings("unchecked")
public <K extends Serializable, V extends Serializable> CompositeCache<K, V> getCache( String cacheName )
{
@@ -85,12 +86,14 @@ public class MockCompositeCacheManager
* <p>
* @return the configurationProperties
*/
+ @Override
public Properties getConfigurationProperties()
{
return configurationProperties;
}
/** @return Mock */
+ @Override
public String getStats()
{
return "Mock";
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/MockElementSerializer.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/MockElementSerializer.java?rev=1584224&r1=1584223&r2=1584224&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/MockElementSerializer.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/MockElementSerializer.java Thu Apr 3 00:16:10 2014
@@ -48,6 +48,7 @@ public class MockElementSerializer
* @throws ClassNotFoundException
*
*/
+ @Override
public <T extends Serializable> T deSerialize( byte[] bytes )
throws IOException, ClassNotFoundException
{
@@ -61,6 +62,7 @@ public class MockElementSerializer
* @throws IOException
*
*/
+ @Override
public <T extends Serializable> byte[] serialize( T obj )
throws IOException
{
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/event/ElementEventHandlerMockImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/event/ElementEventHandlerMockImpl.java?rev=1584224&r1=1584223&r2=1584224&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/event/ElementEventHandlerMockImpl.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/event/ElementEventHandlerMockImpl.java Thu Apr 3 00:16:10 2014
@@ -55,6 +55,7 @@ public class ElementEventHandlerMockImpl
/**
* @param event
*/
+ @Override
public synchronized void handleElementEvent( IElementEvent event )
{
setCallCount( getCallCount() + 1 );
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/event/SimpleEventHandlingUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/event/SimpleEventHandlingUnitTest.java?rev=1584224&r1=1584223&r2=1584224&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/event/SimpleEventHandlingUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/control/event/SimpleEventHandlingUnitTest.java Thu Apr 3 00:16:10 2014
@@ -279,6 +279,7 @@ public class SimpleEventHandlingUnitTest
/**
* @param event
*/
+ @Override
public synchronized void handleElementEvent( IElementEvent event )
{
//System.out.println( "Handling Event of Type " +
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/logging/MockCacheEventLogger.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/logging/MockCacheEventLogger.java?rev=1584224&r1=1584223&r2=1584224&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/logging/MockCacheEventLogger.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/logging/MockCacheEventLogger.java Thu Apr 3 00:16:10 2014
@@ -38,6 +38,7 @@ public class MockCacheEventLogger
* @param eventName
* @param optionalDetails
*/
+ @Override
public void logApplicationEvent( String source, String eventName, String optionalDetails )
{
// TODO Auto-generated method stub
@@ -48,6 +49,7 @@ public class MockCacheEventLogger
* @param eventName
* @param errorMessage
*/
+ @Override
public void logError( String source, String eventName, String errorMessage )
{
// TODO Auto-generated method stub
@@ -61,6 +63,7 @@ public class MockCacheEventLogger
* @param key
* @return ICacheEvent
*/
+ @Override
public <T extends Serializable> ICacheEvent<T> createICacheEvent( String source, String region, String eventName, String optionalDetails,
T key )
{
@@ -70,6 +73,7 @@ public class MockCacheEventLogger
/**
* @param event
*/
+ @Override
public <T extends Serializable> void logICacheEvent( ICacheEvent<T> event )
{
// TODO Auto-generated method stub
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/MockMemoryCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/MockMemoryCache.java?rev=1584224&r1=1584223&r2=1584224&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/MockMemoryCache.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/engine/memory/MockMemoryCache.java Thu Apr 3 00:16:10 2014
@@ -58,6 +58,7 @@ public class MockMemoryCache<K extends S
* Does nothing
* @param cache
*/
+ @Override
public void initialize( CompositeCache<K, V> cache )
{
// nothing
@@ -68,6 +69,7 @@ public class MockMemoryCache<K extends S
* <p>
* @throws IOException
*/
+ @Override
public void dispose()
throws IOException
{
@@ -75,18 +77,21 @@ public class MockMemoryCache<K extends S
}
/** @return size */
+ @Override
public int getSize()
{
return map.size();
}
/** @return stats */
+ @Override
public IStats getStatistics()
{
return null;
}
/** @return null */
+ @Override
public Iterator<Map.Entry<K, MemoryElementDescriptor<K, V>>> getIterator()
{
return null;
@@ -94,6 +99,7 @@ public class MockMemoryCache<K extends S
/**
* @return map.keySet().toArray( */
+ @Override
public Set<K> getKeySet()
{
return new LinkedHashSet<K>(map.keySet());
@@ -104,6 +110,7 @@ public class MockMemoryCache<K extends S
* @return map.remove( key ) != null
* @throws IOException
*/
+ @Override
public boolean remove( K key )
throws IOException
{
@@ -113,6 +120,7 @@ public class MockMemoryCache<K extends S
/**
* @throws IOException
*/
+ @Override
public void removeAll()
throws IOException
{
@@ -124,6 +132,7 @@ public class MockMemoryCache<K extends S
* @return (ICacheElement) map.get( key )
* @throws IOException
*/
+ @Override
public ICacheElement<K, V> get( K key )
throws IOException
{
@@ -135,6 +144,7 @@ public class MockMemoryCache<K extends S
* @return elements
* @throws IOException
*/
+ @Override
public Map<K, ICacheElement<K, V>> getMultiple(Set<K> keys)
throws IOException
{
@@ -165,6 +175,7 @@ public class MockMemoryCache<K extends S
* @return (ICacheElement) map.get( key )
* @throws IOException
*/
+ @Override
public ICacheElement<K, V> getQuiet( K key )
throws IOException
{
@@ -175,6 +186,7 @@ public class MockMemoryCache<K extends S
* @param ce
* @throws IOException
*/
+ @Override
public void waterfal( ICacheElement<K, V> ce )
throws IOException
{
@@ -185,6 +197,7 @@ public class MockMemoryCache<K extends S
* @param ce
* @throws IOException
*/
+ @Override
public void update( ICacheElement<K, V> ce )
throws IOException
{
@@ -197,6 +210,7 @@ public class MockMemoryCache<K extends S
/**
* @return ICompositeCacheAttributes
*/
+ @Override
public ICompositeCacheAttributes getCacheAttributes()
{
return cacheAttr;
@@ -205,12 +219,14 @@ public class MockMemoryCache<K extends S
/**
* @param cattr
*/
+ @Override
public void setCacheAttributes( ICompositeCacheAttributes cattr )
{
this.cacheAttr = cattr;
}
/** @return null */
+ @Override
public CompositeCache<K, V> getCompositeCache()
{
return null;
@@ -238,6 +254,7 @@ public class MockMemoryCache<K extends S
* @return 0
* @throws IOException
*/
+ @Override
public int freeElements( int numberToFree )
throws IOException
{
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/access/JCSWorkerUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/access/JCSWorkerUnitTest.java?rev=1584224&r1=1584223&r2=1584224&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/access/JCSWorkerUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/access/JCSWorkerUnitTest.java Thu Apr 3 00:16:10 2014
@@ -49,6 +49,7 @@ public class JCSWorkerUnitTest
{
int timesCalled = 0;
+ @Override
public Object doWork()
{
Object results = Long.valueOf( ++timesCalled );
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/MockDiscoveryListener.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/MockDiscoveryListener.java?rev=1584224&r1=1584223&r2=1584224&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/MockDiscoveryListener.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/MockDiscoveryListener.java Thu Apr 3 00:16:10 2014
@@ -36,6 +36,7 @@ public class MockDiscoveryListener
* <p>
* @param service
*/
+ @Override
public void addDiscoveredService( DiscoveredService service )
{
discoveredServices.add( service );
@@ -46,6 +47,7 @@ public class MockDiscoveryListener
* <p>
* @param service
*/
+ @Override
public void removeDiscoveredService( DiscoveredService service )
{
discoveredServices.remove( service );