Changed RPC keys to camel case.

1 files changed, 38 insertions, 38 deletions

diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp
index 073192c12..45f626ff5 100644
--- a/zenserver/cache/structuredcache.cpp
+++ b/zenserver/cache/structuredcache.cpp
@@ -797,13 +797,13 @@ HttpStructuredCacheService::HandleBatchRequest(zen::HttpServerRequest& Request)
 				}
 
 				CbObject			   BatchRequest = zen::LoadCompactBinaryObject(Request.ReadPayload());
-				const std::string_view Method		= BatchRequest["method"sv].AsString();
+				const std::string_view Method		= BatchRequest["Method"sv].AsString();
 
-				if (Method == "get-cache-records"sv)
+				if (Method == "GetCacheRecords"sv)
 				{
 					HandleBatchGetCacheRecords(Request, BatchRequest);
 				}
-				else if (Method == "get-cache-chunks"sv)
+				else if (Method == "GetCachePayloads"sv)
 				{
 					HandleBatchGetCachePayloads(Request, BatchRequest);
 				}
@@ -824,13 +824,13 @@ HttpStructuredCacheService::HandleBatchGetCacheRecords(zen::HttpServerRequest& R
 {
 	using namespace fmt::literals;
 
-	const std::string_view Method = BatchRequest["method"sv].AsString();
-	ZEN_ASSERT(Method == "get-cache-records"sv);
+	const std::string_view Method = BatchRequest["Method"sv].AsString();
+	ZEN_ASSERT(Method == "GetCacheRecords"sv);
 
-	CbObjectView Params = BatchRequest["params"sv].AsObjectView();
+	CbObjectView Params = BatchRequest["Params"sv].AsObjectView();
 
 	CacheRecordPolicy Policy;
-	CacheRecordPolicy::FromCompactBinary(Params["policy"sv].AsObjectView(), Policy);
+	CacheRecordPolicy::FromCompactBinary(Params["Policy"sv].AsObjectView(), Policy);
 
 	const bool SkipAttachments = (Policy.GetRecordPolicy() & CachePolicy::SkipAttachments) == CachePolicy::SkipAttachments;
 	const bool QueryUpstream   = m_UpstreamCache && ((Policy.GetRecordPolicy() & CachePolicy::QueryRemote) == CachePolicy::QueryRemote);
@@ -840,10 +840,10 @@ HttpStructuredCacheService::HandleBatchGetCacheRecords(zen::HttpServerRequest& R
 	std::vector<IoBuffer> Payloads;
 	std::vector<size_t>	  Missing;
 
-	for (CbFieldView QueryView : Params["cachekeys"sv])
+	for (CbFieldView QueryView : Params["CacheKeys"sv])
 	{
 		CbObjectView Query = QueryView.AsObjectView();
-		CacheKeys.push_back(CacheKey::Create(Query["bucket"sv].AsString(), Query["hash"sv].AsHash()));
+		CacheKeys.push_back(CacheKey::Create(Query["Bucket"sv].AsString(), Query["Hash"sv].AsHash()));
 	}
 
 	if (CacheKeys.empty())
@@ -858,7 +858,7 @@ HttpStructuredCacheService::HandleBatchGetCacheRecords(zen::HttpServerRequest& R
 		Payloads.reserve(CacheKeys.size());
 	}
 
-	for (size_t Idx = 0; const CacheKey& Key : CacheKeys)
+	for (size_t KeyIndex = 0; const CacheKey& Key : CacheKeys)
 	{
 		ZenCacheValue CacheValue;
 		if (m_CacheStore.Get(Key.Bucket, Key.Hash, CacheValue))
@@ -881,15 +881,15 @@ HttpStructuredCacheService::HandleBatchGetCacheRecords(zen::HttpServerRequest& R
 					  NiceBytes(CacheValue.Value.Size()),
 					  ToString(CacheValue.Value.GetContentType()));
 
-			CacheValues[Idx] = CacheValue.Value;
+			CacheValues[KeyIndex] = CacheValue.Value;
 			m_CacheStats.HitCount++;
 		}
 		else
 		{
-			Missing.push_back(Idx);
+			Missing.push_back(KeyIndex);
 		}
 
-		++Idx;
+		++KeyIndex;
 	}
 
 	if (!Missing.empty() && QueryUpstream)
@@ -933,16 +933,16 @@ HttpStructuredCacheService::HandleBatchGetCacheRecords(zen::HttpServerRequest& R
 		Missing = std::move(UpstreamResult.Missing);
 	}
 
-	for (size_t Idx : Missing)
+	for (size_t KeyIndex : Missing)
 	{
-		const CacheKey& Key = CacheKeys[Idx];
+		const CacheKey& Key = CacheKeys[KeyIndex];
 		ZEN_DEBUG("MISS - '{}/{}'", Key.Bucket, Key.Hash);
 		m_CacheStats.MissCount++;
 	}
 
 	CbObjectWriter BatchResponse;
 
-	BatchResponse.BeginArray("result"sv);
+	BatchResponse.BeginArray("Result"sv);
 	for (const IoBuffer& Value : CacheValues)
 	{
 		if (Value)
@@ -1002,29 +1002,29 @@ HttpStructuredCacheService::HandleBatchGetCachePayloads(zen::HttpServerRequest&
 		return IoHash::Zero;
 	};
 
-	const std::string_view Method = BatchRequest["method"sv].AsString();
-	ZEN_ASSERT(Method == "get-cache-chunks"sv);
+	const std::string_view Method = BatchRequest["Method"sv].AsString();
+	ZEN_ASSERT(Method == "GetCachePayloads"sv);
 
-	CbObjectView Params = BatchRequest["params"sv].AsObjectView();
+	CbObjectView Params = BatchRequest["Params"sv].AsObjectView();
 
 	CacheRecordPolicy Policy;
-	CacheRecordPolicy::FromCompactBinary(Params["policy"sv].AsObjectView(), Policy);
+	CacheRecordPolicy::FromCompactBinary(Params["Policy"sv].AsObjectView(), Policy);
 
 	const bool QueryUpstream = m_UpstreamCache && ((Policy.GetRecordPolicy() & CachePolicy::QueryRemote) == CachePolicy::QueryRemote);
 
 	std::vector<CacheChunkRequest> ChunkRequests;
 	std::vector<size_t>			   Missing;
 
-	for (CbFieldView ChunkView : Params["chunkrequests"sv])
+	for (CbFieldView ChunkView : Params["ChunkRequests"sv])
 	{
 		CbObjectView   Chunk		  = ChunkView.AsObjectView();
-		CbObjectView   CacheKeyObject = Chunk["key"sv].AsObjectView();
-		const CacheKey Key			  = CacheKey::Create(CacheKeyObject["bucket"sv].AsString(), CacheKeyObject["hash"sv].AsHash());
+		CbObjectView   CacheKeyObject = Chunk["Key"sv].AsObjectView();
+		const CacheKey Key			  = CacheKey::Create(CacheKeyObject["Bucket"sv].AsString(), CacheKeyObject["Hash"sv].AsHash());
 		const IoHash   ChunkId		  = IoHash::Zero;
-		const Oid	   PayloadId	  = Chunk["payloadid"sv].AsObjectId();
-		const uint64_t RawOffset	  = Chunk["rawoffset"sv].AsUInt64();
-		const uint64_t RawSize		  = Chunk["rawsize"sv].AsUInt64();
-		const uint32_t ChunkPolicy	  = Chunk["policy"sv].AsUInt32();
+		const Oid	   PayloadId	  = Chunk["PayloadId"sv].AsObjectId();
+		const uint64_t RawOffset	  = Chunk["RawoffSet"sv].AsUInt64();
+		const uint64_t RawSize		  = Chunk["RawSize"sv].AsUInt64();
+		const uint32_t ChunkPolicy	  = Chunk["Policy"sv].AsUInt32();
 
 		ChunkRequests.emplace_back(Key, ChunkId, PayloadId, RawOffset, RawSize, static_cast<CachePolicy>(ChunkPolicy));
 	}
@@ -1061,7 +1061,7 @@ HttpStructuredCacheService::HandleBatchGetCachePayloads(zen::HttpServerRequest&
 	std::vector<IoBuffer> Chunks;
 	Chunks.resize(ChunkRequests.size());
 
-	for (size_t Idx = 0; const CacheChunkRequest& ChunkRequest : ChunkRequests)
+	for (size_t RequestIndex = 0; const CacheChunkRequest& ChunkRequest : ChunkRequests)
 	{
 		if (IoBuffer Chunk = m_CidStore.FindChunkByCid(ChunkRequest.ChunkId))
 		{
@@ -1073,14 +1073,14 @@ HttpStructuredCacheService::HandleBatchGetCachePayloads(zen::HttpServerRequest&
 					  ToString(Chunk.GetContentType()),
 					  "LOCAL");
 
-			Chunks[Idx] = Chunk;
+			Chunks[RequestIndex] = Chunk;
 			m_CacheStats.HitCount++;
 		}
 		else
 		{
-			Missing.push_back(Idx);
+			Missing.push_back(RequestIndex);
 		}
-		++Idx;
+		++RequestIndex;
 	}
 
 	if (!Missing.empty() && QueryUpstream)
@@ -1116,9 +1116,9 @@ HttpStructuredCacheService::HandleBatchGetCachePayloads(zen::HttpServerRequest&
 		Missing = std::move(UpstreamResult.Missing);
 	}
 
-	for (size_t Idx : Missing)
+	for (size_t RequestIndex : Missing)
 	{
-		const CacheChunkRequest& ChunkRequest = ChunkRequests[Idx];
+		const CacheChunkRequest& ChunkRequest = ChunkRequests[RequestIndex];
 		ZEN_DEBUG("MISS - '{}/{}/{}'", ChunkRequest.Key.Bucket, ChunkRequest.Key.Hash, ChunkRequest.ChunkId);
 		m_CacheStats.MissCount++;
 	}
@@ -1126,14 +1126,14 @@ HttpStructuredCacheService::HandleBatchGetCachePayloads(zen::HttpServerRequest&
 	CbPackage	   Package;
 	CbObjectWriter BatchResponse;
 
-	BatchResponse.BeginArray("result"sv);
+	BatchResponse.BeginArray("Result"sv);
 
-	for (size_t Idx = 0; Idx < Chunks.size(); ++Idx)
+	for (size_t ChunkIndex = 0; ChunkIndex < Chunks.size(); ++ChunkIndex)
 	{
-		if (Chunks[Idx])
+		if (Chunks[ChunkIndex])
 		{
-			BatchResponse << ChunkRequests[Idx].ChunkId;
-			Package.AddAttachment(CbAttachment(CompressedBuffer::FromCompressed(SharedBuffer(std::move(Chunks[Idx])))));
+			BatchResponse << ChunkRequests[ChunkIndex].ChunkId;
+			Package.AddAttachment(CbAttachment(CompressedBuffer::FromCompressed(SharedBuffer(std::move(Chunks[ChunkIndex])))));
 		}
 		else
 		{