Reenable RestMethodInfo, but our public one instead

amend
reactiveui · Apr 21, 2023 · 4bf75bb · 4bf75bb
1 parent 1923704
commit 4bf75bb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Refit.Tests/RequestBuilder.cs b/Refit.Tests/RequestBuilder.cs
@@ -2195,8 +2195,8 @@ public void RestMethodInfoShouldBeInProperties()
 #else
             Assert.NotEmpty(output.Properties);
             Assert.True(output.Properties.TryGetValue(HttpRequestMessageOptions.RestMethodInfo, out var restMethodInfoObj));
-            Assert.IsType<RestMethodInfoInternal>(restMethodInfoObj);
-            var restMethodInfo = restMethodInfoObj as RestMethodInfoInternal;
+            Assert.IsType<RestMethodInfo>(restMethodInfoObj);
+            var restMethodInfo = restMethodInfoObj as RestMethodInfo;
 #endif
             Assert.Equal(nameof(IContainAandB.Ping), restMethodInfo.Name);
         }

diff --git a/Refit/HttpRequestMessageProperties.cs b/Refit/HttpRequestMessageProperties.cs
@@ -13,6 +13,6 @@ public static class HttpRequestMessageOptions
         /// <summary>
         /// Returns the <see cref="Refit.RestMethodInfoInternal"/> of the top-level interface
         /// </summary>
-        //public static string RestMethodInfo { get; } = "Refit.RestMethodInfo";
+        public static string RestMethodInfo { get; } = "Refit.RestMethodInfo";
     }
 }
diff --git a/Refit/RequestBuilderImplementation.cs b/Refit/RequestBuilderImplementation.cs
@@ -749,10 +749,10 @@ Func<object[], HttpRequestMessage> BuildRequestFactoryForMethod(RestMethodInfoIn
                 // Always add the top-level type of the interface to the properties
 #if NET6_0_OR_GREATER
                 ret.Options.Set(new HttpRequestOptionsKey<Type>(HttpRequestMessageOptions.InterfaceType), TargetType);
-                ret.Options.Set(new HttpRequestOptionsKey<RestMethodInfo>(HttpRequestMessageOptions.RestMethodInfo), restMethod);
+                ret.Options.Set(new HttpRequestOptionsKey<RestMethodInfo>(HttpRequestMessageOptions.RestMethodInfo), restMethod.ToRestMethodInfo());
 #else
                 ret.Properties[HttpRequestMessageOptions.InterfaceType] = TargetType;
-                ret.Properties[HttpRequestMessageOptions.RestMethodInfo] = restMethod;
+                ret.Properties[HttpRequestMessageOptions.RestMethodInfo] = restMethod.ToRestMethodInfo();
 #endif                
 
                 // NB: The URI methods in .NET are dumb. Also, we do this

diff --git a/Refit/RestMethodInfo.cs b/Refit/RestMethodInfo.cs
@@ -19,7 +19,7 @@ internal static class IsExternalInit { }
 
 namespace Refit
 {
-    public record RestMethodInfo(string name, Type hostingType, MethodInfo methodInfo, string relativePath, Type returnType);
+    public record RestMethodInfo(string Name, Type HostingType, MethodInfo MethodInfo, string RelativePath, Type ReturnType);
 
     [DebuggerDisplay("{MethodInfo}")]
     internal class RestMethodInfoInternal