From 8b29de899376ae57e38b9a467ed30a3b792031ea Mon Sep 17 00:00:00 2001 From: Chris R Date: Mon, 25 Jan 2016 13:56:14 -0800 Subject: [PATCH] Remove ISessionStore.Connect in raction to removal of IDistrbutedCache.Connect. --- .../DistributedSessionStore.cs | 5 --- .../ISessionStore.cs | 2 +- .../SessionMiddleware.cs | 1 - .../SessionTests.cs | 37 ------------------- 4 files changed, 1 insertion(+), 44 deletions(-) diff --git a/src/Microsoft.AspNetCore.Session/DistributedSessionStore.cs b/src/Microsoft.AspNetCore.Session/DistributedSessionStore.cs index 7605dd1d77..e170d08df8 100644 --- a/src/Microsoft.AspNetCore.Session/DistributedSessionStore.cs +++ b/src/Microsoft.AspNetCore.Session/DistributedSessionStore.cs @@ -37,11 +37,6 @@ namespace Microsoft.AspNetCore.Session } } - public void Connect() - { - _cache.Connect(); - } - public ISession Create(string sessionId, TimeSpan idleTimeout, Func tryEstablishSession, bool isNewSessionKey) { if (string.IsNullOrEmpty(sessionId)) diff --git a/src/Microsoft.AspNetCore.Session/ISessionStore.cs b/src/Microsoft.AspNetCore.Session/ISessionStore.cs index 68a62aeb63..17a3261b97 100644 --- a/src/Microsoft.AspNetCore.Session/ISessionStore.cs +++ b/src/Microsoft.AspNetCore.Session/ISessionStore.cs @@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Session public interface ISessionStore { bool IsAvailable { get; } - void Connect(); + ISession Create(string sessionId, TimeSpan idleTimeout, Func tryEstablishSession, bool isNewSessionKey); } } \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Session/SessionMiddleware.cs b/src/Microsoft.AspNetCore.Session/SessionMiddleware.cs index a97177ed93..23ccd289ce 100644 --- a/src/Microsoft.AspNetCore.Session/SessionMiddleware.cs +++ b/src/Microsoft.AspNetCore.Session/SessionMiddleware.cs @@ -62,7 +62,6 @@ namespace Microsoft.AspNetCore.Session _logger = loggerFactory.CreateLogger(); _options = options.Value; _sessionStore = sessionStore; - _sessionStore.Connect(); } /// diff --git a/test/Microsoft.AspNetCore.Session.Tests/SessionTests.cs b/test/Microsoft.AspNetCore.Session.Tests/SessionTests.cs index 2df22a23f4..8e224f050e 100644 --- a/test/Microsoft.AspNetCore.Session.Tests/SessionTests.cs +++ b/test/Microsoft.AspNetCore.Session.Tests/SessionTests.cs @@ -459,33 +459,6 @@ namespace Microsoft.AspNetCore.Session } } - [Fact] - public async Task SessionMiddleware_DoesNotStart_IfUnderlyingStoreIsUnavailable() - { - // Arrange, Act & Assert - var exception = await Assert.ThrowsAsync(async () => - { - var builder = new WebHostBuilder() - .Configure(app => - { - app.UseSession(); - }) - .ConfigureServices(services => - { - services.AddSingleton(); - services.AddSession(); - }); - - using (var server = new TestServer(builder)) - { - var client = server.CreateClient(); - await client.GetAsync(string.Empty); - } - }); - - Assert.Equal("Error connecting database.", exception.Message); - } - [Fact] public async Task SessionKeys_AreCaseSensitive() { @@ -533,16 +506,6 @@ namespace Microsoft.AspNetCore.Session private class TestDistributedCache : IDistributedCache { - public void Connect() - { - throw new InvalidOperationException("Error connecting database."); - } - - public Task ConnectAsync() - { - throw new InvalidOperationException("Error connecting database."); - } - public byte[] Get(string key) { throw new NotImplementedException();