Changed from batch to RPC.

3 files changed, 11 insertions, 11 deletions

diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp
index 10fbb3709..e78e583aa 100644
--- a/zenserver/cache/structuredcache.cpp
+++ b/zenserver/cache/structuredcache.cpp
@@ -112,9 +112,9 @@ HttpStructuredCacheService::HandleRequest(HttpServerRequest& Request)
 	{
 		std::string_view Key = Request.RelativeUri();
 
-		if (Key == "$batch")
+		if (Key == "$rpc")
 		{
-			return HandleBatchRequest(Request);
+			return HandleRpcRequest(Request);
 		}
 
 		if (std::all_of(begin(Key), end(Key), [](const char c) { return std::isalnum(c); }))
@@ -779,7 +779,7 @@ HttpStructuredCacheService::ValidateKeyUri(HttpServerRequest& Request, CacheRef&
 }
 
 void
-HttpStructuredCacheService::HandleBatchRequest(zen::HttpServerRequest& Request)
+HttpStructuredCacheService::HandleRpcRequest(zen::HttpServerRequest& Request)
 {
 	switch (auto Verb = Request.RequestVerb())
 	{
@@ -800,11 +800,11 @@ HttpStructuredCacheService::HandleBatchRequest(zen::HttpServerRequest& Request)
 						const std::string_view Method = BatchRequest["Method"sv].AsString();
 						if (Method == "GetCacheRecords"sv)
 						{
-							HandleBatchGetCacheRecords(AsyncRequest, BatchRequest);
+							HandleRpcGetCacheRecords(AsyncRequest, BatchRequest);
 						}
 						else if (Method == "GetCachePayloads"sv)
 						{
-							HandleBatchGetCachePayloads(AsyncRequest, BatchRequest);
+							HandleRpcGetCachePayloads(AsyncRequest, BatchRequest);
 						}
 						else
 						{
@@ -820,7 +820,7 @@ HttpStructuredCacheService::HandleBatchRequest(zen::HttpServerRequest& Request)
 }
 
 void
-HttpStructuredCacheService::HandleBatchGetCacheRecords(zen::HttpServerRequest& Request, CbObjectView BatchRequest)
+HttpStructuredCacheService::HandleRpcGetCacheRecords(zen::HttpServerRequest& Request, CbObjectView BatchRequest)
 {
 	using namespace fmt::literals;
 
@@ -959,7 +959,7 @@ HttpStructuredCacheService::HandleBatchGetCacheRecords(zen::HttpServerRequest& R
 }
 
 void
-HttpStructuredCacheService::HandleBatchGetCachePayloads(zen::HttpServerRequest& Request, CbObjectView BatchRequest)
+HttpStructuredCacheService::HandleRpcGetCachePayloads(zen::HttpServerRequest& Request, CbObjectView BatchRequest)
 {
 	using namespace fmt::literals;
 
diff --git a/zenserver/cache/structuredcache.h b/zenserver/cache/structuredcache.h
index 9efcc05fa..3d9914606 100644
--- a/zenserver/cache/structuredcache.h
+++ b/zenserver/cache/structuredcache.h
@@ -89,9 +89,9 @@ private:
 	void			   HandleCachePayloadRequest(zen::HttpServerRequest& Request, const CacheRef& Ref, CachePolicy Policy);
 	void			   HandleGetCachePayload(zen::HttpServerRequest& Request, const CacheRef& Ref, CachePolicy Policy);
 	void			   HandlePutCachePayload(zen::HttpServerRequest& Request, const CacheRef& Ref, CachePolicy Policy);
-	void			   HandleBatchRequest(zen::HttpServerRequest& Request);
-	void			   HandleBatchGetCacheRecords(zen::HttpServerRequest& Request, CbObjectView BatchRequest);
-	void			   HandleBatchGetCachePayloads(zen::HttpServerRequest& Request, CbObjectView BatchRequest);
+	void			   HandleRpcRequest(zen::HttpServerRequest& Request);
+	void			   HandleRpcGetCacheRecords(zen::HttpServerRequest& Request, CbObjectView BatchRequest);
+	void			   HandleRpcGetCachePayloads(zen::HttpServerRequest& Request, CbObjectView BatchRequest);
 	void			   HandleCacheBucketRequest(zen::HttpServerRequest& Request, std::string_view Bucket);
 	virtual void	   HandleStatsRequest(zen::HttpServerRequest& Request) override;
 	virtual void	   HandleStatusRequest(zen::HttpServerRequest& Request) override;
diff --git a/zenserver/upstream/zen.cpp b/zenserver/upstream/zen.cpp
index dc23b573b..9ba767098 100644
--- a/zenserver/upstream/zen.cpp
+++ b/zenserver/upstream/zen.cpp
@@ -503,7 +503,7 @@ ZenCacheResult
 ZenStructuredCacheSession::InvokeRpc(const CbObjectView& Request)
 {
 	ExtendableStringBuilder<256> Uri;
-	Uri << m_Client.ServiceUrl() << "/z$/$batch";
+	Uri << m_Client.ServiceUrl() << "/z$/$rpc";
 
 	BinaryWriter Body;
 	Request.CopyTo(Body);