This is an automated email from the ASF dual-hosted git repository. shuber pushed a commit to branch draft-custom-items in repository https://gitbox.apache.org/repos/asf/unomi.git
commit 86e0d812d19aa724757455f477f831c437b65855 Merge: 26c85f3 9e8dad5 Author: Serge Huber <[email protected]> AuthorDate: Wed Oct 13 11:48:30 2021 +0200 Merge branch 'draft-json-schema-integration' into draft-custom-items # Conflicts: # services/src/main/java/org/apache/unomi/services/impl/segments/SegmentServiceImpl.java .../main/java/org/apache/unomi/api/SchemaType.java | 60 ++++++ .../SchemaRegistry.java} | 16 +- .../apache/unomi/api/utils/ValidationPattern.java | 2 +- .../groovy/actions/rest/GroovyActionsEndPoint.java | 2 +- .../unomi/groovy/actions/annotations/Action.java | 6 +- .../groovy/actions/annotations/Parameter.java | 1 - .../services/impl/GroovyActionsServiceImpl.java | 11 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 2 +- .../java/org/apache/unomi/itests/SegmentIT.java | 138 ++++++++++++- manual/src/main/asciidoc/configuration.adoc | 162 ++++++++++++++- package/pom.xml | 11 + .../ElasticSearchPersistenceServiceImpl.java | 63 +++++- .../unomi/persistence/spi/PersistenceService.java | 21 ++ services/pom.xml | 14 ++ .../services/impl/events/EventServiceImpl.java | 13 +- .../impl/events/EventTypeRegistryImpl.java | 27 ++- .../services/impl/schemas/PropertyTypeKeyword.java | 110 ++++++++++ .../services/impl/schemas/SchemaRegistryImpl.java | 224 +++++++++++++++++++++ .../services/impl/segments/SegmentServiceImpl.java | 116 ++++++----- .../painless/evaluateScoringPlanElement.painless | 52 +++++ .../cxs/painless/resetScoringPlan.painless | 34 +--- .../resources/META-INF/cxs/schemas/condition.json | 15 ++ .../META-INF/cxs/schemas/conditiontype.json | 22 ++ .../resources/META-INF/cxs/schemas/consent.json | 25 +++ .../META-INF/cxs/schemas/consentType.json | 20 ++ .../resources/META-INF/cxs/schemas/customitem.json | 20 ++ .../META-INF/cxs/schemas/customitems/page.json | 66 ++++++ .../META-INF/cxs/schemas/customitems/site.json | 13 ++ .../main/resources/META-INF/cxs/schemas/event.json | 29 +++ .../META-INF/cxs/schemas/events/modifyConsent.json | 20 ++ .../META-INF/cxs/schemas/events/view.json | 20 ++ .../main/resources/META-INF/cxs/schemas/goal.json | 18 ++ .../main/resources/META-INF/cxs/schemas/item.json | 31 +++ .../resources/META-INF/cxs/schemas/metadata.json | 44 ++++ .../META-INF/cxs/schemas/metadataitem.json | 14 ++ .../resources/META-INF/cxs/schemas/parameter.json | 20 ++ .../resources/META-INF/cxs/schemas/profile.json | 41 ++++ .../resources/META-INF/cxs/schemas/session.json | 41 ++++ .../META-INF/cxs/schemas/timestampeditem.json | 13 ++ .../META-INF/cxs/schemas/values/boolean.json | 6 + .../META-INF/cxs/schemas/values/date.json | 7 + .../META-INF/cxs/schemas/values/email.json | 7 + .../META-INF/cxs/schemas/values/integer.json | 6 + .../META-INF/cxs/schemas/values/long.json | 6 + .../resources/META-INF/cxs/schemas/values/set.json | 7 + .../META-INF/cxs/schemas/values/string.json | 6 + .../resources/OSGI-INF/blueprint/blueprint.xml | 8 + 47 files changed, 1485 insertions(+), 125 deletions(-) diff --cc services/src/main/java/org/apache/unomi/services/impl/events/EventServiceImpl.java index 00695f8,b831e05..7686797 --- a/services/src/main/java/org/apache/unomi/services/impl/events/EventServiceImpl.java +++ b/services/src/main/java/org/apache/unomi/services/impl/events/EventServiceImpl.java @@@ -31,14 -31,10 +31,10 @@@ import org.apache.unomi.api.ValueType import org.apache.unomi.api.actions.ActionPostExecutor; import org.apache.unomi.api.conditions.Condition; import org.apache.unomi.api.query.Query; - import org.apache.unomi.api.services.DefinitionsService; - import org.apache.unomi.api.services.EventListenerService; - import org.apache.unomi.api.services.EventService; - import org.apache.unomi.api.services.EventTypeRegistry; - import org.apache.unomi.api.services.SourceService; + import org.apache.unomi.api.services.*; import org.apache.unomi.persistence.spi.PersistenceService; import org.apache.unomi.persistence.spi.aggregate.TermsAggregate; -import org.apache.unomi.services.impl.ParserHelper; +import org.apache.unomi.api.utils.ParserHelper; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.slf4j.Logger; diff --cc services/src/main/java/org/apache/unomi/services/impl/segments/SegmentServiceImpl.java index f4844ce,57dacab..fc7470c --- a/services/src/main/java/org/apache/unomi/services/impl/segments/SegmentServiceImpl.java +++ b/services/src/main/java/org/apache/unomi/services/impl/segments/SegmentServiceImpl.java @@@ -38,8 -41,8 +41,7 @@@ import org.apache.unomi.api.services.Se import org.apache.unomi.persistence.spi.CustomObjectMapper; import org.apache.unomi.persistence.spi.aggregate.TermsAggregate; import org.apache.unomi.services.impl.AbstractServiceImpl; --import org.apache.unomi.services.impl.scheduler.SchedulerServiceImpl; -import org.apache.unomi.services.impl.ParserHelper; +import org.apache.unomi.api.utils.ParserHelper; import org.apache.unomi.api.exceptions.BadSegmentConditionException; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext;
