Skip to content

UNOMI-875: Move past-event evaluators to advanced-conditions plugin #774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sergehuber merged 1 commit into from
Jun 17, 2026
Merged

UNOMI-875: Move past-event evaluators to advanced-conditions plugin #774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions distribution/src/main/feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
<feature dependency="true" version="${project.version}">unomi-cxs-geonames-extension</feature>
<feature dependency="true" version="${project.version}">unomi-cxs-privacy-extension</feature>
<feature dependency="true" version="${project.version}">unomi-elasticsearch-conditions</feature>
<feature dependency="true" version="${project.version}">unomi-plugins-advanced-conditions</feature>
<feature dependency="true" version="${project.version}">unomi-plugins-base</feature>
<feature dependency="true" version="${project.version}">unomi-plugins-request</feature>
<feature dependency="true" version="${project.version}">unomi-plugins-mail</feature>
Expand All @@ -59,6 +60,7 @@
<feature dependency="true" version="${project.version}">unomi-cxs-geonames-extension</feature>
<feature dependency="true" version="${project.version}">unomi-cxs-privacy-extension</feature>
<feature dependency="true" version="${project.version}">unomi-elasticsearch-conditions</feature>
<feature dependency="true" version="${project.version}">unomi-plugins-advanced-conditions</feature>
<feature dependency="true" version="${project.version}">unomi-plugins-base</feature>
<feature dependency="true" version="${project.version}">unomi-plugins-request</feature>
<feature dependency="true" version="${project.version}">unomi-plugins-mail</feature>
Expand All @@ -85,6 +87,7 @@
<feature dependency="true" version="${project.version}">unomi-cxs-geonames-extension</feature>
<feature dependency="true" version="${project.version}">unomi-cxs-privacy-extension</feature>
<feature dependency="true" version="${project.version}">unomi-opensearch-conditions</feature>
<feature dependency="true" version="${project.version}">unomi-plugins-advanced-conditions</feature>
<feature dependency="true" version="${project.version}">unomi-plugins-base</feature>
<feature dependency="true" version="${project.version}">unomi-plugins-request</feature>
<feature dependency="true" version="${project.version}">unomi-plugins-mail</feature>
Expand All @@ -110,6 +113,7 @@
<feature dependency="true" version="${project.version}">unomi-cxs-geonames-extension</feature>
<feature dependency="true" version="${project.version}">unomi-cxs-privacy-extension</feature>
<feature dependency="true" version="${project.version}">unomi-opensearch-conditions</feature>
<feature dependency="true" version="${project.version}">unomi-plugins-advanced-conditions</feature>
<feature dependency="true" version="${project.version}">unomi-plugins-base</feature>
<feature dependency="true" version="${project.version}">unomi-plugins-request</feature>
<feature dependency="true" version="${project.version}">unomi-plugins-mail</feature>
Expand Down
6 changes: 6 additions & 0 deletions kar/src/main/feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,12 @@
<bundle start="false">mvn:org.apache.unomi/unomi-plugins-base/${project.version}</bundle>
</feature>

<feature name="unomi-plugins-advanced-conditions" description="Apache Unomi :: Plugins :: Advanced Conditions" version="${project.version}">
<feature>unomi-plugins-base</feature>
<requirement>unomi.persistence.conditions</requirement>
<bundle start="false">mvn:org.apache.unomi/unomi-plugins-advanced-conditions/${project.version}</bundle>
</feature>

<feature name="unomi-plugins-request" description="Apache Unomi :: Plugins :: Request" version="${project.version}">
<feature>unomi-services</feature>
<configfile finalname="/etc/org.apache.unomi.plugins.request.cfg">mvn:org.apache.unomi/unomi-plugins-request/${project.version}/cfg/requestcfg</configfile>
Expand Down
4 changes: 2 additions & 2 deletions ...rg/apache/unomi/persistence/spi/conditions/PastEventConditionPersistenceQueryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
* <ul>
* <li>Implementations are provided by persistence modules and injected where needed.</li>
* <li>
* In {@code org.apache.unomi.plugins.baseplugin.conditions.PastEventConditionEvaluator}, evaluation follows two paths:
* In {@code org.apache.unomi.plugins.advancedconditions.conditions.PastEventConditionEvaluator}, evaluation follows two paths:
* <ol>
* <li>If the condition has a {@code generatedPropertyKey}, the evaluator reads a precomputed count from the
* {@link org.apache.unomi.api.Profile} system properties (no persistence query).</li>
Expand All @@ -51,7 +51,7 @@
* the result means "events occurred within bounds" or "no events occurred".</li>
* </ul>
*
* @see org.apache.unomi.plugins.baseplugin.conditions.PastEventConditionEvaluator
* @see org.apache.unomi.plugins.advancedconditions.conditions.PastEventConditionEvaluator
*/
public interface PastEventConditionPersistenceQueryBuilder {

Expand Down
2 changes: 1 addition & 1 deletion ...a/org/apache/unomi/persistence/spi/conditions/evaluator/ConditionEvaluatorDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
* {@code PastEventConditionEvaluator} for a typical evaluator.
*
* @see org.apache.unomi.persistence.spi.conditions.evaluator.impl.ConditionEvaluatorDispatcherImpl
* @see org.apache.unomi.plugins.baseplugin.conditions.PastEventConditionEvaluator
* @see org.apache.unomi.plugins.advancedconditions.conditions.PastEventConditionEvaluator
*/
public interface ConditionEvaluatorDispatcher {

Expand Down
12 changes: 11 additions & 1 deletion plugins/past-event/pom.xml → plugins/advanced-conditions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,24 @@
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
<artifactId>unomi-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-scripting</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component.annotations</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
Expand Down
9 changes: 8 additions & 1 deletion ...nditions/PastEventConditionEvaluator.java → ...nditions/PastEventConditionEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.unomi.plugins.baseplugin.conditions;
package org.apache.unomi.plugins.advancedconditions.conditions;

import org.apache.unomi.api.Event;
import org.apache.unomi.api.Item;
Expand All @@ -28,30 +28,37 @@
import org.apache.unomi.persistence.spi.conditions.evaluator.ConditionEvaluator;
import org.apache.unomi.persistence.spi.conditions.evaluator.ConditionEvaluatorDispatcher;
import org.apache.unomi.scripting.ScriptExecutor;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;

@Component(service = ConditionEvaluator.class, property = {"conditionEvaluatorId=pastEventConditionEvaluator"})
public class PastEventConditionEvaluator implements ConditionEvaluator {

private PersistenceService persistenceService;
private DefinitionsService definitionsService;
private ScriptExecutor scriptExecutor;
private PastEventConditionPersistenceQueryBuilder pastEventConditionPersistenceQueryBuilder;

@Reference
public void setPersistenceService(PersistenceService persistenceService) {
this.persistenceService = persistenceService;
}

@Reference
public void setDefinitionsService(DefinitionsService definitionsService) {
this.definitionsService = definitionsService;
}

@Reference
public void setPastEventConditionPersistenceQueryBuilder(PastEventConditionPersistenceQueryBuilder pastEventConditionPersistenceQueryBuilder) {
this.pastEventConditionPersistenceQueryBuilder = pastEventConditionPersistenceQueryBuilder;
}

@Reference
public void setScriptExecutor(ScriptExecutor scriptExecutor) {
this.scriptExecutor = scriptExecutor;
}
Expand Down
12 changes: 6 additions & 6 deletions ...ourceEventPropertyConditionEvaluator.java → ...ourceEventPropertyConditionEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.unomi.plugins.baseplugin.conditions;
package org.apache.unomi.plugins.advancedconditions.conditions;

import org.apache.unomi.api.Event;
import org.apache.unomi.api.Item;
Expand All @@ -24,12 +24,15 @@
import org.apache.unomi.api.services.DefinitionsService;
import org.apache.unomi.persistence.spi.conditions.evaluator.ConditionEvaluator;
import org.apache.unomi.persistence.spi.conditions.evaluator.ConditionEvaluatorDispatcher;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@Component(service = ConditionEvaluator.class, property = {"conditionEvaluatorId=sourceEventPropertyConditionEvaluator"})
public class SourceEventPropertyConditionEvaluator implements ConditionEvaluator {
private static final Map<String,String> MAPPED_PROPERTIES;
static {
Expand Down Expand Up @@ -82,11 +85,8 @@ public boolean eval(Condition condition, Item item, Map<String, Object> context,
}
}

public DefinitionsService getDefinitionsService() {
return definitionsService;
}

@Reference
public void setDefinitionsService(DefinitionsService definitionsService) {
this.definitionsService = definitionsService;
}
}
}
2 changes: 1 addition & 1 deletion ...ditions/sourceEventPropertyCondition.json → ...ditions/sourceEventPropertyCondition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@
"multivalued": false
}
]
}
}
0 ...src/main/resources/messages_en.properties → ...src/main/resources/messages_en.properties
View file
Open in desktop
File renamed without changes.
23 changes: 0 additions & 23 deletions plugins/baseplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@
<reference id="configSharingService" interface="org.apache.unomi.api.services.ConfigSharingService"/>
<reference id="scriptExecutor" interface="org.apache.unomi.scripting.ScriptExecutor"/>
<reference id="topicService" interface="org.apache.unomi.api.services.TopicService"/>
<reference id="pastEventConditionPersistenceQueryBuilder" interface="org.apache.unomi.persistence.spi.conditions.PastEventConditionPersistenceQueryBuilder"/>

<reference id="executionContextManager" interface="org.apache.unomi.api.services.ExecutionContextManager">
<reference-listener ref="mergeProfilesOnPropertyAction" bind-method="bindExecutionContextManager" unbind-method="unbindExecutionContextManager" />
</reference>
Expand Down Expand Up @@ -104,27 +102,6 @@
<bean class="org.apache.unomi.plugins.baseplugin.conditions.GeoLocationByPointSessionConditionEvaluator"/>
</service>

<service interface="org.apache.unomi.persistence.spi.conditions.evaluator.ConditionEvaluator">
<service-properties>
<entry key="conditionEvaluatorId" value="sourceEventPropertyConditionEvaluator"/>
</service-properties>
<bean class="org.apache.unomi.plugins.baseplugin.conditions.SourceEventPropertyConditionEvaluator">
<property name="definitionsService" ref="definitionsService"/>
</bean>
</service>

<service interface="org.apache.unomi.persistence.spi.conditions.evaluator.ConditionEvaluator">
<service-properties>
<entry key="conditionEvaluatorId" value="pastEventConditionEvaluator"/>
</service-properties>
<bean class="org.apache.unomi.plugins.baseplugin.conditions.PastEventConditionEvaluator">
<property name="definitionsService" ref="definitionsService"/>
<property name="persistenceService" ref="persistenceService"/>
<property name="pastEventConditionPersistenceQueryBuilder" ref="pastEventConditionPersistenceQueryBuilder"/>
<property name="scriptExecutor" ref="scriptExecutor"/>
</bean>
</service>

<service interface="org.apache.unomi.persistence.spi.conditions.evaluator.ConditionEvaluator">
<service-properties>
<entry key="conditionEvaluatorId" value="nestedConditionEvaluator"/>
Expand Down
26 changes: 0 additions & 26 deletions plugins/past-event/src/main/resources/OSGI-INF/blueprint/blueprint.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@
<module>plugins</module>
<module>plugins/baseplugin</module>
<module>plugins/hover-event</module>
<module>plugins/past-event</module>
<module>plugins/advanced-conditions</module>
<module>plugins/tracked-event</module>
<module>plugins/kafka-injector</module>
<module>plugins/mail</module>
Expand Down
Loading