Fix namespace in demo servers (C++ and C#) (#284)

bernardnormier · web-flow · commit 4df0a6de95fd · 2025-02-11T09:01:18.000-05:00
diff --git a/cpp/Ice/config/Chatbot.cpp b/cpp/Ice/config/Chatbot.cpp
@@ -6,10 +6,9 @@
 #include <sstream>
 
 using namespace std;
-using namespace ConfigServer;
 
 string
-Chatbot::greet(string name, const Ice::Current&)
+Server::Chatbot::greet(string name, const Ice::Current&)
 {
     cout << "Dispatching greet request { name = '" << name << "' }" << endl;
 
diff --git a/cpp/Ice/config/Chatbot.h b/cpp/Ice/config/Chatbot.h
@@ -5,7 +5,7 @@
 
 #include "Greeter.h"
 
-namespace ConfigServer
+namespace Server
 {
     /// A Chatbot is an Ice servant that implements Slice interface Greeter.
     class Chatbot : public VisitorCenter::Greeter
diff --git a/cpp/Ice/config/Server.cpp b/cpp/Ice/config/Server.cpp
@@ -6,7 +6,6 @@
 #include <iostream>
 
 using namespace std;
-using namespace ConfigServer;
 
 int
 main(int argc, char* argv[])
@@ -26,7 +25,7 @@ main(int argc, char* argv[])
     auto adapter = communicator->createObjectAdapter("GreeterAdapter");
 
     // Register the Chatbot servant with the adapter.
-    adapter->add(make_shared<Chatbot>(), Ice::stringToIdentity("greeter"));
+    adapter->add(make_shared<Server::Chatbot>(), Ice::stringToIdentity("greeter"));
 
     // Start dispatching requests.
     adapter->activate();
diff --git a/cpp/Ice/greeter/Chatbot.cpp b/cpp/Ice/greeter/Chatbot.cpp
@@ -8,7 +8,7 @@
 using namespace std;
 
 string
-GreeterServer::Chatbot::greet(string name, const Ice::Current&)
+Server::Chatbot::greet(string name, const Ice::Current&)
 {
     cout << "Dispatching greet request { name = '" << name << "' }" << endl;
 
diff --git a/cpp/Ice/greeter/Chatbot.h b/cpp/Ice/greeter/Chatbot.h
@@ -5,7 +5,7 @@
 
 #include "Greeter.h"
 
-namespace GreeterServer
+namespace Server
 {
     /// A Chatbot is an Ice servant that implements Slice interface Greeter.
     class Chatbot : public VisitorCenter::Greeter
diff --git a/cpp/Ice/greeter/ChatbotAMD.cpp b/cpp/Ice/greeter/ChatbotAMD.cpp
@@ -9,7 +9,7 @@
 
 using namespace std;
 
-GreeterServerAMD::Chatbot::~Chatbot()
+ServerAMD::Chatbot::~Chatbot()
 {
     // Wait for all tasks to complete.
     for (auto& task : _tasks)
@@ -19,7 +19,7 @@ GreeterServerAMD::Chatbot::~Chatbot()
 }
 
 void
-GreeterServerAMD::Chatbot::greetAsync(
+ServerAMD::Chatbot::greetAsync(
     string name,
     function<void(string_view)> response,
     [[maybe_unused]] function<void(std::exception_ptr)> exception,
diff --git a/cpp/Ice/greeter/ChatbotAMD.h b/cpp/Ice/greeter/ChatbotAMD.h
@@ -5,7 +5,7 @@
 
 #include "GreeterAMD.h"
 
-namespace GreeterServerAMD
+namespace ServerAMD
 {
     /// A Chatbot is an Ice servant that implements Slice interface Greeter.
     class Chatbot : public VisitorCenter::Greeter
diff --git a/cpp/Ice/greeter/Server.cpp b/cpp/Ice/greeter/Server.cpp
@@ -22,7 +22,7 @@ main(int argc, char* argv[])
     auto adapter = communicator->createObjectAdapterWithEndpoints("GreeterAdapter", "tcp -p 4061");
 
     // Register the Chatbot servant with the adapter.
-    adapter->add(make_shared<GreeterServer::Chatbot>(), Ice::stringToIdentity("greeter"));
+    adapter->add(make_shared<Server::Chatbot>(), Ice::stringToIdentity("greeter"));
 
     // Start dispatching requests.
     adapter->activate();
diff --git a/cpp/Ice/greeter/ServerAMD.cpp b/cpp/Ice/greeter/ServerAMD.cpp
@@ -22,7 +22,7 @@ main(int argc, char* argv[])
     auto adapter = communicator->createObjectAdapterWithEndpoints("GreeterAdapter", "tcp -p 4061");
 
     // Register the Chatbot servant with the adapter.
-    adapter->add(make_shared<GreeterServerAMD::Chatbot>(), Ice::stringToIdentity("greeter"));
+    adapter->add(make_shared<ServerAMD::Chatbot>(), Ice::stringToIdentity("greeter"));
 
     // Start dispatching requests.
     adapter->activate();
diff --git a/csharp/Ice/Config/Server/Chatbot.cs b/csharp/Ice/Config/Server/Chatbot.cs
@@ -2,7 +2,7 @@
 
 using VisitorCenter;
 
-namespace ConfigServer;
+namespace Server;
 
 /// <summary>A Chatbot is an Ice servant that implements Slice interface Greeter.</summary>
 internal class Chatbot : GreeterDisp_
diff --git a/csharp/Ice/Config/Server/Program.cs b/csharp/Ice/Config/Server/Program.cs
@@ -1,7 +1,5 @@
 // Copyright (c) ZeroC, Inc.
 
-using ConfigServer;
-
 // Create an Ice communicator to initialize the Ice runtime. The communicator gets its configuration properties from
 // file config.server, in the server's current working directory. The communicator initialization also parses the
 // command-line options to find and set additional properties.
@@ -12,7 +10,7 @@
 Ice.ObjectAdapter adapter = communicator.createObjectAdapter("GreeterAdapter");
 
 // Register the Chatbot servant with the adapter.
-adapter.add(new Chatbot(), Ice.Util.stringToIdentity("greeter"));
+adapter.add(new Server.Chatbot(), Ice.Util.stringToIdentity("greeter"));
 
 // Start dispatching requests.
 adapter.activate();
diff --git a/csharp/Ice/Greeter/Server/Chatbot.cs b/csharp/Ice/Greeter/Server/Chatbot.cs
@@ -2,7 +2,7 @@
 
 using VisitorCenter;
 
-namespace GreeterServer;
+namespace Server;
 
 /// <summary>A Chatbot is an Ice servant that implements Slice interface Greeter.</summary>
 internal class Chatbot : GreeterDisp_
diff --git a/csharp/Ice/Greeter/Server/Program.cs b/csharp/Ice/Greeter/Server/Program.cs
@@ -1,15 +1,13 @@
 // Copyright (c) ZeroC, Inc.
 
-using GreeterServer;
-
 // Create an Ice communicator to initialize the Ice runtime. The communicator is disposed before the program exits.
 using Ice.Communicator communicator = Ice.Util.initialize(ref args);
 
 // Create an object adapter that listens for incoming requests and dispatches them to servants.
 Ice.ObjectAdapter adapter = communicator.createObjectAdapterWithEndpoints("GreeterAdapter", "tcp -p 4061");
 
 // Register the Chatbot servant with the adapter.
-adapter.add(new Chatbot(), Ice.Util.stringToIdentity("greeter"));
+adapter.add(new Server.Chatbot(), Ice.Util.stringToIdentity("greeter"));
 
 // Start dispatching requests.
 adapter.activate();
diff --git a/csharp/Ice/Greeter/ServerAMD/Chatbot.cs b/csharp/Ice/Greeter/ServerAMD/Chatbot.cs
@@ -2,7 +2,7 @@
 
 using VisitorCenter;
 
-namespace GreeterServerAMD;
+namespace ServerAMD;
 
 /// <summary>A Chatbot is an Ice servant that implements Slice interface Greeter.</summary>
 internal class Chatbot : GreeterDisp_
diff --git a/csharp/Ice/Greeter/ServerAMD/Program.cs b/csharp/Ice/Greeter/ServerAMD/Program.cs
@@ -1,15 +1,13 @@
 // Copyright (c) ZeroC, Inc.
 
-using GreeterServerAMD;
-
 // Create an Ice communicator to initialize the Ice runtime. The communicator is disposed before the program exits.
 using Ice.Communicator communicator = Ice.Util.initialize(ref args);
 
 // Create an object adapter that listens for incoming requests and dispatches them to servants.
 Ice.ObjectAdapter adapter = communicator.createObjectAdapterWithEndpoints("GreeterAdapter", "tcp -p 4061");
 
 // Register the Chatbot servant with the adapter.
-adapter.add(new Chatbot(), Ice.Util.stringToIdentity("greeter"));
+adapter.add(new ServerAMD.Chatbot(), Ice.Util.stringToIdentity("greeter"));
 
 // Start dispatching requests.
 adapter.activate();
diff --git a/swift/Ice/greeter/Sources/Server/Chatbot.swift b/swift/Ice/greeter/Sources/Server/Chatbot.swift
@@ -3,7 +3,7 @@
 import Ice
 
 /// A Chatbot is an Ice servant that implements Slice interface Greeter.
-class ChatBot: Greeter {
+class Chatbot: Greeter {
 
     // Implements the protocol method greet from the Greeter protocol generated by the Slice compiler.
     func greet(name: String, current _: Ice.Current) throws -> String {
diff --git a/swift/Ice/greeter/Sources/Server/main.swift b/swift/Ice/greeter/Sources/Server/main.swift
@@ -20,7 +20,7 @@ let adapter = try communicator.createObjectAdapterWithEndpoints(
     name: "GreeterAdapter", endpoints: "tcp -p 4061")
 
 // Register the Chatbot servant with the adapter.
-try adapter.add(servant: GreeterDisp(ChatBot()), id: Ice.stringToIdentity("greeter"))
+try adapter.add(servant: GreeterDisp(Chatbot()), id: Ice.stringToIdentity("greeter"))
 
 // Start dispatching requests.
 try adapter.activate()

Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,9 @@`
`6`	`6`	`#include <sstream>`
`7`	`7`
`8`	`8`	`using namespace std;`
`9`		`-using namespace ConfigServer;`
`10`	`9`
`11`	`10`	`string`
`12`		`-Chatbot::greet(string name, const Ice::Current&)`
	`11`	`+Server::Chatbot::greet(string name, const Ice::Current&)`
`13`	`12`	`{`
`14`	`13`	`cout << "Dispatching greet request { name = '" << name << "' }" << endl;`
`15`	`14`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`#include "Greeter.h"`
`7`	`7`
`8`		`-namespace ConfigServer`
	`8`	`+namespace Server`
`9`	`9`	`{`
`10`	`10`	`/// A Chatbot is an Ice servant that implements Slice interface Greeter.`
`11`	`11`	`class Chatbot : public VisitorCenter::Greeter`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`using namespace std;`
`9`	`9`
`10`	`10`	`string`
`11`		`-GreeterServer::Chatbot::greet(string name, const Ice::Current&)`
	`11`	`+Server::Chatbot::greet(string name, const Ice::Current&)`
`12`	`12`	`{`
`13`	`13`	`cout << "Dispatching greet request { name = '" << name << "' }" << endl;`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`#include "Greeter.h"`
`7`	`7`
`8`		`-namespace GreeterServer`
	`8`	`+namespace Server`
`9`	`9`	`{`
`10`	`10`	`/// A Chatbot is an Ice servant that implements Slice interface Greeter.`
`11`	`11`	`class Chatbot : public VisitorCenter::Greeter`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`using namespace std;`
`11`	`11`
`12`		`-GreeterServerAMD::Chatbot::~Chatbot()`
	`12`	`+ServerAMD::Chatbot::~Chatbot()`
`13`	`13`	`{`
`14`	`14`	`// Wait for all tasks to complete.`
`15`	`15`	`for (auto& task : _tasks)`
`@@ -19,7 +19,7 @@ GreeterServerAMD::Chatbot::~Chatbot()`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`void`
`22`		`-GreeterServerAMD::Chatbot::greetAsync(`
	`22`	`+ServerAMD::Chatbot::greetAsync(`
`23`	`23`	`string name,`
`24`	`24`	`function<void(string_view)> response,`
`25`	`25`	`[[maybe_unused]] function<void(std::exception_ptr)> exception,`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`#include "GreeterAMD.h"`
`7`	`7`
`8`		`-namespace GreeterServerAMD`
	`8`	`+namespace ServerAMD`
`9`	`9`	`{`
`10`	`10`	`/// A Chatbot is an Ice servant that implements Slice interface Greeter.`
`11`	`11`	`class Chatbot : public VisitorCenter::Greeter`