You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2018/11/02 23:59:40 UTC
[jspwiki] 11/17: more use of generics,
reorganize imports and removal of unused @SuppressWarnings
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 1f5ef18c116aef7b5fa9798a07e68adda63b3a38
Author: juanpablo <ju...@apache.org>
AuthorDate: Sat Nov 3 00:50:40 2018 +0100
more use of generics, reorganize imports and removal of unused @SuppressWarnings
---
.../src/main/java/org/apache/wiki/PageManager.java | 12 ++++++------
.../org/apache/wiki/event/WikiEventManager.java | 13 +++++++++++--
.../org/apache/wiki/event/WikiSecurityEvent.java | 4 ++--
.../java/org/apache/wiki/event/WorkflowEvent.java | 21 +++++++--------------
.../java/org/apache/wiki/modules/ModuleManager.java | 4 ++--
.../apache/wiki/plugin/AbstractReferralPlugin.java | 10 +++++-----
.../org/apache/wiki/plugin/WeblogEntryPlugin.java | 6 +++---
.../org/apache/wiki/rpc/atom/AtomAPIServlet.java | 6 +++---
.../apache/wiki/search/LuceneSearchProvider.java | 8 ++++----
.../main/java/org/apache/wiki/ui/EditorManager.java | 2 +-
.../java/org/apache/wiki/ui/TemplateManager.java | 21 ++++++++++-----------
.../org/apache/wiki/ui/admin/WikiFormAdminBean.java | 2 +-
.../wiki/ui/admin/beans/SearchManagerBean.java | 1 -
.../java/org/apache/wiki/workflow/AbstractStep.java | 9 ++++++++-
.../java/org/apache/wiki/workflow/Workflow.java | 8 +++++++-
15 files changed, 70 insertions(+), 57 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/PageManager.java b/jspwiki-main/src/main/java/org/apache/wiki/PageManager.java
index 62f0ea0..87d3c9a 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/PageManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/PageManager.java
@@ -150,7 +150,7 @@ public class PageManager extends ModuleManager implements WikiEventListener {
private WikiPageProvider m_provider;
- protected ConcurrentHashMap<String, PageLock> m_pageLocks = new ConcurrentHashMap<String, PageLock>();
+ protected ConcurrentHashMap<String, PageLock> m_pageLocks = new ConcurrentHashMap<>();
private WikiEngine m_engine;
@@ -225,7 +225,7 @@ public class PageManager extends ModuleManager implements WikiEventListener {
* @return A Collection of WikiPage objects.
* @throws ProviderException If the backend has problems.
*/
- public Collection getAllPages() throws ProviderException {
+ public Collection< WikiPage > getAllPages() throws ProviderException {
return m_provider.getAllPages();
}
@@ -692,7 +692,7 @@ public class PageManager extends ModuleManager implements WikiEventListener {
*/
@Override
public Collection< WikiModuleInfo > modules() {
- return null;
+ return new ArrayList<>();
}
/**
@@ -730,9 +730,9 @@ public class PageManager extends ModuleManager implements WikiEventListener {
// Examine each page ACL
try {
int pagesChanged = 0;
- Collection pages = getAllPages();
- for (Iterator it = pages.iterator(); it.hasNext(); ) {
- WikiPage page = (WikiPage) it.next();
+ Collection< WikiPage > pages = getAllPages();
+ for (Iterator< WikiPage > it = pages.iterator(); it.hasNext(); ) {
+ WikiPage page = it.next();
boolean aclChanged = changeAcl(page, oldPrincipals, newPrincipal);
if (aclChanged) {
// If the Acl needed changing, change it now
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/event/WikiEventManager.java b/jspwiki-main/src/main/java/org/apache/wiki/event/WikiEventManager.java
index 751b634..fb0c5ad 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/event/WikiEventManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/event/WikiEventManager.java
@@ -20,7 +20,16 @@
package org.apache.wiki.event;
import java.lang.ref.WeakReference;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.ConcurrentModificationException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.Vector;
import org.apache.log4j.Logger;
@@ -470,7 +479,7 @@ public final class WikiEventManager
{
synchronized( m_listenerList )
{
- TreeSet<WikiEventListener> set = new TreeSet<WikiEventListener>( new WikiEventListenerComparator() );
+ TreeSet<WikiEventListener> set = new TreeSet<>( new WikiEventListenerComparator() );
for( Iterator i = m_listenerList.iterator(); i.hasNext(); )
{
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/event/WikiSecurityEvent.java b/jspwiki-main/src/main/java/org/apache/wiki/event/WikiSecurityEvent.java
index dd67531..e498327 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/event/WikiSecurityEvent.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/event/WikiSecurityEvent.java
@@ -234,7 +234,7 @@ public final class WikiSecurityEvent extends WikiEvent
case LOGIN_CREDENTIAL_EXPIRED: return "LOGIN_ACCOUNT_EXPIRED";
case LOGIN_FAILED: return "LOGIN_FAILED";
case LOGOUT: return "LOGOUT";
- case PRINCIPAL_ADD: return "PRINCIPAL_ADD";
+ case PRINCIPAL_ADD: return "PRINCIPAL_ADD";
case SESSION_EXPIRED: return "SESSION_EXPIRED";
case GROUP_ADD: return "GROUP_ADD";
case GROUP_REMOVE: return "GROUP_REMOVE";
@@ -261,7 +261,7 @@ public final class WikiSecurityEvent extends WikiEvent
case LOGIN_CREDENTIAL_EXPIRED: return "login failed: credential expired";
case LOGIN_FAILED: return "login failed";
case LOGOUT: return "user logged out";
- case PRINCIPAL_ADD: return "new principal added";
+ case PRINCIPAL_ADD: return "new principal added";
case SESSION_EXPIRED: return "session expired";
case GROUP_ADD: return "new group added";
case GROUP_REMOVE: return "group removed";
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/event/WorkflowEvent.java b/jspwiki-main/src/main/java/org/apache/wiki/event/WorkflowEvent.java
index fc7a710..5f2c552 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/event/WorkflowEvent.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/event/WorkflowEvent.java
@@ -97,20 +97,13 @@ public final class WorkflowEvent extends WikiEvent {
*/
public String eventName( int type ) {
switch( type ) {
- case CREATED:
- return "CREATED";
- case ABORTED:
- return "ABORTED";
- case COMPLETED:
- return "COMPLETED";
- case RUNNING:
- return "RUNNING";
- case STARTED:
- return "STARTED";
- case WAITING:
- return "WAITING";
- default:
- return super.eventName();
+ case CREATED: return "CREATED";
+ case ABORTED: return "ABORTED";
+ case COMPLETED: return "COMPLETED";
+ case RUNNING: return "RUNNING";
+ case STARTED: return "STARTED";
+ case WAITING: return "WAITING";
+ default: return super.eventName();
}
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/modules/ModuleManager.java b/jspwiki-main/src/main/java/org/apache/wiki/modules/ModuleManager.java
index 35a59e4..e0e5b82 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/modules/ModuleManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/modules/ModuleManager.java
@@ -79,10 +79,10 @@ public abstract class ModuleManager
*
* @return A Collection of WikiModuleInfo instances.
*/
- public abstract Collection modules();
+ public abstract Collection< WikiModuleInfo > modules();
protected < T extends WikiModuleInfo > Collection< WikiModuleInfo > modules( Iterator< T > iterator ) {
- Set< WikiModuleInfo > ls = new TreeSet< WikiModuleInfo >();
+ Set< WikiModuleInfo > ls = new TreeSet<>();
for( Iterator< T > i = iterator; i.hasNext(); ) {
WikiModuleInfo wmi = i.next();
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java
index ed5e8f3..2c530be 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/AbstractReferralPlugin.java
@@ -259,7 +259,7 @@ public abstract class AbstractReferralPlugin implements WikiPlugin
*/
protected Collection filterCollection( Collection c )
{
- ArrayList<Object> result = new ArrayList<Object>();
+ ArrayList<Object> result = new ArrayList<>();
PatternMatcher pm = new Perl5Matcher();
@@ -366,22 +366,22 @@ public abstract class AbstractReferralPlugin implements WikiPlugin
* @param numItems How many items to show.
* @return The WikiText
*/
- protected String wikitizeCollection( Collection links, String separator, int numItems )
+ protected String wikitizeCollection( Collection< String > links, String separator, int numItems )
{
if( links == null || links.isEmpty() )
return "";
StringBuilder output = new StringBuilder();
- Iterator it = links.iterator();
- int count = 0;
+ Iterator< String > it = links.iterator();
+ int count = 0;
//
// The output will be B Item[1] A S B Item[2] A S B Item[3] A
//
while( it.hasNext() && ( (count < numItems) || ( numItems == ALL_ITEMS ) ) )
{
- String value = (String)it.next();
+ String value = it.next();
if( count > 0 )
{
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogEntryPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogEntryPlugin.java
index ce403da..a18bb2d 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogEntryPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogEntryPlugin.java
@@ -124,13 +124,13 @@ public class WeblogEntryPlugin implements WikiPlugin {
String baseName,
String date)
throws ProviderException {
- Collection everyone = mgr.getAllPages();
+ Collection< WikiPage > everyone = mgr.getAllPages();
int max = 0;
String startString = WeblogPlugin.makeEntryPage(baseName, date, "");
- for (Iterator i = everyone.iterator(); i.hasNext(); ) {
- WikiPage p = (WikiPage) i.next();
+ for (Iterator< WikiPage > i = everyone.iterator(); i.hasNext(); ) {
+ WikiPage p = i.next();
if (p.getName().startsWith(startString)) {
try {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java
index 145d090..049a551 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java
@@ -262,15 +262,15 @@ public class AtomAPIServlet extends HttpServlet
throws ProviderException,
IOException
{
- Collection pages = m_engine.getPageManager().getAllPages();
+ Collection< WikiPage > pages = m_engine.getPageManager().getAllPages();
Feed feed = SyndicationFactory.newSyndicationFeed();
feed.setTitle("List of blogs at this site");
feed.setModified( new Date() );
- for( Iterator i = pages.iterator(); i.hasNext(); )
+ for( Iterator< WikiPage > i = pages.iterator(); i.hasNext(); )
{
- WikiPage p = (WikiPage) i.next();
+ WikiPage p = i.next();
//
// List only weblogs
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
index 1902930..cf3cc20 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
@@ -99,7 +99,7 @@ public class LuceneSearchProvider implements SearchProvider {
// Lucene properties.
/** Which analyzer to use. Default is StandardAnalyzer. */
- public static final String PROP_LUCENE_ANALYZER = "jspwiki.lucene.analyzer";
+ public static final String PROP_LUCENE_ANALYZER = "jspwiki.lucene.analyzer";
private static final String PROP_LUCENE_INDEXDELAY = "jspwiki.lucene.indexdelay";
private static final String PROP_LUCENE_INITIALDELAY = "jspwiki.lucene.initialdelay";
@@ -227,11 +227,11 @@ public class LuceneSearchProvider implements SearchProvider {
try
{
writer = getIndexWriter( luceneDir );
- Collection allPages = m_engine.getPageManager().getAllPages();
+ Collection< WikiPage > allPages = m_engine.getPageManager().getAllPages();
- for( Iterator iterator = allPages.iterator(); iterator.hasNext(); )
+ for( Iterator< WikiPage > iterator = allPages.iterator(); iterator.hasNext(); )
{
- WikiPage page = (WikiPage) iterator.next();
+ WikiPage page = iterator.next();
try
{
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/EditorManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/EditorManager.java
index 7236471..ed5895f 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/EditorManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/EditorManager.java
@@ -283,7 +283,7 @@ public class EditorManager extends ModuleManager {
* {@inheritDoc}
*/
@Override
- public Collection modules() {
+ public Collection< WikiModuleInfo > modules() {
return modules( m_editors.values().iterator() );
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/TemplateManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/TemplateManager.java
index 03ccdd4..96dce0e 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/TemplateManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/TemplateManager.java
@@ -398,15 +398,14 @@ public class TemplateManager extends ModuleManager {
* @return Set of Strings with the skin names.
* @since 2.3.26
*/
- @SuppressWarnings("unchecked")
- public Set listSkins( PageContext pageContext, String template )
+ public Set< String > listSkins( PageContext pageContext, String template )
{
String place = makeFullJSPName( template, SKIN_DIRECTORY );
ServletContext sContext = pageContext.getServletContext();
Set<String> skinSet = sContext.getResourcePaths( place );
- TreeSet<String> resultSet = new TreeSet<String>();
+ TreeSet<String> resultSet = new TreeSet<>();
if( log.isDebugEnabled() ) log.debug( "Listings skins from "+place );
@@ -442,9 +441,9 @@ public class TemplateManager extends ModuleManager {
* @return map of installed Languages
* @since 2.7.x
*/
- public Map listLanguages(PageContext pageContext)
+ public Map< String, String > listLanguages(PageContext pageContext)
{
- Map< String, String > resultMap = new LinkedHashMap< String, String >();
+ Map< String, String > resultMap = new LinkedHashMap<>();
String clientLanguage = ((HttpServletRequest) pageContext.getRequest()).getLocale().toString();
List< String > entries = ClassUtil.classpathEntriesUnder( DIRECTORY );
@@ -482,8 +481,8 @@ public class TemplateManager extends ModuleManager {
{
WikiContext context = WikiContext.findContext( pageContext );
Properties props = m_engine.getWikiProperties();
- ArrayList<String> tfArr = new ArrayList<String>(40);
- LinkedHashMap<String,String> resultMap = new LinkedHashMap<String,String>();
+ ArrayList<String> tfArr = new ArrayList<>(40);
+ LinkedHashMap<String,String> resultMap = new LinkedHashMap<>();
/* filter timeformat properties */
for (Enumeration e = props.propertyNames(); e.hasMoreElements();)
@@ -562,9 +561,9 @@ public class TemplateManager extends ModuleManager {
* @return map of TimeZones
* @since 2.7.x
*/
- public Map listTimeZones(PageContext pageContext)
+ public Map< String, String > listTimeZones(PageContext pageContext)
{
- LinkedHashMap<String,String> resultMap = new LinkedHashMap<String,String>();
+ Map<String,String> resultMap = new LinkedHashMap<>();
String[][] tzs = { { "GMT-12", "Enitwetok, Kwajalien" },
{ "GMT-11", "Nome, Midway Island, Samoa" },
@@ -840,9 +839,9 @@ public class TemplateManager extends ModuleManager {
* @return {@inheritDoc}
*/
@Override
- public Collection modules()
+ public Collection< WikiModuleInfo > modules()
{
- return new ArrayList<WikiModuleInfo>();
+ return new ArrayList<>();
}
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java
index ed7b4b0..dd11b18 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java
@@ -37,7 +37,7 @@ public abstract class WikiFormAdminBean
{
public abstract String getForm( WikiContext context );
- public abstract void handleResponse( WikiContext context, Map params );
+ public abstract void handleResponse( WikiContext context, Map< ?, ? > params );
public String doGet(WikiContext context)
{
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/SearchManagerBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/SearchManagerBean.java
index 8f0bc5b..99ad0f9 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/SearchManagerBean.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/SearchManagerBean.java
@@ -89,7 +89,6 @@ public class SearchManagerBean extends SimpleAdminBean
setName("Reindexer started");
}
- @SuppressWarnings("unchecked")
public void backgroundTask() throws Exception
{
Collection<WikiPage> allPages = m_engine.getPageManager().getAllPages();
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/workflow/AbstractStep.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/AbstractStep.java
index 3de438f..3624653 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/workflow/AbstractStep.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/workflow/AbstractStep.java
@@ -20,7 +20,14 @@ package org.apache.wiki.workflow;
import java.io.Serializable;
import java.security.Principal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import org.apache.wiki.api.exceptions.WikiException;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/workflow/Workflow.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Workflow.java
index 0884dee..80aa960 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/workflow/Workflow.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Workflow.java
@@ -20,7 +20,13 @@ package org.apache.wiki.workflow;
import java.io.Serializable;
import java.security.Principal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.event.WikiEventListener;