You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by sh...@apache.org on 2022/02/22 08:45:51 UTC
[unomi] branch UNOMI-486-json-schema-graphql updated: UNOMI-486 - Rename property type keyword to Unomi property type keyword - Allow null in itemId JSON schema.
This is an automated email from the ASF dual-hosted git repository.
shuber pushed a commit to branch UNOMI-486-json-schema-graphql
in repository https://gitbox.apache.org/repos/asf/unomi.git
The following commit(s) were added to refs/heads/UNOMI-486-json-schema-graphql by this push:
new 68940c3 UNOMI-486 - Rename property type keyword to Unomi property type keyword - Allow null in itemId JSON schema.
68940c3 is described below
commit 68940c35a77fb2b73332918be4f5b249a701d4d5
Author: Serge Huber <sh...@jahia.com>
AuthorDate: Tue Feb 22 09:45:43 2022 +0100
UNOMI-486
- Rename property type keyword to Unomi property type keyword
- Allow null in itemId JSON schema.
---
.../apache/unomi/services/impl/schemas/SchemaRegistryImpl.java | 2 +-
.../{PropertyTypeKeyword.java => UnomiPropertyTypeKeyword.java} | 8 ++++----
services/src/main/resources/META-INF/cxs/schemas/item.json | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/services/src/main/java/org/apache/unomi/services/impl/schemas/SchemaRegistryImpl.java b/services/src/main/java/org/apache/unomi/services/impl/schemas/SchemaRegistryImpl.java
index 7c7f545..eb137e0 100644
--- a/services/src/main/java/org/apache/unomi/services/impl/schemas/SchemaRegistryImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/impl/schemas/SchemaRegistryImpl.java
@@ -79,7 +79,7 @@ public class SchemaRegistryImpl implements SchemaRegistry, SynchronousBundleList
public void init() {
JsonMetaSchema jsonMetaSchema = JsonMetaSchema.builder(URI, JsonMetaSchema.getV201909())
- .addKeyword(new PropertyTypeKeyword(profileService, this))
+ .addKeyword(new UnomiPropertyTypeKeyword(profileService, this))
.addKeyword(new NonValidationKeyword("self"))
.build();
jsonSchemaFactory = JsonSchemaFactory.builder(JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V201909))
diff --git a/services/src/main/java/org/apache/unomi/services/impl/schemas/PropertyTypeKeyword.java b/services/src/main/java/org/apache/unomi/services/impl/schemas/UnomiPropertyTypeKeyword.java
similarity index 95%
rename from services/src/main/java/org/apache/unomi/services/impl/schemas/PropertyTypeKeyword.java
rename to services/src/main/java/org/apache/unomi/services/impl/schemas/UnomiPropertyTypeKeyword.java
index 68afb41..4c5796d 100644
--- a/services/src/main/java/org/apache/unomi/services/impl/schemas/PropertyTypeKeyword.java
+++ b/services/src/main/java/org/apache/unomi/services/impl/schemas/UnomiPropertyTypeKeyword.java
@@ -26,9 +26,9 @@ import org.slf4j.LoggerFactory;
import java.text.MessageFormat;
import java.util.*;
-class PropertyTypeKeyword extends AbstractKeyword {
+class UnomiPropertyTypeKeyword extends AbstractKeyword {
- private static final Logger logger = LoggerFactory.getLogger(PropertyTypeKeyword.class);
+ private static final Logger logger = LoggerFactory.getLogger(UnomiPropertyTypeKeyword.class);
private final ProfileService profileService;
private final SchemaRegistryImpl schemaRegistry;
@@ -97,8 +97,8 @@ class PropertyTypeKeyword extends AbstractKeyword {
}
}
- public PropertyTypeKeyword(ProfileService profileService, SchemaRegistryImpl schemaRegistry) {
- super("propertyTypes");
+ public UnomiPropertyTypeKeyword(ProfileService profileService, SchemaRegistryImpl schemaRegistry) {
+ super("unomiPropertyTypes");
this.profileService = profileService;
this.schemaRegistry = schemaRegistry;
}
diff --git a/services/src/main/resources/META-INF/cxs/schemas/item.json b/services/src/main/resources/META-INF/cxs/schemas/item.json
index 400b144..ed9dff5 100644
--- a/services/src/main/resources/META-INF/cxs/schemas/item.json
+++ b/services/src/main/resources/META-INF/cxs/schemas/item.json
@@ -5,7 +5,7 @@
"type": "object",
"properties" : {
"itemId" : {
- "type" : "string",
+ "type" : ["null","string"],
"pattern" : "^(\\w|[-_@\\.]){0,60}$",
"description" : "The identifier for the item"
},