IApiConnectionLegacyを削除

diff --git a/OpenTween.Tests/Api/TwitterApiTest.cs b/OpenTween.Tests/Api/TwitterApiTest.cs
index f19ca84..ed21171 100644 (file)
--- a/OpenTween.Tests/Api/TwitterApiTest.cs
+++ b/OpenTween.Tests/Api/TwitterApiTest.cs
@@ -79,11 +79,11 @@ namespace OpenTween.Api
             Assert.Equal("foobar", twitterApi.CurrentScreenName);
         }
 
-        private Mock<IApiConnectionLegacy> CreateApiConnectionMock<T>(Action<T> verifyRequest)
+        private Mock<IApiConnection> CreateApiConnectionMock<T>(Action<T> verifyRequest)
             where T : IHttpRequest
             => this.CreateApiConnectionMock(verifyRequest, "");
 
-        private Mock<IApiConnectionLegacy> CreateApiConnectionMock<T>(Action<T> verifyRequest, string responseText)
+        private Mock<IApiConnection> CreateApiConnectionMock<T>(Action<T> verifyRequest, string responseText)
             where T : IHttpRequest
         {
             Func<T, bool> verifyRequestWrapper = r =>
@@ -97,7 +97,7 @@ namespace OpenTween.Api
             {
                 Content = new StringContent(responseText),
             };
-            var mock = new Mock<IApiConnectionLegacy>();
+            var mock = new Mock<IApiConnection>();
             mock.Setup(x =>
                 x.SendAsync(
                     It.Is<T>(r => verifyRequestWrapper(r))

diff --git a/OpenTween/Api/TwitterApi.cs b/OpenTween/Api/TwitterApi.cs
index 7386e08..f1186b1 100644 (file)
--- a/OpenTween/Api/TwitterApi.cs
+++ b/OpenTween/Api/TwitterApi.cs
@@ -41,9 +41,9 @@ namespace OpenTween.Api
 
         public string CurrentScreenName { get; private set; } = "";
 
-        public IApiConnectionLegacy Connection => this.ApiConnection;
+        public IApiConnection Connection => this.ApiConnection;
 
-        internal IApiConnectionLegacy ApiConnection;
+        internal IApiConnection ApiConnection;
 
         public APIAuthType AuthType { get; private set; } = APIAuthType.None;
 

diff --git a/OpenTween/Connection/IApiConnectionLegacy.cs b/OpenTween/Connection/IApiConnectionLegacy.cs
deleted file mode 100644 (file)
index 2c2db7f..0000000
--- a/OpenTween/Connection/IApiConnectionLegacy.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// OpenTween - Client of Twitter
-// Copyright (c) 2016 kim_upsilon (@kim_upsilon) <https://upsilo.net/~upsilon/>
-// All rights reserved.
-//
-// This file is part of OpenTween.
-//
-// This program is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License as published by the Free
-// Software Foundation; either version 3 of the License, or (at your option)
-// any later version.
-//
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-// for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program. If not, see <http://www.gnu.org/licenses/>, or write to
-// the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
-// Boston, MA 02110-1301, USA.
-
-#nullable enable
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace OpenTween.Connection
-{
-    public interface IApiConnectionLegacy : IApiConnection, IDisposable
-    {
-    }
-}

diff --git a/OpenTween/Connection/TwitterApiConnection.cs b/OpenTween/Connection/TwitterApiConnection.cs
index b5e2d1f..4103597 100644 (file)
--- a/OpenTween/Connection/TwitterApiConnection.cs
+++ b/OpenTween/Connection/TwitterApiConnection.cs
@@ -39,7 +39,7 @@ using OpenTween.Api.DataModel;
 
 namespace OpenTween.Connection
 {
-    public class TwitterApiConnection : IApiConnection, IApiConnectionLegacy, IDisposable
+    public class TwitterApiConnection : IApiConnection, IDisposable
     {
         public static Uri RestApiBase { get; set; } = new("https://api.twitter.com/1.1/");