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 2020/03/16 21:58:00 UTC
[jspwiki] 10/47: JSPWIKI-303: adapt to new PageFilter signature
(backwards compatibility still needs to be implemented)
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 68630d74af465a6885af541b56d7f3846c692438
Author: juanpablo <ju...@apache.org>
AuthorDate: Wed Mar 11 19:01:15 2020 +0100
JSPWIKI-303: adapt to new PageFilter signature (backwards compatibility still needs to be implemented)
---
.../java/org/apache/wiki/filters/CreoleFilter.java | 10 +--
.../org/apache/wiki/filters/PageEventFilter.java | 25 +++++---
.../apache/wiki/filters/PingWeblogsComFilter.java | 3 +-
.../org/apache/wiki/filters/ProfanityFilter.java | 9 ++-
.../java/org/apache/wiki/filters/SpamFilter.java | 48 ++++++++-------
.../wiki/references/DefaultReferenceManager.java | 5 +-
.../java/org/apache/wiki/filters/TestFilter.java | 3 +-
.../apache/wiki/workflow/ApprovalWorkflowTest.java | 72 +++++++++-------------
8 files changed, 86 insertions(+), 89 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/filters/CreoleFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/filters/CreoleFilter.java
index 43b678f..96962e4 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/filters/CreoleFilter.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/filters/CreoleFilter.java
@@ -19,7 +19,7 @@
package org.apache.wiki.filters;
import org.apache.log4j.Logger;
-import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.exceptions.FilterException;
import org.apache.wiki.api.filters.BasicPageFilter;
@@ -48,14 +48,16 @@ public class CreoleFilter extends BasicPageFilter {
/**
* {@inheritDoc}
*/
- @Override public void initialize( final Engine engine, final Properties props ) throws FilterException {
+ @Override
+ public void initialize( final Engine engine, final Properties props ) throws FilterException {
+ super.initialize( engine, props );
}
/**
* {@inheritDoc}
*/
@Override
- public String preSave( final WikiContext wikiContext, final String content ) {
+ public String preSave( final Context wikiContext, final String content ) {
try {
final String username = wikiContext.getCurrentUser().getName();
final Properties prop = wikiContext.getEngine().getWikiProperties();
@@ -70,7 +72,7 @@ public class CreoleFilter extends BasicPageFilter {
* {@inheritDoc}
*/
@Override
- public String preTranslate( final WikiContext wikiContext, final String content ) {
+ public String preTranslate( final Context wikiContext, final String content ) {
try {
final Properties prop = wikiContext.getEngine().getWikiProperties();
return new CreoleToJSPWikiTranslator().translate(prop ,content);
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/filters/PageEventFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/filters/PageEventFilter.java
index 3296774..336f282 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/filters/PageEventFilter.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/filters/PageEventFilter.java
@@ -19,10 +19,10 @@
package org.apache.wiki.filters;
-import org.apache.wiki.api.filters.BasicPageFilter;
+import org.apache.wiki.api.core.Context;
+import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.exceptions.FilterException;
-
-import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.filters.BasicPageFilter;
import org.apache.wiki.event.WikiEventListener;
import org.apache.wiki.event.WikiEventManager;
import org.apache.wiki.event.WikiPageEvent;
@@ -53,8 +53,9 @@ public class PageEventFilter extends BasicPageFilter {
/**
* Called whenever a new PageFilter is instantiated and reset.
*/
- public void initialize( final Properties properties ) throws FilterException {
- //
+ @Override
+ public void initialize( final Engine engine, final Properties properties ) throws FilterException {
+ super.initialize( engine, properties );
}
/**
@@ -64,7 +65,8 @@ public class PageEventFilter extends BasicPageFilter {
* @param wikiContext The current wikicontext.
* @param content WikiMarkup.
*/
- public String preTranslate( final WikiContext wikiContext, final String content ) {
+ @Override
+ public String preTranslate( final Context wikiContext, final String content ) {
fireEvent( WikiPageEvent.PRE_TRANSLATE, wikiContext );
return content;
}
@@ -74,7 +76,8 @@ public class PageEventFilter extends BasicPageFilter {
* This method is called after a page has been fed through the TranslatorReader, so anything you are seeing here is translated content.
* If you want to do any of your own WikiMarkup2HTML translation, do it here.
*/
- public String postTranslate( final WikiContext wikiContext, final String htmlContent ) {
+ @Override
+ public String postTranslate( final Context wikiContext, final String htmlContent ) {
fireEvent( WikiPageEvent.POST_TRANSLATE, wikiContext );
return htmlContent;
}
@@ -83,7 +86,8 @@ public class PageEventFilter extends BasicPageFilter {
/**
* This method is called before the page has been saved to the PageProvider.
*/
- public String preSave( final WikiContext wikiContext, final String content ) {
+ @Override
+ public String preSave( final Context wikiContext, final String content ) {
fireEvent( WikiPageEvent.PRE_SAVE, wikiContext );
return content;
}
@@ -95,7 +99,8 @@ public class PageEventFilter extends BasicPageFilter {
* <p>
* Since the result is discarded from this method, this is only useful for things like counters, etc.
*/
- public void postSave( final WikiContext wikiContext, final String content ) {
+ @Override
+ public void postSave( final Context wikiContext, final String content ) {
fireEvent( WikiPageEvent.POST_SAVE, wikiContext );
}
@@ -128,7 +133,7 @@ public class PageEventFilter extends BasicPageFilter {
* @param type the WikiPageEvent type to be fired.
* @param context the WikiContext of the event.
*/
- protected final void fireEvent( final int type, final WikiContext context ) {
+ protected final void fireEvent( final int type, final Context context ) {
if( WikiEventManager.isListening(this ) && WikiPageEvent.isValidType( type ) ) {
final WikiPageEvent event = new WikiPageEvent( context.getEngine(), type, context.getPage().getName() );
WikiEventManager.fireEvent(this, event );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java
index fbfdeb9..35e5297 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/filters/PingWeblogsComFilter.java
@@ -20,6 +20,7 @@ package org.apache.wiki.filters;
import org.apache.log4j.Logger;
import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.filters.BasicPageFilter;
import org.apache.xmlrpc.AsyncCallback;
@@ -61,7 +62,7 @@ public class PingWeblogsComFilter extends BasicPageFilter {
* {@inheritDoc}
*/
@Override
- public void postSave( final WikiContext context, final String pagecontent ) {
+ public void postSave( final Context context, final String pagecontent ) {
String blogName = context.getPage().getName();
final Engine engine = context.getEngine();
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/filters/ProfanityFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/filters/ProfanityFilter.java
index c0c4de0..b3ef1db 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/filters/ProfanityFilter.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/filters/ProfanityFilter.java
@@ -19,7 +19,7 @@
package org.apache.wiki.filters;
import org.apache.log4j.Logger;
-import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.filters.BasicPageFilter;
import org.apache.wiki.util.TextUtil;
@@ -71,11 +71,10 @@ public class ProfanityFilter extends BasicPageFilter {
/**
* {@inheritDoc}
*/
- public String preTranslate( final WikiContext context, String content ) {
- for( int i = 0; i < c_profanities.length; i++ ) {
- final String word = c_profanities[ i ];
+ @Override
+ public String preTranslate( final Context context, String content ) {
+ for( final String word : c_profanities ) {
final String replacement = word.charAt( 0 ) + "*" + word.charAt( word.length() - 1 );
-
content = TextUtil.replaceStringCaseUnsensitive( content, word, replacement );
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java b/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java
index 12c42aa..0287f09 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/filters/SpamFilter.java
@@ -32,7 +32,9 @@ import org.apache.wiki.InternalWikiException;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiPage;
import org.apache.wiki.WikiProvider;
+import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.core.Engine;
+import org.apache.wiki.api.core.Page;
import org.apache.wiki.api.exceptions.ProviderException;
import org.apache.wiki.api.exceptions.RedirectException;
import org.apache.wiki.api.filters.BasicPageFilter;
@@ -271,7 +273,7 @@ public class SpamFilter extends BasicPageFilter {
private static final int ACCEPT = 1;
private static final int NOTE = 2;
- private static String log( final WikiContext ctx, final int type, final String source, String message ) {
+ private static String log( final Context ctx, final int type, final String source, String message ) {
message = TextUtil.replaceString( message, "\r\n", "\\r\\n" );
message = TextUtil.replaceString( message, "\"", "\\\"" );
@@ -301,7 +303,7 @@ public class SpamFilter extends BasicPageFilter {
/** {@inheritDoc} */
@Override
- public String preSave( final WikiContext context, final String content ) throws RedirectException {
+ public String preSave( final Context context, final String content ) throws RedirectException {
cleanBanList();
refreshBlacklists( context );
final Change change = getChange( context, content );
@@ -326,8 +328,8 @@ public class SpamFilter extends BasicPageFilter {
return content;
}
- private void checkPageName( final WikiContext context, final String content, final Change change) throws RedirectException {
- final WikiPage page = context.getPage();
+ private void checkPageName( final Context context, final String content, final Change change) throws RedirectException {
+ final Page page = context.getPage();
final String pageName = page.getName();
final int maxlength = Integer.valueOf(m_pageNameMaxLength);
if ( pageName.length() > maxlength) {
@@ -343,7 +345,7 @@ public class SpamFilter extends BasicPageFilter {
}
}
- private void checkStrategy( final WikiContext context, final String error, final String message ) throws RedirectException {
+ private void checkStrategy( final Context context, final String error, final String message ) throws RedirectException {
if( m_stopAtFirstMatch ) {
throw new RedirectException( message, getRedirectPage( context ) );
}
@@ -431,7 +433,7 @@ public class SpamFilter extends BasicPageFilter {
* @param content
* @throws RedirectException
*/
- private synchronized void checkSinglePageChange( final WikiContext context, final String content, final Change change )
+ private synchronized void checkSinglePageChange( final Context context, final String content, final Change change )
throws RedirectException {
final HttpServletRequest req = context.getHttpRequest();
@@ -523,7 +525,7 @@ public class SpamFilter extends BasicPageFilter {
* @param change
* @throws RedirectException
*/
- private void checkAkismet( final WikiContext context, final Change change ) throws RedirectException {
+ private void checkAkismet( final Context context, final Change change ) throws RedirectException {
if( m_akismetAPIKey != null ) {
if( m_akismet == null ) {
log.info( "Initializing Akismet spam protection." );
@@ -553,7 +555,7 @@ public class SpamFilter extends BasicPageFilter {
final String userAgent = req.getHeader( "User-Agent" );
final String referrer = req.getHeader( "Referer");
final String permalink = context.getViewURL( context.getPage().getName() );
- final String commentType = context.getRequestContext().equals( WikiContext.COMMENT ) ? "comment" : "edit";
+ final String commentType = ( ( WikiContext )context ).getRequestContext().equals( WikiContext.COMMENT ) ? "comment" : "edit";
final String commentAuthor = context.getCurrentUser().getName();
final String commentAuthorEmail = null;
final String commentAuthorURL = null;
@@ -600,7 +602,7 @@ public class SpamFilter extends BasicPageFilter {
* @param change
* @throws RedirectException
*/
- private void checkBotTrap( final WikiContext context, final Change change ) throws RedirectException {
+ private void checkBotTrap( final Context context, final Change change ) throws RedirectException {
final HttpServletRequest request = context.getHttpRequest();
if( request != null ) {
final String unspam = request.getParameter( getBotFieldName() );
@@ -613,7 +615,7 @@ public class SpamFilter extends BasicPageFilter {
}
}
- private void checkUTF8( final WikiContext context, final Change change ) throws RedirectException {
+ private void checkUTF8( final Context context, final Change change ) throws RedirectException {
final HttpServletRequest request = context.getHttpRequest();
if( request != null ) {
final String utf8field = request.getParameter( "encodingcheck" );
@@ -645,7 +647,7 @@ public class SpamFilter extends BasicPageFilter {
* @param context
* @throws RedirectException
*/
- private void checkBanList( final WikiContext context, final Change change ) throws RedirectException {
+ private void checkBanList( final Context context, final Change change ) throws RedirectException {
final HttpServletRequest req = context.getHttpRequest();
if( req != null ) {
@@ -669,7 +671,7 @@ public class SpamFilter extends BasicPageFilter {
*
* @param context associated WikiContext
*/
- private void refreshBlacklists( final WikiContext context ) {
+ private void refreshBlacklists( final Context context ) {
try {
boolean rebuild = false;
@@ -681,7 +683,7 @@ public class SpamFilter extends BasicPageFilter {
}
}
- final Attachment att = context.getEngine().getManager( AttachmentManager.class ).getAttachmentInfo( context, m_blacklist );
+ final Attachment att = context.getEngine().getManager( AttachmentManager.class ).getAttachmentInfo( ( WikiContext )context, m_blacklist );
if( att != null ) {
if( m_spamPatterns == null || m_spamPatterns.isEmpty() || att.getLastModified().after( m_lastRebuild ) ) {
rebuild = true;
@@ -729,7 +731,7 @@ public class SpamFilter extends BasicPageFilter {
* @param change
* @throws RedirectException
*/
- private void checkPatternList( final WikiContext context, final String content, final Change change ) throws RedirectException {
+ private void checkPatternList( final Context context, final String content, final Change change ) throws RedirectException {
// If we have no spam patterns defined, or we're trying to save the page containing the patterns, just return.
if( m_spamPatterns == null || context.getPage().getName().equals( m_forbiddenWordsPage ) ) {
return;
@@ -760,7 +762,7 @@ public class SpamFilter extends BasicPageFilter {
* @param context
* @throws RedirectException
*/
- private void checkIPList( final WikiContext context ) throws RedirectException {
+ private void checkIPList( final Context context ) throws RedirectException {
// If we have no IP patterns defined, or we're trying to save the page containing the IP patterns, just return.
if( m_IPPatterns == null || context.getPage().getName().equals( m_forbiddenIPsPage ) ) {
return;
@@ -784,7 +786,7 @@ public class SpamFilter extends BasicPageFilter {
}
}
- private void checkPatternList( final WikiContext context, final String content, final String change ) throws RedirectException {
+ private void checkPatternList( final Context context, final String content, final String change ) throws RedirectException {
final Change c = new Change();
c.m_change = change;
checkPatternList( context, content, c );
@@ -797,8 +799,8 @@ public class SpamFilter extends BasicPageFilter {
* @param newText
* @return Empty string, if there is no change.
*/
- private static Change getChange( final WikiContext context, final String newText ) {
- final WikiPage page = context.getPage();
+ private static Change getChange( final Context context, final String newText ) {
+ final Page page = context.getPage();
final StringBuffer change = new StringBuffer();
final Engine engine = context.getEngine();
// Get current page version
@@ -856,7 +858,7 @@ public class SpamFilter extends BasicPageFilter {
* @param context
* @return True, if this users should be ignored.
*/
- private boolean ignoreThisUser( final WikiContext context ) {
+ private boolean ignoreThisUser( final Context context ) {
if( context.hasAdminPermissions() ) {
return true;
}
@@ -893,7 +895,7 @@ public class SpamFilter extends BasicPageFilter {
* @param ctx WikiContext
* @return An URL to redirect to
*/
- private String getRedirectPage( final WikiContext ctx ) {
+ private String getRedirectPage( final Context ctx ) {
if( m_useCaptcha ) {
return ctx.getURL( WikiContext.NONE, "Captcha.jsp", "page= " +ctx.getEngine().encodeName( ctx.getPage().getName() ) );
}
@@ -909,7 +911,7 @@ public class SpamFilter extends BasicPageFilter {
* @return False, if this userprofile is suspect and should not be allowed to be added.
* @since 2.6.1
*/
- public boolean isValidUserProfile( final WikiContext context, final UserProfile profile ) {
+ public boolean isValidUserProfile( final Context context, final UserProfile profile ) {
try {
checkPatternList( context, profile.getEmail(), profile.getEmail() );
checkPatternList( context, profile.getFullname(), profile.getFullname() );
@@ -931,7 +933,7 @@ public class SpamFilter extends BasicPageFilter {
* @since 2.6
* @return A hash value for this page and session
*/
- public static final String getSpamHash( final WikiPage page, final HttpServletRequest request ) {
+ public static final String getSpamHash( final Page page, final HttpServletRequest request ) {
long lastModified = 0;
if( page.getLastModified() != null ) {
@@ -985,7 +987,7 @@ public class SpamFilter extends BasicPageFilter {
* @throws IOException If redirection fails
* @since 2.6
*/
- public static final boolean checkHash( final WikiContext context, final PageContext pageContext ) throws IOException {
+ public static final boolean checkHash( final Context context, final PageContext pageContext ) throws IOException {
final String hashName = getHashFieldName( (HttpServletRequest)pageContext.getRequest() );
if( pageContext.getRequest().getParameter(hashName) == null ) {
if( pageContext.getAttribute( hashName ) == null ) {
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/references/DefaultReferenceManager.java b/jspwiki-main/src/main/java/org/apache/wiki/references/DefaultReferenceManager.java
index 358958b..9853821 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/references/DefaultReferenceManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/references/DefaultReferenceManager.java
@@ -25,6 +25,7 @@ import org.apache.wiki.LinkCollector;
import org.apache.wiki.WikiContext;
import org.apache.wiki.WikiPage;
import org.apache.wiki.WikiProvider;
+import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.core.Engine;
import org.apache.wiki.api.exceptions.ProviderException;
import org.apache.wiki.api.filters.BasicPageFilter;
@@ -416,8 +417,8 @@ public class DefaultReferenceManager extends BasicPageFilter implements Referenc
* @param content {@inheritDoc}
*/
@Override
- public void postSave( final WikiContext context, final String content ) {
- final WikiPage page = context.getPage();
+ public void postSave( final Context context, final String content ) {
+ final WikiPage page = ( WikiPage )context.getPage();
updateReferences( page.getName(), scanWikiLinks( page, content ) );
serializeAttrsToDisk( page );
}
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/filters/TestFilter.java b/jspwiki-main/src/test/java/org/apache/wiki/filters/TestFilter.java
index 044af74..a342ca4 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/filters/TestFilter.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/filters/TestFilter.java
@@ -28,7 +28,8 @@ public class TestFilter extends BasicPageFilter {
public Properties m_properties;
- @Override public void initialize( final Engine engine, final Properties props ) {
+ @Override
+ public void initialize( final Engine engine, final Properties props ) {
m_properties = props;
}
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/workflow/ApprovalWorkflowTest.java b/jspwiki-main/src/test/java/org/apache/wiki/workflow/ApprovalWorkflowTest.java
index 0f7defe..7bc2859 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/workflow/ApprovalWorkflowTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/workflow/ApprovalWorkflowTest.java
@@ -19,7 +19,7 @@
package org.apache.wiki.workflow;
import org.apache.wiki.TestEngine;
-import org.apache.wiki.WikiContext;
+import org.apache.wiki.api.core.Context;
import org.apache.wiki.api.exceptions.FilterException;
import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.api.filters.BasicPageFilter;
@@ -44,8 +44,7 @@ public class ApprovalWorkflowTest {
DecisionQueue m_dq;
@BeforeEach
- public void setUp() throws Exception
- {
+ public void setUp() throws Exception {
final Properties props = TestEngine.getTestProperties();
// Explicitly turn on Admin approvals for page saves and our sample approval workflow
@@ -53,7 +52,7 @@ public class ApprovalWorkflowTest {
props.put( "jspwiki.approver.workflow.approvalWorkflow", Users.JANNE );
// Start the wiki engine
- m_engine = new TestEngine(props);
+ m_engine = new TestEngine( props );
m_wm = m_engine.getWorkflowManager();
m_dq = m_wm.getDecisionQueue();
m_builder = WorkflowBuilder.getBuilder( m_engine );
@@ -61,15 +60,13 @@ public class ApprovalWorkflowTest {
@Test
- public void testBuildApprovalWorkflow() throws WikiException
- {
-
+ public void testBuildApprovalWorkflow() throws WikiException {
final Principal submitter = new WikiPrincipal( "Submitter" );
final String workflowApproverKey = "workflow.approvalWorkflow";
final Task prepTask = new TestPrepTask( "task.preSaveWikiPage" );
final String decisionKey = "decision.saveWikiPage";
final Fact[] facts = new Fact[3];
- facts[0] = new Fact("fact1",Integer.valueOf( 1 ) );
+ facts[0] = new Fact("fact1", 1 );
facts[1] = new Fact("fact2","A factual String");
facts[2] = new Fact("fact3",Outcome.DECISION_ACKNOWLEDGE);
final Task completionTask = new TestPrepTask( "task.saveWikiPage" );
@@ -113,11 +110,11 @@ public class ApprovalWorkflowTest {
// Check that our predecessor/successor relationships are ok
Assertions.assertEquals( decision, prepTask.getSuccessor( Outcome.STEP_COMPLETE ) );
- Assertions.assertEquals( null, prepTask.getSuccessor( Outcome.STEP_ABORT ) );
- Assertions.assertEquals( null, prepTask.getSuccessor( Outcome.STEP_CONTINUE ) );
- Assertions.assertEquals( null, decision.getSuccessor( Outcome.DECISION_ACKNOWLEDGE ) );
- Assertions.assertEquals( null, decision.getSuccessor( Outcome.DECISION_HOLD ) );
- Assertions.assertEquals( null, decision.getSuccessor( Outcome.DECISION_REASSIGN ) );
+ Assertions.assertNull( prepTask.getSuccessor( Outcome.STEP_ABORT ) );
+ Assertions.assertNull( prepTask.getSuccessor( Outcome.STEP_CONTINUE ) );
+ Assertions.assertNull( decision.getSuccessor( Outcome.DECISION_ACKNOWLEDGE ) );
+ Assertions.assertNull( decision.getSuccessor( Outcome.DECISION_HOLD ) );
+ Assertions.assertNull( decision.getSuccessor( Outcome.DECISION_REASSIGN ) );
Assertions.assertEquals( completionTask, decision.getSuccessor( Outcome.DECISION_APPROVE ) );
// The "deny" notification should use the right key
@@ -137,14 +134,13 @@ public class ApprovalWorkflowTest {
}
@Test
- public void testBuildApprovalWorkflowDeny() throws WikiException
- {
+ public void testBuildApprovalWorkflowDeny() throws WikiException {
final Principal submitter = new WikiPrincipal( "Submitter" );
final String workflowApproverKey = "workflow.approvalWorkflow";
final Task prepTask = new TestPrepTask( "task.preSaveWikiPage" );
final String decisionKey = "decision.saveWikiPage";
final Fact[] facts = new Fact[3];
- facts[0] = new Fact("fact1",new Integer(1));
+ facts[0] = new Fact("fact1", 1 );
facts[1] = new Fact("fact2","A factual String");
facts[2] = new Fact("fact3",Outcome.DECISION_ACKNOWLEDGE);
final Task completionTask = new TestPrepTask( "task.saveWikiPage" );
@@ -180,17 +176,13 @@ public class ApprovalWorkflowTest {
}
@Test
- public void testSaveWikiPageWithApproval() throws WikiException
- {
+ public void testSaveWikiPageWithApproval() throws WikiException {
// Create a sample test page and try to save it
final String pageName = "SaveWikiPageWorkflow-Test" + System.currentTimeMillis();
final String text = "This is a test!";
- try
- {
- m_engine.saveTextAsJanne(pageName, text);
- }
- catch ( final DecisionRequiredException e )
- {
+ try {
+ m_engine.saveTextAsJanne( pageName, text );
+ } catch( final DecisionRequiredException e ) {
// Swallow exception, because it is expected...
}
@@ -202,7 +194,7 @@ public class ApprovalWorkflowTest {
Assertions.assertEquals(1, decisions.size());
// Now, approve the decision and it should go away, and page should appear.
- final Decision decision = (Decision)decisions.iterator().next();
+ final Decision decision = decisions.iterator().next();
decision.decide(Outcome.DECISION_APPROVE);
Assertions.assertTrue( m_engine.getManager( PageManager.class ).wikiPageExists(pageName));
decisions = m_dq.getActorDecisions( m_engine.adminSession() );
@@ -213,17 +205,13 @@ public class ApprovalWorkflowTest {
}
@Test
- public void testSaveWikiPageWithRejection() throws WikiException
- {
+ public void testSaveWikiPageWithRejection() throws WikiException {
// Create a sample test page and try to save it
final String pageName = "SaveWikiPageWorkflow-Test" + System.currentTimeMillis();
final String text = "This is a test!";
- try
- {
- m_engine.saveTextAsJanne(pageName, text);
- }
- catch ( final DecisionRequiredException e )
- {
+ try {
+ m_engine.saveTextAsJanne( pageName, text );
+ } catch( final DecisionRequiredException e ) {
// Swallow exception, because it is expected...
}
@@ -235,14 +223,14 @@ public class ApprovalWorkflowTest {
Assertions.assertEquals(1, decisions.size());
// Now, DENY the decision and the page should still not exist...
- Decision decision = (Decision)decisions.iterator().next();
+ Decision decision = decisions.iterator().next();
decision.decide(Outcome.DECISION_DENY);
Assertions.assertFalse( m_engine.getManager( PageManager.class ).wikiPageExists(pageName) );
// ...but there should also be a notification decision in Janne's queue
decisions = m_dq.getActorDecisions( m_engine.janneSession() );
Assertions.assertEquals(1, decisions.size());
- decision = (Decision)decisions.iterator().next();
+ decision = decisions.iterator().next();
Assertions.assertEquals(WorkflowManager.WF_WP_SAVE_REJECT_MESSAGE_KEY, decision.getMessageKey());
// Once Janne disposes of the notification, his queue should be empty
@@ -252,8 +240,7 @@ public class ApprovalWorkflowTest {
}
@Test
- public void testSaveWikiPageWithException() throws WikiException
- {
+ public void testSaveWikiPageWithException() {
// Add a PageFilter that rejects all save attempts
final FilterManager fm = m_engine.getFilterManager();
fm.addPageFilter( new AbortFilter(), 0 );
@@ -287,8 +274,8 @@ public class ApprovalWorkflowTest {
super( messageKey );
}
- @Override public Outcome execute() throws WikiException
- {
+ @Override
+ public Outcome execute() {
getWorkflow().setAttribute( getMessageKey(), "Completed" );
setOutcome( Outcome.STEP_COMPLETE );
return Outcome.STEP_COMPLETE;
@@ -299,10 +286,9 @@ public class ApprovalWorkflowTest {
/**
* Dummy PageFilter that always throws a FilterException during preSave operations.
*/
- public static class AbortFilter extends BasicPageFilter
- {
- @Override public String preSave( final WikiContext wikiContext, final String content) throws FilterException
- {
+ public static class AbortFilter extends BasicPageFilter {
+ @Override
+ public String preSave( final Context wikiContext, final String content ) throws FilterException {
throw new FilterException( "Page save aborted." );
}
}