Skip to content

Commit 7f80afc

Browse files
committed
CONFLUENCE-240: Make AbstractMacroConverter and the Confluence Converter public
* Mark ConfluenceConverter as deprecated so IDEs can warn against injecting it
1 parent 353f763 commit 7f80afc

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceConverter.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,18 @@
6868
/**
6969
* Default implementation of ConfluenceFilterReferenceConverter.
7070
*
71-
* Note: the ConfluenceConverter role is deprecated and will eventually go away. We give a grace period to let
72-
* projects switch to {@link ConfluenceFilterReferenceConverter}, ideally we should get rid of this deprecated role
73-
* early 2026.
71+
* Note: While the implementation itself is not deprecated, the ConfluenceConverter role is deprecated and will
72+
* eventually go away. We give a grace period to let projects switch to {@link ConfluenceFilterReferenceConverter},
73+
* ideally we should get rid of this deprecated role early 2026. We use the deprecated annotations to make the IDEs
74+
* warn against using it.
7475
*
7576
* @version $Id$
7677
* @since 9.26.0
78+
* @deprecated since 9.83.0, use {@link ConfluenceFilterReferenceConverter} instead
7779
*/
7880
@Component (roles = {ConfluenceFilterReferenceConverter.class, ConfluenceConverter.class})
7981
@Singleton
82+
@Deprecated (since = "9.83.0")
8083
public class ConfluenceConverter implements ConfluenceFilterReferenceConverter
8184
{
8285
private static final Pattern FORBIDDEN_USER_CHARACTERS = Pattern.compile("[. /]");

0 commit comments

Comments
 (0)