updating clang-format, glob CMake, switch-based escaping, Schema return by value

Author: pulimsr

src/aws-cpp-sdk-core/CMakeLists.txt

@@ -97,6 +97,8 @@ file(GLOB SMITHY_IDENTITY_SIGNER_HEADERS "include/smithy/identity/signer/*.h")
 file(GLOB SMITHY_IDENTITY_SIGNER_BUILTIN_HEADERS "include/smithy/identity/signer/built-in/*.h")
 file(GLOB SMITHY_INTERCEPTOR_HEADERS "include/smithy/interceptor/*.h")
 file(GLOB SMITHY_INTERCEPTOR_IMPL_HEADERS "include/smithy/interceptor/impl/*.h")
+file(GLOB SMITHY_CLIENT_SCHEMA_HEADERS "include/smithy/client/schema/*.h")
+file(GLOB SMITHY_CLIENT_SCHEMA_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/source/smithy/client/schema/*.cpp")
 
 file(GLOB AWS_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/source/*.cpp")
 file(GLOB AWS_TINYXML2_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/source/external/tinyxml2/*.cpp")
@@ -316,6 +318,7 @@ file(GLOB AWS_NATIVE_SDK_COMMON_HEADERS
   ${OPTEL_HEADERS}
   ${SMITHY_INTERCEPTOR_HEADERS}
   ${SMITHY_INTERCEPTOR_IMPL_HEADERS}
+  ${SMITHY_CLIENT_SCHEMA_HEADERS}
 )
 
 # misc platform-specific, not related to features (encryption/http clients)
@@ -378,6 +381,7 @@ file(GLOB AWS_NATIVE_SDK_NON_UNITY_SRC
     ${UTILS_CHECKSUM_SOURCE}
     ${UTILS_CRYPTO_SOURCE}
     ${OPTEL_SOURCE}
+    ${SMITHY_CLIENT_SCHEMA_SOURCE}
 )
 
 file(GLOB AWS_NATIVE_SDK_UNITY_SRC
@@ -462,6 +466,7 @@ if(MSVC)
     source_group("Header Files\\smithy\\identity\\signer\\built-in" FILES ${SMITHY_IDENTITY_SIGNER_BUILTIN_HEADERS})
     source_group("Header Files\\smithy\\interceptor" FILES ${SMITHY_INTERCEPTOR_HEADERS})
     source_group("Header Files\\smithy\\interceptor" FILES ${SMITHY_INTERCEPTOR_IMPL_HEADERS})
+    source_group("Header Files\\smithy\\client\\schema" FILES ${SMITHY_CLIENT_SCHEMA_HEADERS})
 
     # http client conditional headers
     if(ENABLE_CURL_CLIENT)
@@ -543,17 +548,7 @@ check_cxx_source_compiles("
             return 0;
         }" AWS_HAS_ALIGNED_ALLOC)
 
-add_library(${PROJECT_NAME} ${AWS_NATIVE_SDK_SRC}
-        include/smithy/client/schema/ShapeSerializer.h
-        include/smithy/client/schema/CborShapeSerializer.h
-        include/smithy/client/schema/Schema.h
-        include/smithy/client/schema/JsonShapeSerializer.h
-        include/smithy/client/schema/QueryShapeSerializer.h
-        include/smithy/client/schema/XmlShapeSerializer.h
-        source/smithy/client/schema/JsonShapeSerializer.cpp
-        include/smithy/client/schema/JsonWriteUtils.h
-        source/smithy/client/schema/JsonWriteUtils.cpp
-)
+add_library(${PROJECT_NAME} ${AWS_NATIVE_SDK_SRC})
 add_library(AWS::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 
 target_compile_definitions(${PROJECT_NAME} PUBLIC "AWS_SDK_VERSION_MAJOR=${AWSSDK_VERSION_MAJOR}")

src/aws-cpp-sdk-core/include/smithy/client/schema/CborShapeSerializer.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <aws/core/Core_EXPORTS.h>
-#include <smithy/client/schema/ShapeSerializer.h>
 #include <aws/core/utils/memory/AWSMemory.h>
+#include <smithy/client/schema/ShapeSerializer.h>
 
 namespace smithy {
 namespace schema {

src/aws-cpp-sdk-core/include/smithy/client/schema/JsonShapeSerializer.h

@@ -1,17 +1,15 @@
 #pragma once
 
-#include <smithy/client/schema/ShapeSerializer.h>
-
+#include <aws/core/client/AWSError.h>
 #include <aws/core/utils/memory/AWSMemory.h>
-
-#include "aws/core/client/AWSError.h"
+#include <smithy/client/schema/ShapeSerializer.h>
 
 namespace smithy {
 namespace schema {
 
 class JsonShapeSerializer final : public ShapeSerializer {
  public:
- using SerializerOutcome = Aws::Utils::Outcome<Aws::String, Aws::Client::AWSError<Aws::Client::CoreErrors>>;
+  using SerializerOutcome = Aws::Utils::Outcome<Aws::String, Aws::Client::AWSError<Aws::Client::CoreErrors>>;
   JsonShapeSerializer();
   ~JsonShapeSerializer();
 

src/aws-cpp-sdk-core/include/smithy/client/schema/JsonWriteUtils.h

@@ -1,16 +1,10 @@
 #pragma once
-
 #include <aws/core/utils/memory/stl/AWSString.h>
 
-namespace smithy {
-    namespace schema {
-        class JsonWriteUtils {
-        public:
-            static void WriteQuotedString(Aws::String& buf, const Aws::String& value);
-        private:
-            static const bool NEEDS_ESCAPE[128];
-            static const char ESCAPE_TABLE[128];
-            static const char HEX[16];
-        };
-    }
-}
+namespace Aws {
+namespace Schema {
+
+void WriteQuotedJsonString(Aws::String& buf, const Aws::String& value);
+
+}  // namespace Schema
+}  // namespace Aws

src/aws-cpp-sdk-core/include/smithy/client/schema/QueryShapeSerializer.h

@@ -1,8 +1,7 @@
 #pragma once
 
-#include <smithy/client/schema/ShapeSerializer.h>
-
 #include <aws/core/utils/memory/AWSMemory.h>
+#include <smithy/client/schema/ShapeSerializer.h>
 
 namespace smithy {
 namespace schema {

src/aws-cpp-sdk-core/include/smithy/client/schema/Schema.h

@@ -35,12 +35,11 @@ enum class ShapeType : uint8_t {
 class Schema {
  public:
   Schema() = default;
-  Schema(const Aws::String& memberName, ShapeType type)
-      : m_type(type), m_memberName(memberName) {}
+  Schema(const Aws::String& memberName, ShapeType type) : m_type(type), m_memberName(memberName) {}
 
   ShapeType GetType() const { return m_type; }
   const char* GetId() const { return m_id; }
-  const Aws::String& GetMemberName() const { return m_memberName; }
+  Aws::String GetMemberName() const { return m_memberName; }
   int GetMemberIndex() const { return m_memberIndex; }
   bool IsMember() const { return !m_memberName.empty(); }
 

src/aws-cpp-sdk-core/include/smithy/client/schema/XmlShapeSerializer.h

@@ -1,8 +1,7 @@
 #pragma once
 
-#include <smithy/client/schema/ShapeSerializer.h>
-
 #include <aws/core/utils/memory/AWSMemory.h>
+#include <smithy/client/schema/ShapeSerializer.h>
 
 namespace smithy {
 namespace schema {

src/aws-cpp-sdk-core/source/smithy/client/schema/JsonShapeSerializer.cpp

@@ -20,9 +20,8 @@ using SerializerOutcome = Aws::Utils::Outcome<Aws::String, Aws::Client::AWSError
 static constexpr int MAX_DEPTH = 1000;
 
 class JsonShapeSerializer::Impl {
-
-public:
-  Impl() {m_buf.reserve(8192);}
+ public:
+  Impl() { m_buf.reserve(8192); }
 
   bool BeginStructure(const Schema&) {
     if (m_depth + 1 >= MAX_DEPTH) {
@@ -66,7 +65,7 @@ class JsonShapeSerializer::Impl {
 
   void WriteString(const Schema& schema, const Aws::String& value) {
     WriteFieldName(schema);
-    JsonWriteUtils::WriteQuotedString(m_buf, value);
+    Aws::Schema::WriteQuotedJsonString(m_buf, value);
   }
 
   void WriteTimestamp(const Schema& schema, const DateTime& value) {
@@ -154,23 +153,21 @@ class JsonShapeSerializer::Impl {
   }
 
   SerializerOutcome GetPayload() {
-    if(m_finalized || !m_errorMessage.empty()) {
+    if (m_finalized || !m_errorMessage.empty()) {
       return Aws::Client::AWSError<Aws::Client::CoreErrors>(
-        Aws::Client::CoreErrors::INTERNAL_FAILURE,
-        "SerializationException",
-        !m_errorMessage.empty()?m_errorMessage:"Serializer has already been finalized",
-        false);
+          Aws::Client::CoreErrors::INTERNAL_FAILURE, "SerializationException",
+          !m_errorMessage.empty() ? m_errorMessage : "Serializer has already been finalized", false);
     }
     m_finalized = true;
     return std::move(m_buf);
   }
 
-private:
+ private:
   Aws::String m_buf;
   int m_depth = 0;
- Aws::Array<bool, MAX_DEPTH> m_needsComma{};
- Aws::Array<bool, MAX_DEPTH> m_isMap{};
- Aws::Array<bool, MAX_DEPTH> m_isList{};
+  Aws::Array<bool, MAX_DEPTH> m_needsComma{};
+  Aws::Array<bool, MAX_DEPTH> m_isMap{};
+  Aws::Array<bool, MAX_DEPTH> m_isList{};
   Aws::String m_currentMapKey;
   bool m_finalized = false;
   Aws::String m_errorMessage;
@@ -184,7 +181,7 @@ class JsonShapeSerializer::Impl {
   }
 
   void WriteKey(const Aws::String& key) {
-    JsonWriteUtils::WriteQuotedString(m_buf, key);
+    Aws::Schema::WriteQuotedJsonString(m_buf, key);
     m_buf += ':';
   }
 
@@ -199,7 +196,6 @@ class JsonShapeSerializer::Impl {
       WriteKey(schema.GetMemberName());
     }
   }
-
 };
 
 JsonShapeSerializer::JsonShapeSerializer() : m_impl(Aws::MakeUnique<Impl>("JsonShapeSerializer")) {}

src/aws-cpp-sdk-core/source/smithy/client/schema/JsonWriteUtils.cpp

@@ -1,80 +1,75 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+#include <aws/core/utils/memory/stl/AWSArray.h>
 #include <smithy/client/schema/JsonWriteUtils.h>
 
-using namespace smithy::schema;
+namespace {
 
-const char JsonWriteUtils::HEX[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+static const Aws::Array<char, 16> HEX = {{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'}};
 
-const bool JsonWriteUtils::NEEDS_ESCAPE[128] = {
-    // 0x00-0x1F: control chars
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-    // 0x20-0x2F: space ! " # $ % & ' ( ) * + , - . /
-    0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    // 0x30-0x3F
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    // 0x40-0x4F
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    // 0x50-0x5F: P-Z [ \ ] ^ _
-    0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,
-    // 0x60-0x6F
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    // 0x70-0x7F
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-};
+void EscapeChar(Aws::String& buf, unsigned char c) {
+  switch (c) {
+    case '\"':
+      buf += "\\\"";
+      break;
+    case '\\':
+      buf += "\\\\";
+      break;
+    case '\b':
+      buf += "\\b";
+      break;
+    case '\f':
+      buf += "\\f";
+      break;
+    case '\n':
+      buf += "\\n";
+      break;
+    case '\r':
+      buf += "\\r";
+      break;
+    case '\t':
+      buf += "\\t";
+      break;
+    default:
+      buf += "\\u00";
+      buf += HEX[(c >> 4) & 0xF];
+      buf += HEX[c & 0xF];
+      break;
+  }
+}
+
+bool NeedsEscape(unsigned char c) { return c < 0x20 || c == '"' || c == '\\'; }
+
+}  // anonymous namespace
 
-const char JsonWriteUtils::ESCAPE_TABLE[128] = {
-    // 0x00-0x0F
-    0,0,0,0,0,0,0,0,'b','t','n',0,'f','r',0,0,
-    // 0x10-0x1F
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    // 0x20-0x2F
-    0,0,'"',0,0,0,0,0,0,0,0,0,0,0,0,0,
-    // 0x30-0x3F
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    // 0x40-0x4F
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    // 0x50-0x5F
-    0,0,0,0,0,0,0,0,0,0,0,0,'\\',0,0,0,
-    // 0x60-0x6F
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    // 0x70-0x7F
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-};
+namespace Aws {
+namespace Schema {
 
-void JsonWriteUtils::WriteQuotedString(Aws::String& buf, const Aws::String& value) {
-    buf += '"';
-    const char* data = value.data();
-    const size_t len = value.size();
+void WriteQuotedJsonString(Aws::String& buf, const Aws::String& value) {
+  buf += '"';
+  const char* data = value.data();
+  const size_t len = value.size();
 
-    size_t i = 0;
+  size_t i = 0;
+  while (i < len) {
+    size_t start = i;
     while (i < len) {
-        // Fast scan: find next char that needs escaping
-        size_t start = i;
-        while (i < len) {
-            unsigned char c = static_cast<unsigned char>(data[i]);
-            if (c < 0x80 && NEEDS_ESCAPE[c]) break;
-            i++;
-        }
-        // Bulk append safe run
-        if (i > start) {
-            buf.append(data + start, i - start);
-        }
-        // Escape one char
-        if (i < len) {
-            unsigned char c = static_cast<unsigned char>(data[i]);
-            if (ESCAPE_TABLE[c] != 0) {
-                buf += '\\';
-                buf += ESCAPE_TABLE[c];
-            } else {
-                buf += '\\';
-                buf += 'u';
-                buf += '0';
-                buf += '0';
-                buf += HEX[(c >> 4) & 0xF];
-                buf += HEX[c & 0xF];
-            }
-            i++;
-        }
+      unsigned char c = static_cast<unsigned char>(data[i]);
+      if (c < 0x80 && NeedsEscape(c)) break;
+      i++;
     }
-    buf += '"';
+    if (i > start) {
+      buf.append(data + start, i - start);
+    }
+    if (i < len) {
+      EscapeChar(buf, static_cast<unsigned char>(data[i]));
+      i++;
+    }
+  }
+  buf += '"';
 }
+
+}  // namespace Schema
+}  // namespace Aws