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:13 UTC
[jspwiki] 03/32: JSPWIKI-120: removed getPageCount from WikiEngine
- use PageManager.getTotalPageCount instead
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 46b7e9756048b1a747fd8a662d545b945dfdeeca
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Jan 3 21:09:20 2020 +0100
JSPWIKI-120: removed getPageCount from WikiEngine - use PageManager.getTotalPageCount instead
---
.../src/main/java/org/apache/wiki/WikiEngine.java | 9 ---------
.../org/apache/wiki/ui/admin/beans/CoreBean.java | 21 ++++++++-------------
.../wiki/variables/DefaultVariableManager.java | 2 +-
.../apache/wiki/stress/MassiveRepositoryTest.java | 21 +++++++++------------
4 files changed, 18 insertions(+), 35 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 836e10d..3080f5d 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
@@ -1544,15 +1544,6 @@ public class WikiEngine {
}
/**
- * Returns the number of pages in this Wiki
- * @return The total number of pages.
- */
- public int getPageCount()
- {
- return m_pageManager.getTotalPageCount();
- }
-
- /**
* Returns a Collection of WikiPages, sorted in time
* order of last change (i.e. first object is the most
* recently changed). This method also includes attachments.
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 a031506..0a8e7d2 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
@@ -18,25 +18,22 @@
*/
package org.apache.wiki.ui.admin.beans;
-import javax.management.NotCompliantMBeanException;
-
import org.apache.wiki.Release;
import org.apache.wiki.WikiEngine;
import org.apache.wiki.ui.admin.SimpleAdminBean;
+import javax.management.NotCompliantMBeanException;
+
+
/**
* An AdminBean which manages the JSPWiki core operations.
- *
*/
-public class CoreBean
- extends SimpleAdminBean
-{
+public class CoreBean extends SimpleAdminBean {
+
private static final String[] ATTRIBUTES = { "pages", "version" };
private static final String[] METHODS = { };
- //private WikiEngine m_engine; //inherited proteced filed from SimpleAdminBean
- public CoreBean( WikiEngine engine ) throws NotCompliantMBeanException
- {
+ public CoreBean( final WikiEngine engine ) throws NotCompliantMBeanException {
m_engine = engine;
}
@@ -45,9 +42,8 @@ public class CoreBean
*
* @return the page content
*/
- public int getPages()
- {
- return m_engine.getPageCount();
+ public int getPages() {
+ return m_engine.getPageManager().getTotalPageCount();
}
public String getPagesDescription()
@@ -75,7 +71,6 @@ public class CoreBean
return CORE;
}
-
public String getId()
{
return "corebean";
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java b/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java
index 2f82aa8..7ba3d1a 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java
@@ -343,7 +343,7 @@ public class DefaultVariableManager implements VariableManager {
}
public String getTotalpages() {
- return Integer.toString( m_context.getEngine().getPageCount() );
+ return Integer.toString( m_context.getEngine().getPageManager().getTotalPageCount() );
}
public String getPageprovider() {
diff --git a/jspwiki-main/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java b/jspwiki-main/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java
index a581170..08c65f0 100644
--- a/jspwiki-main/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java
+++ b/jspwiki-main/src/test/java/org/apache/wiki/stress/MassiveRepositoryTest.java
@@ -17,23 +17,20 @@
under the License.
*/
package org.apache.wiki.stress;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.AfterEach;
-
-import org.junit.jupiter.api.Test;
-
-import java.io.File;
-import java.util.Properties;
-import java.util.Random;
-
-import org.junit.jupiter.api.Assertions;
import net.sf.ehcache.CacheManager;
-
import org.apache.wiki.TestEngine;
import org.apache.wiki.WikiProvider;
import org.apache.wiki.api.exceptions.WikiException;
import org.apache.wiki.providers.FileSystemProvider;
import org.apache.wiki.util.TextUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.util.Properties;
+import java.util.Random;
public class MassiveRepositoryTest {
@@ -148,7 +145,7 @@ public class MassiveRepositoryTest {
System.out.println("\nTook "+sw.toString()+", which is "+sw.toString(numRevisions)+" adds/second");
- Assertions.assertEquals( numPages, engine.getPageCount(), "Right number of pages" );
+ Assertions.assertEquals( numPages, engine.getPageManager().getTotalPageCount(), "Right number of pages" );
//
// Rendering random pages