[xwiki-notifications] [xwiki-contrib/confluence] c6ab57: CONFLUENCE-500: Handle collisions with existing sp...

Branch: refs/heads/master Home: https://github.com/xwiki-contrib/confluence Commit: c6ab57ce70c46088615b8fd52227f20797be4e3a https://github.com/xwiki-contrib/confluence/commit/c6ab57ce70c46088615b8fd52... 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/input/ConfluenceInputProperties.java Log Message: ----------- CONFLUENCE-500: Handle collisions with existing spaces when importing Confluence spaces * add spaces in the property description Commit: f2cb5d08d11344b96446310db810641783ecfd95 https://github.com/xwiki-contrib/confluence/commit/f2cb5d08d11344b96446310db... 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: c8021274399532de93c91a0b48a5dbb3694721ed https://github.com/xwiki-contrib/confluence/commit/c8021274399532de93c91a0b4... 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: e39cfff86876bdd5adcd8351842357e6638d272e https://github.com/xwiki-contrib/confluence/commit/e39cfff86876bdd5adcd83518... 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: dc807f4f90d820f552461803f5686866e6af85b4 https://github.com/xwiki-contrib/confluence/commit/dc807f4f90d820f552461803f... 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: 43b75cb921f1f2fdc8406c0975b47bd80b369c4a https://github.com/xwiki-contrib/confluence/commit/43b75cb921f1f2fdc8406c097... 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: 63a1c1c0e818d89c18752468ac41c77ce321ea5d https://github.com/xwiki-contrib/confluence/commit/63a1c1c0e818d89c18752468a... 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: 7242cd0bacddee281bf4009a44ea3afd5c0a2c8a https://github.com/xwiki-contrib/confluence/commit/7242cd0bacddee281bf4009a4... 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: 85c9b16fbee5709d499eeb9898436c71e8de3cfd https://github.com/xwiki-contrib/confluence/commit/85c9b16fbee5709d499eeb989... 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/ada32456018b...85c9b16fb... To unsubscribe from these emails, change your notification settings at https://github.com/xwiki-contrib/confluence/settings/notifications