feat(search like): remove wordSearchExclusionMappings configuration (…

…#2816) Covers [BPM-44](https://bonitasoft.atlassian.net/browse/BPM-44)
bonitasoft · Dec 13, 2023 · c4f1dce · c4f1dce
1 parent 0abb78f
commit c4f1dce
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 266 deletions.
diff --git a/bpm/bonita-core/bonita-process-engine/src/main/resources/bonita-community.xml b/bpm/bonita-core/bonita-process-engine/src/main/resources/bonita-community.xml
@@ -1023,56 +1023,12 @@
         </property>
     </bean>
 
-    <bean id="defaultPlatformWordSearchExclusionMappings" class="org.springframework.beans.factory.config.SetFactoryBean">
-        <property name="targetSetClass">
-            <value>java.util.HashSet</value>
-        </property>
-        <property name="sourceSet">
-            <list>
-            </list>
-        </property>
-    </bean>
-
-    <bean id="platformWordSearchExclusionMappings" parent="defaultPlatformWordSearchExclusionMappings" class="org.springframework.beans.factory.config.SetFactoryBean">
-        <property name="targetSetClass">
-            <value>java.util.HashSet</value>
-        </property>
-        <property name="sourceSet">
-            <list merge="true">
-                <!-- value>org.bonitasoft.engine.identity.model.SUser</value -->
-            </list>
-        </property>
-    </bean>
-
     <bean id="queryBuilderFactory" class="org.bonitasoft.engine.persistence.QueryBuilderFactory">
         <constructor-arg name="orderByCheckingMode" value="${sysprop.bonita.orderby.checking.mode:NONE}" />
         <constructor-arg name="classAliasMappings">
             <bean factory-bean="hbmConfigurationProvider" factory-method="getClassAliasMappings" />
         </constructor-arg>
         <constructor-arg name="likeEscapeCharacter" value="${bonita.platform.persistence.tenant.likeEscapeCharacter}" />
-        <constructor-arg name="wordSearchExclusionMappings" ref="tenantWordSearchExclusionMappings" />
-    </bean>
-
-    <bean id="defaultTenantWordSearchExclusionMappings" class="org.springframework.beans.factory.config.SetFactoryBean">
-        <property name="targetSetClass">
-            <value>java.util.HashSet</value>
-        </property>
-        <property name="sourceSet">
-            <list>
-
-            </list>
-        </property>
-    </bean>
-
-    <bean id="tenantWordSearchExclusionMappings" parent="defaultTenantWordSearchExclusionMappings" class="org.springframework.beans.factory.config.SetFactoryBean">
-        <property name="targetSetClass">
-            <value>java.util.HashSet</value>
-        </property>
-        <property name="sourceSet">
-            <list merge="true">
-                <!-- value>org.bonitasoft.engine.identity.model.SUser</value -->
-            </list>
-        </property>
     </bean>
 
     <bean id="hbmConfigurationProviderProperties" parent="communityHbmConfigurationProviderProperties" class="org.bonitasoft.engine.service.impl.MapToPropertiesFactoryBean">

diff --git a/platform/platform-resources/src/main/resources/platform_engine/bonita-platform-custom.xml b/platform/platform-resources/src/main/resources/platform_engine/bonita-platform-custom.xml
@@ -3,29 +3,4 @@
 
     <!-- ADD ANY BEAN DEFINITION YOU WANT TO BE AVAILABLE TO THE PLATFORM ACCESSOR -->
 
-    <!--
-    <bean id="platformWordSearchExclusionMappings" parent="defaultPlatformWordSearchExclusionMappings" class="org.springframework.beans.factory.config.SetFactoryBean">
-        <property name="targetSetClass">
-            <value>java.util.HashSet</value>
-        </property>
-        <property name="sourceSet">
-            <list merge="true">
-                <value>org.bonitasoft.engine.identity.model.SUser</value>
-            </list>
-        </property>
-    </bean>
-    -->
-
-    <!--
-    <bean id="tenantWordSearchExclusionMappings" parent="defaultTenantWordSearchExclusionMappings" class="org.springframework.beans.factory.config.SetFactoryBean">
-        <property name="targetSetClass">
-            <value>java.util.HashSet</value>
-        </property>
-        <property name="sourceSet">
-            <list merge="true">
-                <value>org.bonitasoft.engine.identity.model.SUser</value>
-            </list>
-        </property>
-    </bean>
-    -->
 </beans>
diff --git a/...nita-persistence/src/main/java/org/bonitasoft/engine/persistence/QueryBuilderFactory.java b/...nita-persistence/src/main/java/org/bonitasoft/engine/persistence/QueryBuilderFactory.java
@@ -13,9 +13,7 @@
  **/
 package org.bonitasoft.engine.persistence;
 
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 
 import lombok.extern.slf4j.Slf4j;
 import org.hibernate.Session;
@@ -32,31 +30,13 @@ public class QueryBuilderFactory {
     private OrderByBuilder orderByBuilder = new DefaultOrderByBuilder();
     private Map<String, String> classAliasMappings;
     private char likeEscapeCharacter;
-    private final Set<Class<? extends PersistentObject>> wordSearchExclusionMappings = new HashSet<>();
 
     public QueryBuilderFactory(OrderByCheckingMode orderByCheckingMode, Map<String, String> classAliasMappings,
-            char likeEscapeCharacter, Set<String> wordSearchExclusionMappings)
+            char likeEscapeCharacter)
             throws Exception {
         this.orderByCheckingMode = orderByCheckingMode;
         this.classAliasMappings = classAliasMappings;
         this.likeEscapeCharacter = likeEscapeCharacter;
-        initializeWordSearchExclusions(wordSearchExclusionMappings);
-    }
-
-    private void initializeWordSearchExclusions(Set<String> wordSearchExclusionMappings)
-            throws Exception {
-        if (wordSearchExclusionMappings != null && !wordSearchExclusionMappings.isEmpty()) {
-            for (final String wordSearchExclusionMapping : wordSearchExclusionMappings) {
-                final Class<?> clazz = Class.forName(wordSearchExclusionMapping);
-                if (!PersistentObject.class.isAssignableFrom(clazz)) {
-                    throw new IllegalArgumentException(
-                            "Unable to add a word search exclusion mapping for class " + clazz
-                                    + " because it does not implements "
-                                    + PersistentObject.class);
-                }
-                this.wordSearchExclusionMappings.add((Class<? extends PersistentObject>) clazz);
-            }
-        }
     }
 
     public <T> QueryBuilder createQueryBuilderFor(Session session,
@@ -75,17 +55,4 @@ public <T> QueryBuilder createQueryBuilderFor(Session session,
     public void setOrderByBuilder(OrderByBuilder orderByBuilder) {
         this.orderByBuilder = orderByBuilder;
     }
-
-    protected boolean isWordSearchEnabled(final Class<? extends PersistentObject> entityClass) {
-        if (entityClass == null) {
-            return false;
-        }
-        for (final Class<? extends PersistentObject> exclusion : wordSearchExclusionMappings) {
-            if (exclusion.isAssignableFrom(entityClass)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
 }
diff --git a/...-persistence/src/test/java/org/bonitasoft/engine/persistence/QueryBuilderFactoryTest.java b/...-persistence/src/test/java/org/bonitasoft/engine/persistence/QueryBuilderFactoryTest.java