Remove clusterinit (#1763)

rogeralsing · web-flow · commit bf852ec74253 · 2022-09-25T14:55:56.000+02:00
* remove cluster init
* cluster tweaks
diff --git a/benchmarks/GossipBenchmark/Messages/ClusterInit.cs b/benchmarks/GossipBenchmark/Messages/ClusterInit.cs
@@ -0,0 +1,6 @@
+namespace ClusterHelloWorld.Messages;
+
+public class ClusterInit
+{
+    
+}
diff --git a/examples/ClusterGrainHelloWorld/Messages/ClusterInit.cs b/examples/ClusterGrainHelloWorld/Messages/ClusterInit.cs
@@ -0,0 +1,6 @@
+namespace ClusterHelloWorld.Messages;
+
+public class ClusterInit
+{
+    
+}
diff --git a/examples/ClusterGrainHelloWorld/Messages/Messages.csproj b/examples/ClusterGrainHelloWorld/Messages/Messages.csproj
@@ -4,18 +4,18 @@
         <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Google.Protobuf" Version="3.21.1"/>
-        <PackageReference Include="Grpc.Tools" Version="2.46.3" PrivateAssets="All"/>
-        <PackageReference Include="Proto.Cluster.CodeGen" Version="0.30.0"/>
+        <PackageReference Include="Google.Protobuf" Version="3.21.1" />
+        <PackageReference Include="Grpc.Tools" Version="2.46.3" PrivateAssets="All" />
+        <PackageReference Include="Proto.Cluster.CodeGen" Version="0.30.0" />
     </ItemGroup>
     <ItemGroup>
-        <Protobuf Include="Protos.proto"/>
+        <Protobuf Include="Protos.proto" />
     </ItemGroup>
     <ItemGroup>
-        <ProtoGrain Include="Protos.proto"/>
+        <ProtoGrain Include="Protos.proto" />
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\..\..\src\Proto.Cluster\Proto.Cluster.csproj"/>
+        <ProjectReference Include="..\..\..\src\Proto.Cluster\Proto.Cluster.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/examples/ClusterPubSub/ClusterInit.cs b/examples/ClusterPubSub/ClusterInit.cs
@@ -0,0 +1,6 @@
+namespace ClusterPubSub;
+
+public class ClusterInit
+{
+    
+}
diff --git a/examples/ClusterPubSub/ClusterPubSub.csproj b/examples/ClusterPubSub/ClusterPubSub.csproj
@@ -6,22 +6,22 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\src\Proto.Cluster.TestProvider\Proto.Cluster.TestProvider.csproj"/>
+        <ProjectReference Include="..\..\src\Proto.Cluster.TestProvider\Proto.Cluster.TestProvider.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Google.Protobuf" Version="3.21.1"/>
+        <PackageReference Include="Google.Protobuf" Version="3.21.1" />
         <PackageReference Include="Grpc.Tools" Version="2.46.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0"/>
-        <PackageReference Include="Proto.Cluster.CodeGen" Version="0.31.0"/>
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
+        <PackageReference Include="Proto.Cluster.CodeGen" Version="0.31.0" />
     </ItemGroup>
 
     <ItemGroup>
-        <Protobuf Include="protos.proto" GrpcServices="none"/>
-        <ProtoGrain Include="protos.proto"/>
+        <Protobuf Include="protos.proto" GrpcServices="none" />
+        <ProtoGrain Include="protos.proto" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Proto.Cluster.CodeGen/CodeGenerator.cs b/src/Proto.Cluster.CodeGen/CodeGenerator.cs
@@ -130,7 +130,7 @@ static string RemovePackageName(string type)
         }
 
         static string GetKind(string? packageName, string serviceName) =>
-            string.IsNullOrEmpty(packageName) ? serviceName : $"{packageName}/{serviceName}";
+            string.IsNullOrEmpty(packageName) ? serviceName : $"{packageName}.{serviceName}";
     }
 
     #region UnusedMethods
diff --git a/src/Proto.Cluster/Grain/ClusterInit.cs b/src/Proto.Cluster/Grain/ClusterInit.cs
diff --git a/src/Proto.Cluster/Proto.Cluster.csproj b/src/Proto.Cluster/Proto.Cluster.csproj
@@ -6,21 +6,21 @@
         <TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Grpc.Tools" Version="2.46.3" PrivateAssets="All"/>
+        <PackageReference Include="Grpc.Tools" Version="2.46.3" PrivateAssets="All" />
         <PackageReference Include="Roslynator.Analyzers" Version="4.0.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1"/>
+        <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\Proto.Remote\Proto.Remote.csproj"/>
+        <ProjectReference Include="..\Proto.Remote\Proto.Remote.csproj" />
     </ItemGroup>
     <ItemGroup>
-        <Protobuf Include="SeedContracts.proto" GrpcServices="Server" AdditionalImportDirs=".; ..\..\src"/>
-        <Protobuf Include="ClusterContracts.proto" GrpcServices="Server" AdditionalImportDirs=".; ..\..\src"/>
-        <Protobuf Include="GossipContracts.proto" GrpcServices="Server" AdditionalImportDirs=".; ..\..\src"/>
-        <Protobuf Include="PubSubContracts.proto" GrpcServices="Server" AdditionalImportDirs=".; ..\..\src"/>
-        <Protobuf Include="GrainContracts.proto" GrpcServices="Server" AdditionalImportDirs=".; ..\..\src"/>
+        <Protobuf Include="SeedContracts.proto" GrpcServices="Server" AdditionalImportDirs=".; ..\..\src" />
+        <Protobuf Include="ClusterContracts.proto" GrpcServices="Server" AdditionalImportDirs=".; ..\..\src" />
+        <Protobuf Include="GossipContracts.proto" GrpcServices="Server" AdditionalImportDirs=".; ..\..\src" />
+        <Protobuf Include="PubSubContracts.proto" GrpcServices="Server" AdditionalImportDirs=".; ..\..\src" />
+        <Protobuf Include="GrainContracts.proto" GrpcServices="Server" AdditionalImportDirs=".; ..\..\src" />
     </ItemGroup>
 </Project>
diff --git a/tests/Proto.Cluster.CodeGen.Tests/ExpectedOutput.cs b/tests/Proto.Cluster.CodeGen.Tests/ExpectedOutput.cs
@@ -265,7 +265,7 @@ public TestGrainClient(Cluster cluster, string id)
 
     public class TestGrainActor : IActor
     {
-        public const string Kind = "Foo/TestGrain";
+        public const string Kind = "Foo.TestGrain";
 
         private TestGrainBase? _inner;
         private IContext? _context;

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +namespace ClusterHelloWorld.Messages;
++
 +public class ClusterInit
 +{
++
 +}
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ static string RemovePackageName(string type)`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`static string GetKind(string? packageName, string serviceName) =>`
`133`		`- string.IsNullOrEmpty(packageName) ? serviceName : $"{packageName}/{serviceName}";`
	`133`	`+ string.IsNullOrEmpty(packageName) ? serviceName : $"{packageName}.{serviceName}";`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`#region UnusedMethods`
Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ public TestGrainClient(Cluster cluster, string id)`
`265`	`265`
`266`	`266`	`public class TestGrainActor : IActor`
`267`	`267`	`{`
`268`		`- public const string Kind = "Foo/TestGrain";`
	`268`	`+ public const string Kind = "Foo.TestGrain";`
`269`	`269`
`270`	`270`	`private TestGrainBase? _inner;`
`271`	`271`	`private IContext? _context;`