succesfully get individual converters from container

Author: tpluscode

RomanticWeb/ComponentModel/InternalComponentsCompositionRoot.cs

@@ -86,7 +86,7 @@ private void RegisterConverter(Type converterType, IServiceRegistry registry)
                 return;
             }
 
-            registry.Register(typeof(INodeConverter), converterType, converterType.FullName, new PerContainerLifetime());
+            registry.Register(converterType, converterType, converterType.FullName, new PerContainerLifetime());
         }
 
         private bool IsAlreadyRegistered(Type converterType, IServiceRegistry registry)

RomanticWeb/ComponentModel/MappingCompositionRoot.cs

@@ -14,7 +14,7 @@ public MappingCompositionRoot()
             MappingModelVisitor<RdfTypeCacheBuilder>();
             MappingProviderVisitor<ConventionsVisitor>();
             MappingProviderVisitor<MappingProvidersValidator>();
-            MappingProviderVisitor<ConvertersRegistrator>();
+            ////MappingProviderVisitor<ConvertersRegistrator>();
             MappingProviderVisitor<GeneratedListMappingSource>();
             MappingProviderVisitor<GeneratedDictionaryMappingSource>();
         }

RomanticWeb/Converters/ConverterCatalog.cs

@@ -10,14 +10,21 @@ namespace RomanticWeb.Converters
     /// </summary>
     internal sealed class ConverterCatalog : IConverterCatalog
     {
+        private readonly Func<Type, INodeConverter> _createConverter;
+
         private readonly IDictionary<Type, INodeConverter> _converters;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ConverterCatalog"/> class.
         /// </summary>
-        public ConverterCatalog(IEnumerable<INodeConverter> converters)
+        public ConverterCatalog(Func<Type, INodeConverter> createConverter)
+        {
+            _createConverter = createConverter;
+        }
+
+        internal ConverterCatalog()
+            : this(type => null)
         {
-            _converters = converters.ToDictionary(c => c.GetType(), c => c);
         }
 
         /// <inheritdoc/>
@@ -45,13 +52,8 @@ public INodeConverter GetConverter(Type converterType)
             {
                 return new FallbackNodeConverter(this);
             }
-            
-            if (!_converters.ContainsKey(converterType))
-            {
-                _converters[converterType] = (INodeConverter)Activator.CreateInstance(converterType);
-            }
 
-            return _converters[converterType];
+            return _createConverter(converterType);
         }
     }
 }

RomanticWeb/EntityContextFactory.cs

@@ -39,6 +39,15 @@ internal EntityContextFactory(IServiceContainer container)
             _container = container;
             _container.RegisterAssembly("RomanticWeb.dll");
             _container.Register<IEntityContextFactory>(f => this);
+            _container.RegisterInstance<Func<Type, INodeConverter>>(type =>
+                {
+                    if (!_container.CanGetInstance(type, string.Empty))
+                    {
+                         _container.Register(type);   
+                    }
+
+                    return (INodeConverter)_container.GetInstance(type);
+                });
 
             WithMappings(DefaultMappings);
 

Tests/RomanticWeb.Tests/Mapping/MappingRepositoryTestBase.cs

@@ -39,7 +39,7 @@ public void Setup()
             container.RegisterFrom<InternalComponentsCompositionRoot>();
             container.RegisterInstance(_ontologies.Object);
             var conventions = container.GetInstance<IEnumerable<IConvention>>();
-            var mappingModelBuilder = new MappingModelBuilder(new MappingContext(_ontologies.Object, conventions), new ConverterCatalog(new INodeConverter[0]));
+            var mappingModelBuilder = new MappingModelBuilder(new MappingContext(_ontologies.Object, conventions), new ConverterCatalog());
             container.RegisterInstance(mappingModelBuilder);
             container.Register(f => CreateMappingSources());
 

Tests/RomanticWeb.Tests/OntologyAccessorTests.cs

@@ -49,7 +49,7 @@ public void Getting_known_predicate_should_return_objects()
         {
             // given
             _store.Setup(g => g.GetObjectsForPredicate(_entity.Id, It.IsAny<Uri>(), It.IsAny<Uri>())).Returns(new Node[0]);
-            dynamic accessor = new OntologyAccessor(_entity, _ontology, new FallbackNodeConverter(new ConverterCatalog(new INodeConverter[0])), new TestTransformerCatalog());
+            dynamic accessor = new OntologyAccessor(_entity, _ontology, new FallbackNodeConverter(new ConverterCatalog()), new TestTransformerCatalog());
 
             // when
             var givenName = accessor.givenName;
@@ -63,7 +63,7 @@ public void Getting_unknown_predicate_should_use_the_property_name()
         {
             // given
             _store.Setup(g => g.GetObjectsForPredicate(_entity.Id, It.IsAny<Uri>(), It.IsAny<Uri>())).Returns(new Node[0]);
-            dynamic accessor = new OntologyAccessor(_entity, _ontology, new FallbackNodeConverter(new ConverterCatalog(new INodeConverter[0])), new TestTransformerCatalog());
+            dynamic accessor = new OntologyAccessor(_entity, _ontology, new FallbackNodeConverter(new ConverterCatalog()), new TestTransformerCatalog());
 
             // when
             var givenName = accessor.fullName;