Merge branch 'Phase3' into pollex-dev

wayne

2022-03-04 472fd20c108714b28be49d4fedee5bbabe1b2358

 pamapi/src/test/java/com/pollex/pam/web/rest/AccountResourceIT.java

@@ -6,17 +6,16 @@
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;

import com.pollex.pam.IntegrationTest;
import com.pollex.pam.config.Constants;
import com.pollex.pam.domain.User;
import com.pollex.pam.repository.AuthorityRepository;
import com.pollex.pam.repository.UserRepository;
import com.pollex.pam.security.AuthoritiesConstants;
import com.pollex.pam.service.UserService;
import com.pollex.pam.service.dto.AdminUserDTO;
import com.pollex.pam.service.dto.PasswordChangeDTO;
import com.pollex.pam.service.dto.UserDTO;
import com.pollex.pam.web.rest.vm.KeyAndPasswordVM;
import com.pollex.pam.web.rest.vm.ManagedUserVM;
import com.pollex.pam.business.config.Constants;
import com.pollex.pam.business.domain.User;
import com.pollex.pam.business.repository.AuthorityRepository;
import com.pollex.pam.business.repository.UserRepository;
import com.pollex.pam.business.security.AuthoritiesConstants;
import com.pollex.pam.business.service.UserService;
import com.pollex.pam.business.service.dto.AdminUserDTO;
import com.pollex.pam.business.service.dto.PasswordChangeDTO;
import com.pollex.pam.business.web.vm.KeyAndPasswordVM;
import com.pollex.pam.business.web.vm.ManagedUserVM;
import java.time.Instant;
import java.util.*;
import org.apache.commons.lang3.RandomStringUtils;