Merge pull request #17 from oatpp/add_oatpp_unsigned_types

Add oatpp unsigned types
oatpp · Jan 26, 2020 · 136f09a · 136f09a
2 parents 8e4a5d3 + 2385968
commit 136f09a
Show file tree

Hide file tree

Showing 16 changed files with 143 additions and 49 deletions.
diff --git a/res/favicon-16x16.png b/res/favicon-16x16.png
diff --git a/res/favicon-32x32.png b/res/favicon-32x32.png
diff --git a/res/index.html b/res/index.html
@@ -37,8 +37,7 @@
     <script src="./swagger-ui-standalone-preset.js"> </script>
     <script>
     window.onload = function() {
-
-      // Build a system
+      // Begin Swagger UI call region
       const ui = SwaggerUIBundle({
         url: "/api-docs/oas-3.0.0.json",
         dom_id: '#swagger-ui',
@@ -52,6 +51,7 @@
         ],
         layout: "StandaloneLayout"
       })
+      // End Swagger UI call region
 
       window.ui = ui
     }

diff --git a/res/oauth2-redirect.html b/res/oauth2-redirect.html
@@ -1,5 +1,6 @@
 <!doctype html>
 <html lang="en-US">
+<title>Swagger UI: OAuth2 Redirect</title>
 <body onload="run()">
 </body>
 </html>

diff --git a/res/swagger-ui-bundle.js b/res/swagger-ui-bundle.js
diff --git a/res/swagger-ui-bundle.js.map b/res/swagger-ui-bundle.js.map
diff --git a/res/swagger-ui-standalone-preset.js b/res/swagger-ui-standalone-preset.js
diff --git a/res/swagger-ui-standalone-preset.js.map b/res/swagger-ui-standalone-preset.js.map
diff --git a/res/swagger-ui.css b/res/swagger-ui.css
diff --git a/res/swagger-ui.css.map b/res/swagger-ui.css.map
diff --git a/res/swagger-ui.js b/res/swagger-ui.js
diff --git a/res/swagger-ui.js.map b/res/swagger-ui.js.map
diff --git a/src/oatpp-swagger/Types.cpp b/src/oatpp-swagger/Types.cpp
@@ -27,7 +27,7 @@
 namespace oatpp { namespace swagger {
 
 namespace __class {
-  const char* const Binary::CLASS_NAME = "string";
+const oatpp::data::mapping::type::ClassId Binary::CLASS_ID("string");
 }
 
 }}
diff --git a/src/oatpp-swagger/Types.hpp b/src/oatpp-swagger/Types.hpp
@@ -41,14 +41,14 @@ namespace __class {
     /**
      * CLASS_NAME = `"string"`.
      */
-    static const char* const CLASS_NAME;
+    static const oatpp::data::mapping::type::ClassId CLASS_ID;
 
     /**
      * Get type information.
      * @return - &id:oatpp::data::mapping::type::Type;.
      */
     static oatpp::data::mapping::type::Type* getType(){
-      static oatpp::data::mapping::type::Type type(CLASS_NAME, "binary");
+      static oatpp::data::mapping::type::Type type(CLASS_ID, "binary");
       return &type;
     }
 

diff --git a/src/oatpp-swagger/oas3/Generator.cpp b/src/oatpp-swagger/oas3/Generator.cpp
@@ -26,6 +26,8 @@
 
 #include "oatpp/core/utils/ConversionUtils.hpp"
 
+#include <limits>
+
 namespace oatpp { namespace swagger { namespace oas3 {
 
 Schema::ObjectWrapper Generator::generateSchemaForTypeObject(const oatpp::data::mapping::type::Type* type, bool linkSchema, UsedTypes& usedTypes) {
@@ -79,16 +81,51 @@ Schema::ObjectWrapper Generator::generateSchemaForType(const oatpp::data::mappin
     auto result = Schema::createShared();
     result->type = "string";
     return result;
+  } else if(classId == oatpp::data::mapping::type::__class::Int8::CLASS_ID.id){
+    auto result = Schema::createShared();
+    result->type = "integer";
+    result->minimum = std::numeric_limits<v_int8>::min();
+    result->maximum = std::numeric_limits<v_int8>::max();
+    return result;
+  } else if(classId == oatpp::data::mapping::type::__class::UInt8::CLASS_ID.id){
+    auto result = Schema::createShared();
+    result->type = "integer";
+    result->minimum = std::numeric_limits<v_uint8>::min();
+    result->maximum = std::numeric_limits<v_uint8>::max();
+    return result;
+  } else if(classId == oatpp::data::mapping::type::__class::Int16::CLASS_ID.id){
+    auto result = Schema::createShared();
+    result->type = "integer";
+    result->minimum = std::numeric_limits<v_int16>::min();
+    result->maximum = std::numeric_limits<v_int16>::max();
+    return result;
+  } else if(classId == oatpp::data::mapping::type::__class::UInt16::CLASS_ID.id){
+    auto result = Schema::createShared();
+    result->type = "integer";
+    result->minimum = std::numeric_limits<v_uint16>::min();
+    result->maximum = std::numeric_limits<v_uint16>::max();
+    return result;
   } else if(classId == oatpp::data::mapping::type::__class::Int32::CLASS_ID.id){
     auto result = Schema::createShared();
     result->type = "integer";
-    result->format = "int32";
+    result->minimum = std::numeric_limits<v_int32>::min();
+    result->maximum = std::numeric_limits<v_int32>::max();
+    return result;
+  } else if(classId == oatpp::data::mapping::type::__class::UInt32::CLASS_ID.id){
+    auto result = Schema::createShared();
+    result->type = "integer";
+    result->minimum = std::numeric_limits<v_uint32>::min();
+    result->maximum = std::numeric_limits<v_uint32>::max();
     return result;
   } else if(classId == oatpp::data::mapping::type::__class::Int64::CLASS_ID.id){
     auto result = Schema::createShared();
     result->type = "integer";
     result->format = "int64";
     return result;
+  } else if(classId == oatpp::data::mapping::type::__class::UInt64::CLASS_ID.id){
+    auto result = Schema::createShared();
+    result->type = "integer";
+    return result;
   } else if(classId == oatpp::data::mapping::type::__class::Float32::CLASS_ID.id){
     auto result = Schema::createShared();
     result->type = "number";
@@ -250,6 +287,13 @@ void Generator::generatePathItemData(const std::shared_ptr<Endpoint>& endpoint,
     operation->operationId = info->name;
     operation->summary = info->summary;
     operation->description = info->description;
+
+    if(info->tags.size() > 0) {
+      operation->tags = operation->tags->createShared();
+      for(auto& tag : info->tags) {
+        operation->tags->pushBack(tag);
+      }
+    }
 
     if(oatpp::base::StrBuffer::equalsCI("get", info->method->c_str(), info->method->getSize())) {
       pathItem->operationGet = operation;

diff --git a/src/oatpp-swagger/oas3/Model.hpp b/src/oatpp-swagger/oas3/Model.hpp
@@ -290,6 +290,16 @@ class Schema : public oatpp::data::mapping::type::Object {
    */
   DTO_FIELD(String, format);
 
+  /**
+   * Minimum value.
+   */
+  DTO_FIELD(Int64, minimum);
+
+  /**
+   * Maximum value.
+   */
+  DTO_FIELD(Int64, maximum);
+
   /**
    * Map of &id:oatpp::String; to &l:Schema;.
    */