Skip to content

UNOMI-875: Final unomi-3-dev hygiene port #791

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 30, 2026
Merged

UNOMI-875: Final unomi-3-dev hygiene port #791

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
149 changes: 149 additions & 0 deletions ...t/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionEvaluatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
package org.apache.unomi.plugins.baseplugin.conditions;

import org.apache.unomi.api.*;
import org.apache.unomi.api.conditions.Condition;
import org.apache.unomi.api.conditions.ConditionType;
import org.apache.unomi.api.rules.Rule;
import org.apache.unomi.plugins.baseplugin.conditions.accessors.HardcodedPropertyAccessor;
import org.apache.unomi.scripting.ExpressionFilter;
Expand All @@ -32,6 +34,7 @@

import static junit.framework.TestCase.assertEquals;
import static junit.framework.TestCase.assertNull;
import static org.junit.Assert.assertFalse;

public class PropertyConditionEvaluatorTest {

Expand Down Expand Up @@ -190,6 +193,152 @@ public static Session generateMockSession(Profile mockProfile) {
return mockSession;
}

@Test
public void testNullSafeIntegerComparison_NonNumericActualValue() throws Exception {
Profile testProfile = new Profile();
testProfile.setItemId("testProfile");
testProfile.getProperties().put("nonNumericProperty", "notANumber");

Condition condition = new Condition();
ConditionType conditionType = new ConditionType();
conditionType.setItemId("propertyCondition");
condition.setConditionType(conditionType);
condition.setParameter("propertyName", "properties.nonNumericProperty");
condition.setParameter("comparisonOperator", "greaterThan");
condition.setParameter("propertyValueInteger", 10);

boolean result = propertyConditionEvaluator.eval(condition, testProfile, new HashMap<>(), null);
assertFalse("Non-numeric value should not match greaterThan comparison with integer", result);
}

@Test
public void testNullSafeIntegerComparison_NonNumericExpectedValue() throws Exception {
Profile testProfile = new Profile();
testProfile.setItemId("testProfile");
testProfile.getProperties().put("numericProperty", 42);

Condition condition = new Condition();
ConditionType conditionType = new ConditionType();
conditionType.setItemId("propertyCondition");
condition.setConditionType(conditionType);
condition.setParameter("propertyName", "properties.numericProperty");
condition.setParameter("comparisonOperator", "greaterThan");
condition.setParameter("propertyValueInteger", "notANumber");

boolean result = propertyConditionEvaluator.eval(condition, testProfile, new HashMap<>(), null);
assertFalse("Non-numeric expected value should not match greaterThan comparison", result);
}

@Test
public void testNullSafeDoubleComparison_NonNumericActualValue() throws Exception {
Profile testProfile = new Profile();
testProfile.setItemId("testProfile");
testProfile.getProperties().put("nonNumericProperty", "notANumber");

Condition condition = new Condition();
ConditionType conditionType = new ConditionType();
conditionType.setItemId("propertyCondition");
condition.setConditionType(conditionType);
condition.setParameter("propertyName", "properties.nonNumericProperty");
condition.setParameter("comparisonOperator", "lessThan");
condition.setParameter("propertyValueDouble", 10.5);

boolean result = propertyConditionEvaluator.eval(condition, testProfile, new HashMap<>(), null);
assertFalse("Non-numeric value should not match lessThan comparison with double", result);
}

@Test
public void testNullSafeDoubleComparison_NonNumericExpectedValue() throws Exception {
Profile testProfile = new Profile();
testProfile.setItemId("testProfile");
testProfile.getProperties().put("numericProperty", 42.5);

Condition condition = new Condition();
ConditionType conditionType = new ConditionType();
conditionType.setItemId("propertyCondition");
condition.setConditionType(conditionType);
condition.setParameter("propertyName", "properties.numericProperty");
condition.setParameter("comparisonOperator", "lessThan");
condition.setParameter("propertyValueDouble", "notANumber");

boolean result = propertyConditionEvaluator.eval(condition, testProfile, new HashMap<>(), null);
assertFalse("Non-numeric expected value should not match lessThan comparison", result);
}

@Test
public void testNullSafeDateComparison_NonDateActualValue() throws Exception {
Profile testProfile = new Profile();
testProfile.setItemId("testProfile");
testProfile.getProperties().put("nonDateProperty", "notADate");

Condition condition = new Condition();
ConditionType conditionType = new ConditionType();
conditionType.setItemId("propertyCondition");
condition.setConditionType(conditionType);
condition.setParameter("propertyName", "properties.nonDateProperty");
condition.setParameter("comparisonOperator", "greaterThan");
condition.setParameter("propertyValueDate", new Date());

boolean result = propertyConditionEvaluator.eval(condition, testProfile, new HashMap<>(), null);
assertFalse("Non-date value should not match greaterThan comparison with date", result);
}

@Test
public void testNullSafeDateComparison_NonDateExpectedValue() throws Exception {
Profile testProfile = new Profile();
testProfile.setItemId("testProfile");
Date testDate = new Date();
testProfile.getProperties().put("dateProperty", testDate);

Condition condition = new Condition();
ConditionType conditionType = new ConditionType();
conditionType.setItemId("propertyCondition");
condition.setConditionType(conditionType);
condition.setParameter("propertyName", "properties.dateProperty");
condition.setParameter("comparisonOperator", "lessThan");
condition.setParameter("propertyValueDate", "notADate");

boolean result = propertyConditionEvaluator.eval(condition, testProfile, new HashMap<>(), null);
assertFalse("Non-date expected value should not match lessThan comparison", result);
}

@Test
public void testNullSafeDateExprComparison_NonDateActualValue() throws Exception {
Profile testProfile = new Profile();
testProfile.setItemId("testProfile");
testProfile.getProperties().put("nonDateProperty", "notADate");

Condition condition = new Condition();
ConditionType conditionType = new ConditionType();
conditionType.setItemId("propertyCondition");
condition.setConditionType(conditionType);
condition.setParameter("propertyName", "properties.nonDateProperty");
condition.setParameter("comparisonOperator", "greaterThanOrEqualTo");
condition.setParameter("propertyValueDateExpr", new Date());

boolean result = propertyConditionEvaluator.eval(condition, testProfile, new HashMap<>(), null);
assertFalse("Non-date value should not match greaterThanOrEqualTo comparison with dateExpr", result);
}

@Test
public void testNullSafeDateExprComparison_NonDateExpectedValue() throws Exception {
Profile testProfile = new Profile();
testProfile.setItemId("testProfile");
Date testDate = new Date();
testProfile.getProperties().put("dateProperty", testDate);

Condition condition = new Condition();
ConditionType conditionType = new ConditionType();
conditionType.setItemId("propertyCondition");
condition.setConditionType(conditionType);
condition.setParameter("propertyName", "properties.dateProperty");
condition.setParameter("comparisonOperator", "lessThanOrEqualTo");
condition.setParameter("propertyValueDateExpr", "notADate");

boolean result = propertyConditionEvaluator.eval(condition, testProfile, new HashMap<>(), null);
assertFalse("Non-date expected value should not match lessThanOrEqualTo comparison", result);
}

class HardcodedWorker implements Callable<Object> {

@Override
Expand Down
24 changes: 23 additions & 1 deletion plugins/kafka-injector/src/main/java/org/apache/unomi/kafka/KafkaInjector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -35,7 +36,9 @@
import java.util.Arrays;
import java.util.Dictionary;
import java.util.Properties;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;

@Component(
name = "org.apache.unomi.kafka",
Expand All @@ -51,6 +54,7 @@ public class KafkaInjector implements Runnable {
private String messageType;
private boolean consuming = false;
private ObjectMapper objectMapper;
private ExecutorService executorService;

@Reference
private EventService eventService;
Expand Down Expand Up @@ -141,7 +145,25 @@ public void activate(ComponentContext componentContext) {
Thread.currentThread().setContextClassLoader(originClassLoader);
}
consuming = true;
Executors.newSingleThreadExecutor().execute(this);
executorService = Executors.newSingleThreadExecutor();
executorService.execute(this);
}

@Deactivate
public void deactivate() {
consuming = false;
if (executorService != null) {
executorService.shutdown();
try {
if (!executorService.awaitTermination(10, TimeUnit.SECONDS)) {
executorService.shutdownNow();
}
} catch (InterruptedException e) {
executorService.shutdownNow();
Thread.currentThread().interrupt();
}
executorService = null;
}
}

@Override
Expand Down
Loading