Renamed CompactBinaryAttachment to ObjectAttachment to mimic UE (see CL16510518)

1 files changed, 18 insertions, 18 deletions

diff --git a/zencore/compactbinarypackage.cpp b/zencore/compactbinarypackage.cpp
index 5b659ef39..4a1ea65d2 100644
--- a/zencore/compactbinarypackage.cpp
+++ b/zencore/compactbinarypackage.cpp
@@ -118,7 +118,7 @@ CbAttachment::Load(CbFieldIterator& Fields)
 		++Fields;
 		Hash = Fields.AsAttachment();
 		ZEN_ASSERT(!Fields.HasError());	 // TEXT("Attachments must be a non-empty binary value with a content hash."));
-		if (Fields.IsCompactBinaryAttachment())
+		if (Fields.IsObjectAttachment())
 		{
 			CompactBinary = CbFieldViewIterator::MakeRange(Buffer);
 		}
@@ -152,7 +152,7 @@ CbAttachment::Load(BinaryReader& Reader, BufferAllocator Allocator)
 		 });
 		Hash						   = HashField.AsAttachment();
 		ZEN_ASSERT(!HashField.HasError(), "Attachments must be a non-empty binary value with a content hash.");
-		if (HashField.IsCompactBinaryAttachment())
+		if (HashField.IsObjectAttachment())
 		{
 			CompactBinary = CbFieldViewIterator::MakeRange(Buffer);
 		}
@@ -179,7 +179,7 @@ CbAttachment::Save(CbWriter& Writer) const
 		{
 			Writer.AddBinary(AsBinaryView());
 		}
-		Writer.AddCompactBinaryAttachment(Hash);
+		Writer.AddObjectAttachment(Hash);
 	}
 	else if (Buffer && Buffer.GetSize())
 	{
@@ -289,7 +289,7 @@ CbPackage::GatherAttachments(const CbFieldViewIterator& Fields, AttachmentResolv
 
 		if (SharedBuffer Buffer = Resolver(Hash))
 		{
-			if (Field.IsCompactBinaryAttachment())
+			if (Field.IsObjectAttachment())
 			{
 				AddAttachment(CbAttachment(CbFieldIterator::MakeRange(std::move(Buffer)), Hash), &Resolver);
 			}
@@ -335,7 +335,7 @@ CbPackage::Load(CbFieldIterator& Fields)
 			++Fields;
 			if (Object.CreateIterator())
 			{
-				ObjectHash = Fields.AsCompactBinaryAttachment();
+				ObjectHash = Fields.AsObjectAttachment();
 				ZEN_ASSERT(!Fields.HasError(), TEXT("Object must be followed by a CompactBinaryReference with the object hash."));
 				++Fields;
 			}
@@ -379,7 +379,7 @@ CbPackage::Load(BinaryReader& Reader, BufferAllocator Allocator, AttachmentResol
 				CbField		  HashField = LoadCompactBinary(Reader, StackAllocator);
 				const IoHash& Hash		= HashField.AsAttachment();
 				ZEN_ASSERT(!HashField.HasError(), "Attachments must be a non-empty binary value with a content hash.");
-				if (HashField.IsCompactBinaryAttachment())
+				if (HashField.IsObjectAttachment())
 				{
 					AddAttachment(CbAttachment(CbFieldIterator::MakeRange(std::move(Buffer)), Hash));
 				}
@@ -405,8 +405,8 @@ CbPackage::Load(BinaryReader& Reader, BufferAllocator Allocator, AttachmentResol
 			if (Object.CreateViewIterator())
 			{
 				CbField HashField = LoadCompactBinary(Reader, StackAllocator);
-				ObjectHash		  = HashField.AsCompactBinaryAttachment();
-				ZEN_ASSERT(!HashField.HasError(), "Object must be followed by a CompactBinaryAttachment with the object hash.");
+				ObjectHash		  = HashField.AsObjectAttachment();
+				ZEN_ASSERT(!HashField.HasError(), "Object must be followed by a ObjectAttachment with the object hash.");
 			}
 			else
 			{
@@ -422,7 +422,7 @@ CbPackage::Save(CbWriter& Writer) const
 	if (Object.CreateIterator())
 	{
 		Writer.AddObject(Object);
-		Writer.AddCompactBinaryAttachment(ObjectHash);
+		Writer.AddObjectAttachment(ObjectHash);
 	}
 	for (const CbAttachment& Attachment : Attachments)
 	{
@@ -463,7 +463,7 @@ TEST_CASE("usonpackage")
 
 		CHECK(MakeMemoryView(WriteStream).EqualBytes(Fields.GetRangeBuffer().GetView()));
 		CHECK(ValidateCompactBinaryRange(MakeMemoryView(WriteStream), CbValidateMode::All) == CbValidateError::None);
-		CHECK(ValidateCompactBinaryAttachment(MakeMemoryView(WriteStream), CbValidateMode::All) == CbValidateError::None);
+		CHECK(ValidateObjectAttachment(MakeMemoryView(WriteStream), CbValidateMode::All) == CbValidateError::None);
 
 		CbAttachment FromFields;
 		FromFields.Load(Fields);
@@ -791,7 +791,7 @@ TEST_CASE("usonpackage.serialization")
 		CbWriter Writer;
 		Writer.SetName("Level3");
 		Writer.BeginArray();
-		Writer.AddCompactBinaryAttachment(Level3Hash);
+		Writer.AddObjectAttachment(Level3Hash);
 		Writer.EndArray();
 		Level2 = Writer.Save().AsArray();
 	}
@@ -801,7 +801,7 @@ TEST_CASE("usonpackage.serialization")
 	{
 		CbWriter Writer;
 		Writer.BeginObject();
-		Writer.SetName("Level2").AddCompactBinaryAttachment(Level2Hash);
+		Writer.SetName("Level2").AddObjectAttachment(Level2Hash);
 		Writer.EndObject();
 		Level1 = Writer.Save().AsObject();
 	}
@@ -858,13 +858,13 @@ TEST_CASE("usonpackage.serialization")
 	{
 		CbWriter Writer;
 		Writer.AddBinary(Level2.GetBuffer());
-		Writer.AddCompactBinaryAttachment(Level2Hash);
+		Writer.AddObjectAttachment(Level2Hash);
 		Writer.AddBinary(Level4);
 		Writer.AddBinaryAttachment(Level4Hash);
 		Writer.AddObject(Level1);
-		Writer.AddCompactBinaryAttachment(Level1Hash);
+		Writer.AddObjectAttachment(Level1Hash);
 		Writer.AddBinary(Level3.GetBuffer());
-		Writer.AddCompactBinaryAttachment(Level3Hash);
+		Writer.AddObjectAttachment(Level3Hash);
 		Writer.AddNull();
 
 		CbFieldIterator Fields = Writer.Save();
@@ -909,15 +909,15 @@ TEST_CASE("usonpackage.serialization")
 		CbFieldIterator Saved = Writer.Save();
 		CHECK(Saved.AsObject().Equals(Level1));
 		++Saved;
-		CHECK(Saved.AsCompactBinaryAttachment() == Level1Hash);
+		CHECK(Saved.AsObjectAttachment() == Level1Hash);
 		++Saved;
 		CHECK(Saved.AsBinaryView().EqualBytes(Level2.GetView()));
 		++Saved;
-		CHECK(Saved.AsCompactBinaryAttachment() == Level2Hash);
+		CHECK(Saved.AsObjectAttachment() == Level2Hash);
 		++Saved;
 		CHECK(Saved.AsBinaryView().EqualBytes(Level3.GetView()));
 		++Saved;
-		CHECK(Saved.AsCompactBinaryAttachment() == Level3Hash);
+		CHECK(Saved.AsObjectAttachment() == Level3Hash);
 		++Saved;
 		CHECK(Saved.AsBinaryView().EqualBytes(Level4.GetView()));
 		++Saved;