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
The following commit(s) were added to refs/heads/master by this push:
new 31c3421 JSPWIKI-1136 - Refine Class member fields
31c3421 is described below
commit 31c34210315b013ccf873b09a729e310a21a989c
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Sun Dec 6 10:43:14 2020 +0100
JSPWIKI-1136 - Refine Class member fields
---
.../src/main/java/org/apache/wiki/api/Release.java | 14 +++++++------
.../org/apache/wiki/event/WikiEventManager.java | 2 +-
.../java/org/apache/wiki/event/WikiPageEvent.java | 2 +-
.../org/apache/wiki/event/WikiPageRenameEvent.java | 2 +-
.../main/java/org/apache/wiki/LinkCollector.java | 2 +-
.../src/main/java/org/apache/wiki/WatchDog.java | 8 ++++----
.../src/main/java/org/apache/wiki/WikiEngine.java | 2 +-
.../src/main/java/org/apache/wiki/WikiPage.java | 4 ++--
.../src/main/java/org/apache/wiki/WikiSession.java | 2 +-
.../main/java/org/apache/wiki/ajax/AjaxUtil.java | 7 ++++---
.../org/apache/wiki/attachment/Attachment.java | 2 +-
.../wiki/attachment/DefaultAttachmentManager.java | 4 ++--
.../wiki/auth/DefaultAuthenticationManager.java | 2 +-
.../wiki/auth/DefaultAuthorizationManager.java | 2 +-
.../org/apache/wiki/auth/DefaultUserManager.java | 2 +-
.../org/apache/wiki/auth/SecurityVerifier.java | 23 ++++++++++++----------
.../org/apache/wiki/auth/acl/AclEntryImpl.java | 2 +-
.../wiki/auth/authorize/XMLGroupDatabase.java | 4 ++--
.../wiki/auth/permissions/GroupPermission.java | 9 +++++----
.../wiki/auth/permissions/PagePermission.java | 5 +++--
.../wiki/auth/permissions/PermissionFactory.java | 2 +-
.../apache/wiki/auth/user/DefaultUserProfile.java | 2 +-
.../apache/wiki/diff/ContextualDiffProvider.java | 6 +++---
.../org/apache/wiki/diff/ExternalDiffProvider.java | 2 +-
.../apache/wiki/diff/TraditionalDiffProvider.java | 6 +++---
.../apache/wiki/filters/DefaultFilterManager.java | 4 ++--
.../java/org/apache/wiki/filters/SpamFilter.java | 6 +++---
.../wiki/htmltowiki/PersistentMapDecorator.java | 2 +-
.../wiki/htmltowiki/WhitespaceTrimWriter.java | 2 +-
.../htmltowiki/XHtmlElementToWikiTranslator.java | 10 +++++-----
.../org/apache/wiki/modules/BaseModuleManager.java | 2 +-
.../org/apache/wiki/pages/DefaultPageManager.java | 8 ++++----
.../main/java/org/apache/wiki/pages/PageLock.java | 8 ++++----
.../wiki/parser/CreoleToJSPWikiTranslator.java | 2 +-
.../apache/wiki/parser/JSPWikiMarkupParser.java | 14 ++++++-------
.../java/org/apache/wiki/parser/LinkParser.java | 2 +-
.../java/org/apache/wiki/parser/PluginContent.java | 4 ++--
.../org/apache/wiki/parser/VariableContent.java | 2 +-
.../java/org/apache/wiki/parser/WikiDocument.java | 2 +-
.../apache/wiki/plugin/AbstractReferralPlugin.java | 4 ++--
.../apache/wiki/plugin/DefaultPluginManager.java | 8 ++++----
.../main/java/org/apache/wiki/plugin/Denounce.java | 6 +++---
.../java/org/apache/wiki/plugin/IndexPlugin.java | 2 +-
.../apache/wiki/plugin/ReferredPagesPlugin.java | 6 +++---
.../org/apache/wiki/preferences/Preferences.java | 7 ++++---
.../wiki/providers/CachingAttachmentProvider.java | 6 +++---
.../org/apache/wiki/providers/CachingProvider.java | 2 +-
.../wiki/references/DefaultReferenceManager.java | 2 +-
.../main/java/org/apache/wiki/rss/AtomFeed.java | 2 +-
.../org/apache/wiki/rss/DefaultRSSGenerator.java | 4 ++--
.../apache/wiki/search/LuceneSearchProvider.java | 8 ++++----
.../java/org/apache/wiki/search/SearchMatcher.java | 4 ++--
.../java/org/apache/wiki/tags/BreadcrumbsTag.java | 2 +-
.../java/org/apache/wiki/tags/CalendarTag.java | 8 ++++----
.../main/java/org/apache/wiki/tags/ContentTag.java | 2 +-
.../main/java/org/apache/wiki/tags/CookieTag.java | 2 +-
.../main/java/org/apache/wiki/ui/Installer.java | 2 +-
.../java/org/apache/wiki/ui/WikiJSPFilter.java | 8 ++++----
.../wiki/ui/admin/DefaultAdminBeanManager.java | 4 ++--
.../java/org/apache/wiki/xmlrpc/RPCServlet.java | 8 ++++----
.../wiki/auth/AuthenticationManagerTest.java | 2 +-
.../org/apache/wiki/auth/SecurityEventTrap.java | 2 +-
.../java/org/apache/wiki/auth/TestAuthorizer.java | 2 +-
.../wiki/auth/authorize/GroupManagerTest.java | 2 +-
.../wiki/auth/authorize/JDBCGroupDatabaseTest.java | 2 +-
.../wiki/auth/user/JDBCUserDatabaseTest.java | 2 +-
.../wiki/providers/VersioningFileProviderTest.java | 2 +-
.../java/org/apache/wiki/web/TestContainer.java | 4 ++--
.../main/java/org/apache/wiki/util/ClassUtil.java | 4 ++--
.../java/org/apache/wiki/util/PriorityList.java | 2 +-
.../org/apache/wiki/util/TimedCounterList.java | 8 ++++----
71 files changed, 162 insertions(+), 153 deletions(-)
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
index 750b025..b7edc8b 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
@@ -109,9 +109,10 @@ public final class Release {
return true;
}
final String[] versionComponents = StringUtils.split( version,
VERSION_SEPARATORS );
- final int reqVersion = versionComponents.length > 0 ?
Integer.parseInt( versionComponents[0] ) : Release.VERSION;
- final int reqRevision = versionComponents.length > 1 ?
Integer.parseInt( versionComponents[1] ) : Release.REVISION;
- final int reqMinorRevision = versionComponents.length > 2 ?
Integer.parseInt( versionComponents[2] ) : Release.MINORREVISION;
+ final int versionCompoLength = versionComponents.length;
+ final int reqVersion = versionCompoLength > 0 ?
Integer.parseInt( versionComponents[0] ) : Release.VERSION;
+ final int reqRevision = versionCompoLength > 1 ?
Integer.parseInt( versionComponents[1] ) : Release.REVISION;
+ final int reqMinorRevision = versionCompoLength > 2 ?
Integer.parseInt( versionComponents[2] ) : Release.MINORREVISION;
if( VERSION == reqVersion ) {
if( REVISION == reqRevision ) {
@@ -139,9 +140,10 @@ public final class Release {
}
final String[] versionComponents = StringUtils.split( version,
VERSION_SEPARATORS );
- final int reqVersion = versionComponents.length > 0 ?
Integer.parseInt( versionComponents[0] ) : Release.VERSION;
- final int reqRevision = versionComponents.length > 1 ?
Integer.parseInt( versionComponents[1] ) : Release.REVISION;
- final int reqMinorRevision = versionComponents.length > 2 ?
Integer.parseInt( versionComponents[2] ) : Release.MINORREVISION;
+ final int versionCompoLength = versionComponents.length;
+ final int reqVersion = versionCompoLength > 0 ?
Integer.parseInt( versionComponents[0] ) : Release.VERSION;
+ final int reqRevision = versionCompoLength > 1 ?
Integer.parseInt( versionComponents[1] ) : Release.REVISION;
+ final int reqMinorRevision = versionCompoLength > 2 ?
Integer.parseInt( versionComponents[2] ) : Release.MINORREVISION;
if( VERSION == reqVersion ) {
if( REVISION == reqRevision ) {
diff --git
a/jspwiki-event/src/main/java/org/apache/wiki/event/WikiEventManager.java
b/jspwiki-event/src/main/java/org/apache/wiki/event/WikiEventManager.java
index c737158..1cefc79 100644
--- a/jspwiki-event/src/main/java/org/apache/wiki/event/WikiEventManager.java
+++ b/jspwiki-event/src/main/java/org/apache/wiki/event/WikiEventManager.java
@@ -126,7 +126,7 @@ public final class WikiEventManager {
private static final Logger log = Logger.getLogger(WikiEventManager.class);
/* If true, permits a WikiEventMonitor to be set. */
- private static boolean c_permitMonitor = false;
+ private static final boolean c_permitMonitor = false;
/* Optional listener to be used as all-event monitor. */
private static WikiEventListener c_monitor = null;
diff --git
a/jspwiki-event/src/main/java/org/apache/wiki/event/WikiPageEvent.java
b/jspwiki-event/src/main/java/org/apache/wiki/event/WikiPageEvent.java
index c9e28a1..3c5c65e 100644
--- a/jspwiki-event/src/main/java/org/apache/wiki/event/WikiPageEvent.java
+++ b/jspwiki-event/src/main/java/org/apache/wiki/event/WikiPageEvent.java
@@ -163,7 +163,7 @@ public class WikiPageEvent extends WikiEvent {
/** Indicates a wiki page reindex event (a page was changed when requested
to a provided) */
public static final int PAGE_REINDEX = 28;
- private String m_pagename;
+ private final String m_pagename;
// ............
diff --git
a/jspwiki-event/src/main/java/org/apache/wiki/event/WikiPageRenameEvent.java
b/jspwiki-event/src/main/java/org/apache/wiki/event/WikiPageRenameEvent.java
index 7d0608c..e1a54be 100644
--- a/jspwiki-event/src/main/java/org/apache/wiki/event/WikiPageRenameEvent.java
+++ b/jspwiki-event/src/main/java/org/apache/wiki/event/WikiPageRenameEvent.java
@@ -34,7 +34,7 @@ public class WikiPageRenameEvent extends WikiPageEvent {
/** Indicates a page rename event. This is based on events generated by
{@link org.apache.wiki.content.PageRenamer}. */
public static final int PAGE_RENAMED = 28;
- private String m_oldpagename;
+ private final String m_oldpagename;
// ............
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/LinkCollector.java
b/jspwiki-main/src/main/java/org/apache/wiki/LinkCollector.java
index 286b3f3..e660966 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/LinkCollector.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/LinkCollector.java
@@ -29,7 +29,7 @@ import java.util.List;
*/
public class LinkCollector implements StringTransmutator {
- private List< String > m_items = new ArrayList<>();
+ private final List< String > m_items = new ArrayList<>();
/**
* Returns a List of Strings representing links.
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WatchDog.java
b/jspwiki-main/src/main/java/org/apache/wiki/WatchDog.java
index 07b6ac1..3629a19 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WatchDog.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WatchDog.java
@@ -46,14 +46,14 @@ import java.util.concurrent.ConcurrentHashMap;
*/
public final class WatchDog {
- private Watchable m_watchable;
+ private final Watchable m_watchable;
private final Stack< State > m_stateStack = new Stack<>();
private boolean m_enabled = true;
- private Engine m_engine;
+ private final Engine m_engine;
private static final Logger log = Logger.getLogger( WatchDog.class );
- private static Map< Integer, WeakReference< WatchDog > > c_kennel = new
ConcurrentHashMap<>();
+ private static final Map< Integer, WeakReference< WatchDog > > c_kennel =
new ConcurrentHashMap<>();
private static WikiBackgroundThread c_watcherThread;
/**
@@ -399,7 +399,7 @@ public final class WatchDog {
* This class wraps a Thread so that it can become Watchable.
*/
private static class ThreadWrapper implements Watchable {
- private Thread m_thread;
+ private final Thread m_thread;
public ThreadWrapper( final Thread thread ) {
m_thread = thread;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
index 1e91e7b..f4272a4 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
@@ -131,7 +131,7 @@ public class WikiEngine implements Engine {
private boolean m_isConfigured = false;
/** Stores wikiengine attributes. */
- private Map< String, Object > m_attributes = new ConcurrentHashMap<>();
+ private final Map< String, Object > m_attributes = new
ConcurrentHashMap<>();
/** Stores WikiEngine's associated managers. */
protected Map< Class< ? >, Object > managers = new ConcurrentHashMap<>();
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiPage.java
b/jspwiki-main/src/main/java/org/apache/wiki/WikiPage.java
index ec581b7..93c334e 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiPage.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiPage.java
@@ -39,8 +39,8 @@ import java.util.Map;
// need to figure out the metadata lifecycle.
public class WikiPage implements Page {
- private String m_name;
- private Engine m_engine;
+ private final String m_name;
+ private final Engine m_engine;
private String m_wiki;
private Date m_lastModified;
private long m_fileSize = -1;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java
b/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java
index f9bfd90..db05505 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java
@@ -63,7 +63,7 @@ public final class WikiSession implements Session {
private static final String ALL = "*";
- private static ThreadLocal< Session > c_guestSession = new ThreadLocal<>();
+ private static final ThreadLocal< Session > c_guestSession = new
ThreadLocal<>();
private final Subject m_subject = new Subject();
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ajax/AjaxUtil.java
b/jspwiki-main/src/main/java/org/apache/wiki/ajax/AjaxUtil.java
index 8deda32..164492f 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ajax/AjaxUtil.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ajax/AjaxUtil.java
@@ -31,7 +31,7 @@ import javax.servlet.http.HttpServlet;
*/
public class AjaxUtil extends HttpServlet {
private static final long serialVersionUID = 3170439306358345408L;
- private static Gson gson = new Gson();
+ private static final Gson gson = new Gson();
/**
* Uses Google Gson (https://code.google.com/p/google-gson/) to convert
to JSON
@@ -65,15 +65,16 @@ public class AjaxUtil extends HttpServlet {
if( !lastPart.endsWith( "/" ) ) {
lastPart += "/";
}
+ final int lastPartLength = lastPart.length();
int index = path.indexOf( lastPart );
if( index < 0 ) {
- lastPart = lastPart.substring( 0, lastPart.length() - 1
);
+ lastPart = lastPart.substring( 0, lastPartLength - 1 );
index = path.indexOf( lastPart );
if( index < 0 ) {
throw new ServletException( "Invalid path
provided " + path + " does not contain '" + lastPart + "'" );
}
}
- path = path.substring( index + lastPart.length() );
+ path = path.substring( index + lastPartLength );
index = path.indexOf( "/" );
if( index == -1 ) {
index = path.indexOf( "#" );
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/attachment/Attachment.java
b/jspwiki-main/src/main/java/org/apache/wiki/attachment/Attachment.java
index 22748c9..05db025 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/attachment/Attachment.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/attachment/Attachment.java
@@ -29,7 +29,7 @@ import org.apache.wiki.api.core.Engine;
public class Attachment extends WikiPage implements
org.apache.wiki.api.core.Attachment {
private String m_fileName;
- private String m_parentName;
+ private final String m_parentName;
private boolean m_cacheable = true;
/**
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/attachment/DefaultAttachmentManager.java
b/jspwiki-main/src/main/java/org/apache/wiki/attachment/DefaultAttachmentManager.java
index 454ebdf..78e4347 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/attachment/DefaultAttachmentManager.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/attachment/DefaultAttachmentManager.java
@@ -61,8 +61,8 @@ public class DefaultAttachmentManager implements
AttachmentManager {
private static final Logger log = Logger.getLogger(
DefaultAttachmentManager.class );
private AttachmentProvider m_provider;
- private Engine m_engine;
- private CacheManager m_cacheManager = CacheManager.getInstance();
+ private final Engine m_engine;
+ private final CacheManager m_cacheManager = CacheManager.getInstance();
private Cache m_dynamicAttachments;
/**
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthenticationManager.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthenticationManager.java
index cb60827..fbe19f7 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthenticationManager.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthenticationManager.java
@@ -100,7 +100,7 @@ public class DefaultAuthenticationManager implements
AuthenticationManager {
private boolean m_storeIPAddress = true;
/** Keeps a list of the usernames who have attempted a login recently. */
- private TimedCounterList< String > m_lastLoginAttempts = new
TimedCounterList<>();
+ private final TimedCounterList< String > m_lastLoginAttempts = new
TimedCounterList<>();
/**
* {@inheritDoc}
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthorizationManager.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthorizationManager.java
index 835c421..2e3a6de 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthorizationManager.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultAuthorizationManager.java
@@ -81,7 +81,7 @@ public class DefaultAuthorizationManager implements
AuthorizationManager {
private Authorizer m_authorizer = null;
/** Cache for storing ProtectionDomains used to evaluate the local policy.
*/
- private Map< Principal, ProtectionDomain > m_cachedPds = new
WeakHashMap<>();
+ private final Map< Principal, ProtectionDomain > m_cachedPds = new
WeakHashMap<>();
private Engine m_engine = null;
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultUserManager.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultUserManager.java
index a6078ef..d8a1a6f 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultUserManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/DefaultUserManager.java
@@ -430,7 +430,7 @@ public class DefaultUserManager implements UserManager {
*/
public static final class JSONUserModule implements WikiAjaxServlet {
- private volatile DefaultUserManager m_manager;
+ private final DefaultUserManager m_manager;
/**
* Create a new JSONUserModule.
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/SecurityVerifier.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/SecurityVerifier.java
index 97a6e94..86173f3 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/SecurityVerifier.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/SecurityVerifier.java
@@ -61,13 +61,13 @@ import java.util.Set;
*/
public final class SecurityVerifier {
- private Engine m_engine;
+ private final Engine m_engine;
private boolean m_isSecurityPolicyConfigured = false;
private Principal[] m_policyPrincipals = new
Principal[0];
- private Session m_session;
+ private final Session m_session;
/** Message prefix for errors. */
public static final String ERROR = "Error.";
@@ -199,10 +199,13 @@ public final class SecurityVerifier {
final String[] groupActions = new String[]
{ "view", "edit", null, null, "delete" };
+
+ final int rolesLength = roles.length;
+ final int pageActionsLength = pageActions.length;
// Calculate column widths
final String colWidth;
- if( pageActions.length > 0 && roles.length > 0 ) {
- colWidth = ( 67f / ( pageActions.length * roles.length ) ) + "%";
+ if( pageActionsLength > 0 && rolesLength > 0 ) {
+ colWidth = ( 67f / ( pageActionsLength * rolesLength ) ) + "%";
} else {
colWidth = "67%";
}
@@ -212,20 +215,20 @@ public final class SecurityVerifier {
// Write the table header
s.append( "<table class=\"wikitable\" border=\"1\">\n" );
s.append( " <colgroup span=\"1\" width=\"33%\"/>\n" );
- s.append( " <colgroup span=\"" + pageActions.length * roles.length +
"\" width=\"" + colWidth
+ s.append( " <colgroup span=\"" + pageActionsLength * rolesLength +
"\" width=\"" + colWidth
+ "\" align=\"center\"/>\n" );
s.append( " <tr>\n" );
s.append( " <th rowspan=\"2\" valign=\"bottom\">Permission</th>\n"
);
- for( int i = 0; i < roles.length; i++ )
+ for( int i = 0; i < rolesLength; i++ )
{
- s.append( " <th colspan=\"" + pageActions.length + "\"
title=\"" + roles[i].getClass().getName() + "\">"
+ s.append( " <th colspan=\"" + pageActionsLength + "\" title=\""
+ roles[i].getClass().getName() + "\">"
+ roles[i].getName() + "</th>\n" );
}
s.append( " </tr>\n" );
// Print a column for each role
s.append( " <tr>\n" );
- for( int i = 0; i < roles.length; i++ )
+ for( int i = 0; i < rolesLength; i++ )
{
for( final String pageAction : pageActions )
{
@@ -272,7 +275,7 @@ public final class SecurityVerifier {
s.append( " <td>WikiPermission \"" + wiki + "\",\"" + wikiPerm
+ "\"</td>\n" );
for( final Principal role : roles ) {
final Permission permission = new WikiPermission( wiki,
wikiPerm );
- s.append( printPermissionTest( permission, role,
pageActions.length ) );
+ s.append( printPermissionTest( permission, role,
pageActionsLength ) );
}
s.append( " </tr>\n" );
}
@@ -283,7 +286,7 @@ public final class SecurityVerifier {
for( final Principal role : roles )
{
final Permission permission = new AllPermission( wiki );
- s.append( printPermissionTest( permission, role,
pageActions.length ) );
+ s.append( printPermissionTest( permission, role, pageActionsLength
) );
}
s.append( " </tr>\n" );
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/AclEntryImpl.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/AclEntryImpl.java
index d7a75a2..3e5c056 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/AclEntryImpl.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/AclEntryImpl.java
@@ -35,7 +35,7 @@ import java.util.Vector;
public class AclEntryImpl implements AclEntry, Serializable {
private static final long serialVersionUID = 1L;
- private Vector< Permission > m_permissions = new Vector<>();
+ private final Vector< Permission > m_permissions = new Vector<>();
private Principal m_principal;
/**
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/XMLGroupDatabase.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/XMLGroupDatabase.java
index 6b0ec1d..4fd4edb 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/XMLGroupDatabase.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/XMLGroupDatabase.java
@@ -102,13 +102,13 @@ public class XMLGroupDatabase implements GroupDatabase {
private Document m_dom = null;
- private DateFormat m_defaultFormat =
DateFormat.getDateTimeInstance();
+ private final DateFormat m_defaultFormat =
DateFormat.getDateTimeInstance();
private File m_file = null;
private Engine m_engine = null;
- private Map<String, Group> m_groups = new ConcurrentHashMap<>();
+ private final Map<String, Group> m_groups = new
ConcurrentHashMap<>();
/**
* Looks up and deletes a {@link Group} from the group database. If the
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java
index 74f6618..8a0c67c 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/GroupPermission.java
@@ -168,14 +168,15 @@ public final class GroupPermission extends Permission
implements Serializable
m_group = groupName;
// Parse actions
- String[] groupActions = actions.toLowerCase().split( ACTION_SEPARATOR
);
+ final String[] groupActions = actions.toLowerCase().split(
ACTION_SEPARATOR );
Arrays.sort( groupActions, String.CASE_INSENSITIVE_ORDER );
m_mask = createMask( actions );
StringBuilder buffer = new StringBuilder();
- for( int i = 0; i < groupActions.length; i++ )
+ final int groupActionsLength = groupActions.length;
+ for( int i = 0; i < groupActionsLength; i++ )
{
buffer.append( groupActions[i] );
- if ( i < ( groupActions.length - 1 ) )
+ if ( i < ( groupActionsLength - 1 ) )
{
buffer.append( ACTION_SEPARATOR );
}
@@ -345,7 +346,7 @@ public final class GroupPermission extends Permission
implements Serializable
* @param actions the actions for this permission, separated by commas
* @return the binary actions mask
*/
- protected static int createMask( String actions )
+ protected static int createMask( final String actions )
{
if ( actions == null || actions.length() == 0 )
{
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/PagePermission.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/PagePermission.java
index b65b88f..cad6624 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/PagePermission.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/PagePermission.java
@@ -190,11 +190,12 @@ public final class PagePermission extends Permission
implements Serializable
final String[] pageActions = StringUtils.split( actions.toLowerCase(),
ACTION_SEPARATOR );
Arrays.sort( pageActions, String.CASE_INSENSITIVE_ORDER );
m_mask = createMask( actions );
+ final int pageActionsLength = pageActions.length;
final StringBuilder buffer = new StringBuilder();
- for( int i = 0; i < pageActions.length; i++ )
+ for( int i = 0; i < pageActionsLength; i++ )
{
buffer.append( pageActions[i] );
- if ( i < ( pageActions.length - 1 ) )
+ if ( i < ( pageActionsLength - 1 ) )
{
buffer.append( ACTION_SEPARATOR );
}
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/PermissionFactory.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/PermissionFactory.java
index 3e372bf..a95d191 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/PermissionFactory.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/PermissionFactory.java
@@ -41,7 +41,7 @@ public final class PermissionFactory
* This is a WeakHashMap<Integer,PagePermission>, which stores the
* cached page permissions.
*/
- private static WeakHashMap<Integer, PagePermission> c_cache = new
WeakHashMap<>();
+ private static final WeakHashMap<Integer, PagePermission> c_cache = new
WeakHashMap<>();
/**
* Get a permission object for a WikiPage and a set of actions.
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/DefaultUserProfile.java
b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/DefaultUserProfile.java
index 9ba0121..1a641cc 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/DefaultUserProfile.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/DefaultUserProfile.java
@@ -38,7 +38,7 @@ public final class DefaultUserProfile implements UserProfile {
private static final String EMPTY_STRING = "";
private static final String WHITESPACE = "\\s";
- private Map< String, Serializable > attributes = new HashMap<>();
+ private final Map< String, Serializable > attributes = new HashMap<>();
private Date created = null;
private String email = null;
private String fullname = null;
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/diff/ContextualDiffProvider.java
b/jspwiki-main/src/main/java/org/apache/wiki/diff/ContextualDiffProvider.java
index c6d47fd..ff0babc 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/diff/ContextualDiffProvider.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/diff/ContextualDiffProvider.java
@@ -205,10 +205,10 @@ public class ContextualDiffProvider implements
DiffProvider {
* all necessary variables.
*/
private final class ChangeMerger implements RevisionVisitor {
- private StringBuffer m_sb;
+ private final StringBuffer m_sb;
/** Keeping score of the original lines to process */
- private int m_max;
+ private final int m_max;
private int m_index = 0;
@@ -227,7 +227,7 @@ public class ContextualDiffProvider implements DiffProvider
{
private StringBuffer m_newBuf;
/** Reference to the source string array */
- private String[] m_origStrings;
+ private final String[] m_origStrings;
private ChangeMerger( final StringBuffer sb, final String[]
origStrings, final int max ) {
m_sb = sb;
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/diff/ExternalDiffProvider.java
b/jspwiki-main/src/main/java/org/apache/wiki/diff/ExternalDiffProvider.java
index 1535af3..47d2f67 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/diff/ExternalDiffProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/diff/ExternalDiffProvider.java
@@ -62,7 +62,7 @@ public class ExternalDiffProvider implements DiffProvider {
//the external program generates a format suitible for the colorization
code of the
//TraditionalDiffProvider, currently set to true for legacy compatibility.
//I don't think this 'feature' ever worked right, did it?...
- private boolean m_traditionalColorization = true;
+ private final boolean m_traditionalColorization = true;
/**
* Creates a new ExternalDiffProvider.
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/diff/TraditionalDiffProvider.java
b/jspwiki-main/src/main/java/org/apache/wiki/diff/TraditionalDiffProvider.java
index e73d002..d18245a 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/diff/TraditionalDiffProvider.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/diff/TraditionalDiffProvider.java
@@ -122,9 +122,9 @@ public class TraditionalDiffProvider implements
DiffProvider {
private static final class RevisionPrint implements RevisionVisitor {
- private StringBuffer m_result;
- private Context m_context;
- private ResourceBundle m_rb;
+ private final StringBuffer m_result;
+ private final Context m_context;
+ private final ResourceBundle m_rb;
private RevisionPrint( final Context ctx, final StringBuffer sb ) {
m_result = sb;
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
b/jspwiki-main/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
index ad41ec1..e802d15 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/filters/DefaultFilterManager.java
@@ -86,9 +86,9 @@ import java.util.Properties;
*/
public class DefaultFilterManager extends BaseModuleManager implements
FilterManager {
- private PriorityList< PageFilter > m_pageFilters = new PriorityList<>();
+ private final PriorityList< PageFilter > m_pageFilters = new
PriorityList<>();
- private Map< String, PageFilterInfo > m_filterClassMap = new HashMap<>();
+ private final Map< String, PageFilterInfo > m_filterClassMap = new
HashMap<>();
private static final Logger log =
Logger.getLogger(DefaultFilterManager.class);
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java
b/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java
index 08b3d92..635a930 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java
@@ -192,11 +192,11 @@ public class SpamFilter extends BasePageFilter {
private static final Logger c_spamlog = Logger.getLogger( "SpamLog" );
private static final Logger log = Logger.getLogger( SpamFilter.class );
- private Vector<Host> m_temporaryBanList = new Vector<>();
+ private final Vector<Host> m_temporaryBanList = new Vector<>();
private int m_banTime = 60; // minutes
- private Vector<Host> m_lastModifications = new Vector<>();
+ private final Vector<Host> m_lastModifications = new Vector<>();
/** How many times a single IP address can change a page per minute? */
private int m_limitSinglePageChanges = 5;
@@ -215,7 +215,7 @@ public class SpamFilter extends BasePageFilter {
private boolean m_useCaptcha = false;
/** The limit at which we consider something to be spam. */
- private int m_scoreLimit = 1;
+ private final int m_scoreLimit = 1;
/** If set to true, will ignore anyone who is in Authenticated role. */
private boolean m_ignoreAuthenticated = false;
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/PersistentMapDecorator.java
b/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/PersistentMapDecorator.java
index 62c7fa1..1f8ddba 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/PersistentMapDecorator.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/PersistentMapDecorator.java
@@ -32,7 +32,7 @@ public class PersistentMapDecorator extends Properties
{
private static final long serialVersionUID = 0L;
- private Map< Object, Object > m_delegate;
+ private final Map< Object, Object > m_delegate;
/**
* Creates a new decorator for a given map.
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/WhitespaceTrimWriter.java
b/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/WhitespaceTrimWriter.java
index b073257..957edcd 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/WhitespaceTrimWriter.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/WhitespaceTrimWriter.java
@@ -31,7 +31,7 @@ import java.util.regex.Pattern;
public class WhitespaceTrimWriter extends Writer
{
- private StringBuffer m_result = new StringBuffer();
+ private final StringBuffer m_result = new StringBuffer();
private StringBuffer m_buffer = new StringBuffer();
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
b/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
index ab0aea8..feb244b 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java
@@ -46,15 +46,15 @@ public class XHtmlElementToWikiTranslator
{
private static final String UTF8 = "UTF-8";
- private XHtmlToWikiConfig m_config;
+ private final XHtmlToWikiConfig m_config;
- private WhitespaceTrimWriter m_outTimmer;
+ private final WhitespaceTrimWriter m_outTimmer;
- private PrintWriter m_out;
+ private final PrintWriter m_out;
- private LiStack m_liStack = new LiStack();
+ private final LiStack m_liStack = new LiStack();
- private PreStack m_preStack = new PreStack();
+ private final PreStack m_preStack = new PreStack();
/**
* Create a new translator using the default config.
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/modules/BaseModuleManager.java
b/jspwiki-main/src/main/java/org/apache/wiki/modules/BaseModuleManager.java
index b096520..9a2552f 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/modules/BaseModuleManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/modules/BaseModuleManager.java
@@ -34,7 +34,7 @@ public abstract class BaseModuleManager implements
ModuleManager {
protected Engine m_engine;
- private boolean m_loadIncompatibleModules = false;
+ private final boolean m_loadIncompatibleModules = false;
/**
* Constructs the ModuleManager.
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/pages/DefaultPageManager.java
b/jspwiki-main/src/main/java/org/apache/wiki/pages/DefaultPageManager.java
index 3802b39..4d9419a 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/pages/DefaultPageManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/pages/DefaultPageManager.java
@@ -87,17 +87,17 @@ public class DefaultPageManager implements PageManager {
private static final Logger LOG = Logger.getLogger(
DefaultPageManager.class );
- private PageProvider m_provider;
+ private final PageProvider m_provider;
- private Engine m_engine;
+ private final Engine m_engine;
protected ConcurrentHashMap< String, PageLock > m_pageLocks = new
ConcurrentHashMap<>();
- private int m_expiryTime;
+ private final int m_expiryTime;
private LockReaper m_reaper = null;
- private PageSorter pageSorter = new PageSorter();
+ private final PageSorter pageSorter = new PageSorter();
/**
* Creates a new PageManager.
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/pages/PageLock.java
b/jspwiki-main/src/main/java/org/apache/wiki/pages/PageLock.java
index c14a53b..724a9be 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/pages/PageLock.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/pages/PageLock.java
@@ -33,10 +33,10 @@ public class PageLock implements Serializable {
private static final long serialVersionUID = 0L;
- private String m_page;
- private String m_locker;
- private Date m_lockAcquired;
- private Date m_lockExpiry;
+ private final String m_page;
+ private final String m_locker;
+ private final Date m_lockAcquired;
+ private final Date m_lockExpiry;
/**
* Creates a new PageLock. The lock is not attached to any objects at
this point.
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/parser/CreoleToJSPWikiTranslator.java
b/jspwiki-main/src/main/java/org/apache/wiki/parser/CreoleToJSPWikiTranslator.java
index 0c7e431..3cd0c09 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/parser/CreoleToJSPWikiTranslator.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/parser/CreoleToJSPWikiTranslator.java
@@ -162,7 +162,7 @@ public class CreoleToJSPWikiTranslator
private static final String ESCAPE_PROTECTED =
"~(\\*\\*|~|//|-|#|\\{\\{|}}|\\\\|~\\[~~[|]]|----|=|\\|)";
- private static Map<String, String> c_protectionMap = new HashMap<String,
String>();
+ private static final Map<String, String> c_protectionMap = new
HashMap<String, String>();
private ArrayList<String> m_hashList = new ArrayList<String>();
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
b/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
index 8f981f8..f0c95ca 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java
@@ -103,17 +103,17 @@ public class JSPWikiMarkupParser extends MarkupParser {
private boolean m_isPreBlock = false;
/** Contains style information, in multiple forms. */
- private Stack<Boolean> m_styleStack = new Stack<>();
+ private final Stack<Boolean> m_styleStack = new Stack<>();
// general list handling
private int m_genlistlevel = 0;
- private StringBuilder m_genlistBulletBuffer = new StringBuilder(10); //
stores the # and * pattern
- private boolean m_allowPHPWikiStyleLists = true;
+ private final StringBuilder m_genlistBulletBuffer = new
StringBuilder(10); // stores the # and * pattern
+ private final boolean m_allowPHPWikiStyleLists = true;
private boolean m_isOpenParagraph = false;
/** Parser for extended link functionality. */
- private LinkParser m_linkParser = new LinkParser();
+ private final LinkParser m_linkParser = new LinkParser();
/** Keeps track of any plain text that gets put in the Text nodes */
private StringBuilder m_plainTextBuf = new StringBuilder(20);
@@ -121,7 +121,7 @@ public class JSPWikiMarkupParser extends MarkupParser {
private Element m_currentElement;
/** Keep track of duplicate header names. */
- private Map<String, Integer> m_titleSectionCounter = new HashMap<>();
+ private final Map<String, Integer> m_titleSectionCounter = new
HashMap<>();
/** If true, then considers CamelCase links as well. */
private boolean m_camelCaseLinks = false;
@@ -143,11 +143,11 @@ public class JSPWikiMarkupParser extends MarkupParser {
private boolean m_useRelNofollow = false;
- private PatternCompiler m_compiler = new Perl5Compiler();
+ private final PatternCompiler m_compiler = new Perl5Compiler();
static final String WIKIWORD_REGEX =
"(^|[[:^alnum:]]+)([[:upper:]]+[[:lower:]]+[[:upper:]]+[[:alnum:]]*|(http://|https://|mailto:)([A-Za-z0-9_/\\.\\+\\?\\#\\-\\@=&;~%]+))";
- private PatternMatcher m_camelCaseMatcher = new Perl5Matcher();
+ private final PatternMatcher m_camelCaseMatcher = new
Perl5Matcher();
private Pattern m_camelCasePattern;
private int m_rowNum = 1;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/parser/LinkParser.java
b/jspwiki-main/src/main/java/org/apache/wiki/parser/LinkParser.java
index 111a5cd..245364c 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/parser/LinkParser.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/parser/LinkParser.java
@@ -152,7 +152,7 @@ import org.jdom2.Attribute;
*/
public class LinkParser
{
- private static Logger log = Logger.getLogger(LinkParser.class);
+ private static final Logger log = Logger.getLogger(LinkParser.class);
/** Permitted attributes on links. Keep this sorted. */
private static final String[] PERMITTED_ATTRIBUTES = new String[] {
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/parser/PluginContent.java
b/jspwiki-main/src/main/java/org/apache/wiki/parser/PluginContent.java
index 183632a..369b740 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/parser/PluginContent.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/parser/PluginContent.java
@@ -66,8 +66,8 @@ public class PluginContent extends Text implements
PluginElement {
private static final long serialVersionUID = 1L;
private static final Logger log = Logger.getLogger(PluginContent.class);
- private String m_pluginName;
- private Map< String, String > m_params;
+ private final String m_pluginName;
+ private final Map< String, String > m_params;
/**
* Creates a new DOM element with the given plugin name and a map of
parameters.
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/parser/VariableContent.java
b/jspwiki-main/src/main/java/org/apache/wiki/parser/VariableContent.java
index 5899575..3d3af94 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/parser/VariableContent.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/parser/VariableContent.java
@@ -37,7 +37,7 @@ public class VariableContent extends Text {
private static final long serialVersionUID = 1L;
- private String m_varName;
+ private final String m_varName;
/**
* Create a VariableContent for the given variable.
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/parser/WikiDocument.java
b/jspwiki-main/src/main/java/org/apache/wiki/parser/WikiDocument.java
index 13cb838..9648661 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/parser/WikiDocument.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/parser/WikiDocument.java
@@ -36,7 +36,7 @@ public class WikiDocument extends Document {
private static final long serialVersionUID = 1L;
- private Page m_page;
+ private final Page m_page;
private String m_wikiText;
private WeakReference< Context > m_context;
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 de5a355..fc02ca6 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
@@ -79,7 +79,7 @@ import java.util.stream.Collectors;
*/
public abstract class AbstractReferralPlugin implements Plugin {
- private static Logger log = Logger.getLogger( AbstractReferralPlugin.class
);
+ private static final Logger log = Logger.getLogger(
AbstractReferralPlugin.class );
/** Magic value for rendering all items. */
public static final int ALL_ITEMS = -1;
@@ -415,7 +415,7 @@ public abstract class AbstractReferralPlugin implements
Plugin {
*/
private static class CutMutator implements StringTransmutator {
- private int m_length;
+ private final int m_length;
public CutMutator( final int length ) {
m_length = length;
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java
b/jspwiki-main/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java
index 207f3ee..dc32e54 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/plugin/DefaultPluginManager.java
@@ -162,13 +162,13 @@ public class DefaultPluginManager extends
BaseModuleManager implements PluginMan
private static final Logger log = Logger.getLogger(
DefaultPluginManager.class );
private static final String DEFAULT_FORMS_PACKAGE =
"org.apache.wiki.forms";
- private ArrayList< String > m_searchPath = new ArrayList<>();
- private ArrayList< String > m_externalJars = new ArrayList<>();
- private Pattern m_pluginPattern;
+ private final ArrayList< String > m_searchPath = new ArrayList<>();
+ private final ArrayList< String > m_externalJars = new ArrayList<>();
+ private final Pattern m_pluginPattern;
private boolean m_pluginsEnabled = true;
/** Keeps a list of all known plugin classes. */
- private Map< String, WikiPluginInfo > m_pluginClassMap = new HashMap<>();
+ private final Map< String, WikiPluginInfo > m_pluginClassMap = new
HashMap<>();
/**
* Create a new PluginManager.
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/Denounce.java
b/jspwiki-main/src/main/java/org/apache/wiki/plugin/Denounce.java
index 1f5ebbe..1f16873 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/Denounce.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/Denounce.java
@@ -69,9 +69,9 @@ public class Denounce implements Plugin {
private static final String PROP_DENOUNCETEXT = "denounce.denouncetext";
- private static ArrayList<Pattern> c_refererPatterns = new ArrayList<>();
- private static ArrayList<Pattern> c_agentPatterns = new ArrayList<>();
- private static ArrayList<Pattern> c_hostPatterns = new ArrayList<>();
+ private static final ArrayList<Pattern> c_refererPatterns = new
ArrayList<>();
+ private static final ArrayList<Pattern> c_agentPatterns = new
ArrayList<>();
+ private static final ArrayList<Pattern> c_hostPatterns = new
ArrayList<>();
private static String c_denounceText = "";
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/IndexPlugin.java
b/jspwiki-main/src/main/java/org/apache/wiki/plugin/IndexPlugin.java
index 29b1a5b..baa6b65 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/IndexPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/IndexPlugin.java
@@ -60,7 +60,7 @@ public class IndexPlugin extends AbstractReferralPlugin
implements Plugin {
private static final Logger log = Logger.getLogger(IndexPlugin.class);
- private Namespace xmlns_XHTML =
Namespace.getNamespace("http://www.w3.org/1999/xhtml";);
+ private final Namespace xmlns_XHTML =
Namespace.getNamespace("http://www.w3.org/1999/xhtml";);
/**
* {@inheritDoc}
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferredPagesPlugin.java
b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferredPagesPlugin.java
index 67ff112..9fd46b2 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferredPagesPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/ReferredPagesPlugin.java
@@ -60,9 +60,9 @@ public class ReferredPagesPlugin implements Plugin {
private static final Logger log = Logger.getLogger(
ReferredPagesPlugin.class );
private Engine m_engine;
private int m_depth;
- private HashSet<String> m_exists = new HashSet<>();
- private StringBuffer m_result = new StringBuffer(1024);
- private PatternMatcher m_matcher = new Perl5Matcher();
+ private final HashSet<String> m_exists = new HashSet<>();
+ private final StringBuffer m_result = new StringBuffer(1024);
+ private final PatternMatcher m_matcher = new Perl5Matcher();
private Pattern m_includePattern;
private Pattern m_excludePattern;
private boolean m_formatCompact = true;
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/preferences/Preferences.java
b/jspwiki-main/src/main/java/org/apache/wiki/preferences/Preferences.java
index 23edefa..114bf12 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/preferences/Preferences.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/preferences/Preferences.java
@@ -199,13 +199,14 @@ public class Preferences extends HashMap< String,String >
{
String variant = "";
final String[] res = StringUtils.split( langSetting, "-_" );
- if( res.length > 2 ) {
+ final int resLength = res.length;
+ if( resLength > 2 ) {
variant = res[ 2 ];
}
- if( res.length > 1 ) {
+ if( resLength > 1 ) {
country = res[ 1 ];
}
- if( res.length > 0 ) {
+ if( resLength > 0 ) {
language = res[ 0 ];
loc = new Locale( language, country, variant );
}
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java
b/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java
index 46e6ab9..bacde51 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java
@@ -57,7 +57,7 @@ public class CachingAttachmentProvider implements
AttachmentProvider {
private AttachmentProvider m_provider;
- private CacheManager m_cacheManager = CacheManager.getInstance();
+ private final CacheManager m_cacheManager = CacheManager.getInstance();
/** Default cache capacity for now. */
public static final int m_capacity = 1000;
@@ -76,8 +76,8 @@ public class CachingAttachmentProvider implements
AttachmentProvider {
*/
private Cache m_attCache;
- private long m_cacheMisses = 0;
- private long m_cacheHits = 0;
+ private final long m_cacheMisses = 0;
+ private final long m_cacheHits = 0;
/** The extension to append to directory names to denote an attachment
directory. */
public static final String DIR_EXTENSION = "-att";
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingProvider.java
b/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingProvider.java
index fb33eaa..5d31aa4 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingProvider.java
@@ -64,7 +64,7 @@ public class CachingProvider implements PageProvider {
private static final Logger log = Logger.getLogger( CachingProvider.class
);
- private CacheManager m_cacheManager = CacheManager.getInstance();
+ private final CacheManager m_cacheManager = CacheManager.getInstance();
private PageProvider m_provider;
// FIXME: Find another way to the search engine to use instead of from
Engine?
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/references/DefaultReferenceManager.java
b/jspwiki-main/src/main/java/org/apache/wiki/references/DefaultReferenceManager.java
index 64efeae..817629f 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/references/DefaultReferenceManager.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/references/DefaultReferenceManager.java
@@ -120,7 +120,7 @@ public class DefaultReferenceManager extends BasePageFilter
implements Reference
private Map< String, Set< String > > m_referredBy;
private Map< String, Set< String > > m_unmutableReferredBy;
- private boolean m_matchEnglishPlurals;
+ private final boolean m_matchEnglishPlurals;
private static final Logger log = Logger.getLogger(
DefaultReferenceManager.class);
private static final String SERIALIZATION_FILE = "refmgr.ser";
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/rss/AtomFeed.java
b/jspwiki-main/src/main/java/org/apache/wiki/rss/AtomFeed.java
index 7128c73..b9fb069 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/rss/AtomFeed.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/rss/AtomFeed.java
@@ -46,7 +46,7 @@ import java.util.List;
*/
public class AtomFeed extends Feed {
- private Namespace m_atomNameSpace =
Namespace.getNamespace("http://www.w3.org/2005/Atom";);
+ private final Namespace m_atomNameSpace =
Namespace.getNamespace("http://www.w3.org/2005/Atom";);
/** Defines a SimpleDateFormat string for RFC3339-formatted dates. */
public static final String RFC3339FORMAT = "yyyy-MM-dd'T'HH:mm:ssZZ";
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/rss/DefaultRSSGenerator.java
b/jspwiki-main/src/main/java/org/apache/wiki/rss/DefaultRSSGenerator.java
index 166d99a..6cf6d09 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/rss/DefaultRSSGenerator.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/rss/DefaultRSSGenerator.java
@@ -52,10 +52,10 @@ import java.util.Set;
public class DefaultRSSGenerator implements RSSGenerator {
private static final Logger log = Logger.getLogger(
DefaultRSSGenerator.class );
- private Engine m_engine;
+ private final Engine m_engine;
/** The RSS file to generate. */
- private String m_rssFile;
+ private final String m_rssFile;
private String m_channelDescription = "";
private String m_channelLanguage = "en-us";
private boolean m_enabled = true;
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 7451762..c653f4a 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
@@ -545,7 +545,7 @@ public class LuceneSearchProvider implements SearchProvider
{
protected static final int INITIAL_DELAY = 60;
private final LuceneSearchProvider m_provider;
- private int m_initialDelay;
+ private final int m_initialDelay;
private WatchDog m_watchdog;
@@ -594,9 +594,9 @@ public class LuceneSearchProvider implements SearchProvider
{
// FIXME: This class is dumb; needs to have a better implementation
private static class SearchResultImpl implements SearchResult {
- private Page m_page;
- private int m_score;
- private String[] m_contexts;
+ private final Page m_page;
+ private final int m_score;
+ private final String[] m_contexts;
public SearchResultImpl( final Page page, final int score, final
String[] contexts ) {
m_page = page;
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/search/SearchMatcher.java
b/jspwiki-main/src/main/java/org/apache/wiki/search/SearchMatcher.java
index 10c5d61..34967b9 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/search/SearchMatcher.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/search/SearchMatcher.java
@@ -39,8 +39,8 @@ import java.io.StringReader;
*/
public class SearchMatcher {
- private QueryItem[] m_queries;
- private Engine m_engine;
+ private final QueryItem[] m_queries;
+ private final Engine m_engine;
/**
* Creates a new SearchMatcher.
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/tags/BreadcrumbsTag.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/BreadcrumbsTag.java
index fea1742..30fca0a 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/BreadcrumbsTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/BreadcrumbsTag.java
@@ -176,7 +176,7 @@ public class BreadcrumbsTag extends WikiTagBase
* Extends the LinkedList class to provide a fixed-size queue
implementation
*/
public static class FixedQueue extends LinkedList< String > implements
Serializable {
- private int m_size;
+ private final int m_size;
private static final long serialVersionUID = 0L;
FixedQueue( final int size ) {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java
index 21ee007..3396f8d 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/CalendarTag.java
@@ -202,8 +202,8 @@ public class CalendarTag extends WikiTagBase {
final String calendarDate = m_dateFormat.format( day.getTime() );
String url = m_wikiContext.getURL(
ContextEnum.PAGE_VIEW.getRequestContext(),
pageName,"calendar.date="+calendarDate );
-
- if( queryString != null && queryString.length() > 0 ) {
+ final int queryStringLlength = queryString.length();
+ if(queryStringLlength > 0) {
//
// Ensure that the 'calendar.date=ddMMyy' has been removed
from the queryString
//
@@ -218,13 +218,13 @@ public class CalendarTag extends WikiTagBase {
// FIXME: Will this fail when we use & instead of &?
// FIXME: should use some parsing routine
final int pos2 = queryString.indexOf("&", pos1 ) + 1;
- if ( ( pos2 > 0 ) && ( pos2 < queryString.length() ) ) {
+ if ( ( pos2 > 0 ) && ( pos2 < queryStringLlength ) ) {
tmp = tmp + queryString.substring(pos2);
}
queryString = tmp;
}
- if( queryString.length() > 0 ) {
+ if( queryStringLlength > 0 ) {
url = url + "&" + queryString;
}
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/ContentTag.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/ContentTag.java
index 0ab0def..3d7ee7a 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/ContentTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/ContentTag.java
@@ -41,7 +41,7 @@ public class ContentTag extends WikiTagBase {
private static final long serialVersionUID = 0L;
private static final Logger log = Logger.getLogger( ContentTag.class );
- private Map<String, String> m_mappings = new HashMap<>();
+ private final Map<String, String> m_mappings = new HashMap<>();
/**
* Set the template for the VIEW context.
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/CookieTag.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/CookieTag.java
index faaeadf..6991a74 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/CookieTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/CookieTag.java
@@ -97,7 +97,7 @@ public class CookieTag
{
private static final long serialVersionUID = 0L;
- private static Logger log = Logger.getLogger( CookieTag.class );
+ private static final Logger log = Logger.getLogger( CookieTag.class );
/** Name of the cookie value. Required. */
private String m_name;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/Installer.java
b/jspwiki-main/src/main/java/org/apache/wiki/ui/Installer.java
index a6431a3..faa0ac9 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/Installer.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/Installer.java
@@ -70,7 +70,7 @@ public class Installer {
private final File m_propertyFile;
private final Properties m_props;
private final Engine m_engine;
- private HttpServletRequest m_request;
+ private final HttpServletRequest m_request;
private boolean m_validated;
public Installer( final HttpServletRequest request, final ServletConfig
config ) {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
index a3f9139..ed4ef7d 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
@@ -208,10 +208,10 @@ public class WikiJSPFilter extends WikiServletFilter {
private static class JSPWikiServletResponseWrapper extends
HttpServletResponseWrapper {
ByteArrayOutputStream m_output;
- private ByteArrayServletOutputStream m_servletOut;
- private PrintWriter m_writer;
- private HttpServletResponse m_response;
- private boolean useEncoding;
+ private final ByteArrayServletOutputStream m_servletOut;
+ private final PrintWriter m_writer;
+ private final HttpServletResponse m_response;
+ private final boolean useEncoding;
/** How large the initial buffer should be. This should be tuned to
achieve a balance in speed and memory consumption. */
private static final int INIT_BUFFER_SIZE = 0x8000;
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java
b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java
index 3a3aa93..e424dc3 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java
@@ -54,9 +54,9 @@ import java.util.List;
*/
public class DefaultAdminBeanManager implements WikiEventListener,
AdminBeanManager {
- private Engine m_engine;
+ private final Engine m_engine;
private ArrayList< AdminBean > m_allBeans;
- private MBeanServer m_mbeanServer;
+ private final MBeanServer m_mbeanServer;
private static final Logger log = Logger.getLogger(
DefaultAdminBeanManager.class );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java
b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java
index bf3c731..00c7a38 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java
@@ -59,7 +59,7 @@ public class RPCServlet extends HttpServlet {
public static final String XMLRPC_PREFIX = "wiki";
private Engine m_engine;
- private XmlRpcServer m_xmlrpcServer = new XmlRpcServer();
+ private final XmlRpcServer m_xmlrpcServer = new XmlRpcServer();
private static final Logger log = Logger.getLogger( RPCServlet.class );
@@ -154,7 +154,7 @@ public class RPCServlet extends HttpServlet {
}
private static class LocalHandler implements ContextXmlRpcHandler {
- private Class< ? > m_clazz;
+ private final Class< ? > m_clazz;
public LocalHandler( final Class< ? > clazz )
{
@@ -173,8 +173,8 @@ public class RPCServlet extends HttpServlet {
private static class WikiXmlRpcContext implements XmlRpcContext {
- private XmlRpcHandlerMapping m_mapping;
- private Context m_context;
+ private final XmlRpcHandlerMapping m_mapping;
+ private final Context m_context;
public WikiXmlRpcContext( final XmlRpcHandlerMapping map, final
Context ctx ) {
m_mapping = map;
diff --git
a/jspwiki-main/src/test/java/org/apache/wiki/auth/AuthenticationManagerTest.java
b/jspwiki-main/src/test/java/org/apache/wiki/auth/AuthenticationManagerTest.java
index c1229f8..7258b24 100644
---
a/jspwiki-main/src/test/java/org/apache/wiki/auth/AuthenticationManagerTest.java
+++
b/jspwiki-main/src/test/java/org/apache/wiki/auth/AuthenticationManagerTest.java
@@ -45,7 +45,7 @@ import java.util.Properties;
public class AuthenticationManagerTest {
public static class DummyAuthorizer implements WebAuthorizer {
- private static Principal[] m_roles = new Principal[] { new Role(
"ContainerRole" ), new Role( "AuthorizerRole" ),
+ private static final Principal[] m_roles = new Principal[] { new Role(
"ContainerRole" ), new Role( "AuthorizerRole" ),
new Role(
"DummyRole" ) };
@Override public Principal findRole( final String role ) {
diff --git
a/jspwiki-main/src/test/java/org/apache/wiki/auth/SecurityEventTrap.java
b/jspwiki-main/src/test/java/org/apache/wiki/auth/SecurityEventTrap.java
index 20fa6f6..c31a168 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/auth/SecurityEventTrap.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/auth/SecurityEventTrap.java
@@ -32,7 +32,7 @@ import org.apache.wiki.event.WikiSecurityEvent;
public class SecurityEventTrap implements WikiEventListener
{
private WikiSecurityEvent m_lastEvent = null;
- private List<WikiSecurityEvent> m_events = new
ArrayList<WikiSecurityEvent>();
+ private final List<WikiSecurityEvent> m_events = new
ArrayList<WikiSecurityEvent>();
public void actionPerformed( WikiEvent event )
{
diff --git
a/jspwiki-main/src/test/java/org/apache/wiki/auth/TestAuthorizer.java
b/jspwiki-main/src/test/java/org/apache/wiki/auth/TestAuthorizer.java
index 7e1ef75..6f0545b 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/auth/TestAuthorizer.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/auth/TestAuthorizer.java
@@ -35,7 +35,7 @@ import java.util.Properties;
*/
public class TestAuthorizer implements WebAuthorizer {
- private Role[] m_roles = new Role[]{
+ private final Role[] m_roles = new Role[]{
new Role( "Admin" ),
Role.AUTHENTICATED,
new Role( "IT" ),
diff --git
a/jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/GroupManagerTest.java
b/jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/GroupManagerTest.java
index fd3fb33..6f5a605 100644
---
a/jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/GroupManagerTest.java
+++
b/jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/GroupManagerTest.java
@@ -44,7 +44,7 @@ public class GroupManagerTest
private GroupManager m_groupMgr;
- private SecurityEventTrap m_trap = new SecurityEventTrap();
+ private final SecurityEventTrap m_trap = new SecurityEventTrap();
private Session m_session;
diff --git
a/jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java
b/jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java
index 2ccbfad..39db467 100644
---
a/jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java
+++
b/jspwiki-main/src/test/java/org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java
@@ -46,7 +46,7 @@ import org.junit.jupiter.api.Test;
*/
public class JDBCGroupDatabaseTest
{
- private HsqlDbUtils m_hu = new HsqlDbUtils();
+ private final HsqlDbUtils m_hu = new HsqlDbUtils();
private Connection m_conn = null;
diff --git
a/jspwiki-main/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java
b/jspwiki-main/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java
index 1a7c6c9..4c96473 100644
---
a/jspwiki-main/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java
+++
b/jspwiki-main/src/test/java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java
@@ -47,7 +47,7 @@ import org.junit.jupiter.api.Test;
*/
public class JDBCUserDatabaseTest
{
- private HsqlDbUtils m_hu = new HsqlDbUtils();
+ private final HsqlDbUtils m_hu = new HsqlDbUtils();
private JDBCUserDatabase m_db = null;
diff --git
a/jspwiki-main/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java
b/jspwiki-main/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java
index 19fe39e..4aeca69 100644
---
a/jspwiki-main/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java
+++
b/jspwiki-main/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java
@@ -55,7 +55,7 @@ public class VersioningFileProviderTest
+ "#Wed Jan 01 12:27:57 GMT 2012" + "\n"
+ "author=" + OLD_AUTHOR + "\n";
- private Properties PROPS = TestEngine.getTestProperties(
"/jspwiki-vers-custom.properties" );
+ private final Properties PROPS = TestEngine.getTestProperties(
"/jspwiki-vers-custom.properties" );
private TestEngine engine = TestEngine.build( PROPS );
// this is the testing page directory
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/web/TestContainer.java
b/jspwiki-main/src/test/java/org/apache/wiki/web/TestContainer.java
index 943191d..653af30 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/web/TestContainer.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/web/TestContainer.java
@@ -71,7 +71,7 @@ public class TestContainer
public static final String INITIAL_CONTEXT_FACTORY_JETTY =
"org.eclipse.jetty.jndi.InitialContextFactory";
public static final String JNDI_ENV_ROOT = "java:comp/env";
- private static HsqlDbUtils m_hu = new HsqlDbUtils();
+ private static final HsqlDbUtils m_hu = new HsqlDbUtils();
private static final Logger log = Logger.getLogger( TestContainer.class );
@@ -79,7 +79,7 @@ public class TestContainer
private static Resource userDB = null;
private static Resource groupDB = null;
- private static ContextHandlerCollection handlerCollection = new
ContextHandlerCollection();
+ private static final ContextHandlerCollection handlerCollection = new
ContextHandlerCollection();
/**
* Starts up a test server for a particular web application on the
specified
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/ClassUtil.java
b/jspwiki-util/src/main/java/org/apache/wiki/util/ClassUtil.java
index d8118ca..ab4e345 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/ClassUtil.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/ClassUtil.java
@@ -56,10 +56,10 @@ public final class ClassUtil {
public static final String MAPPINGS_EXTRA = "ini/classmappings-extra.xml";
/** Initialize the class mappings document. */
- private static Map< String, String > c_classMappings =
populateClassMappingsFrom( MAPPINGS );
+ private static final Map< String, String > c_classMappings =
populateClassMappingsFrom( MAPPINGS );
/** Initialize the class mappings extra document. */
- private static Map< String, String > c_classMappingsExtra =
populateClassMappingsFrom( MAPPINGS_EXTRA ) ;
+ private static final Map< String, String > c_classMappingsExtra =
populateClassMappingsFrom( MAPPINGS_EXTRA ) ;
private static boolean classLoaderSetup = false;
private static ClassLoader loader = null;
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/PriorityList.java
b/jspwiki-util/src/main/java/org/apache/wiki/util/PriorityList.java
index dba1049..4a69eea 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/PriorityList.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/PriorityList.java
@@ -33,7 +33,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
public class PriorityList<E>
extends AbstractList<E>
{
- private CopyOnWriteArrayList<Item<E>> m_elements = new
CopyOnWriteArrayList<Item<E>>();
+ private final CopyOnWriteArrayList<Item<E>> m_elements = new
CopyOnWriteArrayList<Item<E>>();
/**
* This is the default priority, which is used if no priority
diff --git
a/jspwiki-util/src/main/java/org/apache/wiki/util/TimedCounterList.java
b/jspwiki-util/src/main/java/org/apache/wiki/util/TimedCounterList.java
index da907f2..d354e15 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/TimedCounterList.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/TimedCounterList.java
@@ -36,8 +36,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
*/
public class TimedCounterList<T> extends AbstractList<T>
{
- private ArrayList<CounterItem<T>> m_list = new ArrayList<CounterItem<T>>();
- private ReadWriteLock m_lock = new ReentrantReadWriteLock();
+ private final ArrayList<CounterItem<T>> m_list = new
ArrayList<CounterItem<T>>();
+ private final ReadWriteLock m_lock = new
ReentrantReadWriteLock();
/**
* {@inheritDoc}
@@ -229,8 +229,8 @@ public class TimedCounterList<T> extends AbstractList<T>
private static class CounterItem<E>
{
- private E m_obj;
- private long m_addTime;
+ private final E m_obj;
+ private final long m_addTime;
public CounterItem(E o)
{
