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 f44500b650582c9977b871472c15586dad8f5c72 Author: juanpablo <[email protected]> AuthorDate: Mon Feb 24 17:16:57 2020 +0100 JSPWIKI-120: propagate WikiContext#getEngine() now returns Engine instead of WikiEngine (9) --- .../org/apache/wiki/ui/DefaultCommandResolver.java | 5 +- .../src/main/java/org/apache/wiki/ui/Editor.java | 2 +- .../java/org/apache/wiki/ui/admin/AdminBean.java | 4 +- .../org/apache/wiki/ui/admin/SimpleAdminBean.java | 22 +++--- .../apache/wiki/ui/admin/WikiFormAdminBean.java | 23 +++--- .../org/apache/wiki/ui/admin/beans/CoreBean.java | 17 ++--- .../org/apache/wiki/ui/admin/beans/FilterBean.java | 24 +++---- .../org/apache/wiki/ui/admin/beans/ModuleBean.java | 30 ++++---- .../wiki/ui/admin/beans/PlainEditorAdminBean.java | 57 +++++++-------- .../org/apache/wiki/ui/admin/beans/PluginBean.java | 24 +++---- .../wiki/ui/admin/beans/SearchManagerBean.java | 81 ++++++++++------------ .../org/apache/wiki/ui/admin/beans/UserBean.java | 51 +++++++------- 12 files changed, 161 insertions(+), 179 deletions(-) diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultCommandResolver.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultCommandResolver.java index 65348ed..ce25685 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultCommandResolver.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultCommandResolver.java @@ -25,6 +25,7 @@ import org.apache.wiki.WikiPage; import org.apache.wiki.WikiProvider; import org.apache.wiki.api.exceptions.ProviderException; import org.apache.wiki.auth.GroupPrincipal; +import org.apache.wiki.pages.PageManager; import org.apache.wiki.parser.MarkupParser; import org.apache.wiki.util.TextUtil; @@ -304,7 +305,7 @@ public final class DefaultCommandResolver implements CommandResolver { } } - WikiPage wikipage = m_engine.getPageManager().getPage( page, version ); + WikiPage wikipage = m_engine.getManager( PageManager.class ).getPage( page, version ); if ( wikipage == null ) { page = MarkupParser.cleanLink( page ); wikipage = new WikiPage( m_engine, page ); @@ -324,7 +325,7 @@ public final class DefaultCommandResolver implements CommandResolver { if ( m_specialPages.containsKey( page ) ) { return true; } - return m_engine.getPageManager().pageExists( page ); + return m_engine.getManager( PageManager.class ).pageExists( page ); } } diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/Editor.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/Editor.java index 9c35e45..17df105 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/Editor.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/Editor.java @@ -34,7 +34,7 @@ public class Editor { public Editor( final WikiContext wikiContext, final String editorName ) { m_wikiContext = wikiContext; m_editorName = editorName; - m_editorManager = wikiContext.getEngine().getEditorManager(); + m_editorManager = wikiContext.getEngine().getManager( EditorManager.class ); } public String getName() { diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/AdminBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/AdminBean.java index 92bb7f8..1805824 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/AdminBean.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/AdminBean.java @@ -18,7 +18,7 @@ */ package org.apache.wiki.ui.admin; -import org.apache.wiki.WikiEngine; +import org.apache.wiki.api.core.Engine; import org.apache.wiki.ui.GenericHTTPHandler; @@ -33,7 +33,7 @@ public interface AdminBean extends GenericHTTPHandler { int CORE = 1; int EDITOR = 2; - void initialize( WikiEngine engine ); + void initialize( Engine engine ); /** * Return a human-readable title for this AdminBean. diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/SimpleAdminBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/SimpleAdminBean.java index a5a9c34..b1e0ed5 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/SimpleAdminBean.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/SimpleAdminBean.java @@ -20,7 +20,7 @@ package org.apache.wiki.ui.admin; import org.apache.commons.lang3.StringUtils; import org.apache.wiki.WikiContext; -import org.apache.wiki.WikiEngine; +import org.apache.wiki.api.core.Engine; import org.apache.wiki.management.SimpleMBean; import javax.management.MBeanAttributeInfo; @@ -41,7 +41,7 @@ public abstract class SimpleAdminBean extends SimpleMBean implements AdminBean * Provides access to a WikiEngine instance to which this AdminBean * belongs to. */ - protected WikiEngine m_engine; + protected Engine m_engine; /** * Constructor reserved for subclasses only. @@ -56,7 +56,7 @@ public abstract class SimpleAdminBean extends SimpleMBean implements AdminBean /** * Initialize the AdminBean by setting up a WikiEngine instance internally. */ - public void initialize( WikiEngine engine ) + @Override public void initialize( final Engine engine ) { m_engine = engine; } @@ -67,11 +67,11 @@ public abstract class SimpleAdminBean extends SimpleMBean implements AdminBean * attribute is read-only, a readonly input widget is created. * The value is determined by the toString() method of the attribute. */ - public String doGet(WikiContext context) + @Override public String doGet( final WikiContext context) { - MBeanInfo info = getMBeanInfo(); - MBeanAttributeInfo[] attributes = info.getAttributes(); - StringBuilder sb = new StringBuilder(); + final MBeanInfo info = getMBeanInfo(); + final MBeanAttributeInfo[] attributes = info.getAttributes(); + final StringBuilder sb = new StringBuilder(); for( int i = 0; i < attributes.length; i++ ) { @@ -81,7 +81,7 @@ public abstract class SimpleAdminBean extends SimpleMBean implements AdminBean try { - Object value = getAttribute( attributes[i].getName() ); + final Object value = getAttribute( attributes[i].getName() ); if( attributes[i].isWritable() ) { sb.append( "<input type='text' name='question' size='30' value='"+value+"' />\n" ); @@ -91,7 +91,7 @@ public abstract class SimpleAdminBean extends SimpleMBean implements AdminBean sb.append( "<input type='text' class='readonly' readonly='true' size='30' value='"+value+"' />\n" ); } } - catch( Exception e ) + catch( final Exception e ) { sb.append("Exception: "+e.getMessage()); } @@ -106,7 +106,7 @@ public abstract class SimpleAdminBean extends SimpleMBean implements AdminBean /** * Not implemented yet. */ - public String doPost(WikiContext context) + @Override public String doPost( final WikiContext context) { // TODO Auto-generated method stub return null; @@ -116,7 +116,7 @@ public abstract class SimpleAdminBean extends SimpleMBean implements AdminBean * By default, this method returns the class name of the bean. This is * suitable, if you have a singleton bean. */ - public String getId() + @Override public String getId() { return getClass().getName(); } diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java index dd11b18..3ca2668 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/WikiFormAdminBean.java @@ -18,16 +18,15 @@ */ package org.apache.wiki.ui.admin; -import java.io.IOException; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.apache.wiki.WikiContext; import org.apache.wiki.parser.WikiDocument; import org.apache.wiki.render.RenderingManager; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Map; + /** * This class is still experimental. * @@ -39,21 +38,21 @@ public abstract class WikiFormAdminBean public abstract void handleResponse( WikiContext context, Map< ?, ? > params ); - public String doGet(WikiContext context) + @Override public String doGet( final WikiContext context) { String result = ""; - String wikiMarkup = getForm(context); + final String wikiMarkup = getForm(context); - RenderingManager mgr = context.getEngine().getRenderingManager(); + final RenderingManager mgr = context.getEngine().getManager( RenderingManager.class ); - WikiDocument doc; + final WikiDocument doc; try { doc = mgr.getParser( context, wikiMarkup ).parse(); result = mgr.getHTML(context, doc); } - catch (IOException e) + catch ( final IOException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -62,7 +61,7 @@ public abstract class WikiFormAdminBean return result; } - public String handlePost(WikiContext context, HttpServletRequest req, HttpServletResponse resp) + public String handlePost( final WikiContext context, final HttpServletRequest req, final HttpServletResponse resp) { return null; // FIXME: Not yet implemented diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/CoreBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/CoreBean.java index 0a8e7d2..7d201df 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/CoreBean.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/CoreBean.java @@ -19,7 +19,8 @@ package org.apache.wiki.ui.admin.beans; import org.apache.wiki.Release; -import org.apache.wiki.WikiEngine; +import org.apache.wiki.api.core.Engine; +import org.apache.wiki.pages.PageManager; import org.apache.wiki.ui.admin.SimpleAdminBean; import javax.management.NotCompliantMBeanException; @@ -33,7 +34,7 @@ public class CoreBean extends SimpleAdminBean { private static final String[] ATTRIBUTES = { "pages", "version" }; private static final String[] METHODS = { }; - public CoreBean( final WikiEngine engine ) throws NotCompliantMBeanException { + public CoreBean( final Engine engine ) throws NotCompliantMBeanException { m_engine = engine; } @@ -43,7 +44,7 @@ public class CoreBean extends SimpleAdminBean { * @return the page content */ public int getPages() { - return m_engine.getPageManager().getTotalPageCount(); + return m_engine.getManager( PageManager.class ).getTotalPageCount(); } public String getPagesDescription() @@ -61,27 +62,27 @@ public class CoreBean extends SimpleAdminBean { return "The JSPWiki engine version"; } - public String getTitle() + @Override public String getTitle() { return "Core bean"; } - public int getType() + @Override public int getType() { return CORE; } - public String getId() + @Override public String getId() { return "corebean"; } - public String[] getAttributeNames() + @Override public String[] getAttributeNames() { return ATTRIBUTES; } - public String[] getMethodNames() + @Override public String[] getMethodNames() { return METHODS; } diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/FilterBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/FilterBean.java index 8d952bc..3b47696 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/FilterBean.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/FilterBean.java @@ -18,34 +18,34 @@ */ package org.apache.wiki.ui.admin.beans; -import java.util.Collection; - -import javax.management.NotCompliantMBeanException; - -import org.apache.wiki.WikiEngine; +import org.apache.wiki.api.core.Engine; +import org.apache.wiki.api.engine.FilterManager; import org.apache.wiki.modules.WikiModuleInfo; import org.apache.wiki.util.XHTML; import org.apache.wiki.util.XhtmlUtil; import org.jdom2.Element; +import javax.management.NotCompliantMBeanException; +import java.util.Collection; + public class FilterBean extends ModuleBean { - public FilterBean( WikiEngine engine ) throws NotCompliantMBeanException { + public FilterBean( final Engine engine ) throws NotCompliantMBeanException { super( engine ); } /** * {@inheritDoc} */ - public String getTitle() { + @Override public String getTitle() { return "Filters"; } /** * {@inheritDoc} */ - public int getType() { + @Override public int getType() { return CORE; } @@ -54,7 +54,7 @@ public class FilterBean extends ModuleBean { */ @Override protected Collection< WikiModuleInfo > modules() { - return m_engine.getFilterManager().modules(); + return m_engine.getManager( FilterManager.class ).modules(); } /** @@ -62,7 +62,7 @@ public class FilterBean extends ModuleBean { */ @Override protected Element heading() { - Element trHead = XhtmlUtil.element( XHTML.tr ); + final Element trHead = XhtmlUtil.element( XHTML.tr ); trHead.addContent( XhtmlUtil.element( XHTML.th ).addContent( "Name" ) ) .addContent( XhtmlUtil.element( XHTML.th ).addContent( "Author" ) ) .addContent( XhtmlUtil.element( XHTML.th ).addContent( "Notes" ) ); @@ -73,8 +73,8 @@ public class FilterBean extends ModuleBean { * {@inheritDoc} */ @Override - protected Element rowBody( WikiModuleInfo info ) { - Element tr = XhtmlUtil.element( XHTML.tr ); + protected Element rowBody( final WikiModuleInfo info ) { + final Element tr = XhtmlUtil.element( XHTML.tr ); tr.addContent( XhtmlUtil.element( XHTML.td ).addContent( info.getName() ) ) .addContent( XhtmlUtil.element( XHTML.td ).addContent( info.getAuthor() ) ) .addContent( XhtmlUtil.element( XHTML.td ).addContent( validModuleVersion( info ) ) ); diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java index f6340ad..aa84a5f 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/ModuleBean.java @@ -21,7 +21,7 @@ package org.apache.wiki.ui.admin.beans; import org.apache.commons.lang3.StringUtils; import org.apache.wiki.Release; import org.apache.wiki.WikiContext; -import org.apache.wiki.WikiEngine; +import org.apache.wiki.api.core.Engine; import org.apache.wiki.modules.WikiModuleInfo; import org.apache.wiki.ui.admin.SimpleAdminBean; import org.apache.wiki.util.XHTML; @@ -37,37 +37,37 @@ public abstract class ModuleBean extends SimpleAdminBean { private static final String VER_WARNING = "<span class='warning'>This module is not compatible with this version of JSPWiki.</span>"; - public ModuleBean( WikiEngine engine ) throws NotCompliantMBeanException { + public ModuleBean( final Engine engine ) throws NotCompliantMBeanException { m_engine = engine; } /** * {@inheritDoc} */ - public String[] getAttributeNames() { + @Override public String[] getAttributeNames() { return new String[0]; } /** * {@inheritDoc} */ - public String[] getMethodNames() { + @Override public String[] getMethodNames() { return new String[0]; } /** * {@inheritDoc} */ - public String doGet( WikiContext context ) { - Collection< WikiModuleInfo > filters = modules(); - Element root = title(); - Element tb = containerForModuleDetail( root ); + @Override public String doGet( final WikiContext context ) { + final Collection< WikiModuleInfo > filters = modules(); + final Element root = title(); + final Element tb = containerForModuleDetail( root ); - Element trHead = heading(); + final Element trHead = heading(); tb.addContent( trHead ); - for( WikiModuleInfo info : filters ) { - Element tr = rowBody( info ); + for( final WikiModuleInfo info : filters ) { + final Element tr = rowBody( info ); tb.addContent( tr ); } @@ -75,13 +75,13 @@ public abstract class ModuleBean extends SimpleAdminBean { } protected Element title() { - Element root = XhtmlUtil.element( XHTML.div ); + final Element root = XhtmlUtil.element( XHTML.div ); root.addContent( XhtmlUtil.element( XHTML.h4 ).addContent( getTitle() ) ); return root; } - protected Element containerForModuleDetail( Element root ) { - Element tb = XhtmlUtil.element( XHTML.table ).setAttribute( "border", "1" ); + protected Element containerForModuleDetail( final Element root ) { + final Element tb = XhtmlUtil.element( XHTML.table ).setAttribute( "border", "1" ); root.addContent( tb ); return tb; } @@ -108,7 +108,7 @@ public abstract class ModuleBean extends SimpleAdminBean { */ protected abstract Element rowBody( WikiModuleInfo module ); - protected String validModuleVersion( WikiModuleInfo info ) { + protected String validModuleVersion( final WikiModuleInfo info ) { return Release.isNewerOrEqual( info.getMinVersion() ) && Release.isOlderOrEqual( info.getMaxVersion() ) ? StringUtils.EMPTY : VER_WARNING; diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PlainEditorAdminBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PlainEditorAdminBean.java index b2fc5ea..0ac1d9b 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PlainEditorAdminBean.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PlainEditorAdminBean.java @@ -18,44 +18,39 @@ */ package org.apache.wiki.ui.admin.beans; -import javax.management.NotCompliantMBeanException; -import javax.servlet.http.HttpServletRequest; - import org.apache.wiki.WikiContext; -import org.apache.wiki.WikiEngine; -import org.apache.wiki.ui.admin.AdminBean; +import org.apache.wiki.api.core.Engine; import org.apache.wiki.management.SimpleMBean; +import org.apache.wiki.ui.admin.AdminBean; import org.apache.wiki.util.TextUtil; +import javax.management.NotCompliantMBeanException; +import javax.servlet.http.HttpServletRequest; + /** * This class is still experimental. * * */ -public class PlainEditorAdminBean - extends SimpleMBean - implements AdminBean -{ - private static final String TEMPLATE = - "<div>"+ - "<input type='checkbox' id='ajax' %checked/>Use AJAX?<br />"+ - "<input type='submit' value='Submit'/>"+ - "%messages"+ - "</div>" - ; +public class PlainEditorAdminBean extends SimpleMBean implements AdminBean { + + private static final String TEMPLATE = "<div>"+ + "<input type='checkbox' id='ajax' %checked/>Use AJAX?<br />" + + "<input type='submit' value='Submit'/>" + + "%messages" + + "</div>"; private boolean m_checked; private static final String[] ATTRIBUTES = {"title","checked"}; private static final String[] METHODS = {}; - public PlainEditorAdminBean() throws NotCompliantMBeanException - { + public PlainEditorAdminBean() throws NotCompliantMBeanException { } - public String doGet(WikiContext context) + @Override public String doGet( final WikiContext context) { - HttpServletRequest req = context.getHttpRequest(); + final HttpServletRequest req = context.getHttpRequest(); if( req != null && req.getMethod().equals("POST") && getTitle().equals( req.getParameter("form") ) ) { @@ -69,11 +64,11 @@ public class PlainEditorAdminBean return base; } - public String doPost( WikiContext context ) + @Override public String doPost( final WikiContext context ) { - HttpServletRequest req = context.getHttpRequest(); + final HttpServletRequest req = context.getHttpRequest(); - boolean checked = "checked".equals( req.getParameter( "id" ) ); + final boolean checked = "checked".equals( req.getParameter( "id" ) ); // Make changes @@ -85,12 +80,12 @@ public class PlainEditorAdminBean return base; } - public String getTitle() + @Override public String getTitle() { return "Plain editor"; } - public int getType() + @Override public int getType() { return EDITOR; } @@ -100,7 +95,7 @@ public class PlainEditorAdminBean return true; } - public String getId() + @Override public String getId() { return "editor.plain"; } @@ -110,19 +105,17 @@ public class PlainEditorAdminBean return m_checked; } - public String[] getAttributeNames() + @Override public String[] getAttributeNames() { return ATTRIBUTES; } - public String[] getMethodNames() + @Override public String[] getMethodNames() { return METHODS; } - public void initialize(WikiEngine engine) - { - // TODO Auto-generated method stub - + @Override public void initialize( final Engine engine ) { } + } diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PluginBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PluginBean.java index 175fe9a..704567b 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PluginBean.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/PluginBean.java @@ -18,35 +18,35 @@ */ package org.apache.wiki.ui.admin.beans; -import java.util.Collection; - -import javax.management.NotCompliantMBeanException; - -import org.apache.wiki.WikiEngine; +import org.apache.wiki.api.core.Engine; +import org.apache.wiki.api.engine.PluginManager; import org.apache.wiki.modules.WikiModuleInfo; import org.apache.wiki.plugin.DefaultPluginManager.WikiPluginInfo; import org.apache.wiki.util.XHTML; import org.apache.wiki.util.XhtmlUtil; import org.jdom2.Element; +import javax.management.NotCompliantMBeanException; +import java.util.Collection; + public class PluginBean extends ModuleBean { - public PluginBean( WikiEngine engine ) throws NotCompliantMBeanException { + public PluginBean( final Engine engine ) throws NotCompliantMBeanException { super( engine ); } /** * {@inheritDoc} */ - public String getTitle() { + @Override public String getTitle() { return "Plugins"; } /** * {@inheritDoc} */ - public int getType() { + @Override public int getType() { return CORE; } @@ -55,7 +55,7 @@ public class PluginBean extends ModuleBean { */ @Override protected Collection< WikiModuleInfo > modules() { - return m_engine.getPluginManager().modules(); + return m_engine.getManager( PluginManager.class ).modules(); } /** @@ -63,7 +63,7 @@ public class PluginBean extends ModuleBean { */ @Override protected Element heading() { - Element trHead = XhtmlUtil.element( XHTML.tr ); + final Element trHead = XhtmlUtil.element( XHTML.tr ); trHead.addContent( XhtmlUtil.element( XHTML.th ).addContent( "Name" ) ) .addContent( XhtmlUtil.element( XHTML.th ).addContent( "Alias" ) ) .addContent( XhtmlUtil.element( XHTML.th ).addContent( "Author" ) ) @@ -75,8 +75,8 @@ public class PluginBean extends ModuleBean { * {@inheritDoc} */ @Override - protected Element rowBody( WikiModuleInfo plugin ) { - Element tr = XhtmlUtil.element( XHTML.tr ); + protected Element rowBody( final WikiModuleInfo plugin ) { + final Element tr = XhtmlUtil.element( XHTML.tr ); tr.addContent( XhtmlUtil.element( XHTML.td ).addContent( plugin.getName() ) ) .addContent( XhtmlUtil.element( XHTML.td ).addContent( ( ( WikiPluginInfo )plugin).getAlias() ) ) .addContent( XhtmlUtil.element( XHTML.td ).addContent( plugin.getAuthor() ) ) diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/SearchManagerBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/SearchManagerBean.java index 99ad0f9..98b6988 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/SearchManagerBean.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/SearchManagerBean.java @@ -18,17 +18,19 @@ */ package org.apache.wiki.ui.admin.beans; -import java.util.Collection; - -import javax.management.NotCompliantMBeanException; - import org.apache.wiki.WikiBackgroundThread; import org.apache.wiki.WikiContext; -import org.apache.wiki.WikiEngine; import org.apache.wiki.WikiPage; +import org.apache.wiki.api.core.Engine; +import org.apache.wiki.pages.PageManager; import org.apache.wiki.search.SearchManager; import org.apache.wiki.ui.admin.SimpleAdminBean; import org.apache.wiki.ui.progress.ProgressItem; +import org.apache.wiki.ui.progress.ProgressManager; + +import javax.management.NotCompliantMBeanException; +import java.util.Collection; + /** * The SearchManagerBean is a simple AdminBean interface @@ -47,23 +49,23 @@ public class SearchManagerBean extends SimpleAdminBean private WikiBackgroundThread m_updater; - public SearchManagerBean(WikiEngine engine) throws NotCompliantMBeanException + public SearchManagerBean( final Engine engine) throws NotCompliantMBeanException { super(); initialize(engine); } - public String[] getAttributeNames() + @Override public String[] getAttributeNames() { return new String[0]; } - public String[] getMethodNames() + @Override public String[] getMethodNames() { return METHODS; } - public String getTitle() + @Override public String getTitle() { return "Search manager"; } @@ -74,44 +76,40 @@ public class SearchManagerBean extends SimpleAdminBean * <p> * This method prevents itself from being called twice. */ - public synchronized void reload() - { - if( m_updater == null ) - { - m_updater = new WikiBackgroundThread(m_engine, 0) { + public synchronized void reload() { + if( m_updater == null ) { + m_updater = new WikiBackgroundThread( m_engine, 0 ) { + int m_count; int m_max; - public void startupTask() throws Exception - { + @Override public void startupTask() throws Exception { super.startupTask(); - setName("Reindexer started"); + setName( "Reindexer started" ); } - public void backgroundTask() throws Exception - { - Collection<WikiPage> allPages = m_engine.getPageManager().getAllPages(); + @Override public void backgroundTask() throws Exception { + final Collection< WikiPage > allPages = m_engine.getManager( PageManager.class ).getAllPages(); - SearchManager mgr = m_engine.getSearchManager(); + final SearchManager mgr = m_engine.getManager( SearchManager.class ); m_max = allPages.size(); - ProgressItem pi = new ProgressItem() { - public int getProgress() - { + final ProgressItem pi = new ProgressItem() { + + @Override public int getProgress() { return 100 * m_count / m_max; } }; - m_engine.getProgressManager().startProgress( pi, PROGRESS_ID ); + m_engine.getManager( ProgressManager.class ).startProgress( pi, PROGRESS_ID ); - for( WikiPage page : allPages ) - { - mgr.reindexPage(page); + for( final WikiPage page : allPages ) { + mgr.reindexPage( page ); m_count++; } - m_engine.getProgressManager().stopProgress( PROGRESS_ID ); + m_engine.getManager( ProgressManager.class ).stopProgress( PROGRESS_ID ); shutdown(); m_updater = null; } @@ -122,38 +120,29 @@ public class SearchManagerBean extends SimpleAdminBean } } - public int getType() + @Override public int getType() { return CORE; } - public String doGet(WikiContext context) - { - if( m_updater != null ) - { - return "Update already in progress ("+ - context.getEngine().getProgressManager().getProgress(PROGRESS_ID)+ - "%)"; + @Override public String doGet( final WikiContext context ) { + if( m_updater != null ) { + return "Update already in progress ("+ context.getEngine().getManager( ProgressManager.class ).getProgress(PROGRESS_ID)+ "%)"; } return "<input type='submit' id='searchmanagerbean-reload' name='searchmanagerbean-reload' value='Force index reload'/>"+ "<div class='description'>Forces JSPWiki search engine to reindex all pages. Use this if you think some pages are not being found even if they should.</div>"; } - public String doPost(WikiContext context) - { - String val = context.getHttpParameter("searchmanagerbean-reload"); - - if( val != null ) - { + @Override public String doPost( final WikiContext context ) { + final String val = context.getHttpParameter( "searchmanagerbean-reload" ); + if( val != null ) { reload(); - context.getWikiSession().addMessage( "Started reload of all indexed pages..." ); - return ""; } - return doGet(context); + return doGet( context ); } } diff --git a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/UserBean.java b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/UserBean.java index 00074e8..2d662c5 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/UserBean.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/beans/UserBean.java @@ -18,14 +18,9 @@ */ package org.apache.wiki.ui.admin.beans; -import java.util.Date; - -import javax.management.NotCompliantMBeanException; -import javax.servlet.http.HttpServletRequest; - import org.apache.wiki.WikiContext; -import org.apache.wiki.WikiEngine; import org.apache.wiki.WikiSession; +import org.apache.wiki.api.core.Engine; import org.apache.wiki.auth.NoSuchPrincipalException; import org.apache.wiki.auth.UserManager; import org.apache.wiki.auth.WikiSecurityException; @@ -33,39 +28,43 @@ import org.apache.wiki.auth.user.UserProfile; import org.apache.wiki.ui.admin.AdminBean; import org.apache.wiki.ui.admin.SimpleAdminBean; +import javax.management.NotCompliantMBeanException; +import javax.servlet.http.HttpServletRequest; +import java.util.Date; + public class UserBean extends SimpleAdminBean { - public UserBean( WikiEngine engine ) throws NotCompliantMBeanException + public UserBean( final Engine engine ) throws NotCompliantMBeanException { super(); } - public String[] getAttributeNames() + @Override public String[] getAttributeNames() { return new String[0]; } // FIXME: We don't yet support MBean for this kind of stuff. - public String[] getMethodNames() + @Override public String[] getMethodNames() { return new String[0]; } - public String doPost(WikiContext context) + @Override public String doPost( final WikiContext context) { - HttpServletRequest request = context.getHttpRequest(); - WikiSession session = context.getWikiSession(); - UserManager mgr = context.getEngine().getUserManager(); + final HttpServletRequest request = context.getHttpRequest(); + final WikiSession session = context.getWikiSession(); + final UserManager mgr = context.getEngine().getManager( UserManager.class ); - String loginid = request.getParameter("loginid"); - String loginname = request.getParameter("loginname"); - String fullname = request.getParameter("fullname"); - String password = request.getParameter("password"); - String password2 = request.getParameter("password2"); - String email = request.getParameter("email"); + final String loginid = request.getParameter("loginid"); + final String loginname = request.getParameter("loginname"); + final String fullname = request.getParameter("fullname"); + final String password = request.getParameter("password"); + final String password2 = request.getParameter("password2"); + final String email = request.getParameter("email"); if( request.getParameter("action").equalsIgnoreCase("remove") ) @@ -75,11 +74,11 @@ public class UserBean extends SimpleAdminBean mgr.getUserDatabase().deleteByLoginName(loginid); session.addMessage("User profile "+loginid+" ("+fullname+") has been deleted"); } - catch (NoSuchPrincipalException e) + catch ( final NoSuchPrincipalException e) { session.addMessage("User profile has already been removed"); } - catch (WikiSecurityException e) + catch ( final WikiSecurityException e) { session.addMessage("Security problem: "+e); } @@ -93,7 +92,7 @@ public class UserBean extends SimpleAdminBean return ""; } - UserProfile p; + final UserProfile p; if( loginid.equals("--New--") ) { @@ -108,7 +107,7 @@ public class UserBean extends SimpleAdminBean { p = mgr.getUserDatabase().findByLoginName( loginid ); } - catch (NoSuchPrincipalException e) + catch ( final NoSuchPrincipalException e) { session.addMessage("I could not find user profile "+loginid); return ""; @@ -124,7 +123,7 @@ public class UserBean extends SimpleAdminBean { mgr.getUserDatabase().save( p ); } - catch( WikiSecurityException e ) + catch( final WikiSecurityException e ) { session.addMessage("Unable to save "+e.getMessage()); } @@ -134,12 +133,12 @@ public class UserBean extends SimpleAdminBean return ""; } - public String getTitle() + @Override public String getTitle() { return "User administration"; } - public int getType() + @Override public int getType() { return AdminBean.UNKNOWN; }
