From bc70390722f094161e915ea7edc2716cf0afd2c8 Mon Sep 17 00:00:00 2001
From: Pavel Kirienko <pavel.kirienko@gmail.com>
Date: Fri, 14 Mar 2014 01:20:27 +0400
Subject: [PATCH] Renaming: Server<> --> ServiceServer<>

---
 .../uavcan/{server.hpp => service_server.hpp}    | 16 ++++++++--------
 libuavcan/test/service_client.cpp                |  4 ++--
 .../test/{server.cpp => service_server.cpp}      |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)
 rename libuavcan/include/uavcan/{server.hpp => service_server.hpp} (83%)
 rename libuavcan/test/{server.cpp => service_server.cpp} (96%)

diff --git a/libuavcan/include/uavcan/server.hpp b/libuavcan/include/uavcan/service_server.hpp
similarity index 83%
rename from libuavcan/include/uavcan/server.hpp
rename to libuavcan/include/uavcan/service_server.hpp
index ac8955a280..a3f37500c1 100644
--- a/libuavcan/include/uavcan/server.hpp
+++ b/libuavcan/include/uavcan/service_server.hpp
@@ -15,10 +15,10 @@ template <typename DataType_,
                                       typename DataType_::Response&),
           unsigned int NumStaticReceivers = 2,
           unsigned int NumStaticBufs = 1>
-class Server : public GenericSubscriber<DataType_, typename DataType_::Request,
-                                        typename TransferListenerInstantiationHelper<typename DataType_::Request,
-                                                                                     NumStaticReceivers,
-                                                                                     NumStaticBufs>::Type>
+class ServiceServer : public GenericSubscriber<DataType_, typename DataType_::Request,
+                                               typename TransferListenerInstantiationHelper<typename DataType_::Request,
+                                                                                            NumStaticReceivers,
+                                                                                            NumStaticBufs>::Type>
 {
 public:
     typedef DataType_ DataType;
@@ -44,19 +44,19 @@ private:
             callback_(request, response_);
         }
         else
-            handleFatalError("Invalid server callback");
+            handleFatalError("Invalid service server callback");
 
         const int res = publisher_.publish(response_, TransferTypeServiceResponse, request.getSrcNodeID(),
             request.getTransferID());
         if (res <= 0)
         {
-            UAVCAN_TRACE("Server", "Response publication failure: %i", res);
+            UAVCAN_TRACE("ServiceServer", "Response publication failure: %i", res);
             response_failure_count_++;
         }
     }
 
 public:
-    Server(Scheduler& scheduler, IAllocator& allocator, IMarshalBufferProvider& buffer_provider)
+    ServiceServer(Scheduler& scheduler, IAllocator& allocator, IMarshalBufferProvider& buffer_provider)
     : SubscriberType(scheduler, allocator)
     , publisher_(scheduler, buffer_provider, getDefaultTxTimeout())
     , callback_()
@@ -73,7 +73,7 @@ public:
 
         if (!try_implicit_cast<bool>(callback, true))
         {
-            UAVCAN_TRACE("Server", "Invalid callback");
+            UAVCAN_TRACE("ServiceServer", "Invalid callback");
             return -1;
         }
         callback_ = callback;
diff --git a/libuavcan/test/service_client.cpp b/libuavcan/test/service_client.cpp
index 339f76f783..461650864a 100644
--- a/libuavcan/test/service_client.cpp
+++ b/libuavcan/test/service_client.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include <uavcan/service_client.hpp>
-#include <uavcan/server.hpp>
+#include <uavcan/service_server.hpp>
 #include <uavcan/util/method_binder.hpp>
 #include <root_ns_a/StringService.hpp>
 #include <queue>
@@ -157,7 +157,7 @@ TEST(ServiceClient, Basic)
     uavcan::DefaultDataTypeRegistrator<root_ns_a::StringService> _registrator;
 
     // Server
-    uavcan::Server<root_ns_a::StringService> server(node_a.scheduler, node_a.poolmgr, node_a.buffer_provider);
+    uavcan::ServiceServer<root_ns_a::StringService> server(node_a.scheduler, node_a.poolmgr, node_a.buffer_provider);
     ASSERT_EQ(1, server.start(stringServiceServerCallback));
 
     {
diff --git a/libuavcan/test/server.cpp b/libuavcan/test/service_server.cpp
similarity index 96%
rename from libuavcan/test/server.cpp
rename to libuavcan/test/service_server.cpp
index 22ab4887ae..eba41c3f9e 100644
--- a/libuavcan/test/server.cpp
+++ b/libuavcan/test/service_server.cpp
@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/server.hpp>
+#include <uavcan/service_server.hpp>
 #include <uavcan/util/method_binder.hpp>
 #include <root_ns_a/StringService.hpp>
 #include "clock.hpp"
@@ -34,7 +34,7 @@ struct ServerImpl
 };
 
 
-TEST(Server, Basic)
+TEST(ServiceServer, Basic)
 {
     uavcan::PoolAllocator<uavcan::MemPoolBlockSize * 8, uavcan::MemPoolBlockSize> pool;
     uavcan::PoolManager<1> poolmgr;
@@ -55,7 +55,7 @@ TEST(Server, Basic)
     ServerImpl impl("456");
 
     {
-        uavcan::Server<root_ns_a::StringService, ServerImpl::Binder> server(sch, poolmgr, buffer_provider);
+        uavcan::ServiceServer<root_ns_a::StringService, ServerImpl::Binder> server(sch, poolmgr, buffer_provider);
 
         ASSERT_EQ(0, sch.getDispatcher().getNumServiceRequestListeners());
         server.start(impl.bind());