Merge pull request #436 from netgrif/NAE-2418

[NAE-2418] Verify @transient handling across persistence layers in nae-spring-core-adapter

Author: machacjozef

application-engine/src/main/java/com/netgrif/application/engine/auth/service/RegistrationService.java

@@ -132,7 +132,7 @@ public AbstractUser createNewUser(NewUserRequest newUser) {
             }
             log.info("Renewing old user [{}]", newUser.email);
         } else {
-            user = new User();
+            user = new com.netgrif.application.engine.adapter.spring.auth.domain.User();
             user.setEmail(newUser.email);
             user.setUsername(newUser.email);
             log.info("Creating new user [{}]", newUser.email);

application-engine/src/main/java/com/netgrif/application/engine/configuration/security/PublicAuthenticationFilter.java

@@ -105,7 +105,7 @@ private LoggedUser resolveLoggedUser(String existingToken) {
     }
 
     private LoggedUser createAnonymousUser() {
-        User anonymousUser = new User();
+        User anonymousUser = new com.netgrif.application.engine.adapter.spring.auth.domain.User();
         anonymousUser.setState(UserState.ACTIVE);
         anonymousUser = (User) userService.saveUser(anonymousUser, null);
         return ActorTransformer.toLoggedUser(anonymousUser);

application-engine/src/main/java/com/netgrif/application/engine/petrinet/service/ArcFactory.java

@@ -1,11 +1,10 @@
 package com.netgrif.application.engine.petrinet.service;
 
+import com.netgrif.application.engine.adapter.spring.petrinet.domain.arcs.InhibitorArc;
+import com.netgrif.application.engine.adapter.spring.petrinet.domain.arcs.ReadArc;
+import com.netgrif.application.engine.adapter.spring.petrinet.domain.arcs.ResetArc;
 import com.netgrif.application.engine.objects.petrinet.domain.arcs.Arc;
-import com.netgrif.application.engine.objects.petrinet.domain.arcs.InhibitorArc;
-import com.netgrif.application.engine.objects.petrinet.domain.arcs.ReadArc;
-import com.netgrif.application.engine.objects.petrinet.domain.arcs.ResetArc;
 import com.netgrif.application.engine.objects.petrinet.domain.arcs.reference.Reference;
-import com.netgrif.application.engine.objects.petrinet.domain.arcs.reference.Type;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -14,15 +13,15 @@ public final class ArcFactory {
     public Arc getArc(com.netgrif.application.engine.objects.importer.model.Arc arc) throws IllegalArgumentException {
         switch (arc.getType()) {
             case REGULAR:
-                return new Arc();
+                return new com.netgrif.application.engine.adapter.spring.petrinet.domain.arcs.Arc();
             case RESET:
                 return new ResetArc();
             case INHIBITOR:
                 return new InhibitorArc();
             case READ:
                 return new ReadArc();
             case VARIABLE:
-                Arc varArc = new Arc();
+                Arc varArc = new com.netgrif.application.engine.adapter.spring.petrinet.domain.arcs.Arc();
                 Reference ref = new Reference();
                 ref.setReference(String.valueOf(arc.getMultiplicity()));
                 varArc.setReference(ref);

application-engine/src/main/java/com/netgrif/application/engine/petrinet/service/PetriNetEventHandler.java

@@ -16,7 +16,6 @@ public class PetriNetEventHandler extends AbstractMongoEventListener<PetriNet> {
 
     @Autowired
     private IElasticPetriNetService service;
-
     @Override
     public void onAfterDelete(AfterDeleteEvent<PetriNet> event) {
         Document document = event.getDocument();

application-engine/src/main/java/com/netgrif/application/engine/petrinet/service/ProcessRoleService.java

@@ -5,12 +5,9 @@
 import com.netgrif.application.engine.adapter.spring.petrinet.domain.roles.RoleReferencedException;
 import com.netgrif.application.engine.adapter.spring.utils.PaginationProperties;
 import com.netgrif.application.engine.auth.service.GroupService;
-import com.netgrif.application.engine.objects.auth.domain.AbstractUser;
+import com.netgrif.application.engine.objects.auth.domain.*;
 import com.netgrif.application.engine.auth.service.RealmService;
-import com.netgrif.application.engine.objects.auth.domain.Group;
-import com.netgrif.application.engine.objects.auth.domain.LoggedUser;
 import com.netgrif.application.engine.auth.service.UserService;
-import com.netgrif.application.engine.objects.auth.domain.Realm;
 import com.netgrif.application.engine.objects.event.events.user.UserRoleChangeEvent;
 import com.netgrif.application.engine.objects.importer.model.EventPhaseType;
 import com.netgrif.application.engine.objects.petrinet.domain.PetriNet;
@@ -121,30 +118,29 @@ public void deleteAll() {
 
     @Override
     public void assignRolesToUser(AbstractUser user, Collection<ProcessResourceId> processResourceIds, LoggedUser loggedUser) {
-        assignRolesToActor(user.getProcessRoles(), processResourceIds);
+        assignRolesToActor(user, processResourceIds);
         saveUserAndReloadContext(user, loggedUser);
     }
 
     @Override
     public void assignRolesToGroup(Group group, Collection<ProcessResourceId> requestedRolesIds) {
-        assignRolesToActor(group.getProcessRoles(), requestedRolesIds);
+        assignRolesToActor(group, requestedRolesIds);
         groupService.save(group);
     }
 
-    protected void assignRolesToActor(Collection<ProcessRole> oldActorRoles, Collection<ProcessResourceId> requestedRolesIds) {
+    protected void assignRolesToActor(AbstractActor abstractActor, Collection<ProcessResourceId> requestedRolesIds) {
         List<ProcessRole> requestedRoles = this.findByIds(requestedRolesIds.stream().map(ProcessResourceId::toString).collect(Collectors.toSet()));
         if (requestedRoles.isEmpty() && !requestedRolesIds.isEmpty())
             throw new IllegalArgumentException("No process roles found.");
         if (requestedRoles.size() != requestedRolesIds.size())
             throw new IllegalArgumentException("Not all process roles were found!");
 
-        Set<ProcessRole> userOldRoles = new HashSet<>(oldActorRoles);
+        Set<ProcessRole> userOldRoles = new HashSet<>(abstractActor.getProcessRoles());
         Set<ProcessRole> rolesNewToUser = getRolesNewToActor(userOldRoles, requestedRoles);
         Set<ProcessRole> rolesRemovedFromUser = getRolesRemovedFromActor(userOldRoles, requestedRoles);
 
-
-        oldActorRoles.clear();
-        oldActorRoles.addAll(updateRequestedRoles(userOldRoles, rolesNewToUser, rolesRemovedFromUser));
+        abstractActor.clearProcessRoles();
+        abstractActor.addAllProcessRoles(updateRequestedRoles(userOldRoles, rolesNewToUser, rolesRemovedFromUser));
     }
 
     protected void saveUserAndReloadContext(AbstractUser user, LoggedUser loggedUser) {

application-engine/src/main/java/com/netgrif/application/engine/startup/runner/SuperCreatorRunner.java

@@ -55,7 +55,7 @@ private AbstractUser createSuperUser() {
 
         Optional<AbstractUser> superUser = userService.findUserByUsername(UserConstants.ADMIN_USER_USERNAME, null);
         if (superUser.isEmpty()) {
-            User user = new User();
+            User user = new com.netgrif.application.engine.adapter.spring.auth.domain.User();
             user.setFirstName(UserConstants.ADMIN_USER_FIRST_NAME);
             user.setLastName(UserConstants.ADMIN_USER_LAST_NAME);
             user.setUsername(UserConstants.ADMIN_USER_USERNAME);

application-engine/src/test/groovy/com/netgrif/application/engine/action/AssignActionTest.groovy

@@ -100,7 +100,7 @@ class AssignActionTest {
 
         auths = importHelper.createAuthorities(["user": Authority.user, "admin": Authority.admin])
 
-        importHelper.createUser(new User(firstName: "Test", lastName: "Integration", email: USER_EMAIL, password: USER_PASSWORD, state: UserState.ACTIVE),
+        importHelper.createUser(new com.netgrif.application.engine.adapter.spring.auth.domain.User(firstName: "Test", lastName: "Integration", email: USER_EMAIL, password: USER_PASSWORD, state: UserState.ACTIVE),
                 [auths.get("user"), auths.get("admin")] as Authority[],
 //                [org] as Group[],
                 [] as ProcessRole[])

application-engine/src/test/groovy/com/netgrif/application/engine/action/RemoveActionTest.groovy

@@ -102,7 +102,7 @@ class RemoveActionTest {
 
         def auths = importHelper.createAuthorities(["user": Authority.user, "admin": Authority.admin])
 
-        importHelper.createUser(new User(firstName: "Test", lastName : "Integration", email: USER_EMAIL, password: USER_PASSWORD, state: UserState.ACTIVE),
+        importHelper.createUser(new com.netgrif.application.engine.adapter.spring.auth.domain.User(firstName: "Test", lastName : "Integration", email: USER_EMAIL, password: USER_PASSWORD, state: UserState.ACTIVE),
                 [auths.get("user")] as Authority[],
                 [] as ProcessRole[])
     }

application-engine/src/test/groovy/com/netgrif/application/engine/auth/LoginAttemptsTest.groovy

@@ -63,7 +63,7 @@ class LoginAttemptsTest {
                 .build()
 
         auths = importHelper.createAuthorities(["user": Authority.user, "admin": Authority.admin])
-        importHelper.createUser(new User(firstName: "Test", lastName: "Integration", email: USER_EMAIL, password: USER_PASSWORD, state: UserState.ACTIVE),
+        importHelper.createUser(new com.netgrif.application.engine.adapter.spring.auth.domain.User(firstName: "Test", lastName: "Integration", email: USER_EMAIL, password: USER_PASSWORD, state: UserState.ACTIVE),
                 [auths.get("user"), auths.get("admin")] as Authority[],
                 [] as ProcessRole[])
     }

application-engine/src/test/groovy/com/netgrif/application/engine/auth/SecurityContextTest.groovy

@@ -67,7 +67,7 @@ class SecurityContextTest {
     @BeforeEach
     void before() {
         testHelper.truncateDbs()
-        user = new User()
+        user = new com.netgrif.application.engine.adapter.spring.auth.domain.User()
         user.setUsername('test@email.com')
         user.setEmail('test@email.com')
         user.setCredential("password", new PasswordCredential('password', 0, true))