Merge pull request #17 from awslabs/FB-Integers

Fb integers

Author: JonathanHenson

aws-cpp-sdk-core-tests/utils/StringUtilsTest.cpp

@@ -193,9 +193,10 @@ TEST(StringUtilsTest, TestInt64Conversion)
 
 TEST(StringUtilsTest, TestInt32Conversion)
 {
-    long long intValue = LONG_MAX - 1;
+    long long intValue = INT_MAX - 1;
     std::stringstream ss;
     ss << intValue;
+
     ASSERT_EQ(0, StringUtils::ConvertToInt32(NULL));
     ASSERT_EQ(0, StringUtils::ConvertToInt32(""));
     ASSERT_EQ(intValue, StringUtils::ConvertToInt32(ss.str().c_str()));

aws-cpp-sdk-core/source/external/json-cpp/jsoncpp.cpp

@@ -1568,7 +1568,7 @@ const LargestInt Value::maxLargestInt = LargestInt(LargestUInt(-1) / 2);
 const LargestUInt Value::maxLargestUInt = LargestUInt(-1);
 
 /// Unknown size marker
-static const unsigned int unknown = (unsigned)-1;
+static const size_t unknown = (size_t)-1;
 
 #if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
 template <typename T, typename U>
@@ -1598,14 +1598,14 @@ static inline bool InRange(double d, T min, U max) {
  * @return Pointer on the duplicate instance of string.
  */
 static inline char* duplicateStringValue(const char* value,
-                                         unsigned int length = unknown) {
+                                         size_t length = unknown) {
   if (length == unknown)
-    length = (unsigned int)strlen(value);
+    length = strlen(value);
 
   // Avoid an integer overflow in the call to malloc below by limiting length
   // to a sane value.
-  if (length >= (unsigned)Value::maxInt)
-    length = Value::maxInt - 1;
+  if (length >= (size_t)Value::maxInt)
+    length = (size_t)Value::maxInt - 1;
 
   char* newString = static_cast<char*>(Aws::Malloc(JSON_CPP_ALLOCATION_TAG, length + 1));
   JSON_ASSERT_MESSAGE(newString != 0,
@@ -1815,13 +1815,13 @@ Value::Value(const char* value) {
 Value::Value(const char* beginValue, const char* endValue) {
   initBasic(stringValue, true);
   value_.string_ =
-      duplicateStringValue(beginValue, (unsigned int)(endValue - beginValue));
+      duplicateStringValue(beginValue, (size_t)(endValue - beginValue));
 }
 
 Value::Value(const Aws::String& value) {
   initBasic(stringValue, true);
   value_.string_ =
-      duplicateStringValue(value.c_str(), (unsigned int)value.length());
+      duplicateStringValue(value.c_str(), value.length());
 }
 
 Value::Value(const StaticString& value) {

aws-cpp-sdk-core/source/utils/StringUtils.cpp

@@ -169,7 +169,7 @@ Aws::String StringUtils::URLDecode(const char* safe)
             hex[1] = *(i + 2);
             hex[2] = 0;
             i += 2;
-            int hexAsInteger = strtol(hex, nullptr, 16);
+            auto hexAsInteger = strtol(hex, nullptr, 16);
             unescaped << (char)hexAsInteger;
         }
         else

code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/cpp/CppViewHelper.java

@@ -36,7 +36,7 @@ public class CppViewHelper {
 
     static {
         CORAL_TO_CPP_TYPE_MAPPING.put("long", "long long");
-        CORAL_TO_CPP_TYPE_MAPPING.put("integer", "long");
+        CORAL_TO_CPP_TYPE_MAPPING.put("integer", "int");
         CORAL_TO_CPP_TYPE_MAPPING.put("string", "Aws::String");
         CORAL_TO_CPP_TYPE_MAPPING.put("timestamp", "Aws::Utils::DateTime");
         CORAL_TO_CPP_TYPE_MAPPING.put("boolean", "bool");

code-generation/generator/src/test/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/cpp/CppViewHelperTest.java

@@ -110,7 +110,7 @@ public void testComputeCppType() {
         shape.setType("long");
         assertEquals("long long", CppViewHelper.computeCppType(shape));
         shape.setType("integer");
-        assertEquals("long", CppViewHelper.computeCppType(shape));
+        assertEquals("int", CppViewHelper.computeCppType(shape));
         shape.setType("double");
         assertEquals("double", CppViewHelper.computeCppType(shape));
         shape.setType("float");