You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by jk...@apache.org on 2023/01/03 14:12:26 UTC
[unomi] branch backport-UNOMI-597 created (now d7d51f13d)
This is an automated email from the ASF dual-hosted git repository.
jkevan pushed a change to branch backport-UNOMI-597
in repository https://gitbox.apache.org/repos/asf/unomi.git
at d7d51f13d UNOMI-597: rollback missing function to make the iTests working on 1.x
This branch includes the following new commits:
new 7d0ba6325 UNOMI-597: do not persist internal events (#441)
new d7d51f13d UNOMI-597: rollback missing function to make the iTests working on 1.x
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.
[unomi] 01/02: UNOMI-597: do not persist internal events (#441)
Posted by jk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jkevan pushed a commit to branch backport-UNOMI-597
in repository https://gitbox.apache.org/repos/asf/unomi.git
commit 7d0ba6325058394f75567593634a9414b1b2cdb2
Author: jsinovassin <58...@users.noreply.github.com>
AuthorDate: Tue Jun 21 09:40:16 2022 +0200
UNOMI-597: do not persist internal events (#441)
* UNOMI-597: do not persist internal events
* feedback
---
.../unomi/lists/actions/AddToListsAction.java | 4 +-
.../unomi/privacy/internal/PrivacyServiceImpl.java | 12 +-
.../test/java/org/apache/unomi/itests/AllITs.java | 3 +-
.../org/apache/unomi/itests/SendEventActionIT.java | 124 +++++++++++++++++++++
.../actions/MergeProfilesOnPropertyAction.java | 3 +-
.../baseplugin/actions/SendEventAction.java | 10 +-
.../unomi/rest/endpoints/ContextJsonEndpoint.java | 2 +-
.../services/impl/goals/GoalsServiceImpl.java | 1 +
8 files changed, 140 insertions(+), 19 deletions(-)
diff --git a/extensions/lists-extension/actions/src/main/java/org/apache/unomi/lists/actions/AddToListsAction.java b/extensions/lists-extension/actions/src/main/java/org/apache/unomi/lists/actions/AddToListsAction.java
index f120310dd..7f60f0881 100644
--- a/extensions/lists-extension/actions/src/main/java/org/apache/unomi/lists/actions/AddToListsAction.java
+++ b/extensions/lists-extension/actions/src/main/java/org/apache/unomi/lists/actions/AddToListsAction.java
@@ -65,9 +65,7 @@ public class AddToListsAction implements ActionExecutor {
if (listsChanged) {
profile.getSystemProperties().put("lists", existingListIdentifiers);
- Event profileUpdated = new Event("profileUpdated", null, profile, event.getScope(), null, profile, new Date());
- profileUpdated.setPersistent(false);
- eventService.send(profileUpdated);
+ eventService.send(new Event("profileUpdated", null, profile, event.getScope(), null, profile, null,new Date(), false));
return EventService.PROFILE_UPDATED;
} else {
return EventService.NO_CHANGE;
diff --git a/extensions/privacy-extension/services/src/main/java/org/apache/unomi/privacy/internal/PrivacyServiceImpl.java b/extensions/privacy-extension/services/src/main/java/org/apache/unomi/privacy/internal/PrivacyServiceImpl.java
index 3d3d68d7f..db57eb20b 100644
--- a/extensions/privacy-extension/services/src/main/java/org/apache/unomi/privacy/internal/PrivacyServiceImpl.java
+++ b/extensions/privacy-extension/services/src/main/java/org/apache/unomi/privacy/internal/PrivacyServiceImpl.java
@@ -88,9 +88,7 @@ public class PrivacyServiceImpl implements PrivacyService {
if (profile == null) {
return false;
}
- Event profileDeletedEvent = new Event("profileDeleted", null, profile, null, null, profile, new Date());
- profileDeletedEvent.setPersistent(true);
- eventService.send(profileDeletedEvent);
+ eventService.send(new Event("profileDeleted", null, profile, null, null, profile,null, new Date(), false));
// we simply overwrite the existing profile with an empty one.
Profile emptyProfile = new Profile(profileId);
profileService.save(emptyProfile);
@@ -105,15 +103,11 @@ public class PrivacyServiceImpl implements PrivacyService {
}
// first we send out the anonymize profile event to make sure other systems can still use external identifiers to lookup the profile and anonymize it.
- Event anonymizeProfileEvent = new Event("anonymizeProfile", null, profile, scope, null, profile, new Date());
- anonymizeProfileEvent.setPersistent(true);
- eventService.send(anonymizeProfileEvent);
+ eventService.send(new Event("anonymizeProfile", null, profile, scope, null, profile, null, new Date(), false));
boolean res = profile.getProperties().keySet().removeAll(getDeniedProperties(profile.getItemId()));
- Event profileUpdatedEvent = new Event("profileUpdated", null, profile, scope, null, profile, new Date());
- profileUpdatedEvent.setPersistent(false);
- eventService.send(profileUpdatedEvent);
+ eventService.send(new Event("profileUpdated", null, profile, scope, null, profile, null, new Date(), false));
profileService.save(profile);
diff --git a/itests/src/test/java/org/apache/unomi/itests/AllITs.java b/itests/src/test/java/org/apache/unomi/itests/AllITs.java
index e6db9969c..19c4744fb 100644
--- a/itests/src/test/java/org/apache/unomi/itests/AllITs.java
+++ b/itests/src/test/java/org/apache/unomi/itests/AllITs.java
@@ -49,7 +49,8 @@ import org.junit.runners.Suite.SuiteClasses;
ContextServletIT.class,
SecurityIT.class,
RuleServiceIT.class,
- GroovyActionsServiceIT.class
+ GroovyActionsServiceIT.class,
+ SendEventActionIT.class
})
public class AllITs {
}
diff --git a/itests/src/test/java/org/apache/unomi/itests/SendEventActionIT.java b/itests/src/test/java/org/apache/unomi/itests/SendEventActionIT.java
new file mode 100644
index 000000000..bae27b344
--- /dev/null
+++ b/itests/src/test/java/org/apache/unomi/itests/SendEventActionIT.java
@@ -0,0 +1,124 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package org.apache.unomi.itests;
+
+import org.apache.unomi.api.Event;
+import org.apache.unomi.api.Metadata;
+import org.apache.unomi.api.Profile;
+import org.apache.unomi.api.actions.Action;
+import org.apache.unomi.api.conditions.Condition;
+import org.apache.unomi.api.rules.Rule;
+import org.apache.unomi.api.services.EventService;
+import org.apache.unomi.api.services.ProfileService;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerSuite;
+import org.ops4j.pax.exam.util.Filter;
+
+import javax.inject.Inject;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerSuite.class)
+public class SendEventActionIT extends BaseIT {
+
+ private final static String TEST_RULE_ID = "sendEventTest";
+ private final static String EVENT_ID = "sendEventTestId";
+ private final static String TEST_EVENT_TYPE = "sendEventTestEventType";
+ private final static String TEST_PROFILE_ID = "sendEventTestProfileId";
+
+ @Inject
+ @Filter(timeout = 600000)
+ protected ProfileService profileService;
+ @Inject
+ @Filter(timeout = 600000)
+ protected EventService eventService;
+
+ @After
+ public void tearDown() throws InterruptedException {
+ eventService.removeProfileEvents(TEST_PROFILE_ID);
+ rulesService.removeRule(TEST_RULE_ID);
+ waitForNullValue("Event has not been deleted", () -> eventService.getEvent(EVENT_ID), DEFAULT_TRYING_TIMEOUT, DEFAULT_TRYING_TRIES);
+ waitForNullValue("Rule " + TEST_RULE_ID + "has not been deleted", () -> rulesService.getRule(TEST_RULE_ID), DEFAULT_TRYING_TIMEOUT,
+ DEFAULT_TRYING_TRIES);
+ }
+
+ @Test
+ public void testSendEventNotPersisted() throws InterruptedException {
+ createAndWaitForRule(createSendEventRule(false));
+
+ Assert.assertEquals(TEST_PROFILE_ID, sendEvent().getProfile().getItemId());
+
+ shouldBeTrueUntilEnd("Event should not have been persisted", () -> eventService.searchEvents(getSearchCondition(), 0, 1),
+ (eventPartialList -> eventPartialList.size() == 0), DEFAULT_TRYING_TIMEOUT, DEFAULT_TRYING_TRIES);
+ }
+
+ @Test
+ public void testSendEventPersisted() throws InterruptedException {
+ createAndWaitForRule(createSendEventRule(true));
+
+ Assert.assertEquals(TEST_PROFILE_ID, sendEvent().getProfile().getItemId());
+
+ keepTrying("Event should have been persisted", () -> eventService.searchEvents(getSearchCondition(), 0, 1),
+ (eventPartialList -> eventPartialList.size() == 1), DEFAULT_TRYING_TIMEOUT, DEFAULT_TRYING_TRIES);
+ }
+
+ private Event sendEvent() {
+ Profile profile = new Profile();
+ profile.setProperties(new HashMap<>());
+ profile.setItemId(TEST_PROFILE_ID);
+ profile.setProperty("j:nodename", "michel");
+ Event testEvent = new Event(TEST_EVENT_TYPE, null, profile, null, null, profile, new Date());
+ testEvent.setItemId(EVENT_ID);
+ eventService.send(testEvent);
+ return testEvent;
+ }
+
+ private Condition getSearchCondition() {
+ Condition condition = new Condition(definitionsService.getConditionType("eventPropertyCondition"));
+ condition.setParameter("propertyName", "eventType");
+ condition.setParameter("propertyValue", "sentFromAction");
+ condition.setParameter("comparisonOperator", "equals");
+
+ return condition;
+ }
+
+ private Rule createSendEventRule(boolean toBePersisted) {
+ Rule sendEventRule = new Rule();
+ sendEventRule.setMetadata(new Metadata(null, TEST_RULE_ID, TEST_RULE_ID, "Test rule for testing SendEventAction"));
+
+ Condition condition = new Condition(definitionsService.getConditionType("eventTypeCondition"));
+ condition.setParameter("eventTypeId", TEST_EVENT_TYPE);
+ sendEventRule.setCondition(condition);
+
+ final Action action = new Action(definitionsService.getActionType("sendEventAction"));
+ action.setParameter("eventType", "sentFromAction");
+ action.setParameter("eventTarget", profileService.load(TEST_PROFILE_ID));
+ action.setParameter("eventProperties", new HashMap<String, Object>());
+ action.setParameter("toBePersisted", toBePersisted);
+ sendEventRule.setActions(Collections.singletonList(action));
+
+ return sendEventRule;
+ }
+}
diff --git a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/MergeProfilesOnPropertyAction.java b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/MergeProfilesOnPropertyAction.java
index 92d7c6983..7a3782079 100644
--- a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/MergeProfilesOnPropertyAction.java
+++ b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/MergeProfilesOnPropertyAction.java
@@ -124,7 +124,8 @@ public class MergeProfilesOnPropertyAction implements ActionExecutor {
if (currentSession != null) {
currentSession.setProfile(profile);
- eventService.send(new Event("sessionReassigned", currentSession, profile, event.getScope(), event, currentSession, event.getTimeStamp()));
+ eventService.send(new Event("sessionReassigned", currentSession, profile, event.getScope(), event, currentSession,
+ null, event.getTimeStamp(), false));
}
return EventService.PROFILE_UPDATED + EventService.SESSION_UPDATED;
diff --git a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SendEventAction.java b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SendEventAction.java
index 9f522464f..909fb59a5 100644
--- a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SendEventAction.java
+++ b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SendEventAction.java
@@ -17,6 +17,7 @@
package org.apache.unomi.plugins.baseplugin.actions;
+import org.apache.commons.lang3.StringUtils;
import org.apache.unomi.api.Event;
import org.apache.unomi.api.Item;
import org.apache.unomi.api.actions.Action;
@@ -36,18 +37,19 @@ public class SendEventAction implements ActionExecutor {
@Override
public int execute(Action action, Event event) {
String eventType = (String) action.getParameterValues().get("eventType");
+ Boolean toBePersisted = (Boolean) action.getParameterValues().get("toBePersisted");
+
@SuppressWarnings("unchecked")
Map<String, Object> eventProperties = (Map<String, Object>) action.getParameterValues().get("eventProperties");
Item target = (Item) action.getParameterValues().get("eventTarget");
-// String type = (String) target.get("type");
-
-// Item targetItem = new CustomItem();
-// BeanUtils.populate(targetItem, target);
Event subEvent = new Event(eventType, event.getSession(), event.getProfile(), event.getScope(), event, target, event.getTimeStamp());
subEvent.setProfileId(event.getProfileId());
subEvent.getAttributes().putAll(event.getAttributes());
subEvent.getProperties().putAll(eventProperties);
+ if (toBePersisted != null && !toBePersisted) {
+ subEvent.setPersistent(false);
+ }
return eventService.send(subEvent);
}
diff --git a/rest/src/main/java/org/apache/unomi/rest/endpoints/ContextJsonEndpoint.java b/rest/src/main/java/org/apache/unomi/rest/endpoints/ContextJsonEndpoint.java
index bc87d0f3f..a7ebea0da 100644
--- a/rest/src/main/java/org/apache/unomi/rest/endpoints/ContextJsonEndpoint.java
+++ b/rest/src/main/java/org/apache/unomi/rest/endpoints/ContextJsonEndpoint.java
@@ -267,7 +267,7 @@ public class ContextJsonEndpoint {
// Only save session and send event if a session id was provided, otherwise keep transient session
session = new Session(sessionId, sessionProfile, timestamp, scope);
changes |= EventService.SESSION_UPDATED;
- Event event = new Event("sessionCreated", session, profile, scope, null, session, timestamp);
+ Event event = new Event("sessionCreated", session, profile, scope, null, session, null, timestamp, false);
if (sessionProfile.isAnonymousProfile()) {
// Do not keep track of profile in event
event.setProfileId(null);
diff --git a/services/src/main/java/org/apache/unomi/services/impl/goals/GoalsServiceImpl.java b/services/src/main/java/org/apache/unomi/services/impl/goals/GoalsServiceImpl.java
index 538fe5d1c..37da7a314 100644
--- a/services/src/main/java/org/apache/unomi/services/impl/goals/GoalsServiceImpl.java
+++ b/services/src/main/java/org/apache/unomi/services/impl/goals/GoalsServiceImpl.java
@@ -189,6 +189,7 @@ public class GoalsServiceImpl implements GoalsService, SynchronousBundleListener
action3.setParameter("eventType", "goal");
action3.setParameter("eventTarget", goal);
action3.setParameter("eventProperties", new HashMap<String, Object>());
+ action3.setParameter("toBePersisted", false);
rule.setActions(Arrays.asList(action1,action2,action3));
}
[unomi] 02/02: UNOMI-597: rollback missing function to make the iTests working on 1.x
Posted by jk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jkevan pushed a commit to branch backport-UNOMI-597
in repository https://gitbox.apache.org/repos/asf/unomi.git
commit d7d51f13d3e6d22b3b97151e43f4cb7ee4d948b0
Author: Kevan <ke...@jahia.com>
AuthorDate: Tue Jan 3 15:12:11 2023 +0100
UNOMI-597: rollback missing function to make the iTests working on 1.x
---
.../test/java/org/apache/unomi/itests/BaseIT.java | 27 ++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/itests/src/test/java/org/apache/unomi/itests/BaseIT.java b/itests/src/test/java/org/apache/unomi/itests/BaseIT.java
index 584d7e2fb..27588c61a 100644
--- a/itests/src/test/java/org/apache/unomi/itests/BaseIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/BaseIT.java
@@ -76,6 +76,8 @@ public abstract class BaseIT {
protected static final String URL = "http://localhost:" + HTTP_PORT;
protected static final String KARAF_DIR = "target/exam";
protected static final String UNOMI_KEY = "670c26d1cc413346c3b2fd9ce65dab41";
+ protected static final int DEFAULT_TRYING_TIMEOUT = 2000;
+ protected static final int DEFAULT_TRYING_TRIES = 30;
@Inject
@Filter(timeout = 600000)
@@ -257,6 +259,31 @@ public abstract class BaseIT {
return value;
}
+ protected <T> void waitForNullValue(String failMessage, Supplier<T> call, int timeout, int retries) throws InterruptedException {
+ int count = 0;
+ while (call.get() != null) {
+ if (count++ > retries) {
+ Assert.fail(failMessage);
+ }
+ Thread.sleep(timeout);
+ }
+ }
+
+ protected <T> T shouldBeTrueUntilEnd(String failMessage, Supplier<T> call, Predicate<T> predicate, int timeout, int retries)
+ throws InterruptedException {
+ int count = 0;
+ T value = null;
+ while (count <= retries) {
+ count++;
+ value = call.get();
+ if (!predicate.test(value)) {
+ Assert.fail(failMessage);
+ }
+ Thread.sleep(timeout);
+ }
+ return value;
+ }
+
protected String bundleResourceAsString(final String resourcePath) throws IOException {
final java.net.URL url = bundleContext.getBundle().getResource(resourcePath);
if (url != null) {