Merge pull request #1401 from cdowding-sl/hotfix/1382

Hotfix/1382
finos · Oct 3, 2019 · 42c4f83 · 42c4f83
2 parents 81d1ebd + 3a210a9
commit 42c4f83
Show file tree

Hide file tree

Showing 69 changed files with 248 additions and 581 deletions.
diff --git a/docs/UserGuide.md b/docs/UserGuide.md
@@ -252,10 +252,10 @@ Strings are sequences of unicode characters with a maximum length of 1000 charac
 
 ## DateTime
 
-DateTimes represent specific moments in time, and are specified in profiles through specialised objects:
+DateTimes represent specific moments in time, and are specified in profiles through specialised strings:
 
 ```javascript
-{ "date": "2000-01-01T09:00:00.000" }
+"2000-01-01T09:00:00.000"
 ```
 
 The format is a subset of [ISO-8601](https://en.wikipedia.org/wiki/ISO_8601); the date and time must be fully specified as above,
@@ -317,7 +317,7 @@ The [grammatical `not` constraint](#Grammatical-Constraints) inverts a constrain
 OR
 { "field": "type", "is": "equalTo", "value": 23 }
 OR
-{ "field": "type", "is": "equalTo", "value": { "date": "2001-02-03T04:05:06.007" } }
+{ "field": "type", "is": "equalTo", "value": "2001-02-03T04:05:06.007" }
 ```
 
 Is satisfied if `field`'s value is equal to `value`
@@ -327,7 +327,7 @@ Is satisfied if `field`'s value is equal to `value`
 ### `inSet` _(field, values)_
 
 ```javascript
-{ "field": "type", "is": "inSet", "values": [ "X_092", 123, null, { "date": "2001-02-03T04:05:06.007" } ] }
+{ "field": "type", "is": "inSet", "values": [ "X_092", 123, null, "2001-02-03T04:05:06.007" ] }
 ```
 
 Is satisfied if `field`'s value is in the set `values`
@@ -487,16 +487,16 @@ Is satisfied if `field` is a number less than or equal to `value`.
 Is satisfied if `field` has at least the [granularity](#Numeric-granularity) specified in `value`.
 
 ## DateTime constraints
-All dates must be in format `yyyy-MM-ddTHH:mm:ss.SSS` and embedded in a _date-object_. The Z suffix can be included, but is not required. All datetimes are treated as UTC whether the Z suffix is included or not.
+All dates must be in format `yyyy-MM-ddTHH:mm:ss.SSS` and the Z suffix can be included, but is not required. All datetimes are treated as UTC whether the Z suffix is included or not.
 
-Example: `{ "date": "2001-02-03T04:05:06.007" }`
+Example: `2001-02-03T04:05:06.007`
 
 <div id="predicate-after"></div>
 
 ### `after` _(field, value)_
 
 ```javascript
-{ "field": "date", "is": "after", "value": { "date": "2018-09-01T00:00:00.000" } }
+{ "field": "date", "is": "after", "value": "2018-09-01T00:00:00.000" }
 ```
 
 Is satisfied if `field` is a datetime occurring after `value`.
@@ -506,7 +506,7 @@ Is satisfied if `field` is a datetime occurring after `value`.
 ### `afterOrAt` _(field, value)_
 
 ```javascript
-{ "field": "date", "is": "afterOrAt", "value": { "date": "2018-09-01T00:00:00.000" } }
+{ "field": "date", "is": "afterOrAt", "value": "2018-09-01T00:00:00.000" }
 ```
 
 Is satisfied if `field` is a datetime occurring after or simultaneously with `value`.
@@ -516,7 +516,7 @@ Is satisfied if `field` is a datetime occurring after or simultaneously with `va
 ### `before` _(field, value)_
 
 ```javascript
-{ "field": "date", "is": "before", "value": { "date": "2018-09-01T00:00:00.000" } }
+{ "field": "date", "is": "before", "value": "2018-09-01T00:00:00.000" }
 ```
 
 Is satisfied if `field` is a datetime occurring before `value`.
@@ -526,7 +526,7 @@ Is satisfied if `field` is a datetime occurring before `value`.
 ### `beforeOrAt` _(field, value)_
 
 ```javascript
-{ "field": "date", "is": "beforeOrAt", "value": { "date": "2018-09-01T00:00:00.000" } }
+{ "field": "date", "is": "beforeOrAt", "value": "2018-09-01T00:00:00.000" }
 ```
 
 Is satisfied if `field` is a datetime occurring before or simultaneously with `value`.

diff --git a/docs/user/Schema.md b/docs/user/Schema.md
@@ -62,7 +62,7 @@
 					"then": {
 						"allOf": [
 							{ "field": "tariff", "is": "null" },
-							{ "field": "time", "is": "after", "value": { "date": "2014-01-01" } }
+							{ "field": "time", "is": "after", "value": "2014-01-01" }
 						]
 					},
 					"else": { "not": { "field": "tariff", "is": "null" } }

diff --git a/examples/a-valid-isin/profile.json b/examples/a-valid-isin/profile.json
@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "0.8",
+  "schemaVersion": "0.9",
   "fields": [
     {
       "name": "isin",

diff --git a/examples/actor-names/profile.json b/examples/actor-names/profile.json
@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "0.8",
+  "schemaVersion": "0.9",
   "fields": [
     {
       "name": "forename",

diff --git a/examples/anyOf/profile.json b/examples/anyOf/profile.json
@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "0.8",
+  "schemaVersion": "0.9",
   "rules": [
     {
       "rule": "rule 1",

diff --git a/examples/date-after-dynamic/profile.json b/examples/date-after-dynamic/profile.json
@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "0.8",
+  "schemaVersion": "0.9",
   "fields": [
     {
       "name": "field1",
@@ -25,9 +25,7 @@
         {
           "field": "field1",
           "is": "after",
-          "value": {
-            "date": "8001-02-03T04:05:06.007"
-          }
+          "value": "8001-02-03T04:05:06.007"
         },
         {
           "field": "field2",

diff --git a/examples/date-after/profile.json b/examples/date-after/profile.json
@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "0.8",
+  "schemaVersion": "0.9",
   "fields": [
     {
       "name": "date",
@@ -13,9 +13,7 @@
         {
           "field": "date",
           "is": "after",
-          "value": {
-            "date": "8001-02-03T04:05:06.007"
-          }
+          "value": "8001-02-03T04:05:06.007"
         }
       ]
     }

diff --git a/examples/date-equal-to-dynamic-offset/profile.json b/examples/date-equal-to-dynamic-offset/profile.json
@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "0.8",
+  "schemaVersion": "0.9",
   "fields": [
     {
       "name": "first",
@@ -43,9 +43,7 @@
         {
           "field": "first",
           "is": "after",
-          "value": {
-            "date": "8001-02-03T04:05:06.007"
-          }
+          "value": "8001-02-03T04:05:06.007"
         },
         {
           "field": "second",
@@ -64,9 +62,7 @@
         {
           "field": "firstWorking",
           "is": "equalTo",
-          "value": {
-            "date": "2019-08-12T12:00:00.000"
-          }
+          "value": "2019-08-12T12:00:00.000"
         },
         {
           "field": "secondWorking",
@@ -78,16 +74,12 @@
         {
           "field": "current",
           "is": "before",
-          "value": {
-            "date": "now"
-          }
+          "value": "now"
         },
         {
           "field": "current",
           "is": "after",
-          "value": {
-            "date": "2019-06-01T12:00:00.000"
-          }
+          "value": "2019-06-01T12:00:00.000"
         }
       ]
     }

diff --git a/examples/date-equal-to-dynamic/profile.json b/examples/date-equal-to-dynamic/profile.json
@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "0.8",
+  "schemaVersion": "0.9",
   "fields": [
     {
       "name": "first",
@@ -17,9 +17,7 @@
         {
           "field": "first",
           "is": "after",
-          "value": {
-            "date": "8001-02-03T04:05:06.007"
-          }
+          "value": "8001-02-03T04:05:06.007"
         },
         {
           "field": "second",

diff --git a/examples/date-equal-to/profile.json b/examples/date-equal-to/profile.json
@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "0.8",
+  "schemaVersion": "0.9",
   "fields": [
     {
       "name": "date",
@@ -13,9 +13,7 @@
         {
           "field": "date",
           "is": "equalTo",
-          "value": {
-            "date": "2001-02-03T04:05:06.007"
-          }
+          "value": "2001-02-03T04:05:06.007"
         }
       ]
     }

diff --git a/examples/date-offset-working-days/profile.json b/examples/date-offset-working-days/profile.json
@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "0.8",
+  "schemaVersion": "0.9",
   "fields": [
     {
       "name": "foo",

diff --git a/examples/demo-trades-smaller/profile.json b/examples/demo-trades-smaller/profile.json
@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "0.8",
+  "schemaVersion": "0.9",
   "fields": [
     {
       "name": "tradeId",
@@ -71,8 +71,8 @@
     {
       "rule": "tradeDatetime",
       "constraints": [
-        { "field": "tradeDatetime", "is": "after", "value": { "date": "2019-09-02T09:30:00.000" } },
-        { "field": "tradeDatetime", "is": "before", "value": { "date": "2019-09-02T16:30:00.000" } }
+        { "field": "tradeDatetime", "is": "after", "value": "2019-09-02T09:30:00.000" },
+        { "field": "tradeDatetime", "is": "before", "value": "2019-09-02T16:30:00.000" }
       ]
     }
   ]

diff --git a/examples/demo-trades/profile.json b/examples/demo-trades/profile.json
@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "0.8",
+  "schemaVersion": "0.9",
   "fields": [
     {
       "name": "tradeId",
@@ -101,15 +101,15 @@
       "rule": "tradeDatetime",
       "constraints": [
         { "field": "tradeDatetime", "is": "granularTo", "value": "millis" },
-        { "field": "tradeDatetime", "is": "after", "value": { "date": "2019-09-02T09:30:00.000" } },
-        { "field": "tradeDatetime", "is": "before", "value": { "date": "2019-09-02T16:30:00.000" } }
+        { "field": "tradeDatetime", "is": "after", "value":"2019-09-02T09:30:00.000" },
+        { "field": "tradeDatetime", "is": "before", "value": "2019-09-02T16:30:00.000" }
       ]
     },
     {
       "rule": "tradeDate",
       "constraints": [
         { "field": "tradeDate", "is": "granularTo", "value": "days" },
-        { "field": "tradeDate", "is": "equalTo", "value": { "date": "2019-09-02T00:00:00.000" } }
+        { "field": "tradeDate", "is": "equalTo", "value": "2019-09-02T00:00:00.000" }
       ]
     },
     {

diff --git a/examples/duplicates/profile.json b/examples/duplicates/profile.json
@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "0.8",
+  "schemaVersion": "0.9",
   "fields": [
     {
       "name": "a",

diff --git a/examples/formatting/profile.json b/examples/formatting/profile.json
@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "0.8",
+  "schemaVersion": "0.9",
   "fields": [
     {
       "name": "decimal",
@@ -40,16 +40,12 @@
         {
           "field": "date1",
           "is": "equalTo",
-          "value": {
-            "date": "2001-02-03T04:05:06.007"
-          }
+          "value": "2001-02-03T04:05:06.007"
         },
         {
           "field": "date2",
           "is": "equalTo",
-          "value": {
-            "date": "2001-02-03T04:05:06.007"
-          }
+          "value":  "2001-02-03T04:05:06.007"
         },
         {
           "field": "an_integer",

diff --git a/examples/from-file-weighted/profile.json b/examples/from-file-weighted/profile.json
@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "0.8",
+  "schemaVersion": "0.9",
   "fields": [
     {
       "name": "name",

diff --git a/examples/from-file/profile.json b/examples/from-file/profile.json
@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "0.8",
+  "schemaVersion": "0.9",
   "fields": [
     {
       "name": "name",

diff --git a/examples/hard-contradiction-null-validation/profile.json b/examples/hard-contradiction-null-validation/profile.json
@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "0.8",
+  "schemaVersion": "0.9",
   "fields": [
     {
       "name": "Column 1",

diff --git a/examples/hard-contradiction-range-and-granular/profile.json b/examples/hard-contradiction-range-and-granular/profile.json
@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "0.8",
+  "schemaVersion": "0.9",
   "fields": [
     {
       "name": "Column 1",

diff --git a/examples/integer-range-with-blacklist/profile.json b/examples/integer-range-with-blacklist/profile.json
@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "0.8",
+  "schemaVersion": "0.9",
   "fields": [
     {
       "name": "an_integer",

diff --git a/examples/integer-range/profile.json b/examples/integer-range/profile.json
@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "0.8",
+  "schemaVersion": "0.9",
   "fields": [
     {
       "name": "an_integer",

diff --git a/examples/names/profile.json b/examples/names/profile.json
@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "0.8",
+  "schemaVersion": "0.9",
   "fields": [
     {
       "name": "forename",

diff --git a/examples/partial-contradictions/profile.json b/examples/partial-contradictions/profile.json
@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "0.8",
+  "schemaVersion": "0.9",
   "fields": [
     {
       "name": "Column 1",

diff --git a/examples/partitioning/profile.json b/examples/partitioning/profile.json
@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "0.8",
+  "schemaVersion": "0.9",
   "fields": [
     {
       "name": "p1f1",

diff --git a/examples/real-number-range/profile.json b/examples/real-number-range/profile.json
@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "0.8",
+  "schemaVersion": "0.9",
   "fields": [
     {
       "name": "a_number",

diff --git a/examples/regex-contains/profile.json b/examples/regex-contains/profile.json
@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "0.8",
+  "schemaVersion": "0.9",
   "fields": [
     {
       "name": "first_name",

diff --git a/examples/regex-intersect-with-blacklist/profile.json b/examples/regex-intersect-with-blacklist/profile.json
@@ -1,5 +1,5 @@
 {
-  "schemaVersion": "0.8",
+  "schemaVersion": "0.9",
   "fields": [
     {
       "name": "first_name",