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 e7c35b14bf4d65f254e12ac24956a41287dd8c7d Author: juanpablo <[email protected]> AuthorDate: Fri Dec 6 23:27:32 2019 +0100 use method from TextUtil --- .../org/apache/wiki/pages/DefaultPageManager.java | 6 ++-- .../wiki/providers/CachingAttachmentProvider.java | 38 ++++++++++++---------- .../org/apache/wiki/providers/CachingProvider.java | 36 +++++++++++--------- 3 files changed, 45 insertions(+), 35 deletions(-) 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 7a305f6..0f508c5 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 @@ -53,6 +53,7 @@ import java.util.Date; import java.util.Enumeration; import java.util.Iterator; import java.util.List; +import java.util.NoSuchElementException; import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; @@ -91,9 +92,10 @@ public class DefaultPageManager extends ModuleManager implements PageManager { * * @param engine WikiEngine instance * @param props Properties to use for initialization + * @throws NoSuchElementException {@value #PROP_PAGEPROVIDER} property not found on WikiEngine properties * @throws WikiException If anything goes wrong, you get this. */ - public DefaultPageManager(WikiEngine engine, Properties props) throws WikiException { + public DefaultPageManager(WikiEngine engine, Properties props) throws NoSuchElementException, WikiException { super(engine); String classname; m_engine = engine; @@ -107,7 +109,7 @@ public class DefaultPageManager extends ModuleManager implements PageManager { if (useCache) { classname = "org.apache.wiki.providers.CachingProvider"; } else { - classname = m_engine.getRequiredProperty(props, PROP_PAGEPROVIDER); + classname = TextUtil.getRequiredProperty(props, PROP_PAGEPROVIDER); } pageSorter.initialize( props ); diff --git a/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java index c089a68..930f8af 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java @@ -18,15 +18,9 @@ */ package org.apache.wiki.providers; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.Iterator; -import java.util.List; -import java.util.Properties; - +import net.sf.ehcache.Cache; +import net.sf.ehcache.CacheManager; +import net.sf.ehcache.Element; import org.apache.log4j.Logger; import org.apache.wiki.WikiEngine; import org.apache.wiki.WikiPage; @@ -37,10 +31,18 @@ import org.apache.wiki.attachment.Attachment; import org.apache.wiki.attachment.AttachmentManager; import org.apache.wiki.search.QueryItem; import org.apache.wiki.util.ClassUtil; +import org.apache.wiki.util.TextUtil; + +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.Iterator; +import java.util.List; +import java.util.NoSuchElementException; +import java.util.Properties; -import net.sf.ehcache.Cache; -import net.sf.ehcache.CacheManager; -import net.sf.ehcache.Element; /** * Provides a caching attachment provider. This class rests on top of a @@ -95,10 +97,7 @@ public class CachingAttachmentProvider * {@inheritDoc} */ @Override - public void initialize( WikiEngine engine, Properties properties ) - throws NoRequiredPropertyException, - IOException - { + public void initialize( WikiEngine engine, Properties properties ) throws NoRequiredPropertyException, IOException { log.info("Initing CachingAttachmentProvider"); String attCollCacheName = engine.getApplicationName() + "." + ATTCOLLCACHE_NAME; @@ -122,7 +121,12 @@ public class CachingAttachmentProvider // // Find and initialize real provider. // - String classname = engine.getRequiredProperty( properties, AttachmentManager.PROP_PROVIDER ); + final String classname; + try { + classname = TextUtil.getRequiredProperty( properties, AttachmentManager.PROP_PROVIDER ); + } catch( final NoSuchElementException e ) { + throw new NoRequiredPropertyException( e.getMessage(), AttachmentManager.PROP_PROVIDER ); + } try { 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 6ae54c2..234d74b 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,14 +18,9 @@ */ package org.apache.wiki.providers; -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; import org.apache.log4j.Logger; import org.apache.wiki.WikiContext; import org.apache.wiki.WikiEngine; @@ -38,10 +33,16 @@ import org.apache.wiki.render.RenderingManager; import org.apache.wiki.search.QueryItem; import org.apache.wiki.search.SearchResult; import org.apache.wiki.util.ClassUtil; +import org.apache.wiki.util.TextUtil; -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.NoSuchElementException; +import java.util.Properties; +import java.util.TreeSet; /** @@ -105,14 +106,13 @@ public class CachingProvider implements WikiPageProvider { * {@inheritDoc} */ @Override - public void initialize( WikiEngine engine, Properties properties ) - throws NoRequiredPropertyException, IOException { + public void initialize( final WikiEngine engine, final Properties properties ) throws NoRequiredPropertyException, IOException { log.debug("Initing CachingProvider"); // engine is used for getting the search engine m_engine = engine; - String cacheName = engine.getApplicationName() + "." + CACHE_NAME; + final String cacheName = engine.getApplicationName() + "." + CACHE_NAME; if (m_cacheManager.cacheExists(cacheName)) { m_cache = m_cacheManager.getCache(cacheName); } else { @@ -145,8 +145,12 @@ public class CachingProvider implements WikiPageProvider { // // Find and initialize real provider. // - String classname = m_engine.getRequiredProperty( properties, PageManager.PROP_PAGEPROVIDER ); - + final String classname; + try { + classname = TextUtil.getRequiredProperty( properties, PageManager.PROP_PAGEPROVIDER ); + } catch( final NoSuchElementException e ) { + throw new NoRequiredPropertyException( e.getMessage(), PageManager.PROP_PAGEPROVIDER ); + } try {
