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/11 22:12:04 UTC
[jspwiki] 01/08: add @Overrides, reorganize imports, use generics
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 0a12de5d8faa9f9d1c72bb55757fd3ae4de5c4ac
Author: juanpablo <ju...@apache.org>
AuthorDate: Sun Nov 11 14:20:41 2018 +0100
add @Overrides, reorganize imports, use generics
---
.../java/org/apache/wiki/event/WikiEventManager.java | 9 +++++----
.../wiki/htmltowiki/XHtmlElementToWikiTranslator.java | 3 ++-
.../main/java/org/apache/wiki/xmlrpc/RPCHandler.java | 18 ++++++++++--------
.../test/java/org/apache/wiki/TestJDBCDataSource.java | 12 +++++++++++-
jspwiki-main/src/test/java/org/apache/wiki/Util.java | 6 +++---
5 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/event/WikiEventManager.java b/jspwiki-main/src/main/java/org/apache/wiki/event/WikiEventManager.java
index fb0c5ad..46dc3f3 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/event/WikiEventManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/event/WikiEventManager.java
@@ -160,10 +160,10 @@ public final class WikiEventManager
private static WikiEventListener c_monitor = null;
/* The Map of client object to WikiEventDelegate. */
- private final Map<Object, WikiEventDelegate> m_delegates = new HashMap<Object, WikiEventDelegate>();
+ private final Map<Object, WikiEventDelegate> m_delegates = new HashMap<>();
/* The Vector containing any preloaded WikiEventDelegates. */
- private final Vector<WikiEventDelegate> m_preloadCache = new Vector<WikiEventDelegate>();
+ private final Vector<WikiEventDelegate> m_preloadCache = new Vector<>();
/* Singleton instance of the WikiEventManager. */
private static WikiEventManager c_instance = null;
@@ -439,7 +439,7 @@ public final class WikiEventManager
{
/* A list of event listeners for this instance. */
- private ArrayList<WeakReference<WikiEventListener>> m_listenerList = new ArrayList<WeakReference<WikiEventListener>>();
+ private ArrayList<WeakReference<WikiEventListener>> m_listenerList = new ArrayList<>();
private Class m_class = null;
@@ -506,7 +506,7 @@ public final class WikiEventManager
{
synchronized( m_listenerList )
{
- return m_listenerList.add( new WeakReference<WikiEventListener>(listener) );
+ return m_listenerList.add( new WeakReference<>(listener) );
}
}
@@ -606,6 +606,7 @@ public final class WikiEventManager
private static class WikiEventListenerComparator implements Comparator<WikiEventListener>
{
// TODO: This method is a critical performance bottleneck
+ @Override
public int compare(WikiEventListener w0, WikiEventListener w1)
{
if( w1 == w0 || w0.equals(w1) ) return 0;
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 d12203e..f47c31f 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
@@ -793,7 +793,7 @@ public class XHtmlElementToWikiTranslator
*/
private Map getAugmentedWikiLinkAttributes( Element a )
{
- Map<String,String> attributesMap = new HashMap<String,String>();
+ Map<String,String> attributesMap = new HashMap<>();
String id = a.getAttributeValue( "id" );
if( id != null && !id.equals( "" ) )
@@ -1045,6 +1045,7 @@ public class XHtmlElementToWikiTranslator
// m_li = m_li.substring( 0, m_li.length() - 1 );
}
+ @Override
public String toString()
{
return m_li.toString();
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java
index 215f2a3..9fbfe9b 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java
@@ -18,7 +18,6 @@
*/
package org.apache.wiki.xmlrpc;
-import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.util.Calendar;
import java.util.Collection;
@@ -53,6 +52,7 @@ public class RPCHandler
/**
* {@inheritDoc}
*/
+ @Override
public void initialize( WikiContext ctx )
{
super.initialize( ctx );
@@ -92,7 +92,7 @@ public class RPCHandler
{
checkPermission( PagePermission.VIEW );
Collection< WikiPage > pages = m_engine.getRecentChanges();
- Vector<String> result = new Vector<String>();
+ Vector<String> result = new Vector<>();
for( WikiPage p : pages )
{
@@ -108,9 +108,10 @@ public class RPCHandler
/**
* Encodes a single wiki page info into a Hashtable.
*/
+ @Override
protected Hashtable<String,Object> encodeWikiPage( WikiPage page )
{
- Hashtable<String, Object> ht = new Hashtable<String, Object>();
+ Hashtable<String, Object> ht = new Hashtable<>();
ht.put( "name", toRPCString(page.getName()) );
@@ -140,11 +141,12 @@ public class RPCHandler
return ht;
}
+ @Override
public Vector getRecentChanges( Date since )
{
checkPermission( PagePermission.VIEW );
Collection< WikiPage > pages = m_engine.getRecentChanges();
- Vector<Hashtable<String, Object>> result = new Vector<Hashtable<String, Object>>();
+ Vector<Hashtable<String, Object>> result = new Vector<>();
Calendar cal = Calendar.getInstance();
cal.setTime( since );
@@ -263,7 +265,7 @@ public class RPCHandler
extCollector,
attCollector );
- Vector<Hashtable<String, String>> result = new Vector<Hashtable<String, String>>();
+ Vector<Hashtable<String, String>> result = new Vector<>();
//
// Add local links.
@@ -271,7 +273,7 @@ public class RPCHandler
for( Iterator< String > i = localCollector.getLinks().iterator(); i.hasNext(); )
{
String link = i.next();
- Hashtable< String, String > ht = new Hashtable<String, String>();
+ Hashtable< String, String > ht = new Hashtable<>();
ht.put( "page", toRPCString( link ) );
ht.put( "type", LINK_LOCAL );
@@ -305,7 +307,7 @@ public class RPCHandler
{
String link = i.next();
- Hashtable< String, String > ht = new Hashtable< String, String >();
+ Hashtable< String, String > ht = new Hashtable< >();
ht.put( "page", toRPCString( link ) );
ht.put( "type", LINK_LOCAL );
@@ -323,7 +325,7 @@ public class RPCHandler
{
String link = i.next();
- Hashtable< String, String > ht = new Hashtable< String, String >();
+ Hashtable< String, String > ht = new Hashtable< >();
ht.put( "page", link );
ht.put( "type", LINK_EXTERNAL );
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/TestJDBCDataSource.java b/jspwiki-main/src/test/java/org/apache/wiki/TestJDBCDataSource.java
index d7814f4..006c38c 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/TestJDBCDataSource.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/TestJDBCDataSource.java
@@ -81,6 +81,7 @@ public class TestJDBCDataSource implements DataSource
* @return the database connection
* @see javax.sql.DataSource#getConnection()
*/
+ @Override
public Connection getConnection() throws SQLException
{
return getConnection( m_jdbcUser, m_jdbcPassword );
@@ -92,6 +93,7 @@ public class TestJDBCDataSource implements DataSource
* @see javax.sql.DataSource#getConnection(java.lang.String,
* java.lang.String)
*/
+ @Override
public Connection getConnection( String username, String password ) throws SQLException
{
Properties connProperties = new Properties();
@@ -106,6 +108,7 @@ public class TestJDBCDataSource implements DataSource
* @return the login timeout, in seconds
* @see javax.sql.DataSource#getLoginTimeout()
*/
+ @Override
public int getLoginTimeout() throws SQLException
{
return m_timeout;
@@ -116,6 +119,7 @@ public class TestJDBCDataSource implements DataSource
* @return the log writer
* @see javax.sql.DataSource#getLogWriter()
*/
+ @Override
public PrintWriter getLogWriter() throws SQLException
{
return m_writer;
@@ -126,6 +130,7 @@ public class TestJDBCDataSource implements DataSource
* @param seconds the login timeout, in seconds
* @see javax.sql.DataSource#setLoginTimeout(int)
*/
+ @Override
public void setLoginTimeout( int seconds ) throws SQLException
{
this.m_timeout = seconds;
@@ -136,6 +141,7 @@ public class TestJDBCDataSource implements DataSource
* @param out the log writer
* @see javax.sql.DataSource#setLogWriter(java.io.PrintWriter)
*/
+ @Override
public void setLogWriter( PrintWriter out ) throws SQLException
{
this.m_writer = out;
@@ -146,6 +152,7 @@ public class TestJDBCDataSource implements DataSource
* the Logger farthest from the root Logger that is still an ancestor of all of the Loggers used by this data source. Configuring this Logger will affect all of the log messages generated by the data source. In the worst case, this may be the root Logger.
* @return the parent Logger for this data source
*/
+ @Override
public Logger getParentLogger()
{
return null;
@@ -179,22 +186,25 @@ public class TestJDBCDataSource implements DataSource
// Load the driver using the sytem class loader
final ClassLoader parent = ClassLoader.getSystemClassLoader();
URLClassLoader loader = AccessController.doPrivileged( new PrivilegedAction<URLClassLoader>() {
+ @Override
public URLClassLoader run() {
return new URLClassLoader( new URL[] { driverURL }, parent );
}
});
- Class driverClass = loader.loadClass( clazz );
+ Class< ? > driverClass = loader.loadClass( clazz );
// Cache the driver
m_driver = (Driver) driverClass.newInstance();
}
+ @Override
public boolean isWrapperFor( Class<?> arg0 ) throws SQLException
{
// unused interface methods required for JDK 6
return false;
}
+ @Override
public <T> T unwrap( Class<T> arg0 ) throws SQLException
{
// unused interface methods required for JDK 6
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/Util.java b/jspwiki-main/src/test/java/org/apache/wiki/Util.java
index 5c1ed57..77c2ff1 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/Util.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/Util.java
@@ -21,6 +21,7 @@ package org.apache.wiki;
import java.util.Collection;
import java.util.Iterator;
+
/**
* Utilities for tests.
*/
@@ -29,10 +30,9 @@ public class Util
/**
* Check that a collection contains the required string.
*/
- public static boolean collectionContains( Collection container,
- String captive )
+ public static boolean collectionContains( Collection< ? > container, String captive )
{
- Iterator i = container.iterator();
+ Iterator< ? > i = container.iterator();
while( i.hasNext() )
{
Object cap = i.next();