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 bc8e7536b33137953efd3591fec248706db0c975 Author: juanpablo <[email protected]> AuthorDate: Sun Mar 15 21:35:01 2020 +0100 mark classes / interfaces from jspwiki-210-adapters as deprecated --- .../main/java/org/apache/wiki/api/filters/BasicPageFilter.java | 8 ++++++++ .../src/main/java/org/apache/wiki/api/plugin/WikiPlugin.java | 3 +++ .../java/org/apache/wiki/providers/WikiAttachmentProvider.java | 3 +++ .../src/main/java/org/apache/wiki/providers/WikiPageProvider.java | 3 +++ 4 files changed, 17 insertions(+) diff --git a/jspwiki-210-adapters/src/main/java/org/apache/wiki/api/filters/BasicPageFilter.java b/jspwiki-210-adapters/src/main/java/org/apache/wiki/api/filters/BasicPageFilter.java index 1be7789..b4d2d9d 100644 --- a/jspwiki-210-adapters/src/main/java/org/apache/wiki/api/filters/BasicPageFilter.java +++ b/jspwiki-210-adapters/src/main/java/org/apache/wiki/api/filters/BasicPageFilter.java @@ -18,6 +18,7 @@ */ package org.apache.wiki.api.filters; +import org.apache.log4j.Logger; import org.apache.wiki.WikiContext; import org.apache.wiki.WikiEngine; import org.apache.wiki.api.core.Context; @@ -33,11 +34,18 @@ import static org.apache.wiki.api.filters.FilterSupportOperations.methodOfNonPub /** * Hooks all filters not using the public api into it. + * + * @deprecated use {@link BasePageFilter} instead + * @see BasePageFilter */ +@Deprecated public class BasicPageFilter extends BasePageFilter { public void initialize( final WikiEngine engine, final Properties properties ) throws FilterException { this.m_engine = engine; + Logger.getLogger( BasicPageFilter.class ).warn( this.getClass().getName() + " implements deprecated org.apache.wiki.api.filters.BasicPageFilter" ); + Logger.getLogger( BasicPageFilter.class ).warn( "Please contact the filter's author so there can be a new release of the filter " + + "extending the new org.apache.wiki.api.filters.BasePageFilter class" ); } public String preTranslate( final WikiContext wikiContext, final String content ) throws FilterException { diff --git a/jspwiki-210-adapters/src/main/java/org/apache/wiki/api/plugin/WikiPlugin.java b/jspwiki-210-adapters/src/main/java/org/apache/wiki/api/plugin/WikiPlugin.java index 30a3b1b..14a7b53 100644 --- a/jspwiki-210-adapters/src/main/java/org/apache/wiki/api/plugin/WikiPlugin.java +++ b/jspwiki-210-adapters/src/main/java/org/apache/wiki/api/plugin/WikiPlugin.java @@ -28,7 +28,10 @@ import java.util.Map; /** * Defines an interface for plugins. Any instance of a wiki plugin should implement this interface. + * @deprecated use {@link Plugin} instead + * @see Plugin */ +@Deprecated public interface WikiPlugin extends Plugin { /** {@inheritDoc} */ diff --git a/jspwiki-210-adapters/src/main/java/org/apache/wiki/providers/WikiAttachmentProvider.java b/jspwiki-210-adapters/src/main/java/org/apache/wiki/providers/WikiAttachmentProvider.java index a02b00a..4fe46d3 100644 --- a/jspwiki-210-adapters/src/main/java/org/apache/wiki/providers/WikiAttachmentProvider.java +++ b/jspwiki-210-adapters/src/main/java/org/apache/wiki/providers/WikiAttachmentProvider.java @@ -37,7 +37,10 @@ import java.util.List; * The difference between this class and WikiPageProvider is that there PageProviders handle Unicode text, whereas we handle binary data. * While there are quite a lot of similarities in how we handle things, many providers can really use just one. In addition, * since binary files can be really large, we rely on Input/OutputStreams. + * @deprecated use {@link org.apache.wiki.api.providers.AttachmentProvider} instead + * @see org.apache.wiki.api.providers.AttachmentProvider */ +@Deprecated public interface WikiAttachmentProvider extends WikiProvider { /** diff --git a/jspwiki-210-adapters/src/main/java/org/apache/wiki/providers/WikiPageProvider.java b/jspwiki-210-adapters/src/main/java/org/apache/wiki/providers/WikiPageProvider.java index 030806a..1a25535 100644 --- a/jspwiki-210-adapters/src/main/java/org/apache/wiki/providers/WikiPageProvider.java +++ b/jspwiki-210-adapters/src/main/java/org/apache/wiki/providers/WikiPageProvider.java @@ -38,7 +38,10 @@ import java.util.List; * instead of name/version. We will perhaps modify these in the future. In the mean time, name/version is quite sufficient. * <P> * FIXME: In reality we should have an AbstractWikiPageProvider, which would provide intelligent backups for subclasses. + * @deprecated use {@link org.apache.wiki.api.providers.PageProvider} instead + * @see org.apache.wiki.api.providers.PageProvider */ +@Deprecated public interface WikiPageProvider extends WikiProvider { /**
