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:20 UTC
[jspwiki] 01/02: JSPWIKI-1144 - Minor performance improvement:
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));