Support named registration via Autofac (useful when using multiple co…

…res with the same document type)
hiiru · Nov 6, 2012 · e89b2ff · e89b2ff
1 parent f36a934
commit e89b2ff
Show file tree

Hide file tree

Showing 2 changed files with 93 additions and 0 deletions.
diff --git a/AutofacContrib.SolrNet.Tests/AutofacMulticoreTests.cs b/AutofacContrib.SolrNet.Tests/AutofacMulticoreTests.cs
@@ -20,6 +20,7 @@
 using MbUnit.Framework;
 using SolrNet;
 using SolrNet.Impl;
+using System.Collections.Generic;
 
 namespace AutofacContrib.SolrNet.Tests
 {
@@ -102,6 +103,96 @@ public void ResolveSolrOperations_withMultiCore()
             Assert.IsTrue(solrOperations2 is SolrServer<Entity2>);
         }
 
+        [Test]
+        public void ResolveSolrOperations_viaNamedWithMultiCore()
+        {
+            // Arrange 
+            var builder = new ContainerBuilder();
+            var cores = new SolrServers {
+                                new SolrServerElement {
+                                        Id = "entity1",
+                                        DocumentType = typeof (Entity1).AssemblyQualifiedName,
+                                        Url = "http://localhost:8983/solr/coreEntity1",
+                                    },
+                               new SolrServerElement {
+                                        Id = "entity2",
+                                        DocumentType = typeof (Entity2).AssemblyQualifiedName,
+                                        Url = "http://localhost:8983/solr/coreEntity2",
+                                },
+                            };
+
+            builder.RegisterModule(new SolrNetModule(cores));
+            var container = builder.Build();
+
+            // Act
+            var solrOperations1 = container.ResolveNamed<ISolrOperations<Entity1>>("entity1");
+            var solrOperations2 = container.ResolveNamed<ISolrOperations<Entity2>>("entity2");
+
+            // Assert
+            Assert.IsTrue(solrOperations1 is SolrServer<Entity1>);
+            Assert.IsTrue(solrOperations2 is SolrServer<Entity2>);
+        }
+
+        [Test]
+        public void ResolveSolrOperations_viaNamedWithMultiCoreForDictionary()
+        {
+            // Arrange 
+            var builder = new ContainerBuilder();
+            var cores = new SolrServers {
+                                new SolrServerElement {
+                                        Id = "dictionary1",
+                                        DocumentType = typeof (Dictionary<string, object>).AssemblyQualifiedName,
+                                        Url = "http://localhost:8983/solr/coreDictionaryEntity1",
+                                    },
+                               new SolrServerElement {
+                                        Id = "dictionary2",
+                                        DocumentType = typeof (Dictionary<string, object>).AssemblyQualifiedName,
+                                        Url = "http://localhost:8983/solr/coreDictionaryEntity2",
+                                },
+                            };
+
+            builder.RegisterModule(new SolrNetModule(cores));
+            var container = builder.Build();
+
+            // Act
+            var solrOperations1 = container.ResolveNamed<ISolrOperations<Dictionary<string, object>>>("dictionary1");
+            var solrOperations2 = container.ResolveNamed<ISolrOperations<Dictionary<string, object>>>("dictionary2");
+
+            // Assert
+            Assert.IsTrue(solrOperations1 is SolrServer<Dictionary<string, object>>);
+            Assert.IsTrue(solrOperations2 is SolrServer<Dictionary<string, object>>);
+        }
+
+        [Test]
+        public void ResolveSolrReadOnlyOperations_viaNamedWithMultiCoreForDictionary()
+        {
+            // Arrange 
+            var builder = new ContainerBuilder();
+            var cores = new SolrServers {
+                                new SolrServerElement {
+                                        Id = "dictionary1",
+                                        DocumentType = typeof (Dictionary<string, object>).AssemblyQualifiedName,
+                                        Url = "http://localhost:8983/solr/coreDictionaryEntity1",
+                                    },
+                               new SolrServerElement {
+                                        Id = "dictionary2",
+                                        DocumentType = typeof (Dictionary<string, object>).AssemblyQualifiedName,
+                                        Url = "http://localhost:8983/solr/coreDictionaryEntity2",
+                                },
+                            };
+
+            builder.RegisterModule(new SolrNetModule(cores));
+            var container = builder.Build();
+
+            // Act
+            var solrReadOnlyOperations1 = container.ResolveNamed<ISolrReadOnlyOperations<Dictionary<string, object>>>("dictionary1");
+            var solrReadOnlyOperations2 = container.ResolveNamed<ISolrReadOnlyOperations<Dictionary<string, object>>>("dictionary2");
+
+            // Assert
+            Assert.IsTrue(solrReadOnlyOperations1 is SolrServer<Dictionary<string, object>>);
+            Assert.IsTrue(solrReadOnlyOperations2 is SolrServer<Dictionary<string, object>>);
+        }
+
         [Test]
         public void ResolveSolrOperations_fromConfigSection()
         {

diff --git a/AutofacContrib.SolrNet/SolrNetModule.cs b/AutofacContrib.SolrNet/SolrNetModule.cs
@@ -170,12 +170,14 @@ private static void RegisterCore(SolrCore core, ContainerBuilder builder) {
             var SolrServer = typeof (SolrServer<>).MakeGenericType(core.DocumentType);
 
             builder.RegisterType(SolrServer)
+                .Named(core.Id, ISolrOperations)
                 .As(ISolrOperations)
                 .WithParameters(new[] {
                     new ResolvedParameter((p, c) => p.Name == "basicServer", (p, c) => c.ResolveNamed(core.Id + SolrBasicServer, ISolrBasicOperations)),
                 });
 
             builder.RegisterType(SolrServer)
+                .Named(core.Id, ISolrReadOnlyOperations)
                 .As(ISolrReadOnlyOperations)
                 .WithParameters(new[] {
                     new ResolvedParameter((p, c) => p.Name == "basicServer", (p, c) => c.ResolveNamed(core.Id + SolrBasicServer, ISolrBasicOperations)),