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 2022/07/12 20:38:01 UTC
[jspwiki] branch master updated: Remove redundant member initializer.
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 843e6ed73 Remove redundant member initializer.
843e6ed73 is described below
commit 843e6ed736ea7399e9a4ccc25562cd2912d4f354
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Wed Jun 22 22:50:38 2022 +0200
Remove redundant member initializer.
---
.../src/test/java/com/example/filters/TwoXFilter.java | 2 +-
.../test/java/org/apache/wiki/event/TestWikiEventListener.java | 2 +-
.../src/main/java/org/apache/wiki/auth/SecurityVerifier.java | 2 +-
.../java/org/apache/wiki/parser/CreoleToJSPWikiTranslator.java | 2 +-
.../main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java | 4 ++--
.../java/org/apache/wiki/plugin/AbstractReferralPlugin.java | 2 +-
.../main/java/org/apache/wiki/plugin/ReferredPagesPlugin.java | 2 +-
.../src/main/java/org/apache/wiki/tags/BreadcrumbsTag.java | 2 +-
jspwiki-main/src/main/java/org/apache/wiki/tags/ParamTag.java | 2 +-
jspwiki-main/src/test/java/org/apache/wiki/HsqlDbUtils.java | 4 ++--
jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java | 8 ++++----
.../src/test/java/org/apache/wiki/TestJDBCDataSource.java | 10 +++++-----
.../src/test/java/org/apache/wiki/TestJNDIContext.java | 4 ++--
.../src/test/java/org/apache/wiki/auth/SecurityEventTrap.java | 2 +-
.../org/apache/wiki/auth/authorize/JDBCGroupDatabaseTest.java | 4 ++--
.../java/org/apache/wiki/auth/user/JDBCUserDatabaseTest.java | 2 +-
.../src/test/java/org/apache/wiki/plugin/JavaScriptPlugin.java | 2 +-
.../src/test/java/org/apache/wiki/plugin/SamplePlugin.java | 2 +-
.../test/java/org/apache/wiki/providers/CounterProvider.java | 10 +++++-----
.../java/org/apache/wiki/providers/VerySimpleProvider.java | 2 +-
.../src/test/java/org/apache/wiki/web/TestContainer.java | 4 ++--
jspwiki-util/src/main/java/org/apache/wiki/util/FormUtil.java | 2 +-
.../src/main/java/org/apache/wiki/util/TimedCounterList.java | 4 ++--
23 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/jspwiki-210-test-adaptees/src/test/java/com/example/filters/TwoXFilter.java b/jspwiki-210-test-adaptees/src/test/java/com/example/filters/TwoXFilter.java
index f8d11df07..6f89f7bcd 100644
--- a/jspwiki-210-test-adaptees/src/test/java/com/example/filters/TwoXFilter.java
+++ b/jspwiki-210-test-adaptees/src/test/java/com/example/filters/TwoXFilter.java
@@ -29,7 +29,7 @@ import java.util.Properties;
public class TwoXFilter extends BasicPageFilter {
String newContent = "";
- int invocations = 0;
+ int invocations;
/** {@inheritDoc} */
@Override
diff --git a/jspwiki-event/src/test/java/org/apache/wiki/event/TestWikiEventListener.java b/jspwiki-event/src/test/java/org/apache/wiki/event/TestWikiEventListener.java
index 8372e0a45..01c4a041b 100644
--- a/jspwiki-event/src/test/java/org/apache/wiki/event/TestWikiEventListener.java
+++ b/jspwiki-event/src/test/java/org/apache/wiki/event/TestWikiEventListener.java
@@ -20,7 +20,7 @@ package org.apache.wiki.event;
public class TestWikiEventListener implements WikiEventListener {
- int invoked = 0;
+ int invoked;
/** {@inheritDoc} */
@Override
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 319cba835..27a4cce73 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
@@ -585,7 +585,7 @@ public final class SecurityVerifier {
*/
File getFileFromProperty( final String property )
{
- String propertyValue = null;
+ String propertyValue;
try
{
propertyValue = System.getProperty( property );
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 f314ca7e8..ab26217a9 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
@@ -185,7 +185,7 @@ public class CreoleToJSPWikiTranslator
dateFormat = DEFAULT_DATEFORMAT;
}
- SimpleDateFormat df = null;
+ SimpleDateFormat df;
try
{
df = new SimpleDateFormat(dateFormat);
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 8bafdfc3b..6949faf80 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
@@ -1458,7 +1458,7 @@ public class JSPWikiMarkupParser extends MarkupParser {
private Element handleHeading()
throws IOException
{
- Element el = null;
+ Element el;
final int ch = nextToken();
@@ -2028,7 +2028,7 @@ public class JSPWikiMarkupParser extends MarkupParser {
private Element handleBar( final boolean newLine )
throws IOException
{
- Element el = null;
+ Element el;
if( !m_istable && !newLine )
{
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 2b46b8bbc..61a1fa0eb 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
@@ -129,7 +129,7 @@ public abstract class AbstractReferralPlugin implements Plugin {
protected String m_before = ""; // null not blank
protected String m_separator = ""; // null not blank
protected String m_after = "\\\\";
- protected int items = 0;
+ protected int items;
protected Pattern[] m_exclude;
protected Pattern[] m_include;
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 8493a5f63..59f4413e7 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
@@ -66,7 +66,7 @@ public class ReferredPagesPlugin implements Plugin {
private final PatternMatcher m_matcher = new Perl5Matcher();
private Pattern m_includePattern;
private Pattern m_excludePattern;
- private int items = 0;
+ private int items;
private boolean m_formatCompact = true;
private boolean m_formatSort;
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 374ece1fe..fd0bd782e 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
@@ -154,7 +154,7 @@ public class BreadcrumbsTag extends WikiTagBase
final JspWriter out = pageContext.getOut();
final int queueSize = trail.size();
final String linkclass = "wikipage";
- String curPage = null;
+ String curPage;
for( int i = 0; i < queueSize - 1; i++ ) {
curPage = trail.get(i);
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/ParamTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/ParamTag.java
index 45a460a93..9592532f8 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/ParamTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/ParamTag.java
@@ -74,7 +74,7 @@ public class ParamTag
@Override
public int doEndTag()
{
- Tag t = null;
+ Tag t;
do
{
t = getParent();
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/HsqlDbUtils.java b/jspwiki-main/src/test/java/org/apache/wiki/HsqlDbUtils.java
index d7aab6a82..1a58b34ff 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/HsqlDbUtils.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/HsqlDbUtils.java
@@ -57,8 +57,8 @@ public class HsqlDbUtils
private static final Logger LOG = LogManager.getLogger( HsqlDbUtils.class );
- Server hsqlServer = null;
- int localPort = 0;
+ Server hsqlServer;
+ int localPort;
/**
* Convenience Hypersonic startup method for unit tests.
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java b/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
index 95dbe234a..43a225ff2 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/TestEngine.java
@@ -69,12 +69,12 @@ import java.util.Properties;
public class TestEngine extends WikiEngine {
private static final Logger log = LogManager.getLogger( TestEngine.class );
- private Session m_adminWikiSession = null;
- private Session m_janneWikiSession = null;
- private Session m_guestWikiSession = null;
+ private Session m_adminWikiSession;
+ private Session m_janneWikiSession;
+ private Session m_guestWikiSession;
// combined properties file (jspwiki.properties + custom override, if any)
- private static Properties combinedProperties = null;
+ private static Properties combinedProperties;
/**
* Creates WikiSession with the privileges of the administrative user. For testing purposes, obviously.
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/TestJDBCDataSource.java b/jspwiki-main/src/test/java/org/apache/wiki/TestJDBCDataSource.java
index 8267886a6..244a6ab25 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/TestJDBCDataSource.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/TestJDBCDataSource.java
@@ -53,15 +53,15 @@ public class TestJDBCDataSource implements DataSource
protected static final String PROPERTY_USER_PASSWORD = "jdbc.user.password";
- protected String m_jdbcPassword = null;
+ protected String m_jdbcPassword;
- protected String m_jdbcURL = null;
+ protected String m_jdbcURL;
- protected String m_jdbcUser = null;
+ protected String m_jdbcUser;
- protected int m_timeout = 0;
+ protected int m_timeout;
- protected PrintWriter m_writer = null;
+ protected PrintWriter m_writer;
/**
* Constructs a new instance of this class, using a supplied properties
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/TestJNDIContext.java b/jspwiki-main/src/test/java/org/apache/wiki/TestJNDIContext.java
index 41660134c..6d8adb6a8 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/TestJNDIContext.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/TestJNDIContext.java
@@ -58,7 +58,7 @@ public class TestJNDIContext implements Context
private final Map<String, Object> m_bindings = new HashMap<>();
- private static boolean initialized = false;
+ private static boolean initialized;
/**
* InitialContextFactory class that configures the JVM to
@@ -67,7 +67,7 @@ public class TestJNDIContext implements Context
public static class Factory implements InitialContextFactory
{
- private static Context ctx = null;
+ private static Context ctx;
@Override
public Context getInitialContext(final Hashtable<?,?> environment ) throws NamingException
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 95541d61a..c52102d56 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
@@ -31,7 +31,7 @@ import org.apache.wiki.event.WikiSecurityEvent;
*/
public class SecurityEventTrap implements WikiEventListener
{
- private WikiSecurityEvent m_lastEvent = null;
+ private WikiSecurityEvent m_lastEvent;
private final List<WikiSecurityEvent> m_events = new ArrayList<WikiSecurityEvent>();
public void actionPerformed(final WikiEvent event )
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 d8fe98ff0..7867d6dd2 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
@@ -43,9 +43,9 @@ public class JDBCGroupDatabaseTest
{
private final HsqlDbUtils m_hu = new HsqlDbUtils();
- private Connection m_conn = null;
+ private Connection m_conn;
- private JDBCGroupDatabase m_db = null;
+ private JDBCGroupDatabase m_db;
private String m_wiki;
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 b2cd8264b..d84dc7ffd 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
@@ -49,7 +49,7 @@ import java.util.Properties;
public class JDBCUserDatabaseTest {
private final HsqlDbUtils m_hu = new HsqlDbUtils();
- private JDBCUserDatabase m_db = null;
+ private JDBCUserDatabase m_db;
private static final String TEST_ATTRIBUTES = "rO0ABXNyABFqYXZhLnV0aWwuSGFzaE1hcAUH2sHDFmDRAwACRgAKbG9hZEZhY3RvckkACXRocmVzaG9sZHhwP0AAAAAAAAx3CAAAABAAAAACdAAKYXR0cmlidXRlMXQAEXNvbWUgcmFuZG9tIHZhbHVldAAKYXR0cmlidXRlMnQADWFub3RoZXIgdmFsdWV4";
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/plugin/JavaScriptPlugin.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/JavaScriptPlugin.java
index f75c86d76..bb61645d9 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/plugin/JavaScriptPlugin.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/plugin/JavaScriptPlugin.java
@@ -34,7 +34,7 @@ import java.util.Map;
*/
public class JavaScriptPlugin implements Plugin, InitializablePlugin {
- protected static boolean c_inited = false;
+ protected static boolean c_inited;
@Override
public String execute( final Context context, final Map< String, String > params ) throws PluginException {
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/plugin/SamplePlugin.java b/jspwiki-main/src/test/java/org/apache/wiki/plugin/SamplePlugin.java
index 1c239cfbe..d8a67ceb7 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/plugin/SamplePlugin.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/plugin/SamplePlugin.java
@@ -33,7 +33,7 @@ import java.util.Map;
*/
public class SamplePlugin implements Plugin, ParserStagePlugin {
- protected static boolean c_rendered = false;
+ protected static boolean c_rendered;
@Override
public String execute( final Context context, final Map< String, String > params ) {
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/providers/CounterProvider.java b/jspwiki-main/src/test/java/org/apache/wiki/providers/CounterProvider.java
index 0562cf6e8..65ec376a6 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/providers/CounterProvider.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/providers/CounterProvider.java
@@ -39,11 +39,11 @@ import java.util.Vector;
*/
public class CounterProvider implements PageProvider {
- public int m_getPageCalls = 0;
- public int m_pageExistsCalls = 0;
- public int m_getPageTextCalls = 0;
- public int m_getAllPagesCalls = 0;
- public int m_initCalls = 0;
+ public int m_getPageCalls;
+ public int m_pageExistsCalls;
+ public int m_getPageTextCalls;
+ public int m_getAllPagesCalls;
+ public int m_initCalls;
Page[] m_pages = new Page[0];
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/providers/VerySimpleProvider.java b/jspwiki-main/src/test/java/org/apache/wiki/providers/VerySimpleProvider.java
index 438048c6f..280b47a64 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/providers/VerySimpleProvider.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/providers/VerySimpleProvider.java
@@ -39,7 +39,7 @@ import java.util.Vector;
public class VerySimpleProvider implements PageProvider {
/** The last request is stored here. */
- public String m_latestReq = null;
+ public String m_latestReq;
/** The version number of the last request is stored here. */
public int m_latestVers = -123989;
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 41a95bb4e..ea985c42a 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
@@ -72,8 +72,8 @@ public class TestContainer {
private static final Logger log = LogManager.getLogger( TestContainer.class );
private static Context initCtx ;
- private static Resource userDB = null;
- private static Resource groupDB = null;
+ private static Resource userDB;
+ private static Resource groupDB;
private static final ContextHandlerCollection handlerCollection = new ContextHandlerCollection();
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/FormUtil.java b/jspwiki-util/src/main/java/org/apache/wiki/util/FormUtil.java
index 764f6baa8..3b17a86dc 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/FormUtil.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/FormUtil.java
@@ -97,7 +97,7 @@ public final class FormUtil
keyPrefix.isEmpty() )
return rval;
- String fullPrefix = null;
+ String fullPrefix;
if( keyPrefix.charAt( keyPrefix.length() - 1 ) == '.' )
fullPrefix = keyPrefix;
else
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 6980c406d..0c2e8ec96 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
@@ -90,7 +90,7 @@ public class TimedCounterList<T> extends AbstractList<T>
public int size()
{
m_lock.readLock().lock();
- int size = 0;
+ int size;
try
{
@@ -213,7 +213,7 @@ public class TimedCounterList<T> extends AbstractList<T>
public long getAddTime(final int index )
{
m_lock.readLock().lock();
- long res = 0;
+ long res;
try
{