solr startup

Author: Ihar Yakimush

SolrNet.IntegrationOData/Controllers/ValuesController.cs

@@ -13,23 +13,30 @@ namespace SolrNet.IntegrationOData.Controllers
     [ApiController]
     public class ValuesController : ControllerBase
     {
+        public ISolrOperations<Product> Solr { get; }
+
+        public ValuesController(ISolrOperations<Product> solr)
+        {
+            Solr = solr ?? throw new ArgumentNullException(nameof(solr));
+        }
         // GET api/values
         [HttpGet]
         public IActionResult Get()
         {
             return this.Ok(new string[]
             {
-                "http://localhost:64623/api/values/1?$filter=price gt 100&$orderby=Popularity desc&$top=3&$skip=1",
-                "http://localhost:64623/api/values/1?$filter=Popularity ne null",
-                "http://localhost:64623/api/values/1?$filter=Popularity eq null",
+                "http://localhost:61452/api/values/1?$filter=price gt 100&$orderby=Popularity desc&$top=3&$skip=1",
+                "http://localhost:61452/api/values/1?$filter=Popularity ne null",
+                "http://localhost:61452/api/values/1?$filter=Popularity eq null",
+                "http://localhost:61452/api/values/1?$filter=Categories/any(c: c eq 'electronics')",
             });
         }
 
         // GET api/values/5
         [HttpGet("{id}")]
         public ActionResult<string> Get(int id, ODataQueryOptions odata)
         {
-            return this.Ok(Product.SolrOperations.Value.AsQuerable().OData().ApplyQueryOptionsWithoutSelectExpand(odata).ToSolrQueryResults());
+            return this.Ok(this.Solr.AsQuerable().OData().ApplyQueryOptionsWithoutSelectExpand(odata).ToSolrQueryResults());
         }
 
         // POST api/values

SolrNet.IntegrationOData/Product.cs

@@ -36,13 +36,5 @@ public class Product
 
         [SolrField("inStock_b")]
         public bool InStock { get; set; }
-
-        public static Lazy<ISolrOperations<Product>> SolrOperations = new Lazy<ISolrOperations<Product>>(() =>
-        {
-            IServiceCollection services = new ServiceCollection();
-            services.AddSolrNet("http://localhost:8983/solr/demo");
-
-            return services.BuildServiceProvider().GetRequiredService<ISolrOperations<Product>>();
-        }, LazyThreadSafetyMode.ExecutionAndPublication);
     }
 }

SolrNet.IntegrationOData/Startup.cs

@@ -25,6 +25,7 @@ public Startup(IConfiguration configuration)
         public void ConfigureServices(IServiceCollection services)
         {
             services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
+            services.AddSolrNet("http://localhost:8983/solr/demo");
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -35,7 +36,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
                 app.UseDeveloperExceptionPage();
             }
 
-            app.UseMvc();
+            app.UseMvcWithDefaultRoute();
         }
     }
 }

SolrNet.Linq/SolrNet.Linq.csproj

@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SolrNet.Core" Version="1.0.10" />
+    <PackageReference Include="SolrNet.Core" Version="1.0.0" />
   </ItemGroup>
 
 </Project>