Improved WsjcppJsonRpc20ParamDef (more validators)

Author: sea5kg

src.wsjcpp/CMakeLists.txt

@@ -1,7 +1,7 @@
 # Automaticly generated by wsjcpp@v0.1.5
 cmake_minimum_required(VERSION 3.0)
 
-add_definitions(-DWSJCPP_APP_VERSION="v0.0.1")
+add_definitions(-DWSJCPP_APP_VERSION="v0.0.2")
 add_definitions(-DWSJCPP_APP_NAME="wsjcpp-jsonrpc2")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -28,7 +28,7 @@ list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_core/wsjcpp_resources_manager.c
 list (APPEND WSJCPP_INCLUDE_DIRS "./src.wsjcpp/nlohmann_json/")
 list (APPEND WSJCPP_SOURCES "./src.wsjcpp/nlohmann_json/json.hpp")
 
-# wsjcpp-validators:v0.1.0
+# wsjcpp-validators:v0.1.2
 list (APPEND WSJCPP_INCLUDE_DIRS "./src.wsjcpp/wsjcpp_validators/")
 list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_validators/wsjcpp_validators.h")
 list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_validators/wsjcpp_validators.cpp")

src.wsjcpp/wsjcpp_validators/wsjcpp.hold.yml

@@ -3,7 +3,7 @@ cmake_minimum_required: 3.0
 cmake_cxx_standard: 11
 
 name: wsjcpp-validators
-version: v0.1.0
+version: v0.1.2
 description: Classes for data validation
 issues: https://github.com/wsjcpp/wsjcpp-validators/issues
 
@@ -24,10 +24,15 @@ authors:
 
 dependencies:
   - name: "wsjcpp-core"
-    version: "v0.1.1"
+    version: "v0.1.7"
     url: "https://github.com/wsjcpp/wsjcpp-core:master"
     origin: "https://github.com/"
     installation-dir: "./src.wsjcpp/wsjcpp_core"
+  - name: "nlohmann/json"
+    version: "v3.9.1"
+    url: "https://github.com/nlohmann/json:develop"
+    origin: "https://github.com/"
+    installation-dir: "./src.wsjcpp/nlohmann_json"
 
 distribution:
   - source-file: "src/wsjcpp_validators.h"
@@ -69,3 +74,7 @@ unit-tests:
       description: "test valid ipv4"
     - name: "isValidIpV6"
       description: "test valid ipv6"
+    - name: "ValidatorIntegerMinValue"
+      description: "Test validator"
+    - name: "ValidatorIntegerMaxValue"
+      description: "Test validator"

src.wsjcpp/wsjcpp_validators/wsjcpp_validators.cpp

@@ -715,3 +715,85 @@ bool WsjcppValidatorHex::isValid(const std::string &sValue, std::string &sError)
     }
     return true;
 }
+
+
+// ----------------------------------------------------------------------
+// WsjcppValidatorIntegerBase
+
+WsjcppValidatorIntegerBase::WsjcppValidatorIntegerBase(const std::string &sTypeName) {
+    TAG = "WsjcppValidatorIntegerBase";
+    m_sTypeName = sTypeName;
+}
+
+// ----------------------------------------------------------------------
+
+WsjcppValidatorType WsjcppValidatorIntegerBase::getBaseType() {
+    return WsjcppValidatorType::WSJCPP_VALIDATOR_INTEGER;
+}
+
+// ----------------------------------------------------------------------
+
+std::string WsjcppValidatorIntegerBase::getTypeName() {
+    return m_sTypeName;
+}
+
+// ----------------------------------------------------------------------
+// WsjcppValidatorIntegerMinValue
+
+WsjcppValidatorIntegerMinValue::WsjcppValidatorIntegerMinValue(int nMinValue) 
+: WsjcppValidatorIntegerBase("integer_min_value") {
+    TAG = "WsjcppValidatorIntegerMinValue";
+    m_nMinValue = nMinValue;
+}
+
+// ----------------------------------------------------------------------
+
+bool WsjcppValidatorIntegerMinValue::isValid(int nValue, std::string &sError) {
+    if (nValue < m_nMinValue) {
+        sError = "Value must be more or equal then " + std::to_string(m_nMinValue);
+        return false;
+    }
+    return true;
+}
+
+// ----------------------------------------------------------------------
+// WsjcppValidatorIntegerMaxValue
+
+WsjcppValidatorIntegerMaxValue::WsjcppValidatorIntegerMaxValue(int nMaxValue) 
+: WsjcppValidatorIntegerBase("integer_max_value") {
+    TAG = "WsjcppValidatorIntegerMaxValue";
+    m_nMaxValue = nMaxValue;
+}
+
+// ----------------------------------------------------------------------
+
+bool WsjcppValidatorIntegerMaxValue::isValid(int nValue, std::string &sError) {
+    if (nValue > m_nMaxValue) {
+        sError = "Value must be less or equal then " + std::to_string(m_nMaxValue);
+        return false;
+    }
+    return true;
+}
+
+// ----------------------------------------------------------------------
+// WsjcppValidatorJsonBase
+
+WsjcppValidatorJsonBase::WsjcppValidatorJsonBase(const std::string &sTypeName) {
+    TAG = "WsjcppValidatorJsonBase";
+    m_sTypeName = sTypeName;
+}
+
+// ----------------------------------------------------------------------
+
+WsjcppValidatorType WsjcppValidatorJsonBase::getBaseType() {
+    return WsjcppValidatorType::WSJCPP_VALIDATOR_JSON;
+}
+
+// ----------------------------------------------------------------------
+
+std::string WsjcppValidatorJsonBase::getTypeName() {
+    return m_sTypeName;
+}
+
+
+// ----------------------------------------------------------------------

src.wsjcpp/wsjcpp_validators/wsjcpp_validators.h

@@ -4,10 +4,12 @@
 #include <string>
 #include <vector>
 #include <regex>
+#include <json.hpp>
 
 enum WsjcppValidatorType {
     WSJCPP_VALIDATOR_STRING,
-    WSJCPP_VALIDATOR_NUMBER
+    WSJCPP_VALIDATOR_INTEGER,
+    WSJCPP_VALIDATOR_JSON
 };
 
 // ----------------------------------------------------------------------
@@ -188,4 +190,55 @@ class WsjcppValidatorHex : public WsjcppValidatorStringBase {
 
 // ----------------------------------------------------------------------
 
+class WsjcppValidatorIntegerBase {
+    public:
+        WsjcppValidatorIntegerBase(const std::string &typeName);
+        virtual WsjcppValidatorType getBaseType();
+        virtual std::string getTypeName();
+        virtual bool isValid(int nValue, std::string &sError) = 0;
+    protected:
+        std::string TAG;
+    private:
+        std::string m_sTypeName;
+};
+
+// ----------------------------------------------------------------------
+
+class WsjcppValidatorIntegerMinValue : public WsjcppValidatorIntegerBase {
+    public:
+        WsjcppValidatorIntegerMinValue(int nMinValue);
+        virtual bool isValid(int nValue, std::string &sError) override;
+
+    private:
+        std::string TAG;
+        int m_nMinValue;
+};
+
+// ----------------------------------------------------------------------
+
+class WsjcppValidatorIntegerMaxValue : public WsjcppValidatorIntegerBase {
+    public:
+        WsjcppValidatorIntegerMaxValue(int nMaxValue);
+        virtual bool isValid(int nValue, std::string &sError) override;
+
+    private:
+        std::string TAG;
+        int m_nMaxValue;
+};
+
+// ----------------------------------------------------------------------
+
+class WsjcppValidatorJsonBase {
+    public:
+        WsjcppValidatorJsonBase(const std::string &typeName);
+        virtual WsjcppValidatorType getBaseType();
+        virtual std::string getTypeName();
+        virtual bool isValid(const nlohmann::json &nValue, std::string &sError) = 0;
+
+    protected:
+        std::string TAG;
+    private:
+        std::string m_sTypeName;
+};
+
 #endif // WSJCPP_VALIDATOR_H