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 b0c03d701f6cde1abcc5989dfb0bc2c85223a302 Author: juanpablo <[email protected]> AuthorDate: Sat Dec 16 22:06:32 2017 +0100 conversions to enhanced for loops where possible --- .../org/apache/wiki/xmlrpc/AbstractRPCHandler.java | 30 ++++++++-------- .../org/apache/wiki/xmlrpc/MetaWeblogHandler.java | 4 +-- .../java/org/apache/wiki/xmlrpc/RPCHandler.java | 27 +++++++-------- .../org/apache/wiki/xmlrpc/RPCHandlerUTF8.java | 40 +++++++++------------- .../java/org/apache/wiki/xmlrpc/RPCServlet.java | 6 ++-- 5 files changed, 47 insertions(+), 60 deletions(-) diff --git a/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java b/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java index cb43afd..5b21b80 100644 --- a/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java +++ b/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/AbstractRPCHandler.java @@ -1,4 +1,4 @@ -/* +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information @@ -14,7 +14,7 @@ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations - under the License. + under the License. */ package org.apache.wiki.xmlrpc; @@ -60,8 +60,8 @@ public abstract class AbstractRPCHandler protected WikiEngine m_engine; protected WikiContext m_context; - - + + /** * This is the currently implemented JSPWiki XML-RPC code revision. */ @@ -78,19 +78,17 @@ public abstract class AbstractRPCHandler public Vector getRecentChanges( Date since ) { checkPermission( PagePermission.VIEW ); - Collection pages = m_engine.getRecentChanges(); - Vector<Hashtable<?, ?>> result = new Vector<Hashtable<?, ?>>(); + Collection< WikiPage > pages = m_engine.getRecentChanges(); + Vector< Hashtable< ?, ? > > result = new Vector<Hashtable< ?, ? > >(); // Transform UTC into local time. Calendar cal = Calendar.getInstance(); cal.setTime( since ); - cal.add( Calendar.MILLISECOND, cal.get( Calendar.ZONE_OFFSET ) + + cal.add( Calendar.MILLISECOND, cal.get( Calendar.ZONE_OFFSET ) + (cal.getTimeZone().inDaylightTime( since ) ? cal.get( Calendar.DST_OFFSET ) : 0 ) ); - for( Iterator i = pages.iterator(); i.hasNext(); ) + for( WikiPage page : pages ) { - WikiPage page = (WikiPage)i.next(); - if( page.getLastModified().after( cal.getTime() ) ) { result.add( encodeWikiPage( page ) ); @@ -101,28 +99,28 @@ public abstract class AbstractRPCHandler } /** - * Checks whether the current user has permission to perform the RPC action; + * Checks whether the current user has permission to perform the RPC action; * throws an exception if not allowed by {@link org.apache.wiki.auth.AuthorizationManager}. - * + * * @param perm the Permission to check */ protected void checkPermission( Permission perm ) { AuthorizationManager mgr = m_engine.getAuthorizationManager(); - + if( mgr.checkPermission( m_context.getWikiSession(), perm ) ) return; - + throw new AuthenticationFailed( "You have no access to this resource, o master" ); } - + /** * Returns the current supported JSPWiki XML-RPC API. */ public int getRPCVersionSupported() { checkPermission( WikiPermission.LOGIN ); - + return RPC_VERSION; } } diff --git a/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java b/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java index 42acb4e..7b287b9 100644 --- a/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java +++ b/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java @@ -218,9 +218,9 @@ public class MetaWeblogHandler Collections.sort( changed, new PageTimeComparator() ); int items = 0; - for( Iterator i = changed.iterator(); i.hasNext() && items < numberOfPosts; items++ ) + for( Iterator< WikiPage > i = changed.iterator(); i.hasNext() && items < numberOfPosts; items++ ) { - WikiPage p = (WikiPage) i.next(); + WikiPage p = i.next(); result.put( "entry", makeEntry( p ) ); } diff --git a/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java b/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java index e5cab19..82fc4d3 100644 --- a/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java +++ b/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCHandler.java @@ -1,4 +1,4 @@ -/* +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information @@ -14,7 +14,7 @@ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations - under the License. + under the License. */ package org.apache.wiki.xmlrpc; @@ -47,7 +47,7 @@ import org.apache.xmlrpc.XmlRpcException; public class RPCHandler extends AbstractRPCHandler { - private static Logger log = Logger.getLogger( RPCHandler.class ); + private static Logger log = Logger.getLogger( RPCHandler.class ); /** * {@inheritDoc} @@ -103,12 +103,11 @@ public class RPCHandler public Vector getAllPages() { checkPermission( PagePermission.VIEW ); - Collection pages = m_engine.getRecentChanges(); + Collection< WikiPage > pages = m_engine.getRecentChanges(); Vector<String> result = new Vector<String>(); - for( Iterator i = pages.iterator(); i.hasNext(); ) + for( WikiPage p : pages ) { - WikiPage p = (WikiPage) i.next(); if( !(p instanceof Attachment) ) { result.add( toRPCString(p.getName()) ); @@ -138,8 +137,8 @@ public class RPCHandler Calendar cal = Calendar.getInstance(); cal.setTime( d ); - cal.add( Calendar.MILLISECOND, - - (cal.get( Calendar.ZONE_OFFSET ) + + cal.add( Calendar.MILLISECOND, + - (cal.get( Calendar.ZONE_OFFSET ) + (cal.getTimeZone().inDaylightTime( d ) ? cal.get( Calendar.DST_OFFSET ) : 0 )) ); ht.put( "lastModified", cal.getTime() ); @@ -156,7 +155,7 @@ public class RPCHandler public Vector getRecentChanges( Date since ) { checkPermission( PagePermission.VIEW ); - Collection pages = m_engine.getRecentChanges(); + Collection< WikiPage > pages = m_engine.getRecentChanges(); Vector<Hashtable<String, Object>> result = new Vector<Hashtable<String, Object>>(); Calendar cal = Calendar.getInstance(); @@ -170,10 +169,8 @@ public class RPCHandler (cal.getTimeZone().inDaylightTime(since) ? cal.get( Calendar.DST_OFFSET ) : 0 ) ) ); since = cal.getTime(); - for( Iterator i = pages.iterator(); i.hasNext(); ) + for( WikiPage page : pages ) { - WikiPage page = (WikiPage)i.next(); - if( page.getLastModified().after( since ) && !(page instanceof Attachment) ) { result.add( encodeWikiPage( page ) ); @@ -202,9 +199,9 @@ public class RPCHandler } WikiPage p = m_engine.getPage( pagename ); - + checkPermission( PermissionFactory.getPagePermission( p, PagePermission.VIEW_ACTION ) ); - + return pagename; } @@ -242,7 +239,7 @@ public class RPCHandler } public byte[] getPageHTML( String pagename ) - throws XmlRpcException + throws XmlRpcException { pagename = parsePageCheckCondition( pagename ); diff --git a/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java b/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java index 5fee6b3..667c7fc 100644 --- a/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java +++ b/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCHandlerUTF8.java @@ -1,4 +1,4 @@ -/* +/* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information @@ -14,7 +14,7 @@ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations - under the License. + under the License. */ package org.apache.wiki.xmlrpc; @@ -47,21 +47,19 @@ public class RPCHandlerUTF8 public String getApplicationName() { checkPermission( PagePermission.VIEW ); - + return m_engine.getApplicationName(); } public Vector getAllPages() { checkPermission( PagePermission.VIEW ); - - Collection pages = m_engine.getRecentChanges(); + + Collection< WikiPage > pages = m_engine.getRecentChanges(); Vector<String> result = new Vector<String>(); - for( Iterator i = pages.iterator(); i.hasNext(); ) + for( WikiPage p : pages ) { - WikiPage p = (WikiPage) i.next(); - if( !(p instanceof Attachment) ) { result.add( p.getName() ); @@ -91,8 +89,8 @@ public class RPCHandlerUTF8 Calendar cal = Calendar.getInstance(); cal.setTime( d ); - cal.add( Calendar.MILLISECOND, - - (cal.get( Calendar.ZONE_OFFSET ) + + cal.add( Calendar.MILLISECOND, + - (cal.get( Calendar.ZONE_OFFSET ) + (cal.getTimeZone().inDaylightTime( d ) ? cal.get( Calendar.DST_OFFSET ) : 0 )) ); ht.put( "lastModified", cal.getTime() ); @@ -109,8 +107,8 @@ public class RPCHandlerUTF8 public Vector getRecentChanges( Date since ) { checkPermission( PagePermission.VIEW ); - - Collection pages = m_engine.getRecentChanges(); + + Collection< WikiPage > pages = m_engine.getRecentChanges(); Vector<Hashtable<String, Object>> result = new Vector<Hashtable<String, Object>>(); Calendar cal = Calendar.getInstance(); @@ -124,10 +122,8 @@ public class RPCHandlerUTF8 (cal.getTimeZone().inDaylightTime(since) ? cal.get( Calendar.DST_OFFSET ) : 0 ) ) ); since = cal.getTime(); - for( Iterator i = pages.iterator(); i.hasNext(); ) + for( WikiPage page : pages ) { - WikiPage page = (WikiPage)i.next(); - if( page.getLastModified().after( since ) && !(page instanceof Attachment) ) { result.add( encodeWikiPage( page ) ); @@ -154,7 +150,7 @@ public class RPCHandlerUTF8 } WikiPage p = m_engine.getPage( pagename ); - + checkPermission( PermissionFactory.getPagePermission( p, PagePermission.VIEW_ACTION ) ); return pagename; } @@ -163,7 +159,7 @@ public class RPCHandlerUTF8 throws XmlRpcException { pagename = parsePageCheckCondition( pagename ); - + return encodeWikiPage( m_engine.getPage(pagename) ); } @@ -194,7 +190,7 @@ public class RPCHandlerUTF8 } public String getPageHTML( String pagename ) - throws XmlRpcException + throws XmlRpcException { pagename = parsePageCheckCondition( pagename ); @@ -259,10 +255,8 @@ public class RPCHandlerUTF8 // // Add links to inline attachments // - for( Iterator i = attCollector.getLinks().iterator(); i.hasNext(); ) + for( String link : attCollector.getLinks() ) { - String link = (String) i.next(); - Hashtable<String, String> ht = new Hashtable<String, String>(); ht.put( "page", link ); @@ -277,10 +271,8 @@ public class RPCHandlerUTF8 // simply because URLs are by definition ASCII. // - for( Iterator i = extCollector.getLinks().iterator(); i.hasNext(); ) + for( String link : extCollector.getLinks() ) { - String link = (String) i.next(); - Hashtable<String, String> ht = new Hashtable<String, String>(); ht.put( "page", link ); diff --git a/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java b/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java index b470dc7..ef23d4c 100644 --- a/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java +++ b/jspwiki-war/src/main/java/org/apache/wiki/xmlrpc/RPCServlet.java @@ -75,7 +75,7 @@ public class RPCServlet extends HttpServlet rpchandler.initialize( m_engine ); m_xmlrpcServer.addHandler( prefix, rpchandler ); */ - Class handlerClass = Class.forName( handlerName ); + Class< ? > handlerClass = Class.forName( handlerName ); m_xmlrpcServer.addHandler( prefix, new LocalHandler(handlerClass) ); } @@ -179,9 +179,9 @@ public class RPCServlet extends HttpServlet private static class LocalHandler implements ContextXmlRpcHandler { - private Class m_clazz; + private Class< ? > m_clazz; - public LocalHandler( Class clazz ) + public LocalHandler( Class< ? > clazz ) { m_clazz = clazz; } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
