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 2020/01/09 22:17:35 UTC
[jspwiki] 25/32: explicit casting on WikiPage#getAttribute() can be
removed in most cases now
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 2bac2a4f28ca426cd78e90746aa14955e4cd5771
Author: juanpablo <ju...@apache.org>
AuthorDate: Wed Jan 8 00:29:40 2020 +0100
explicit casting on WikiPage#getAttribute() can be removed in most cases now
---
.../src/main/java/org/apache/wiki/WikiContext.java | 6 +++---
jspwiki-main/src/main/java/org/apache/wiki/WikiPage.java | 14 +++++++-------
.../main/java/org/apache/wiki/filters/SpamFilter.java | 8 +++-----
.../java/org/apache/wiki/parser/JSPWikiMarkupParser.java | 2 +-
.../java/org/apache/wiki/plugin/RecentChangesPlugin.java | 4 ++--
.../apache/wiki/providers/BasicAttachmentProvider.java | 2 +-
.../org/apache/wiki/providers/FileSystemProvider.java | 12 ++++++------
.../apache/wiki/providers/VersioningFileProvider.java | 2 +-
.../java/org/apache/wiki/rpc/atom/AtomAPIServlet.java | 3 ++-
.../apache/wiki/providers/FileSystemProviderTest.java | 16 ++++++++--------
10 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiContext.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiContext.java
index 4b33cf3..bea0ea4 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiContext.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiContext.java
@@ -337,7 +337,7 @@ public class WikiContext implements Cloneable, Command {
if( redirURL == null )
{
- String alias = (String)m_page.getAttribute( WikiPage.ALIAS );
+ String alias = m_page.getAttribute( WikiPage.ALIAS );
if( alias != null )
{
@@ -345,7 +345,7 @@ public class WikiContext implements Cloneable, Command {
}
else
{
- redirURL = (String)m_page.getAttribute( WikiPage.REDIRECT );
+ redirURL = m_page.getAttribute( WikiPage.REDIRECT );
}
}
@@ -802,7 +802,7 @@ public class WikiContext implements Cloneable, Command {
WikiPage page = getPage();
if ( page != null )
{
- template = (String)page.getAttribute( WikiEngine.PROP_TEMPLATEDIR );
+ template = page.getAttribute( WikiEngine.PROP_TEMPLATEDIR );
}
}
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 6d00214..8cb19f9 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiPage.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiPage.java
@@ -18,16 +18,16 @@
*/
package org.apache.wiki;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.wiki.auth.acl.Acl;
import org.apache.wiki.auth.acl.AclEntry;
import org.apache.wiki.auth.acl.AclImpl;
import org.apache.wiki.providers.WikiPageProvider;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* Simple wrapper class for the Wiki page attributes. The Wiki page
* content is moved around in Strings, though.
@@ -103,9 +103,9 @@ public class WikiPage implements Cloneable, Comparable< WikiPage > {
* @param key The key using which the attribute is fetched
* @return The attribute. If the attribute has not been set, returns null.
*/
- public Object getAttribute( String key )
+ public < T > T getAttribute( String key )
{
- return m_attributes.get( key );
+ return (T)m_attributes.get( key );
}
/**
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 bc1acc7..c018bfc 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
@@ -753,13 +753,11 @@ public class SpamFilter extends BasicPageFilter {
//
if( rebuild ) {
m_lastRebuild = new Date();
- m_spamPatterns = parseWordList( sourceSpam,
- ( sourceSpam != null ) ? ( String )sourceSpam.getAttribute( LISTVAR ) : null );
+ m_spamPatterns = parseWordList( sourceSpam, ( sourceSpam != null ) ? sourceSpam.getAttribute( LISTVAR ) : null );
log.info( "Spam filter reloaded - recognizing " + m_spamPatterns.size() + " patterns from page " + m_forbiddenWordsPage );
- m_IPPatterns = parseWordList( sourceIPs,
- ( sourceIPs != null ) ? ( String )sourceIPs.getAttribute( LISTIPVAR ) : null );
+ m_IPPatterns = parseWordList( sourceIPs, ( sourceIPs != null ) ? sourceIPs.getAttribute( LISTIPVAR ) : null );
log.info( "IP filter reloaded - recognizing " + m_IPPatterns.size() + " patterns from page " + m_forbiddenIPsPage );
if( att != null ) {
@@ -902,7 +900,7 @@ public class SpamFilter extends BasicPageFilter {
//
// Don't forget to include the change note, too
//
- final String changeNote = ( String )page.getAttribute( WikiPage.CHANGENOTE );
+ final String changeNote = page.getAttribute( WikiPage.CHANGENOTE );
if( changeNote != null ) {
change.append( "\r\n" );
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 b23608a..8b2806b 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
@@ -192,7 +192,7 @@ public class JSPWikiMarkupParser extends MarkupParser {
//
Properties props = m_engine.getWikiProperties();
- String cclinks = (String)m_context.getPage().getAttribute( PROP_CAMELCASELINKS );
+ String cclinks = m_context.getPage().getAttribute( PROP_CAMELCASELINKS );
if( cclinks != null )
{
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/RecentChangesPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/RecentChangesPlugin.java
index 642041c..f768f2a 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/RecentChangesPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/RecentChangesPlugin.java
@@ -197,8 +197,8 @@ public class RecentChangesPlugin extends AbstractReferralPlugin implements WikiP
// Change note
if( showChangenote ) {
- String changenote = ( String )pageref.getAttribute( WikiPage.CHANGENOTE );
- Element td_changenote = XhtmlUtil.element( XHTML.td, changenote );
+ final String changenote = pageref.getAttribute( WikiPage.CHANGENOTE );
+ final Element td_changenote = XhtmlUtil.element( XHTML.td, changenote );
td_changenote.setAttribute( XHTML.ATTR_class, "changenote" );
row.addContent( td_changenote );
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
index ccaa8ed..5f6d67c 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
@@ -345,7 +345,7 @@ public class BasicAttachmentProvider
props.setProperty( versionNumber+".author", author );
- String changeNote = (String)att.getAttribute(WikiPage.CHANGENOTE);
+ String changeNote = att.getAttribute(WikiPage.CHANGENOTE);
if( changeNote != null )
{
props.setProperty( versionNumber+".changenote", changeNote );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/providers/FileSystemProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/FileSystemProvider.java
index 65d3dc5..c8c7e3b 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/providers/FileSystemProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/providers/FileSystemProvider.java
@@ -18,6 +18,10 @@
*/
package org.apache.wiki.providers;
+import org.apache.log4j.Logger;
+import org.apache.wiki.WikiPage;
+import org.apache.wiki.api.exceptions.ProviderException;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -26,10 +30,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.Properties;
-import org.apache.log4j.Logger;
-import org.apache.wiki.WikiPage;
-import org.apache.wiki.api.exceptions.ProviderException;
-
/**
* Provides a simple directory based repository for Wiki pages.
* <P>
@@ -76,8 +76,8 @@ public class FileSystemProvider
try
{
String author = page.getAuthor();
- String changenote = (String)page.getAttribute( WikiPage.CHANGENOTE );
- String viewcount = (String)page.getAttribute( WikiPage.VIEWCOUNT );
+ String changenote = page.getAttribute( WikiPage.CHANGENOTE );
+ String viewcount = page.getAttribute( WikiPage.VIEWCOUNT );
if( author != null )
{
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 2a36b0d..27dd7cb 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
@@ -437,7 +437,7 @@ public class VersioningFileProvider extends AbstractFileProvider {
page.setAuthor(newAuthor);
props.setProperty( versionNumber + ".author", newAuthor );
- String changeNote = (String) page.getAttribute(WikiPage.CHANGENOTE);
+ String changeNote = page.getAttribute(WikiPage.CHANGENOTE);
if( changeNote != null ) {
props.setProperty( versionNumber + ".changenote", changeNote );
}
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 f172e25..f568541 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
@@ -280,8 +280,9 @@ public class AtomAPIServlet extends HttpServlet
log.debug( p.getName()+" = "+p.getAttribute(WeblogPlugin.ATTR_ISWEBLOG)) ;
- if( !("true".equals(p.getAttribute(WeblogPlugin.ATTR_ISWEBLOG)) ) )
+ if( !("true".equals(p.getAttribute(WeblogPlugin.ATTR_ISWEBLOG)) ) ) {
continue;
+ }
String encodedName = TextUtil.urlEncodeUTF8( p.getName() );
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/providers/FileSystemProviderTest.java b/jspwiki-main/src/test/java/org/apache/wiki/providers/FileSystemProviderTest.java
index bd36f8d..30ea671 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/providers/FileSystemProviderTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/providers/FileSystemProviderTest.java
@@ -18,11 +18,6 @@
*/
package org.apache.wiki.providers;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Properties;
-
import org.apache.log4j.PropertyConfigurator;
import org.apache.wiki.TestEngine;
import org.apache.wiki.WikiEngine;
@@ -34,6 +29,11 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Properties;
+
public class FileSystemProviderTest {
@@ -291,9 +291,9 @@ public class FileSystemProviderTest {
m_provider.putPageText( testPage, "This page has custom properties" );
Assertions.assertTrue( file.exists(), "No such file" );
WikiPage pageRetrieved = m_provider.getPageInfo( pageName, -1 );
- String value = (String)pageRetrieved.getAttribute("@test");
- String value2 = (String)pageRetrieved.getAttribute("@test2");
- String value3 = (String)pageRetrieved.getAttribute("test3");
+ String value = pageRetrieved.getAttribute("@test");
+ String value2 = pageRetrieved.getAttribute("@test2");
+ String value3 = pageRetrieved.getAttribute("test3");
Assertions.assertNotNull(value);
Assertions.assertNotNull(value2);
Assertions.assertNull(value3);