This is an automated email from the ASF dual-hosted git repository. mbien pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/roller.git
commit 7d07a845feed451d0356c9954ad2f11a0e148e96 Author: Michael Bien <[email protected]> AuthorDate: Thu Jul 8 09:04:00 2021 +0200 Cache: type compiler warning fixes and collection improvements. --- .../ui/rendering/util/cache/PlanetCache.java | 6 +++--- .../ui/rendering/util/cache/SaltCache.java | 12 ++++++------ .../ui/rendering/util/cache/SiteWideCache.java | 21 ++++++++++----------- .../rendering/util/cache/WeblogCacheWarmupJob.java | 5 +++-- .../ui/rendering/util/cache/WeblogFeedCache.java | 20 ++++++++++---------- .../ui/rendering/util/cache/WeblogPageCache.java | 22 ++++++++++------------ .../roller/weblogger/util/cache/CacheFactory.java | 2 +- .../roller/weblogger/util/cache/CacheManager.java | 4 ++-- .../weblogger/util/cache/ExpiringCacheEntry.java | 13 ++++--------- .../util/cache/ExpiringLRUCacheFactoryImpl.java | 8 ++++---- .../weblogger/util/cache/LRUCacheFactoryImpl.java | 6 +++--- .../roller/weblogger/util/cache/LRUCacheImpl.java | 8 ++++---- .../util/cache/LazyExpiringCacheEntry.java | 4 ++-- 13 files changed, 62 insertions(+), 69 deletions(-) diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java index 649abed..9ea6214 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/PlanetCache.java @@ -37,7 +37,7 @@ import org.apache.roller.weblogger.util.cache.ExpiringCacheEntry; */ public final class PlanetCache { - private static Log log = LogFactory.getLog(PlanetCache.class); + private static final Log log = LogFactory.getLog(PlanetCache.class); // a unique identifier for this cache, this is used as the prefix for // roller config properties that apply to this cache @@ -60,7 +60,7 @@ public final class PlanetCache { Map<String, String> cacheProps = new HashMap<>(); cacheProps.put("id", CACHE_ID); - Enumeration allProps = WebloggerConfig.keys(); + Enumeration<Object> allProps = WebloggerConfig.keys(); String prop; while(allProps.hasMoreElements()) { prop = (String) allProps.nextElement(); @@ -192,7 +192,7 @@ public final class PlanetCache { */ public String generateKey(PlanetRequest planetRequest) { - StringBuilder key = new StringBuilder(); + StringBuilder key = new StringBuilder(128); key.append(CACHE_ID).append(':'); key.append(planetRequest.getContext()); diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SaltCache.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SaltCache.java index 1fa3dec..e810bf7 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SaltCache.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SaltCache.java @@ -36,7 +36,8 @@ import org.apache.roller.weblogger.util.cache.ExpiringCacheEntry; * cache, e.g. memcached */ public final class SaltCache { - private static Log log = LogFactory.getLog(SaltCache.class); + + private static final Log log = LogFactory.getLog(SaltCache.class); // a unique identifier for this cache, this is used as the prefix for // roller config properties that apply to this cache @@ -49,10 +50,10 @@ public final class SaltCache { private SaltCache() { - Map cacheProps = new HashMap(); + Map<String, String> cacheProps = new HashMap<>(); cacheProps.put("id", CACHE_ID); - Enumeration allProps = WebloggerConfig.keys(); - String prop = null; + Enumeration<Object> allProps = WebloggerConfig.keys(); + String prop; while(allProps.hasMoreElements()) { prop = (String) allProps.nextElement(); @@ -78,8 +79,7 @@ public final class SaltCache { Object entry = null; - ExpiringCacheEntry lazyEntry = - (ExpiringCacheEntry) this.contentCache.get(key); + ExpiringCacheEntry lazyEntry = (ExpiringCacheEntry) this.contentCache.get(key); if(lazyEntry != null) { entry = lazyEntry.getValue(); if(entry != null) { diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java index 68b341d..02f7bd9 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java @@ -20,12 +20,11 @@ package org.apache.roller.weblogger.ui.rendering.util.cache; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.util.Arrays; import java.util.Date; import java.util.Enumeration; import java.util.HashMap; import java.util.Map; -import java.util.Set; -import java.util.TreeSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.roller.util.RollerConstants; @@ -53,7 +52,7 @@ import org.apache.roller.weblogger.util.cache.ExpiringCacheEntry; */ public final class SiteWideCache implements CacheHandler { - private static Log log = LogFactory.getLog(SiteWideCache.class); + private static final Log log = LogFactory.getLog(SiteWideCache.class); // a unique identifier for this cache, this is used as the prefix for // roller config properties that apply to this cache @@ -76,8 +75,8 @@ public final class SiteWideCache implements CacheHandler { Map<String, String> cacheProps = new HashMap<>(); cacheProps.put("id", CACHE_ID); - Enumeration allProps = WebloggerConfig.keys(); - String prop = null; + Enumeration<Object> allProps = WebloggerConfig.keys(); + String prop; while(allProps.hasMoreElements()) { prop = (String) allProps.nextElement(); @@ -234,9 +233,9 @@ public final class SiteWideCache implements CacheHandler { if("tags".equals(pageRequest.getContext())) { key.append("/tags/"); if(pageRequest.getTags() != null && !pageRequest.getTags().isEmpty()) { - Set ordered = new TreeSet(pageRequest.getTags()); - String[] tags = (String[]) ordered.toArray(new String[ordered.size()]); - key.append(Utilities.stringArrayToString(tags,"+")); + String[] tags = pageRequest.getTags().toArray(new String[0]); + Arrays.sort(tags); + key.append("/tags/").append(Utilities.stringArrayToString(tags,"+")); } } } @@ -316,9 +315,9 @@ public final class SiteWideCache implements CacheHandler { } if(feedRequest.getTags() != null && !feedRequest.getTags().isEmpty()) { - String[] tags = new String[feedRequest.getTags().size()]; - new TreeSet(feedRequest.getTags()).toArray(tags); - key.append("/tags/").append(Utilities.stringArrayToString(tags,"+")); + String[] tags = feedRequest.getTags().toArray(new String[0]); + Arrays.sort(tags); + key.append("/tags/").append(Utilities.stringArrayToString(tags,"+")); } return key.toString(); diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java index 7224c04..98baa89 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogCacheWarmupJob.java @@ -48,7 +48,7 @@ import org.apache.roller.weblogger.util.cache.CachedContent; */ public class WeblogCacheWarmupJob implements Job { - private static Log log = LogFactory.getLog(WeblogCacheWarmupJob.class); + private static final Log log = LogFactory.getLog(WeblogCacheWarmupJob.class); // inputs from the user private Map<String, Object> inputs = null; @@ -63,6 +63,7 @@ public class WeblogCacheWarmupJob implements Job { if(inputs != null) { // what weblogs will we handle? + @SuppressWarnings("unchecked") List<String> weblogs = (List<String>) inputs.get("weblogs"); if(weblogs == null) { return; @@ -118,7 +119,7 @@ public class WeblogCacheWarmupJob implements Job { // populate the rendering model Map<String, Object> modelMap = new HashMap<>(); - Map<String, WeblogFeedRequest> initData = new HashMap<>(); + Map<String, Object> initData = new HashMap<>(); initData.put("request", null); initData.put("feedRequest", feedRequest); initData.put("weblogRequest", feedRequest); diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogFeedCache.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogFeedCache.java index 7e5cec5..35f57b2 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogFeedCache.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogFeedCache.java @@ -20,11 +20,10 @@ package org.apache.roller.weblogger.ui.rendering.util.cache; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.util.Arrays; import java.util.Enumeration; import java.util.HashMap; import java.util.Map; -import java.util.Set; -import java.util.TreeSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.roller.weblogger.config.WebloggerConfig; @@ -40,7 +39,7 @@ import org.apache.roller.weblogger.util.cache.LazyExpiringCacheEntry; */ public final class WeblogFeedCache { - private static Log log = LogFactory.getLog(WeblogFeedCache.class); + private static final Log log = LogFactory.getLog(WeblogFeedCache.class); // a unique identifier for this cache, this is used as the prefix for // roller config properties that apply to this cache @@ -58,10 +57,11 @@ public final class WeblogFeedCache { cacheEnabled = WebloggerConfig.getBooleanProperty(CACHE_ID+".enabled"); - Map cacheProps = new HashMap(); + Map<String, String> cacheProps = new HashMap<>(); cacheProps.put("id", CACHE_ID); - Enumeration allProps = WebloggerConfig.keys(); - String prop = null; + + Enumeration<Object> allProps = WebloggerConfig.keys(); + String prop; while(allProps.hasMoreElements()) { prop = (String) allProps.nextElement(); @@ -164,7 +164,7 @@ public final class WeblogFeedCache { StringBuilder key = new StringBuilder(128); - key.append(this.CACHE_ID).append(':'); + key.append(CACHE_ID).append(':'); key.append(feedRequest.getWeblogHandle()); key.append('/').append(feedRequest.getType()); @@ -186,9 +186,9 @@ public final class WeblogFeedCache { } if(feedRequest.getTags() != null && !feedRequest.getTags().isEmpty()) { - Set ordered = new TreeSet(feedRequest.getTags()); - String[] tags = (String[]) ordered.toArray(new String[ordered.size()]); - key.append("/tags/").append(Utilities.stringArrayToString(tags,"+")); + String[] tags = feedRequest.getTags().toArray(new String[0]); + Arrays.sort(tags); + key.append("/tags/").append(Utilities.stringArrayToString(tags,"+")); } if(feedRequest.getLocale() != null) { diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogPageCache.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogPageCache.java index 7982c87..4c63d08 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogPageCache.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/WeblogPageCache.java @@ -20,11 +20,10 @@ package org.apache.roller.weblogger.ui.rendering.util.cache; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.util.Arrays; import java.util.Enumeration; import java.util.HashMap; import java.util.Map; -import java.util.Set; -import java.util.TreeSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.roller.weblogger.config.WebloggerConfig; @@ -40,7 +39,7 @@ import org.apache.roller.weblogger.util.cache.LazyExpiringCacheEntry; */ public final class WeblogPageCache { - private static Log log = LogFactory.getLog(WeblogPageCache.class); + private static final Log log = LogFactory.getLog(WeblogPageCache.class); // a unique identifier for this cache, this is used as the prefix for // roller config properties that apply to this cache @@ -58,10 +57,10 @@ public final class WeblogPageCache { cacheEnabled = WebloggerConfig.getBooleanProperty(CACHE_ID+".enabled"); - Map cacheProps = new HashMap(); + Map<String, String> cacheProps = new HashMap<>(); cacheProps.put("id", CACHE_ID); - Enumeration allProps = WebloggerConfig.keys(); - String prop = null; + Enumeration<Object> allProps = WebloggerConfig.keys(); + String prop; while(allProps.hasMoreElements()) { prop = (String) allProps.nextElement(); @@ -95,8 +94,7 @@ public final class WeblogPageCache { Object entry = null; - LazyExpiringCacheEntry lazyEntry = - (LazyExpiringCacheEntry) this.contentCache.get(key); + LazyExpiringCacheEntry lazyEntry = (LazyExpiringCacheEntry) this.contentCache.get(key); if(lazyEntry != null) { entry = lazyEntry.getValue(lastModified); @@ -168,7 +166,7 @@ public final class WeblogPageCache { StringBuilder key = new StringBuilder(128); - key.append(this.CACHE_ID).append(':'); + key.append(CACHE_ID).append(':'); key.append(pageRequest.getWeblogHandle()); if(pageRequest.getWeblogAnchor() != null) { @@ -207,9 +205,9 @@ public final class WeblogPageCache { if("tags".equals(pageRequest.getContext())) { key.append("/tags/"); if(pageRequest.getTags() != null && !pageRequest.getTags().isEmpty()) { - Set ordered = new TreeSet(pageRequest.getTags()); - String[] tags = (String[]) ordered.toArray(new String[ordered.size()]); - key.append(Utilities.stringArrayToString(tags,"+")); + String[] tags = pageRequest.getTags().toArray(new String[0]); + Arrays.sort(tags); + key.append("/tags/").append(Utilities.stringArrayToString(tags,"+")); } } } diff --git a/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheFactory.java b/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheFactory.java index 145983b..171cd85 100644 --- a/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheFactory.java +++ b/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheFactory.java @@ -30,6 +30,6 @@ import java.util.Map; */ public interface CacheFactory { - Cache constructCache(Map properties); + Cache constructCache(Map<String, ?> properties); } diff --git a/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheManager.java b/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheManager.java index 23b4d1b..9b44a30 100644 --- a/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheManager.java +++ b/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheManager.java @@ -139,7 +139,7 @@ public final class CacheManager { * see fit. It also allows users to write their own caching modifications * and have them used only by specific caches. */ - public static Cache constructCache(CacheHandler handler, Map properties) { + public static Cache constructCache(CacheHandler handler, Map<String, String> properties) { log.debug("Constructing new cache with props "+properties); @@ -147,7 +147,7 @@ public final class CacheManager { if(properties != null && properties.containsKey("factory")) { // someone wants a custom cache instance - String classname = (String) properties.get("factory"); + String classname = properties.get("factory"); try { // use reflection to instantiate the factory class diff --git a/app/src/main/java/org/apache/roller/weblogger/util/cache/ExpiringCacheEntry.java b/app/src/main/java/org/apache/roller/weblogger/util/cache/ExpiringCacheEntry.java index d24b781..d644b30 100644 --- a/app/src/main/java/org/apache/roller/weblogger/util/cache/ExpiringCacheEntry.java +++ b/app/src/main/java/org/apache/roller/weblogger/util/cache/ExpiringCacheEntry.java @@ -29,19 +29,14 @@ import java.io.Serializable; */ public class ExpiringCacheEntry implements Serializable { - private Object value; - private long timeCached = -1; - private long timeout = 0; + private final Object value; + private final long timeCached; + private final long timeout; public ExpiringCacheEntry(Object value, long timeout) { this.value = value; - - // make sure that we don't support negative values - if(timeout > 0) { - this.timeout = timeout; - } - + this.timeout = Math.max(0, timeout); // make sure that we don't support negative values this.timeCached = System.currentTimeMillis(); } diff --git a/app/src/main/java/org/apache/roller/weblogger/util/cache/ExpiringLRUCacheFactoryImpl.java b/app/src/main/java/org/apache/roller/weblogger/util/cache/ExpiringLRUCacheFactoryImpl.java index ec83fd3..a11ac31 100644 --- a/app/src/main/java/org/apache/roller/weblogger/util/cache/ExpiringLRUCacheFactoryImpl.java +++ b/app/src/main/java/org/apache/roller/weblogger/util/cache/ExpiringLRUCacheFactoryImpl.java @@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFactory; */ public class ExpiringLRUCacheFactoryImpl implements CacheFactory { - private static Log log = LogFactory.getLog(ExpiringLRUCacheFactoryImpl.class); + private static final Log log = LogFactory.getLog(ExpiringLRUCacheFactoryImpl.class); // protected so only the CacheManager can instantiate us @@ -39,7 +39,7 @@ public class ExpiringLRUCacheFactoryImpl implements CacheFactory { * Construct a new instance of a Roller Expiring LRUCache. */ @Override - public Cache constructCache(Map properties) { + public Cache constructCache(Map<String, ?> properties) { int size = 100; long timeout = 15 * 60; @@ -48,13 +48,13 @@ public class ExpiringLRUCacheFactoryImpl implements CacheFactory { try { size = Integer.parseInt((String) properties.get("size")); } catch(Exception e) { - // ignored + log.warn("invalid size property", e); } try { timeout = Long.parseLong((String) properties.get("timeout")); } catch(Exception e) { - // ignored + log.warn("invalid timeout property", e); } String cacheId = (String) properties.get("id"); diff --git a/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheFactoryImpl.java b/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheFactoryImpl.java index 4877d1f..27c0676 100644 --- a/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheFactoryImpl.java +++ b/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheFactoryImpl.java @@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFactory; */ public class LRUCacheFactoryImpl implements CacheFactory { - private static Log log = LogFactory.getLog(LRUCacheFactoryImpl.class); + private static final Log log = LogFactory.getLog(LRUCacheFactoryImpl.class); // protected so that only the CacheManager can instantiate us @@ -39,14 +39,14 @@ public class LRUCacheFactoryImpl implements CacheFactory { * Construct a new instance of a Roller LRUCache. */ @Override - public Cache constructCache(Map properties) { + public Cache constructCache(Map<String, ?> properties) { int size = 100; String id = "unknown"; try { size = Integer.parseInt((String) properties.get("size")); } catch(Exception e) { - // ignored + log.warn("invalide size property", e); } String cacheId = (String) properties.get("id"); diff --git a/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheImpl.java b/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheImpl.java index b1ef250..83d4abf 100644 --- a/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheImpl.java +++ b/app/src/main/java/org/apache/roller/weblogger/util/cache/LRUCacheImpl.java @@ -31,7 +31,7 @@ import org.apache.roller.util.RollerConstants; public class LRUCacheImpl implements Cache { private final String id; - private final Map cache; + private final Map<String, Object> cache; // for metrics protected double hits = 0; @@ -50,7 +50,7 @@ public class LRUCacheImpl implements Cache { protected LRUCacheImpl(String id, int maxsize) { this.id = id; - this.cache = new LRULinkedHashMap(maxsize); + this.cache = new LRULinkedHashMap<>(maxsize); } @@ -133,7 +133,7 @@ public class LRUCacheImpl implements Cache { // David Flanaghan: http://www.davidflanagan.com/blog/000014.html - private static class LRULinkedHashMap extends LinkedHashMap { + private static class LRULinkedHashMap<K, V> extends LinkedHashMap<K, V> { protected int maxsize; public LRULinkedHashMap(int maxsize) { @@ -142,7 +142,7 @@ public class LRUCacheImpl implements Cache { } @Override - protected boolean removeEldestEntry(Map.Entry eldest) { + protected boolean removeEldestEntry(Map.Entry<K, V> eldest) { return this.size() > this.maxsize; } } diff --git a/app/src/main/java/org/apache/roller/weblogger/util/cache/LazyExpiringCacheEntry.java b/app/src/main/java/org/apache/roller/weblogger/util/cache/LazyExpiringCacheEntry.java index fc0ea1e..0b85b25 100644 --- a/app/src/main/java/org/apache/roller/weblogger/util/cache/LazyExpiringCacheEntry.java +++ b/app/src/main/java/org/apache/roller/weblogger/util/cache/LazyExpiringCacheEntry.java @@ -44,8 +44,8 @@ import java.io.Serializable; */ public class LazyExpiringCacheEntry implements Serializable { - private Object value = null; - private long timeCached = -1; + private final Object value; + private final long timeCached; public LazyExpiringCacheEntry(Object item) {
