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 2018/11/12 23:32:31 UTC
[jspwiki] 07/09: more add @Overrides, code format,
use of generics and removal of warnings
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 aad1ac7a977fd64c49a47e978d803e4354860a1e
Author: juanpablo <ju...@apache.org>
AuthorDate: Tue Nov 13 00:28:24 2018 +0100
more add @Overrides, code format, use of generics and removal of warnings
---
.../auth/authorize/WebContainerAuthorizer.java | 20 ++++++----
.../htmltowiki/XHtmlElementToWikiTranslator.java | 14 +++----
.../apache/wiki/parser/JSPWikiMarkupParser.java | 21 +++++-----
.../java/org/apache/wiki/parser/MarkupParser.java | 12 +++---
.../main/java/org/apache/wiki/plugin/Denounce.java | 22 ++++++++---
.../wiki/providers/AbstractFileProvider.java | 22 +++++++++--
.../org/apache/wiki/providers/CachingProvider.java | 45 +++++++++++++++-------
.../wiki/providers/VersioningFileProvider.java | 20 +++++++---
.../apache/wiki/providers/WikiPageProvider.java | 6 +--
9 files changed, 117 insertions(+), 65 deletions(-)
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 6e58ab4..a1a146a 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
@@ -30,20 +30,20 @@ import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import org.apache.log4j.Logger;
+import org.apache.wiki.InternalWikiException;
+import org.apache.wiki.WikiEngine;
+import org.apache.wiki.WikiSession;
import org.jdom2.Document;
import org.jdom2.Element;
-import org.jdom2.Namespace;
import org.jdom2.JDOMException;
+import org.jdom2.Namespace;
import org.jdom2.input.SAXBuilder;
+import org.jdom2.input.sax.XMLReaders;
import org.jdom2.xpath.XPath;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import org.apache.wiki.InternalWikiException;
-import org.apache.wiki.WikiEngine;
-import org.apache.wiki.WikiSession;
-
/**
* Authorizes users by delegating role membership checks to the servlet
* container. In addition to implementing methods for the
@@ -91,6 +91,7 @@ public class WebContainerAuthorizer implements WebAuthorizer
* @param engine the current wiki engine
* @param props the wiki engine initialization properties
*/
+ @Override
public void initialize( WikiEngine engine, Properties props )
{
m_engine = engine;
@@ -151,6 +152,7 @@ public class WebContainerAuthorizer implements WebAuthorizer
* @return <code>true</code> if the user is considered to be in the role,
* <code>false</code> otherwise
*/
+ @Override
public boolean isUserInRole( HttpServletRequest request, Principal role )
{
return request.isUserInRole( role.getName() );
@@ -179,6 +181,7 @@ public class WebContainerAuthorizer implements WebAuthorizer
* <code>false</code> otherwise
* @see org.apache.wiki.auth.Authorizer#isUserInRole(org.apache.wiki.WikiSession, java.security.Principal)
*/
+ @Override
public boolean isUserInRole( WikiSession session, Principal role )
{
if ( session == null || role == null )
@@ -196,6 +199,7 @@ public class WebContainerAuthorizer implements WebAuthorizer
* @return a Role Principal, or <code>null</code>
* @see org.apache.wiki.auth.Authorizer#initialize(WikiEngine, Properties)
*/
+ @Override
public Principal findRole( String role )
{
for( Role containerRole : m_containerRoles )
@@ -311,6 +315,7 @@ public class WebContainerAuthorizer implements WebAuthorizer
* array.
* @return an array of Principals representing the roles
*/
+ @Override
public Principal[] getRoles()
{
return m_containerRoles.clone();
@@ -327,7 +332,7 @@ public class WebContainerAuthorizer implements WebAuthorizer
*/
protected Role[] getRoles( Document webxml ) throws JDOMException
{
- Set<Role> roles = new HashSet<Role>();
+ Set<Role> roles = new HashSet<>();
Element root = webxml.getRootElement();
// Get roles referred to by constraints
@@ -371,7 +376,7 @@ public class WebContainerAuthorizer implements WebAuthorizer
{
URL url;
SAXBuilder builder = new SAXBuilder();
- builder.setValidation( false );
+ builder.setXMLReaderFactory( XMLReaders.NONVALIDATING );
builder.setEntityResolver( new LocalEntityResolver() );
Document doc = null;
if ( m_engine.getServletContext() == null )
@@ -420,6 +425,7 @@ public class WebContainerAuthorizer implements WebAuthorizer
* @throws SAXException if the resource cannot be resolved locally
* @throws IOException if the resource cannot be opened
*/
+ @Override
public InputSource resolveEntity( String publicId, String systemId ) throws SAXException, IOException
{
String file = systemId.substring( systemId.lastIndexOf( '/' ) + 1 );
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 f47c31f..872aa9d 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
@@ -30,6 +30,7 @@ import java.util.Map;
import org.apache.commons.lang.StringEscapeUtils;
import org.jdom2.Attribute;
+import org.jdom2.Content;
import org.jdom2.Element;
import org.jdom2.JDOMException;
import org.jdom2.Text;
@@ -252,9 +253,9 @@ public class XHtmlElementToWikiTranslator
private void printChildren( Element base ) throws IOException, JDOMException
{
- for( Iterator i = base.getContent().iterator(); i.hasNext(); )
+ for( Iterator< Content > i = base.getContent().iterator(); i.hasNext(); )
{
- Object c = i.next();
+ Content c = i.next();
if( c instanceof Element )
{
Element e = (Element)c;
@@ -404,7 +405,7 @@ public class XHtmlElementToWikiTranslator
}
else
{
- Map augmentedWikiLinkAttributes = getAugmentedWikiLinkAttributes( e );
+ Map<String, String> augmentedWikiLinkAttributes = getAugmentedWikiLinkAttributes( e );
m_out.print( "[" );
print( e );
@@ -697,7 +698,6 @@ public class XHtmlElementToWikiTranslator
}
}
- @SuppressWarnings("unchecked")
private void printImage( Element base ) throws JDOMException
{
Element child = (Element)XPath.selectSingleNode( base, "TBODY/TR/TD/*" );
@@ -707,7 +707,7 @@ public class XHtmlElementToWikiTranslator
}
Element img;
String href;
- Map<Object,Object> map = new ForgetNullValuesLinkedHashMap();
+ Map<Object,Object> map = new ForgetNullValuesLinkedHashMap<>();
if( child.getName().equals( "A" ) )
{
img = child.getChild( "IMG" );
@@ -785,13 +785,13 @@ public class XHtmlElementToWikiTranslator
{
String classVal = a.getAttributeValue( "class" );
- return classVal != null && classVal.equals( "createpage" );
+ return "createpage".equals( classVal );
}
/**
* Returns a Map containing the valid augmented wiki link attributes.
*/
- private Map getAugmentedWikiLinkAttributes( Element a )
+ private Map<String,String> getAugmentedWikiLinkAttributes( Element a )
{
Map<String,String> attributesMap = new HashMap<>();
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 7c7f1af..6ad722a 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
@@ -98,7 +98,7 @@ public class JSPWikiMarkupParser extends MarkupParser {
private boolean m_isPreBlock = false;
/** Contains style information, in multiple forms. */
- private Stack<Boolean> m_styleStack = new Stack<Boolean>();
+ private Stack<Boolean> m_styleStack = new Stack<>();
// general list handling
private int m_genlistlevel = 0;
@@ -116,7 +116,7 @@ public class JSPWikiMarkupParser extends MarkupParser {
private Element m_currentElement;
/** Keep track of duplicate header names. */
- private Map<String, Integer> m_titleSectionCounter = new HashMap<String, Integer>();
+ private Map<String, Integer> m_titleSectionCounter = new HashMap<>();
/** If true, consider CamelCase hyperlinks as well. */
public static final String PROP_CAMELCASELINKS = "jspwiki.translatorReader.camelCaseLinks";
@@ -235,21 +235,19 @@ public class JSPWikiMarkupParser extends MarkupParser {
* Calls a transmutator chain.
*
* @param list Chain to call
- * @param text Text that should be passed to the mutate() method
- * of each of the mutators in the chain.
+ * @param text Text that should be passed to the mutate() method of each of the mutators in the chain.
* @return The result of the mutation.
*/
-
- protected String callMutatorChain( Collection list, String text )
+ protected String callMutatorChain( Collection< StringTransmutator > list, String text )
{
if( list == null || list.size() == 0 )
{
return text;
}
- for( Iterator i = list.iterator(); i.hasNext(); )
+ for( Iterator< StringTransmutator > i = list.iterator(); i.hasNext(); )
{
- StringTransmutator m = (StringTransmutator) i.next();
+ StringTransmutator m = i.next();
text = m.mutate( m_context, text );
}
@@ -296,7 +294,7 @@ public class JSPWikiMarkupParser extends MarkupParser {
return el;
}
- private Element makeLink( int type, String link, String text, String section, Iterator attributes )
+ private Element makeLink( int type, String link, String text, String section, Iterator< Attribute > attributes )
{
Element el = null;
@@ -422,7 +420,7 @@ public class JSPWikiMarkupParser extends MarkupParser {
{
while( attributes.hasNext() )
{
- Attribute attr = (Attribute)attributes.next();
+ Attribute attr = attributes.next();
if( attr != null )
{
el.setAttribute(attr);
@@ -2638,6 +2636,7 @@ public class JSPWikiMarkupParser extends MarkupParser {
* @return A WikiDocument, ready to be passed to the renderer.
* @throws IOException If parsing cannot be accomplished.
*/
+ @Override
public WikiDocument parse()
throws IOException
{
@@ -2669,7 +2668,7 @@ public class JSPWikiMarkupParser extends MarkupParser {
if( rootElement.getChild("p") != null )
{
- ArrayList<Content> ls = new ArrayList<Content>();
+ ArrayList<Content> ls = new ArrayList<>();
int idxOfFirstContent = 0;
int count = 0;
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 f8e58df..56825a6 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
@@ -55,11 +55,11 @@ public abstract class MarkupParser
protected WikiContext m_context;
/** Optionally stores internal wikilinks */
- protected ArrayList<StringTransmutator> m_localLinkMutatorChain = new ArrayList<StringTransmutator>();
- protected ArrayList<StringTransmutator> m_externalLinkMutatorChain = new ArrayList<StringTransmutator>();
- protected ArrayList<StringTransmutator> m_attachmentLinkMutatorChain = new ArrayList<StringTransmutator>();
- protected ArrayList<HeadingListener> m_headingListenerChain = new ArrayList<HeadingListener>();
- protected ArrayList<StringTransmutator> m_linkMutators = new ArrayList<StringTransmutator>();
+ protected ArrayList<StringTransmutator> m_localLinkMutatorChain = new ArrayList<>();
+ protected ArrayList<StringTransmutator> m_externalLinkMutatorChain = new ArrayList<>();
+ protected ArrayList<StringTransmutator> m_attachmentLinkMutatorChain = new ArrayList<>();
+ protected ArrayList<HeadingListener> m_headingListenerChain = new ArrayList<>();
+ protected ArrayList<StringTransmutator> m_linkMutators = new ArrayList<>();
protected boolean m_inlineImages = true;
protected boolean m_parseAccessRules = true;
@@ -284,7 +284,7 @@ public abstract class MarkupParser
List< Pattern > compiledpatterns = ( List< Pattern > )m_engine.getAttribute( INLINE_IMAGE_PATTERNS );
if( compiledpatterns == null ) {
- compiledpatterns = new ArrayList< Pattern >( 20 );
+ compiledpatterns = new ArrayList< >( 20 );
Collection< String > ptrns = m_engine.getAllInlinedImagePatterns();
//
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/Denounce.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/Denounce.java
index b2f73d9..225f5ee 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/Denounce.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/Denounce.java
@@ -22,13 +22,22 @@ package org.apache.wiki.plugin;
import java.io.IOException;
import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
import javax.servlet.http.HttpServletRequest;
import org.apache.log4j.Logger;
import org.apache.oro.text.GlobCompiler;
-import org.apache.oro.text.regex.*;
+import org.apache.oro.text.regex.MalformedPatternException;
+import org.apache.oro.text.regex.Pattern;
+import org.apache.oro.text.regex.PatternCompiler;
+import org.apache.oro.text.regex.PatternMatcher;
+import org.apache.oro.text.regex.Perl5Matcher;
import org.apache.wiki.WikiContext;
import org.apache.wiki.api.exceptions.PluginException;
import org.apache.wiki.api.plugin.WikiPlugin;
@@ -61,9 +70,9 @@ public class Denounce implements WikiPlugin
private static final String PROP_DENOUNCETEXT = "denounce.denouncetext";
- private static ArrayList<Pattern> c_refererPatterns = new ArrayList<Pattern>();
- private static ArrayList<Pattern> c_agentPatterns = new ArrayList<Pattern>();
- private static ArrayList<Pattern> c_hostPatterns = new ArrayList<Pattern>();
+ private static ArrayList<Pattern> c_refererPatterns = new ArrayList<>();
+ private static ArrayList<Pattern> c_agentPatterns = new ArrayList<>();
+ private static ArrayList<Pattern> c_hostPatterns = new ArrayList<>();
private static String c_denounceText = "";
@@ -90,7 +99,7 @@ public class Denounce implements WikiPlugin
c_denounceText = props.getProperty( PROP_DENOUNCETEXT, c_denounceText );
- for( Enumeration e = props.propertyNames(); e.hasMoreElements(); )
+ for( Enumeration< ? > e = props.propertyNames(); e.hasMoreElements(); )
{
String name = (String) e.nextElement();
@@ -130,6 +139,7 @@ public class Denounce implements WikiPlugin
/**
* {@inheritDoc}
*/
+ @Override
public String execute( WikiContext context, Map<String, String> params )
throws PluginException
{
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 002c59a..8df71eb 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
@@ -121,6 +121,7 @@ public abstract class AbstractFileProvider
* @throws FileNotFoundException If the specified page directory does not exist.
* @throws IOException In case the specified page directory is a file, not a directory.
*/
+ @Override
public void initialize( WikiEngine engine, Properties properties ) throws NoRequiredPropertyException, IOException, FileNotFoundException
{
log.debug("Initing FileSystemProvider");
@@ -250,6 +251,7 @@ public abstract class AbstractFileProvider
/**
* {@inheritDoc}
*/
+ @Override
public boolean pageExists( String page )
{
File pagefile = findPage( page );
@@ -260,6 +262,7 @@ public abstract class AbstractFileProvider
/**
* {@inheritDoc}
*/
+ @Override
public boolean pageExists( String page, int version )
{
return pageExists (page);
@@ -273,6 +276,7 @@ public abstract class AbstractFileProvider
* @param version {@inheritDoc}
* @throws {@inheritDoc}
*/
+ @Override
public String getPageText( String page, int version )
throws ProviderException
{
@@ -324,6 +328,7 @@ public abstract class AbstractFileProvider
/**
* {@inheritDoc}
*/
+ @Override
public void putPageText( WikiPage page, String text )
throws ProviderException
{
@@ -350,6 +355,7 @@ public abstract class AbstractFileProvider
/**
* {@inheritDoc}
*/
+ @Override
public Collection getAllPages()
throws ProviderException
{
@@ -394,6 +400,7 @@ public abstract class AbstractFileProvider
* @param date {@inheritDoc}
* @return {@inheritDoc}
*/
+ @Override
public Collection getAllChangedSince( Date date )
{
return new ArrayList(); // FIXME
@@ -402,6 +409,7 @@ public abstract class AbstractFileProvider
/**
* {@inheritDoc}
*/
+ @Override
public int getPageCount()
{
File wikipagedir = new File( m_pageDirectory );
@@ -418,10 +426,11 @@ public abstract class AbstractFileProvider
* @param query {@inheritDoc}
* @return {@inheritDoc}
*/
+ @Override
public Collection findPages( QueryItem[] query )
{
File wikipagedir = new File( m_pageDirectory );
- TreeSet<SearchResult> res = new TreeSet<SearchResult>( new SearchResultComparator() );
+ TreeSet<SearchResult> res = new TreeSet<>( new SearchResultComparator() );
SearchMatcher matcher = new SearchMatcher( m_engine, query );
File[] wikipages = wikipagedir.listFiles( new WikiFileFilter() );
@@ -470,6 +479,7 @@ public abstract class AbstractFileProvider
* @return {@inheritDoc}
* @throws {@inheritDoc}
*/
+ @Override
public WikiPage getPageInfo( String page, int version )
throws ProviderException
{
@@ -493,10 +503,10 @@ public abstract class AbstractFileProvider
* @throws {@inheritDoc}
* @return {@inheritDoc}
*/
- public List getVersionHistory( String page )
- throws ProviderException
+ @Override
+ public List<WikiPage> getVersionHistory( String page ) throws ProviderException
{
- ArrayList<WikiPage> list = new ArrayList<WikiPage>();
+ ArrayList<WikiPage> list = new ArrayList<>();
list.add( getPageInfo( page, WikiPageProvider.LATEST_VERSION ) );
@@ -506,6 +516,7 @@ public abstract class AbstractFileProvider
/**
* {@inheritDoc}
*/
+ @Override
public String getProviderInfo()
{
return "";
@@ -514,6 +525,7 @@ public abstract class AbstractFileProvider
/**
* {@inheritDoc}
*/
+ @Override
public void deleteVersion( String pageName, int version )
throws ProviderException
{
@@ -528,6 +540,7 @@ public abstract class AbstractFileProvider
/**
* {@inheritDoc}
*/
+ @Override
public void deletePage( String pageName )
throws ProviderException
{
@@ -635,6 +648,7 @@ public abstract class AbstractFileProvider
/**
* {@inheritDoc}
*/
+ @Override
public boolean accept( File dir, String name )
{
return name.endsWith( FILE_EXT );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingProvider.java
index 78cd42e..c4fa161 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingProvider.java
@@ -18,9 +18,14 @@
*/
package org.apache.wiki.providers;
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.Element;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.TreeSet;
+
import org.apache.log4j.Logger;
import org.apache.wiki.PageManager;
import org.apache.wiki.WikiContext;
@@ -34,13 +39,9 @@ import org.apache.wiki.search.QueryItem;
import org.apache.wiki.util.ClassUtil;
import org.apache.wiki.util.TextUtil;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.TreeSet;
+import net.sf.ehcache.Cache;
+import net.sf.ehcache.CacheManager;
+import net.sf.ehcache.Element;
/**
@@ -103,6 +104,7 @@ public class CachingProvider implements WikiPageProvider {
/**
* {@inheritDoc}
*/
+ @Override
public void initialize( WikiEngine engine, Properties properties )
throws NoRequiredPropertyException, IOException {
log.debug("Initing CachingProvider");
@@ -195,6 +197,7 @@ public class CachingProvider implements WikiPageProvider {
/**
* {@inheritDoc}
*/
+ @Override
public boolean pageExists( String pageName, int version )
{
if( pageName == null ) return false;
@@ -236,6 +239,7 @@ public class CachingProvider implements WikiPageProvider {
/**
* {@inheritDoc}
*/
+ @Override
public boolean pageExists( String pageName )
{
if( pageName == null ) return false;
@@ -286,6 +290,7 @@ public class CachingProvider implements WikiPageProvider {
/**
* {@inheritDoc}
*/
+ @Override
public String getPageText( String pageName, int version )
throws ProviderException
{
@@ -342,6 +347,7 @@ public class CachingProvider implements WikiPageProvider {
/**
* {@inheritDoc}
*/
+ @Override
public void putPageText(WikiPage page, String text) throws ProviderException {
synchronized (this) {
m_provider.putPageText(page, text);
@@ -361,6 +367,7 @@ public class CachingProvider implements WikiPageProvider {
/**
* {@inheritDoc}
*/
+ @Override
public Collection getAllPages() throws ProviderException {
Collection all;
@@ -385,7 +392,7 @@ public class CachingProvider implements WikiPageProvider {
Element element = m_cache.get(key);
Object cachedPage = element.getObjectValue();
if (cachedPage != null) {
- all.add((WikiPage) cachedPage);
+ all.add(cachedPage);
}
}
}
@@ -403,6 +410,7 @@ public class CachingProvider implements WikiPageProvider {
/**
* {@inheritDoc}
*/
+ @Override
public Collection getAllChangedSince( Date date )
{
return m_provider.getAllChangedSince( date );
@@ -411,6 +419,7 @@ public class CachingProvider implements WikiPageProvider {
/**
* {@inheritDoc}
*/
+ @Override
public int getPageCount()
throws ProviderException
{
@@ -420,6 +429,7 @@ public class CachingProvider implements WikiPageProvider {
/**
* {@inheritDoc}
*/
+ @Override
public Collection findPages( QueryItem[] query )
{
//
@@ -461,6 +471,7 @@ public class CachingProvider implements WikiPageProvider {
/**
* {@inheritDoc}
*/
+ @Override
public WikiPage getPageInfo( String pageName, int version ) throws ProviderException
{
WikiPage page = null;
@@ -500,15 +511,17 @@ public class CachingProvider implements WikiPageProvider {
/**
* {@inheritDoc}
*/
- public List getVersionHistory(String pageName) throws ProviderException {
- List history = null;
+ @SuppressWarnings("unchecked")
+ @Override
+ public List< WikiPage > getVersionHistory(String pageName) throws ProviderException {
+ List< WikiPage > history = null;
if (pageName == null) return null;
Element element = m_historyCache.get(pageName);
if (element != null) {
m_historyCacheHits++;
- history = (List) element.getObjectValue();
+ history = ( List< WikiPage > )element.getObjectValue();
} else {
history = m_provider.getVersionHistory(pageName);
m_historyCache.put( new Element( pageName, history ));
@@ -523,6 +536,7 @@ public class CachingProvider implements WikiPageProvider {
*
* @return A plain string with all the above mentioned values.
*/
+ @Override
public synchronized String getProviderInfo()
{
return "Real provider: "+m_provider.getClass().getName()+
@@ -535,6 +549,7 @@ public class CachingProvider implements WikiPageProvider {
/**
* {@inheritDoc}
*/
+ @Override
public void deleteVersion( String pageName, int version )
throws ProviderException
{
@@ -566,6 +581,7 @@ public class CachingProvider implements WikiPageProvider {
/**
* {@inheritDoc}
*/
+ @Override
public void deletePage( String pageName )
throws ProviderException
{
@@ -584,6 +600,7 @@ public class CachingProvider implements WikiPageProvider {
/**
* {@inheritDoc}
*/
+ @Override
public void movePage(String from, String to) throws ProviderException {
m_provider.movePage(from, to);
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 718056e..bac6914 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
@@ -85,6 +85,7 @@ public class VersioningFileProvider
/**
* {@inheritDoc}
*/
+ @Override
public void initialize( WikiEngine engine, Properties properties )
throws NoRequiredPropertyException,
IOException
@@ -336,6 +337,7 @@ public class VersioningFileProvider
/**
* {@inheritDoc}
*/
+ @Override
public synchronized String getPageText( String page, int version )
throws ProviderException
{
@@ -414,6 +416,7 @@ public class VersioningFileProvider
/**
* {@inheritDoc}
*/
+ @Override
public synchronized void putPageText( WikiPage page, String text )
throws ProviderException
{
@@ -534,6 +537,7 @@ public class VersioningFileProvider
/**
* {@inheritDoc}
*/
+ @Override
public WikiPage getPageInfo( String page, int version )
throws ProviderException
{
@@ -629,6 +633,7 @@ public class VersioningFileProvider
/**
* {@inheritDoc}
*/
+ @Override
public boolean pageExists( String pageName, int version )
{
if (version == WikiPageProvider.LATEST_VERSION || version == findLatestVersion( pageName ) ) {
@@ -652,11 +657,9 @@ public class VersioningFileProvider
* {@inheritDoc}
*/
// FIXME: Does not get user information.
- public List getVersionHistory( String page )
- throws ProviderException
- {
- ArrayList<WikiPage> list = new ArrayList<WikiPage>();
-
+ @Override
+ public List< WikiPage > getVersionHistory( String page ) throws ProviderException {
+ ArrayList<WikiPage> list = new ArrayList<>();
int latest = findLatestVersion( page );
// list.add( getPageInfo(page,WikiPageProvider.LATEST_VERSION) );
@@ -741,6 +744,7 @@ public class VersioningFileProvider
* @throws {@inheritDoc}
*/
// FIXME: Should log errors.
+ @Override
public void deletePage( String page )
throws ProviderException
{
@@ -776,6 +780,7 @@ public class VersioningFileProvider
* Using deleteVersion() is definitely not recommended.
*
*/
+ @Override
public void deleteVersion( String page, int version )
throws ProviderException
{
@@ -865,10 +870,11 @@ public class VersioningFileProvider
* {@inheritDoc}
*/
// FIXME: This is kinda slow, we should need to do this only once.
+ @Override
public Collection getAllPages() throws ProviderException
{
Collection pages = super.getAllPages();
- Collection<WikiPage> returnedPages = new ArrayList<WikiPage>();
+ Collection<WikiPage> returnedPages = new ArrayList<>();
for( Iterator i = pages.iterator(); i.hasNext(); )
{
@@ -885,6 +891,7 @@ public class VersioningFileProvider
/**
* {@inheritDoc}
*/
+ @Override
public String getProviderInfo()
{
return "";
@@ -893,6 +900,7 @@ public class VersioningFileProvider
/**
* {@inheritDoc}
*/
+ @Override
public void movePage( String from,
String to )
throws ProviderException
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/providers/WikiPageProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/WikiPageProvider.java
index 3644edd..50b744a 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/providers/WikiPageProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/providers/WikiPageProvider.java
@@ -74,7 +74,7 @@ public interface WikiPageProvider
* @return True, if page exists; false otherwise.
*/
- public boolean pageExists(String page, int version);
+ boolean pageExists(String page, int version);
/**
* Finds pages based on the query. Only applicable to providers
@@ -139,9 +139,7 @@ public interface WikiPageProvider
* @return A collection of WikiPages.
* @throws ProviderException If something goes wrong.
*/
-
- List getVersionHistory( String page )
- throws ProviderException;
+ List< WikiPage > getVersionHistory( String page ) throws ProviderException;
/**
* Gets a specific version out of the repository.