[Unomi-485] invalid comparison operator https://issues.apache.org/jira/browse/UNOMI-485

.gitignore

@@ -15,4 +15,6 @@ GeoLite2-City.mmdb
 allCountries.zip
 rest/.miredot-offline.json
 /extensions/salesforce-connector/test.properties
+extensions/web-tracker/javascript/dist/*
+extensions/web-tracker/javascript/snippet.min.*
 **/*.versionsBackup

.travis.settings.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd" xmlns="http://maven.apache.org/SETTINGS/1.1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <servers>
+        <server>
+            <username>${JFROG_USER}</username>
+            <password>${JFROG_PASSWORD}</password>
+            <id>snapshots</id>
+        </server>
+    </servers>
+    <profiles>
+        <profile>
+            <repositories>
+                <repository>
+                    <snapshots />
+                    <id>snapshots</id>
+                    <name>maven</name>
+                    <url>https://yotpo.jfrog.io/artifactory/maven</url>
+                </repository>
+            </repositories>
+            <id>artifactory</id>
+        </profile>
+    </profiles>
+    <activeProfiles>
+        <activeProfile>artifactory</activeProfile>
+    </activeProfiles>
+</settings>

.travis.yml

@@ -0,0 +1,33 @@
+group: edge
+
+services:
+  - docker
+
+cache:
+  directories:
+    - $HOME/.m2/
+before_cache:
+  rm -rf $HOME/.m2/repository/org/apache/unomi
+
+language: java
+
+stages:
+  - name: build
+    if: branch != releases
+  - name: build and deploy
+    if: branch = releases
+
+install: skip
+
+jobs:
+  include:
+  - stage: build
+    name: "Build Unomi"
+    jdk: openjdk8
+    script:
+    - ./build.sh
+  - stage: build and deploy
+    name: "Build and deploy Unomi"
+    jdk: openjdk8
+    script:
+      - ./buildAndDeploy.sh

NOTICE

@@ -1,5 +1,5 @@
 Apache Unomi
-Copyright 2015-2019 The Apache Software Foundation
+Copyright 2015-2020 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

NOTICE.template

@@ -1,5 +1,5 @@
 Apache Unomi
-Copyright 2016 The Apache Software Foundation
+Copyright 2015-2020 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.unomi</groupId>
         <artifactId>unomi-root</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.5.2-YOTPO-SNAPSHOT</version>
     </parent>
 
     <artifactId>unomi-api</artifactId>
@@ -37,7 +37,10 @@
             <version>2.2.11</version>
             <scope>provided</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
     </dependencies>
 
     <reporting>

api/src/main/java/org/apache/unomi/api/ContextRequest.java

@@ -64,6 +64,7 @@ public class ContextRequest {
     private Profile profileOverrides;
     private Map<String, Object> sessionPropertiesOverrides;
     private String sessionId;
+    private String profileId;
 
     /**
      * Retrieves the source of the context request.
@@ -242,4 +243,21 @@ public String getSessionId() {
     public void setSessionId(String sessionId) {
         this.sessionId = sessionId;
     }
+
+    /**
+     * Retrieve the profileId passed along with the request. All events will be processed with this profileId as a
+     * default
+     * @return the identifier for the profile
+     */
+    public String getProfileId() {
+        return profileId;
+    }
+
+    /**
+     * Sets the profileId in the request.
+     * @param profileId an unique identifier for the profile
+     */
+    public void setProfileId(String profileId) {
+        this.profileId = profileId;
+    }
 }

api/src/main/java/org/apache/unomi/api/Event.java

@@ -17,6 +17,7 @@
 
 package org.apache.unomi.api;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.unomi.api.actions.ActionPostExecutor;
 
 import javax.xml.bind.annotation.XmlTransient;
@@ -323,6 +324,30 @@ public Object getProperty(String name) {
         return properties.get(name);
     }
 
+    /**
+     * Retrieves the value of the nested property identified by the specified name.
+     *
+     * @param name the name of the property to be retrieved, splited in the nested properties with "."
+     * @return the value of the property identified by the specified name
+     */
+    public Object getNestedProperty(String name) {
+        if (!name.contains(".")) {
+            return getProperty(name);
+        }
+
+        Map properties = this.properties;
+        String[] propertyPath = StringUtils.substringBeforeLast(name, ".").split("\\.");
+        String propertyName = StringUtils.substringAfterLast(name, ".");
+
+        for (String property: propertyPath) {
+            properties = (Map) properties.get(property);
+            if (properties == null) {
+                return null;
+            }
+        }
+        return properties.get(propertyName);
+    }
+
     /**
      * Retrieves the properties.
      *

api/src/main/java/org/apache/unomi/api/Item.java

@@ -21,6 +21,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.Serializable;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -63,6 +64,7 @@ public static String getItemType(Class clazz) {
     protected String itemType;
     protected String scope;
     protected Long version;
+    protected Map<String, Object> systemMetadata = new HashMap<>();
 
     public Item() {
         this.itemType = getItemType(this.getClass());
@@ -140,4 +142,12 @@ public Long getVersion() {
     public void setVersion(Long version) {
         this.version = version;
     }
+
+    public Object getSystemMetadataMetadata(String key) {
+        return systemMetadata.get(key);
+    }
+
+    public void setSystemMetadata(String key, Object value) {
+        systemMetadata.put(key, value);
+    }
 }

api/src/main/java/org/apache/unomi/api/Profile.java

@@ -17,6 +17,7 @@
 
 package org.apache.unomi.api;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.unomi.api.segments.Scoring;
 import org.apache.unomi.api.segments.Segment;
 
@@ -94,6 +95,30 @@ public Object getProperty(String name) {
         return properties.get(name);
     }
 
+    /**
+     * Retrieves the value of the nested property identified by the specified name.
+     *
+     * @param name the name of the property to be retrieved, splited in the nested properties with "."
+     * @return the value of the property identified by the specified name
+     */
+    public Object getNestedProperty(String name) {
+        if (!name.contains(".")) {
+            return getProperty(name);
+        }
+
+        Map properties = this.properties;
+        String[] propertyPath = StringUtils.substringBeforeLast(name, ".").split("\\.");
+        String propertyName = StringUtils.substringAfterLast(name, ".");
+
+        for (String property: propertyPath) {
+            properties = (Map) properties.get(property);
+            if (properties == null) {
+                return null;
+            }
+        }
+        return properties.get(propertyName);
+    }
+
     /**
      * Retrieves a Map of all property name - value pairs for this profile.
      *

api/src/main/java/org/apache/unomi/api/conditions/ConditionHook.java

@@ -0,0 +1,7 @@
+package org.apache.unomi.api.conditions;
+
+
+public interface ConditionHook {
+
+    void executeHook(Condition condition);
+}

api/src/main/java/org/apache/unomi/api/conditions/ConditionHookFactory.java

@@ -0,0 +1,7 @@
+package org.apache.unomi.api.conditions;
+
+
+public interface ConditionHookFactory {
+
+    ConditionHook createConditionHook();
+}

api/src/main/java/org/apache/unomi/api/query/Query.java

@@ -33,6 +33,8 @@ public class Query implements Serializable {
     private String sortby;
     private Condition condition;
     private boolean forceRefresh;
+    private String scrollTimeValidity;
+    private String scrollIdentifier;
 
     /**
      * Instantiates a new Query.
@@ -150,4 +152,21 @@ public boolean isForceRefresh() {
     public void setForceRefresh(boolean forceRefresh) {
         this.forceRefresh = forceRefresh;
     }
+
+    public String getScrollIdentifier() {
+        return scrollIdentifier;
+    }
+
+    public void setScrollIdentifier(String scrollIdentifier) {
+        this.scrollIdentifier = scrollIdentifier;
+    }
+
+    public String getScrollTimeValidity() {
+        return scrollTimeValidity;
+    }
+
+    public void setScrollTimeValidity(String scrollTimeValidity) {
+        this.scrollTimeValidity = scrollTimeValidity;
+    }
+
 }

api/src/main/java/org/apache/unomi/api/services/DefinitionsService.java

@@ -20,6 +20,7 @@
 import org.apache.unomi.api.PluginType;
 import org.apache.unomi.api.PropertyMergeStrategyType;
 import org.apache.unomi.api.ValueType;
+import org.apache.unomi.api.actions.Action;
 import org.apache.unomi.api.actions.ActionType;
 import org.apache.unomi.api.conditions.Condition;
 import org.apache.unomi.api.conditions.ConditionType;
@@ -205,6 +206,21 @@ public interface DefinitionsService {
      */
     boolean resolveConditionType(Condition rootCondition);
 
+    /**
+     * Resolves (if possible) the {@link ActionType} for the specified action
+     *
+     * @param action the action for which we want to resolve type
+     * @return {@code true}
+     */
+    boolean resolveActionType(Action action);
+
+    /**
+     * Resolves (if possible) the {@link ActionType}s for the specified action
+     *
+     * @param actions the actions for which we want to resolve type
+     * @return {@code true}
+     */
+    boolean resolveActionTypes(List<Action> actions);
     /**
      * Forces a refresh of the definitions from the persistence service. Warning: this may seriously impact performance
      * so it is recommended to use this in specific cases such as for example in integration tests.

build.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -ev
+
+#mvn -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn clean install -P integration-tests -Drat.skip=true --no-snapshot-updates
+#(cd itests && mvn -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -P integration-tests -Dit.test=org.apache.unomi.itests.ProfileServiceWithoutOverwriteIT --no-snapshot-updates verify)
+mvn -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn clean install -Drat.skip=true --no-snapshot-updates

buildAndDeploy.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -ev
+
+cp .travis.settings.xml $HOME/.m2/settings.xml
+mvn -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn clean install deploy -DskipTests -P integration-tests -Drat.skip=true --no-snapshot-updates -DaltDeploymentRepository=snapshots::default::https://yotpo.jfrog.io/artifactory/maven

buildAndRunNoTests.sh

@@ -23,7 +23,7 @@ PROGNAME=`basename "$0"`
 if [ -f "$DIRNAME/setenv.sh" ]; then
   . "$DIRNAME/setenv.sh"
 fi
-mvn clean install -P \!integration-tests,\!performance-tests,rat -DskipTests
+mvn clean install -P \!integration-tests,\!performance-tests,rat,\!run-tests -DskipTests
 if [ $? -ne 0 ]
 then
     exit 1;

common/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.unomi</groupId>
         <artifactId>unomi-root</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.5.2-YOTPO-SNAPSHOT</version>
     </parent>
 
     <artifactId>unomi-common</artifactId>