[unomi] branch master updated: UNOMI-788 : remove missing property warning (#642)

[dgriffon]

This is an automated email from the ASF dual-hosted git repository.

dgriffon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/unomi.git


The following commit(s) were added to refs/heads/master by this push:
     new ae0c110fa UNOMI-788 : remove missing property warning (#642)
ae0c110fa is described below

commit ae0c110fa48d148c189335b4e44191ee63ddda1e
Author: David Griffon <dgrif...@jahia.com>
AuthorDate: Fri Aug 18 10:15:06 2023 +0200

    UNOMI-788 : remove missing property warning (#642)
---
 .../conditions/HardcodedPropertyAccessorRegistry.java       |  4 ----
 .../baseplugin/conditions/PropertyConditionEvaluator.java   | 13 +++++++------
 .../src/main/resources/OSGI-INF/blueprint/blueprint.xml     |  2 +-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git 
a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/HardcodedPropertyAccessorRegistry.java
 
b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/HardcodedPropertyAccessorRegistry.java
index ed0d5c1d6..5650042fa 100644
--- 
a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/HardcodedPropertyAccessorRegistry.java
+++ 
b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/HardcodedPropertyAccessorRegistry.java
@@ -134,10 +134,6 @@ public class HardcodedPropertyAccessorRegistry {
                 }
             }
         }
-        logger.warn("Couldn't find any property access for class {}. See debug 
log level for more information", object.getClass().getName());
-        if (logger.isDebugEnabled()) {
-            logger.debug("Couldn't find any property access for class {} and 
expression {}", object.getClass().getName(), expression);
-        }
         return HardcodedPropertyAccessor.PROPERTY_NOT_FOUND_MARKER;
     }
 
diff --git 
a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionEvaluator.java
 
b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionEvaluator.java
index 7ad182e4f..c52bea840 100644
--- 
a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionEvaluator.java
+++ 
b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionEvaluator.java
@@ -69,6 +69,12 @@ public class PropertyConditionEvaluator implements 
ConditionEvaluator {
         this.expressionFilterFactory = expressionFilterFactory;
     }
 
+    public void init() {
+        if (!useOGNLScripting) {
+            logger.info("OGNL Script disabled, properties using OGNL won't be 
evaluated");
+        }
+    }
+
     private int compare(Object actualValue, String expectedValue, Object 
expectedValueDate, Object expectedValueInteger, Object expectedValueDateExpr, 
Object expectedValueDouble) {
         if (expectedValue == null && expectedValueDate == null && 
expectedValueInteger == null && getDate(expectedValueDateExpr) == null && 
expectedValueDouble == null) {
             return actualValue == null ? 0 : 1;
@@ -318,13 +324,8 @@ public class PropertyConditionEvaluator implements 
ConditionEvaluator {
         }
         if (useOGNLScripting) {
             return getOGNLPropertyValue(item, expression);
-        } else {
-            logger.warn("OGNL Off. Expression not evaluated on item {}. See 
debug log level for more information", item.getClass().getName());
-            if (logger.isDebugEnabled()) {
-                logger.debug("OGNL Off. Expression not evaluated on item {}: 
{}", item.getClass().getName(), expression);
-            }
-            return null;
         }
+        return null;
     }
 
     protected Object getHardcodedPropertyValue(Item item, String expression) {
diff --git 
a/plugins/baseplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml 
b/plugins/baseplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 97bbe12d5..9f7dc8c92 100644
--- a/plugins/baseplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/plugins/baseplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -155,7 +155,7 @@
         <bean 
class="org.apache.unomi.plugins.baseplugin.conditions.NotConditionEvaluator"/>
     </service>
 
-    <bean id="propertyConditionEvaluator" 
class="org.apache.unomi.plugins.baseplugin.conditions.PropertyConditionEvaluator">
+    <bean id="propertyConditionEvaluator" 
class="org.apache.unomi.plugins.baseplugin.conditions.PropertyConditionEvaluator"
 init-method="init">
         <property name="usePropertyConditionOptimizations" 
value="${base.usePropertyConditionOptimizations}"/>
     </bean>
     <service  
interface="org.apache.unomi.persistence.elasticsearch.conditions.ConditionEvaluator"
 ref="propertyConditionEvaluator">