显式实现接口

Author: xljiulang

WebApiClientCore.Analyzers/SourceGenerator/HttpApiProxyClass.cs

@@ -103,41 +103,32 @@ public override string ToString()
             builder.AppendLine();
 
             var index = 0;
-            foreach (var method in this.FindApiMethods())
+            foreach (var interfaceType in this.httpApi.AllInterfaces.Append(httpApi))
             {
-                var methodCode = this.BuildMethod(method, index);
-                builder.AppendLine(methodCode);
-                index += 1;
+                foreach (var method in interfaceType.GetMembers().OfType<IMethodSymbol>())
+                {
+                    var methodCode = this.BuildMethod(interfaceType, method, index);
+                    builder.AppendLine(methodCode);
+                    index += 1;
+                }
             }
 
+
             builder.AppendLine("\t}");
             builder.AppendLine("}");
             builder.AppendLine("#pragma warning restore");
 
             return builder.ToString();
         }
 
-        /// <summary>
-        /// 查找接口类型及其继承的接口的所有方法
-        /// </summary>
-        /// <returns></returns>
-        private IEnumerable<IMethodSymbol> FindApiMethods()
-        {
-#pragma warning disable RS1024
-            return this.httpApi.AllInterfaces.Append(httpApi)
-                .SelectMany(item => item.GetMembers())
-                .OfType<IMethodSymbol>()
-                .Distinct(MethodEqualityComparer.Default);
-#pragma warning restore RS1024
-        }
-
         /// <summary>
         /// 构建方法
         /// </summary>
+        /// <param name="interfaceType"></param>
         /// <param name="method"></param>
         /// <param name="index"></param>
         /// <returns></returns>
-        private string BuildMethod(IMethodSymbol method, int index)
+        private string BuildMethod(INamedTypeSymbol interfaceType, IMethodSymbol method, int index)
         {
             var builder = new StringBuilder();
             var parametersString = string.Join(",", method.Parameters.Select(item => $"{GetFullName(item.Type)} {item.Name}"));
@@ -146,9 +137,10 @@ private string BuildMethod(IMethodSymbol method, int index)
                 ? "global::System.Array.Empty<global::System.Object>()"
                 : $"new global::System.Object[] {{ {parameterNamesString} }}";
 
+            var methodName = $"\"{interfaceType.ToDisplayString()}.{method.Name}\"";
             var returnTypeString = GetFullName(method.ReturnType);
-            builder.AppendLine($"\t\t[global::WebApiClientCore.HttpApiProxyMethod({index})]");
-            builder.AppendLine($"\t\tpublic {returnTypeString} {method.Name}( {parametersString} )");
+            builder.AppendLine($"\t\t[global::WebApiClientCore.HttpApiProxyMethod({index}, {methodName})]");
+            builder.AppendLine($"\t\t{returnTypeString} {GetFullName(interfaceType)}.{method.Name}( {parametersString} )");
             builder.AppendLine("\t\t{");
             builder.AppendLine($"\t\t\treturn ({returnTypeString})this.{this.apiInterceptorFieldName}.Intercept(this.{this.actionInvokersFieldName}[{index}], {paremterArrayString});");
             builder.AppendLine("\t\t}");

WebApiClientCore/HttpApiMethodFinder.cs

@@ -22,7 +22,8 @@ public static IEnumerable<MethodInfo> FindApiMethods(Type httpApiType)
             return Sort(interfaces, t => t.GetInterfaces())
                 .Reverse()
                 .SelectMany(item => item.GetMethods())
-                .Distinct(MethodEqualityComparer.Default);
+                //.Distinct(MethodEqualityComparer.Default)
+                ;
         }
 
         /// <summary>

WebApiClientCore/HttpApiProxyMethodAttribute.cs

@@ -15,13 +15,20 @@ public sealed class HttpApiProxyMethodAttribute : Attribute
         /// </summary>
         public int Index { get; }
 
+        /// <summary>
+        /// 获取名称
+        /// </summary>
+        public string Name { get; }
+
         /// <summary>
         /// 方法的索引特性
         /// </summary>
         /// <param name="index">索引值，确保连续且不重复</param>
-        public HttpApiProxyMethodAttribute(int index)
+        /// <param name="name">方法的名称</param>
+        public HttpApiProxyMethodAttribute(int index, string name)
         {
             this.Index = index;
+            this.Name = name;
         }
     }
 }

WebApiClientCore/Implementations/SourceGeneratorHttpApiActivator.cs

@@ -68,15 +68,13 @@ public THttpApi CreateInstance(IHttpApiInterceptor apiInterceptor)
         private static MethodInfo[] FindApiMethods(Type proxyType)
         {
             var apiMethods = HttpApi.FindApiMethods(typeof(THttpApi));
-            var proxyMethods = proxyType.GetMethods();
+            var proxyMethods = proxyType.GetMethods(BindingFlags.NonPublic | BindingFlags.Instance);
 
-            var methods = from a in apiMethods
-                          join p in proxyMethods
-                          on new MethodFeature(a) equals new MethodFeature(p)
-                          let methodAttr = p.GetCustomAttribute<HttpApiProxyMethodAttribute>()
-                          where methodAttr != null
-                          orderby methodAttr.Index
-                          select a;
+            var methods = from a in apiMethods.Select(item => new MethodFeature(item))
+                          join p in proxyMethods.Select(item => new MethodFeature(item))
+                          on a equals p
+                          orderby p.Index
+                          select a.Method;
 
             return methods.ToArray();
         }
@@ -112,15 +110,22 @@ orderby methodAttr.Index
         /// </summary>
         private sealed class MethodFeature : IEquatable<MethodFeature>
         {
-            private readonly MethodInfo method;
+            public MethodInfo Method { get; }
+
+            public int Index { get; }
+
+            public string Name { get; }
 
             /// <summary>
             /// MethodInfo的特征
             /// </summary>
             /// <param name="method"></param>
             public MethodFeature(MethodInfo method)
             {
-                this.method = method;
+                var attribute = method.GetCustomAttribute<HttpApiProxyMethodAttribute>();
+                this.Method = method;
+                this.Index = attribute == null ? -1 : attribute.Index;
+                this.Name = attribute == null ? $"{method.DeclaringType?.FullName}.{method.Name}" : attribute.Name;
             }
 
             /// <summary>
@@ -130,15 +135,14 @@ public MethodFeature(MethodInfo method)
             /// <returns></returns>
             public bool Equals(MethodFeature? other)
             {
-                if (other == null)
+                if (other == null || this.Name != other.Name)
                 {
                     return false;
                 }
 
-                var x = this.method;
-                var y = other.method;
-
-                if (x.Name != y.Name || x.ReturnType != y.ReturnType)
+                var x = this.Method;
+                var y = other.Method;
+                if (x.ReturnType != y.ReturnType)
                 {
                     return false;
                 }
@@ -161,9 +165,9 @@ public override bool Equals(object? obj)
             public override int GetHashCode()
             {
                 var hashCode = new HashCode();
-                hashCode.Add(this.method.Name);
-                hashCode.Add(this.method.ReturnType);
-                foreach (var parameter in this.method.GetParameters())
+                hashCode.Add(this.Name);
+                hashCode.Add(this.Method.ReturnType);
+                foreach (var parameter in this.Method.GetParameters())
                 {
                     hashCode.Add(parameter.ParameterType);
                 }