You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by js...@apache.org on 2023/05/09 13:42:29 UTC
[unomi] 01/01: UNOMI-778 : remove useless unevaluatedProperties on sub schema
This is an automated email from the ASF dual-hosted git repository.
jsinovassinnaik pushed a commit to branch UNOMI-778-remove-uselss-unevaluated-property
in repository https://gitbox.apache.org/repos/asf/unomi.git
commit 0a8819af4fc9c0fb2a5c6a9c8e2104a02ba79f0e
Author: jsinovassin <js...@jahia.com>
AuthorDate: Tue May 9 15:40:27 2023 +0200
UNOMI-778 : remove useless unevaluatedProperties on sub schema
---
.../cxs/schemas/events/form/form.flattenedProperties.fields.json | 3 +--
.../META-INF/cxs/schemas/events/form/form.flattenedProperties.json | 3 +--
.../resources/META-INF/cxs/schemas/events/form/form.source.json | 3 +--
.../cxs/schemas/events/modifyConsent/modifyConsent.properties.json | 5 ++---
.../resources/META-INF/cxs/schemas/events/video/video.target.json | 3 +--
.../META-INF/cxs/schemas/events/video/video.target.properties.json | 3 +--
.../META-INF/cxs/schemas/events/view/view.flattenProperties.json | 5 ++---
.../src/main/resources/META-INF/cxs/schemas/events/view/view.json | 2 +-
.../resources/META-INF/cxs/schemas/events/view/view.properties.json | 5 ++---
.../META-INF/cxs/schemas/items/URLParameters/URLParameters.json | 5 ++---
.../main/resources/META-INF/cxs/schemas/items/consent/consent.json | 3 +--
.../resources/META-INF/cxs/schemas/items/consent/consentType.json | 5 ++---
.../resources/META-INF/cxs/schemas/items/interests/interests.json | 5 ++---
.../src/main/resources/META-INF/cxs/schemas/items/page/page.json | 5 ++---
.../META-INF/cxs/schemas/items/page/page.properties.attributes.json | 6 ++----
.../resources/META-INF/cxs/schemas/items/page/page.properties.json | 5 ++---
.../META-INF/cxs/schemas/items/page/page.properties.pageInfo.json | 3 +--
.../src/main/resources/META-INF/cxs/schemas/items/site/site.json | 5 ++---
itests/src/test/java/org/apache/unomi/itests/JSONSchemaIT.java | 2 +-
.../src/test/resources/schemas/schema-dummy-properties-updated.json | 3 +--
itests/src/test/resources/schemas/schema-dummy-properties.json | 3 +--
.../schemas/schema-flattened-flattenedProperties-interests.json | 5 ++---
.../resources/schemas/schema-flattened-flattenedProperties.json | 5 ++---
itests/src/test/resources/schemas/schema-flattened-properties.json | 3 +--
24 files changed, 36 insertions(+), 59 deletions(-)
diff --git a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/form/form.flattenedProperties.fields.json b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/form/form.flattenedProperties.fields.json
index 1bc5dd8a1..ef06189b2 100644
--- a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/form/form.flattenedProperties.fields.json
+++ b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/form/form.flattenedProperties.fields.json
@@ -16,6 +16,5 @@
"type": "string"
}
}
- },
- "unevaluatedProperties": false
+ }
}
diff --git a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/form/form.flattenedProperties.json b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/form/form.flattenedProperties.json
index fe8fc7a2c..5bf1f739f 100644
--- a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/form/form.flattenedProperties.json
+++ b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/form/form.flattenedProperties.json
@@ -13,6 +13,5 @@
"fields": {
"$ref" : "https://unomi.apache.org/schemas/json/events/form/flattenedProperties/fields/1-0-0"
}
- },
- "unevaluatedProperties" : false
+ }
}
diff --git a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/form/form.source.json b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/form/form.source.json
index 04a1b3273..cb3b72b25 100644
--- a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/form/form.source.json
+++ b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/form/form.source.json
@@ -9,6 +9,5 @@
},
"title": "FormSource",
"type": "object",
- "allOf": [{ "$ref": "https://unomi.apache.org/schemas/json/item/1-0-0" }],
- "unevaluatedProperties" : false
+ "allOf": [{ "$ref": "https://unomi.apache.org/schemas/json/item/1-0-0" }]
}
diff --git a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/modifyConsent/modifyConsent.properties.json b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/modifyConsent/modifyConsent.properties.json
index dec05c560..6527e29b7 100644
--- a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/modifyConsent/modifyConsent.properties.json
+++ b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/modifyConsent/modifyConsent.properties.json
@@ -13,6 +13,5 @@
"consent" : {
"$ref" : "https://unomi.apache.org/schemas/json/consent/1-0-0"
}
- },
- "unevaluatedProperties": false
-}
\ No newline at end of file
+ }
+}
diff --git a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/video/video.target.json b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/video/video.target.json
index 62645a914..234591a89 100644
--- a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/video/video.target.json
+++ b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/video/video.target.json
@@ -14,6 +14,5 @@
"properties": {
"$ref": "https://unomi.apache.org/schemas/json/events/video/target/properties/1-0-0"
}
- },
- "unevaluatedProperties": false
+ }
}
diff --git a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/video/video.target.properties.json b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/video/video.target.properties.json
index f358d6174..345961c55 100644
--- a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/video/video.target.properties.json
+++ b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/video/video.target.properties.json
@@ -13,6 +13,5 @@
"action": {
"type": "string"
}
- },
- "unevaluatedProperties": false
+ }
}
diff --git a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/view/view.flattenProperties.json b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/view/view.flattenProperties.json
index 957761d71..a78b9ebe7 100644
--- a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/view/view.flattenProperties.json
+++ b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/view/view.flattenProperties.json
@@ -16,6 +16,5 @@
"URLParameters": {
"$ref": "https://unomi.apache.org/schemas/json/URLParameters/1-0-0"
}
- },
- "unevaluatedProperties" : false
-}
\ No newline at end of file
+ }
+}
diff --git a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/view/view.json b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/view/view.json
index e77576476..921ae52b1 100644
--- a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/view/view.json
+++ b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/view/view.json
@@ -26,4 +26,4 @@
}
},
"unevaluatedProperties": false
-}
\ No newline at end of file
+}
diff --git a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/view/view.properties.json b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/view/view.properties.json
index 13c69694c..8fee44e29 100644
--- a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/view/view.properties.json
+++ b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/view/view.properties.json
@@ -9,6 +9,5 @@
},
"title": "ViewProperties",
"type": "object",
- "properties" : {},
- "unevaluatedProperties" : false
-}
\ No newline at end of file
+ "properties" : {}
+}
diff --git a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/URLParameters/URLParameters.json b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/URLParameters/URLParameters.json
index 3d7e3a6d0..1d883d60d 100644
--- a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/URLParameters/URLParameters.json
+++ b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/URLParameters/URLParameters.json
@@ -16,6 +16,5 @@
"type": "string"
}
}
- },
- "unevaluatedProperties": false
-}
\ No newline at end of file
+ }
+}
diff --git a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/consent/consent.json b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/consent/consent.json
index 40b09d64d..8da47562d 100644
--- a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/consent/consent.json
+++ b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/consent/consent.json
@@ -28,6 +28,5 @@
"type" : "string",
"format" : "date-time"
}
- },
- "unevaluatedProperties": false
+ }
}
diff --git a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/consent/consentType.json b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/consent/consentType.json
index 995f77f9a..23189416d 100644
--- a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/consent/consentType.json
+++ b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/consent/consentType.json
@@ -22,6 +22,5 @@
"description" : {
"type" : ["null", "string"]
}
- },
- "unevaluatedProperties": false
-}
\ No newline at end of file
+ }
+}
diff --git a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/interests/interests.json b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/interests/interests.json
index 74bc6c84d..0681e32c1 100644
--- a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/interests/interests.json
+++ b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/interests/interests.json
@@ -13,6 +13,5 @@
"^.*$": {
"type": "number"
}
- },
- "unevaluatedProperties": false
-}
\ No newline at end of file
+ }
+}
diff --git a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/page/page.json b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/page/page.json
index ec52e5871..18d13e002 100644
--- a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/page/page.json
+++ b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/page/page.json
@@ -14,6 +14,5 @@
"properties" : {
"$ref" : "https://unomi.apache.org/schemas/json/items/page/properties/1-0-0"
}
- },
- "unevaluatedProperties" : false
-}
\ No newline at end of file
+ }
+}
diff --git a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/page/page.properties.attributes.json b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/page/page.properties.attributes.json
index cb54c2a93..cece7608e 100644
--- a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/page/page.properties.attributes.json
+++ b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/page/page.properties.attributes.json
@@ -9,7 +9,5 @@
},
"title": "Page Attributes",
"type": ["null", "object"],
- "properties": {
- },
- "unevaluatedProperties" : false
-}
\ No newline at end of file
+ "properties": {}
+}
diff --git a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/page/page.properties.json b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/page/page.properties.json
index 3abfd4d0e..8ef3f29be 100644
--- a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/page/page.properties.json
+++ b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/page/page.properties.json
@@ -22,6 +22,5 @@
"$ref" : "https://unomi.apache.org/schemas/json/consentType/1-0-0"
}
}
- },
- "unevaluatedProperties" : false
-}
\ No newline at end of file
+ }
+}
diff --git a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/page/page.properties.pageInfo.json b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/page/page.properties.pageInfo.json
index 8468409ba..ded8b0a0c 100644
--- a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/page/page.properties.pageInfo.json
+++ b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/page/page.properties.pageInfo.json
@@ -64,6 +64,5 @@
"sameDomainReferrer": {
"type": ["null", "boolean"]
}
- },
- "unevaluatedProperties" : false
+ }
}
diff --git a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/site/site.json b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/site/site.json
index c73afaf17..777dc4a81 100644
--- a/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/site/site.json
+++ b/extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/site/site.json
@@ -9,6 +9,5 @@
},
"title": "SiteItem",
"type": "object",
- "allOf": [{ "$ref": "https://unomi.apache.org/schemas/json/item/1-0-0" }],
- "unevaluatedProperties" : false
-}
\ No newline at end of file
+ "allOf": [{ "$ref": "https://unomi.apache.org/schemas/json/item/1-0-0" }]
+}
diff --git a/itests/src/test/java/org/apache/unomi/itests/JSONSchemaIT.java b/itests/src/test/java/org/apache/unomi/itests/JSONSchemaIT.java
index 366f3ece5..034c2eb3c 100644
--- a/itests/src/test/java/org/apache/unomi/itests/JSONSchemaIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/JSONSchemaIT.java
@@ -286,7 +286,7 @@ public class JSONSchemaIT extends BaseIT {
.append("]");
Map<String, Set<ValidationError>> errors = schemaService.validateEvents(listInvalidEvents.toString());
- assertEquals(9, errors.get("flattened").size());
+ assertEquals(6, errors.get("flattened").size());
// Verify that error on interests.football appear only once even if two events have the issue
assertEquals(1, errors.get("flattened").stream().filter(validationError -> validationError.getError().startsWith("$.flattenedProperties.interests.football")).collect(Collectors.toList()).size());
}
diff --git a/itests/src/test/resources/schemas/schema-dummy-properties-updated.json b/itests/src/test/resources/schemas/schema-dummy-properties-updated.json
index d1482be34..83f5cabf2 100644
--- a/itests/src/test/resources/schemas/schema-dummy-properties-updated.json
+++ b/itests/src/test/resources/schemas/schema-dummy-properties-updated.json
@@ -19,6 +19,5 @@
"invalidPropName": {
"type": "string"
}
- },
- "unevaluatedProperties": false
+ }
}
diff --git a/itests/src/test/resources/schemas/schema-dummy-properties.json b/itests/src/test/resources/schemas/schema-dummy-properties.json
index e497791ee..5ead897a5 100644
--- a/itests/src/test/resources/schemas/schema-dummy-properties.json
+++ b/itests/src/test/resources/schemas/schema-dummy-properties.json
@@ -21,6 +21,5 @@
"type": "string",
"maxLength": 20000
}
- },
- "unevaluatedProperties": false
+ }
}
diff --git a/itests/src/test/resources/schemas/schema-flattened-flattenedProperties-interests.json b/itests/src/test/resources/schemas/schema-flattened-flattenedProperties-interests.json
index a5fde38fc..c42c0fae9 100644
--- a/itests/src/test/resources/schemas/schema-flattened-flattenedProperties-interests.json
+++ b/itests/src/test/resources/schemas/schema-flattened-flattenedProperties-interests.json
@@ -14,6 +14,5 @@
"type": "number"
}
},
- "maxProperties": 4,
- "unevaluatedProperties": false
-}
\ No newline at end of file
+ "maxProperties": 4
+}
diff --git a/itests/src/test/resources/schemas/schema-flattened-flattenedProperties.json b/itests/src/test/resources/schemas/schema-flattened-flattenedProperties.json
index e50e883f2..067c66220 100644
--- a/itests/src/test/resources/schemas/schema-flattened-flattenedProperties.json
+++ b/itests/src/test/resources/schemas/schema-flattened-flattenedProperties.json
@@ -13,6 +13,5 @@
"interests": {
"$ref": "https://vendor.test.com/schemas/json/events/flattened/flattenedProperties/interests/1-0-0"
}
- },
- "unevaluatedProperties": false
-}
\ No newline at end of file
+ }
+}
diff --git a/itests/src/test/resources/schemas/schema-flattened-properties.json b/itests/src/test/resources/schemas/schema-flattened-properties.json
index 7d7fd7c0d..b0f71bcd0 100644
--- a/itests/src/test/resources/schemas/schema-flattened-properties.json
+++ b/itests/src/test/resources/schemas/schema-flattened-properties.json
@@ -13,6 +13,5 @@
"marker": {
"type": "string"
}
- },
- "unevaluatedProperties": false
+ }
}