Default service path cleanup (icerpc#3723)

bernardnormier · Oct 19, 2023 · 2311983 · 2311983
1 parent bb016e8
commit 2311983
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 68 deletions.
diff --git a/src/IceRpc.Slice/DefaultServicePathTypeExtensions.cs b/src/IceRpc.Slice/DefaultServicePathTypeExtensions.cs
diff --git a/tests/IceRpc.Slice.Tests/TypeIdAttributeTests.cs b/tests/IceRpc.Slice.Tests/TypeIdAttributeTests.cs
@@ -13,7 +13,6 @@ public sealed class TypeIdAttributeTests
     /// <param name="expected">The expected type ID.</param>
     [TestCase(typeof(IceObjectProxy), "::Ice::Object")]
     [TestCase(typeof(PingableProxy), "::IceRpc::Slice::Tests::Pingable")]
-    [TestCase(typeof(IMyInterface), "::IceRpc::Slice::Tests::TypeIdAttributeTestNamespace::MyInterface")]
     [TestCase(typeof(MyInterfaceProxy), "::IceRpc::Slice::Tests::TypeIdAttributeTestNamespace::MyInterface")]
     [TestCase(typeof(IMyInterfaceService), "::IceRpc::Slice::Tests::TypeIdAttributeTestNamespace::MyInterface")]
     [TestCase(typeof(MyOtherInterfaceProxy), "::IceRpc::Slice::Tests::TypeIdAttributeTestNamespace::myOtherInterface")]
@@ -23,25 +22,4 @@ public void Get_slice_type_id(Type type, string? expected)
         string? typeId = type.GetSliceTypeId();
         Assert.That(typeId, Is.EqualTo(expected));
     }
-
-    /// <summary>Verifies that types generated from Slice definitions have the expected default path.</summary>
-    /// <param name="type">The <see cref="Type" /> of the generated type to test.</param>
-    /// <param name="expected">The expected type ID.</param>
-    [TestCase(typeof(IceObjectProxy), "/Ice.Object")]
-    [TestCase(typeof(PingableProxy), "/IceRpc.Slice.Tests.Pingable")]
-    [TestCase(typeof(IMyInterface), "/IceRpc.Slice.Tests.TypeIdAttributeTestNamespace.MyInterface")]
-    [TestCase(typeof(MyInterfaceProxy), "/IceRpc.Slice.Tests.TypeIdAttributeTestNamespace.MyInterface")]
-    [TestCase(typeof(IMyInterfaceService), "/IceRpc.Slice.Tests.TypeIdAttributeTestNamespace.MyInterface")]
-    [TestCase(typeof(MyOtherInterfaceProxy), "/IceRpc.Slice.Tests.TypeIdAttributeTestNamespace.myOtherInterface")]
-    public void Get_default_path(Type type, string expected)
-    {
-        string defaultPath = type.GetDefaultServicePath();
-        Assert.That(defaultPath, Is.EqualTo(expected));
-    }
-
-    [TestCase(typeof(MyClass))]
-    [TestCase(typeof(MyException))]
-    [TestCase(typeof(ServerAddress))]
-    public void Get_default_path_exception(Type type) =>
-        Assert.That(type.GetDefaultServicePath, Throws.ArgumentException);
 }
diff --git a/tools/IceRpc.ProtocGen/ClientGenerator.cs b/tools/IceRpc.ProtocGen/ClientGenerator.cs
@@ -86,9 +86,8 @@ internal static string GenerateImplementation(ServiceDescriptor service)
 /// <remarks>protoc-gen-icerpc-csharp generated this record struct from Protobuf service <c>{service.Name}</c>.</remarks>
 public readonly partial record struct {clientImplementationName} : I{service.Name.ToPascalCase()}
 {{
-    /// <summary>Gets the default service address for services that implement Protobuf service {service.FullName}.
-    /// Its protocol is <c>icerpc</c> and its path is the Protobuf service name.
-    /// </summary>
+    /// <summary>Gets the default service address for services that implement Protobuf service {service.FullName}:
+    /// <c>icerpc:/{service.Name}</c>.</summary>
     public static IceRpc.ServiceAddress DefaultServiceAddress {{ get; }} =
         new(IceRpc.Protocol.IceRpc) {{ Path = ""/{service.Name}"" }};
 

diff --git a/tools/slicec-cs/src/generators/proxy_generator.rs b/tools/slicec-cs/src/generators/proxy_generator.rs
@@ -40,7 +40,6 @@ pub fn generate_proxy(interface_def: &Interface) -> CodeBlock {
             interface_def,
         )
         .add_comments(interface_def.formatted_doc_comment_seealso())
-        .add_type_id_attribute(interface_def)
         .add_bases(&interface_bases)
         .add_block(proxy_interface_operations(interface_def));
     code.add_block(&proxy_interface_builder.build());
@@ -67,9 +66,8 @@ This remote service must implement Slice interface {slice_interface}."#
         .add_block(
             format!(
                 r#"
-/// <summary>Gets the default service address for services that implement Slice interface {slice_interface}.
-/// Its protocol is <see cref="IceRpc.Protocol.IceRpc" /> and its path is computed from the name of the Slice interface.
-/// </summary>
+/// <summary>Gets the default service address for services that implement Slice interface {slice_interface}:
+/// <c>icerpc:{default_service_path}</c>.</summary>
 public static IceRpc.ServiceAddress DefaultServiceAddress {{ get; }} =
     new(IceRpc.Protocol.IceRpc) {{ Path = "{default_service_path}" }};