From 9133315ddd04a314df7f6608f645866975bd10c9 Mon Sep 17 00:00:00 2001 From: palajsamuel Date: Tue, 18 Nov 2025 10:59:11 +0100 Subject: [PATCH 1/2] [NAE-2239] Method calls not updated after Pageable was added - added pageable to method calls in ActionDelegate - unused imports removed --- .../integration/modules/ModuleServiceInjector.groovy | 1 - .../engine/migration/ActionMigration.groovy | 5 +++-- .../domain/dataset/logic/action/ActionDelegate.groovy | 10 +++++----- .../application/engine/startup/ImportHelper.groovy | 4 ++-- .../workflow/service/WorkflowAuthorizationService.java | 1 - .../workflow/web/RestResponseExceptionHandler.java | 1 - .../engine/workflow/web/WorkflowController.java | 1 - .../engine/petrinet/domain/PetriNetTest.groovy | 2 +- 8 files changed, 11 insertions(+), 14 deletions(-) diff --git a/application-engine/src/main/groovy/com/netgrif/application/engine/integration/modules/ModuleServiceInjector.groovy b/application-engine/src/main/groovy/com/netgrif/application/engine/integration/modules/ModuleServiceInjector.groovy index 2e017e700f..98fb658c7b 100644 --- a/application-engine/src/main/groovy/com/netgrif/application/engine/integration/modules/ModuleServiceInjector.groovy +++ b/application-engine/src/main/groovy/com/netgrif/application/engine/integration/modules/ModuleServiceInjector.groovy @@ -8,7 +8,6 @@ import org.slf4j.Logger import org.slf4j.LoggerFactory import org.springframework.boot.ApplicationArguments import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty -import org.springframework.core.annotation.AnnotatedElementUtils import org.springframework.stereotype.Component /** diff --git a/application-engine/src/main/groovy/com/netgrif/application/engine/migration/ActionMigration.groovy b/application-engine/src/main/groovy/com/netgrif/application/engine/migration/ActionMigration.groovy index d2ae62c461..941a954736 100644 --- a/application-engine/src/main/groovy/com/netgrif/application/engine/migration/ActionMigration.groovy +++ b/application-engine/src/main/groovy/com/netgrif/application/engine/migration/ActionMigration.groovy @@ -9,6 +9,7 @@ import com.netgrif.application.engine.objects.workflow.domain.eventoutcomes.petr import groovy.util.logging.Slf4j import org.springframework.beans.factory.annotation.Autowired import org.springframework.core.io.ClassPathResource +import org.springframework.data.domain.Pageable import org.springframework.stereotype.Component import java.util.stream.Collectors @@ -23,7 +24,7 @@ class ActionMigration { @Autowired private UserService userService; - void migrateActions(String petriNetPath) { + void migrateActions(String petriNetPath, Pageable pageable = Pageable.unpaged()) { InputStream netStream = new ClassPathResource(petriNetPath).inputStream ImportPetriNetEventOutcome newPetriNet = petriNetService.importPetriNet(netStream, VersionType.MAJOR, ActorTransformer.toLoggedUser(userService.getLoggedOrSystem())) List oldPetriNets @@ -33,7 +34,7 @@ class ActionMigration { log.error(message) throw new IllegalArgumentException(message) } else { - oldPetriNets = petriNetService.getByIdentifier(newPetriNet.getNet().importId) + oldPetriNets = petriNetService.getByIdentifier(newPetriNet.getNet().importId, pageable) .stream().filter({ net -> (net.version != newPetriNet.getNet().version)}) .collect(Collectors.toList()) } diff --git a/application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy b/application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy index 3331909650..d2d9485b28 100644 --- a/application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy +++ b/application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy @@ -1024,8 +1024,8 @@ class ActionDelegate { return actualUser } - AbstractUser assignRole(String roleId, String netId, AbstractUser user = userService.loggedUser) { - List nets = petriNetService.getByIdentifier(netId) + AbstractUser assignRole(String roleId, String netId, AbstractUser user = userService.loggedUser, Pageable pageable = Pageable.unpaged()) { + List nets = petriNetService.getByIdentifier(netId, pageable).content nets.forEach({ net -> user = assignRole(roleId, net, user) }) return user } @@ -1045,8 +1045,8 @@ class ActionDelegate { return actualUser } - AbstractUser removeRole(String roleId, String netId, AbstractUser user = userService.loggedUser) { - List nets = petriNetService.getByIdentifier(netId) + AbstractUser removeRole(String roleId, String netId, AbstractUser user = userService.loggedUser, Pageable pageable = Pageable.unpaged()) { + List nets = petriNetService.getByIdentifier(netId, pageable).content nets.forEach({ net -> user = removeRole(roleId, net, user) }) return user } @@ -1321,7 +1321,7 @@ class ActionDelegate { } def changeUserByEmail(String email, String attribute, def cl) { - AbstractUser user = userService.findUserByUsername(email, null) + AbstractUser user = userService.findUserByUsername(email, null).get() changeUser(user, attribute, cl) } diff --git a/application-engine/src/main/groovy/com/netgrif/application/engine/startup/ImportHelper.groovy b/application-engine/src/main/groovy/com/netgrif/application/engine/startup/ImportHelper.groovy index 651bf31abb..a71f624e5b 100644 --- a/application-engine/src/main/groovy/com/netgrif/application/engine/startup/ImportHelper.groovy +++ b/application-engine/src/main/groovy/com/netgrif/application/engine/startup/ImportHelper.groovy @@ -112,7 +112,7 @@ class ImportHelper { } Optional createNet(String fileName, String release, LoggedUser author = ActorTransformer.toLoggedUser(userService.getSystem())) { - return createNet(fileName, VersionType.valueOf(release.trim().toUpperCase()), author, uriNodeId) + return createNet(fileName, VersionType.valueOf(release.trim().toUpperCase()), author) } Optional createNet(String fileName, VersionType release = VersionType.MAJOR, LoggedUser author = ActorTransformer.toLoggedUser(userService.getSystem())) { @@ -167,7 +167,7 @@ class ImportHelper { } Map getProcessRoles(PetriNet net) { - List roles = processRoleService.findAll(net.stringId) + List roles = processRoleService.findAllByNetStringId(net.stringId) Map map = [:] net.roles.values().each { netRole -> map[netRole.name.getDefaultValue()] = roles.find { it.stringId == netRole.stringId } diff --git a/application-engine/src/main/java/com/netgrif/application/engine/workflow/service/WorkflowAuthorizationService.java b/application-engine/src/main/java/com/netgrif/application/engine/workflow/service/WorkflowAuthorizationService.java index e4438d1b86..707e33353d 100644 --- a/application-engine/src/main/java/com/netgrif/application/engine/workflow/service/WorkflowAuthorizationService.java +++ b/application-engine/src/main/java/com/netgrif/application/engine/workflow/service/WorkflowAuthorizationService.java @@ -1,6 +1,5 @@ package com.netgrif.application.engine.workflow.service; -import com.netgrif.application.engine.adapter.spring.auth.domain.LoggedUserImpl; import com.netgrif.application.engine.auth.service.UserService; import com.netgrif.application.engine.objects.auth.domain.AbstractUser; import com.netgrif.application.engine.objects.auth.domain.LoggedUser; diff --git a/application-engine/src/main/java/com/netgrif/application/engine/workflow/web/RestResponseExceptionHandler.java b/application-engine/src/main/java/com/netgrif/application/engine/workflow/web/RestResponseExceptionHandler.java index b1c3fd3f40..9f7aded896 100644 --- a/application-engine/src/main/java/com/netgrif/application/engine/workflow/web/RestResponseExceptionHandler.java +++ b/application-engine/src/main/java/com/netgrif/application/engine/workflow/web/RestResponseExceptionHandler.java @@ -6,7 +6,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatusCode; import org.springframework.http.ResponseEntity; import org.springframework.http.converter.HttpMessageNotWritableException; diff --git a/application-engine/src/main/java/com/netgrif/application/engine/workflow/web/WorkflowController.java b/application-engine/src/main/java/com/netgrif/application/engine/workflow/web/WorkflowController.java index bf93216113..bad76f64af 100644 --- a/application-engine/src/main/java/com/netgrif/application/engine/workflow/web/WorkflowController.java +++ b/application-engine/src/main/java/com/netgrif/application/engine/workflow/web/WorkflowController.java @@ -50,7 +50,6 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; -import java.util.ArrayList; import java.util.Locale; import java.util.Map; diff --git a/application-engine/src/test/groovy/com/netgrif/application/engine/petrinet/domain/PetriNetTest.groovy b/application-engine/src/test/groovy/com/netgrif/application/engine/petrinet/domain/PetriNetTest.groovy index 19b9b76ec8..7efdd6ca99 100644 --- a/application-engine/src/test/groovy/com/netgrif/application/engine/petrinet/domain/PetriNetTest.groovy +++ b/application-engine/src/test/groovy/com/netgrif/application/engine/petrinet/domain/PetriNetTest.groovy @@ -122,7 +122,7 @@ class PetriNetTest { def lastImport = petriNetService.importPetriNet(netResource4.inputStream, VersionType.PATCH, superCreator.loggedSuper) assert lastImport.getNet().version.toString() == "3.1.1" - Page nets = petriNetService.getByIdentifier(zeroImport.getNet().identifier, Pageable.unpaged()) + Page nets = petriNetService.getByIdentifier(zeroImport.getNet().identifier, Pageable.unpaged()) assert nets.getSize() == 5 } From c8c3785c3933cbd0cd8bd176e664fedb8ec65aee Mon Sep 17 00:00:00 2001 From: palajsamuel Date: Tue, 18 Nov 2025 11:19:34 +0100 Subject: [PATCH 2/2] [NAE-2239] Method calls not updated after Pageable was added - empty optional check added --- .../domain/dataset/logic/action/ActionDelegate.groovy | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy b/application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy index d2d9485b28..d3fe949c8e 100644 --- a/application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy +++ b/application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy @@ -1321,7 +1321,12 @@ class ActionDelegate { } def changeUserByEmail(String email, String attribute, def cl) { - AbstractUser user = userService.findUserByUsername(email, null).get() + Optional userOptional = userService.findUserByUsername(email, null) + if (!userOptional.isPresent()) { + log.error("Cannot find user with email [" + email + "]") + return + } + AbstractUser user = userOptional.get() changeUser(user, attribute, cl) }