ByteBuffer reference access implementation (#3482)

* Add AccessB() function to Aws::Utils::ByteBuffer class for reference access

* TableOperationTest - TestAttributeValues - Include checks for when byteBuffer should be empty

---------

Co-authored-by: sbaluja <[email protected]>

Author: sbaluja

generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/AttributeValue.h

@@ -65,6 +65,8 @@ class AWS_DYNAMODB_API AttributeValue
 
     /// returns the ByteBuffer if the value is specialized to this type, otherwise an empty Buffer
     const Aws::Utils::ByteBuffer GetB() const;
+    /// returns a reference to the ByteBuffer if the value is specialized to this type, otherwise a reference to an empty Buffer
+    const Aws::Utils::ByteBuffer& AccessB() const;
     /// if already specialized to a ByteBuffer, sets the value to this value
     /// if uninitialized, specializes the type to a ByteBuffer with the specified value
     /// if already specialized to another type then the behavior is undefined

generated/src/aws-cpp-sdk-dynamodb/include/aws/dynamodb/model/AttributeValueValue.h

@@ -32,6 +32,11 @@ class AttributeValueValue
 
     virtual const Aws::Utils::ByteBuffer GetB() const { return {}; }
 
+    virtual const Aws::Utils::ByteBuffer& AccessB() const {
+        static const Aws::Utils::ByteBuffer empty;
+        return empty;
+    }
+
     virtual const Aws::Vector<Aws::String> GetSS() const { return {}; }
 
     virtual void AddSItem(const Aws::String& ) { assert(false); }
@@ -104,6 +109,7 @@ class AttributeValueByteBuffer final : public AttributeValueValue
     explicit AttributeValueByteBuffer(const Aws::Utils::ByteBuffer& value) : m_b(value) {}
     explicit AttributeValueByteBuffer(Aws::Utils::Json::JsonView jsonValue);
     const Aws::Utils::ByteBuffer GetB() const override { return m_b; }
+    const Aws::Utils::ByteBuffer& AccessB() const override { return m_b; }
     bool IsDefault() const override { return m_b.GetLength() == 0; }
     bool operator == (const AttributeValueValue& other) const override { return GetType() == other.GetType() && m_b == other.GetB(); }
     Aws::Utils::Json::JsonValue Jsonize() const override;

generated/src/aws-cpp-sdk-dynamodb/source/model/AttributeValue.cpp

@@ -66,6 +66,19 @@ AttributeValue& AttributeValue::SetB(const ByteBuffer& b)
     return *this;
 }
 
+const ByteBuffer& AttributeValue::AccessB() const
+{
+    if (m_value)
+    {
+       return m_value->AccessB();
+    }
+    else
+    {
+        static const ByteBuffer empty;
+        return empty;
+    }
+}
+
 const Aws::Vector<Aws::String> AttributeValue::GetSS() const
 {
     if (m_value)

tests/aws-cpp-sdk-dynamodb-integration-tests/TableOperationTest.cpp

@@ -907,7 +907,7 @@ TEST_F(TableOperationTest, TestAttributeValues)
     const Aws::Utils::ByteBuffer byteBuffer1(buffer1, 6);
     unsigned char buffer2[6] = { 21, 35, 55, 68, 11, 6 };
     const Aws::Utils::ByteBuffer byteBuffer2(buffer2, 6);
-
+    const Aws::Utils::ByteBuffer emptyBuf;
     // create the Hash Key value
     AttributeValue hashKey("TestValue");
 
@@ -947,6 +947,9 @@ TEST_F(TableOperationTest, TestAttributeValues)
         //ReturnedItemCollection returnedItemCollection = result.GetItems();
         EXPECT_EQ("TestValue", returnedItemCollection[HASH_KEY_NAME].GetS());
         EXPECT_EQ("String Value", returnedItemCollection["String"].GetS());
+
+        EXPECT_EQ(emptyBuf, returnedItemCollection["ByteBuffer"].GetB());
+        EXPECT_EQ(emptyBuf, returnedItemCollection["ByteBuffer"].AccessB());
     }
 
     // Number Value
@@ -1058,6 +1061,7 @@ TEST_F(TableOperationTest, TestAttributeValues)
         EXPECT_EQ("String Value", returnedItemCollection["String"].GetS());
         EXPECT_EQ("1001", returnedItemCollection["Number"].GetN());
         EXPECT_EQ(byteBuffer1, returnedItemCollection["ByteBuffer"].GetB()); // on the 3rd day of xmas...
+        EXPECT_EQ(byteBuffer1, returnedItemCollection["ByteBuffer"].AccessB());
     }
 
     // StringSet
@@ -1097,6 +1101,7 @@ TEST_F(TableOperationTest, TestAttributeValues)
         EXPECT_EQ("String Value", returnedItemCollection["String"].GetS());
         EXPECT_EQ("1001", returnedItemCollection["Number"].GetN());
         EXPECT_EQ(byteBuffer1, returnedItemCollection["ByteBuffer"].GetB());
+        EXPECT_EQ(byteBuffer1, returnedItemCollection["ByteBuffer"].AccessB());
         auto ss = returnedItemCollection["String Set"].GetSS();
         EXPECT_EQ(2u, ss.size());
         EXPECT_NE(ss.end(), std::find(ss.begin(), ss.end(), "test1"));
@@ -1140,6 +1145,7 @@ TEST_F(TableOperationTest, TestAttributeValues)
         EXPECT_EQ("String Value", returnedItemCollection["String"].GetS());
         EXPECT_EQ("1001", returnedItemCollection["Number"].GetN());
         EXPECT_EQ(byteBuffer1, returnedItemCollection["ByteBuffer"].GetB());
+        EXPECT_EQ(byteBuffer1, returnedItemCollection["ByteBuffer"].AccessB());
         auto ss = returnedItemCollection["String Set"].GetSS();
         EXPECT_EQ(2u, ss.size());
         EXPECT_NE(ss.end(), std::find(ss.begin(), ss.end(), "test1"));
@@ -1187,6 +1193,7 @@ TEST_F(TableOperationTest, TestAttributeValues)
         EXPECT_EQ("String Value", returnedItemCollection["String"].GetS());
         EXPECT_EQ("1001", returnedItemCollection["Number"].GetN());
         EXPECT_EQ(byteBuffer1, returnedItemCollection["ByteBuffer"].GetB());
+        EXPECT_EQ(byteBuffer1, returnedItemCollection["ByteBuffer"].AccessB());
         auto ss = returnedItemCollection["String Set"].GetSS();
         EXPECT_EQ(2u, ss.size());
         EXPECT_NE(ss.end(), std::find(ss.begin(), ss.end(), "test1"));
@@ -1240,6 +1247,7 @@ TEST_F(TableOperationTest, TestAttributeValues)
         EXPECT_EQ("String Value", returnedItemCollection["String"].GetS());
         EXPECT_EQ("1001", returnedItemCollection["Number"].GetN());
         EXPECT_EQ(byteBuffer1, returnedItemCollection["ByteBuffer"].GetB());
+        EXPECT_EQ(byteBuffer1, returnedItemCollection["ByteBuffer"].AccessB());
         auto ss = returnedItemCollection["String Set"].GetSS();
         EXPECT_EQ(2u, ss.size());
         EXPECT_NE(ss.end(), std::find(ss.begin(), ss.end(), "test1"));
@@ -1334,6 +1342,7 @@ TEST_F(TableOperationTest, TestAttributeValues)
         EXPECT_EQ("String Value", returnedItemCollection["String"].GetS());
         EXPECT_EQ("1001", returnedItemCollection["Number"].GetN());
         EXPECT_EQ(byteBuffer1, returnedItemCollection["ByteBuffer"].GetB());
+        EXPECT_EQ(byteBuffer1, returnedItemCollection["ByteBuffer"].AccessB());
         auto ss = returnedItemCollection["String Set"].GetSS();
         EXPECT_EQ(2u, ss.size());
         EXPECT_NE(ss.end(), std::find(ss.begin(), ss.end(), "test1"));

tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/dynamodb/AttributeValueHeader.vm

@@ -62,6 +62,8 @@ public:
 
     /// returns the ByteBuffer if the value is specialized to this type, otherwise an empty Buffer
     const Aws::Utils::ByteBuffer GetB() const;
+    /// returns a reference to the ByteBuffer if the value is specialized to this type, otherwise a reference to an empty Buffer
+    const Aws::Utils::ByteBuffer& AccessB() const;
     /// if already specialized to a ByteBuffer, sets the value to this value
     /// if uninitialized, specializes the type to a ByteBuffer with the specified value
     /// if already specialized to another type then the behavior is undefined

tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/dynamodb/AttributeValueSource.vm

@@ -63,6 +63,19 @@ AttributeValue& AttributeValue::SetB(const ByteBuffer& b)
     return *this;
 }
 
+const ByteBuffer& AttributeValue::AccessB() const
+{
+    if (m_value)
+    {
+       return m_value->AccessB();
+    }
+    else
+    {
+        static const ByteBuffer empty;
+        return empty;
+    }
+}
+
 const Aws::Vector<Aws::String> AttributeValue::GetSS() const
 {
     if (m_value)

tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/dynamodb/AttributeValueValueHeader.vm

@@ -29,6 +29,11 @@ public:
 
     virtual const Aws::Utils::ByteBuffer GetB() const { return {}; }
 
+    virtual const Aws::Utils::ByteBuffer& AccessB() const {
+        static const Aws::Utils::ByteBuffer empty;
+        return empty;
+    }
+
     virtual const Aws::Vector<Aws::String> GetSS() const { return {}; }
 
     virtual void AddSItem(const Aws::String& ) { assert(false); }
@@ -101,6 +106,7 @@ public:
     explicit AttributeValueByteBuffer(const Aws::Utils::ByteBuffer& value) : m_b(value) {}
     explicit AttributeValueByteBuffer(Aws::Utils::Json::JsonView jsonValue);
     const Aws::Utils::ByteBuffer GetB() const override { return m_b; }
+    const Aws::Utils::ByteBuffer& AccessB() const override { return m_b; }
     bool IsDefault() const override { return m_b.GetLength() == 0; }
     bool operator == (const AttributeValueValue& other) const override { return GetType() == other.GetType() && m_b == other.GetB(); }
     Aws::Utils::Json::JsonValue Jsonize() const override;