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/10/28 09:28:14 UTC
[jspwiki] branch master updated: JSPWIKI-1158 -Remove unnecessary
ToString
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
The following commit(s) were added to refs/heads/master by this push:
new 5713a13 JSPWIKI-1158 -Remove unnecessary ToString
5713a13 is described below
commit 5713a13fe5d238f83c04de01d6e46cbb66d14e07
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Thu Oct 21 18:31:04 2021 +0200
JSPWIKI-1158 -Remove unnecessary ToString
---
jspwiki-main/src/main/java/org/apache/wiki/WikiPage.java | 4 +---
.../java/org/apache/wiki/auth/authorize/DefaultGroupManager.java | 2 +-
.../src/main/java/org/apache/wiki/auth/user/XMLUserDatabase.java | 5 +----
.../src/main/java/org/apache/wiki/pages/DefaultPageManager.java | 2 +-
.../src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java | 3 +--
.../src/main/java/org/apache/wiki/plugin/TableOfContents.java | 2 +-
.../src/main/java/org/apache/wiki/search/LuceneSearchProvider.java | 2 +-
jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java | 6 +++---
jspwiki-main/src/main/java/org/apache/wiki/ui/AbstractCommand.java | 2 +-
jspwiki-main/src/main/java/org/apache/wiki/workflow/Fact.java | 2 +-
.../main/java/org/apache/wiki/search/tika/TikaSearchProvider.java | 2 +-
11 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiPage.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiPage.java
index 9452190..770938d 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiPage.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiPage.java
@@ -316,9 +316,7 @@ public class WikiPage implements Page {
p.m_version = m_version;
p.m_lastModified = m_lastModified != null ? (Date)m_lastModified.clone() : null;
p.m_fileSize = m_fileSize;
- for( final Map.Entry< String, Object > entry : m_attributes.entrySet() ) {
- p.m_attributes.put( entry.getKey(), entry.getValue() );
- }
+ p.m_attributes.putAll( m_attributes );
if( m_accessList != null ) {
p.m_accessList = new AclImpl();
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 f2030bb..86fad07 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
@@ -426,7 +426,7 @@ public class DefaultGroupManager implements GroupManager, Authorizer, WikiEventL
// Oooo! This is really bad...
log.error( "Could not change user name in Group lists because of GroupDatabase error:" + e.getMessage() );
}
- log.info( "Profile name change for '" + newPrincipal.toString() + "' caused " + groupsChanged + " groups to change also." );
+ log.info( "Profile name change for '" + newPrincipal + "' caused " + groupsChanged + " groups to change also." );
}
}
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 d0010c9..a4d3b87 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
@@ -459,10 +459,7 @@ public class XMLUserDatabase extends AbstractUserDatabase {
}
// check if we have to do a case insensitive compare
- boolean caseSensitiveCompare = true;
- if (matchAttribute.equals(EMAIL)) {
- caseSensitiveCompare = false;
- }
+ boolean caseSensitiveCompare = !matchAttribute.equals( EMAIL );
for( int i = 0; i < users.getLength(); i++ ) {
final Element user = (Element) users.item( i );
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 f70b4ad..0cf9820 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
@@ -717,7 +717,7 @@ public class DefaultPageManager implements PageManager {
pagesChanged++;
}
}
- LOG.info( "Profile name change for '" + newPrincipal.toString() + "' caused " + pagesChanged + " page ACLs to change also." );
+ LOG.info( "Profile name change for '" + newPrincipal + "' caused " + pagesChanged + " page ACLs to change also." );
} catch( final ProviderException e ) {
// Oooo! This is really bad...
LOG.error( "Could not change user name in Page ACLs because of Provider error:" + e.getMessage(), 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 e4c9b4d..25bbca9 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
@@ -237,8 +237,7 @@ public class JSPWikiMarkupParser extends MarkupParser {
* @param param A Heading object.
*/
protected void callHeadingListenerChain( final Heading param ) {
- final List< HeadingListener > list = m_headingListenerChain;
- for( final HeadingListener h : list ) {
+ for( final HeadingListener h : m_headingListenerChain ) {
h.headingAdded( m_context, param );
}
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/TableOfContents.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/TableOfContents.java
index ae1f850..3c69284 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/TableOfContents.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/TableOfContents.java
@@ -223,7 +223,7 @@ public class TableOfContents implements Plugin, HeadingListener {
parser.addHeadingListener( this );
parser.parse();
- sb.append( "<ul>\n" ).append( m_buf.toString() ).append( "</ul>\n" );
+ sb.append( "<ul>\n" ).append( m_buf ).append( "</ul>\n" );
} catch( final IOException e ) {
log.error("Could not construct table of contents", e);
throw new PluginException("Unable to construct table of contents (see logs)");
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
index cf0755d..01b21db 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java
@@ -282,7 +282,7 @@ public class LuceneSearchProvider implements SearchProvider {
if( searchSuffix ) {
try( final InputStream attStream = mgr.getAttachmentStream( att ); final StringWriter sout = new StringWriter() ) {
FileUtil.copyContents( new InputStreamReader( attStream ), sout );
- out = out + " " + sout.toString();
+ out = out + " " + sout;
} catch( final ProviderException | IOException e ) {
log.error("Attachment cannot be loaded", e);
}
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 517b200..5a61b1f 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
@@ -282,9 +282,9 @@ public class LinkTag extends WikiLinkTag implements ParamHandler, BodyTag {
return buf.toString();
}
if( !addTo.endsWith( "&" ) ) {
- return addTo + "&" + buf.toString();
+ return addTo + "&" + buf;
}
- return addTo + buf.toString();
+ return addTo + buf;
}
private String makeBasicURL( final String context, final String page, String parms ) {
@@ -358,7 +358,7 @@ public class LinkTag extends WikiLinkTag implements ParamHandler, BodyTag {
break;
default:
case ANCHOR:
- out.print("<a "+sb.toString()+" href=\""+url+"\">");
+ out.print("<a "+ sb +" href=\""+url+"\">");
break;
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/AbstractCommand.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/AbstractCommand.java
index dfad8f6..fc09d5e 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/AbstractCommand.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/AbstractCommand.java
@@ -163,7 +163,7 @@ public abstract class AbstractCommand implements Command {
"[context=" + m_requestContext + "," +
"urlPattern=" + m_urlPattern + "," +
"jsp=" + m_jsp +
- ( m_target == null ? "" : ",target=" + m_target + m_target.toString() ) +
+ ( m_target == null ? "" : ",target=" + m_target + m_target ) +
"]";
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/workflow/Fact.java b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Fact.java
index 887c907..a641540 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/workflow/Fact.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/workflow/Fact.java
@@ -103,6 +103,6 @@ public final class Fact implements Serializable
*/
public String toString()
{
- return "[Fact:" + m_obj.toString() + "]";
+ return "[Fact:" + m_obj + "]";
}
}
diff --git a/jspwiki-tika-searchprovider/src/main/java/org/apache/wiki/search/tika/TikaSearchProvider.java b/jspwiki-tika-searchprovider/src/main/java/org/apache/wiki/search/tika/TikaSearchProvider.java
index ba0d659..43f86af 100644
--- a/jspwiki-tika-searchprovider/src/main/java/org/apache/wiki/search/tika/TikaSearchProvider.java
+++ b/jspwiki-tika-searchprovider/src/main/java/org/apache/wiki/search/tika/TikaSearchProvider.java
@@ -103,7 +103,7 @@ public class TikaSearchProvider extends LuceneSearchProvider {
// -1 disables the character size limit; otherwise only the first 100.000 characters are indexed
parser.parse( attStream, handler, metadata );
- out.append( handler.toString() );
+ out.append( handler );
final String[] names = metadata.names();
for( final String name : names ) {