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 2021/10/13 11:18:09 UTC
[unomi] branch draft-custom-items updated (26c85f3 -> 39bf254)
This is an automated email from the ASF dual-hosted git repository.
shuber pushed a change to branch draft-custom-items
in repository https://gitbox.apache.org/repos/asf/unomi.git.
from 26c85f3 Modify property condition builders to use collections instead of lists (works with sets now)
add ac71863 return the result of the groovy action dispatcher (#346)
add 27c280f UNOMI-513: fix scoring plan recalculation (#348)
add 6106e95 [UNOMI-508] - Updated the documentation to include Groovy Actions (#347)
add 3c2f200 fix build doc step in CI (#349)
add c36be8c UNOMI-514 : increase the number of authorized characters in validation pattern (#350)
add d9d8ec2 remove timer when stopping groovy extensions (#352)
add 1d44d76 JSON Schema integration
add 9e8dad5 JSON Schema integration
new 86e0d81 Merge branch 'draft-json-schema-integration' into draft-custom-items
new 39bf254 Fix merge issue
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../api/{EventSource.java => SchemaType.java} | 49 +++--
.../apache/unomi/api/services/SchemaRegistry.java | 19 +-
.../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 | 115 ++++++-----
.../painless/evaluateScoringPlanElement.painless | 52 +++++
.../cxs/painless/resetScoringPlan.painless | 19 +-
.../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, 1446 insertions(+), 140 deletions(-)
copy api/src/main/java/org/apache/unomi/api/{EventSource.java => SchemaType.java} (53%)
copy metrics/src/main/java/org/apache/unomi/metrics/CallerCount.java => api/src/main/java/org/apache/unomi/api/services/SchemaRegistry.java (75%)
create mode 100644 services/src/main/java/org/apache/unomi/services/impl/schemas/PropertyTypeKeyword.java
create mode 100644 services/src/main/java/org/apache/unomi/services/impl/schemas/SchemaRegistryImpl.java
create mode 100644 services/src/main/resources/META-INF/cxs/painless/evaluateScoringPlanElement.painless
copy api/src/main/java/org/apache/unomi/api/PersonalizationStrategy.java => services/src/main/resources/META-INF/cxs/painless/resetScoringPlan.painless (59%)
create mode 100644 services/src/main/resources/META-INF/cxs/schemas/condition.json
create mode 100644 services/src/main/resources/META-INF/cxs/schemas/conditiontype.json
create mode 100644 services/src/main/resources/META-INF/cxs/schemas/consent.json
create mode 100644 services/src/main/resources/META-INF/cxs/schemas/consentType.json
create mode 100644 services/src/main/resources/META-INF/cxs/schemas/customitem.json
create mode 100644 services/src/main/resources/META-INF/cxs/schemas/customitems/page.json
create mode 100644 services/src/main/resources/META-INF/cxs/schemas/customitems/site.json
create mode 100644 services/src/main/resources/META-INF/cxs/schemas/event.json
create mode 100644 services/src/main/resources/META-INF/cxs/schemas/events/modifyConsent.json
create mode 100644 services/src/main/resources/META-INF/cxs/schemas/events/view.json
create mode 100644 services/src/main/resources/META-INF/cxs/schemas/goal.json
create mode 100644 services/src/main/resources/META-INF/cxs/schemas/item.json
create mode 100644 services/src/main/resources/META-INF/cxs/schemas/metadata.json
create mode 100644 services/src/main/resources/META-INF/cxs/schemas/metadataitem.json
create mode 100644 services/src/main/resources/META-INF/cxs/schemas/parameter.json
create mode 100644 services/src/main/resources/META-INF/cxs/schemas/profile.json
create mode 100644 services/src/main/resources/META-INF/cxs/schemas/session.json
create mode 100644 services/src/main/resources/META-INF/cxs/schemas/timestampeditem.json
create mode 100644 services/src/main/resources/META-INF/cxs/schemas/values/boolean.json
create mode 100644 services/src/main/resources/META-INF/cxs/schemas/values/date.json
create mode 100644 services/src/main/resources/META-INF/cxs/schemas/values/email.json
create mode 100644 services/src/main/resources/META-INF/cxs/schemas/values/integer.json
create mode 100644 services/src/main/resources/META-INF/cxs/schemas/values/long.json
create mode 100644 services/src/main/resources/META-INF/cxs/schemas/values/set.json
create mode 100644 services/src/main/resources/META-INF/cxs/schemas/values/string.json
[unomi] 02/02: Fix merge issue
Posted by sh...@apache.org.
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 39bf25471810b3afc46bbe5575da45a627c26de5
Author: Serge Huber <sh...@jahia.com>
AuthorDate: Wed Oct 13 13:18:01 2021 +0200
Fix merge issue
---
.../java/org/apache/unomi/services/impl/segments/SegmentServiceImpl.java | 1 +
1 file changed, 1 insertion(+)
diff --git 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
index fc7470c..b4bd9e3 100644
--- 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
@@ -41,6 +41,7 @@ import org.apache.unomi.api.services.SegmentService;
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.api.utils.ParserHelper;
import org.apache.unomi.api.exceptions.BadSegmentConditionException;
import org.osgi.framework.Bundle;
[unomi] 01/02: Merge branch 'draft-json-schema-integration' into
draft-custom-items
Posted by sh...@apache.org.
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 <sh...@jahia.com>
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;