Branch: refs/heads/CONFLUENCE-240 Home: https://github.com/xwiki-contrib/confluence Commit: 154571b682f7fc2af8c867d3cdaed771cadc978b https://github.com/xwiki-contrib/confluence/commit/154571b682f7fc2af8c867d3c... Author: Raphaël Jakse <[email protected]> Date: 2025-11-28 (Fri, 28 Nov 2025) Changed paths: A confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/AbstractMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/AbstractMacroConverter.java A confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/AbstractWithSortAndReverseMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/ChildrenMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/PagetreeMacroConverter.java Log Message: ----------- CONFLUENCE-240: Make AbstractMacroConverter and the Confluence Converter public * Introduce the public AbstractMacroConverter class Commit: 734cc6ca5d069df673b2548f0c438726f0bcec43 https://github.com/xwiki-contrib/confluence/commit/734cc6ca5d069df673b2548f0... Author: Raphaël Jakse <[email protected]> Date: 2025-11-28 (Fri, 28 Nov 2025) Changed paths: M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/AUIMessageConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/AbstractParseContentMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/AlertMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/AnchorMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/BlogPostsMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/CenterMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/ClickableMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/CodeMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/ConditionalContentMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/DefaultMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/ImgMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/IncludeMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/JiraMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/LangMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/LivesearchMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/MarkdownMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/MathMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/MathblockRefMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/MentionMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/NoformatMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/PagetreesearchMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/PlantumlRenderMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/PopularLabelsMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/RwPagetreeMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/ScrollExporterMacrosConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/SpacesMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/SwaggerOpenApiMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/TocMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/WarningMacroConverter.java M confluence-xml/src/test/java/org/xwiki/contrib/confluence/filter/FakeBlockMacroConverter.java M confluence-xml/src/test/java/org/xwiki/contrib/confluence/filter/FakeShowIfMacroConverter.java Log Message: ----------- CONFLUENCE-240: Make AbstractMacroConverter and the Confluence Converter public * Make most macro converters use the new class Commit: c59eee7eb1eaf6f173d0007512bb47c79e2fd0b9 https://github.com/xwiki-contrib/confluence/commit/c59eee7eb1eaf6f173d000751... Author: Raphaël Jakse <[email protected]> Date: 2025-11-28 (Fri, 28 Nov 2025) Changed paths: M confluence-syntax-xhtml/src/main/java/org/xwiki/contrib/confluence/parser/xhtml/ConfluenceReferenceConverter.java M confluence-syntax-xhtml/src/main/java/org/xwiki/contrib/confluence/parser/xhtml/internal/wikimodel/FallbackConfluenceReferenceConverter.java A confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/ConfluenceFilterReferenceConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceInputFilterStream.java Log Message: ----------- CONFLUENCE-240: Make AbstractMacroConverter and the Confluence Converter public * Make a public ConfluenceFilterReferenceConverter interface in Confluence-XML * Make ConfluenceConverter an implementer of this interface Commit: 80adfec0e58981230bcc90d7c7e53922454ec8a2 https://github.com/xwiki-contrib/confluence/commit/80adfec0e58981230bcc90d7c... Author: Raphaël Jakse <[email protected]> Date: 2025-11-28 (Fri, 28 Nov 2025) Changed paths: M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceConverterListener.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceInputFilterStream.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/BlogPostsMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/ChildrenMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/LivesearchMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/MentionMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/PagetreeMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/PagetreesearchMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/RwPagetreeMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/url/internal/BaseConfluenceURLConverter.java M confluence-xml/src/test/java/org/xwiki/contrib/confluence/filter/FakeShowIfMacroConverter.java Log Message: ----------- CONFLUENCE-240: Make AbstractMacroConverter and the Confluence Converter public * Make most things use ConfluenceFilterReferenceConverter instead of ConfluenceConverter Commit: 3406da4a9107553967be0fae89a41eda82351e5e https://github.com/xwiki-contrib/confluence/commit/3406da4a9107553967be0fae8... Author: Raphaël Jakse <[email protected]> Date: 2025-11-28 (Fri, 28 Nov 2025) Changed paths: M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceConverter.java Log Message: ----------- CONFLUENCE-240: Make AbstractMacroConverter and the Confluence Converter public * Mark ConfluenceConverter as deprecated so IDEs can warn against injecting it Commit: 26b0e019c626c4e344920e455b7dc3900bf1f7e8 https://github.com/xwiki-contrib/confluence/commit/26b0e019c626c4e344920e455... Author: Raphaël Jakse <[email protected]> Date: 2025-11-28 (Fri, 28 Nov 2025) Changed paths: M confluence-syntax-xhtml/src/main/java/org/xwiki/contrib/confluence/parser/xhtml/ConfluenceReferenceConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/ConfluenceFilterReferenceConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceConverterListener.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceInputFilterStream.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/MentionMacroConverter.java M confluence-xml/src/test/resources/confluencexml/usersreferences.test Log Message: ----------- CONFLUENCE-240: Make AbstractMacroConverter and the Confluence Converter public * Clean up the user key, name and resource reference conversion related APIs Commit: e7c131d50262aae06e8719277d16df5e9e4da83e https://github.com/xwiki-contrib/confluence/commit/e7c131d50262aae06e8719277... Author: Raphaël Jakse <[email protected]> Date: 2025-11-28 (Fri, 28 Nov 2025) Changed paths: M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/AbstractMacroConverter.java A confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/ConversionException.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/MacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceConverterListener.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/AUIMessageConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/AbstractMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/AbstractTranslationMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/AnchorMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/BlogPostsMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/CenterMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/ClickableMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/CodeMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/ConditionalContentMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/DefaultMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/ImgMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/IncludeMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/JiraMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/LangMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/LivesearchMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/MacroToContentConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/MathMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/MathblockRefMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/MentionMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/PlantumlRenderMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/RedirectMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/ScrollExporterMacrosConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/SwaggerOpenApiMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/TocMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/TranslationMacroConverter.java R confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/ViewportRedirectMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/WidgetMacroConverter.java M confluence-xml/src/main/resources/META-INF/components.txt M confluence-xml/src/test/resources/confluencexml/widget.test Log Message: ----------- CONFLUENCE-240: Make AbstractMacroConverter and the Confluence Converter public * Add a mechanism to throw checked exceptions in macro converters, to match the current practice of throwing to cancel a conversion, but which has so far required to throw a unchecked RuntimeException, which is not great * Add convenient utility methods to save parameters for handling the common cases where we want to retrieve parameters checking whether they are null or empty. They make it a bit less cumbersome and verbose to handle many cases. Commit: 1e2bef21b3160732ec19394bb5729ec42ec9b4c6 https://github.com/xwiki-contrib/confluence/commit/1e2bef21b3160732ec19394bb... Author: Raphaël Jakse <[email protected]> Date: 2025-11-28 (Fri, 28 Nov 2025) Changed paths: M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/AbstractMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/MacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/AbstractMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/DefaultMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/ImgMacroConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/MacroToContentConverter.java M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/MentionMacroConverter.java M confluence-xml/src/test/java/org/xwiki/contrib/confluence/filter/FakeShowIfMacroConverter.java Log Message: ----------- CONFLUENCE-240: Make AbstractMacroConverter and the Confluence Converter public Force macro converters to implement toXWikiId, which will likely help avoid bugs Compare: https://github.com/xwiki-contrib/confluence/compare/7f80afc7c647...1e2bef21b... To unsubscribe from these emails, change your notification settings at https://github.com/xwiki-contrib/confluence/settings/notifications