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 97e8dd20992415a09915770ccab07bf882c73216
Author: Michael Bien <mbie...@gmail.com>
AuthorDate: Fri Jul 9 05:11:23 2021 +0200
misc: compiler warning fixes combined with collection improvements.
---
.../planet/util/rome/ContentModuleGenerator.java | 18 +++++-------------
.../roller/planet/util/rome/ContentModuleImpl.java | 2 +-
.../java/org/apache/roller/util/PropertyExpander.java | 4 ++--
.../weblogger/business/jpa/JPAPersistenceStrategy.java | 11 +++++------
.../weblogger/business/pings/WeblogUpdatePinger.java | 6 +++---
.../weblogger/business/plugins/PluginManager.java | 2 +-
.../weblogger/business/plugins/PluginManagerImpl.java | 4 ++--
.../weblogger/business/runnable/ThreadManagerImpl.java | 2 +-
.../roller/weblogger/config/WebloggerConfig.java | 8 ++++----
.../planet/business/WebloggerRomeFeedFetcher.java | 3 ++-
.../apache/roller/weblogger/util/Bannedwordslist.java | 15 ++++++---------
.../apache/roller/weblogger/util/RollerMessages.java | 8 ++++----
.../weblogger/util/StandaloneWebappClassLoader.java | 6 +++---
.../org/apache/roller/weblogger/util/Trackback.java | 10 ++++------
.../org/apache/roller/weblogger/util/URLUtilities.java | 8 ++++----
.../apache/roller/weblogger/business/PingsTest.java | 2 +-
16 files changed, 48 insertions(+), 61 deletions(-)
diff --git
a/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleGenerator.java
b/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleGenerator.java
index c88a786..d72ea06 100644
---
a/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleGenerator.java
+++
b/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleGenerator.java
@@ -16,8 +16,6 @@
*/
package org.apache.roller.planet.util.rome;
-import java.util.Collections;
-import java.util.HashSet;
import java.util.Set;
import org.jdom2.Element;
@@ -27,24 +25,18 @@ import com.rometools.rome.feed.module.Module;
import com.rometools.rome.io.ModuleGenerator;
public class ContentModuleGenerator implements ModuleGenerator {
- private static final Namespace CONTENT_NS =
- Namespace.getNamespace(ContentModule.URI);
+
+ private static final Namespace CONTENT_NS =
Namespace.getNamespace(ContentModule.URI);
+
+ private static final Set<Namespace> NAMESPACES = Set.of(CONTENT_NS);
@Override
public String getNamespaceUri() {
return ContentModule.URI;
}
- private static final Set NAMESPACES;
-
- static {
- Set nss = new HashSet();
- nss.add(CONTENT_NS);
- NAMESPACES = Collections.unmodifiableSet(nss);
- }
-
@Override
- public Set getNamespaces() {
+ public Set<Namespace> getNamespaces() {
return NAMESPACES;
}
diff --git
a/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleImpl.java
b/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleImpl.java
index 65e7fb3..e79f553 100644
---
a/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleImpl.java
+++
b/app/src/main/java/org/apache/roller/planet/util/rome/ContentModuleImpl.java
@@ -34,7 +34,7 @@ public class ContentModuleImpl extends ModuleImpl implements
ContentModule {
this.encoded = encoded;
}
@Override
- public Class getInterface() {
+ public Class<? extends CopyFrom> getInterface() {
return ContentModule.class;
}
diff --git a/app/src/main/java/org/apache/roller/util/PropertyExpander.java
b/app/src/main/java/org/apache/roller/util/PropertyExpander.java
index 3b767e9..c53c635 100644
--- a/app/src/main/java/org/apache/roller/util/PropertyExpander.java
+++ b/app/src/main/java/org/apache/roller/util/PropertyExpander.java
@@ -56,7 +56,7 @@ public final class PropertyExpander {
* @return the result of replacing property expressions with the values of
the corresponding properties from the
* supplied property map, null if the input string is null.
*/
- public static String expandProperties(String input, Map props) {
+ public static String expandProperties(String input, Map<?, ?> props) {
if (input == null) {
return null;
@@ -64,7 +64,7 @@ public final class PropertyExpander {
Matcher matcher = EXPANSION_PATTERN.matcher(input);
- StringBuffer expanded = new StringBuffer(input.length());
+ StringBuilder expanded = new StringBuilder(input.length());
while (matcher.find()) {
String propName = matcher.group(2);
String value = (String) props.get(propName);
diff --git
a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPersistenceStrategy.java
b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPersistenceStrategy.java
index 3e0bca7..85b170a 100644
---
a/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPersistenceStrategy.java
+++
b/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAPersistenceStrategy.java
@@ -44,7 +44,7 @@ import org.apache.roller.weblogger.business.DatabaseProvider;
@com.google.inject.Singleton
public class JPAPersistenceStrategy {
- private static Log logger =
+ private static final Log logger =
LogFactory.getFactory().getInstance(JPAPersistenceStrategy.class);
/**
@@ -78,7 +78,7 @@ public class JPAPersistenceStrategy {
// Add all JPA, OpenJPA, HibernateJPA, etc. properties found
Properties emfProps = new Properties();
- Enumeration keys = WebloggerConfig.keys();
+ Enumeration<Object> keys = WebloggerConfig.keys();
while (keys.hasMoreElements()) {
String key = (String) keys.nextElement();
if ( key.startsWith("javax.persistence.")
@@ -183,7 +183,7 @@ public class JPAPersistenceStrategy {
* @param id the id of the object to remove
* @throws WebloggerException on any error deleting object
*/
- public void remove(Class clazz, String id) throws WebloggerException {
+ public void remove(Class<?> clazz, String id) throws WebloggerException {
EntityManager em = getEntityManager(true);
Object po = em.find(clazz, id);
em.remove(po);
@@ -204,7 +204,7 @@ public class JPAPersistenceStrategy {
* @param pos the persistent objects to remove
* @throws org.apache.roller.weblogger.WebloggerException on any error
*/
- public void removeAll(Collection pos) throws WebloggerException {
+ public void removeAll(Collection<?> pos) throws WebloggerException {
EntityManager em = getEntityManager(true);
for (Object obj : pos) {
em.remove(obj);
@@ -218,8 +218,7 @@ public class JPAPersistenceStrategy {
* @return the object retrieved
* @throws WebloggerException on any error retrieving object
*/
- public Object load(Class clazz, String id)
- throws WebloggerException {
+ public Object load(Class<?> clazz, String id) throws WebloggerException {
EntityManager em = getEntityManager(false);
return em.find(clazz, id);
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/business/pings/WeblogUpdatePinger.java
b/app/src/main/java/org/apache/roller/weblogger/business/pings/WeblogUpdatePinger.java
index 29e66c4..49d0e22 100644
---
a/app/src/main/java/org/apache/roller/weblogger/business/pings/WeblogUpdatePinger.java
+++
b/app/src/main/java/org/apache/roller/weblogger/business/pings/WeblogUpdatePinger.java
@@ -101,10 +101,10 @@ public final class WeblogUpdatePinger {
public static PingResult sendPing(PingTarget pingTarget, Weblog website)
throws IOException, XmlRpcException {
String websiteUrl = website.getAbsoluteURL();
String pingTargetUrl = pingTarget.getPingUrl();
- Set variantOptions = PingConfig.getVariantOptions(pingTargetUrl);
+ Set<String> variantOptions =
PingConfig.getVariantOptions(pingTargetUrl);
// Set up the ping parameters.
- List params = new ArrayList();
+ List<String> params = new ArrayList<>();
if (!variantOptions.contains("noname")) {
// ping variant for icerocket and anyone with similar bug, where
we must omit the blog name.
params.add(website.getName());
@@ -134,7 +134,7 @@ public final class WeblogUpdatePinger {
}
try {
// normal case: response is a struct (represented as a Map) with
Boolean flerror and String fields.
- Map result = (Map) obj;
+ Map<?, ?> result = (Map<?, ?>) obj;
return new PingResult((Boolean) result.get("flerror"), (String)
result.get("message"));
} catch (Exception ex) {
// exception case: The caller responded with an unexpected type,
though parsed at the basic XML RPC level.
diff --git
a/app/src/main/java/org/apache/roller/weblogger/business/plugins/PluginManager.java
b/app/src/main/java/org/apache/roller/weblogger/business/plugins/PluginManager.java
index 2a0f10c..9f51632 100644
---
a/app/src/main/java/org/apache/roller/weblogger/business/plugins/PluginManager.java
+++
b/app/src/main/java/org/apache/roller/weblogger/business/plugins/PluginManager.java
@@ -56,7 +56,7 @@ public interface PluginManager {
* @param str String to which to apply plugins
* @return the transformed text
*/
- String applyWeblogEntryPlugins(Map pagePlugins,WeblogEntry entry, String
str);
+ String applyWeblogEntryPlugins(Map<String, WeblogEntryPlugin> pagePlugins,
WeblogEntry entry, String str);
/**
diff --git
a/app/src/main/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java
b/app/src/main/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java
index 2ac1a24..7f6dc2a 100644
---
a/app/src/main/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java
+++
b/app/src/main/java/org/apache/roller/weblogger/business/plugins/PluginManagerImpl.java
@@ -89,7 +89,7 @@ public class PluginManagerImpl implements PluginManager {
}
@Override
- public String applyWeblogEntryPlugins(Map pagePlugins, WeblogEntry entry,
String str) {
+ public String applyWeblogEntryPlugins(Map<String, WeblogEntryPlugin>
pagePlugins, WeblogEntry entry, String str) {
String ret = str;
WeblogEntry copy = new WeblogEntry(entry);
@@ -97,7 +97,7 @@ public class PluginManagerImpl implements PluginManager {
if (entryPlugins != null) {
for (String key : entryPlugins) {
- WeblogEntryPlugin pagePlugin = (WeblogEntryPlugin)
pagePlugins.get(key);
+ WeblogEntryPlugin pagePlugin = pagePlugins.get(key);
if (pagePlugin != null) {
ret = pagePlugin.render(entry, ret);
} else {
diff --git
a/app/src/main/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java
b/app/src/main/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java
index a0280c1..c515bed 100644
---
a/app/src/main/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java
+++
b/app/src/main/java/org/apache/roller/weblogger/business/runnable/ThreadManagerImpl.java
@@ -131,7 +131,7 @@ public abstract class ThreadManagerImpl implements
ThreadManager {
@Override
public void executeInForeground(Runnable runnable)
throws InterruptedException {
- Future task = serviceScheduler.submit(runnable);
+ Future<?> task = serviceScheduler.submit(runnable);
// since this task is really meant to be executed within this calling
// thread, here we can add a little code here to loop until it
realizes
diff --git
a/app/src/main/java/org/apache/roller/weblogger/config/WebloggerConfig.java
b/app/src/main/java/org/apache/roller/weblogger/config/WebloggerConfig.java
index c652c59..1e655e0 100644
--- a/app/src/main/java/org/apache/roller/weblogger/config/WebloggerConfig.java
+++ b/app/src/main/java/org/apache/roller/weblogger/config/WebloggerConfig.java
@@ -53,7 +53,7 @@ public final class WebloggerConfig {
try {
// we'll need this to get at our properties files in the classpath
- Class configClass =
Class.forName("org.apache.roller.weblogger.config.WebloggerConfig");
+ Class<?> configClass =
Class.forName("org.apache.roller.weblogger.config.WebloggerConfig");
// first, lets load our default properties
try (InputStream is =
configClass.getResourceAsStream(default_config)) {
@@ -116,7 +116,7 @@ public final class WebloggerConfig {
String initialValue = (String) config.get(propName);
if (initialValue != null) {
String expandedValue =
PropertyExpander.expandSystemProperties(initialValue);
- config.put(propName,expandedValue);
+ config.setProperty(propName, expandedValue);
}
}
}
@@ -145,7 +145,7 @@ public final class WebloggerConfig {
log.debug("WebloggerConfig looks like this ...");
String key;
- Enumeration keys = config.keys();
+ Enumeration<Object> keys = config.keys();
while(keys.hasMoreElements()) {
key = (String) keys.nextElement();
log.debug(key+"="+config.getProperty(key));
@@ -239,7 +239,7 @@ public final class WebloggerConfig {
* Retrieve all property keys
* @return Enumeration A list of all keys
**/
- public static Enumeration keys() {
+ public static Enumeration<Object> keys() {
return config.keys();
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java
b/app/src/main/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java
index b69e6b8..076ad46 100644
---
a/app/src/main/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java
+++
b/app/src/main/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcher.java
@@ -32,6 +32,7 @@ import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.plugins.PluginManager;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.WeblogEntryManager;
+import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.WeblogEntry.PubStatus;
@@ -132,7 +133,7 @@ public class WebloggerRomeFeedFetcher extends
RomeFeedFetcher {
// Populate subscription object with new entries
PluginManager ppmgr =
WebloggerFactory.getWeblogger().getPluginManager();
- Map pagePlugins = ppmgr.getWeblogEntryPlugins(localWeblog);
+ Map<String, WeblogEntryPlugin> pagePlugins =
ppmgr.getWeblogEntryPlugins(localWeblog);
for ( WeblogEntry rollerEntry : entries ) {
SubscriptionEntry entry = new SubscriptionEntry();
String content;
diff --git
a/app/src/main/java/org/apache/roller/weblogger/util/Bannedwordslist.java
b/app/src/main/java/org/apache/roller/weblogger/util/Bannedwordslist.java
index 4ad3b9c..faeb925 100644
--- a/app/src/main/java/org/apache/roller/weblogger/util/Bannedwordslist.java
+++ b/app/src/main/java/org/apache/roller/weblogger/util/Bannedwordslist.java
@@ -33,7 +33,6 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
-import java.util.LinkedList;
import java.util.List;
import java.util.StringTokenizer;
import java.util.regex.Matcher;
@@ -64,9 +63,9 @@ import org.apache.roller.util.DateUtil;
*/
public final class Bannedwordslist {
- private static Log mLogger = LogFactory.getLog(Bannedwordslist.class);
+ private static final Log mLogger =
LogFactory.getLog(Bannedwordslist.class);
- private static Bannedwordslist bannedwordslist;
+ private static final Bannedwordslist bannedwordslist;
private static final String BANNEDWORDSLIST_FILE = "bannedwordslist.txt";
private static final String LAST_UPDATE_STR = "Last update:";
@@ -74,8 +73,8 @@ public final class Bannedwordslist {
private static final String BANNEDWORDSLIST_URL = null;
private Date lastModified = null;
- private List<String> bannedwordslistStr = new LinkedList<>();
- private List<Pattern> bannedwordslistRegex = new LinkedList<>();
+ private final List<String> bannedwordslistStr = new ArrayList<>();
+ private final List<Pattern> bannedwordslistRegex = new ArrayList<>();
// setup our singleton at class loading time
static {
@@ -388,12 +387,10 @@ public final class Bannedwordslist {
*
* @return true if a match was found, otherwise false
*/
- private static boolean testStringRules(String source, List rules) {
+ private static boolean testStringRules(String source, List<String> rules) {
boolean matches = false;
- for (Object ruleObj : rules) {
- String rule;
- rule = (String) ruleObj;
+ for (String rule : rules) {
try {
StringBuilder patternBuilder;
diff --git
a/app/src/main/java/org/apache/roller/weblogger/util/RollerMessages.java
b/app/src/main/java/org/apache/roller/weblogger/util/RollerMessages.java
index 7c40423..be91b80 100644
--- a/app/src/main/java/org/apache/roller/weblogger/util/RollerMessages.java
+++ b/app/src/main/java/org/apache/roller/weblogger/util/RollerMessages.java
@@ -27,8 +27,8 @@ import java.util.List;
*/
public class RollerMessages
{
- private List<RollerMessage> mErrors = new ArrayList<>();
- private List<RollerMessage> mMessages = new ArrayList<>();
+ private final List<RollerMessage> mErrors = new ArrayList<>();
+ private final List<RollerMessage> mMessages = new ArrayList<>();
public RollerMessages()
{
@@ -57,11 +57,11 @@ public class RollerMessages
{
mMessages.add(new RollerMessage(key, args));
}
- public Iterator getErrors()
+ public Iterator<RollerMessage> getErrors()
{
return mErrors.iterator();
}
- public Iterator getMessages()
+ public Iterator<RollerMessage> getMessages()
{
return mMessages.iterator();
}
diff --git
a/app/src/main/java/org/apache/roller/weblogger/util/StandaloneWebappClassLoader.java
b/app/src/main/java/org/apache/roller/weblogger/util/StandaloneWebappClassLoader.java
index 227e350..cb6004f 100644
---
a/app/src/main/java/org/apache/roller/weblogger/util/StandaloneWebappClassLoader.java
+++
b/app/src/main/java/org/apache/roller/weblogger/util/StandaloneWebappClassLoader.java
@@ -48,7 +48,7 @@ public class StandaloneWebappClassLoader extends
URLClassLoader {
private static URL[] buildURLsArray(String webappDir, String jarsDir)
throws Exception {
// Create collection of URLs needed for classloader
- List urlList = new ArrayList();
+ List<URL> urlList = new ArrayList<>();
// Add WEB-INF/lib jars
String libPath = webappDir + FS + "WEB-INF" + FS + "lib";
@@ -61,10 +61,10 @@ public class StandaloneWebappClassLoader extends
URLClassLoader {
// Add additional jars
addURLs(jarsDir, urlList);
- return (URL[])urlList.toArray(new URL[urlList.size()]);
+ return urlList.toArray(new URL[0]);
}
- private static void addURLs(String dirPath, List urlList) throws Exception
{
+ private static void addURLs(String dirPath, List<URL> urlList) throws
Exception {
File libDir = new File(dirPath);
String[] libJarNames = libDir.list(new FilenameFilter() {
@Override
diff --git a/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java
b/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java
index 38e81b4..626f38d 100644
--- a/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java
+++ b/app/src/main/java/org/apache/roller/weblogger/util/Trackback.java
@@ -22,7 +22,6 @@ import java.io.IOException;
import java.io.StringReader;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.HashMap;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -111,11 +110,10 @@ public class Trackback {
String blog_name = entry.getWebsite().getName();
// build trackback post parameters as query string
- Map params = new HashMap();
- params.put("title", URLUtilities.encode(title));
- params.put("excerpt", URLUtilities.encode(excerpt));
- params.put("url", URLUtilities.encode(url));
- params.put("blog_name", URLUtilities.encode(blog_name));
+ Map<String, String> params = Map.of("title",
URLUtilities.encode(title),
+ "excerpt",
URLUtilities.encode(excerpt),
+ "url", URLUtilities.encode(url),
+ "blog_name",
URLUtilities.encode(blog_name));
String queryString = URLUtilities.getQueryString(params);
LOG.debug("query string - " + queryString);
diff --git
a/app/src/main/java/org/apache/roller/weblogger/util/URLUtilities.java
b/app/src/main/java/org/apache/roller/weblogger/util/URLUtilities.java
index 06cb789..716e2d2 100644
--- a/app/src/main/java/org/apache/roller/weblogger/util/URLUtilities.java
+++ b/app/src/main/java/org/apache/roller/weblogger/util/URLUtilities.java
@@ -90,19 +90,19 @@ public final class URLUtilities {
}
- public static String getEncodedTagsString(List tags) {
+ public static String getEncodedTagsString(List<String> tags) {
StringBuilder tagsString = new StringBuilder();
if(tags != null && !tags.isEmpty()) {
String tag;
- Iterator tagsIT = tags.iterator();
+ Iterator<String> tagsIT = tags.iterator();
// do first tag
- tag = (String) tagsIT.next();
+ tag = tagsIT.next();
tagsString.append(encode(tag));
// do rest of tags, joining them with a '+'
while(tagsIT.hasNext()) {
- tag = (String) tagsIT.next();
+ tag = tagsIT.next();
tagsString.append("+");
tagsString.append(encode(tag));
}
diff --git
a/app/src/test/java/org/apache/roller/weblogger/business/PingsTest.java
b/app/src/test/java/org/apache/roller/weblogger/business/PingsTest.java
index 62364b1..557b097 100644
--- a/app/src/test/java/org/apache/roller/weblogger/business/PingsTest.java
+++ b/app/src/test/java/org/apache/roller/weblogger/business/PingsTest.java
@@ -262,7 +262,7 @@ public class PingsTest {
assertNull(testAutoPing);
// remove a collection
- List autoPings = new ArrayList();
+ List<AutoPing> autoPings = new ArrayList<>();
autoPing2 = mgr.getAutoPing(autoPing2.getId()); //Get managed
version of autoPing2
autoPings.add(autoPing2);
autoPing3 = mgr.getAutoPing(autoPing3.getId()); //Get managed
version of autoPing2
