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/01/09 22:17:30 UTC
[jspwiki] 20/32: JSPWIKI-120: move getText(..) methods from
WikiEngine to PageManager
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 4cb064d76569011498a649e54888a5b2225813d2
Author: juanpablo <ju...@apache.org>
AuthorDate: Mon Jan 6 22:41:09 2020 +0100
JSPWIKI-120: move getText(..) methods from WikiEngine to PageManager
---
.../src/main/java/org/apache/wiki/WikiEngine.java | 53 --------------------
.../org/apache/wiki/pages/DefaultPageManager.java | 9 ++++
.../java/org/apache/wiki/pages/PageManager.java | 38 +++++++++++++++
.../org/apache/wiki/rpc/atom/AtomAPIServlet.java | 2 +-
.../java/org/apache/wiki/tags/InsertPageTag.java | 8 +---
.../org/apache/wiki/xmlrpc/MetaWeblogHandler.java | 2 +-
.../test/java/org/apache/wiki/WikiEngineTest.java | 49 +------------------
.../java/org/apache/wiki/auth/UserManagerTest.java | 4 +-
.../org/apache/wiki/content/PageRenamerTest.java | 16 +++----
.../apache/wiki/pages/DefaultPageManagerTest.java | 56 ++++++++++++++++++++--
.../apache/wiki/providers/CachingProviderTest.java | 2 +-
.../wiki/providers/VersioningFileProviderTest.java | 50 +++++++++----------
.../wiki/stress/StressTestVersioningProvider.java | 2 +-
jspwiki-war/src/main/webapp/Edit.jsp | 2 +-
jspwiki-war/src/main/webapp/PageModified.jsp | 2 +-
.../src/main/webapp/templates/default/Nav.jsp | 2 +-
16 files changed, 144 insertions(+), 153 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
index 4308c3b..a6183f4 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
@@ -1160,59 +1160,6 @@ public class WikiEngine {
}
/**
- * Returns the un-HTMLized text of the latest version of a page. This method also replaces the < and & -characters with
- * their respective HTML entities, thus making it suitable for inclusion on an HTML page. If you want to have the page text
- * without any conversions, use getPureText().
- *
- * @param page WikiName of the page to fetch.
- * @return WikiText.
- */
- public String getText( final String page )
- {
- return getText( page, WikiPageProvider.LATEST_VERSION );
- }
-
- /**
- * Returns the un-HTMLized text of the given version of a page. This method also replaces the < and & -characters with
- * their respective HTML entities, thus making it suitable for inclusion on an HTML page. If you want to have the page text
- * without any conversions, use getPureText().
- *
- * @param page WikiName of the page to fetch
- * @param version Version of the page to fetch
- * @return WikiText.
- */
- public String getText( final String page, final int version ) {
- final String result = getPageManager().getPureText( page, version );
-
- //
- // Replace ampersand first, or else all quotes and stuff
- // get replaced as well with " etc.
- //
- /*
- result = TextUtil.replaceString( result, "&", "&" );
- */
-
- return TextUtil.replaceEntities( result );
- }
-
- /**
- * Returns the un-HTMLized text of the given version of a page in the given context. USE THIS METHOD if you don't know what doing.
- * <p>
- * This method also replaces the < and & -characters with their respective HTML entities, thus making it suitable
- * for inclusion on an HTML page. If you want to have the page text without any conversions, use getPureText().
- *
- * @since 1.9.15.
- * @param context The WikiContext
- * @param page A page reference (not an attachment)
- * @return The page content as HTMLized String.
- * @see PageManager#getPureText(WikiPage)
- */
- public String getText( final WikiContext context, final WikiPage page )
- {
- return getText( page.getName(), page.getVersion() );
- }
-
- /**
* Returns the converted HTML of the page using a different context than the default context.
*
* @param context A WikiContext in which you wish to render this page in.
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 07a58d3..d47f910 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
@@ -210,6 +210,15 @@ public class DefaultPageManager extends ModuleManager implements PageManager {
/**
* {@inheritDoc}
+ * @see org.apache.wiki.pages.PageManager#getText(String, int)
+ */
+ public String getText( final String page, final int version ) {
+ final String result = getPureText( page, version );
+ return TextUtil.replaceEntities( result );
+ }
+
+ /**
+ * {@inheritDoc}
* @see org.apache.wiki.pages.PageManager#getEngine()
*/
@Override
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/pages/PageManager.java b/jspwiki-main/src/main/java/org/apache/wiki/pages/PageManager.java
index 9cee4c6..e3435fb 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/pages/PageManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/pages/PageManager.java
@@ -98,6 +98,44 @@ public interface PageManager extends WikiEventListener {
}
/**
+ * Returns the un-HTMLized text of the given version of a page. This method also replaces the < and & -characters with
+ * their respective HTML entities, thus making it suitable for inclusion on an HTML page. If you want to have the page text
+ * without any conversions, use {@link #getPureText(String, int)}.
+ *
+ * @param page WikiName of the page to fetch
+ * @param version Version of the page to fetch
+ * @return WikiText.
+ */
+ String getText( String page, int version );
+
+ /**
+ * Returns the un-HTMLized text of the latest version of a page. This method also replaces the < and & -characters with
+ * their respective HTML entities, thus making it suitable for inclusion on an HTML page. If you want to have the page text
+ * without any conversions, use {@link #getPureText(String, int)}.
+ *
+ * @param page WikiName of the page to fetch.
+ * @return WikiText.
+ */
+ default String getText( final String page ) {
+ return getText( page, WikiPageProvider.LATEST_VERSION );
+ }
+
+ /**
+ * Returns the un-HTMLized text of the given version of a page in the given context. USE THIS METHOD if you don't know what doing.
+ * <p>
+ * This method also replaces the < and & -characters with their respective HTML entities, thus making it suitable
+ * for inclusion on an HTML page. If you want to have the page text without any conversions, use {@link #getPureText(WikiPage)}.
+ *
+ * @since 1.9.15.
+ * @param page A page reference (not an attachment)
+ * @return The page content as HTMLized String.
+ * @see PageManager#getPureText(WikiPage)
+ */
+ default String getText( final WikiPage page ) {
+ return getText( page.getName(), page.getVersion() );
+ }
+
+ /**
* Returns the WikiEngine to which this PageManager belongs to.
*
* @return The WikiEngine object.
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java b/jspwiki-main/src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java
index 6abdf6c..f172e25 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/rpc/atom/AtomAPIServlet.java
@@ -228,7 +228,7 @@ public class AtomAPIServlet extends HttpServlet
Entry entry = SyndicationFactory.newSyndicationEntry();
- String pageText = m_engine.getText(page.getName());
+ String pageText = m_engine.getPageManager().getText(page.getName());
String title = "";
int firstLine = pageText.indexOf('\n');
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertPageTag.java b/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertPageTag.java
index 643d0c4..e7f62d5 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertPageTag.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/InsertPageTag.java
@@ -109,12 +109,8 @@ public class InsertPageTag extends WikiTagBase {
final WikiPage oldPage = m_wikiContext.setRealPage( insertedPage );
switch( m_mode ) {
- case HTML:
- out.print( engine.getHTML( m_wikiContext, insertedPage ) );
- break;
- case PLAIN:
- out.print( engine.getText( m_wikiContext, insertedPage ) );
- break;
+ case HTML: out.print( engine.getHTML( m_wikiContext, insertedPage ) ); break;
+ case PLAIN: out.print( engine.getPageManager().getText( insertedPage ) ); break;
}
m_wikiContext.setRealPage( oldPage );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
index db56148..37f43a6 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/xmlrpc/MetaWeblogHandler.java
@@ -157,7 +157,7 @@ public class MetaWeblogHandler
ht.put("postid", page.getName());
ht.put("userid", page.getAuthor());
- String pageText = m_context.getEngine().getText(page.getName());
+ String pageText = m_context.getEngine().getPageManager().getText(page.getName());
String title = "";
int firstLine = pageText.indexOf('\n');
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/WikiEngineTest.java b/jspwiki-main/src/test/java/org/apache/wiki/WikiEngineTest.java
index f41e275..6ecffce 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/WikiEngineTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/WikiEngineTest.java
@@ -119,39 +119,6 @@ public class WikiEngineTest {
}
@Test
- public void testPutPage() throws Exception {
- final String text = "Foobar.\r\n";
- final String name = NAME1;
- m_engine.saveText( name, text );
-
- Assertions.assertTrue( m_engine.pageExists( name ), "page does not exist" );
- Assertions.assertEquals( text, m_engine.getText( name ), "wrong content" );
- }
-
- @Test
- public void testPutPageEntities() throws Exception {
- final String text = "Foobar. "\r\n";
- final String name = NAME1;
- m_engine.saveText( name, text );
-
- Assertions.assertTrue( m_engine.pageExists( name ), "page does not exist" );
- Assertions.assertEquals( "Foobar. &quot;\r\n", m_engine.getText( name ), "wrong content" );
- }
-
- /**
- * Check that basic " is changed.
- */
- @Test
- public void testPutPageEntities2() throws Exception {
- final String text = "Foobar. \"\r\n";
- final String name = NAME1;
- m_engine.saveText( name, text );
-
- Assertions.assertTrue( m_engine.pageExists( name ), "page does not exist" );
- Assertions.assertEquals( "Foobar. "\r\n", m_engine.getText( name ), "wrong content" );
- }
-
- @Test
public void testGetHTML() throws Exception {
final String text = "''Foobar.''";
final String name = NAME1;
@@ -377,7 +344,7 @@ public class WikiEngineTest {
@Test
public void testSpacedNames1() throws Exception {
m_engine.saveText("This is a test", "puppaa");
- Assertions.assertEquals( "puppaa", m_engine.getText("This is a test").trim(), "normal" );
+ Assertions.assertEquals( "puppaa", m_engine.getPageManager().getText("This is a test").trim(), "normal" );
}
@@ -449,18 +416,4 @@ public class WikiEngineTest {
Assertions.assertFalse( m_engine.pageExists( name ), "page should not exist right now neither" );
}
- @Test
- public void testSaveExistingPageWithEmptyContent() throws Exception {
- final String text = "Foobar.\r\n";
- final String name = NAME1;
- m_engine.saveText( name, text );
-
- Assertions.assertTrue( m_engine.pageExists( name ), "page does not exist" );
- // saveText uses normalizePostData to assure it conforms to certain rules
- Assertions.assertEquals( TextUtil.normalizePostData( text ), m_engine.getText( name ), "wrong content" );
-
- m_engine.saveText( name, "" );
- Assertions.assertEquals( TextUtil.normalizePostData( "" ), m_engine.getText( name ), "wrong content" );
- }
-
}
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/auth/UserManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/auth/UserManagerTest.java
index 05ad867..668d4f2 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/auth/UserManagerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/auth/UserManagerTest.java
@@ -190,7 +190,7 @@ public class UserManagerTest {
// Test 4: our page text should have been re-written
// (The new full name should be in the ACL, but the login name should have been removed)
String expectedText = "[{ALLOW view Alice," + newName + "}]\nTest text. More text.\r\n";
- String actualText = m_engine.getText( pageName );
+ String actualText = m_engine.getPageManager().getText( pageName );
Assertions.assertEquals( expectedText, actualText );
// Remove our test page
@@ -249,7 +249,7 @@ public class UserManagerTest {
// Test 8: our page text should have been re-written
// (The new full name should be in the ACL, but the login name should have been removed)
expectedText = "[{ALLOW view Alice," + oldName + "}]\nMore test text. More text.\r\n";
- actualText = m_engine.getText( pageName );
+ actualText = m_engine.getPageManager().getText( pageName );
Assertions.assertEquals( expectedText, actualText );
// CLEANUP: delete the profile; user and page; should be back to old counts
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/content/PageRenamerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/content/PageRenamerTest.java
index 6bd2659..fe57d7f 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/content/PageRenamerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/content/PageRenamerTest.java
@@ -267,7 +267,7 @@ public class PageRenamerTest
Assertions.assertNotNull( p, "no page" );
- Assertions.assertEquals("[FooTest]", m_engine.getText("FooTest").trim() );
+ Assertions.assertEquals("[FooTest]", m_engine.getPageManager().getText("FooTest").trim() );
}
@Test
@@ -283,7 +283,7 @@ public class PageRenamerTest
Assertions.assertNotNull( p, "no page" );
// Should be no change
- Assertions.assertEquals("[TestPage|]", m_engine.getText("TestPage2").trim() );
+ Assertions.assertEquals("[TestPage|]", m_engine.getPageManager().getText("TestPage2").trim() );
}
@Test
@@ -299,7 +299,7 @@ public class PageRenamerTest
Assertions.assertNotNull( p, "no page" );
- Assertions.assertEquals("[|FooTest]", m_engine.getText("TestPage2").trim() );
+ Assertions.assertEquals("[|FooTest]", m_engine.getPageManager().getText("TestPage2").trim() );
}
private void rename( String src, String dst ) throws WikiException
@@ -329,7 +329,7 @@ public class PageRenamerTest
rename( "Cdauth", "CdauthNew" );
- Assertions.assertEquals( dst, m_engine.getText("TestPage").trim() );
+ Assertions.assertEquals( dst, m_engine.getPageManager().getText("TestPage").trim() );
}
@Test
@@ -342,7 +342,7 @@ public class PageRenamerTest
rename ("TestPage2", "Test");
- Assertions.assertEquals( "[Link to Test|Test]", m_engine.getText( "TestPage" ).trim() );
+ Assertions.assertEquals( "[Link to Test|Test]", m_engine.getPageManager().getText( "TestPage" ).trim() );
}
@Test
@@ -355,7 +355,7 @@ public class PageRenamerTest
rename ("TestPage2", "Test");
- Assertions.assertEquals( "[Link to Test|Test|target='_new']", m_engine.getText( "TestPage" ).trim() );
+ Assertions.assertEquals( "[Link to Test|Test|target='_new']", m_engine.getPageManager().getText( "TestPage" ).trim() );
}
@Test
@@ -452,7 +452,7 @@ public class PageRenamerTest
rename ("TestPage2", "Test");
- Assertions.assertEquals( "[[Link to TestPage2|TestPage2|target='_new']", m_engine.getText( "TestPage" ).trim() );
+ Assertions.assertEquals( "[[Link to TestPage2|TestPage2|target='_new']", m_engine.getPageManager().getText( "TestPage" ).trim() );
}
@Test
@@ -465,7 +465,7 @@ public class PageRenamerTest
rename ("TestPage2", "Test");
- Assertions.assertEquals( "~[Link to TestPage2|TestPage2|target='_new']", m_engine.getText( "TestPage" ).trim() );
+ Assertions.assertEquals( "~[Link to TestPage2|TestPage2|target='_new']", m_engine.getPageManager().getText( "TestPage" ).trim() );
}
/**
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/pages/DefaultPageManagerTest.java b/jspwiki-main/src/test/java/org/apache/wiki/pages/DefaultPageManagerTest.java
index b52b706..6d934e4 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/pages/DefaultPageManagerTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/pages/DefaultPageManagerTest.java
@@ -29,6 +29,7 @@ import org.apache.wiki.providers.BasicAttachmentProvider;
import org.apache.wiki.providers.CachingProvider;
import org.apache.wiki.providers.FileSystemProvider;
import org.apache.wiki.providers.VerySimpleProvider;
+import org.apache.wiki.util.TextUtil;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -150,7 +151,7 @@ public class DefaultPageManagerTest {
engine.getPageManager().deleteVersion( page );
Assertions.assertNull( engine.getPageManager().getPage( NAME1, 3 ), "got page" );
- final String content = engine.getText( NAME1, WikiProvider.LATEST_VERSION );
+ final String content = engine.getPageManager().getText( NAME1, WikiProvider.LATEST_VERSION );
Assertions.assertEquals( "Test2", content.trim(), "content" );
}
@@ -167,9 +168,9 @@ public class DefaultPageManagerTest {
engine.getPageManager().deleteVersion( page );
Assertions.assertNull( engine.getPageManager().getPage( NAME1, 1 ), "got page" );
- final String content = engine.getText( NAME1, WikiProvider.LATEST_VERSION );
+ final String content = engine.getPageManager().getText( NAME1, WikiProvider.LATEST_VERSION );
Assertions.assertEquals( "Test3", content.trim(), "content" );
- Assertions.assertEquals( "", engine.getText(NAME1, 1).trim(), "content1" );
+ Assertions.assertEquals( "", engine.getPageManager().getText(NAME1, 1).trim(), "content1" );
}
@Test
@@ -192,7 +193,7 @@ public class DefaultPageManagerTest {
props.setProperty( "jspwiki.pageProvider", "org.apache.wiki.providers.VerySimpleProvider" );
props.setProperty( "jspwiki.usePageCache", "false" );
final WikiEngine engine = new TestEngine( props );
- final String p = engine.getText( "test", -1 );
+ final String p = engine.getPageManager().getText( "test", -1 );
final VerySimpleProvider vsp = (VerySimpleProvider) engine.getPageManager().getProvider();
Assertions.assertEquals( "test", vsp.m_latestReq, "wrong page" );
@@ -229,4 +230,51 @@ public class DefaultPageManagerTest {
Assertions.assertNotNull( p, "null" );
}
+ @Test
+ public void testPutPage() throws Exception {
+ final String text = "Foobar.\r\n";
+ final String name = NAME1;
+ engine.saveText( name, text );
+
+ Assertions.assertTrue( engine.pageExists( name ), "page does not exist" );
+ Assertions.assertEquals( text, engine.getPageManager().getText( name ), "wrong content" );
+ }
+
+ @Test
+ public void testPutPageEntities() throws Exception {
+ final String text = "Foobar. "\r\n";
+ final String name = NAME1;
+ engine.saveText( name, text );
+
+ Assertions.assertTrue( engine.pageExists( name ), "page does not exist" );
+ Assertions.assertEquals( "Foobar. &quot;\r\n", engine.getPageManager().getText( name ), "wrong content" );
+ }
+
+ /**
+ * Check that basic " is changed.
+ */
+ @Test
+ public void testPutPageEntities2() throws Exception {
+ final String text = "Foobar. \"\r\n";
+ final String name = NAME1;
+ engine.saveText( name, text );
+
+ Assertions.assertTrue( engine.pageExists( name ), "page does not exist" );
+ Assertions.assertEquals( "Foobar. "\r\n", engine.getPageManager().getText( name ), "wrong content" );
+ }
+
+ @Test
+ public void testSaveExistingPageWithEmptyContent() throws Exception {
+ final String text = "Foobar.\r\n";
+ final String name = NAME1;
+ engine.saveText( name, text );
+
+ Assertions.assertTrue( engine.pageExists( name ), "page does not exist" );
+ // saveText uses normalizePostData to assure it conforms to certain rules
+ Assertions.assertEquals( TextUtil.normalizePostData( text ), engine.getPageManager().getText( name ), "wrong content" );
+
+ engine.saveText( name, "" );
+ Assertions.assertEquals( TextUtil.normalizePostData( "" ), engine.getPageManager().getText( name ), "wrong content" );
+ }
+
}
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/providers/CachingProviderTest.java b/jspwiki-main/src/test/java/org/apache/wiki/providers/CachingProviderTest.java
index 6aa93d8..1d29bfa 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/providers/CachingProviderTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/providers/CachingProviderTest.java
@@ -95,7 +95,7 @@ public class CachingProviderTest
WikiPage p = engine.getPageManager().getPage( "Testi" );
Assertions.assertNotNull( p, "page did not exist?" );
- String text = engine.getText( "Testi");
+ String text = engine.getPageManager().getText( "Testi");
Assertions.assertEquals( "[fuufaa]", text, "text" );
// TODO: ReferenceManager check as well
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java b/jspwiki-main/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java
index 5edd440..cb17e9c 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/providers/VersioningFileProviderTest.java
@@ -87,7 +87,7 @@ public class VersioningFileProviderTest
// also create an associated properties file with some history
injectFile(NAME1+FileSystemProvider.PROP_EXT, FAKE_HISTORY);
- String res = engine.getText( NAME1 );
+ String res = engine.getPageManager().getText( NAME1 );
Assertions.assertEquals( fakeWikiPage, res, "fetch latest should work" );
WikiPage page = engine.getPageManager().getPage( NAME1, 1 );
@@ -108,10 +108,10 @@ public class VersioningFileProviderTest
// initial FileSystemProvider wiki page must be faked.
injectFile(NAME1+AbstractFileProvider.FILE_EXT, "foobar");
- String res = engine.getText( NAME1 );
+ String res = engine.getPageManager().getText( NAME1 );
Assertions.assertEquals( "foobar", res, "fetch latest did not work" );
- res = engine.getText( NAME1, 1 ); // Should be the first version.
+ res = engine.getPageManager().getText( NAME1, 1 ); // Should be the first version.
Assertions.assertEquals( "foobar", res, "fetch by direct version did not work" );
WikiPage page = engine.getPageManager().getPage( NAME1 );
@@ -136,10 +136,10 @@ public class VersioningFileProviderTest
// now create the associated properties file with some history
injectFile(NAME1+FileSystemProvider.PROP_EXT, FAKE_HISTORY);
- String res = engine.getText( NAME1 );
+ String res = engine.getPageManager().getText( NAME1 );
Assertions.assertEquals( fakeWikiPage, res, "fetch latest did not work" );
- res = engine.getText( NAME1, 1 ); // Should be the first version.
+ res = engine.getPageManager().getText( NAME1, 1 ); // Should be the first version.
Assertions.assertEquals( fakeWikiPage, res, "fetch by direct version did not work" );
WikiPage page = engine.getPageManager().getPage( NAME1, 1 );
@@ -166,7 +166,7 @@ public class VersioningFileProviderTest
// also create an associated properties file with some history
injectFile(NAME1+FileSystemProvider.PROP_EXT, FAKE_HISTORY);
- String result1 = engine.getText( NAME1 );
+ String result1 = engine.getPageManager().getText( NAME1 );
Assertions.assertEquals( fakeWikiPage, result1, "latest should be initial" );
// now update the wiki page to create a new version
@@ -178,13 +178,13 @@ public class VersioningFileProviderTest
Assertions.assertEquals( 2, versionHistory.size(), "number of versions" );
// fetch the updated page
- String result2 = engine.getText( NAME1 );
+ String result2 = engine.getPageManager().getText( NAME1 );
Assertions.assertEquals( text, result2, "latest should be new version" );
- String result3 = engine.getText( NAME1, 2 ); // Should be the 2nd version.
+ String result3 = engine.getPageManager().getText( NAME1, 2 ); // Should be the 2nd version.
Assertions.assertEquals( text, result3, "fetch new by version did not work" );
// now confirm the original page has been archived
- String result4 = engine.getText( NAME1, 1 );
+ String result4 = engine.getPageManager().getText( NAME1, 1 );
Assertions.assertEquals( fakeWikiPage, result4, "fetch original by version Assertions.failed" );
WikiPage pageNew = engine.getPageManager().getPage( NAME1, 2 );
@@ -226,17 +226,17 @@ public class VersioningFileProviderTest
Assertions.assertEquals( 3, versionHistory.size(), "number of versions" );
// fetch the latest version of the page
- String result = engine.getText( NAME1 );
+ String result = engine.getPageManager().getText( NAME1 );
Assertions.assertEquals( text3, result, "latest should be newest version" );
- String result2 = engine.getText( NAME1, 3 );
+ String result2 = engine.getPageManager().getText( NAME1, 3 );
Assertions.assertEquals( text3, result2, "fetch new by version did not work" );
// confirm the original page was archived
- String result3 = engine.getText( NAME1, 1 );
+ String result3 = engine.getPageManager().getText( NAME1, 1 );
Assertions.assertEquals( fakeWikiPage, result3, "fetch original by version Assertions.failed" );
// confirm the first update was archived
- String result4 = engine.getText( NAME1, 2 );
+ String result4 = engine.getPageManager().getText( NAME1, 2 );
Assertions.assertEquals( text2, result4, "fetch original by version Assertions.failed" );
WikiPage pageNew = engine.getPageManager().getPage( NAME1 );
@@ -293,17 +293,17 @@ public class VersioningFileProviderTest
Assertions.assertEquals( 3, versionHistory.size(), "number of versions" );
// fetch the latest version of the page
- String result = engine.getText( NAME1 );
+ String result = engine.getPageManager().getText( NAME1 );
Assertions.assertEquals( text3, result, "latest should be newest version" );
- String result2 = engine.getText( NAME1, 3 );
+ String result2 = engine.getPageManager().getText( NAME1, 3 );
Assertions.assertEquals( text3, result2, "fetch new by version did not work" );
// confirm the original page was archived
- String result3 = engine.getText( NAME1, 1 );
+ String result3 = engine.getPageManager().getText( NAME1, 1 );
Assertions.assertEquals( fakeWikiPage, result3, "fetch original by version Assertions.failed" );
// confirm the first update was archived
- String result4 = engine.getText( NAME1, 2 );
+ String result4 = engine.getPageManager().getText( NAME1, 2 );
Assertions.assertEquals( text2, result4, "fetch original by version Assertions.failed" );
WikiPage pageNew = engine.getPageManager().getPage( NAME1 );
@@ -338,7 +338,7 @@ public class VersioningFileProviderTest
Assertions.assertEquals( maxver, pageinfo.getVersion(), "wrong version" );
// +2 comes from \r\n.
- Assertions.assertEquals( maxver+2, engine.getText(NAME1).length(), "wrong text" );
+ Assertions.assertEquals( maxver+2, engine.getPageManager().getText(NAME1).length(), "wrong text" );
}
@Test
@@ -349,7 +349,7 @@ public class VersioningFileProviderTest
engine.saveText( NAME1, text );
- String res = engine.getText(NAME1);
+ String res = engine.getPageManager().getText(NAME1);
Assertions.assertEquals( text, res );
}
@@ -397,9 +397,9 @@ public class VersioningFileProviderTest
Assertions.assertEquals( 3, res.getVersion(), "wrong version" );
- Assertions.assertEquals( text, engine.getText( NAME1, 1 ), "ver1" );
- Assertions.assertEquals( text2, engine.getText( NAME1, 2 ), "ver2" );
- Assertions.assertEquals( text3, engine.getText( NAME1, 3 ), "ver3" );
+ Assertions.assertEquals( text, engine.getPageManager().getText( NAME1, 1 ), "ver1" );
+ Assertions.assertEquals( text2, engine.getPageManager().getText( NAME1, 2 ), "ver2" );
+ Assertions.assertEquals( text3, engine.getPageManager().getText( NAME1, 3 ), "ver3" );
}
@Test
@@ -442,9 +442,9 @@ public class VersioningFileProviderTest
Assertions.assertEquals( 3, res.getVersion(), "wrong version" );
- Assertions.assertEquals( text, engine.getText( NAME1, 1 ), "ver1" );
- Assertions.assertEquals( text2, engine.getText( NAME1, 2 ), "ver2" );
- Assertions.assertEquals( text3, engine.getText( NAME1, 3 ), "ver3" );
+ Assertions.assertEquals( text, engine.getPageManager().getText( NAME1, 1 ), "ver1" );
+ Assertions.assertEquals( text2, engine.getPageManager().getText( NAME1, 2 ), "ver2" );
+ Assertions.assertEquals( text3, engine.getPageManager().getText( NAME1, 3 ), "ver3" );
}
@Test
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/stress/StressTestVersioningProvider.java b/jspwiki-main/src/test/java/org/apache/wiki/stress/StressTestVersioningProvider.java
index dd81de0..300fab6 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/stress/StressTestVersioningProvider.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/stress/StressTestVersioningProvider.java
@@ -72,7 +72,7 @@ public class StressTestVersioningProvider {
Assertions.assertEquals( maxver, pageinfo.getVersion(), "wrong version" );
// +2 comes from \r\n.
- Assertions.assertEquals( maxver+2, engine.getText(NAME1).length(), "wrong text" );
+ Assertions.assertEquals( maxver+2, engine.getPageManager().getText(NAME1).length(), "wrong text" );
}
private void runMassiveFileTest(int maxpages)
diff --git a/jspwiki-war/src/main/webapp/Edit.jsp b/jspwiki-war/src/main/webapp/Edit.jsp
index 1178cc7..bcaf43e 100644
--- a/jspwiki-war/src/main/webapp/Edit.jsp
+++ b/jspwiki-war/src/main/webapp/Edit.jsp
@@ -199,7 +199,7 @@
if( append != null )
{
- StringBuffer pageText = new StringBuffer(wiki.getText( pagereq ));
+ StringBuffer pageText = new StringBuffer(wiki.getPageManager().getText( pagereq ));
pageText.append( text );
diff --git a/jspwiki-war/src/main/webapp/PageModified.jsp b/jspwiki-war/src/main/webapp/PageModified.jsp
index f679e67..9130123 100644
--- a/jspwiki-war/src/main/webapp/PageModified.jsp
+++ b/jspwiki-war/src/main/webapp/PageModified.jsp
@@ -46,7 +46,7 @@
// Make the user and conflicting text presentable for display.
usertext = StringEscapeUtils.escapeXml11( usertext );
- String conflicttext = wiki.getText(pagereq);
+ String conflicttext = wiki.getPageManager().getText(pagereq);
conflicttext = StringEscapeUtils.escapeXml11( conflicttext );
pageContext.setAttribute( "conflicttext",
diff --git a/jspwiki-war/src/main/webapp/templates/default/Nav.jsp b/jspwiki-war/src/main/webapp/templates/default/Nav.jsp
index 57bdc49..0bf0f36 100644
--- a/jspwiki-war/src/main/webapp/templates/default/Nav.jsp
+++ b/jspwiki-war/src/main/webapp/templates/default/Nav.jsp
@@ -31,7 +31,7 @@
<%
WikiContext c = WikiContext.findContext( pageContext );
- String text = c.getEngine().getText(c, c.getPage());
+ String text = c.getEngine().getPageManager().getText(c, c.getPage());
StringTokenizer tokens = new StringTokenizer( text );
//avg reading speeds: https://iovs.arvojournals.org/article.aspx?articleid=2166061