[NAE-2464] Post release fixes

Dockerfile

@@ -2,7 +2,7 @@
 
 FROM eclipse-temurin:21-jre
 
-ARG VERSION="7.0.1"
+ARG VERSION="7.0.2"
 
 LABEL authors="Netgrif <devops@netgrif.com>" \
       org.opencontainers.image.authors="NETGRIF <devops@netgrif.com>" \

Dockerfile.multi-stage

@@ -31,7 +31,7 @@ RUN mvn -B -e -DskipTests -P docker-build clean install
 # prepare runtime
 FROM eclipse-temurin:21-jre-jammy
 
-ARG VERSION="7.0.1"
+ARG VERSION="7.0.2"
 
 LABEL authors="Netgrif <devops@netgrif.com>" \
       org.opencontainers.image.authors="NETGRIF <devops@netgrif.com>" \

application-engine/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.netgrif</groupId>
         <artifactId>application-engine-parent</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
     </parent>
 
     <artifactId>application-engine</artifactId>

application-engine/src/main/groovy/com/netgrif/application/engine/AsyncRunner.groovy

@@ -1,18 +1,73 @@
 package com.netgrif.application.engine
 
-import org.springframework.scheduling.annotation.Async
+import com.netgrif.application.engine.petrinet.domain.dataset.logic.action.ActionDelegate
+import org.springframework.beans.factory.annotation.Qualifier
+import org.springframework.context.annotation.Bean
+import org.springframework.core.task.TaskExecutor
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor
 import org.springframework.stereotype.Service
 
+import java.util.concurrent.atomic.AtomicBoolean
+
 @Service
 class AsyncRunner {
 
-    @Async
+    private final TaskExecutor actionsExecutor
+
+    AsyncRunner(@Qualifier("taskExecutor") TaskExecutor actionsExecutor) {
+        this.actionsExecutor = actionsExecutor
+    }
+
     void run(Closure closure) {
-        closure()
+        ActionDelegate actionDelegate = findActionDelegate(closure)
+        actionDelegate?.retainForAsyncExecution()
+        AtomicBoolean released = new AtomicBoolean()
+
+        Runnable task = {
+            try {
+                closure()
+            } finally {
+                release(actionDelegate, released)
+            }
+        } as Runnable
+
+        try {
+            execute(task)
+        } catch (Throwable throwable) {
+            release(actionDelegate, released)
+            throw throwable
+        }
     }
 
-    @Async
     void execute(final Runnable runnable) {
-        runnable.run()
+        actionsExecutor.execute(runnable)
+    }
+
+    private static void release(ActionDelegate actionDelegate, AtomicBoolean released) {
+        if (actionDelegate != null && released.compareAndSet(false, true)) {
+            actionDelegate.releaseAfterAsyncExecution()
+        }
+    }
+
+    private static ActionDelegate findActionDelegate(Closure closure) {
+        Set<Object> visited = Collections.newSetFromMap(new IdentityHashMap<>())
+        return findActionDelegate(closure, visited)
+    }
+
+    private static ActionDelegate findActionDelegate(Object candidate, Set<Object> visited) {
+        if (candidate == null || !visited.add(candidate)) {
+            return null
+        }
+        if (candidate instanceof ActionDelegate) {
+            return candidate
+        }
+        if (!(candidate instanceof Closure)) {
+            return null
+        }
+
+        Closure nestedClosure = (Closure) candidate
+        return findActionDelegate(nestedClosure.delegate, visited)
+                ?: findActionDelegate(nestedClosure.owner, visited)
+                ?: findActionDelegate(nestedClosure.thisObject, visited)
     }
-}
+}

application-engine/src/main/groovy/com/netgrif/application/engine/migration/helpers/CaseMigrationHelper.groovy

@@ -16,6 +16,7 @@ import com.netgrif.application.engine.petrinet.service.interfaces.IPetriNetServi
 import com.querydsl.core.types.Predicate
 import groovy.util.logging.Slf4j
 import org.bson.types.ObjectId
+import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.data.mongodb.core.BulkOperations
 import org.springframework.data.mongodb.core.FindAndReplaceOptions
 import org.springframework.data.mongodb.core.MongoTemplate
@@ -65,7 +66,7 @@ class CaseMigrationHelper extends AbstractMigrationHelper<Case> {
      * @param mongoTemplate MongoTemplate to interact with MongoDB.
      * @param migrationConfigurationProperties Properties for migration configuration, including cases.
      */
-    CaseMigrationHelper(MongoTemplate mongoTemplate,
+    CaseMigrationHelper(@Qualifier("mongoTemplate") MongoTemplate mongoTemplate,
                         MigrationProperties migrationProperties,
                         IPetriNetService petriNetService,
                         IElasticCaseService elasticCaseService,

application-engine/src/main/groovy/com/netgrif/application/engine/migration/helpers/PetriNetMigrationHelper.groovy

@@ -20,6 +20,7 @@ import com.netgrif.application.engine.petrinet.service.interfaces.IPetriNetServi
 import groovy.util.logging.Slf4j
 import org.apache.tomcat.util.http.fileupload.IOUtils
 import org.springframework.beans.factory.ObjectFactory
+import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.core.io.ClassPathResource
 import org.springframework.core.io.Resource
 import org.springframework.data.domain.Pageable
@@ -83,7 +84,7 @@ class PetriNetMigrationHelper extends AbstractMigrationHelper<PetriNet> {
      * @param importerProvider the {@link ObjectFactory} that supplies {@link Importer} instances for importing Petri Net models from various sources
      * @param userService the {@link UserService} for managing user-related operations, including retrieving system user for Petri Net imports
      */
-    PetriNetMigrationHelper(MongoTemplate mongoTemplate,
+    PetriNetMigrationHelper(@Qualifier("mongoTemplate") MongoTemplate mongoTemplate,
                             MigrationProperties migrationProperties,
                             IPetriNetService petriNetService,
                             ProcessRoleRepository processRoleRepository,

application-engine/src/main/groovy/com/netgrif/application/engine/migration/helpers/TaskMigrationHelper.groovy

@@ -15,6 +15,7 @@ import com.netgrif.application.engine.petrinet.service.interfaces.IPetriNetServi
 import com.netgrif.application.engine.workflow.service.interfaces.ITaskService
 import com.querydsl.core.types.Predicate
 import groovy.util.logging.Slf4j
+import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.data.mongodb.core.BulkOperations
 import org.springframework.data.mongodb.core.MongoTemplate
 import org.springframework.data.mongodb.core.query.Criteria
@@ -70,7 +71,7 @@ class TaskMigrationHelper extends AbstractMigrationHelper<Task> {
      *
      * @param mongoTemplate the {@link MongoTemplate} to use for interacting with MongoDB
      */
-    TaskMigrationHelper(MongoTemplate mongoTemplate,
+    TaskMigrationHelper(@Qualifier("mongoTemplate") MongoTemplate mongoTemplate,
                         MigrationProperties migrationProperties,
                         IPetriNetService petriNetService,
                         ITaskService taskService,

application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy

@@ -240,6 +240,10 @@ class ActionDelegate extends DelegateExpando {
     FieldActionsRunner actionsRunner
     List<EventOutcome> outcomes
 
+    private int pendingAsyncExecutions
+    private boolean executionFinished
+    private boolean executionStateCleared
+
     def init(Action action, Case useCase, Optional<Task> task, FieldActionsRunner actionsRunner, Map<String, String> params = [:]) {
         this.action = action
         this.useCase = useCase
@@ -254,7 +258,32 @@ class ActionDelegate extends DelegateExpando {
         this.Plugin = new PluginHolder()
     }
 
-    void clearAfterExecution() {
+    synchronized void retainForAsyncExecution() {
+        if (executionStateCleared) {
+            throw new IllegalStateException("Action execution state has already been cleared")
+        }
+        pendingAsyncExecutions++
+    }
+
+    synchronized void releaseAfterAsyncExecution() {
+        if (pendingAsyncExecutions == 0) {
+            throw new IllegalStateException("No asynchronous action execution is pending")
+        }
+        pendingAsyncExecutions--
+        clearExecutionStateIfPossible()
+    }
+
+    synchronized void clearAfterExecution() {
+        executionFinished = true
+        clearExecutionStateIfPossible()
+    }
+
+    private void clearExecutionStateIfPossible() {
+        if (!executionFinished || pendingAsyncExecutions != 0 || executionStateCleared) {
+            return
+        }
+        executionStateCleared = true
+
         this.action = null
         this.useCase = null
         this.task = null

application-engine/src/main/java/com/netgrif/application/engine/configuration/MongoClientConfiguration.java

@@ -4,9 +4,7 @@
 import com.mongodb.connection.*;
 import com.netgrif.application.engine.configuration.properties.DataConfigurationProperties;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
+import org.springframework.context.annotation.*;
 
 import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
 import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;

application-engine/src/main/java/com/netgrif/application/engine/configuration/groovy/GroovyShellConfiguration.java

@@ -40,7 +40,11 @@ protected String[] getDefaultEngineImports() {
         return new String[]{
                 "com.netgrif.application.engine.objects",
                 "com.netgrif.application.engine.adapter.spring",
-                "java.time"
+                "com.netgrif.application.engine.objects.petrinet.domain.dataset",
+                "org.bson.types",
+                "java.time",
+                "java.util",
+                "java.util.stream"
         };
     }
 

application-engine/src/main/java/com/netgrif/application/engine/configuration/properties/MigrationProperties.java

@@ -18,7 +18,7 @@
  */
 @Data
 @Configuration
-@ConfigurationProperties(prefix = "nae.migration")
+@ConfigurationProperties(prefix = "netgrif.engine.migration")
 public class MigrationProperties {
 
     /**

application-engine/src/main/java/com/netgrif/application/engine/elastic/service/ElasticCaseService.java

@@ -10,6 +10,7 @@
 import co.elastic.clients.elasticsearch.core.bulk.BulkOperation;
 import com.netgrif.application.engine.configuration.properties.DataConfigurationProperties;
 import com.netgrif.application.engine.elastic.domain.BulkOperationWrapper;
+import com.netgrif.application.engine.elastic.service.model.FullTextField;
 import com.netgrif.application.engine.objects.auth.domain.LoggedUser;
 import com.netgrif.application.engine.objects.elastic.domain.ElasticCase;
 import com.netgrif.application.engine.elastic.domain.ElasticCaseRepository;
@@ -42,6 +43,7 @@
 
 import java.util.*;
 import java.util.function.BinaryOperator;
+import java.util.regex.Matcher;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -59,7 +61,7 @@
     protected DataConfigurationProperties.ElasticsearchProperties elasticProperties;
     protected IPetriNetService petriNetService;
     protected IWorkflowService workflowService;
-    protected IElasticCasePrioritySearch iElasticCasePrioritySearch;
+    protected IElasticCasePrioritySearch elasticCasePrioritySearch;
     protected ApplicationEventPublisher publisher;
     protected ElasticQueueManager caseElasticIndexQueueManager;
     protected ElasticQueueManager caseElasticDeleteQueueManager;
@@ -70,7 +72,7 @@
                               DataConfigurationProperties.ElasticsearchProperties elasticProperties,
                               @Lazy IPetriNetService petriNetService,
                               @Lazy IWorkflowService workflowService,
-                              IElasticCasePrioritySearch iElasticCasePrioritySearch,
+                              IElasticCasePrioritySearch elasticCasePrioritySearch,
                               ApplicationEventPublisher publisher,
                               ElasticsearchClient elasticsearchClient) {
         this.repository = repository;
@@ -79,7 +81,7 @@
         this.elasticProperties = elasticProperties;
         this.petriNetService = petriNetService;
         this.workflowService = workflowService;
-        this.iElasticCasePrioritySearch = iElasticCasePrioritySearch;
+        this.elasticCasePrioritySearch = elasticCasePrioritySearch;
         this.publisher = publisher;
         this.caseElasticIndexQueueManager = new ElasticQueueManager(elasticProperties, elasticsearchClient, publisher);
         this.caseElasticDeleteQueueManager = new ElasticQueueManager(elasticProperties, elasticsearchClient, publisher);
@@ -413,15 +415,37 @@
     }
 
     protected void buildFullTextQuery(CaseSearchRequest request, BoolQuery.Builder query) {
-        if (request.fullText == null || request.fullText.isEmpty()) {
+        if (request.fullText == null || request.fullText.isBlank()) {
             return;
         }
 
-        // TODO: improvement? wildcard does not scale good
-        //String searchText = elasticsearchProperties.isAnalyzerEnabled() ? request.fullText : "*" + request.fullText + "*";
-        String searchText = "*" + request.fullText + "*";
-        QueryStringQuery fullTextQuery = QueryStringQuery.of(builder -> builder.fields(iElasticCasePrioritySearch.fullTextFields()).query(searchText));
-        query.must(fullTextQuery._toQuery());
+        List<String> fullTextTerms = normalizeFullTextSearch(request.fullText);
+        if (fullTextTerms.isEmpty()) {
+            return;
+        }
+
+        List<FullTextField> fullTextFields = elasticCasePrioritySearch.fullTextFields().stream()
+                .map(this::parseFullTextField)
+                .toList();
+
+        BoolQuery.Builder fullTextQuery = new BoolQuery.Builder();
+
+        fullTextTerms.forEach(term -> {
+            BoolQuery.Builder termQuery = new BoolQuery.Builder();
+            String wildcardValue = "*" + escapeWildcardValue(term) + "*";
+
+            fullTextFields.forEach(fullTextField -> termQuery.should(QueryBuilders.wildcard(builder -> builder
+                    .field(fullTextField.field())
+                    .value(wildcardValue)
+                    .caseInsensitive(true)
+                    .boost(fullTextField.boost())
+            )));
+
+            termQuery.minimumShouldMatch("1");
+            fullTextQuery.must(termQuery.build()._toQuery());
+        });
+
+        query.must(fullTextQuery.build()._toQuery());
     }
 
     /**
@@ -531,4 +555,44 @@
                 .id(useCase.getId())
                 .document(template.getElasticsearchConverter().mapObject(useCase))));
     }
+
+    private List<String> normalizeFullTextSearch(String fullText) {
+        return Arrays.stream(Matcher.quoteReplacement(fullText)
+                        .replace("\\\\", "")
+                        .replaceAll("\\s+", " ")
+                        .trim()
+                        .split("\\s+"))
+                .map(String::trim)
+                .map(this::removeDanglingEscapeCharacters)
+                .filter(term -> !term.isBlank())
+                .toList();
+    }
+
+    private String removeDanglingEscapeCharacters(String term) {
+        return term.replaceAll("\\\\+$", "");
+    }
+
+    private FullTextField parseFullTextField(String fieldDefinition) {
+        String[] parts = fieldDefinition.split("\\^", 2);
+        String field = parts[0].trim();
+        float boost = 1.0f;
+
+        if (parts.length == 2 && !parts[1].isBlank()) {
+            try {
+                boost = Float.parseFloat(parts[1].trim());
+                boost = Float.isFinite(boost) && boost > 0 ? boost : 1.0f;
+            } catch (NumberFormatException e) {
+                log.warn("Invalid boost [{}] in fulltext field definition [{}]. Using default boost 1.0.", parts[1], fieldDefinition);
+            }
+        }
+
+        return new FullTextField(field, boost);
+    }
+
+    private String escapeWildcardValue(String value) {
+        return value
+                .replace("\\", "\\\\")
+                .replace("*", "\\*")
+                .replace("?", "\\?");
+    }
 }

application-engine/src/main/java/com/netgrif/application/engine/elastic/service/model/FullTextField.java

@@ -0,0 +1,4 @@
+package com.netgrif.application.engine.elastic.service.model;
+
+public record FullTextField(String field, float boost) {
+}