CONFLUENCE-240: Make AbstractMacroConverter and the Confluence Converter public

 * Make most things use ConfluenceFilterReferenceConverter instead of ConfluenceConverter

Author: raphj

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

@@ -33,6 +33,7 @@
 import org.xwiki.component.descriptor.ComponentInstantiationStrategy;
 import org.xwiki.component.manager.ComponentLookupException;
 import org.xwiki.component.manager.ComponentManager;
+import org.xwiki.contrib.confluence.filter.ConfluenceFilterReferenceConverter;
 import org.xwiki.contrib.confluence.filter.MacroConverter;
 import org.xwiki.contrib.confluence.filter.input.ConfluenceInputContext;
 import org.xwiki.contrib.confluence.parser.confluence.internal.wikimodel.ConfluenceResourceReference;
@@ -86,7 +87,7 @@ public class ConfluenceConverterListener extends WrappingListener
     private ConfluenceInputContext context;
 
     @Inject
-    private ConfluenceConverter confluenceConverter;
+    private ConfluenceFilterReferenceConverter confluenceConverter;
 
     @Inject
     @Named("plain/1.0")
@@ -137,8 +138,7 @@ private void handleIdMacro(Map<String, String> parameters, String content, boole
                 return;
             }
 
-            String currentPageTitle =
-                confluenceConverter.getCurrentPageTitleForAnchor();
+            String currentPageTitle = ((ConfluenceConverter) confluenceConverter).getCurrentPageTitleForAnchor();
 
             if (context.isConfluenceCloud()) {
                 String dashedName = spacesToDash(name);

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

@@ -57,6 +57,7 @@
 import org.xwiki.component.annotation.Component;
 import org.xwiki.component.annotation.InstantiationStrategy;
 import org.xwiki.component.descriptor.ComponentInstantiationStrategy;
+import org.xwiki.contrib.confluence.filter.ConfluenceFilterReferenceConverter;
 import org.xwiki.contrib.confluence.filter.PageIdentifier;
 import org.xwiki.contrib.confluence.filter.event.ConfluenceFilteredEvent;
 import org.xwiki.contrib.confluence.filter.event.ConfluenceFilteringEvent;
@@ -199,7 +200,7 @@ public class ConfluenceInputFilterStream
     private ConfluenceInputContext context;
 
     @Inject
-    private ConfluenceConverter confluenceConverter;
+    private ConfluenceFilterReferenceConverter confluenceConverter;
 
     @Inject
     private ConfluenceURLConverter urlConverter;

confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/BlogPostsMacroConverter.java

@@ -28,8 +28,8 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.xwiki.component.annotation.Component;
+import org.xwiki.contrib.confluence.filter.ConfluenceFilterReferenceConverter;
 import org.xwiki.contrib.confluence.filter.input.ConfluenceInputContext;
-import org.xwiki.contrib.confluence.filter.internal.input.ConfluenceConverter;
 
 /**
  * blog-posts macro converter.
@@ -61,7 +61,7 @@ public class BlogPostsMacroConverter extends AbstractMacroConverter
     private ConfluenceInputContext context;
 
     @Inject
-    private ConfluenceConverter converter;
+    private ConfluenceFilterReferenceConverter converter;
 
     @Override
     public String toXWikiId(String confluenceId, Map<String, String> confluenceParameters, String confluenceContent,

confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/ChildrenMacroConverter.java

@@ -21,7 +21,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.xwiki.component.annotation.Component;
-import org.xwiki.contrib.confluence.filter.internal.input.ConfluenceConverter;
+import org.xwiki.contrib.confluence.filter.ConfluenceFilterReferenceConverter;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -48,7 +48,7 @@ public class ChildrenMacroConverter extends AbstractMacroConverter
     private static final String TRUE = "true";
 
     @Inject
-    private ConfluenceConverter confluenceConverter;
+    private ConfluenceFilterReferenceConverter confluenceConverter;
 
     @Override
     public String toXWikiId(String confluenceId, Map<String, String> confluenceParameters, String confluenceContent,

confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/LivesearchMacroConverter.java

@@ -20,7 +20,6 @@
 package org.xwiki.contrib.confluence.filter.internal.macros;
 
 import org.slf4j.Logger;
-import org.xwiki.contrib.confluence.filter.internal.input.ConfluenceConverter;
 import org.xwiki.component.annotation.Component;
 
 import javax.inject.Inject;
@@ -30,6 +29,7 @@
 import java.util.Map;
 
 import org.xwiki.contrib.confluence.filter.AbstractMacroConverter;
+import org.xwiki.contrib.confluence.filter.ConfluenceFilterReferenceConverter;
 
 /**
  * Livesearch Macro Converter - converts livesearch to the Location Search Macro.
@@ -62,7 +62,7 @@ public class LivesearchMacroConverter extends AbstractMacroConverter
     private static final String PLACEHOLDER = "placeholder";
 
     @Inject
-    private ConfluenceConverter converter;
+    private ConfluenceFilterReferenceConverter converter;
 
     @Inject
     private Logger logger;

confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/MentionMacroConverter.java

@@ -29,7 +29,7 @@
 import org.apache.commons.lang3.RandomStringUtils;
 import org.slf4j.Logger;
 import org.xwiki.component.annotation.Component;
-import org.xwiki.contrib.confluence.filter.internal.input.ConfluenceConverter;
+import org.xwiki.contrib.confluence.filter.ConfluenceFilterReferenceConverter;
 import org.xwiki.rendering.listener.reference.ResourceReference;
 import org.xwiki.rendering.listener.reference.UserResourceReference;
 
@@ -49,7 +49,7 @@ public class MentionMacroConverter extends AbstractMacroConverter
     private static final String REFERENCE_PARAMETER_KEY = "reference";
 
     @Inject
-    private ConfluenceConverter confluenceConverter;
+    private ConfluenceFilterReferenceConverter confluenceConverter;
 
     @Inject
     private Logger logger;

confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/PagetreesearchMacroConverter.java

@@ -21,7 +21,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.xwiki.component.annotation.Component;
-import org.xwiki.contrib.confluence.filter.internal.input.ConfluenceConverter;
+import org.xwiki.contrib.confluence.filter.ConfluenceFilterReferenceConverter;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -46,7 +46,7 @@
 public class PagetreesearchMacroConverter extends AbstractMacroConverter
 {
     @Inject
-    private ConfluenceConverter converter;
+    private ConfluenceFilterReferenceConverter converter;
 
     @Override
     public String toXWikiId(String confluenceId, Map<String, String> confluenceParameters, String confluenceContent,

confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/RwPagetreeMacroConverter.java

@@ -22,8 +22,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.xwiki.component.annotation.Component;
-import org.xwiki.contrib.confluence.filter.internal.input.ConfluenceConverter;
-import org.xwiki.model.reference.EntityReferenceSerializer;
+import org.xwiki.contrib.confluence.filter.ConfluenceFilterReferenceConverter;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -48,14 +47,11 @@ public class RwPagetreeMacroConverter extends AbstractMacroConverter
     private static final String ROOT = "root";
 
     @Inject
-    private ConfluenceConverter confluenceConverter;
+    private ConfluenceFilterReferenceConverter confluenceConverter;
 
     @Inject
     private Logger logger;
 
-    @Inject
-    private EntityReferenceSerializer<String> serializer;
-
     @Override
     public String toXWikiId(String confluenceId, Map<String, String> confluenceParameters, String confluenceContent,
         boolean inline)

confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/url/internal/BaseConfluenceURLConverter.java

@@ -23,7 +23,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.xwiki.component.annotation.Component;
-import org.xwiki.contrib.confluence.filter.internal.input.ConfluenceConverter;
+import org.xwiki.contrib.confluence.filter.ConfluenceFilterReferenceConverter;
 import org.xwiki.contrib.confluence.filter.url.AbstractConfluenceURLConverter;
 import org.xwiki.rendering.listener.reference.ResourceReference;
 import org.xwiki.rendering.listener.reference.ResourceType;
@@ -78,7 +78,7 @@ public class BaseConfluenceURLConverter extends AbstractConfluenceURLConverter
         Pattern.compile("^images/icons/emoticons/([^?#]+)(\\....)(\\?.*)?$");
 
     @Inject
-    private ConfluenceConverter converter;
+    private ConfluenceFilterReferenceConverter converter;
 
     @Inject
     private Logger logger;

confluence-xml/src/test/java/org/xwiki/contrib/confluence/filter/FakeShowIfMacroConverter.java

@@ -26,7 +26,6 @@
 import javax.inject.Singleton;
 
 import org.xwiki.component.annotation.Component;
-import org.xwiki.contrib.confluence.filter.internal.input.ConfluenceConverter;
 import org.xwiki.contrib.confluence.filter.internal.macros.AbstractMacroConverter;
 
 @Component
@@ -37,7 +36,7 @@ public class FakeShowIfMacroConverter extends AbstractMacroConverter
     private static final String GROUP_ID_PARAM = "groupIds";
 
     @Inject
-    private ConfluenceConverter converter;
+    private ConfluenceFilterReferenceConverter converter;
 
     @Override
     protected String toXWikiParameterValue(String confluenceParameterName, String confluenceParameterValue,