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 2021/03/09 21:22:19 UTC
[jspwiki] branch master updated (b4f4a3b -> 61a17e9)
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git.
from b4f4a3b Moved documentation to jspwiki-wiki.a.o
new 3d1724a JSPWIKI-1144 - Minor performance improvement:
new 61a17e9 Use isEmpty().
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/java/org/apache/wiki/TranslationsCheck.java | 2 +-
.../src/main/java/org/apache/wiki/WikiBackgroundThread.java | 2 +-
jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java | 6 +++---
.../java/org/apache/wiki/attachment/AttachmentManager.java | 2 +-
.../java/org/apache/wiki/attachment/AttachmentServlet.java | 12 ++++++------
.../org/apache/wiki/attachment/DefaultAttachmentManager.java | 10 +++++-----
.../org/apache/wiki/auth/DefaultAuthenticationManager.java | 2 +-
.../src/main/java/org/apache/wiki/auth/SecurityVerifier.java | 4 ++--
.../src/main/java/org/apache/wiki/auth/SessionMonitor.java | 2 +-
.../src/main/java/org/apache/wiki/auth/acl/AclImpl.java | 2 +-
.../org/apache/wiki/auth/authorize/DefaultGroupManager.java | 6 +++---
.../src/main/java/org/apache/wiki/auth/authorize/Group.java | 2 +-
.../org/apache/wiki/auth/authorize/JDBCGroupDatabase.java | 2 +-
.../apache/wiki/auth/authorize/WebContainerAuthorizer.java | 4 ++--
.../org/apache/wiki/auth/authorize/XMLGroupDatabase.java | 2 +-
.../org/apache/wiki/auth/permissions/GroupPermission.java | 4 ++--
.../org/apache/wiki/auth/permissions/PagePermission.java | 4 ++--
.../org/apache/wiki/auth/permissions/PermissionFactory.java | 2 +-
.../org/apache/wiki/auth/permissions/WikiPermission.java | 2 +-
.../java/org/apache/wiki/auth/user/AbstractUserDatabase.java | 8 ++++----
.../java/org/apache/wiki/auth/user/JDBCUserDatabase.java | 2 +-
.../main/java/org/apache/wiki/auth/user/XMLUserDatabase.java | 10 +++++-----
.../java/org/apache/wiki/content/DefaultPageRenamer.java | 12 ++++++------
.../main/java/org/apache/wiki/diff/ExternalDiffProvider.java | 2 +-
.../java/org/apache/wiki/filters/DefaultFilterManager.java | 2 +-
.../main/java/org/apache/wiki/filters/ProfanityFilter.java | 2 +-
.../src/main/java/org/apache/wiki/filters/SpamFilter.java | 4 ++--
.../src/main/java/org/apache/wiki/forms/FormOutput.java | 2 +-
.../src/main/java/org/apache/wiki/forms/FormSet.java | 2 +-
.../apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java | 2 +-
.../main/java/org/apache/wiki/pages/DefaultPageManager.java | 10 +++++-----
.../src/main/java/org/apache/wiki/pages/PageSorter.java | 2 +-
.../org/apache/wiki/parser/CreoleToJSPWikiTranslator.java | 4 ++--
.../java/org/apache/wiki/parser/JSPWikiMarkupParser.java | 12 ++++++------
.../java/org/apache/wiki/parser/LinkParsingOperations.java | 4 ++--
.../src/main/java/org/apache/wiki/parser/MarkupParser.java | 2 +-
.../java/org/apache/wiki/plugin/AbstractReferralPlugin.java | 4 ++--
.../main/java/org/apache/wiki/plugin/BugReportHandler.java | 4 ++--
.../java/org/apache/wiki/plugin/DefaultPluginManager.java | 2 +-
jspwiki-main/src/main/java/org/apache/wiki/plugin/Image.java | 2 +-
jspwiki-main/src/main/java/org/apache/wiki/plugin/Note.java | 2 +-
.../src/main/java/org/apache/wiki/plugin/WeblogPlugin.java | 2 +-
.../java/org/apache/wiki/providers/AbstractFileProvider.java | 4 ++--
.../org/apache/wiki/providers/VersioningFileProvider.java | 2 +-
.../main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java | 2 +-
.../main/java/org/apache/wiki/rss/DefaultRSSGenerator.java | 2 +-
.../java/org/apache/wiki/search/DefaultSearchManager.java | 4 ++--
.../src/main/java/org/apache/wiki/tags/AuthorTag.java | 2 +-
.../java/org/apache/wiki/tags/CheckRequestContextTag.java | 2 +-
.../src/main/java/org/apache/wiki/tags/CookieTag.java | 2 +-
.../src/main/java/org/apache/wiki/tags/InsertDiffTag.java | 2 +-
jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java | 2 +-
.../main/java/org/apache/wiki/ui/DefaultCommandResolver.java | 4 ++--
.../main/java/org/apache/wiki/ui/DefaultEditorManager.java | 2 +-
jspwiki-main/src/main/java/org/apache/wiki/ui/Installer.java | 2 +-
.../org/apache/wiki/ui/admin/DefaultAdminBeanManager.java | 2 +-
.../main/java/org/apache/wiki/ui/admin/beans/UserBean.java | 2 +-
.../main/java/org/apache/wiki/url/DefaultURLConstructor.java | 2 +-
.../main/java/org/apache/wiki/url/ShortURLConstructor.java | 2 +-
.../java/org/apache/wiki/url/ShortViewURLConstructor.java | 2 +-
.../org/apache/wiki/variables/DefaultVariableManager.java | 2 +-
.../main/java/org/apache/wiki/workflow/DecisionQueue.java | 2 +-
.../org/apache/wiki/workflow/DefaultWorkflowManager.java | 2 +-
.../src/main/java/org/apache/wiki/workflow/Workflow.java | 2 +-
.../main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java | 2 +-
.../postprocessor/MetadataLinkNodePostProcessorState.java | 2 +-
.../src/main/java/org/apache/wiki/util/FormUtil.java | 4 ++--
.../src/main/java/org/apache/wiki/util/HttpUtil.java | 4 ++--
.../src/main/java/org/apache/wiki/util/MailUtil.java | 2 +-
.../src/main/java/org/apache/wiki/util/PropertiesUtils.java | 2 +-
.../src/main/java/org/apache/wiki/util/TextUtil.java | 8 ++++----
71 files changed, 122 insertions(+), 122 deletions(-)
[jspwiki] 02/02: Use isEmpty().
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 61a17e92a2bc9c6b9e5b1182937f7c584fe9589e
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Wed Jan 20 08:44:41 2021 +0100
Use isEmpty().
---
.../java/org/apache/wiki/attachment/AttachmentServlet.java | 10 +++++-----
.../org/apache/wiki/attachment/DefaultAttachmentManager.java | 4 ++--
.../org/apache/wiki/auth/DefaultAuthenticationManager.java | 2 +-
.../org/apache/wiki/auth/authorize/DefaultGroupManager.java | 2 +-
.../java/org/apache/wiki/auth/permissions/GroupPermission.java | 2 +-
.../java/org/apache/wiki/auth/permissions/PagePermission.java | 2 +-
.../org/apache/wiki/auth/permissions/PermissionFactory.java | 2 +-
.../java/org/apache/wiki/auth/user/AbstractUserDatabase.java | 6 +++---
.../main/java/org/apache/wiki/content/DefaultPageRenamer.java | 6 +++---
.../main/java/org/apache/wiki/diff/ExternalDiffProvider.java | 2 +-
.../src/main/java/org/apache/wiki/filters/ProfanityFilter.java | 2 +-
.../src/main/java/org/apache/wiki/filters/SpamFilter.java | 2 +-
.../src/main/java/org/apache/wiki/pages/PageSorter.java | 2 +-
.../main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java | 8 ++++----
.../src/main/java/org/apache/wiki/plugin/BugReportHandler.java | 2 +-
jspwiki-main/src/main/java/org/apache/wiki/plugin/Image.java | 2 +-
.../java/org/apache/wiki/providers/VersioningFileProvider.java | 2 +-
.../main/java/org/apache/wiki/search/DefaultSearchManager.java | 4 ++--
jspwiki-main/src/main/java/org/apache/wiki/tags/AuthorTag.java | 2 +-
.../main/java/org/apache/wiki/tags/CheckRequestContextTag.java | 2 +-
jspwiki-main/src/main/java/org/apache/wiki/tags/CookieTag.java | 2 +-
jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java | 2 +-
.../main/java/org/apache/wiki/ui/DefaultCommandResolver.java | 4 ++--
.../java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java | 2 +-
.../src/main/java/org/apache/wiki/ui/admin/beans/UserBean.java | 2 +-
.../main/java/org/apache/wiki/url/DefaultURLConstructor.java | 2 +-
.../src/main/java/org/apache/wiki/url/ShortURLConstructor.java | 2 +-
.../main/java/org/apache/wiki/url/ShortViewURLConstructor.java | 2 +-
.../java/org/apache/wiki/workflow/DefaultWorkflowManager.java | 2 +-
.../postprocessor/MetadataLinkNodePostProcessorState.java | 2 +-
jspwiki-util/src/main/java/org/apache/wiki/util/FormUtil.java | 2 +-
jspwiki-util/src/main/java/org/apache/wiki/util/HttpUtil.java | 2 +-
jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java | 2 +-
jspwiki-util/src/main/java/org/apache/wiki/util/TextUtil.java | 2 +-
34 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java
index a952b87..d36d832 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java
@@ -121,14 +121,14 @@ public class AttachmentServlet extends HttpServlet {
final String allowed = TextUtil.getStringProperty( props, AttachmentManager.PROP_ALLOWEDEXTENSIONS, null );
m_maxSize = TextUtil.getIntegerProperty( props, AttachmentManager.PROP_MAXSIZE, Integer.MAX_VALUE );
- if( allowed != null && allowed.length() > 0 ) {
+ if( allowed != null && !allowed.isEmpty() ) {
m_allowedPatterns = allowed.toLowerCase().split( "\\s" );
} else {
m_allowedPatterns = new String[ 0 ];
}
final String forbidden = TextUtil.getStringProperty( props, AttachmentManager.PROP_FORBIDDENEXTENSIONS,null );
- if( forbidden != null && forbidden.length() > 0 ) {
+ if( forbidden != null && !forbidden.isEmpty() ) {
m_forbiddenPatterns = forbidden.toLowerCase().split("\\s");
} else {
m_forbiddenPatterns = new String[0];
@@ -152,13 +152,13 @@ public class AttachmentServlet extends HttpServlet {
for( int i = 0; i < m_forbiddenPatterns.length; i++ )
{
- if( name.endsWith(m_forbiddenPatterns[i]) && m_forbiddenPatterns[i].length() > 0 )
+ if( name.endsWith(m_forbiddenPatterns[i]) && !m_forbiddenPatterns[i].isEmpty() )
return false;
}
for( int i = 0; i < m_allowedPatterns.length; i++ )
{
- if( name.endsWith(m_allowedPatterns[i]) && m_allowedPatterns[i].length() > 0 )
+ if( name.endsWith(m_allowedPatterns[i]) && !m_allowedPatterns[i].isEmpty() )
return true;
}
@@ -560,7 +560,7 @@ public class AttachmentServlet extends HttpServlet {
att.setAuthor( user.getName() );
}
- if( changenote != null && changenote.length() > 0 ) {
+ if( changenote != null && !changenote.isEmpty() ) {
att.setAttribute( Page.CHANGENOTE, changenote );
}
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 7b01c16..399b7aa 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
@@ -123,7 +123,7 @@ public class DefaultAttachmentManager implements AttachmentManager {
}
final String forceDownload = TextUtil.getStringProperty( props, PROP_FORCEDOWNLOAD, null );
- if( forceDownload != null && forceDownload.length() > 0 ) {
+ if( forceDownload != null && !forceDownload.isEmpty() ) {
m_forceDownloadPatterns = forceDownload.toLowerCase().split( "\\s" );
} else {
m_forceDownloadPatterns = new String[ 0 ];
@@ -231,7 +231,7 @@ public class DefaultAttachmentManager implements AttachmentManager {
}
for( final String forceDownloadPattern : m_forceDownloadPatterns ) {
- if( name.endsWith( forceDownloadPattern ) && forceDownloadPattern.length() > 0 ) {
+ if( name.endsWith( forceDownloadPattern ) && !forceDownloadPattern.isEmpty() ) {
return true;
}
}
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 4e536b8..5d329aa 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
@@ -379,7 +379,7 @@ public class DefaultAuthenticationManager implements AuthenticationManager {
if( propName.startsWith( PREFIX_LOGIN_MODULE_OPTIONS ) ) {
// Extract the option name and value
final String optionKey = propName.substring( PREFIX_LOGIN_MODULE_OPTIONS.length() ).trim();
- if( optionKey.length() > 0 ) {
+ if( !optionKey.isEmpty() ) {
final String optionValue = props.getProperty( propName );
// Make sure the key is unique before stashing the key/value pair
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/DefaultGroupManager.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/DefaultGroupManager.java
index 7301992..82c825b 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/DefaultGroupManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/DefaultGroupManager.java
@@ -367,7 +367,7 @@ public class DefaultGroupManager implements GroupManager, Authorizer, WikiEventL
final StringTokenizer tok = new StringTokenizer( memberLine, "\n" );
while( tok.hasMoreTokens() ) {
final String uid = tok.nextToken().trim();
- if( uid.length() > 0 ) {
+ if( !uid.isEmpty() ) {
members.add( uid );
}
}
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 1b13fa0..5bb0d73 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
@@ -157,7 +157,7 @@ public final class GroupPermission extends Permission implements Serializable
final String groupName;
if ( pathParams.length >= 2 )
{
- m_wiki = pathParams[0].length() > 0 ? pathParams[0] : null;
+ m_wiki = !pathParams[0].isEmpty() ? pathParams[0] : null;
groupName = pathParams[1];
}
else
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 9677d5f..b3b50c1 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
@@ -175,7 +175,7 @@ public final class PagePermission extends Permission implements Serializable
final String pageName;
if ( pathParams.length >= 2 )
{
- m_wiki = pathParams[0].length() > 0 ? pathParams[0] : null;
+ m_wiki = !pathParams[0].isEmpty() ? pathParams[0] : null;
pageName = pathParams[1];
}
else
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 a95d191..760c879 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
@@ -100,7 +100,7 @@ public final class PermissionFactory
if( perm == null )
{
- if( wiki.length() > 0 ) page = wiki+":"+page;
+ if( !wiki.isEmpty() ) page = wiki+":"+page;
perm = new PagePermission( page, actions );
synchronized( c_cache )
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java
index cffaed6..43f382d 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java
@@ -136,13 +136,13 @@ public abstract class AbstractUserDatabase implements UserDatabase {
public Principal[] getPrincipals( final String identifier ) throws NoSuchPrincipalException {
final UserProfile profile = findByLoginName( identifier );
final ArrayList< Principal > principals = new ArrayList<>();
- if( profile.getLoginName() != null && profile.getLoginName().length() > 0 ) {
+ if( profile.getLoginName() != null && !profile.getLoginName().isEmpty() ) {
principals.add( new WikiPrincipal( profile.getLoginName(), WikiPrincipal.LOGIN_NAME ) );
}
- if( profile.getFullname() != null && profile.getFullname().length() > 0 ) {
+ if( profile.getFullname() != null && !profile.getFullname().isEmpty() ) {
principals.add( new WikiPrincipal( profile.getFullname(), WikiPrincipal.FULL_NAME ) );
}
- if( profile.getWikiName() != null && profile.getWikiName().length() > 0 ) {
+ if( profile.getWikiName() != null && !profile.getWikiName().isEmpty() ) {
principals.add( new WikiPrincipal( profile.getWikiName(), WikiPrincipal.WIKI_NAME ) );
}
return principals.toArray( new Principal[0] );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/content/DefaultPageRenamer.java b/jspwiki-main/src/main/java/org/apache/wiki/content/DefaultPageRenamer.java
index 91a1d7a..faad5e1 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/content/DefaultPageRenamer.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/content/DefaultPageRenamer.java
@@ -267,7 +267,7 @@ public class DefaultPageRenamer implements PageRenamer {
charBefore = sourceText.charAt( matcher.start() - 1 );
}
- if( matcher.group(1).length() > 0 || charBefore == '~' || charBefore == '[' ) {
+ if( !matcher.group(1).isEmpty() || charBefore == '~' || charBefore == '[' ) {
// Found an escape character, so I am escaping.
sb.append( sourceText.substring( start, matcher.end() ) );
start = matcher.end();
@@ -292,10 +292,10 @@ public class DefaultPageRenamer implements PageRenamer {
//
sb.append( sourceText.substring( start, matcher.start() ) );
sb.append( "[" ).append( text );
- if( link.length() > 0 ) {
+ if( !link.isEmpty() ) {
sb.append( "|" ).append( link );
}
- if( attr.length() > 0 ) {
+ if( !attr.isEmpty() ) {
sb.append( "|" ).append( attr );
}
sb.append( "]" );
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 2cfa234..6e84dc1 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
@@ -161,7 +161,7 @@ public class ExternalDiffProvider implements DiffProvider {
while( (line = in.readLine()) != null ) {
stop = CSS_DIFF_CLOSE;
- if( line.length() > 0 ) {
+ if( !line.isEmpty() ) {
switch( line.charAt( 0 ) ) {
case DIFF_ADDED_SYMBOL:
start = CSS_DIFF_ADDED;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/filters/ProfanityFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/filters/ProfanityFilter.java
index 1070fd3..0d9912f 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/filters/ProfanityFilter.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/filters/ProfanityFilter.java
@@ -55,7 +55,7 @@ public class ProfanityFilter extends BasePageFilter {
String str;
while ( ( str = br.readLine() ) != null ) {
- if( str.length() > 0 && !str.startsWith( "#" ) ) { // allow comments on profanities file
+ if( !str.isEmpty() && !str.startsWith( "#" ) ) { // allow comments on profanities file
profs.add( str );
}
}
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 e28aabc..c355b13 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
@@ -597,7 +597,7 @@ public class SpamFilter extends BasePageFilter {
final HttpServletRequest request = context.getHttpRequest();
if( request != null ) {
final String unspam = request.getParameter( getBotFieldName() );
- if( unspam != null && unspam.length() > 0 ) {
+ if( unspam != null && !unspam.isEmpty() ) {
final String uid = log( context, REJECT, REASON_BOT_TRAP, change.toString() );
log.info( "SPAM:BotTrap (" + uid + "). Wildly behaving bot detected." );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/pages/PageSorter.java b/jspwiki-main/src/main/java/org/apache/wiki/pages/PageSorter.java
index 43df364..4ad1bd5 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/pages/PageSorter.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/pages/PageSorter.java
@@ -92,7 +92,7 @@ public class PageSorter implements Comparator< String > {
// Default is Java natural order
m_comparator = JavaNaturalComparator.DEFAULT_JAVA_COMPARATOR;
final String className = props.getProperty( PROP_PAGE_NAME_COMPARATOR );
- if( className != null && className.length() > 0 ) {
+ if( className != null && !className.isEmpty() ) {
try {
m_comparator = ( Comparator< String > )ClassUtil.findClass( "org.apache.wiki.util.comparators", className ).newInstance();
} catch( final Exception e ) {
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 c677b2c..4d266fb 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
@@ -1058,7 +1058,7 @@ public class JSPWikiMarkupParser extends MarkupParser {
// log.debug("SET name='"+name+"', value='"+val+"'.");
- if( name.length() > 0 && val.length() > 0 ) {
+ if( !name.isEmpty() && !val.isEmpty() ) {
val = m_engine.getManager( VariableManager.class ).expandVariables( m_context, val );
m_context.getPage().setAttribute( name, val );
}
@@ -1989,7 +1989,7 @@ public class JSPWikiMarkupParser extends MarkupParser {
//
final String eol = peekAheadLine();
- if( eol.trim().length() > 0 )
+ if( !eol.trim().isEmpty() )
{
// There is stuff after the class
@@ -2343,7 +2343,7 @@ public class JSPWikiMarkupParser extends MarkupParser {
//
final String nextLine = peekAheadLine();
if( nextLine.isEmpty() ||
- (nextLine.length() > 0 &&
+ (!nextLine.isEmpty() &&
!nextLine.startsWith("{{{") &&
!nextLine.startsWith("----") &&
!nextLine.startsWith("%%") &&
@@ -2557,7 +2557,7 @@ public class JSPWikiMarkupParser extends MarkupParser {
//
// Make sure there are no empty <p/> tags added.
//
- if( newel.getTextTrim().length() > 0 || !newel.getChildren().isEmpty() )
+ if( !newel.getTextTrim().isEmpty() || !newel.getChildren().isEmpty() )
rootElement.addContent(idxOfFirstContent, newel);
}
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/BugReportHandler.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/BugReportHandler.java
index 28c5b43..e3bd1e1 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/BugReportHandler.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/BugReportHandler.java
@@ -129,7 +129,7 @@ public class BugReportHandler implements Plugin {
) ) {
// If no mapping has been defined, just ignore it.
final String head = mappings.getProperty( entry.getKey(), entry.getKey() );
- if( head.length() > 0 ) {
+ if( !head.isEmpty() ) {
out.println( "|" + head + "|" + entry.getValue() );
}
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/Image.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/Image.java
index eae9e67..ca353fa 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/Image.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/Image.java
@@ -214,7 +214,7 @@ public class Image implements Plugin {
{
return true;
}
- else if( s.length() > 0 ) // check [a-zA-z]
+ else if( !s.isEmpty() ) // check [a-zA-z]
{
final char c = s.charAt(0);
return Character.isLowerCase(c) || Character.isUpperCase(c);
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java
index 4cbd644..0355eca 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java
@@ -522,7 +522,7 @@ public class VersioningFileProvider extends AbstractFileProvider {
props.load( in );
final String originalAuthor = props.getProperty( Page.AUTHOR );
- if ( originalAuthor.length() > 0 ) {
+ if ( !originalAuthor.isEmpty() ) {
// simulate original author as if already versioned but put non-versioned property in special cache too
props.setProperty( "1.author", originalAuthor );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java b/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java
index 8ac4c81..dbefafa 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/search/DefaultSearchManager.java
@@ -146,7 +146,7 @@ public class DefaultSearchManager extends BasePageFilter implements SearchManage
final StopWatch sw = new StopWatch();
sw.start();
final List< String > list = new ArrayList<>( maxLength );
- if( wikiName.length() > 0 ) {
+ if( !wikiName.isEmpty() ) {
// split pagename and attachment filename
String filename = "";
final int pos = wikiName.indexOf("/");
@@ -189,7 +189,7 @@ public class DefaultSearchManager extends BasePageFilter implements SearchManage
sw.start();
final List< Map< String, Object > > list = new ArrayList<>( maxLength );
- if( searchString.length() > 0 ) {
+ if( !searchString.isEmpty() ) {
try {
final Collection< SearchResult > c;
if( m_searchProvider instanceof LuceneSearchProvider ) {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/AuthorTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/AuthorTag.java
index 1018b1e..4577223 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/AuthorTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/AuthorTag.java
@@ -54,7 +54,7 @@ public class AuthorTag extends WikiTagBase {
final Page page = m_wikiContext.getPage();
String author = page.getAuthor();
- if( author != null && author.length() > 0 ) {
+ if( author != null && !author.isEmpty() ) {
author = TextUtil.replaceEntities(author);
if( engine.getManager( PageManager.class ).wikiPageExists(author) && !( "plain".equalsIgnoreCase( m_format ) ) ) {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckRequestContextTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckRequestContextTag.java
index 207343b..4c492a5 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckRequestContextTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckRequestContextTag.java
@@ -85,7 +85,7 @@ public class CheckRequestContextTag
final String checkedCtx = m_contextList[i];
- if( checkedCtx.length() > 0 )
+ if( !checkedCtx.isEmpty() )
{
if( checkedCtx.charAt(0) == '!' )
{
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 272c1ab..7a46ef5 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
@@ -337,7 +337,7 @@ public class CookieTag
for( int i = 0; i < nvps.length; i++ ) {
final String nvp = decode( nvps[i] );
final String[] nv = nvp.split( "=" );
- if( nv[0] != null && nv[0].trim().length() > 0 )
+ if( nv[0] != null && !nv[0].trim().isEmpty() )
{
rval.put( nv[0], nv[1] );
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java
index adbac32..0149ef0 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java
@@ -233,7 +233,7 @@ public class LinkTag extends WikiLinkTag implements ParamHandler, BodyTag {
url = makeBasicURL( m_context, reallink, parms );
}
}
- } else if( m_pageName != null && m_pageName.length() > 0 ) {
+ } else if( m_pageName != null && !m_pageName.isEmpty() ) {
final Page p = engine.getManager( PageManager.class ).getPage( m_pageName );
String parms = (m_version != null) ? "version="+getVersion() : null;
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultCommandResolver.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultCommandResolver.java
index 6d67aaa..86d9eff 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultCommandResolver.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultCommandResolver.java
@@ -164,7 +164,7 @@ public final class DefaultCommandResolver implements CommandResolver {
if( command instanceof GroupCommand ) {
String groupName = request.getParameter( "group" );
groupName = TextUtil.replaceEntities( groupName );
- if ( groupName != null && groupName.length() > 0 ) {
+ if ( groupName != null && !groupName.isEmpty() ) {
final GroupPrincipal group = new GroupPrincipal( groupName );
return command.targetedCommand( group );
}
@@ -255,7 +255,7 @@ public final class DefaultCommandResolver implements CommandResolver {
}
// Still haven't found a matching command? Ok, see if we match against our standard list of JSPs
- if ( jsp.length() > 0 && JSPS.containsKey( jsp ) ) {
+ if ( !jsp.isEmpty() && JSPS.containsKey( jsp ) ) {
return JSPS.get( jsp );
}
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 e424dc3..cc1dbfc 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
@@ -142,7 +142,7 @@ public class DefaultAdminBeanManager implements WikiEventListener, AdminBeanMana
for( final WikiModuleInfo wikiModuleInfo : c ) {
final String abname = wikiModuleInfo.getAdminBeanClass();
try {
- if( abname != null && abname.length() > 0 ) {
+ if( abname != null && !abname.isEmpty() ) {
final Class< ? > abclass = Class.forName( abname );
final AdminBean ab = ( AdminBean )abclass.newInstance();
registerAdminBean( ab );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/UserBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/UserBean.java
index a7bfa05..0733206 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/UserBean.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/UserBean.java
@@ -99,7 +99,7 @@ public class UserBean extends SimpleAdminBean {
p.setEmail( email );
p.setFullname( fullname );
- if( password != null && password.length() > 0 ) {
+ if( password != null && !password.isEmpty() ) {
p.setPassword( password );
}
p.setLoginName( loginname );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java b/jspwiki-main/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java
index 04a1ec8..5d77e6e 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/url/DefaultURLConstructor.java
@@ -126,7 +126,7 @@ public class DefaultURLConstructor implements URLConstructor {
*/
@Override
public String makeURL( final String context, final String name, String parameters ) {
- if( parameters != null && parameters.length() > 0 ) {
+ if( parameters != null && !parameters.isEmpty() ) {
if( context.equals( ContextEnum.PAGE_ATTACH.getRequestContext() ) ) {
parameters = "?" + parameters;
} else if( context.equals( ContextEnum.PAGE_NONE.getRequestContext() ) ) {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/url/ShortURLConstructor.java b/jspwiki-main/src/main/java/org/apache/wiki/url/ShortURLConstructor.java
index de57f1e..eef9c61 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/url/ShortURLConstructor.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/url/ShortURLConstructor.java
@@ -123,7 +123,7 @@ public class ShortURLConstructor extends DefaultURLConstructor {
*/
@Override
public String makeURL( final String context, final String name, String parameters ) {
- if( parameters != null && parameters.length() > 0 ) {
+ if( parameters != null && !parameters.isEmpty() ) {
if( context.equals( ContextEnum.PAGE_ATTACH.getRequestContext() ) || context.equals( ContextEnum.PAGE_VIEW.getRequestContext() ) ) {
parameters = "?" + parameters;
} else if( context.equals(ContextEnum.PAGE_NONE.getRequestContext()) ) {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/url/ShortViewURLConstructor.java b/jspwiki-main/src/main/java/org/apache/wiki/url/ShortViewURLConstructor.java
index 659446f..0207ea4 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/url/ShortViewURLConstructor.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/url/ShortViewURLConstructor.java
@@ -55,7 +55,7 @@ public class ShortViewURLConstructor extends ShortURLConstructor {
*/
@Override
public String makeURL( final String context, final String name, String parameters ) {
- if( parameters != null && parameters.length() > 0 ) {
+ if( parameters != null && !parameters.isEmpty() ) {
if( context.equals( ContextEnum.PAGE_ATTACH.getRequestContext() ) || context.equals( ContextEnum.PAGE_VIEW.getRequestContext() ) || name == null ) {
parameters = "?" + parameters;
} else if( context.equals(ContextEnum.PAGE_NONE.getRequestContext()) ) {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/workflow/DefaultWorkflowManager.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/DefaultWorkflowManager.java
index fe51041..1a462a0 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/workflow/DefaultWorkflowManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/workflow/DefaultWorkflowManager.java
@@ -112,7 +112,7 @@ public class DefaultWorkflowManager implements WorkflowManager {
if( key.length() > 0 ) {
// Only use non-null/non-blank approvers
final String approver = props.getProperty( prop );
- if( approver != null && approver.length() > 0 ) {
+ if( approver != null && !approver.isEmpty() ) {
m_approvers.put( key, new UnresolvedPrincipal( approver ) );
}
}
diff --git a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/MetadataLinkNodePostProcessorState.java b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/MetadataLinkNodePostProcessorState.java
index ee955ed..e667ff4 100755
--- a/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/MetadataLinkNodePostProcessorState.java
+++ b/jspwiki-markdown/src/main/java/org/apache/wiki/markdown/extensions/jspwikilinks/postprocessor/MetadataLinkNodePostProcessorState.java
@@ -71,7 +71,7 @@ public class MetadataLinkNodePostProcessorState implements NodePostProcessorStat
LOG.debug( "page=" + wikiContext.getRealPage().getName() + " SET name='" + name + "', value='" + val + "'" );
- if( name.length() > 0 && val.length() > 0 ) {
+ if( !name.isEmpty() && !val.isEmpty() ) {
val = wikiContext.getEngine().getManager( VariableManager.class ).expandVariables( wikiContext, val );
wikiContext.getPage().setAttribute( name, val );
link.unlink();
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 94b16af..764f6ba 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
@@ -162,7 +162,7 @@ public final class FormUtil
{
for( int i = 0; i < values.length; i++ )
{
- if( values[i] != null && values[i].length() > 0 )
+ if( values[i] != null && !values[i].isEmpty() )
{
params.put( realName + "." + i, values[i] );
}
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/HttpUtil.java b/jspwiki-util/src/main/java/org/apache/wiki/util/HttpUtil.java
index 5cd6680..ec2a3dc 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/HttpUtil.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/HttpUtil.java
@@ -179,7 +179,7 @@ public final class HttpUtil {
}
static boolean notBeginningWithHttpOrHttps( final String uri ) {
- return uri.length() > 0 && !( uri.startsWith("http://" ) || uri.startsWith( "https://" ) );
+ return !uri.isEmpty() && !( uri.startsWith("http://" ) || uri.startsWith( "https://" ) );
}
/**
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java b/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java
index 146c609..7cc89f4 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/MailUtil.java
@@ -395,7 +395,7 @@ public final class MailUtil {
final String conntimeout = props.getProperty( PROP_MAIL_CONNECTION_TIMEOUT, DEFAULT_MAIL_CONN_TIMEOUT );
final boolean starttls = TextUtil.getBooleanProperty( props, PROP_MAIL_STARTTLS, true);
- final boolean useAuthentication = account != null && account.length() > 0;
+ final boolean useAuthentication = account != null && !account.isEmpty();
final Properties mailProps = new Properties();
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/TextUtil.java b/jspwiki-util/src/main/java/org/apache/wiki/util/TextUtil.java
index f564556..d7bd856 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/TextUtil.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/TextUtil.java
@@ -686,7 +686,7 @@ public final class TextUtil {
}
// The first section does not get the "----"
- return pagedata.length() > 0 ? tags + 1 : 0;
+ return !pagedata.isEmpty() ? tags + 1 : 0;
}
/**
[jspwiki] 01/02: JSPWIKI-1144 - Minor performance improvement:
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 3d1724a4436e9ce3fb663bd90525ba58d51912ba
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Mon Jan 18 11:41:17 2021 +0100
JSPWIKI-1144 - Minor performance improvement:
* Add final on private variable --> just try to make all class/var read-only
* Remove Redundant initializer
* Use isEmpty() instead length()
* Avoid use pre-size array
---
.../src/main/java/org/apache/wiki/TranslationsCheck.java | 2 +-
.../src/main/java/org/apache/wiki/WikiBackgroundThread.java | 2 +-
jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java | 6 +++---
.../java/org/apache/wiki/attachment/AttachmentManager.java | 2 +-
.../java/org/apache/wiki/attachment/AttachmentServlet.java | 2 +-
.../org/apache/wiki/attachment/DefaultAttachmentManager.java | 6 +++---
.../src/main/java/org/apache/wiki/auth/SecurityVerifier.java | 4 ++--
.../src/main/java/org/apache/wiki/auth/SessionMonitor.java | 2 +-
.../src/main/java/org/apache/wiki/auth/acl/AclImpl.java | 2 +-
.../org/apache/wiki/auth/authorize/DefaultGroupManager.java | 4 ++--
.../src/main/java/org/apache/wiki/auth/authorize/Group.java | 2 +-
.../java/org/apache/wiki/auth/authorize/JDBCGroupDatabase.java | 2 +-
.../org/apache/wiki/auth/authorize/WebContainerAuthorizer.java | 4 ++--
.../java/org/apache/wiki/auth/authorize/XMLGroupDatabase.java | 2 +-
.../java/org/apache/wiki/auth/permissions/GroupPermission.java | 2 +-
.../java/org/apache/wiki/auth/permissions/PagePermission.java | 2 +-
.../java/org/apache/wiki/auth/permissions/WikiPermission.java | 2 +-
.../java/org/apache/wiki/auth/user/AbstractUserDatabase.java | 2 +-
.../main/java/org/apache/wiki/auth/user/JDBCUserDatabase.java | 2 +-
.../main/java/org/apache/wiki/auth/user/XMLUserDatabase.java | 10 +++++-----
.../main/java/org/apache/wiki/content/DefaultPageRenamer.java | 6 +++---
.../java/org/apache/wiki/filters/DefaultFilterManager.java | 2 +-
.../src/main/java/org/apache/wiki/filters/SpamFilter.java | 2 +-
.../src/main/java/org/apache/wiki/forms/FormOutput.java | 2 +-
jspwiki-main/src/main/java/org/apache/wiki/forms/FormSet.java | 2 +-
.../apache/wiki/htmltowiki/XHtmlElementToWikiTranslator.java | 2 +-
.../main/java/org/apache/wiki/pages/DefaultPageManager.java | 10 +++++-----
.../java/org/apache/wiki/parser/CreoleToJSPWikiTranslator.java | 4 ++--
.../main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java | 4 ++--
.../java/org/apache/wiki/parser/LinkParsingOperations.java | 4 ++--
.../src/main/java/org/apache/wiki/parser/MarkupParser.java | 2 +-
.../java/org/apache/wiki/plugin/AbstractReferralPlugin.java | 4 ++--
.../src/main/java/org/apache/wiki/plugin/BugReportHandler.java | 2 +-
.../main/java/org/apache/wiki/plugin/DefaultPluginManager.java | 2 +-
jspwiki-main/src/main/java/org/apache/wiki/plugin/Note.java | 2 +-
.../src/main/java/org/apache/wiki/plugin/WeblogPlugin.java | 2 +-
.../java/org/apache/wiki/providers/AbstractFileProvider.java | 4 ++--
.../src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java | 2 +-
.../src/main/java/org/apache/wiki/rss/DefaultRSSGenerator.java | 2 +-
.../src/main/java/org/apache/wiki/tags/InsertDiffTag.java | 2 +-
.../src/main/java/org/apache/wiki/ui/DefaultEditorManager.java | 2 +-
jspwiki-main/src/main/java/org/apache/wiki/ui/Installer.java | 2 +-
.../java/org/apache/wiki/variables/DefaultVariableManager.java | 2 +-
.../src/main/java/org/apache/wiki/workflow/DecisionQueue.java | 2 +-
.../src/main/java/org/apache/wiki/workflow/Workflow.java | 2 +-
.../main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java | 2 +-
jspwiki-util/src/main/java/org/apache/wiki/util/FormUtil.java | 2 +-
jspwiki-util/src/main/java/org/apache/wiki/util/HttpUtil.java | 2 +-
.../src/main/java/org/apache/wiki/util/PropertiesUtils.java | 2 +-
jspwiki-util/src/main/java/org/apache/wiki/util/TextUtil.java | 6 +++---
50 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/TranslationsCheck.java b/jspwiki-main/src/main/java/org/apache/wiki/TranslationsCheck.java
index 74c4545..b04cbda 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/TranslationsCheck.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/TranslationsCheck.java
@@ -74,7 +74,7 @@ public class TranslationsCheck {
}
if( "site".equals( translations.suffix ) ) {
- StringBuilder site = new StringBuilder();
+ final StringBuilder site = new StringBuilder();
for( int i = 0; i < LANGS.length; i++ ) {
translations.suffix = LANGS[ i ];
site.append(translations.check(i));
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiBackgroundThread.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiBackgroundThread.java
index 5c0ba4f..a290da7 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiBackgroundThread.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiBackgroundThread.java
@@ -33,7 +33,7 @@ import org.apache.wiki.event.WikiEventListener;
public abstract class WikiBackgroundThread extends Thread implements WikiEventListener {
private static final Logger LOG = Logger.getLogger( WikiBackgroundThread.class );
- private volatile boolean m_killMe = false;
+ private volatile boolean m_killMe;
private final Engine m_engine;
private final int m_interval;
private static final long POLLING_INTERVAL = 1_000L;
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 c2e4199..e2b9040 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java
@@ -196,7 +196,7 @@ public final class WikiSession implements Session {
if( messages == null || messages.size() == 0 ) {
return new String[ 0 ];
}
- return messages.toArray( new String[ messages.size() ] );
+ return messages.toArray( new String[0] );
}
/** {@inheritDoc} */
@@ -211,7 +211,7 @@ public final class WikiSession implements Session {
}
}
- return principals.toArray( new Principal[ principals.size() ] );
+ return principals.toArray( new Principal[0] );
}
/** {@inheritDoc} */
@@ -226,7 +226,7 @@ public final class WikiSession implements Session {
roles.addAll( m_subject.getPrincipals( GroupPrincipal.class ) );
// Return a defensive copy
- final Principal[] roleArray = roles.toArray( new Principal[ roles.size() ] );
+ final Principal[] roleArray = roles.toArray( new Principal[0] );
Arrays.sort( roleArray, WikiPrincipal.COMPARATOR );
return roleArray;
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentManager.java b/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentManager.java
index c22b695..76cc34d 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentManager.java
@@ -287,7 +287,7 @@ public interface AttachmentManager {
* @throws WikiException If the filename is not legal (e.g. empty)
*/
static String validateFileName( String filename ) throws WikiException {
- if( filename == null || filename.trim().length() == 0 ) {
+ if( filename == null || filename.trim().isEmpty() ) {
Logger.getLogger( AttachmentManager.class ).error( "Empty file name given." );
// the caller should catch the exception and use the exception text as an i18n key
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java
index 0186ac9..a952b87 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/attachment/AttachmentServlet.java
@@ -146,7 +146,7 @@ public class AttachmentServlet extends HttpServlet {
private boolean isTypeAllowed( String name )
{
- if( name == null || name.length() == 0 ) return false;
+ if( name == null || name.isEmpty() ) return false;
name = name.toLowerCase();
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 78e4347..7b01c16 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
@@ -177,7 +177,7 @@ public class DefaultAttachmentManager implements AttachmentManager {
attachmentname = attachmentname.substring( cutpt + 1 );
// If we for some reason have an empty parent page name; this can't be an attachment
- if( parentPage.length() == 0 ) {
+ if( parentPage.isEmpty() ) {
return null;
}
@@ -192,7 +192,7 @@ public class DefaultAttachmentManager implements AttachmentManager {
}
// If the page cannot be determined, we cannot possibly find the attachments.
- if( currentPage == null || currentPage.getName().length() == 0 ) {
+ if( currentPage == null || currentPage.getName().isEmpty() ) {
return null;
}
@@ -221,7 +221,7 @@ public class DefaultAttachmentManager implements AttachmentManager {
/** {@inheritDoc} */
@Override
public boolean forceDownload( String name ) {
- if( name == null || name.length() == 0 ) {
+ if( name == null || name.isEmpty() ) {
return false;
}
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 6abbbbb..beb6378 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
@@ -551,7 +551,7 @@ public final class SecurityVerifier {
protected void verifyJaas() {
// Verify that the specified JAAS moduie corresponds to a class we can load successfully.
final String jaasClass = m_engine.getWikiProperties().getProperty( AuthenticationManager.PROP_LOGIN_MODULE );
- if( jaasClass == null || jaasClass.length() == 0 ) {
+ if( jaasClass == null || jaasClass.isEmpty() ) {
m_session.addMessage( ERROR_JAAS, "The value of the '" + AuthenticationManager.PROP_LOGIN_MODULE
+ "' property was null or blank. This is a fatal error. This value should be set to a valid LoginModule implementation "
+ "on the classpath." );
@@ -695,7 +695,7 @@ public final class SecurityVerifier {
for ( final ProtectionDomain domain : domains ) {
principals.addAll(Arrays.asList(domain.getPrincipals()));
}
- m_policyPrincipals = principals.toArray( new Principal[principals.size()] );
+ m_policyPrincipals = principals.toArray( new Principal[0] );
} catch( final IOException e ) {
m_session.addMessage( ERROR_POLICY, e.getMessage() );
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/SessionMonitor.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/SessionMonitor.java
index 126a377..a0ec042 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/SessionMonitor.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/SessionMonitor.java
@@ -229,7 +229,7 @@ public class SessionMonitor implements HttpSessionListener {
principals.add( session.getUserPrincipal() );
}
}
- final Principal[] p = principals.toArray( new Principal[ principals.size() ] );
+ final Principal[] p = principals.toArray( new Principal[0] );
Arrays.sort( p, m_comparator );
return p;
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/AclImpl.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/AclImpl.java
index 4ba1d62..b5388e7 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/AclImpl.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/acl/AclImpl.java
@@ -60,7 +60,7 @@ public class AclImpl implements Acl, Serializable {
}
}
}
- return principals.toArray( new Principal[ principals.size() ] );
+ return principals.toArray( new Principal[0] );
}
private boolean hasEntry( final AclEntry entry ) {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/DefaultGroupManager.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/DefaultGroupManager.java
index 642fc43..7301992 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/DefaultGroupManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/DefaultGroupManager.java
@@ -143,7 +143,7 @@ public class DefaultGroupManager implements GroupManager, Authorizer, WikiEventL
/** {@inheritDoc} */
@Override
public Principal[] getRoles() {
- return m_groups.keySet().toArray( new Principal[ m_groups.size() ] );
+ return m_groups.keySet().toArray( new Principal[0] );
}
/** {@inheritDoc} */
@@ -372,7 +372,7 @@ public class DefaultGroupManager implements GroupManager, Authorizer, WikiEventL
}
}
}
- return members.toArray( new String[ members.size() ] );
+ return members.toArray( new String[0] );
}
// events processing .......................................................
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/Group.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/Group.java
index d9ccbcd..2fd053d 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/Group.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/Group.java
@@ -241,7 +241,7 @@ public class Group {
* @return the members
*/
public Principal[] members() {
- return m_members.toArray( new Principal[ m_members.size() ] );
+ return m_members.toArray( new Principal[0] );
}
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/JDBCGroupDatabase.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/JDBCGroupDatabase.java
index 3f87c99..f854ec8 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/JDBCGroupDatabase.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/JDBCGroupDatabase.java
@@ -334,7 +334,7 @@ public class JDBCGroupDatabase implements GroupDatabase {
closeQuietly( conn, ps, rs );
}
- return groups.toArray( new Group[groups.size()] );
+ return groups.toArray( new Group[0] );
}
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java
index 099fb19..43c5a4c 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/authorize/WebContainerAuthorizer.java
@@ -120,7 +120,7 @@ public class WebContainerAuthorizer implements WebAuthorizer {
}
if( m_containerRoles.length > 0 ) {
- StringBuilder roles = new StringBuilder();
+ final StringBuilder roles = new StringBuilder();
for( final Role containerRole : m_containerRoles ) {
roles.append(containerRole).append(" ");
}
@@ -327,7 +327,7 @@ public class WebContainerAuthorizer implements WebAuthorizer {
roles.add( new Role( role ) );
}
- return roles.toArray( new Role[roles.size()] );
+ return roles.toArray( new Role[0] );
}
/**
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 5d5ac51..5742e6c 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
@@ -151,7 +151,7 @@ public class XMLGroupDatabase implements GroupDatabase {
{
buildDOM();
final Collection<Group> groups = m_groups.values();
- return groups.toArray( new Group[groups.size()] );
+ return groups.toArray( new Group[0] );
}
/**
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 82587b3..1b13fa0 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
@@ -348,7 +348,7 @@ public final class GroupPermission extends Permission implements Serializable
*/
protected static int createMask( final String actions )
{
- if ( actions == null || actions.length() == 0 )
+ if ( actions == null || actions.isEmpty() )
{
throw new IllegalArgumentException( "Actions cannot be blank or null" );
}
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 cad6624..9677d5f 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
@@ -432,7 +432,7 @@ public final class PagePermission extends Permission implements Serializable
*/
protected static int createMask( final String actions )
{
- if ( actions == null || actions.length() == 0 )
+ if ( actions == null || actions.isEmpty() )
{
throw new IllegalArgumentException( "Actions cannot be blank or null" );
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/WikiPermission.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/WikiPermission.java
index e54f07e..f801930 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/WikiPermission.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/permissions/WikiPermission.java
@@ -232,7 +232,7 @@ public final class WikiPermission extends Permission implements Serializable
*/
protected static int createMask(final String actions )
{
- if ( actions == null || actions.length() == 0 )
+ if ( actions == null || actions.isEmpty() )
{
throw new IllegalArgumentException( "Actions cannot be blank or null" );
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java
index e4d79da..cffaed6 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/AbstractUserDatabase.java
@@ -145,7 +145,7 @@ public abstract class AbstractUserDatabase implements UserDatabase {
if( profile.getWikiName() != null && profile.getWikiName().length() > 0 ) {
principals.add( new WikiPrincipal( profile.getWikiName(), WikiPrincipal.WIKI_NAME ) );
}
- return principals.toArray( new Principal[ principals.size() ] );
+ return principals.toArray( new Principal[0] );
}
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/JDBCUserDatabase.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/JDBCUserDatabase.java
index a7b9d84..a9ecf6c 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/JDBCUserDatabase.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/JDBCUserDatabase.java
@@ -407,7 +407,7 @@ public class JDBCUserDatabase extends AbstractUserDatabase {
throw new WikiSecurityException( e.getMessage(), e );
}
- return principals.toArray( new Principal[principals.size()] );
+ return principals.toArray( new Principal[0] );
}
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/XMLUserDatabase.java b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/XMLUserDatabase.java
index 4a292fe..3fa5c62 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/auth/user/XMLUserDatabase.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/auth/user/XMLUserDatabase.java
@@ -166,7 +166,7 @@ public class XMLUserDatabase extends AbstractUserDatabase {
principals.add( principal );
}
}
- return principals.toArray( new Principal[principals.size()] );
+ return principals.toArray( new Principal[0] );
}
/** {@inheritDoc} */
@@ -476,7 +476,7 @@ public class XMLUserDatabase extends AbstractUserDatabase {
// Parse basic attributes
profile.setUid( user.getAttribute( UID ) );
- if( profile.getUid() == null || profile.getUid().length() == 0 ) {
+ if( profile.getUid() == null || profile.getUid().isEmpty() ) {
profile.setUid( generateUid( this ) );
}
profile.setLoginName( user.getAttribute( LOGIN_NAME ) );
@@ -492,7 +492,7 @@ public class XMLUserDatabase extends AbstractUserDatabase {
// Is the profile locked?
final String lockExpiry = user.getAttribute( LOCK_EXPIRY );
- if( lockExpiry == null || lockExpiry.length() == 0 ) {
+ if( lockExpiry == null || lockExpiry.isEmpty() ) {
profile.setLockExpiry( null );
} else {
profile.setLockExpiry( new Date( Long.parseLong( lockExpiry ) ) );
@@ -524,7 +524,7 @@ public class XMLUserDatabase extends AbstractUserDatabase {
* @return the text nodes that are immediate children of the base element, concatenated together
*/
private String extractText( final Element element ) {
- StringBuilder text = new StringBuilder();
+ final StringBuilder text = new StringBuilder();
if( element.getChildNodes().getLength() > 0 ) {
final NodeList children = element.getChildNodes();
for( int k = 0; k < children.getLength(); k++ ) {
@@ -574,7 +574,7 @@ public class XMLUserDatabase extends AbstractUserDatabase {
// Sanitize UID (and generate a new one if one does not exist)
String uid = user.getAttribute( UID ).trim();
- if( uid == null || uid.length() == 0 || "-1".equals( uid ) ) {
+ if( uid == null || uid.isEmpty() || "-1".equals( uid ) ) {
uid = String.valueOf( generateUid( this ) );
user.setAttribute( UID, uid );
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/content/DefaultPageRenamer.java b/jspwiki-main/src/main/java/org/apache/wiki/content/DefaultPageRenamer.java
index 63aae73..91a1d7a 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/content/DefaultPageRenamer.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/content/DefaultPageRenamer.java
@@ -67,10 +67,10 @@ public class DefaultPageRenamer implements PageRenamer {
@Override
public String renamePage( final Context context, final String renameFrom, final String renameTo, final boolean changeReferrers ) throws WikiException {
// Sanity checks first
- if( renameFrom == null || renameFrom.length() == 0 ) {
+ if( renameFrom == null || renameFrom.isEmpty() ) {
throw new WikiException( "From name may not be null or empty" );
}
- if( renameTo == null || renameTo.length() == 0 ) {
+ if( renameTo == null || renameTo.isEmpty() ) {
throw new WikiException( "To name may not be null or empty" );
}
@@ -278,7 +278,7 @@ public class DefaultPageRenamer implements PageRenamer {
String link = matcher.group(4);
final String attr = matcher.group(6);
- if( link.length() == 0 ) {
+ if( link.isEmpty() ) {
text = replaceSingleLink( context, text, from, to );
} else {
link = replaceSingleLink( context, link, from, to );
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 e802d15..e2d048b 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
@@ -402,7 +402,7 @@ public class DefaultFilterManager extends BaseModuleManager implements FilterMan
}
protected static PageFilterInfo newInstance( final String className, final Element pluginEl ) {
- if( className == null || className.length() == 0 ) {
+ if( className == null || className.isEmpty() ) {
return null;
}
final PageFilterInfo info = new PageFilterInfo( className );
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 0405a79..e28aabc 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
@@ -396,7 +396,7 @@ public class SpamFilter extends BasePageFilter {
String line;
while( (line = in.readLine() ) != null ) {
line = line.trim();
- if( line.length() == 0 ) continue; // Empty line
+ if( line.isEmpty() ) continue; // Empty line
if( line.startsWith("#") ) continue; // It's a comment
int ws = line.indexOf( ' ' );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/forms/FormOutput.java b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormOutput.java
index 0816408..119a266 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/forms/FormOutput.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormOutput.java
@@ -81,7 +81,7 @@ public class FormOutput extends FormElement {
}
final String handler = params.get( PARAM_HANDLER );
- if( handler == null || handler.length() == 0 ) {
+ if( handler == null || handler.isEmpty() ) {
// Need to print out an error here as this form is misconfigured
return "<p class=\"error\">" + MessageFormat.format( rb.getString( "formoutput.missingargument" ), PARAM_HANDLER ) + "</p>";
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/forms/FormSet.java b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormSet.java
index 7ac24f7..b9eebea 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/forms/FormSet.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/forms/FormSet.java
@@ -64,7 +64,7 @@ public class FormSet implements Plugin {
@Override
public String execute( final Context ctx, final Map< String, String > params ) throws PluginException {
final String formName = params.get( FormElement.PARAM_FORM );
- if( formName == null || formName.trim().length() == 0 ) {
+ if( formName == null || formName.trim().isEmpty() ) {
return "";
}
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 8f8029e..a2f3990 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
@@ -765,7 +765,7 @@ public class XHtmlElementToWikiTranslator
return null;
}
final String s = e.getText();
- return s == null ? null : ( s.replaceAll( "\\s", "" ).length() == 0 ? null : s );
+ return s == null ? null : ( s.replaceAll( "\\s", "" ).isEmpty() ? null : s );
}
private String propsToStyleString( final Map< Object, Object > styleProps ) {
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 ed8e290..6830d8b 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
@@ -172,7 +172,7 @@ public class DefaultPageManager implements PageManager {
*/
@Override
public String getPageText( final String pageName, final int version ) throws ProviderException {
- if (pageName == null || pageName.length() == 0) {
+ if (pageName == null || pageName.isEmpty()) {
throw new ProviderException( "Illegal page name" );
}
String text;
@@ -287,7 +287,7 @@ public class DefaultPageManager implements PageManager {
*/
@Override
public void putPageText( final Page page, final String content ) throws ProviderException {
- if (page == null || page.getName() == null || page.getName().length() == 0) {
+ if (page == null || page.getName() == null || page.getName().isEmpty()) {
throw new ProviderException("Illegal page name");
}
@@ -394,7 +394,7 @@ public class DefaultPageManager implements PageManager {
*/
@Override
public Page getPageInfo( final String pageName, final int version) throws ProviderException {
- if( pageName == null || pageName.length() == 0 ) {
+ if( pageName == null || pageName.isEmpty() ) {
throw new ProviderException( "Illegal page name '" + pageName + "'" );
}
@@ -496,7 +496,7 @@ public class DefaultPageManager implements PageManager {
*/
@Override
public boolean pageExists( final String pageName ) throws ProviderException {
- if (pageName == null || pageName.length() == 0) {
+ if (pageName == null || pageName.isEmpty()) {
throw new ProviderException("Illegal page name");
}
@@ -509,7 +509,7 @@ public class DefaultPageManager implements PageManager {
*/
@Override
public boolean pageExists( final String pageName, final int version ) throws ProviderException {
- if( pageName == null || pageName.length() == 0 ) {
+ if( pageName == null || pageName.isEmpty() ) {
throw new ProviderException( "Illegal page name" );
}
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 f564b1d..2626e6f 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
@@ -427,7 +427,7 @@ public class CreoleToJSPWikiTranslator
{
String protectedMarkup = matcher.group(0);
final String paramsField = matcher.group(groupPos);
- StringBuilder paramsString = new StringBuilder();
+ final StringBuilder paramsString = new StringBuilder();
if (paramsField != null)
{
@@ -537,7 +537,7 @@ public class CreoleToJSPWikiTranslator
private String bytesToHash(final byte[] b)
{
- StringBuilder hash = new StringBuilder();
+ final StringBuilder hash = new StringBuilder();
for (int i = 0; i < b.length; i++)
{
hash.append(Integer.toString((b[i] & 0xff) + 0x100, 16).substring(1));
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 bee3c69..c677b2c 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
@@ -277,7 +277,7 @@ public class JSPWikiMarkupParser extends MarkupParser {
// Make sure we make a link name that can be accepted
// as a valid URL.
- if( link.length() == 0 )
+ if( link.isEmpty() )
{
type = EMPTY;
}
@@ -2342,7 +2342,7 @@ public class JSPWikiMarkupParser extends MarkupParser {
// a <p></p> pair according to XHTML rules.
//
final String nextLine = peekAheadLine();
- if( nextLine.length() == 0 ||
+ if( nextLine.isEmpty() ||
(nextLine.length() > 0 &&
!nextLine.startsWith("{{{") &&
!nextLine.startsWith("----") &&
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/parser/LinkParsingOperations.java b/jspwiki-main/src/main/java/org/apache/wiki/parser/LinkParsingOperations.java
index efd0dbc..eb6005e 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/parser/LinkParsingOperations.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/parser/LinkParsingOperations.java
@@ -166,7 +166,7 @@ public class LinkParsingOperations {
* @return {@code true}, if the link name exists; otherwise it returns {@code false}.
*/
public boolean linkExists( final String page ) {
- if( page == null || page.length() == 0 ) {
+ if( page == null || page.isEmpty() ) {
return false;
}
try {
@@ -184,7 +184,7 @@ public class LinkParsingOperations {
* @return link name, if it exists; otherwise it returns {@code null}.
*/
public String linkIfExists( final String page ) {
- if( page == null || page.length() == 0 ) {
+ if( page == null || page.isEmpty() ) {
return null;
}
try {
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 26cc20e..854e9f7 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
@@ -63,7 +63,7 @@ public abstract class MarkupParser {
protected boolean m_inlineImages = true;
protected boolean m_parseAccessRules = true;
/** Keeps image regexp Patterns */
- protected List< Pattern > m_inlineImagePatterns = null;
+ protected List< Pattern > m_inlineImagePatterns;
protected LinkParsingOperations m_linkParsingOperations;
private static final Logger log = Logger.getLogger( MarkupParser.class );
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 fc02ca6..dc0ea9b 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
@@ -130,7 +130,7 @@ public abstract class AbstractReferralPlugin implements Plugin {
protected PageSorter m_sorter;
protected String m_show = "pages";
- protected boolean m_lastModified=false;
+ protected boolean m_lastModified;
// the last modified date of the page that has been last modified:
protected Date m_dateLastModified = new Date(0);
protected SimpleDateFormat m_dateFormat;
@@ -436,7 +436,7 @@ public abstract class AbstractReferralPlugin implements Plugin {
*/
private void initSorter( final Context context, final Map< String, String > params ) {
final String order = params.get( PARAM_SORTORDER );
- if( order == null || order.length() == 0 ) {
+ if( order == null || order.isEmpty() ) {
// Use the configured comparator
m_sorter = context.getEngine().getManager( PageManager.class ).getPageSorter();
} else if( order.equalsIgnoreCase( PARAM_SORTORDER_JAVA ) ) {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/BugReportHandler.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/BugReportHandler.java
index 121a1de..28c5b43 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/BugReportHandler.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/BugReportHandler.java
@@ -91,7 +91,7 @@ public class BugReportHandler implements Plugin {
if( title == null ) {
throw new PluginException(rb.getString("bugreporthandler.titlerequired"));
}
- if( title.length() == 0 ) {
+ if( title.isEmpty() ) {
return "";
}
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 f7cd28d..3de3ce2 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
@@ -476,7 +476,7 @@ public class DefaultPluginManager extends BaseModuleManager implements PluginMan
* @return A WikiPluginInfo object.
*/
protected static WikiPluginInfo newInstance( final String className, final Element el, final List<String> searchPath, final List<String> externalJars ) {
- if( className == null || className.length() == 0 ) {
+ if( className == null || className.isEmpty() ) {
return null;
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/Note.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/Note.java
index 607aa8b..587e33c 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/Note.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/Note.java
@@ -61,7 +61,7 @@ public class Note implements Plugin {
@Override
public String execute( final Context context, final Map<String, String> params) throws PluginException {
final String commandline = params.get(DefaultPluginManager.PARAM_CMDLINE);
- if (commandline == null || commandline.length() == 0) {
+ if (commandline == null || commandline.isEmpty()) {
return "Unable to obtain plugin command line from parameter'" + DefaultPluginManager.PARAM_CMDLINE + "'"; // I18N
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java
index 148b4f8..25cec5b 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java
@@ -376,7 +376,7 @@ public class WeblogPlugin implements Plugin, ParserStagePlugin {
private int guessNumberOfComments( final Engine engine, final String commentpage ) {
final String pagedata = engine.getManager( PageManager.class ).getPureText( commentpage, WikiProvider.LATEST_VERSION );
- if( pagedata == null || pagedata.trim().length() == 0 ) {
+ if( pagedata == null || pagedata.trim().isEmpty() ) {
return 0;
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/providers/AbstractFileProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/AbstractFileProvider.java
index dcb3282..569b698 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/providers/AbstractFileProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/providers/AbstractFileProvider.java
@@ -105,7 +105,7 @@ public abstract class AbstractFileProvider implements PageProvider {
/** The default encoding. */
public static final String DEFAULT_ENCODING = StandardCharsets.ISO_8859_1.toString();
- private boolean m_windowsHackNeeded = false;
+ private boolean m_windowsHackNeeded;
/**
* {@inheritDoc}
@@ -176,7 +176,7 @@ public abstract class AbstractFileProvider implements PageProvider {
if( m_windowsHackNeeded ) {
final String pn = pagename.toLowerCase();
- StringBuilder pagenameBuilder = new StringBuilder(pagename);
+ final StringBuilder pagenameBuilder = new StringBuilder(pagename);
for( final String windowsDeviceName : WINDOWS_DEVICE_NAMES ) {
if( windowsDeviceName.equals( pn ) ) {
pagenameBuilder.insert(0, "$$$");
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java
index dcb9f03..3c8ed17 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java
@@ -185,7 +185,7 @@ public class AtomAPIServlet extends HttpServlet {
title = pageText.substring( 0, firstLine );
}
- if( title.trim().length() == 0 ) {
+ if( title.trim().isEmpty() ) {
title = page.getName();
}
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 6cf6d09..6c8655a 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
@@ -357,7 +357,7 @@ public class DefaultRSSGenerator implements RSSGenerator {
title = pageText.substring( 0, firstLine ).trim();
}
- if( title.length() == 0 ) {
+ if( title.isEmpty() ) {
title = page.getName();
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertDiffTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertDiffTag.java
index 0b1419b..f09d61c 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertDiffTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertDiffTag.java
@@ -98,7 +98,7 @@ public class InsertDiffTag extends WikiTagBase {
final JspWriter out = pageContext.getOut();
final String diff = engine.getManager( DifferenceManager.class ).getDiff( ctx, vernew.intValue(), verold.intValue() );
- if( diff.length() == 0 ) {
+ if( diff.isEmpty() ) {
return EVAL_BODY_INCLUDE;
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultEditorManager.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultEditorManager.java
index 5299a4a..9584da9 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultEditorManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultEditorManager.java
@@ -156,7 +156,7 @@ public class DefaultEditorManager extends BaseModuleManager implements EditorMan
private String m_path;
protected static WikiEditorInfo newInstance( final String name, final Element el ) {
- if( name == null || name.length() == 0 ) {
+ if( name == null || name.isEmpty() ) {
return null;
}
final WikiEditorInfo info = new WikiEditorInfo( 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 faa0ac9..9f90a6c 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
@@ -254,7 +254,7 @@ public class Installer {
private void validateNotNull( final String key, final String message ) {
final String value = m_props.getProperty( key );
- if ( value == null || value.length() == 0 ) {
+ if ( value == null || value.isEmpty() ) {
m_session.addMessage( INSTALL_ERROR, message );
}
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java b/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java
index a45591a..a8199ce 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java
@@ -146,7 +146,7 @@ public class DefaultVariableManager implements VariableManager {
if( varName == null ) {
throw new IllegalArgumentException( "Null variable name." );
}
- if( varName.length() == 0 ) {
+ if( varName.isEmpty() ) {
throw new IllegalArgumentException( "Zero length variable name." );
}
// Faster than doing equalsIgnoreCase()
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/workflow/DecisionQueue.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/DecisionQueue.java
index eba4419..83d18a3 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/workflow/DecisionQueue.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/workflow/DecisionQueue.java
@@ -66,7 +66,7 @@ public class DecisionQueue implements Serializable {
* @return the pending decisions
*/
protected Decision[] decisions() {
- return m_queue.toArray( new Decision[ m_queue.size() ] );
+ return m_queue.toArray( new Decision[0] );
}
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/workflow/Workflow.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Workflow.java
index a325cd3..4a607e0 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/workflow/Workflow.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Workflow.java
@@ -371,7 +371,7 @@ public class Workflow implements Serializable {
final Principal actor = getCurrentActor();
args.add( actor == null ? "-" : actor.getName() );
args.addAll( m_messageArgs );
- return args.toArray( new Serializable[ args.size() ] );
+ return args.toArray( new Serializable[0] );
}
/**
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
index e987294..44fd78b 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
@@ -140,7 +140,7 @@ public class MetaWeblogHandler implements WikiRPCHandler {
title = pageText.substring( 0, firstLine );
}
- if( title.trim().length() == 0 ) {
+ if( title.trim().isEmpty() ) {
title = page.getName();
}
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 bcd0355..94b16af 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
@@ -94,7 +94,7 @@ public final class FormUtil
if( params == null ||
params.size() == 0 ||
keyPrefix == null ||
- keyPrefix.length() == 0 )
+ keyPrefix.isEmpty() )
return rval;
String fullPrefix = null;
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/HttpUtil.java b/jspwiki-util/src/main/java/org/apache/wiki/util/HttpUtil.java
index 46ee931..5cd6680 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/HttpUtil.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/HttpUtil.java
@@ -74,7 +74,7 @@ public final class HttpUtil {
for( final Cookie cookie : cookies ) {
if( cookie.getName().equals( cookieName ) ) {
String value = cookie.getValue();
- if( value == null || value.length() == 0 ) {
+ if( value == null || value.isEmpty() ) {
return null;
}
if( value.charAt( 0 ) == '"' && value.charAt( value.length() - 1 ) == '"' ) {
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/PropertiesUtils.java b/jspwiki-util/src/main/java/org/apache/wiki/util/PropertiesUtils.java
index 920ffee..aff4940 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/PropertiesUtils.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/PropertiesUtils.java
@@ -48,7 +48,7 @@ public final class PropertiesUtils {
public static String toSortedString(final Properties properties )
{
@SuppressWarnings( { "unchecked", "rawtypes" } ) final TreeMap< String, String > treemap = new TreeMap( properties );
- StringBuilder string = new StringBuilder();
+ final StringBuilder string = new StringBuilder();
final Iterator< Map.Entry< String, String > > iterator = treemap.entrySet().iterator();
while( iterator.hasNext() )
{
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/TextUtil.java b/jspwiki-util/src/main/java/org/apache/wiki/util/TextUtil.java
index 9be8124..f564556 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/TextUtil.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/TextUtil.java
@@ -231,7 +231,7 @@ public final class TextUtil {
if ( src == null || dest == null ) {
throw new NullPointerException();
}
- if ( src.length() == 0 ) {
+ if ( src.isEmpty() ) {
return orig;
}
@@ -548,7 +548,7 @@ public final class TextUtil {
* @since 2.1.127
*/
public static String beautifyString( final String s, final String space ) {
- if( s == null || s.length() == 0 ) {
+ if( s == null || s.isEmpty() ) {
return "";
}
@@ -826,7 +826,7 @@ public final class TextUtil {
* @since 2.4
*/
public static String generateRandomPassword() {
- StringBuilder pw = new StringBuilder();
+ final StringBuilder pw = new StringBuilder();
for( int i = 0; i < PASSWORD_LENGTH; i++ ) {
final int index = ( int )( RANDOM.nextDouble() * PWD_BASE.length() );
pw.append(PWD_BASE.substring(index, index + 1));