You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by dg...@apache.org on 2021/03/30 09:38:30 UTC
[unomi] branch unomi-1.5.x updated: [UNOMI-449] : fix build (from
previous merge / cherry-pick)
This is an automated email from the ASF dual-hosted git repository.
dgriffon pushed a commit to branch unomi-1.5.x
in repository https://gitbox.apache.org/repos/asf/unomi.git
The following commit(s) were added to refs/heads/unomi-1.5.x by this push:
new f7f6ae1 [UNOMI-449] : fix build (from previous merge / cherry-pick)
f7f6ae1 is described below
commit f7f6ae15e78a2cf839305086b674b8f3098111bb
Author: David Griffon <dg...@jahia.com>
AuthorDate: Tue Mar 30 11:38:16 2021 +0200
[UNOMI-449] : fix build (from previous merge / cherry-pick)
---
rest/src/main/java/org/apache/unomi/utils/ServletCommon.java | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/rest/src/main/java/org/apache/unomi/utils/ServletCommon.java b/rest/src/main/java/org/apache/unomi/utils/ServletCommon.java
index 98e70a7..f4b83f4 100644
--- a/rest/src/main/java/org/apache/unomi/utils/ServletCommon.java
+++ b/rest/src/main/java/org/apache/unomi/utils/ServletCommon.java
@@ -74,19 +74,14 @@ public class ServletCommon {
for (Event event : events) {
processedEventsCnt++;
if (event.getEventType() != null) {
- if (!eventService.isEventValid(event)) {
- logger.warn("Event is not valid : {}", event.getEventType());
- continue;
- }
-
- Event eventToSend = new Event(event.getEventType(), session, profile, event.getSourceId(), event.getSource(),
+ Event eventToSend = new Event(event.getEventType(), session, profile, event.getScope(), event.getSource(),
event.getTarget(), event.getProperties(), timestamp, event.isPersistent());
if (!eventService.isEventAllowed(event, thirdPartyId)) {
logger.warn("Event is not allowed : {}", event.getEventType());
continue;
}
if (thirdPartyId != null && event.getItemId() != null) {
- eventToSend = new Event(event.getItemId(), event.getEventType(), session, profile, event.getSourceId(), event.getSource(), event.getTarget(), event.getProperties(), timestamp, event.isPersistent());
+ eventToSend = new Event(event.getItemId(), event.getEventType(), session, profile, event.getScope(), event.getSource(), event.getTarget(), event.getProperties(), timestamp, event.isPersistent());
}
if (filteredEventTypes != null && filteredEventTypes.contains(event.getEventType())) {
logger.debug("Profile is filtering event type {}", event.getEventType());
@@ -109,7 +104,7 @@ public class ServletCommon {
if ((changes & EventService.ERROR) == EventService.ERROR) {
//Don't count the event that failed
processedEventsCnt--;
- logger.error("Error processing events. Total number of processed events: {}/{}", processedEventsCnt, events.size());
+ logger.error("Error processing events. Total number of processed events: {}/{}", processedEventsCnt,events.size());
break;
}
}