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 <[email protected]> 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; } /**
