Added changes in RamlParser and JsonSchemaParser to read property range for double...

Change-Id: I8ee12b1a36d403a0b7df5589b2a82c9f9cbb520c
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3919
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>

diff --git a/service/simulator/ramlparser/example/raml_parser.cpp b/service/simulator/ramlparser/example/raml_parser.cpp
index 068e643..f8525ff 100755 (executable)
--- a/service/simulator/ramlparser/example/raml_parser.cpp
+++ b/service/simulator/ramlparser/example/raml_parser.cpp
@@ -33,19 +33,21 @@
 //#define PRINT_RESOURCE_URI_BASEURI\r
 //#define PRINT_ACTION_QUERY_PARAM\r
 //#define PRINT_RESPONSE_HEADER\r
-//#define PRINT_REQUEST_RESPONSE_BODY_PARAMS\r
+#define PRINT_REQUEST_RESPONSE_BODY_PARAMS\r
 //#define PRINT_ACTION_HEADERS\r
 //#define PRINT_SCHEMAS\r
 #define PRINT_RAML\r
 #define PRINT_JSON\r
-//#define PRINT_JSON_PROPERTIES\r
+//#define PRINT_JSON_DEFINITION\r
+#define PRINT_JSON_PROPERTIES\r
 \r
 using namespace RAML;\r
 \r
-void printParameters(AbstractParam abstractParam)\r
-{\r
+void printProperties(const PropertiesPtr &prop);\r
 \r
 #ifdef PRINT_PARAMS\r
+void printParameters(AbstractParam abstractParam)\r
+{\r
     std::cout << "Description : "  << abstractParam.getDescription()  << std::endl;\r
     std::cout << "DefaultValue : "  << abstractParam.getDefaultValue()  << std::endl;\r
     std::cout << "Example : " << abstractParam.getExample()  << std::endl;\r
@@ -62,93 +64,35 @@ void printParameters(AbstractParam abstractParam)
     for (auto elem : abstractParam.getEnumeration())\r
         std::cout << elem   << "       ";\r
     std::cout << std::endl;\r
-#endif\r
 }\r
+#endif\r
 \r
 void printRequestResponseBody(const RequestResponseBodyPtr &body)\r
 {\r
     std::cout << "Body : Type : " << body->getType() << std::endl;\r
     if ( body->getSchema() == NULL ) return;\r
+#ifdef PRINT_SCHEMAS\r
     std::cout << "Body : Schema : " << body->getSchema()->getSchema() << std::endl;\r
+#endif\r
     std::cout << "Body : Schema : PROPERTIES :" << std::endl;\r
 \r
     for ( auto pro : body->getSchema()->getProperties()->getProperties() )\r
     {\r
-        std::cout << "-----------------------------" << std::endl;\r
-        std::cout << "Name : " << pro.second->getName() << std::endl;\r
-        std::cout << "-----------------------------" << std::endl;\r
-        try\r
-        {\r
-            switch (pro.second->getVariantType())\r
-            {\r
-                case VariantType::INT : // Integer\r
-                    std::cout << "Defaut: " << pro.second->getValueInt() << std::endl;\r
-                    for (auto tt : pro.second->getAllowedValuesInt())\r
-                    {\r
-                        std::cout << "enum value : " << tt << std::endl;\r
-                    }\r
-                    {\r
-                        int min = 0, max = 0, mul = 0;\r
-                        pro.second->getRange(min, max, mul);\r
-                        std::cout << "Minimum: " << min << std::endl;\r
-                        std::cout << "Maximum: " << max << std::endl;\r
-                    }\r
-                    break;\r
-\r
-                case VariantType::DOUBLE : // Double\r
-                    std::cout << "Defaut: " << pro.second->getValueDouble() << std::endl;\r
-                    for (auto tt : pro.second->getAllowedValuesDouble())\r
-                    {\r
-                        std::cout << "enum value : " << tt << std::endl;\r
-                    }\r
-                    {\r
-                        double min = 0, max = 0;\r
-                        int mul = 0;\r
-                        pro.second->getRangeDouble(min, max, mul);\r
-                        std::cout << "MinimumDouble: " << min << std::endl;\r
-                        std::cout << "MaximumDouble: " << max << std::endl;\r
-                    }\r
-                    break;\r
-\r
-                case VariantType::BOOL : // Boolean\r
-                    std::cout << "Defaut: " << std::boolalpha << pro.second->getValueBool() << std::noboolalpha <<\r
-                              std::endl;\r
-                    for (auto tt : pro.second->getAllowedValuesBool())\r
-                    {\r
-                        std::cout << "enum value : " << tt << std::endl;\r
-                    }\r
-                    break;\r
-\r
-                case VariantType::STRING : // String\r
-                    std::cout << "Defaut: " << pro.second->getValueString() << std::endl;\r
-                    for (auto tt : pro.second->getAllowedValuesString())\r
-                    {\r
-                        std::cout << "enum value : " << tt << std::endl;\r
-                    }\r
-                    {\r
-                        int min = 0, max = 0, mul = 0;\r
-                        pro.second->getRange(min, max, mul);\r
-                        std::cout << "MinimumLength: " << min << std::endl;\r
-                        std::cout << "MaximumLength: " << max << std::endl;\r
-                    }\r
-                    break;\r
-                default:\r
-                    break;\r
+        printProperties(pro.second);\r
+    }\r
 \r
-            }\r
-        }\r
-        catch (const boost::bad_lexical_cast &e)\r
-        {\r
-            std::cout << e.what() << std::endl;\r
-        }\r
-        catch ( ... )\r
+    std::cout << "Body : Schema : ITEMS :" << std::endl;\r
+    for (auto it : body->getSchema()->getProperties()->getItems())\r
+    {\r
+        for (auto  tt : it->getProperties())\r
         {\r
-            std::cout << "Unknown exception caught!" << std::endl;\r
+            printProperties(tt.second);\r
         }\r
-\r
     }\r
+#ifdef PRINT_SCHEMAS\r
     std::cout << "-----------------------------" << std::endl;\r
     std::cout << "Body : example : " << body->getExample() << std::endl;\r
+#endif\r
 \r
 #ifdef PRINT_REQUEST_RESPONSE_BODY_PARAMS\r
     std::cout << "Body : FormParameters        "  << std::endl;\r
@@ -158,7 +102,9 @@ void printRequestResponseBody(const RequestResponseBodyPtr &body)
         std::cout << tw.first << " : "  << std::endl;\r
         std::cout << "-----------------------------" << std::endl;\r
         FormParameter formParameter = *tw.second;\r
+#ifdef PRINT_PARAMS\r
         printParameters((AbstractParam)formParameter);\r
+#endif\r
     }\r
 #endif\r
 }\r
@@ -180,7 +126,9 @@ void printResponse(const ResponsePtr &response)
         std::cout << "-----------------------------" << std::endl;\r
 \r
         Header header = *tw.second;\r
+#ifdef PRINT_PARAMS\r
         printParameters((AbstractParam)header);\r
+#endif\r
     }\r
 #endif\r
 }\r
@@ -206,7 +154,9 @@ void printAction(const ActionPtr &action)
         std::cout << tw.first << " : "  << std::endl;\r
         std::cout << "-----------------------------" << std::endl;\r
         QueryParameter queryParam = *tw.second;\r
+#ifdef PRINT_PARAMS\r
         printParameters((AbstractParam)queryParam);\r
+#endif\r
     }\r
 #endif\r
 #ifdef PRINT_ACTION_HEADERS\r
@@ -217,7 +167,9 @@ void printAction(const ActionPtr &action)
         std::cout << tw.first << " : "  << std::endl;\r
         std::cout << "-----------------------------" << std::endl;\r
         Header header = *tw.second;\r
+#ifdef PRINT_PARAMS\r
         printParameters((AbstractParam)header);\r
+#endif\r
     }\r
 #endif\r
 \r
@@ -247,7 +199,9 @@ void printResource(const RamlResourcePtr &resource)
         std::cout << tt.first << " : "  << std::endl;\r
         std::cout << "-----------------------------" << std::endl;\r
         UriParameter uriParameter = *tt.second;\r
+#ifdef PRINT_PARAMS\r
         printParameters((AbstractParam)uriParameter);\r
+#endif\r
     }\r
     std::cout << "#############################################" << std::endl;\r
     std::cout << "BaseUriParameters    "    << std::endl;\r
@@ -258,7 +212,9 @@ void printResource(const RamlResourcePtr &resource)
         std::cout << "-----------------------------" << std::endl;\r
 \r
         UriParameter uriParameter = *tt.second;\r
+#ifdef PRINT_PARAMS\r
         printParameters((AbstractParam)uriParameter);\r
+#endif\r
     }\r
 #endif\r
     std::cout << "Actions  " << std::endl;\r
@@ -310,7 +266,8 @@ void printProperties(const PropertiesPtr &prop)
                     std::cout << "enum value : " << tt << std::endl;\r
                 }\r
                 {\r
-                    int min = 0, max = 0, mul = 0;\r
+                    double min = 0, max = 0;\r
+                    int mul = 0;\r
                     prop->getRange(min, max, mul);\r
                     std::cout << "Minimum: " << min << std::endl;\r
                     std::cout << "Maximum: " << max << std::endl;\r
@@ -326,7 +283,7 @@ void printProperties(const PropertiesPtr &prop)
                 {\r
                     double min = 0, max = 0;\r
                     int mul = 0;\r
-                    prop->getRangeDouble(min, max, mul);\r
+                    prop->getRange(min, max, mul);\r
                     std::cout << "MinimumDouble: " << min << std::endl;\r
                     std::cout << "MaximumDouble: " << max << std::endl;\r
                 }\r
@@ -347,7 +304,8 @@ void printProperties(const PropertiesPtr &prop)
                     std::cout << "enum value : " << tt << std::endl;\r
                 }\r
                 {\r
-                    int min = 0, max = 0, mul = 0;\r
+                    double min = 0, max = 0;\r
+                    int mul = 0;\r
                     prop->getRange(min, max, mul);\r
                     std::cout << "MinimumLength: " << min << std::endl;\r
                     std::cout << "MaximumLength: " << max << std::endl;\r
@@ -403,7 +361,7 @@ void printJsonSchema(JsonSchemaPtr js)
     std::cout << "Type: " << js->getType() << std::endl;\r
     std::cout << "Description: " << js->getDescription() << std::endl;\r
     std::cout << "AdditionalProperties: " << js->getAdditionalProperties() << std::endl;\r
-\r
+#ifdef PRINT_JSON_DEFINITION\r
     std::cout << "-------------------------------" << std::endl;\r
     std::cout << "Definitions." << std::endl;\r
     for (auto  tt : js->getDefinitions())\r
@@ -415,7 +373,7 @@ void printJsonSchema(JsonSchemaPtr js)
             printProperties(it.second);\r
         }\r
     }\r
-\r
+#endif\r
     std::cout << "##############################" << std::endl;\r
     std::cout << "Properties." << std::endl;\r
     for (auto  it : js->getProperties())\r
@@ -430,6 +388,23 @@ void printJsonSchema(JsonSchemaPtr js)
         std::cout << it << std::endl;\r
     }\r
     std::cout << "-------------------------------" << std::endl;\r
+    std::cout << "Items." << std::endl;\r
+    std::cout << "-------------------------------" << std::endl;\r
+    for (auto it : js->getItems())\r
+    {\r
+        for (auto  tt : it->getProperties())\r
+        {\r
+            printProperties(tt.second);\r
+        }\r
+        std::cout << "-------------------------------" << std::endl;\r
+        std::cout << "Required." << std::endl;\r
+        std::cout << "-------------------------------" << std::endl;\r
+        for (auto tt : it->getRequiredValues())\r
+        {\r
+            std::cout << tt << std::endl;\r
+        }\r
+    }\r
+    std::cout << "-------------------------------" << std::endl;\r
 }\r
 \r
 int main(int argc, char *argv[])\r
@@ -472,7 +447,9 @@ int main(int argc, char *argv[])
             std::cout << it.first << " : "  << std::endl;\r
             std::cout << "-----------------------------" << std::endl;\r
             UriParameter uriParameter = *it.second;\r
+#ifdef PRINT_PARAMS\r
             printParameters((AbstractParam)uriParameter);\r
+#endif\r
         }\r
 #endif\r
 #ifdef PRINT_SCHEMAS\r

diff --git a/service/simulator/ramlparser/raml/IncludeResolver.h b/service/simulator/ramlparser/raml/IncludeResolver.h
index 2bd5ab2..80345b7 100755 (executable)
--- a/service/simulator/ramlparser/raml/IncludeResolver.h
+++ b/service/simulator/ramlparser/raml/IncludeResolver.h
@@ -29,7 +29,7 @@
 \r
 #include "yaml-cpp/yaml.h"\r
 #include "cJSON.h"\r
-#include "Utils.h"\r
+#include "RamlUtils.h"\r
 #include <fstream>\r
 #include "yaml-cpp/exceptions.h"\r
 #include "RamlExceptions.h"\r

diff --git a/service/simulator/ramlparser/raml/RamlParser.cpp b/service/simulator/ramlparser/raml/RamlParser.cpp
index 38ed45d..07a57c9 100755 (executable)
--- a/service/simulator/ramlparser/raml/RamlParser.cpp
+++ b/service/simulator/ramlparser/raml/RamlParser.cpp
@@ -45,17 +45,17 @@ namespace RAML
         {\r
             return;\r
         }\r
-        for (auto const & it : resource)\r
+        for (auto const &it : resource)\r
         {\r
             std::string type = getRamlPtr()->getMediaType();\r
 \r
-            for (auto const & action :  it.second->getActions())\r
+            for (auto const &action :  it.second->getActions())\r
             {\r
                 if (action.second->getRequestBody().empty())\r
                 {\r
                     action.second->setRequestBody(type);\r
                 }\r
-                for (auto const & response : action.second->getResponses())\r
+                for (auto const &response : action.second->getResponses())\r
                 {\r
                     if (response.second->getResponseBody().empty())\r
                     {\r
@@ -72,11 +72,11 @@ namespace RAML
         {\r
             return;\r
         }\r
-        for (auto const & it : resource)\r
+        for (auto const &it : resource)\r
         {\r
-            for (auto const & action :  it.second->getActions())\r
+            for (auto const &action :  it.second->getActions())\r
             {\r
-                for (auto const & body :  action.second->getRequestBody())\r
+                for (auto const &body :  action.second->getRequestBody())\r
                 {\r
                     SchemaPtr schema = body.second->getSchema();\r
 \r
@@ -94,9 +94,9 @@ namespace RAML
                         }\r
                     }\r
                 }\r
-                for (auto const & response : action.second->getResponses())\r
+                for (auto const &response : action.second->getResponses())\r
                 {\r
-                    for (auto const & body :  response.second->getResponseBody())\r
+                    for (auto const &body :  response.second->getResponseBody())\r
                     {\r
                         SchemaPtr schema = body.second->getSchema();\r
                         if (schema != NULL)\r
@@ -127,7 +127,7 @@ namespace RAML
         {\r
             return;\r
         }\r
-        for (auto const & it : resource)\r
+        for (auto const &it : resource)\r
         {\r
             auto const &resourceTypes = getRamlPtr()->getResourceTypes();\r
             std::string typeValue = it.second->getResourceType();\r
@@ -158,12 +158,12 @@ namespace RAML
         {\r
             return;\r
         }\r
-        for (auto const & it : resource)\r
+        for (auto const &it : resource)\r
         {\r
             auto const &trait = getRamlPtr()->getTraits();\r
-            for (auto const & act : it.second->getActions())\r
+            for (auto const &act : it.second->getActions())\r
             {\r
-                for (const std::string & traitValue :  act.second->getTraits())\r
+                for (const std::string &traitValue :  act.second->getTraits())\r
                 {\r
                     auto iter = trait.begin();\r
                     for (; iter != trait.end(); iter++)\r
@@ -191,7 +191,7 @@ namespace RAML
                     }\r
                 }\r
             }\r
-            for (const std::string & traitValue :  it.second->getTraits())\r
+            for (const std::string &traitValue :  it.second->getTraits())\r
             {\r
                 auto iter = trait.begin();\r
                 for (; iter != trait.end(); iter++)\r

diff --git a/service/simulator/ramlparser/raml/RamlParser.h b/service/simulator/ramlparser/raml/RamlParser.h
index 3949234..2cf1446 100755 (executable)
--- a/service/simulator/ramlparser/raml/RamlParser.h
+++ b/service/simulator/ramlparser/raml/RamlParser.h
@@ -29,7 +29,7 @@
 \r
 #include "yaml-cpp/yaml.h"\r
 #include "Raml.h"\r
-#include "Utils.h"\r
+#include "RamlUtils.h"\r
 #include "RequestResponseBody.h"\r
 #include "RamlResource.h"\r
 #include "Action.h"\r

diff --git a/service/simulator/ramlparser/raml/Utils.h b/service/simulator/ramlparser/raml/RamlUtils.h
similarity index 96%
rename from service/simulator/ramlparser/raml/Utils.h
rename to service/simulator/ramlparser/raml/RamlUtils.h
index 0895f36..c019632 100755 (executable)
--- a/service/simulator/ramlparser/raml/Utils.h
+++ b/service/simulator/ramlparser/raml/RamlUtils.h
@@ -24,8 +24,8 @@
  * @brief   This file provides utilities for RamlParser.\r
  */\r
 \r
-#ifndef UTILS_H\r
-#define UTILS_H\r
+#ifndef RAML_UTILS_H\r
+#define RAML_UTILS_H\r
 \r
 #include "yaml-cpp/yaml.h"\r
 #include "ActionType.h"\r

diff --git a/service/simulator/ramlparser/raml/jsonSchemaParser/Definitions.h b/service/simulator/ramlparser/raml/jsonSchemaParser/Definitions.h
index 401e448..d2eec8f 100755 (executable)
--- a/service/simulator/ramlparser/raml/jsonSchemaParser/Definitions.h
+++ b/service/simulator/ramlparser/raml/jsonSchemaParser/Definitions.h
@@ -118,7 +118,7 @@ namespace RAML
                     if (*it == reqValue)\r
                         break;\r
                 }\r
-                if (m_required.end() != it)\r
+                if (m_required.end() == it)\r
                 {\r
                     m_required.push_back(reqValue);\r
                 }\r

diff --git a/service/simulator/ramlparser/raml/jsonSchemaParser/Items.h b/service/simulator/ramlparser/raml/jsonSchemaParser/Items.h
index b0a0e50..d2463b2 100755 (executable)
--- a/service/simulator/ramlparser/raml/jsonSchemaParser/Items.h
+++ b/service/simulator/ramlparser/raml/jsonSchemaParser/Items.h
@@ -124,7 +124,7 @@ namespace RAML
                     if (*it == reqValue)\r
                         break;\r
                 }\r
-                if (m_required.end() != it)\r
+                if (m_required.end() == it)\r
                 {\r
                     m_required.push_back(reqValue);\r
                 }\r

diff --git a/service/simulator/ramlparser/raml/jsonSchemaParser/JsonSchema.cpp b/service/simulator/ramlparser/raml/jsonSchemaParser/JsonSchema.cpp
index 67968e2..0a0c11a 100755 (executable)
--- a/service/simulator/ramlparser/raml/jsonSchemaParser/JsonSchema.cpp
+++ b/service/simulator/ramlparser/raml/jsonSchemaParser/JsonSchema.cpp
@@ -460,12 +460,12 @@ namespace RAML
             if (exclusiveMax)\r
             {\r
                 if (exclusiveMax->type == cJSON_True)\r
-                    property->setMaxDouble( --(Max->valuedouble));\r
+                    property->setMax( --(Max->valuedouble));\r
                 else\r
-                    property->setMaxDouble(Max->valuedouble);\r
+                    property->setMax(Max->valuedouble);\r
             }\r
             else\r
-                property->setMaxDouble(Max->valuedouble);\r
+                property->setMax(Max->valuedouble);\r
         }\r
         cJSON *Min = cJSON_GetObjectItem(childProperties, "minimum");\r
         if (Min)\r
@@ -474,12 +474,12 @@ namespace RAML
             if (exclusiveMin)\r
             {\r
                 if (exclusiveMin->type == cJSON_True)\r
-                    property->setMinDouble( ++(Min->valuedouble));\r
+                    property->setMin( ++(Min->valuedouble));\r
                 else\r
-                    property->setMinDouble(Min->valuedouble);\r
+                    property->setMin(Min->valuedouble);\r
             }\r
             else\r
-                property->setMinDouble(Min->valuedouble);\r
+                property->setMin(Min->valuedouble);\r
         }\r
         cJSON *multipleOf = cJSON_GetObjectItem(childProperties, "multipleOf");\r
         if (multipleOf)\r

diff --git a/service/simulator/ramlparser/raml/jsonSchemaParser/Properties.h b/service/simulator/ramlparser/raml/jsonSchemaParser/Properties.h
index 7291635..a7adee2 100755 (executable)
--- a/service/simulator/ramlparser/raml/jsonSchemaParser/Properties.h
+++ b/service/simulator/ramlparser/raml/jsonSchemaParser/Properties.h
@@ -50,7 +50,7 @@ namespace RAML
             /**\r
                   * Constructor of Properties.\r
                   */\r
-            Properties(): m_min(INT_MAX), m_max(INT_MAX), m_doubleMin(INT_MAX), m_doubleMax(INT_MAX),\r
+            Properties(): m_min(INT_MAX), m_max(INT_MAX),\r
                 m_multipleOf(INT_MAX), m_unique(false), m_additionalItems(false) {}\r
 \r
             /**\r
@@ -59,7 +59,7 @@ namespace RAML
                   * @param name - Properties name as string.\r
                   */\r
             Properties(const std::string &name) : m_name(name), m_min(INT_MAX), m_max(INT_MAX),\r
-                m_doubleMin(INT_MAX), m_doubleMax(INT_MAX), m_multipleOf(INT_MAX),\r
+                m_multipleOf(INT_MAX),\r
                 m_unique(false), m_additionalItems(false) {}\r
 \r
             /**\r
@@ -188,7 +188,7 @@ namespace RAML
                  * @param max -  reference to hold Maximum value of Properties.\r
                  * @param multipleOf -  reference to hold multipleOf value of Properties.\r
                  */\r
-            inline void getRange(int &min, int &max, int &multipleOf) const\r
+            inline void getRange(double &min, double &max, int &multipleOf) const\r
             {\r
                 min = m_min;\r
                 max = m_max;\r
@@ -196,24 +196,11 @@ namespace RAML
             }\r
 \r
             /**\r
-                 * This method is for getting Range from Properties.\r
-                 *\r
-                 * @param min - reference to hold Minimum value of Properties.\r
-                 * @param max -  reference to hold Maximum value of Properties.\r
-                 * @param multipleOf -  reference to hold multipleOf value of Properties.\r
-                 */\r
-            inline void getRangeDouble(double &min, double &max, int &multipleOf) const\r
-            {\r
-                min = m_doubleMin;\r
-                max = m_doubleMax;\r
-                multipleOf = m_multipleOf;\r
-            }\r
-            /**\r
-                 * This method is for setting Minimum to Properties\r
+                 * This method is for setting Minimum to Properties.\r
                  *\r
                  * @param min - Minimum value of Properties.\r
                  */\r
-            inline void setMin(const int &min)\r
+            inline void setMin(const double &min)\r
             {\r
                 m_min = min;\r
             }\r
@@ -223,30 +210,10 @@ namespace RAML
                  *\r
                  * @param max - Maximum value of Properties.\r
                  */\r
-            inline void setMax(const int &max)\r
+            inline void setMax(const double &max)\r
             {\r
                 m_max = max;\r
             }\r
-\r
-            /**\r
-                 * This method is for setting Minimum to Properties\r
-                 *\r
-                 * @param min - Minimum value of Properties.\r
-                 */\r
-            inline void setMinDouble(const double &min)\r
-            {\r
-                m_doubleMin = min;\r
-            }\r
-\r
-            /**\r
-                 * This method is for setting Maximum to Properties\r
-                 *\r
-                 * @param max - Maximum value of Properties.\r
-                 */\r
-            inline void setMaxDouble(const double &max)\r
-            {\r
-                m_doubleMax = max;\r
-            }\r
             /**\r
                  * This method is for setting multipleOf to Properties\r
                  *\r
@@ -480,10 +447,8 @@ namespace RAML
         private:\r
             std::string m_name;\r
             ValueVariant m_value;\r
-            int m_min;\r
-            int m_max;\r
-            double m_doubleMin;\r
-            double m_doubleMax;\r
+            double m_min;\r
+            double m_max;\r
             int m_multipleOf;\r
             AllowedValues m_allowedValues;\r
             std::string m_type;\r

diff --git a/service/simulator/ramlparser/raml/model/AbstractParam.h b/service/simulator/ramlparser/raml/model/AbstractParam.h
index dd33564..dafba13 100755 (executable)
--- a/service/simulator/ramlparser/raml/model/AbstractParam.h
+++ b/service/simulator/ramlparser/raml/model/AbstractParam.h
@@ -31,7 +31,7 @@
 #include <map>\r
 #include <list>\r
 #include <string>\r
-#include "Utils.h"\r
+#include "RamlUtils.h"\r
 \r
 \r
 namespace RAML\r

diff --git a/service/simulator/ramlparser/raml/model/Action.h b/service/simulator/ramlparser/raml/model/Action.h
index 6ee2abb..ff829c5 100755 (executable)
--- a/service/simulator/ramlparser/raml/model/Action.h
+++ b/service/simulator/ramlparser/raml/model/Action.h
@@ -36,7 +36,7 @@
 #include "RequestResponseBody.h"\r
 #include "UriParameter.h"\r
 #include "Response.h"\r
-#include "Utils.h"\r
+#include "RamlUtils.h"\r
 #include "IncludeResolver.h"\r
 \r
 namespace RAML\r

diff --git a/service/simulator/ramlparser/raml/model/Raml.h b/service/simulator/ramlparser/raml/model/Raml.h
index f90fdea..855d8f4 100755 (executable)
--- a/service/simulator/ramlparser/raml/model/Raml.h
+++ b/service/simulator/ramlparser/raml/model/Raml.h
@@ -48,7 +48,7 @@
 #include "yaml-cpp/yaml.h"\r
 #include "yaml-cpp/exceptions.h"\r
 #include "RamlExceptions.h"\r
-#include "Utils.h"\r
+#include "RamlUtils.h"\r
 #include "cJSON.h"\r
 \r
 \r

diff --git a/service/simulator/ramlparser/raml/model/RamlResource.h b/service/simulator/ramlparser/raml/model/RamlResource.h
index cac949d..1b4d748 100755 (executable)
--- a/service/simulator/ramlparser/raml/model/RamlResource.h
+++ b/service/simulator/ramlparser/raml/model/RamlResource.h
@@ -33,7 +33,7 @@
 #include "UriParameter.h"\r
 #include "ActionType.h"\r
 #include "Action.h"\r
-#include "Utils.h"\r
+#include "RamlUtils.h"\r
 #include "IncludeResolver.h"\r
 \r
 namespace RAML\r

diff --git a/service/simulator/ramlparser/raml/model/RequestResponseBody.h b/service/simulator/ramlparser/raml/model/RequestResponseBody.h
index 78aaee9..929f915 100755 (executable)
--- a/service/simulator/ramlparser/raml/model/RequestResponseBody.h
+++ b/service/simulator/ramlparser/raml/model/RequestResponseBody.h
@@ -30,7 +30,7 @@
 #include <map>\r
 #include <list>\r
 #include "FormParameter.h"\r
-#include "Utils.h"\r
+#include "RamlUtils.h"\r
 #include "IncludeResolver.h"\r
 #include "Schema.h"\r
 \r

diff --git a/service/simulator/ramlparser/raml/model/Response.h b/service/simulator/ramlparser/raml/model/Response.h
index 5d3ed62..be41192 100755 (executable)
--- a/service/simulator/ramlparser/raml/model/Response.h
+++ b/service/simulator/ramlparser/raml/model/Response.h
@@ -32,7 +32,7 @@
 #include <string>\r
 #include "RequestResponseBody.h"\r
 #include "Header.h"\r
-#include "Utils.h"\r
+#include "RamlUtils.h"\r
 #include "IncludeResolver.h"\r
 \r
 namespace RAML\r

diff --git a/service/simulator/src/common/request_model_builder.cpp b/service/simulator/src/common/request_model_builder.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 9a20021..54006c3
--- a/service/simulator/src/common/request_model_builder.cpp
+++ b/service/simulator/src/common/request_model_builder.cpp
@@ -142,7 +142,8 @@ SimulatorResourceModelSP RequestModelBuilder::createRepSchema(const RAML::Reques
                     repSchema->addAttribute(propertyEntry.second->getName(), propertyEntry.second->getValue<int>());
 
                     // Set the range
-                    int min, max, multipleof;
+                    double min, max;
+                    int multipleof;
                     propertyEntry.second->getRange(min, max, multipleof);
                     repSchema->setRange(propertyEntry.second->getName(), min, max);
                 }

diff --git a/service/simulator/src/service-provider/simulator_resource_creator.cpp b/service/simulator/src/service-provider/simulator_resource_creator.cpp
index 18bd97a..c6ff567 100755 (executable)
--- a/service/simulator/src/service-provider/simulator_resource_creator.cpp
+++ b/service/simulator/src/service-provider/simulator_resource_creator.cpp
@@ -119,7 +119,8 @@ SimulatorResourceServerImplSP SimulatorResourceCreator::createResource(
                 }
 
                 // Set range/supported values set
-                int min = 0, max = 0, multipleof = 0;
+                double min = 0, max = 0;
+                int multipleof = 0;
                 propertyElement.second->getRange(min, max, multipleof);
                 attribute.setRange(min, max);