This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/graphql/graphql-playground/ansi-regex-4.1.1 in repository https://gitbox.apache.org/repos/asf/unomi.git
discard 0c6eeb396 Bump ansi-regex from 4.1.0 to 4.1.1 in /graphql/graphql-playground 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 9732487ab UNOMI-487 Add profile alias management to REST API and GraphQL API (#403) add 032e74ab4 first commit to fix tests (#404) add 018685381 Switch to using -ntp instead of -B for Maven builds add 251e667c1 UNOMI-561 : add endpoint to register json extensions (#406) add a374c88c9 UNOMI-562 (#407) add 81cfd7995 Quick typo fixes add bf09fe44b UNOMI-562 : remove bean validation (#412) add 74b829c60 UNOMI-565 : add code coverage report (#411) add 2bb8be841 UNOMI-562 : fix deserializers (#415) add 7fb9f17b1 UNOMI-563 : do not allow to save schema with invalid name (#410) add ef845b247 UNOMI-567 : filter out warnings from RestClient (#416) add 3c69586e2 UNOMI-567 : allow to set log level of rest client (#418) add 3e3a8eeee UNOMI-563 : fix IT tests (#419) add c53aa2e3f UNOMI-568: refacto json-schema implementation (#421) add 9adb27986 UNOMI-569 : change pattern for context request source id (#423) add a6a3b0313 UNOMI-395 : add endpoint to store scopes (#424) add dcc6cd8d2 UNOMI-571: JSON Schema extensions system (#426) add f2972a186 [UNOMI-564] - Misinformation in some descriptions in online site docs (#409) add da80579b1 UNOMI-395 : add migration logic to create scopes entries from scope i… (#427) add 3351b6c54 UNOMI-578: Allow for external vendor for JSON schemas deployed into t… (#430) add 582867561 UNOMI-580 : add endpoint to get schema + clean (#429) add 24d0ad372 UNOMI-579 Fix Condition evaluator integration test date calculation (#431) add 89200bf63 UNOMI-557: Optimize the profile update during segment deletion (#433) add 2e6a6e8f1 UNOMI-584: introduce new flattenedProperties for events, to allow map… (#434) add 787fa25ce UNOMI-582 GraphQL as feature flag (#432) add b363dd573 UNOMI-569 Flatten JSON Schemas & fix schema bugs (#428) add ce4294488 UNOMI-593 : set filename mapping to match item type (#437) add e182bf384 UNOMI-594: allow for URLParameters in view event using new flattenedProperties (#438) add 01bf2ea9a UNOMI-596: add missing property accessor for making condition working on flattenedProperties (#439) add 7e643ac22 UNOMI-585: introduce new nestedCondition and set profile.properties.interests as nested (#442) add 130c29d39 UNOMI-597: do not persist internal events (#441) add 6cb7a1cec UNOMI-595: upgrade json-schema-validation lib to 1.0.71 and fix URLParameter schema (#444) add da87365b1 UNOMI-607: missing view properties schema (#445) add 77c2ef4ba UNOMI-505 Study replication of existing profileIDs into new alias index (#440) add 41d5bf625 [UNOMI-592] - a tip for building on non-English Windows env (#435) add e8c5b4342 UNOMI-611 : update systemTags and automaticMappingsFrom on existing objects add 3264cdb8a Merge pull request #447 from apache/UNOMI-611-add-additional-information-to-objects add 60fb73b6c UNOMI-586: Optimize ES mappings by ignoring conditions and Objects that are not used for queries (#448) add 1a2140b20 UNOMI-393 Implement default field visibility provider that allows sending events and retrieving current profile (#405) add 5898b7dc8 UNOMI-598 : add keyword to validate scopes (#449) add 573f6a73a UNOMI-618 : rename property for more consistency (#451) add 49456fe10 UNOMI-609 : remove web tracker (#454) add 549f3459c Bump ansi-regex from 4.1.0 to 4.1.1 in /graphql/graphql-playground This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0c6eeb396) \ N -- N -- N refs/heads/dependabot/npm_and_yarn/graphql/graphql-playground/ansi-regex-4.1.1 (549f3459c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .github/codeql/codeql-config.yml | 4 + ...odeql-analysis.yml => codeql-analysis-java.yml} | 36 +- ...analysis.yml => codeql-analysis-javascript.yml} | 10 +- .github/workflows/unomi-ci-build-tests.yml | 46 +- .github/workflows/unomi-ci-docs-deploy.yml | 50 +- .gitignore | 3 +- api/pom.xml | 5 + api/src/main/java/org/apache/unomi/api/Event.java | 25 +- .../json/JSONIntegerType.java => Scope.java} | 23 +- .../apache/unomi/api/schema/UnomiJSONSchema.java | 71 - .../apache/unomi/api/services/EventService.java | 9 - .../apache/unomi/api/services/ProfileService.java | 30 + .../apache/unomi/api/services/ScopeService.java | 46 +- extensions/{web-tracker => json-schema}/pom.xml | 12 +- {rest => extensions/json-schema/rest}/pom.xml | 102 +- .../unomi/schema/rest/JsonSchemaEndPoint.java | 117 ++ extensions/json-schema/services/pom.xml | 154 ++ .../apache/unomi/schema/api/JsonSchemaWrapper.java | 100 ++ .../org/apache/unomi/schema/api/SchemaService.java | 75 +- .../unomi/schema/impl/SchemaServiceImpl.java | 373 +++++ .../apache/unomi/schema/keyword/ScopeKeyword.java | 30 +- .../unomi/schema/keyword/ScopeValidator.java | 54 + .../unomi/schema}/listener/JsonSchemaListener.java | 87 +- .../META-INF/cxs/schemas/events}/event.json | 20 +- .../incrementInterest.flattenProperties.json | 18 + .../incrementInterest/incrementInterest.json | 20 + .../META-INF/cxs/schemas/events/login}/login.json | 7 +- .../events/modifyConsent}/modifyConsent.json | 14 +- .../modifyConsent/modifyConsent.properties.json | 18 + .../events/updateProperties/updateProperties.json | 15 +- .../events/view/view.flattenProperties.json | 21 + .../META-INF/cxs/schemas/events/view}/view.json | 17 +- .../cxs/schemas/events/view/view.properties.json | 14 + .../schemas/items/URLParameters/URLParameters.json | 21 + .../cxs/schemas/items/consent}/consent.json | 14 +- .../cxs/schemas/items/consent}/consentType.json | 9 +- .../cxs/schemas/items/interests/interests.json | 18 + .../META-INF/cxs/schemas/items}/item.json | 14 +- .../META-INF/cxs/schemas/items/page/page.json | 19 + .../items/page/page.properties.attributes.json | 15 + .../cxs/schemas/items/page/page.properties.json | 27 + .../items/page/page.properties.pageInfo.json | 63 + .../META-INF/cxs/schemas/items/site/site.json | 14 + .../cxs/schemas/items}/timestampeditem.json | 9 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 53 + .../src/main/resources/org.apache.unomi.schema.cfg | 19 + .../unomi/lists/actions/AddToListsAction.java | 4 +- extensions/pom.xml | 2 +- .../unomi/privacy/internal/PrivacyServiceImpl.java | 20 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 1 - extensions/web-tracker/README.md | 48 - extensions/web-tracker/javascript/.gitignore | 1 - extensions/web-tracker/javascript/.npmignore | 7 - .../web-tracker/javascript/NPM-RELEASE-GUIDE.md | 22 - extensions/web-tracker/javascript/README.md | 111 -- extensions/web-tracker/javascript/package.json | 36 - extensions/web-tracker/javascript/pom.xml | 114 -- .../src/analytics.js-integration-apache-unomi.js | 626 ------- extensions/web-tracker/javascript/src/index.js | 50 - .../web-tracker/javascript/src/integrations.js | 22 - extensions/web-tracker/javascript/src/license.js | 18 - extensions/web-tracker/javascript/src/snippet.js | 86 - extensions/web-tracker/javascript/yarn.lock | 1756 -------------------- extensions/web-tracker/karaf-kar/pom.xml | 79 - .../karaf-kar/src/main/feature/feature.xml | 27 - extensions/web-tracker/wab/.gitignore | 3 - extensions/web-tracker/wab/pom.xml | 85 - .../META-INF/cxs/rules/form-mapping-example.json | 52 - .../wab/src/main/webapp/basic_test.html | 33 - .../web-tracker/wab/src/main/webapp/index.html | 213 --- graphql/cxs-impl/pom.xml | 6 + .../unomi/graphql/actions/CDPSessionAction.java | 5 +- .../graphql/commands/AddAliasToProfileCommand.java | 66 + .../commands/RemoveAliasFromProfileCommand.java | 69 + .../factories/ProfileAliasConditionFactory.java | 77 + .../FindProfileAliasConnectionDataFetcher.java | 71 + .../profile/GetProfileAliasesDataFetcher.java | 47 + .../fetchers/profile/ProfileAliasDataFetcher.java | 41 + .../graphql/schema/GraphQLSchemaProvider.java | 78 +- .../unomi/graphql/schema/GraphQLSchemaUpdater.java | 10 +- .../unomi/graphql}/schema/json/JSONArrayType.java | 2 +- .../graphql}/schema/json/JSONBooleanType.java | 2 +- .../unomi/graphql}/schema/json/JSONEnumType.java | 2 +- .../graphql}/schema/json/JSONIntegerType.java | 2 +- .../unomi/graphql}/schema/json/JSONNullType.java | 2 +- .../unomi/graphql}/schema/json/JSONNumberType.java | 2 +- .../unomi/graphql}/schema/json/JSONObjectType.java | 13 +- .../unomi/graphql}/schema/json/JSONSchema.java | 2 +- .../unomi/graphql}/schema/json/JSONStringType.java | 2 +- .../unomi/graphql}/schema/json/JSONType.java | 2 +- .../graphql}/schema/json/JSONTypeFactory.java | 16 +- .../unomi/graphql/servlet/GraphQLServlet.java | 14 +- .../auth/GraphQLServletSecurityValidator.java | 147 ++ .../types/input/CDPProfileAliasFilterInput.java | 83 + .../graphql/types/input/CDPProfileAliasInput.java | 53 + .../unomi/graphql/types/output/CDPMutation.java | 27 + .../graphql/types/output/CDPProfileAlias.java | 66 + .../types/output/CDPProfileAliasConnection.java | 66 + .../graphql/types/output/CDPProfileAliasEdge.java | 49 + .../unomi/graphql/types/output/CDPQuery.java | 36 +- .../types/resolvers/CDPEventInterfaceResolver.java | 13 +- .../apache/unomi/graphql/utils/EventBuilder.java | 2 +- graphql/karaf-feature/src/main/feature/feature.xml | 10 +- itests/jacoco-report.sh | 47 + itests/pom.xml | 76 +- .../test/java/org/apache/unomi/itests/AllITs.java | 4 +- .../test/java/org/apache/unomi/itests/BaseIT.java | 243 +-- .../test/java/org/apache/unomi/itests/BasicIT.java | 46 +- .../unomi/itests/ConditionESQueryBuilderIT.java | 10 +- .../apache/unomi/itests/ConditionEvaluatorIT.java | 72 +- .../org/apache/unomi/itests/ContextServletIT.java | 325 ++-- .../unomi/itests/CopyPropertiesActionIT.java | 32 +- .../org/apache/unomi/itests/EventServiceIT.java | 76 +- .../unomi/itests/GroovyActionsServiceIT.java | 24 +- .../apache/unomi/itests/IncrementInterestsIT.java | 32 +- .../apache/unomi/itests/IncrementPropertyIT.java | 48 +- .../org/apache/unomi/itests/InputValidationIT.java | 72 +- .../java/org/apache/unomi/itests/JSONSchemaIT.java | 332 +++- .../org/apache/unomi/itests/ModifyConsentIT.java | 24 +- .../test/java/org/apache/unomi/itests/PatchIT.java | 8 +- .../org/apache/unomi/itests/PrivacyServiceIT.java | 34 +- .../org/apache/unomi/itests/ProfileExportIT.java | 20 +- .../apache/unomi/itests/ProfileImportActorsIT.java | 29 +- .../apache/unomi/itests/ProfileImportBasicIT.java | 2 +- .../unomi/itests/ProfileImportRankingIT.java | 34 +- .../unomi/itests/ProfileImportSurfersIT.java | 63 +- .../org/apache/unomi/itests/ProfileMergeIT.java | 38 +- .../org/apache/unomi/itests/ProfileServiceIT.java | 78 +- .../itests/ProfileServiceWithoutOverwriteIT.java | 15 +- .../unomi/itests/PropertiesUpdateActionIT.java | 55 +- .../test/java/org/apache/unomi/itests/ScopeIT.java | 128 ++ .../java/org/apache/unomi/itests/SecurityIT.java | 12 +- .../java/org/apache/unomi/itests/SegmentIT.java | 242 +-- .../org/apache/unomi/itests/SendEventActionIT.java | 124 ++ .../java/org/apache/unomi/itests/TestUtils.java | 14 +- .../apache/unomi/itests/graphql/BaseGraphQLIT.java | 20 +- .../itests/graphql/GraphQLProfileAliasesIT.java | 104 ++ .../itests/graphql/GraphQLServletSecurityIT.java | 86 + .../graphql/profileAlias/addAliasToProfile.json | 16 + .../graphql/profileAlias/findProfileAliases.json | 8 + .../graphql/profileAlias/getProfileAlias.json | 5 + .../graphql/profileAlias/getProfileAliases.json | 5 + .../profileAlias/removeAliasFromProfile.json | 13 + .../graphql/{event => security}/get-event.json | 0 .../get-profile.json} | 0 .../graphql/{segment => security}/get-segment.json | 0 .../{event => security}/process-events.json | 0 .../test/resources/graphql/security/subscribe.json | 5 + itests/src/test/resources/patch4.json | 1 - .../resources/personalization-controlgroup.json | 79 +- itests/src/test/resources/personalization.json | 62 +- .../resources/schemas/event-dummy-extended-2.json | 11 + .../resources/schemas/event-dummy-extended.json | 10 + .../resources/schemas/event-dummy-invalid-1.json | 9 + .../resources/schemas/event-dummy-invalid-2.json | 9 + .../resources/schemas/event-dummy-invalid-3.json | 8 + .../resources/schemas/event-dummy-invalid-4.json | 8 + .../test/resources/schemas/event-dummy-valid.json | 8 + .../schemas/event-flattened-invalid-1.json | 14 + .../schemas/event-flattened-invalid-2.json | 16 + .../schemas/event-flattened-invalid-3.json | 13 + .../resources/schemas/event-flattened-valid.json | 13 + .../src/test/resources/schemas/event-request.json | 6 + .../schemas/events/float-property-type.json | 7 +- .../resources/schemas/events/test-event-type.json | 5 +- .../resources/schemas/schema-dummy-extension.json | 18 + .../schema-dummy-properties-extension-2.json | 21 + .../schemas/schema-dummy-properties-extension.json | 18 + .../schemas/schema-dummy-properties-updated.json | 24 + .../resources/schemas/schema-dummy-properties.json | 26 + .../src/test/resources/schemas/schema-dummy.json | 22 + ...ma-flattened-flattenedProperties-interests.json | 19 + .../schema-flattened-flattenedProperties.json | 18 + .../schemas/schema-flattened-properties.json | 18 + .../test/resources/schemas/schema-flattened.json | 25 + ...st-event-type.json => schema-invalid-name.json} | 11 +- .../test-invalid.json => schema-invalid.json} | 4 +- ...test-event-type.json => schema-predefined.json} | 8 +- itests/src/test/resources/scope/scope-test1.json | 7 + .../eventcollector_invalidSessionId.json | 12 +- .../eventcollector_request_size_invalid.json | 12 +- .../eventcollector_request_size_valid.json | 12 +- .../resources/validation/eventcollector_valid.json | 12 +- kar/pom.xml | 15 +- kar/src/main/feature/feature.xml | 10 +- lifecycle-watcher/pom.xml | 13 +- .../org/apache/unomi/lifecycle/BundleWatcher.java | 4 +- .../apache/unomi/lifecycle/BundleWatcherImpl.java | 207 ++- .../resources/OSGI-INF/blueprint/blueprint.xml | 6 + manual/src/archives/1.4/asciidoc/index.adoc | 2 +- .../1.5/asciidoc/building-and-deploying.adoc | 15 +- .../1.5/asciidoc/connectors/connectors.adoc | 2 +- manual/src/archives/1.5/asciidoc/datamodel.adoc | 6 +- .../1.6/asciidoc/building-and-deploying.adoc | 15 +- .../1.6/asciidoc/connectors/connectors.adoc | 2 +- manual/src/archives/1.6/asciidoc/datamodel.adoc | 6 +- manual/src/main/asciidoc/5-min-quickstart.adoc | 2 - .../src/main/asciidoc/building-and-deploying.adoc | 15 +- manual/src/main/asciidoc/builtin-event-types.adoc | 8 +- .../src/main/asciidoc/connectors/connectors.adoc | 2 +- manual/src/main/asciidoc/datamodel.adoc | 6 +- manual/src/main/asciidoc/index.adoc | 2 - manual/src/main/asciidoc/request-examples.adoc | 1 - manual/src/main/asciidoc/web-tracker.adoc | 380 ----- package/pom.xml | 12 - .../main/resources/etc/custom.system.properties | 13 +- persistence-elasticsearch/core/pom.xml | 10 +- .../ElasticSearchPersistenceServiceImpl.java | 21 +- .../mappings/{actiontype.json => actionType.json} | 0 .../resources/META-INF/cxs/mappings/campaign.json | 4 + .../{actiontype.json => conditionType.json} | 8 +- .../resources/META-INF/cxs/mappings/event.json | 3 + .../{conditiontype.json => exportConfig.json} | 0 .../main/resources/META-INF/cxs/mappings/goal.json | 8 + .../{exportconfig.json => importConfig.json} | 0 .../resources/META-INF/cxs/mappings/patch.json | 3 +- .../resources/META-INF/cxs/mappings/profile.json | 3 + .../{actiontype.json => profileAlias.json} | 12 +- .../main/resources/META-INF/cxs/mappings/rule.json | 4 + .../cxs/mappings/{importconfig.json => scope.json} | 6 +- .../resources/META-INF/cxs/mappings/scoring.json | 8 + .../resources/META-INF/cxs/mappings/segment.json | 4 + .../resources/OSGI-INF/blueprint/blueprint.xml | 2 + .../org.apache.unomi.persistence.elasticsearch.cfg | 3 + .../unomi/persistence/spi/CustomObjectMapper.java | 10 + .../actions/IncrementInterestAction.java | 2 +- .../actions/MergeProfilesOnPropertyAction.java | 3 +- .../baseplugin/actions/SendEventAction.java | 10 +- .../baseplugin/actions/SetPropertyAction.java | 2 +- .../conditions/NestedConditionESQueryBuilder.java | 46 + .../conditions/NestedConditionEvaluator.java | 129 ++ .../conditions/accessors/EventAccessor.java | 3 + .../cxs/conditions/formEventCondition.json | 3 +- .../geoLocationByPointSessionCondition.json | 5 +- .../conditions/geoLocationSessionCondition.json | 5 +- .../cxs/conditions/goalMatchCondition.json | 4 +- .../META-INF/cxs/conditions/nestedCondition.json | 29 + .../cxs/conditions/newVisitorCondition.json | 4 +- .../cxs/conditions/pastEventCondition.json | 4 +- .../cxs/conditions/profilePropertyCondition.json | 134 +- .../cxs/conditions/profileSegmentCondition.json | 66 +- .../cxs/conditions/profileUserListCondition.json | 3 +- .../cxs/conditions/returningVisitorCondition.json | 4 +- .../META-INF/cxs/conditions/scoringCondition.json | 3 +- .../cxs/conditions/sessionDurationCondition.json | 4 +- .../cxs/conditions/sessionPropertyCondition.json | 4 +- .../cxs/conditions/videoViewEventCondition.json | 3 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 25 +- .../conditions/NestedConditionEvaluatorTest.java | 109 ++ .../conditions/PropertyConditionEvaluatorTest.java | 7 + pom.xml | 4 + rest/pom.xml | 6 + .../deserializers/ContextRequestDeserializer.java | 138 ++ .../EventsCollectorRequestDeserializer.java | 75 + .../unomi/rest/endpoints/ContextJsonEndpoint.java | 51 +- .../rest/endpoints/EventsCollectorEndpoint.java | 8 +- .../unomi/rest/endpoints/JsonSchemaEndPoint.java | 109 -- .../rest/endpoints/ProfileServiceEndPoint.java | 27 + .../unomi/rest/endpoints/ScopeServiceEndPoint.java | 111 ++ .../InvalidRequestException.java | 7 +- .../exception/InvalidRequestExceptionMapper.java | 4 +- .../org/apache/unomi/rest/server/RestServer.java | 43 +- .../RetroCompatibilityParamConverterProvider.java | 4 +- .../rest/service/impl/RestServiceUtilsImpl.java | 26 +- .../rest/validation/BeanValidationService.java | 32 - .../JAXRSBeanValidationInInterceptorOverride.java | 42 - .../validation/impl/BeanValidationServiceImpl.java | 48 - .../request/RequestValidatorInterceptor.java | 1 + .../cxs/schemas/rest/eventscollectorrequest.json | 22 + .../META-INF/cxs/schemas/rest/requestIds.json | 26 + services/pom.xml | 11 - .../services/impl/events/EventServiceImpl.java | 11 +- .../services/impl/goals/GoalsServiceImpl.java | 1 + .../services/impl/profiles/ProfileServiceImpl.java | 47 + .../services/impl/schemas/SchemaRegistryImpl.java | 276 --- .../impl/schemas/UnomiPropertyTypeKeyword.java | 127 -- .../services/impl/scope/ScopeServiceImpl.java | 100 ++ .../services/impl/segments/SegmentServiceImpl.java | 26 +- .../META-INF/cxs/events/anonymizeProfile.json | 39 - .../META-INF/cxs/events/articleCompleted.json | 77 - .../main/resources/META-INF/cxs/events/form.json | 77 - .../main/resources/META-INF/cxs/events/goal.json | 83 - .../resources/META-INF/cxs/events/identify.json | 73 - .../META-INF/cxs/events/incrementInterest.json | 49 - .../main/resources/META-INF/cxs/events/login.json | 73 - .../META-INF/cxs/events/modifyConsent.json | 105 -- .../META-INF/cxs/events/profileDeleted.json | 39 - .../META-INF/cxs/events/profileUpdated.json | 39 - .../resources/META-INF/cxs/events/ruleFired.json | 91 - .../main/resources/META-INF/cxs/events/search.json | 53 - .../META-INF/cxs/events/sessionCreated.json | 56 - .../META-INF/cxs/events/sessionReassigned.json | 59 - .../META-INF/cxs/events/updateProperties.json | 69 - .../main/resources/META-INF/cxs/events/view.json | 77 - .../cxs/properties/profiles/basic/firstName.json | 6 +- .../cxs/properties/profiles/basic/gender.json | 6 +- .../cxs/properties/profiles/basic/lastName.json | 6 +- .../cxs/properties/profiles/basic/nationality.json | 8 +- .../cxs/properties/profiles/contact/city.json | 10 +- .../properties/profiles/contact/countryName.json | 4 +- .../cxs/properties/profiles/contact/email.json | 6 +- .../cxs/properties/profiles/contact/zipCode.json | 2 +- .../properties/profiles/personal/birthDate.json | 6 +- .../cxs/properties/profiles/social/facebookId.json | 6 +- .../cxs/properties/profiles/social/linkedInId.json | 6 +- .../cxs/properties/profiles/social/twitterId.json | 6 +- .../cxs/properties/profiles/work/company.json | 6 +- .../cxs/properties/profiles/work/income.json | 6 +- .../cxs/properties/profiles/work/jobTitle.json | 10 +- .../resources/META-INF/cxs/schemas/condition.json | 15 - .../META-INF/cxs/schemas/conditiontype.json | 22 - .../resources/META-INF/cxs/schemas/customitem.json | 20 - .../META-INF/cxs/schemas/customitems/page.json | 73 - .../META-INF/cxs/schemas/customitems/site.json | 20 - .../META-INF/cxs/schemas/events/form.json | 27 - .../main/resources/META-INF/cxs/schemas/goal.json | 18 - .../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/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 | 53 +- .../main/resources/org.apache.unomi.services.cfg | 10 +- setenv.sh | 2 +- src/main/resources/assemblies/source-shared.xml | 5 +- tools/shell-commands/pom.xml | 8 +- .../unomi/shell/migration/impl/MigrationTo200.java | 314 +++- .../internal/UnomiManagementServiceImpl.java | 4 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 13 +- .../requestBody/bulkSaveProfileAliases.ndjson | 2 + .../resources/requestBody/bulkSaveScope.ndjson | 2 + .../requestBody/copyValueScopeToSourceId.json | 6 + .../main/resources/requestBody/scopeMapping.json | 44 + .../main/resources/requestBody/searchScope.json | 16 + .../main/resources/requestBody/updateMapping.json | 14 + wab/src/main/webapp/index.html | 7 +- 343 files changed, 6789 insertions(+), 7718 deletions(-) create mode 100644 .github/codeql/codeql-config.yml copy .github/workflows/{codeql-analysis.yml => codeql-analysis-java.yml} (52%) rename .github/workflows/{codeql-analysis.yml => codeql-analysis-javascript.yml} (91%) copy api/src/main/java/org/apache/unomi/api/{schema/json/JSONIntegerType.java => Scope.java} (70%) delete mode 100644 api/src/main/java/org/apache/unomi/api/schema/UnomiJSONSchema.java rename rest/src/main/java/org/apache/unomi/rest/validation/HibernateValidationProviderResolver.java => api/src/main/java/org/apache/unomi/api/services/ScopeService.java (56%) rename extensions/{web-tracker => json-schema}/pom.xml (82%) copy {rest => extensions/json-schema/rest}/pom.xml (50%) create mode 100644 extensions/json-schema/rest/src/main/java/org/apache/unomi/schema/rest/JsonSchemaEndPoint.java create mode 100644 extensions/json-schema/services/pom.xml create mode 100644 extensions/json-schema/services/src/main/java/org/apache/unomi/schema/api/JsonSchemaWrapper.java rename api/src/main/java/org/apache/unomi/api/services/SchemaRegistry.java => extensions/json-schema/services/src/main/java/org/apache/unomi/schema/api/SchemaService.java (50%) create mode 100644 extensions/json-schema/services/src/main/java/org/apache/unomi/schema/impl/SchemaServiceImpl.java rename rest/src/main/java/org/apache/unomi/rest/validation/wrapper/CookieWrapper.java => extensions/json-schema/services/src/main/java/org/apache/unomi/schema/keyword/ScopeKeyword.java (51%) create mode 100644 extensions/json-schema/services/src/main/java/org/apache/unomi/schema/keyword/ScopeValidator.java rename {services/src/main/java/org/apache/unomi/services => extensions/json-schema/services/src/main/java/org/apache/unomi/schema}/listener/JsonSchemaListener.java (55%) rename {services/src/main/resources/META-INF/cxs/schemas => extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events}/event.json (67%) create mode 100644 extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/incrementInterest/incrementInterest.flattenProperties.json create mode 100644 extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/incrementInterest/incrementInterest.json rename {services/src/main/resources/META-INF/cxs/schemas/events => extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/login}/login.json (76%) rename {services/src/main/resources/META-INF/cxs/schemas/events => extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/modifyConsent}/modifyConsent.json (61%) create mode 100644 extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/modifyConsent/modifyConsent.properties.json copy services/src/main/resources/META-INF/cxs/schemas/events/view.json => extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/updateProperties/updateProperties.json (54%) create mode 100644 extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/view/view.flattenProperties.json rename {services/src/main/resources/META-INF/cxs/schemas/events => extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/view}/view.json (53%) create mode 100644 extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/events/view/view.properties.json create mode 100644 extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/URLParameters/URLParameters.json rename {services/src/main/resources/META-INF/cxs/schemas => extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/consent}/consent.json (70%) rename {services/src/main/resources/META-INF/cxs/schemas => extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/consent}/consentType.json (72%) create mode 100644 extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/interests/interests.json rename {services/src/main/resources/META-INF/cxs/schemas => extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items}/item.json (81%) create mode 100644 extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/page/page.json create mode 100644 extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/page/page.properties.attributes.json create mode 100644 extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/page/page.properties.json create mode 100644 extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/page/page.properties.pageInfo.json create mode 100644 extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items/site/site.json rename {services/src/main/resources/META-INF/cxs/schemas => extensions/json-schema/services/src/main/resources/META-INF/cxs/schemas/items}/timestampeditem.json (64%) create mode 100644 extensions/json-schema/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml create mode 100644 extensions/json-schema/services/src/main/resources/org.apache.unomi.schema.cfg delete mode 100644 extensions/web-tracker/README.md delete mode 100644 extensions/web-tracker/javascript/.gitignore delete mode 100644 extensions/web-tracker/javascript/.npmignore delete mode 100644 extensions/web-tracker/javascript/NPM-RELEASE-GUIDE.md delete mode 100644 extensions/web-tracker/javascript/README.md delete mode 100644 extensions/web-tracker/javascript/package.json delete mode 100755 extensions/web-tracker/javascript/pom.xml delete mode 100644 extensions/web-tracker/javascript/src/analytics.js-integration-apache-unomi.js delete mode 100644 extensions/web-tracker/javascript/src/index.js delete mode 100644 extensions/web-tracker/javascript/src/integrations.js delete mode 100644 extensions/web-tracker/javascript/src/license.js delete mode 100644 extensions/web-tracker/javascript/src/snippet.js delete mode 100644 extensions/web-tracker/javascript/yarn.lock delete mode 100644 extensions/web-tracker/karaf-kar/pom.xml delete mode 100644 extensions/web-tracker/karaf-kar/src/main/feature/feature.xml delete mode 100644 extensions/web-tracker/wab/.gitignore delete mode 100755 extensions/web-tracker/wab/pom.xml delete mode 100644 extensions/web-tracker/wab/src/main/resources/META-INF/cxs/rules/form-mapping-example.json delete mode 100644 extensions/web-tracker/wab/src/main/webapp/basic_test.html delete mode 100644 extensions/web-tracker/wab/src/main/webapp/index.html create mode 100644 graphql/cxs-impl/src/main/java/org/apache/unomi/graphql/commands/AddAliasToProfileCommand.java create mode 100644 graphql/cxs-impl/src/main/java/org/apache/unomi/graphql/commands/RemoveAliasFromProfileCommand.java create mode 100644 graphql/cxs-impl/src/main/java/org/apache/unomi/graphql/condition/factories/ProfileAliasConditionFactory.java create mode 100644 graphql/cxs-impl/src/main/java/org/apache/unomi/graphql/fetchers/profile/FindProfileAliasConnectionDataFetcher.java create mode 100644 graphql/cxs-impl/src/main/java/org/apache/unomi/graphql/fetchers/profile/GetProfileAliasesDataFetcher.java create mode 100644 graphql/cxs-impl/src/main/java/org/apache/unomi/graphql/fetchers/profile/ProfileAliasDataFetcher.java rename {api/src/main/java/org/apache/unomi/api => graphql/cxs-impl/src/main/java/org/apache/unomi/graphql}/schema/json/JSONArrayType.java (96%) rename {api/src/main/java/org/apache/unomi/api => graphql/cxs-impl/src/main/java/org/apache/unomi/graphql}/schema/json/JSONBooleanType.java (95%) rename {api/src/main/java/org/apache/unomi/api => graphql/cxs-impl/src/main/java/org/apache/unomi/graphql}/schema/json/JSONEnumType.java (95%) rename {api/src/main/java/org/apache/unomi/api => graphql/cxs-impl/src/main/java/org/apache/unomi/graphql}/schema/json/JSONIntegerType.java (95%) rename {api/src/main/java/org/apache/unomi/api => graphql/cxs-impl/src/main/java/org/apache/unomi/graphql}/schema/json/JSONNullType.java (95%) rename {api/src/main/java/org/apache/unomi/api => graphql/cxs-impl/src/main/java/org/apache/unomi/graphql}/schema/json/JSONNumberType.java (95%) rename {api/src/main/java/org/apache/unomi/api => graphql/cxs-impl/src/main/java/org/apache/unomi/graphql}/schema/json/JSONObjectType.java (76%) rename {api/src/main/java/org/apache/unomi/api => graphql/cxs-impl/src/main/java/org/apache/unomi/graphql}/schema/json/JSONSchema.java (98%) rename {api/src/main/java/org/apache/unomi/api => graphql/cxs-impl/src/main/java/org/apache/unomi/graphql}/schema/json/JSONStringType.java (95%) rename {api/src/main/java/org/apache/unomi/api => graphql/cxs-impl/src/main/java/org/apache/unomi/graphql}/schema/json/JSONType.java (98%) rename {api/src/main/java/org/apache/unomi/api => graphql/cxs-impl/src/main/java/org/apache/unomi/graphql}/schema/json/JSONTypeFactory.java (86%) create mode 100644 graphql/cxs-impl/src/main/java/org/apache/unomi/graphql/servlet/auth/GraphQLServletSecurityValidator.java create mode 100644 graphql/cxs-impl/src/main/java/org/apache/unomi/graphql/types/input/CDPProfileAliasFilterInput.java create mode 100644 graphql/cxs-impl/src/main/java/org/apache/unomi/graphql/types/input/CDPProfileAliasInput.java create mode 100644 graphql/cxs-impl/src/main/java/org/apache/unomi/graphql/types/output/CDPProfileAlias.java create mode 100644 graphql/cxs-impl/src/main/java/org/apache/unomi/graphql/types/output/CDPProfileAliasConnection.java create mode 100644 graphql/cxs-impl/src/main/java/org/apache/unomi/graphql/types/output/CDPProfileAliasEdge.java create mode 100755 itests/jacoco-report.sh create mode 100644 itests/src/test/java/org/apache/unomi/itests/ScopeIT.java create mode 100644 itests/src/test/java/org/apache/unomi/itests/SendEventActionIT.java create mode 100644 itests/src/test/java/org/apache/unomi/itests/graphql/GraphQLProfileAliasesIT.java create mode 100644 itests/src/test/java/org/apache/unomi/itests/graphql/GraphQLServletSecurityIT.java create mode 100644 itests/src/test/resources/graphql/profileAlias/addAliasToProfile.json create mode 100644 itests/src/test/resources/graphql/profileAlias/findProfileAliases.json create mode 100644 itests/src/test/resources/graphql/profileAlias/getProfileAlias.json create mode 100644 itests/src/test/resources/graphql/profileAlias/getProfileAliases.json create mode 100644 itests/src/test/resources/graphql/profileAlias/removeAliasFromProfile.json copy itests/src/test/resources/graphql/{event => security}/get-event.json (100%) copy itests/src/test/resources/graphql/{profile/get-profile-without-creation.json => security/get-profile.json} (100%) copy itests/src/test/resources/graphql/{segment => security}/get-segment.json (100%) copy itests/src/test/resources/graphql/{event => security}/process-events.json (100%) create mode 100644 itests/src/test/resources/graphql/security/subscribe.json create mode 100644 itests/src/test/resources/schemas/event-dummy-extended-2.json create mode 100644 itests/src/test/resources/schemas/event-dummy-extended.json create mode 100644 itests/src/test/resources/schemas/event-dummy-invalid-1.json create mode 100644 itests/src/test/resources/schemas/event-dummy-invalid-2.json create mode 100644 itests/src/test/resources/schemas/event-dummy-invalid-3.json create mode 100644 itests/src/test/resources/schemas/event-dummy-invalid-4.json create mode 100644 itests/src/test/resources/schemas/event-dummy-valid.json create mode 100644 itests/src/test/resources/schemas/event-flattened-invalid-1.json create mode 100644 itests/src/test/resources/schemas/event-flattened-invalid-2.json create mode 100644 itests/src/test/resources/schemas/event-flattened-invalid-3.json create mode 100644 itests/src/test/resources/schemas/event-flattened-valid.json create mode 100644 itests/src/test/resources/schemas/event-request.json create mode 100644 itests/src/test/resources/schemas/schema-dummy-extension.json create mode 100644 itests/src/test/resources/schemas/schema-dummy-properties-extension-2.json create mode 100644 itests/src/test/resources/schemas/schema-dummy-properties-extension.json create mode 100644 itests/src/test/resources/schemas/schema-dummy-properties-updated.json create mode 100644 itests/src/test/resources/schemas/schema-dummy-properties.json create mode 100644 itests/src/test/resources/schemas/schema-dummy.json create mode 100644 itests/src/test/resources/schemas/schema-flattened-flattenedProperties-interests.json create mode 100644 itests/src/test/resources/schemas/schema-flattened-flattenedProperties.json create mode 100644 itests/src/test/resources/schemas/schema-flattened-properties.json create mode 100644 itests/src/test/resources/schemas/schema-flattened.json rename itests/src/test/resources/schemas/{events/negative-test-event-type.json => schema-invalid-name.json} (53%) rename itests/src/test/resources/schemas/{events/test-invalid.json => schema-invalid.json} (82%) copy itests/src/test/resources/schemas/{events/test-event-type.json => schema-predefined.json} (54%) create mode 100644 itests/src/test/resources/scope/scope-test1.json delete mode 100644 manual/src/main/asciidoc/web-tracker.adoc copy persistence-elasticsearch/core/src/main/resources/META-INF/cxs/mappings/{actiontype.json => actionType.json} (100%) copy persistence-elasticsearch/core/src/main/resources/META-INF/cxs/mappings/{actiontype.json => conditionType.json} (76%) rename persistence-elasticsearch/core/src/main/resources/META-INF/cxs/mappings/{conditiontype.json => exportConfig.json} (100%) rename persistence-elasticsearch/core/src/main/resources/META-INF/cxs/mappings/{exportconfig.json => importConfig.json} (100%) rename persistence-elasticsearch/core/src/main/resources/META-INF/cxs/mappings/{actiontype.json => profileAlias.json} (73%) rename persistence-elasticsearch/core/src/main/resources/META-INF/cxs/mappings/{importconfig.json => scope.json} (92%) create mode 100644 plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/NestedConditionESQueryBuilder.java create mode 100644 plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/NestedConditionEvaluator.java create mode 100644 plugins/baseplugin/src/main/resources/META-INF/cxs/conditions/nestedCondition.json create mode 100644 plugins/baseplugin/src/test/java/org/apache/unomi/plugins/baseplugin/conditions/NestedConditionEvaluatorTest.java create mode 100644 rest/src/main/java/org/apache/unomi/rest/deserializers/ContextRequestDeserializer.java create mode 100644 rest/src/main/java/org/apache/unomi/rest/deserializers/EventsCollectorRequestDeserializer.java delete mode 100644 rest/src/main/java/org/apache/unomi/rest/endpoints/JsonSchemaEndPoint.java create mode 100644 rest/src/main/java/org/apache/unomi/rest/endpoints/ScopeServiceEndPoint.java rename rest/src/main/java/org/apache/unomi/rest/{validation/request => exception}/InvalidRequestException.java (83%) delete mode 100644 rest/src/main/java/org/apache/unomi/rest/validation/BeanValidationService.java delete mode 100644 rest/src/main/java/org/apache/unomi/rest/validation/JAXRSBeanValidationInInterceptorOverride.java delete mode 100644 rest/src/main/java/org/apache/unomi/rest/validation/impl/BeanValidationServiceImpl.java create mode 100644 rest/src/main/resources/META-INF/cxs/schemas/rest/eventscollectorrequest.json create mode 100644 rest/src/main/resources/META-INF/cxs/schemas/rest/requestIds.json delete mode 100644 services/src/main/java/org/apache/unomi/services/impl/schemas/SchemaRegistryImpl.java delete mode 100644 services/src/main/java/org/apache/unomi/services/impl/schemas/UnomiPropertyTypeKeyword.java create mode 100644 services/src/main/java/org/apache/unomi/services/impl/scope/ScopeServiceImpl.java delete mode 100644 services/src/main/resources/META-INF/cxs/events/anonymizeProfile.json delete mode 100644 services/src/main/resources/META-INF/cxs/events/articleCompleted.json delete mode 100644 services/src/main/resources/META-INF/cxs/events/form.json delete mode 100644 services/src/main/resources/META-INF/cxs/events/goal.json delete mode 100644 services/src/main/resources/META-INF/cxs/events/identify.json delete mode 100644 services/src/main/resources/META-INF/cxs/events/incrementInterest.json delete mode 100644 services/src/main/resources/META-INF/cxs/events/login.json delete mode 100644 services/src/main/resources/META-INF/cxs/events/modifyConsent.json delete mode 100644 services/src/main/resources/META-INF/cxs/events/profileDeleted.json delete mode 100644 services/src/main/resources/META-INF/cxs/events/profileUpdated.json delete mode 100644 services/src/main/resources/META-INF/cxs/events/ruleFired.json delete mode 100644 services/src/main/resources/META-INF/cxs/events/search.json delete mode 100644 services/src/main/resources/META-INF/cxs/events/sessionCreated.json delete mode 100644 services/src/main/resources/META-INF/cxs/events/sessionReassigned.json delete mode 100644 services/src/main/resources/META-INF/cxs/events/updateProperties.json delete mode 100644 services/src/main/resources/META-INF/cxs/events/view.json delete mode 100644 services/src/main/resources/META-INF/cxs/schemas/condition.json delete mode 100644 services/src/main/resources/META-INF/cxs/schemas/conditiontype.json delete mode 100644 services/src/main/resources/META-INF/cxs/schemas/customitem.json delete mode 100644 services/src/main/resources/META-INF/cxs/schemas/customitems/page.json delete mode 100644 services/src/main/resources/META-INF/cxs/schemas/customitems/site.json delete mode 100644 services/src/main/resources/META-INF/cxs/schemas/events/form.json delete mode 100644 services/src/main/resources/META-INF/cxs/schemas/goal.json delete mode 100644 services/src/main/resources/META-INF/cxs/schemas/metadata.json delete mode 100644 services/src/main/resources/META-INF/cxs/schemas/metadataitem.json delete mode 100644 services/src/main/resources/META-INF/cxs/schemas/parameter.json delete mode 100644 services/src/main/resources/META-INF/cxs/schemas/profile.json delete mode 100644 services/src/main/resources/META-INF/cxs/schemas/session.json delete mode 100644 services/src/main/resources/META-INF/cxs/schemas/values/boolean.json delete mode 100644 services/src/main/resources/META-INF/cxs/schemas/values/date.json delete mode 100644 services/src/main/resources/META-INF/cxs/schemas/values/email.json delete mode 100644 services/src/main/resources/META-INF/cxs/schemas/values/integer.json delete mode 100644 services/src/main/resources/META-INF/cxs/schemas/values/long.json delete mode 100644 services/src/main/resources/META-INF/cxs/schemas/values/set.json delete mode 100644 services/src/main/resources/META-INF/cxs/schemas/values/string.json create mode 100644 tools/shell-commands/src/main/resources/requestBody/bulkSaveProfileAliases.ndjson create mode 100644 tools/shell-commands/src/main/resources/requestBody/bulkSaveScope.ndjson create mode 100644 tools/shell-commands/src/main/resources/requestBody/copyValueScopeToSourceId.json create mode 100644 tools/shell-commands/src/main/resources/requestBody/scopeMapping.json create mode 100644 tools/shell-commands/src/main/resources/requestBody/searchScope.json create mode 100644 tools/shell-commands/src/main/resources/requestBody/updateMapping.json