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 0ac6b6a JSPWIKI-1152 - Make final variable when is possible.
0ac6b6a is described below
commit 0ac6b6a65103f622758606430a6775075ffff100
Author: Arturo Bernal <[email protected]>
AuthorDate: Fri Sep 24 06:37:26 2021 +0200
JSPWIKI-1152 - Make final variable when is possible.
---
.../main/java/org/apache/wiki/its/environment/Env.java | 18 +++++++++---------
.../main/java/org/apache/wiki/pages/PageBuilder.java | 4 ++--
.../src/main/java/org/apache/wiki/WatchDog.java | 6 +++---
.../src/main/java/org/apache/wiki/WikiEngine.java | 2 +-
.../apache/wiki/auth/DefaultAuthenticationManager.java | 2 +-
.../org/apache/wiki/modules/BaseModuleManager.java | 2 +-
.../java/org/apache/wiki/pages/DefaultPageManager.java | 2 +-
.../main/java/org/apache/wiki/parser/MarkupParser.java | 16 ++++++++--------
.../java/org/apache/wiki/plugin/TableOfContents.java | 2 +-
.../main/java/org/apache/wiki/render/WikiRenderer.java | 4 ++--
.../src/main/java/org/apache/wiki/rss/Feed.java | 4 ++--
.../java/org/apache/wiki/search/SearchMatcher.java | 4 ++--
.../main/java/org/apache/wiki/ui/WikiJSPFilter.java | 4 ++--
13 files changed, 35 insertions(+), 35 deletions(-)
diff --git
a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/environment/Env.java
b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/environment/Env.java
index 4225539..90951d8 100644
---
a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/environment/Env.java
+++
b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/its/environment/Env.java
@@ -25,30 +25,30 @@ package org.apache.wiki.its.environment;
public class Env {
/** Base url on which the functional tests are run. Default value is
{@code https://jspwiki-wiki.apache.org}. */
- public static String TESTS_BASE_URL = System.getProperty(
"it-jspwiki.base.url", "https://jspwiki-wiki.apache.org"; );
+ public static final String TESTS_BASE_URL = System.getProperty(
"it-jspwiki.base.url", "https://jspwiki-wiki.apache.org"; );
/** Selenide tests download's folder. Default value is {@code
./target/downloads}. */
- public static String TESTS_CONFIG_DOWNLOADS_FOLDER = System.getProperty(
"it-jspwiki.config.download-folder", "./target/downloads" );
+ public static final String TESTS_CONFIG_DOWNLOADS_FOLDER =
System.getProperty( "it-jspwiki.config.download-folder", "./target/downloads" );
/** Should the browser start on headless mode? Only for Firefox / Chrome.
Default value is {@code false}. */
- public static boolean TESTS_CONFIG_HEADLESS = Boolean.parseBoolean(
System.getProperty( "it-jspwiki.config.headless", "false" ) );
+ public static final boolean TESTS_CONFIG_HEADLESS = Boolean.parseBoolean(
System.getProperty( "it-jspwiki.config.headless", "false" ) );
/** Selenide tests reports' folder. Default value is {@code
./target/selenide}. */
- public static String TESTS_CONFIG_REPORTS_FOLDER = System.getProperty(
"it-jspwiki.config.reports", "./target/selenide" );
+ public static final String TESTS_CONFIG_REPORTS_FOLDER =
System.getProperty( "it-jspwiki.config.reports", "./target/selenide" );
/** Amount of time, in milliseconds, to wait for the search index tasks to
complete. Default value is {@code 1200}. */
- public static long TESTS_CONFIG_SEARCH_INDEX_WAIT = Long.parseLong(
System.getProperty( "it-jspwiki.config.search-index-wait", "1200" ) );
+ public static final long TESTS_CONFIG_SEARCH_INDEX_WAIT = Long.parseLong(
System.getProperty( "it-jspwiki.config.search-index-wait", "1200" ) );
/** Should the browser start maximized?. Default value is {@code true}. */
- public static boolean TESTS_CONFIG_START_MAXIMIZED = Boolean.parseBoolean(
System.getProperty( "it-jspwiki.config.start-maximized", "true" ) );
+ public static final boolean TESTS_CONFIG_START_MAXIMIZED =
Boolean.parseBoolean( System.getProperty( "it-jspwiki.config.start-maximized",
"true" ) );
/** Folder where the WebDriver will be downloaded. Default value is {@code
./target/wdm}. */
- public static String TESTS_CONFIG_WDM_TARGET_PATH = System.getProperty(
"it-jspwiki.config.wdm.target-path", "./target/wdm" );
+ public static final String TESTS_CONFIG_WDM_TARGET_PATH =
System.getProperty( "it-jspwiki.config.wdm.target-path", "./target/wdm" );
/** Janne's username. Default value is {@code janne}. */
- public static String LOGIN_JANNE_USERNAME = System.getProperty(
"it-jspwiki.login.janne.username", "janne" );
+ public static final String LOGIN_JANNE_USERNAME = System.getProperty(
"it-jspwiki.login.janne.username", "janne" );
/** Janne's password. Default value is {@code myP@5sw0rd}. */
- public static String LOGIN_JANNE_PASSWORD = System.getProperty(
"it-jspwiki.login.janne.password", "myP@5sw0rd" );
+ public static final String LOGIN_JANNE_PASSWORD = System.getProperty(
"it-jspwiki.login.janne.password", "myP@5sw0rd" );
}
diff --git
a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/pages/PageBuilder.java
b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/pages/PageBuilder.java
index 2ac52ba..22d4bd2 100644
---
a/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/pages/PageBuilder.java
+++
b/jspwiki-it-tests/jspwiki-selenide-tests/src/main/java/org/apache/wiki/pages/PageBuilder.java
@@ -28,8 +28,8 @@ import org.apache.wiki.its.environment.Env;
*/
public class PageBuilder {
- String url;
- Page page;
+ final String url;
+ final Page page;
PageBuilder( final String url, final Page page ) {
this.url = url;
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 599eae8..50f486c 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WatchDog.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WatchDog.java
@@ -376,9 +376,9 @@ public final class WatchDog {
*/
private static class State {
- protected String m_state;
- protected long m_enterTime;
- protected long m_expiryTime;
+ protected final String m_state;
+ protected final long m_enterTime;
+ protected final long m_expiryTime;
protected State( final String state, final int expiry ) {
m_state = state;
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 47a18c2..54e9545 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
@@ -135,7 +135,7 @@ public class WikiEngine implements Engine {
private final Map< String, Object > m_attributes = new
ConcurrentHashMap<>();
/** Stores WikiEngine's associated managers. */
- protected Map< Class< ? >, Object > managers = new ConcurrentHashMap<>();
+ protected final Map< Class< ? >, Object > managers = new
ConcurrentHashMap<>();
/**
* Gets a WikiEngine related to this servlet. Since this method is only
called from JSP pages (and JspInit()) to be specific,
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 a05556a..ed4552c 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
@@ -79,7 +79,7 @@ public class DefaultAuthenticationManager implements
AuthenticationManager {
/** Options passed to {@link LoginModule#initialize(Subject,
CallbackHandler, Map, Map)};
* initialized by {@link #initialize(Engine, Properties)}. */
- protected Map< String, String > m_loginModuleOptions = new HashMap<>();
+ protected final Map< String, String > m_loginModuleOptions = new
HashMap<>();
/** The default {@link LoginModule} class name to use for custom
authentication. */
private static final String DEFAULT_LOGIN_MODULE =
"org.apache.wiki.auth.login.UserDatabaseLoginModule";
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 9a2552f..fda2683 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
@@ -32,7 +32,7 @@ import java.util.TreeSet;
*/
public abstract class BaseModuleManager implements ModuleManager {
- protected Engine m_engine;
+ protected final Engine m_engine;
private final boolean m_loadIncompatibleModules = false;
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 860d92c..f70b4ad 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
@@ -92,7 +92,7 @@ public class DefaultPageManager implements PageManager {
private final Engine m_engine;
- protected ConcurrentHashMap< String, PageLock > m_pageLocks = new
ConcurrentHashMap<>();
+ protected final ConcurrentHashMap< String, PageLock > m_pageLocks = new
ConcurrentHashMap<>();
private final int m_expiryTime;
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/parser/MarkupParser.java
b/jspwiki-main/src/main/java/org/apache/wiki/parser/MarkupParser.java
index 987ea5c..ed6a131 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/parser/MarkupParser.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/parser/MarkupParser.java
@@ -51,21 +51,21 @@ public abstract class MarkupParser {
protected PushbackReader m_in;
private int m_pos = -1; // current position in reader stream
- protected Engine m_engine;
- protected Context m_context;
+ protected final Engine m_engine;
+ protected final Context m_context;
/** Optionally stores internal wikilinks */
- protected ArrayList< StringTransmutator > m_localLinkMutatorChain = new
ArrayList<>();
- protected ArrayList< StringTransmutator > m_externalLinkMutatorChain = new
ArrayList<>();
- protected ArrayList< StringTransmutator > m_attachmentLinkMutatorChain =
new ArrayList<>();
- protected ArrayList< StringTransmutator > m_linkMutators = new
ArrayList<>();
- protected ArrayList< HeadingListener > m_headingListenerChain = new
ArrayList<>();
+ protected final ArrayList< StringTransmutator > m_localLinkMutatorChain =
new ArrayList<>();
+ protected final ArrayList< StringTransmutator > m_externalLinkMutatorChain
= new ArrayList<>();
+ protected final ArrayList< StringTransmutator >
m_attachmentLinkMutatorChain = new ArrayList<>();
+ protected final ArrayList< StringTransmutator > m_linkMutators = new
ArrayList<>();
+ protected final ArrayList< HeadingListener > m_headingListenerChain = new
ArrayList<>();
protected boolean m_inlineImages = true;
protected boolean m_parseAccessRules = true;
/** Keeps image regexp Patterns */
protected List< Pattern > m_inlineImagePatterns;
- protected LinkParsingOperations m_linkParsingOperations;
+ protected final LinkParsingOperations m_linkParsingOperations;
private static final Logger log = LogManager.getLogger( MarkupParser.class
);
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/plugin/TableOfContents.java
b/jspwiki-main/src/main/java/org/apache/wiki/plugin/TableOfContents.java
index 4e2d2cf..28aa978 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/TableOfContents.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/TableOfContents.java
@@ -70,7 +70,7 @@ public class TableOfContents implements Plugin,
HeadingListener {
private static final String VAR_ALREADY_PROCESSING =
"__TableOfContents.processing";
- StringBuffer m_buf = new StringBuffer();
+ final StringBuffer m_buf = new StringBuffer();
private boolean m_usingNumberedList;
private String m_prefix = "";
private int m_starting;
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/render/WikiRenderer.java
b/jspwiki-main/src/main/java/org/apache/wiki/render/WikiRenderer.java
index be627ff..9728eb3 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/render/WikiRenderer.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/render/WikiRenderer.java
@@ -32,8 +32,8 @@ import java.io.IOException;
*/
public abstract class WikiRenderer {
- protected Context m_context;
- protected WikiDocument m_document;
+ protected final Context m_context;
+ protected final WikiDocument m_document;
public static final String LINKS_TRANSLATION = "$1#$2";
public static final String LINKS_SOURCE = "(.+)#section-.+-(.+)";
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/rss/Feed.java
b/jspwiki-main/src/main/java/org/apache/wiki/rss/Feed.java
index c9a7d7a..3842cab 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/rss/Feed.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/rss/Feed.java
@@ -32,14 +32,14 @@ import java.util.List;
* Represents an abstract feed.
*/
public abstract class Feed {
- protected List<Entry> m_entries = new ArrayList<>();
+ protected final List<Entry> m_entries = new ArrayList<>();
protected String m_feedURL;
protected String m_channelTitle;
protected String m_channelDescription;
protected String m_channelLanguage;
- protected Context m_wikiContext;
+ protected final Context m_wikiContext;
protected String m_mode = RSSGenerator.MODE_WIKI;
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 34967b9..8ddbdd7 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
@@ -133,8 +133,8 @@ public class SearchMatcher {
*/
public class SearchResultImpl implements
org.apache.wiki.search.SearchResult {
- int m_score;
- Page m_page;
+ final int m_score;
+ final Page m_page;
/**
* Create a new SearchResult with a given name and a score.
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 f65146b..6364a88 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
@@ -198,7 +198,7 @@ public class WikiJSPFilter extends WikiServletFilter {
*/
private static class JSPWikiServletResponseWrapper extends
HttpServletResponseWrapper {
- ByteArrayOutputStream m_output;
+ final ByteArrayOutputStream m_output;
private final ByteArrayServletOutputStream m_servletOut;
private final PrintWriter m_writer;
private final HttpServletResponse m_response;
@@ -236,7 +236,7 @@ public class WikiJSPFilter extends WikiServletFilter {
class ByteArrayServletOutputStream extends ServletOutputStream {
- ByteArrayOutputStream m_buffer;
+ final ByteArrayOutputStream m_buffer;
public ByteArrayServletOutputStream( final ByteArrayOutputStream
byteArrayOutputStream ) {
super();
