Merge pull request #6 from relogiclabs/develop

Refactor and Optimize Code

Author: zhossain-info

README.md

@@ -67,7 +67,7 @@ The next example represents an expanded version of the previous one, which bring
 ```cpp
 %title: "Extended User Profile Dashboard API Response"
 %version: 2.0.0
-%include: com.relogiclabs.json.schema.positive.ExternalFunctions
+%include: com.relogiclabs.json.schema.external.ExternalFunctions
 
 %pragma DateDataTypeFormat: "DD-MM-YYYY"
 %pragma TimeDataTypeFormat: "DD-MM-YYYY hh:mm:ss"

doc/content/articles/directives.md

@@ -28,7 +28,7 @@ In a schema, the version directive is used to provide a version number of the sc
 ## Include Directive
 Include directive enables the addition or inclusion of a class, as defined by object-oriented programming, to a schema along with a set of methods that have specific signatures for performing custom validations. This feature extends the built-in validation capabilities of the schema. The example below illustrates how to utilize the include directive in Java language:
 ```js
-%include: com.relogiclabs.json.schema.positive.ExternalFunctions
+%include: com.relogiclabs.json.schema.external.ExternalFunctions
 ```
 
 ## Pragma Directive

doc/content/articles/functions.md

@@ -102,11 +102,11 @@ If either the parameter values for `minimum` or `maximum` are unspecified or und
 ```
 Validates that the `target` number is greater than or equal to the `minimum` number specified as a parameter, unless the `exclusive` parameter flag is explicitly set to `true`, in which case the `target` number must be exclusively greater than the `minimum` number.
 
-| Ues Cases          | Valid Values             | Invalid Values           |
-|--------------------|--------------------------|--------------------------|
-| `minimum(0)`       | `0`; `1`; `1000`         | `-1`; `-10`; `-10000`    |
-| `minimum(10.5)`    | `10.5`; `10.6`; `1000.1` | `10.49`; `1.0`; `-100.1` |
-| `minimum(0, true)` | `0.001`; `1.01`; `100.1` | `0`; `-0.01`; `-100.1`   |
+| Ues Cases           | Valid Values             | Invalid Values           |
+|---------------------|--------------------------|--------------------------|
+| `@minimum(0)`       | `0`; `1`; `1000`         | `-1`; `-10`; `-10000`    |
+| `@minimum(10.5)`    | `10.5`; `10.6`; `1000.1` | `10.49`; `1.0`; `-100.1` |
+| `@minimum(0, true)` | `0.001`; `1.01`; `100.1` | `0`; `-0.01`; `-100.1`   |
 
 ### Number Maximum
 ```stylus
@@ -115,11 +115,11 @@ Validates that the `target` number is greater than or equal to the `minimum` num
 ```
 Validates that the `target` number is less than or equal to the `maximum` number specified as a parameter, unless the `exclusive` parameter flag is explicitly set to `true`, in which case the `target` number must be exclusively less than the `maximum` number.
 
-| Ues Cases          | Valid Values                 | Invalid Values            |
-|--------------------|------------------------------|---------------------------|
-| `maximum(100)`     | `100`; `-100`; `0`           | `101`; `1000`; `10000`    |
-| `maximum(10.5)`    | `10.50`; `10.49`; `-1000.1`  | `10.51`; `11.0`; `1000.1` |
-| `maximum(0, true)` | `-0.001`; `-1.01`; `-1000.1` | `0`; `0.01`; `100.1`      |
+| Ues Cases           | Valid Values                 | Invalid Values            |
+|---------------------|------------------------------|---------------------------|
+| `@maximum(100)`     | `100`; `-100`; `0`           | `101`; `1000`; `10000`    |
+| `@maximum(10.5)`    | `10.50`; `10.49`; `-1000.1`  | `10.51`; `11.0`; `1000.1` |
+| `@maximum(0, true)` | `-0.001`; `-1.01`; `-1000.1` | `0`; `0.01`; `100.1`      |
 
 ### String Enum
 ```stylus
@@ -230,17 +230,29 @@ Validates that the `target` date-time is exclusively before the `reference` date
 ```
 Validates that the `target` date-time is exclusively after the `reference` date-time. If the `target` date-time finds on or before the `reference` date-time, a validation error is triggered. The `reference` parameter must be the string representation of the `target` data type, which can either be a `#date` or `#time` type.
 
-### Number Positive
+### Number Positive and Negative
 ```stylus
 #number target - @positive
+#number target - @positive(#number reference)
 ```
-Validates that the `target` number is positive. If the `target` number is zero or negative, it generates a validation error.
+Validates that the `target` number is positive or positive from (or relative to) the specified `reference`. If the `target` number is zero or negative for the first definition or less than the `reference` for the second definition, it generates a validation error.
 
-### Number Negative
 ```stylus
 #number target - @negative
-```
-Validates that the `target` number is negative. If the `target` number is zero or positive, it generates a validation error.
+#number target - @negative(#number reference)
+```
+Validates that the `target` number is negative or negative from (or relative to) the specified `reference`. If the `target` number is zero or positive for the first definition or greater than the `reference` for the second definition, it generates a validation error.
+
+| Ues Cases        | Valid Values             | Invalid Values         |
+|------------------|--------------------------|------------------------|
+| `@positive`      | `1`; `5`; `1000`         | `0`; `-1`; `-1000`     |
+| `@negative`      | `-1`; `-5`; `-1000`      | `0`; `1`; `1000`       |
+| `@positive(0)`   | `0`; `1`; `5`; `1000`    | `-1`; `-5`; `-1000`    |
+| `@positive(10)`  | `10`; `100`; `10000`     | `1`; `5`; `-1000`      |
+| `@negative(0)`   | `0`; `-1`; `-5`; `-1000` | `1`; `5`; `1000`       |
+| `@negative(-10)` | `-10`; `-100`; `-10000`  | `0`; `-5`; `1000`      |
+| `@positive(-1)`  | `-1`; `0`; `10000`       | `-10`; `-100`; `-1000` |
+| `@negative(1)`   | `1`; `0`; `-10000`       | `10`; `100`; `1000`    |
 
 ### String Not Empty
 ```stylus

doc/content/articles/quickstart.md

@@ -147,16 +147,19 @@ com.relogiclabs.json.schema.exception.JsonSchemaException: DTYP04: Data type mis
 Expected (Schema Line: 6:31): data type #integer
 Actual (Json Line: 3:14): found #string inferred by "not number"
 
-	at com.relogiclabs.json.schema.types.JDataType.matchForReport(JDataType.java:86)
-	at com.relogiclabs.json.schema.types.JDataType.matchForReport(JDataType.java:68)
-	at com.relogiclabs.json.schema.types.JValidator.matchDataType(JValidator.java:67)
-	at com.relogiclabs.json.schema.types.JValidator.match(JValidator.java:57)
-	at com.relogiclabs.json.schema.types.JObject.match(JObject.java:55)
-	at com.relogiclabs.json.schema.types.JValidator.match(JValidator.java:52)
-	at com.relogiclabs.json.schema.types.JObject.match(JObject.java:55)
-	at com.relogiclabs.json.schema.types.JValidator.match(JValidator.java:52)
-	at com.relogiclabs.json.schema.types.JRoot.match(JRoot.java:47)
-	at com.relogiclabs.json.schema.JsonAssert.isValid(JsonAssert.java:54)
+	at com.relogiclabs.json.schema.type.JDataType.matchForReport(JDataType.java:90)
+	at com.relogiclabs.json.schema.type.JDataType.matchForReport(JDataType.java:72)
+	at com.relogiclabs.json.schema.type.JValidator.lambda$matchDataType$4(JValidator.java:74)
+	at com.relogiclabs.json.schema.type.JValidator.matchDataType(JValidator.java:74)
+	at com.relogiclabs.json.schema.type.JValidator.match(JValidator.java:64)
+	at com.relogiclabs.json.schema.type.JObject.match(JObject.java:57)
+	at com.relogiclabs.json.schema.type.JValidator.match(JValidator.java:59)
+	at com.relogiclabs.json.schema.type.JObject.match(JObject.java:57)
+	at com.relogiclabs.json.schema.type.JValidator.match(JValidator.java:59)
+	at com.relogiclabs.json.schema.type.JRoot.match(JRoot.java:50)
+	at com.relogiclabs.json.schema.tree.SchemaTree.match(SchemaTree.java:33)
+	at com.relogiclabs.json.schema.JsonAssert.isValid(JsonAssert.java:61)
+	at com.relogiclabs.json.schema.JsonAssert.isValid(JsonAssert.java:72)
 	at org.example.SampleSchema.checkIsValid(SampleSchema.java:64)
 	at org.example.Main.main(Main.java:5)
 ```

doc/content/articles/sourcebuild.md

@@ -158,17 +158,20 @@ com.relogiclabs.json.schema.exception.JsonSchemaException: DTYP04: Data type mis
 Expected (Schema Line: 6:31): data type #integer
 Actual (Json Line: 3:14): found #string inferred by "not number"
 
-	at com.relogiclabs.json.schema.types.JDataType.matchForReport(JDataType.java:86)
-	at com.relogiclabs.json.schema.types.JDataType.matchForReport(JDataType.java:68)
-	at com.relogiclabs.json.schema.types.JValidator.matchDataType(JValidator.java:67)
-	at com.relogiclabs.json.schema.types.JValidator.match(JValidator.java:57)
-	at com.relogiclabs.json.schema.types.JObject.match(JObject.java:55)
-	at com.relogiclabs.json.schema.types.JValidator.match(JValidator.java:52)
-	at com.relogiclabs.json.schema.types.JObject.match(JObject.java:55)
-	at com.relogiclabs.json.schema.types.JValidator.match(JValidator.java:52)
-	at com.relogiclabs.json.schema.types.JRoot.match(JRoot.java:47)
-	at com.relogiclabs.json.schema.JsonAssert.isValid(JsonAssert.java:54)
+	at com.relogiclabs.json.schema.type.JDataType.matchForReport(JDataType.java:90)
+	at com.relogiclabs.json.schema.type.JDataType.matchForReport(JDataType.java:72)
+	at com.relogiclabs.json.schema.type.JValidator.lambda$matchDataType$4(JValidator.java:74)
+	at com.relogiclabs.json.schema.type.JValidator.matchDataType(JValidator.java:74)
+	at com.relogiclabs.json.schema.type.JValidator.match(JValidator.java:64)
+	at com.relogiclabs.json.schema.type.JObject.match(JObject.java:57)
+	at com.relogiclabs.json.schema.type.JValidator.match(JValidator.java:59)
+	at com.relogiclabs.json.schema.type.JObject.match(JObject.java:57)
+	at com.relogiclabs.json.schema.type.JValidator.match(JValidator.java:59)
+	at com.relogiclabs.json.schema.type.JRoot.match(JRoot.java:50)
+	at com.relogiclabs.json.schema.tree.SchemaTree.match(SchemaTree.java:33)
+	at com.relogiclabs.json.schema.JsonAssert.isValid(JsonAssert.java:61)
+	at com.relogiclabs.json.schema.JsonAssert.isValid(JsonAssert.java:72)
 	at org.example.SampleSchema.checkIsValid(SampleSchema.java:64)
 	at org.example.Main.main(Main.java:5)
 ```
-For more information about the schema syntax format and library functionalities, please refer to the reference documentation [here](/JsonSchema-Java/api/index.html).
+For more information about the schema syntax format and library functionalities, please refer to the reference documentation [here](/JsonSchema-Java/api/index.html).