You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by mg...@apache.org on 2008/10/22 18:28:19 UTC
svn commit: r707122 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache:
MapQueryCache.java NestedQueryCache.java OSQueryCache.java QueryCache.java
Author: mgentry
Date: Wed Oct 22 09:28:19 2008
New Revision: 707122
URL: http://svn.apache.org/viewvc?rev=707122&view=rev
Log:
Changed meaningless generic type information to use @SuppressWarnings("unchecked") to suppress warnings.
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCache.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/NestedQueryCache.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/OSQueryCache.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/QueryCache.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCache.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCache.java?rev=707122&r1=707121&r2=707122&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCache.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCache.java Wed Oct 22 09:28:19 2008
@@ -48,7 +48,8 @@
this.map = new LRUMap(maxSize);
}
- public List<?> get(QueryMetadata metadata) {
+ @SuppressWarnings("unchecked")
+ public List get(QueryMetadata metadata) {
String key = metadata.getCacheKey();
if (key == null) {
return null;
@@ -68,8 +69,9 @@
* a result there is a potential of multiple threads to be updating cache in parallel -
* this wouldn't lead to corruption of the cache, but can be suboptimal.
*/
- public List<?> get(QueryMetadata metadata, QueryCacheEntryFactory factory) {
- List<?> result = get(metadata);
+ @SuppressWarnings("unchecked")
+ public List get(QueryMetadata metadata, QueryCacheEntryFactory factory) {
+ List result = get(metadata);
if (result == null) {
Object newObject = factory.createObject();
@@ -85,14 +87,15 @@
}
}
- result = (List<?>) newObject;
+ result = (List) newObject;
put(metadata, result);
}
return result;
}
- public void put(QueryMetadata metadata, List<?> results) {
+ @SuppressWarnings("unchecked")
+ public void put(QueryMetadata metadata, List results) {
String key = metadata.getCacheKey();
if (key != null) {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/NestedQueryCache.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/NestedQueryCache.java?rev=707122&r1=707121&r2=707122&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/NestedQueryCache.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/NestedQueryCache.java Wed Oct 22 09:28:19 2008
@@ -75,15 +75,18 @@
delegate.clear();
}
- public List<?> get(QueryMetadata metadata, QueryCacheEntryFactory factory) {
+ @SuppressWarnings("unchecked")
+ public List get(QueryMetadata metadata, QueryCacheEntryFactory factory) {
return delegate.get(qualifiedMetadata(metadata), factory);
}
- public List<?> get(QueryMetadata metadata) {
+ @SuppressWarnings("unchecked")
+ public List get(QueryMetadata metadata) {
return delegate.get(qualifiedMetadata(metadata));
}
- public void put(QueryMetadata metadata, List<?> results) {
+ @SuppressWarnings("unchecked")
+ public void put(QueryMetadata metadata, List results) {
delegate.put(qualifiedMetadata(metadata), results);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/OSQueryCache.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/OSQueryCache.java?rev=707122&r1=707121&r2=707122&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/OSQueryCache.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/OSQueryCache.java Wed Oct 22 09:28:19 2008
@@ -104,7 +104,8 @@
* Returns a collection of group names that have been configured explicitly via
* properties.
*/
- public Collection<?> getGroupNames() {
+ @SuppressWarnings("unchecked")
+ public Collection getGroupNames() {
return refreshSpecifications != null
? Collections.unmodifiableCollection(refreshSpecifications.keySet())
: Collections.EMPTY_SET;
@@ -235,7 +236,8 @@
return spec;
}
- public List<?> get(QueryMetadata metadata) {
+ @SuppressWarnings("unchecked")
+ public List get(QueryMetadata metadata) {
String key = metadata.getCacheKey();
if (key == null) {
return null;
@@ -244,7 +246,7 @@
RefreshSpecification refresh = getRefreshSpecification(metadata);
try {
- return (List<?>) osCache.getFromCache(
+ return (List) osCache.getFromCache(
key,
refresh.refreshPeriod,
refresh.cronExpression);
@@ -261,7 +263,8 @@
* will block on the entry update or not is controlled by "cache.blocking"
* configuration property and is "false" by default.
*/
- public List<?> get(QueryMetadata metadata, QueryCacheEntryFactory factory) {
+ @SuppressWarnings("unchecked")
+ public List get(QueryMetadata metadata, QueryCacheEntryFactory factory) {
String key = metadata.getCacheKey();
if (key == null) {
return null;
@@ -270,7 +273,7 @@
RefreshSpecification refresh = getRefreshSpecification(metadata);
try {
- return (List<?>) osCache.getFromCache(
+ return (List) osCache.getFromCache(
key,
refresh.refreshPeriod,
refresh.cronExpression);
@@ -292,7 +295,7 @@
}
}
- List<?> list = (List<?>) result;
+ List list = (List) result;
put(metadata, list);
updated = true;
@@ -325,7 +328,8 @@
return refresh != null ? refresh : defaultRefreshSpecification;
}
- public void put(QueryMetadata metadata, List<?> results) {
+ @SuppressWarnings("unchecked")
+ public void put(QueryMetadata metadata, List results) {
String key = metadata.getCacheKey();
if (key != null) {
osCache.putInCache(key, results, metadata.getCacheGroups());
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/QueryCache.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/QueryCache.java?rev=707122&r1=707121&r2=707122&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/QueryCache.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/QueryCache.java Wed Oct 22 09:28:19 2008
@@ -34,7 +34,8 @@
* Returns a cached query result for the given QueryMetadata or null if the result is
* not cached or is expired.
*/
- List<?> get(QueryMetadata metadata);
+ @SuppressWarnings("unchecked")
+ List get(QueryMetadata metadata);
/**
* Returns a cached query result for the given QueryMetadata. If the result is not
@@ -45,9 +46,11 @@
* from running the same query when a missing entry is requested by multiple threads
* simultaneously.
*/
- List<?> get(QueryMetadata metadata, QueryCacheEntryFactory factory);
+ @SuppressWarnings("unchecked")
+ List get(QueryMetadata metadata, QueryCacheEntryFactory factory);
- void put(QueryMetadata metadata, List<?> results);
+ @SuppressWarnings("unchecked")
+ void put(QueryMetadata metadata, List results);
/**
* Removes a single entry from cache.