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:09 UTC

[jspwiki] 19/47: JSPWIKI-303: move o.a.w.WikiProvider to jspwiki-210-adapters module

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 5b65708c4fe5b933613d712eef31d946b36a9bd5
Author: juanpablo <ju...@apache.org>
AuthorDate: Sat Mar 14 19:54:49 2020 +0100

    JSPWIKI-303: move o.a.w.WikiProvider to jspwiki-210-adapters module
---
 .../src/main/java/org/apache/wiki/WikiProvider.java     | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiProvider.java b/jspwiki-210-adapters/src/main/java/org/apache/wiki/WikiProvider.java
similarity index 77%
rename from jspwiki-main/src/main/java/org/apache/wiki/WikiProvider.java
rename to jspwiki-210-adapters/src/main/java/org/apache/wiki/WikiProvider.java
index a001f7f..355b7d3 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiProvider.java
+++ b/jspwiki-210-adapters/src/main/java/org/apache/wiki/WikiProvider.java
@@ -30,10 +30,7 @@ import java.util.Properties;
  *
  *  @since 2.0
  */
-public interface WikiProvider {
-
-    /** Passing this to any method should get the latest version */
-    int LATEST_VERSION = -1;
+public interface WikiProvider extends org.apache.wiki.api.providers.WikiProvider {
 
     /**
      *  Initializes the page provider.
@@ -43,14 +40,12 @@ public interface WikiProvider {
      *  @throws NoRequiredPropertyException If the provider needs a property which is not found in the property set
      *  @throws IOException If there is an IO problem
      */
-    void initialize( Engine engine, Properties properties ) throws NoRequiredPropertyException, IOException;
+    @Override
+    default void initialize( final Engine engine, final Properties properties ) throws NoRequiredPropertyException, IOException {
+        initialize( engine.adapt( WikiEngine.class ), properties );
+    }
 
-    /**
-     *  Return a valid HTML string for information.  May be anything.
-     *  @since 1.6.4
-     *  @return A string describing the provider.
-     */
-    String getProviderInfo();
+    default void initialize( final WikiEngine engine, final Properties properties ) throws NoRequiredPropertyException, IOException {}
 
 }