XWIKI-12370: Improve DocumentReferenceConverter for EntityReference

xwiki-platform-core/xwiki-platform-model/src/main/resources/META-INF/components.txt

@@ -26,6 +26,5 @@ org.xwiki.model.internal.reference.RelativeStringEntityReferenceResolver
 org.xwiki.model.internal.reference.UidStringEntityReferenceSerializer
 org.xwiki.model.internal.reference.PathStringEntityReferenceSerializer
 org.xwiki.model.internal.reference.PathStringDocumentReferenceResolver
-org.xwiki.model.internal.reference.converter.DocumentReferenceConverter
 org.xwiki.model.internal.reference.converter.EntityReferenceConverter
 org.xwiki.model.script.ModelScriptService

xwiki-platform-core/xwiki-platform-model/src/main/java/org/xwiki/model/internal/reference/converter/DocumentReferenceConverter.java → xwiki-platform-core/xwiki-platform-oldcore/src/main/java/com/xpn/xwiki/internal/model/reference/DocumentReferenceConverter.java

@@ -17,7 +17,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.xwiki.model.internal.reference.converter;
+package com.xpn.xwiki.internal.model.reference;
 
 import java.lang.reflect.Type;
 
@@ -48,7 +48,7 @@ public class DocumentReferenceConverter extends AbstractConverter<DocumentRefere
     private DocumentReferenceResolver<String> stringResolver;
 
     @Inject
-    @Named("current")
+    @Named("currentgetdocument")
     private DocumentReferenceResolver<EntityReference> referenceResolver;
 
     @Inject

xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/META-INF/components.txt

@@ -53,6 +53,7 @@ com.xpn.xwiki.internal.model.reference.CurrentStringSpaceReferenceResolver
 com.xpn.xwiki.internal.model.reference.CurrentStringDocumentReferenceResolver
 com.xpn.xwiki.internal.model.reference.CurrentStringAttachmentReferenceResolver
 com.xpn.xwiki.internal.model.reference.CurrentWikiReferenceProvider
+com.xpn.xwiki.internal.model.reference.DocumentReferenceConverter
 com.xpn.xwiki.internal.model.reference.XClassRelativeStringEntityReferenceResolver
 com.xpn.xwiki.internal.model.DefaultLegacySpaceResolver
 com.xpn.xwiki.internal.objects.classes.XClassMigratorListener

xwiki-platform-core/xwiki-platform-model/src/test/java/org/xwiki/model/internal/reference/converter/DocumentReferenceConverterTest.java → xwiki-platform-core/xwiki-platform-oldcore/src/test/java/com/xpn/xwiki/internal/model/reference/DocumentReferenceConverterTest.java

@@ -17,13 +17,14 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.xwiki.model.internal.reference.converter;
+package com.xpn.xwiki.internal.model.reference;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.Mockito;
+import org.xwiki.component.internal.ContextComponentManagerProvider;
 import org.xwiki.model.EntityType;
 import org.xwiki.model.reference.DocumentReference;
 import org.xwiki.model.reference.DocumentReferenceResolver;
@@ -31,8 +32,11 @@
 import org.xwiki.model.reference.EntityReferenceSerializer;
 import org.xwiki.properties.ConverterManager;
 import org.xwiki.properties.converter.Converter;
+import org.xwiki.properties.internal.DefaultConverterManager;
 import org.xwiki.properties.internal.converter.ColorConverter;
-import org.xwiki.test.annotation.AllComponents;
+import org.xwiki.properties.internal.converter.ConvertUtilsConverter;
+import org.xwiki.properties.internal.converter.EnumConverter;
+import org.xwiki.test.annotation.ComponentList;
 import org.xwiki.test.mockito.MockitoComponentMockingRule;
 
 /**
@@ -40,7 +44,8 @@
  * 
  * @version $Id$
  */
-@AllComponents
+@ComponentList(value = { DefaultConverterManager.class, ContextComponentManagerProvider.class, EnumConverter.class,
+ConvertUtilsConverter.class })
 public class DocumentReferenceConverterTest
 {
     @Rule
@@ -61,7 +66,7 @@ public void setUp() throws Exception
         this.converterManager = mocker.getInstance(ConverterManager.class);
 
         this.mockStringResolver = this.mocker.getInstance(DocumentReferenceResolver.TYPE_STRING, "current");
-        this.mockReferenceResolver = this.mocker.getInstance(DocumentReferenceResolver.TYPE_REFERENCE, "current");
+        this.mockReferenceResolver = this.mocker.getInstance(DocumentReferenceResolver.TYPE_REFERENCE, "currentgetdocument");
         this.mockSerialier = this.mocker.getInstance(EntityReferenceSerializer.TYPE_STRING, "compact");
     }