Merge pull request #2040 from microsoft/chore/remove-obsolete

chore/remove obsolete

Author: baywet

src/Microsoft.OpenApi/Interfaces/IStreamLoader.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using System;
-using System.ComponentModel;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.OpenApi.Models;
@@ -20,14 +19,5 @@ public interface IStreamLoader
         /// <param name="uri">Identifier of some source of an OpenAPI Description</param>
         /// <returns>A data object that can be processed by a reader to generate an <see cref="OpenApiDocument"/></returns>
         Task<Stream> LoadAsync(Uri uri);
-
-        /// <summary>
-        /// Use Uri to locate data and convert into an input object.
-        /// </summary>
-        /// <param name="uri"></param>
-        /// <returns></returns>
-        [Obsolete("Use the Async overload")]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        Stream Load(Uri uri);
     }
 }

src/Microsoft.OpenApi/Reader/Services/DefaultStreamLoader.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using System;
-using System.ComponentModel;
 using System.IO;
 using System.Net.Http;
 using System.Threading.Tasks;
@@ -17,7 +16,7 @@ namespace Microsoft.OpenApi.Reader.Services
     public class DefaultStreamLoader : IStreamLoader
     {
         private readonly Uri baseUrl;
-        private HttpClient _httpClient = new();
+        private readonly HttpClient _httpClient = new();
 
         /// <summary>
         /// The default stream loader
@@ -27,16 +26,6 @@ public DefaultStreamLoader(Uri baseUrl)
         {
             this.baseUrl = baseUrl;
         }
-/// <inheritdoc/>
-
-        [Obsolete]
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public Stream Load(Uri uri)
-        {
-#pragma warning disable VSTHRD002 // Avoid problematic synchronous waits
-            return LoadAsync(uri).GetAwaiter().GetResult();
-#pragma warning restore VSTHRD002 // Avoid problematic synchronous waits
-        }
 
         /// <summary>
         /// Use Uri to locate data and convert into an input object.

src/Microsoft.OpenApi/Validations/ValidationRule.cs

@@ -44,16 +44,6 @@ public class ValidationRule<T> : ValidationRule
     {
         private readonly Action<IValidationContext, T> _validate;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ValidationRule"/> class.
-        /// </summary>        
-        /// <param name="validate">Action to perform the validation.</param>
-        [Obsolete("Please use the other constructor and specify a name")]
-        public ValidationRule(Action<IValidationContext, T> validate)
-            : this (Guid.NewGuid().ToString("D"), validate)
-        {
-        }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="ValidationRule"/> class.
         /// </summary>

src/Microsoft.OpenApi/Writers/OpenApiWriterSettings.cs

@@ -5,63 +5,13 @@
 
 namespace Microsoft.OpenApi.Writers
 {
-    /// <summary>
-    /// Indicates if and when the writer should convert references into complete object renderings
-    /// </summary>
-    [Obsolete("Use InlineLocalReference and InlineExternalReference settings instead")]
-    public enum ReferenceInlineSetting
-    {
-        /// <summary>
-        /// Render all references as $ref.
-        /// </summary>
-        DoNotInlineReferences,
-        /// <summary>
-        /// Render all local references as inline objects
-        /// </summary>
-        InlineLocalReferences,
-        /// <summary>
-        /// Render all references as inline objects.
-        /// </summary>
-        InlineAllReferences
-    }
-
     /// <summary>
     /// Configuration settings to control how OpenAPI documents are written
     /// </summary>
     public class OpenApiWriterSettings
     {
-        [Obsolete("Use InlineLocalReference and InlineExternalReference settings instead")]
-        private ReferenceInlineSetting referenceInline = ReferenceInlineSetting.DoNotInlineReferences;
-
         internal LoopDetector LoopDetector { get; } = new();
         /// <summary>
-        /// Indicates how references in the source document should be handled.
-        /// </summary>
-        [Obsolete("Use InlineLocalReference and InlineExternalReference settings instead")]
-        public ReferenceInlineSetting ReferenceInline
-        {
-            get { return referenceInline; }
-            set
-            {
-                referenceInline = value;
-                switch (referenceInline)
-                {
-                    case ReferenceInlineSetting.DoNotInlineReferences:
-                        InlineLocalReferences = false;
-                        InlineExternalReferences = false;
-                        break;
-                    case ReferenceInlineSetting.InlineLocalReferences:
-                        InlineLocalReferences = true;
-                        InlineExternalReferences = false;
-                        break;
-                    case ReferenceInlineSetting.InlineAllReferences:
-                        InlineLocalReferences = true;
-                        InlineExternalReferences = true;
-                        break;
-                }
-            }
-        }
-        /// <summary>
         /// Indicates if local references should be rendered as an inline object
         /// </summary>
         public bool InlineLocalReferences { get; set; }

test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt

@@ -237,8 +237,6 @@ namespace Microsoft.OpenApi.Interfaces
     }
     public interface IStreamLoader
     {
-        [System.Obsolete("Use the Async overload")]
-        System.IO.Stream Load(System.Uri uri);
         System.Threading.Tasks.Task<System.IO.Stream> LoadAsync(System.Uri uri);
     }
 }
@@ -1401,8 +1399,6 @@ namespace Microsoft.OpenApi.Reader.Services
     public class DefaultStreamLoader : Microsoft.OpenApi.Interfaces.IStreamLoader
     {
         public DefaultStreamLoader(System.Uri baseUrl) { }
-        [System.Obsolete]
-        public System.IO.Stream Load(System.Uri uri) { }
         public System.Threading.Tasks.Task<System.IO.Stream> LoadAsync(System.Uri uri) { }
     }
 }
@@ -1653,8 +1649,6 @@ namespace Microsoft.OpenApi.Validations
     }
     public class ValidationRule<T> : Microsoft.OpenApi.Validations.ValidationRule
     {
-        [System.Obsolete("Please use the other constructor and specify a name")]
-        public ValidationRule(System.Action<Microsoft.OpenApi.Validations.IValidationContext, T> validate) { }
         public ValidationRule(string name, System.Action<Microsoft.OpenApi.Validations.IValidationContext, T> validate) { }
     }
 }
@@ -1876,8 +1870,6 @@ namespace Microsoft.OpenApi.Writers
         public OpenApiWriterSettings() { }
         public bool InlineExternalReferences { get; set; }
         public bool InlineLocalReferences { get; set; }
-        [System.Obsolete("Use InlineLocalReference and InlineExternalReference settings instead")]
-        public Microsoft.OpenApi.Writers.ReferenceInlineSetting ReferenceInline { get; set; }
     }
     public class OpenApiYamlWriter : Microsoft.OpenApi.Writers.OpenApiWriterBase
     {
@@ -1895,13 +1887,6 @@ namespace Microsoft.OpenApi.Writers
         public override void WriteValue(string value) { }
         protected override void WriteValueSeparator() { }
     }
-    [System.Obsolete("Use InlineLocalReference and InlineExternalReference settings instead")]
-    public enum ReferenceInlineSetting
-    {
-        DoNotInlineReferences = 0,
-        InlineLocalReferences = 1,
-        InlineAllReferences = 2,
-    }
     public sealed class Scope
     {
         public Scope(Microsoft.OpenApi.Writers.ScopeType type) { }