This is an automated email from the ASF dual-hosted git repository.
asi pushed a change to branch Unomi-487-backup
in repository https://gitbox.apache.org/repos/asf/unomi.git
from ce36a4c27 UNOMI-487 Add profile alias management to REST API and
GraphQL API
add c9eafca10 Update copyright year
add ca6f4c6b6 UNOMI-552 Fix failing integration tests - Improve
optimization criteria to make it a little more accepting of time variance - Fix
issue in merge action when using integration tests (no HTTP request/response
objects are available in this case)
add e6f7d49dd UNOMI-552 Fix failing integration tests - Fix unstable
segment integration test due to inconsistent profile state
add ffb9e72dd UNOMI-552 Fix failing integration tests - Add comment to
explain why we are using a <1 ratio for test validation
add d00f42672 Attempt to fix issue with release:prepare locking Unomi
startup.
add a0bfe54da Attempt to fix issue with release:prepare locking Unomi
startup. - Added a dependency to Unomi in Groovy actions feature - Added a
check of bundle states at initialization of Lifecycle Manager, in case it gets
started after bundles that are required.
add 4802e8e3c UNOMI-486 JSON Schema GraphQL integration (#387)
add adb183be6 Create archive for version 1.6 of Unomi manual
add 245f91f7a updated some typos (#391)
add 0cf8420e7 UNOMI-554 Improve server identification & various bug fixes
(#392)
add ace594ffe Use Maven Cache when building Unomi.
add 15f5c3b7c UNOMI-555 : add possiblity to store jsonSchema (#393)
add a32156f7e UNOMI-558: cleanup open resources (#394)
add 5c68fd4e0 Add deployment to snapshot repository and docker hub
add 4fdcbd495 Fixing snapshot and docker image deployment.
add 6bb93ec8f Setup docker hub auth for deployment to Docker hub
add 927125a0c Split into separate jobs
add 2797f7d4b Optimize jobs a little
add de259187a Run integration and unit tests in parallel
add c4df8725f Merge remote-tracking branch 'unomi/master' into
Unomi-487-backup
add 6703806a9 UNOMI-487 Add profile alias management to REST API and
GraphQL API
No new revisions were added by this update.
Summary of changes:
.github/workflows/unomi-ci-build-tests.yml | 24 +-
.github/workflows/unomi-ci-docs-deploy.yml | 50 ++--
NOTICE | 2 +-
.../main/java/org/apache/unomi/api/EventType.java | 73 -----
.../main/java/org/apache/unomi/api/ServerInfo.java | 48 ++++
.../UnomiJSONSchema.java} | 57 ++--
.../json/JSONArrayType.java} | 19 +-
.../unomi/api/schema/json/JSONBooleanType.java | 19 +-
.../apache/unomi/api/schema/json/JSONEnumType.java | 19 +-
.../unomi/api/schema/json/JSONIntegerType.java | 19 +-
.../apache/unomi/api/schema/json/JSONNullType.java | 19 +-
.../unomi/api/schema/json/JSONNumberType.java | 19 +-
.../unomi/api/schema/json/JSONObjectType.java | 50 ++++
.../apache/unomi/api/schema/json/JSONSchema.java | 106 ++++++++
.../unomi/api/schema/json/JSONStringType.java | 19 +-
.../org/apache/unomi/api/schema/json/JSONType.java | 102 +++++++
.../unomi/api/schema/json/JSONTypeFactory.java | 95 +++++++
.../apache/unomi/api/services/EventService.java | 16 +-
.../unomi/api/services/EventTypeRegistry.java | 59 -----
.../apache/unomi/api/services/PrivacyService.java | 14 +-
.../apache/unomi/api/services/SchemaRegistry.java | 83 +++++-
.../org/apache/unomi/api/utils/ParserHelper.java | 2 +-
docker/src/main/docker/docker-compose.yml | 4 +-
.../karaf-kar/src/main/feature/feature.xml | 2 +-
extensions/groovy-actions/rest/pom.xml | 2 +-
.../unomi/privacy/rest/PrivacyServiceEndPoint.java | 6 +
extensions/privacy-extension/services/pom.xml | 6 +
.../unomi/privacy/internal/PrivacyServiceImpl.java | 23 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 3 +
generate-site-and-upload.sh | 1 +
generate-site.sh | 1 +
.../graphql/schema/GraphQLSchemaProvider.java | 212 ++++++++++-----
.../unomi/graphql/schema/GraphQLSchemaUpdater.java | 10 +-
.../unomi/graphql/schema/PropertyFilterUtils.java | 26 +-
.../types/resolvers/CDPEventInterfaceResolver.java | 12 +-
.../test/java/org/apache/unomi/itests/AllITs.java | 5 +-
.../test/java/org/apache/unomi/itests/BaseIT.java | 203 ++++++++++++++
.../test/java/org/apache/unomi/itests/BasicIT.java | 4 +-
.../org/apache/unomi/itests/ContextServletIT.java | 161 +++++------
.../java/org/apache/unomi/itests/JSONSchemaIT.java | 131 +++++++++
.../org/apache/unomi/itests/PrivacyServiceIT.java | 81 ++++++
.../org/apache/unomi/itests/RuleServiceIT.java | 7 +-
.../java/org/apache/unomi/itests/SegmentIT.java | 5 +
.../java/org/apache/unomi/itests/TestUtils.java | 9 +
.../schemas/events/float-property-type.json | 22 ++
.../schemas/events/negative-test-event-type.json | 13 +
.../resources/schemas/events/test-event-type.json | 14 +
.../resources/schemas/events/test-invalid.json | 13 +
lifecycle-watcher/pom.xml | 8 +
.../org/apache/unomi/lifecycle/BundleWatcher.java | 270 +------------------
.../{BundleWatcher.java => BundleWatcherImpl.java} | 156 ++++++++---
.../resources/OSGI-INF/blueprint/blueprint.xml | 4 +-
.../main/resources/{logo.txt => unomi-logo.txt} | 2 -
.../{1.5 => 1.6}/asciidoc/5-min-quickstart.adoc | 0
.../src/archives/{1.3 => 1.6}/asciidoc/apache.css | 0
.../1.6}/asciidoc/building-and-deploying.adoc | 0
.../asciidoc/builtin-action-types.adoc | 0
.../asciidoc/builtin-condition-types.adoc | 0
.../{1.5 => 1.6}/asciidoc/builtin-event-types.adoc | 0
.../archives/{1.4 => 1.6}/asciidoc/clustering.adoc | 0
.../1.6}/asciidoc/configuration.adoc | 0
.../asciidoc/connectors/connectors.adoc | 0
.../asciidoc/connectors/mailchimp-connector.adoc | 0
.../asciidoc/connectors/salesforce-connector.adoc | 0
.../{1.4 => 1.6}/asciidoc/consent-api.adoc | 0
.../asciidoc/context-request-flow.adoc | 0
.../archives/{1.5 => 1.6}/asciidoc/datamodel.adoc | 0
.../{1.5 => 1.6}/asciidoc/getting-started.adoc | 0
.../asciidoc/how-profile-tracking-works.adoc | 0
.../{1.1 => 1.6}/asciidoc/images/asf_logo_url.png | Bin
.../asciidoc/images/data-model-overview.png | Bin
.../images/expression-filtering-layers.png | Bin
.../asciidoc/images/form-event-type.png | Bin
.../asciidoc/images/incubator-logo.png | Bin
.../asciidoc/images/login-event-type.png | Bin
.../asciidoc/images/modify-consent-event-type.png | Bin
.../{1.5 => 1.6}/asciidoc/images/profile.png | Bin
.../{1.1 => 1.6}/asciidoc/images/unomi-request.png | Bin
.../asciidoc/images/unomi-rule-engine.png | Bin
.../images/update-properties-event-type.png | Bin
.../src/archives/{1.5 => 1.6}/asciidoc/index.adoc | 0
.../asciidoc/migrations/migrate-1.4-to-1.5.adoc | 0
.../1.6}/asciidoc/migrations/migrations.adoc | 0
.../archives/{1.4 => 1.6}/asciidoc/patches.adoc | 0
.../archives/{1.5 => 1.6}/asciidoc/privacy.adoc | 0
.../asciidoc/profile-import-export.adoc | 0
.../asciidoc/queries-and-aggregations.adoc | 0
.../{main => archives/1.6}/asciidoc/recipes.adoc | 0
.../1.6}/asciidoc/request-examples.adoc | 0
.../asciidoc/samples/login-sample.adoc | 0
.../{1.5 => 1.6}/asciidoc/samples/samples.adoc | 0
.../1.6}/asciidoc/samples/twitter-sample.adoc | 0
.../asciidoc/samples/weather-update-sample.adoc | 0
.../{1.5 => 1.6}/asciidoc/shell-commands.adoc | 0
.../{1.5 => 1.6}/asciidoc/updating-events.adoc | 0
.../{1.4 => 1.6}/asciidoc/useful-unomi-urls.adoc | 0
.../{1.5 => 1.6}/asciidoc/web-tracker.adoc | 0
.../{1.5 => 1.6}/asciidoc/writing-plugins.adoc | 0
.../main/resources/etc/custom.system.properties | 2 +
.../conditions/ConditionContextHelper.java | 4 +-
.../META-INF/cxs/mappings/jsonschema.json | 7 +-
.../actions/MergeProfilesOnPropertyAction.java | 15 +-
pom.xml | 1 +
.../unomi/rest/endpoints/EventServiceEndpoint.java | 12 -
...erviceEndPoint.java => JsonSchemaEndPoint.java} | 87 +++---
.../services/impl/events/EventServiceImpl.java | 20 +-
.../impl/events/EventTypeRegistryImpl.java | 261 ------------------
.../services/impl/schemas/SchemaRegistryImpl.java | 295 +++++++++++++--------
...eKeyword.java => UnomiPropertyTypeKeyword.java} | 45 +++-
.../services/listener/JsonSchemaListener.java | 170 ++++++++++++
.../resources/META-INF/cxs/schemas/condition.json | 2 +-
.../META-INF/cxs/schemas/conditiontype.json | 6 +-
.../resources/META-INF/cxs/schemas/consent.json | 2 +-
.../META-INF/cxs/schemas/consentType.json | 2 +-
.../resources/META-INF/cxs/schemas/customitem.json | 4 +-
.../META-INF/cxs/schemas/customitems/page.json | 13 +-
.../META-INF/cxs/schemas/customitems/site.json | 11 +-
.../main/resources/META-INF/cxs/schemas/event.json | 4 +-
.../cxs/schemas/events/{view.json => form.json} | 19 +-
.../cxs/schemas/events/{view.json => login.json} | 20 +-
.../META-INF/cxs/schemas/events/modifyConsent.json | 22 +-
.../META-INF/cxs/schemas/events/view.json | 16 +-
.../main/resources/META-INF/cxs/schemas/goal.json | 8 +-
.../main/resources/META-INF/cxs/schemas/item.json | 4 +-
.../resources/META-INF/cxs/schemas/metadata.json | 2 +-
.../META-INF/cxs/schemas/metadataitem.json | 6 +-
.../resources/META-INF/cxs/schemas/parameter.json | 2 +-
.../resources/META-INF/cxs/schemas/profile.json | 4 +-
.../resources/META-INF/cxs/schemas/session.json | 6 +-
.../META-INF/cxs/schemas/timestampeditem.json | 4 +-
.../META-INF/cxs/schemas/values/boolean.json | 2 +-
.../META-INF/cxs/schemas/values/date.json | 2 +-
.../META-INF/cxs/schemas/values/email.json | 2 +-
.../META-INF/cxs/schemas/values/integer.json | 2 +-
.../META-INF/cxs/schemas/values/long.json | 2 +-
.../resources/META-INF/cxs/schemas/values/set.json | 2 +-
.../META-INF/cxs/schemas/values/string.json | 2 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 25 +-
.../main/resources/org.apache.unomi.services.cfg | 5 +-
.../shell/commands/DeploymentCommandSupport.java | 4 +-
140 files changed, 2118 insertions(+), 1336 deletions(-)
delete mode 100644 api/src/main/java/org/apache/unomi/api/EventType.java
rename api/src/main/java/org/apache/unomi/api/{SchemaType.java =>
schema/UnomiJSONSchema.java} (50%)
copy api/src/main/java/org/apache/unomi/api/{services/SchemaRegistry.java =>
schema/json/JSONArrayType.java} (71%)
copy metrics/src/main/java/org/apache/unomi/metrics/Metric.java =>
api/src/main/java/org/apache/unomi/api/schema/json/JSONBooleanType.java (75%)
copy metrics/src/main/java/org/apache/unomi/metrics/Metric.java =>
api/src/main/java/org/apache/unomi/api/schema/json/JSONEnumType.java (76%)
copy metrics/src/main/java/org/apache/unomi/metrics/Metric.java =>
api/src/main/java/org/apache/unomi/api/schema/json/JSONIntegerType.java (75%)
copy metrics/src/main/java/org/apache/unomi/metrics/Metric.java =>
api/src/main/java/org/apache/unomi/api/schema/json/JSONNullType.java (76%)
copy metrics/src/main/java/org/apache/unomi/metrics/Metric.java =>
api/src/main/java/org/apache/unomi/api/schema/json/JSONNumberType.java (76%)
create mode 100644
api/src/main/java/org/apache/unomi/api/schema/json/JSONObjectType.java
create mode 100644
api/src/main/java/org/apache/unomi/api/schema/json/JSONSchema.java
copy metrics/src/main/java/org/apache/unomi/metrics/Metric.java =>
api/src/main/java/org/apache/unomi/api/schema/json/JSONStringType.java (76%)
create mode 100644
api/src/main/java/org/apache/unomi/api/schema/json/JSONType.java
create mode 100644
api/src/main/java/org/apache/unomi/api/schema/json/JSONTypeFactory.java
delete mode 100644
api/src/main/java/org/apache/unomi/api/services/EventTypeRegistry.java
create mode 100644
itests/src/test/java/org/apache/unomi/itests/JSONSchemaIT.java
create mode 100644
itests/src/test/java/org/apache/unomi/itests/PrivacyServiceIT.java
create mode 100644
itests/src/test/resources/schemas/events/float-property-type.json
create mode 100644
itests/src/test/resources/schemas/events/negative-test-event-type.json
create mode 100644
itests/src/test/resources/schemas/events/test-event-type.json
create mode 100644 itests/src/test/resources/schemas/events/test-invalid.json
copy
lifecycle-watcher/src/main/java/org/apache/unomi/lifecycle/{BundleWatcher.java
=> BundleWatcherImpl.java} (63%)
rename lifecycle-watcher/src/main/resources/{logo.txt => unomi-logo.txt} (93%)
copy manual/src/archives/{1.5 => 1.6}/asciidoc/5-min-quickstart.adoc (100%)
copy manual/src/archives/{1.3 => 1.6}/asciidoc/apache.css (100%)
copy manual/src/{main => archives/1.6}/asciidoc/building-and-deploying.adoc
(100%)
copy manual/src/archives/{1.5 => 1.6}/asciidoc/builtin-action-types.adoc (100%)
copy manual/src/archives/{1.5 => 1.6}/asciidoc/builtin-condition-types.adoc
(100%)
copy manual/src/archives/{1.5 => 1.6}/asciidoc/builtin-event-types.adoc (100%)
copy manual/src/archives/{1.4 => 1.6}/asciidoc/clustering.adoc (100%)
copy manual/src/{main => archives/1.6}/asciidoc/configuration.adoc (100%)
copy manual/src/archives/{1.5 => 1.6}/asciidoc/connectors/connectors.adoc
(100%)
copy manual/src/archives/{1.4 =>
1.6}/asciidoc/connectors/mailchimp-connector.adoc (100%)
copy manual/src/archives/{1.5 =>
1.6}/asciidoc/connectors/salesforce-connector.adoc (100%)
copy manual/src/archives/{1.4 => 1.6}/asciidoc/consent-api.adoc (100%)
copy manual/src/archives/{1.5 => 1.6}/asciidoc/context-request-flow.adoc (100%)
copy manual/src/archives/{1.5 => 1.6}/asciidoc/datamodel.adoc (100%)
copy manual/src/archives/{1.5 => 1.6}/asciidoc/getting-started.adoc (100%)
copy manual/src/archives/{1.4 => 1.6}/asciidoc/how-profile-tracking-works.adoc
(100%)
copy manual/src/archives/{1.1 => 1.6}/asciidoc/images/asf_logo_url.png (100%)
copy manual/src/archives/{1.5 => 1.6}/asciidoc/images/data-model-overview.png
(100%)
copy manual/src/archives/{1.5 =>
1.6}/asciidoc/images/expression-filtering-layers.png (100%)
copy manual/src/archives/{1.5 => 1.6}/asciidoc/images/form-event-type.png
(100%)
copy manual/src/archives/{1.1 => 1.6}/asciidoc/images/incubator-logo.png (100%)
copy manual/src/archives/{1.5 => 1.6}/asciidoc/images/login-event-type.png
(100%)
copy manual/src/archives/{1.5 =>
1.6}/asciidoc/images/modify-consent-event-type.png (100%)
copy manual/src/archives/{1.5 => 1.6}/asciidoc/images/profile.png (100%)
copy manual/src/archives/{1.1 => 1.6}/asciidoc/images/unomi-request.png (100%)
copy manual/src/archives/{1.4 => 1.6}/asciidoc/images/unomi-rule-engine.png
(100%)
copy manual/src/archives/{1.5 =>
1.6}/asciidoc/images/update-properties-event-type.png (100%)
copy manual/src/archives/{1.5 => 1.6}/asciidoc/index.adoc (100%)
copy manual/src/archives/{1.5 =>
1.6}/asciidoc/migrations/migrate-1.4-to-1.5.adoc (100%)
copy manual/src/{main => archives/1.6}/asciidoc/migrations/migrations.adoc
(100%)
copy manual/src/archives/{1.4 => 1.6}/asciidoc/patches.adoc (100%)
copy manual/src/archives/{1.5 => 1.6}/asciidoc/privacy.adoc (100%)
copy manual/src/archives/{1.4 => 1.6}/asciidoc/profile-import-export.adoc
(100%)
copy manual/src/archives/{1.4 => 1.6}/asciidoc/queries-and-aggregations.adoc
(100%)
copy manual/src/{main => archives/1.6}/asciidoc/recipes.adoc (100%)
copy manual/src/{main => archives/1.6}/asciidoc/request-examples.adoc (100%)
copy manual/src/archives/{1.5 => 1.6}/asciidoc/samples/login-sample.adoc (100%)
copy manual/src/archives/{1.5 => 1.6}/asciidoc/samples/samples.adoc (100%)
copy manual/src/{main => archives/1.6}/asciidoc/samples/twitter-sample.adoc
(100%)
copy manual/src/archives/{1.3 =>
1.6}/asciidoc/samples/weather-update-sample.adoc (100%)
copy manual/src/archives/{1.5 => 1.6}/asciidoc/shell-commands.adoc (100%)
copy manual/src/archives/{1.5 => 1.6}/asciidoc/updating-events.adoc (100%)
copy manual/src/archives/{1.4 => 1.6}/asciidoc/useful-unomi-urls.adoc (100%)
copy manual/src/archives/{1.5 => 1.6}/asciidoc/web-tracker.adoc (100%)
copy manual/src/archives/{1.5 => 1.6}/asciidoc/writing-plugins.adoc (100%)
copy
extensions/groovy-actions/services/src/main/resources/META-INF/cxs/mappings/groovyAction.json
=>
persistence-elasticsearch/core/src/main/resources/META-INF/cxs/mappings/jsonschema.json
(87%)
copy
rest/src/main/java/org/apache/unomi/rest/endpoints/{UserListServiceEndPoint.java
=> JsonSchemaEndPoint.java} (50%)
delete mode 100644
services/src/main/java/org/apache/unomi/services/impl/events/EventTypeRegistryImpl.java
rename
services/src/main/java/org/apache/unomi/services/impl/schemas/{PropertyTypeKeyword.java
=> UnomiPropertyTypeKeyword.java} (68%)
create mode 100644
services/src/main/java/org/apache/unomi/services/listener/JsonSchemaListener.java
copy services/src/main/resources/META-INF/cxs/schemas/events/{view.json =>
form.json} (57%)
copy services/src/main/resources/META-INF/cxs/schemas/events/{view.json =>
login.json} (52%)
