Organize imports. This closes #319.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/86fac5e3 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/86fac5e3 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/86fac5e3 Branch: refs/heads/hotfix-2.0.0 Commit: 86fac5e36f5a8d1440c85cd39c3e9431856eae70 Parents: 1972937 Author: Dave Johnson <[email protected]> Authored: Thu Jul 23 11:30:50 2015 -0400 Committer: Dave Johnson <[email protected]> Committed: Thu Jul 23 11:30:50 2015 -0400 ---------------------------------------------------------------------- .../usergrid/rest/management/AdminUsersIT.java | 58 +++---- .../cassandra/ManagementServiceImpl.java | 151 ++++--------------- .../apache/usergrid/management/EmailFlowIT.java | 71 ++------- 3 files changed, 64 insertions(+), 216 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/86fac5e3/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java index 375bbd9..2a68029 100644 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java +++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java @@ -17,53 +17,31 @@ package org.apache.usergrid.rest.management; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMultipart; - -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; -import org.jvnet.mock_javamail.Mailbox; - - - +import com.sun.jersey.api.client.ClientResponse; +import com.sun.jersey.api.client.UniformInterfaceException; +import com.sun.jersey.api.representation.Form; import org.apache.usergrid.management.MockImapClient; import org.apache.usergrid.persistence.index.utils.StringUtils; import org.apache.usergrid.persistence.index.utils.UUIDUtils; import org.apache.usergrid.rest.test.resource2point0.AbstractRestIT; import org.apache.usergrid.rest.test.resource2point0.endpoints.mgmt.ManagementResource; -import org.apache.usergrid.rest.test.resource2point0.model.ApiResponse; -import org.apache.usergrid.rest.test.resource2point0.model.Entity; -import org.apache.usergrid.rest.test.resource2point0.model.QueryParameters; -import org.apache.usergrid.rest.test.resource2point0.model.Token; +import org.apache.usergrid.rest.test.resource2point0.model.*; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; +import org.jvnet.mock_javamail.Mailbox; -import com.fasterxml.jackson.databind.JsonNode; -import com.sun.jersey.api.client.ClientResponse; -import com.sun.jersey.api.client.UniformInterfaceException; -import com.sun.jersey.api.representation.Form; +import javax.mail.Message; +import javax.mail.MessagingException; +import javax.mail.internet.MimeMultipart; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_USERS_REQUIRE_CONFIRMATION; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_APPROVES_ADMIN_USERS; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_APPROVES_ORGANIZATIONS; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_DEFAULT_SYSADMIN_EMAIL; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_ADMIN_USER_EMAIL; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_ADMIN_USER_PASSWORD; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import org.apache.usergrid.rest.test.resource2point0.model.Organization; -import org.apache.usergrid.rest.test.resource2point0.model.User; +import static org.apache.usergrid.management.AccountCreationProps.*; +import static org.junit.Assert.*; /** http://git-wip-us.apache.org/repos/asf/usergrid/blob/86fac5e3/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java ---------------------------------------------------------------------- diff --git a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java index 47e32a8..9ee3a7b 100644 --- a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java +++ b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java @@ -17,56 +17,24 @@ package org.apache.usergrid.management.cassandra; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Properties; -import java.util.Set; -import java.util.UUID; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; +import com.google.common.collect.BiMap; +import com.google.common.collect.HashBiMap; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang.text.StrSubstitutor; import org.apache.shiro.UnavailableSecurityManagerException; import org.apache.usergrid.locking.Lock; import org.apache.usergrid.locking.LockManager; -import org.apache.usergrid.management.AccountCreationProps; -import org.apache.usergrid.management.ActivationState; -import org.apache.usergrid.management.ApplicationInfo; -import org.apache.usergrid.management.ManagementService; -import org.apache.usergrid.management.OrganizationInfo; -import org.apache.usergrid.management.OrganizationOwnerInfo; -import org.apache.usergrid.management.UserInfo; -import org.apache.usergrid.management.exceptions.DisabledAdminUserException; -import org.apache.usergrid.management.exceptions.DisabledAppUserException; -import org.apache.usergrid.management.exceptions.IncorrectPasswordException; -import org.apache.usergrid.management.exceptions.ManagementException; -import org.apache.usergrid.management.exceptions.RecentlyUsedPasswordException; -import org.apache.usergrid.management.exceptions.UnableToLeaveOrganizationException; -import org.apache.usergrid.management.exceptions.UnactivatedAdminUserException; -import org.apache.usergrid.management.exceptions.UnactivatedAppUserException; -import org.apache.usergrid.management.exceptions.UnconfirmedAdminUserException; -import org.apache.usergrid.persistence.CredentialsInfo; -import org.apache.usergrid.persistence.Entity; -import org.apache.usergrid.persistence.EntityManager; -import org.apache.usergrid.persistence.EntityManagerFactory; -import org.apache.usergrid.persistence.EntityRef; -import org.apache.usergrid.persistence.exceptions.ApplicationAlreadyExistsException; -import org.apache.usergrid.persistence.index.query.Identifier; -import org.apache.usergrid.persistence.PagingResultsIterator; -import org.apache.usergrid.persistence.Results; -import org.apache.usergrid.persistence.SimpleEntityRef; +import org.apache.usergrid.management.*; +import org.apache.usergrid.management.exceptions.*; +import org.apache.usergrid.persistence.*; import org.apache.usergrid.persistence.entities.Application; import org.apache.usergrid.persistence.entities.Group; import org.apache.usergrid.persistence.entities.User; +import org.apache.usergrid.persistence.exceptions.ApplicationAlreadyExistsException; import org.apache.usergrid.persistence.exceptions.DuplicateUniquePropertyExistsException; import org.apache.usergrid.persistence.exceptions.EntityNotFoundException; +import org.apache.usergrid.persistence.index.query.Identifier; +import org.apache.usergrid.persistence.index.query.Query.Level; import org.apache.usergrid.security.AuthPrincipalInfo; import org.apache.usergrid.security.AuthPrincipalType; import org.apache.usergrid.security.crypto.EncryptionService; @@ -83,85 +51,28 @@ import org.apache.usergrid.security.tokens.TokenCategory; import org.apache.usergrid.security.tokens.TokenInfo; import org.apache.usergrid.security.tokens.TokenService; import org.apache.usergrid.security.tokens.exceptions.TokenException; -import org.apache.usergrid.services.ServiceAction; -import org.apache.usergrid.services.ServiceManager; -import org.apache.usergrid.services.ServiceManagerFactory; -import org.apache.usergrid.services.ServiceRequest; -import org.apache.usergrid.services.ServiceResults; -import org.apache.usergrid.utils.ConversionUtils; -import org.apache.usergrid.utils.JsonUtils; -import org.apache.usergrid.utils.MailUtils; -import org.apache.usergrid.utils.StringUtils; -import org.apache.usergrid.utils.UUIDUtils; +import org.apache.usergrid.services.*; +import org.apache.usergrid.utils.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; -import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; +import java.nio.ByteBuffer; +import java.util.*; +import java.util.Map.Entry; +import static java.lang.Boolean.parseBoolean; import static org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString; import static org.apache.commons.codec.digest.DigestUtils.sha; import static org.apache.commons.lang.StringUtils.isBlank; import static org.apache.usergrid.locking.LockHelper.getUniqueUpdateLock; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_ACTIVATION_URL; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_CONFIRMATION_URL; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_RESETPW_URL; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_ACTIVATED; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_CONFIRMATION; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_CONFIRMED_AWAITING_ACTIVATION; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_INVITED; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_PASSWORD_RESET; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_USER_ACTIVATION; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_FOOTER; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ORGANIZATION_ACTIVATED; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ORGANIZATION_CONFIRMATION; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ORGANIZATION_CONFIRMED_AWAITING_ACTIVATION; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_SYSADMIN_ADMIN_ACTIVATED; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_SYSADMIN_ADMIN_ACTIVATION; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_SYSADMIN_ORGANIZATION_ACTIVATED; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_SYSADMIN_ORGANIZATION_ACTIVATION; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_ACTIVATED; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_CONFIRMATION; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_CONFIRMED_AWAITING_ACTIVATION; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_PASSWORD_RESET; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_PIN_REQUEST; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_MAILER_EMAIL; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_ORGANIZATION_ACTIVATION_URL; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_SETUP_TEST_ACCOUNT; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_ORG_SYSADMIN_EMAIL; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_SYSADMIN_EMAIL; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_DEFAULT_SYSADMIN_EMAIL; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_LOGIN_ALLOWED; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_LOGIN_EMAIL; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_LOGIN_NAME; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_LOGIN_PASSWORD; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_ADMIN_USER_EMAIL; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_ADMIN_USER_NAME; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_ADMIN_USER_PASSWORD; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_ADMIN_USER_USERNAME; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_APP; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_ORGANIZATION; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_USER_ACTIVATION_URL; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_USER_CONFIRMATION_URL; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_USER_RESETPW_URL; +import static org.apache.usergrid.management.AccountCreationProps.*; import static org.apache.usergrid.persistence.CredentialsInfo.getCredentialsSecret; import static org.apache.usergrid.persistence.Schema.*; import static org.apache.usergrid.persistence.Schema.PROPERTY_UUID; -import static org.apache.usergrid.persistence.entities.Activity.PROPERTY_ACTOR; -import static org.apache.usergrid.persistence.entities.Activity.PROPERTY_ACTOR_NAME; -import static org.apache.usergrid.persistence.entities.Activity.PROPERTY_CATEGORY; -import static org.apache.usergrid.persistence.entities.Activity.PROPERTY_CONTENT; -import static org.apache.usergrid.persistence.entities.Activity.PROPERTY_DISPLAY_NAME; -import static org.apache.usergrid.persistence.entities.Activity.PROPERTY_ENTITY_TYPE; -import static org.apache.usergrid.persistence.entities.Activity.PROPERTY_OBJECT; -import static org.apache.usergrid.persistence.entities.Activity.PROPERTY_OBJECT_ENTITY_TYPE; -import static org.apache.usergrid.persistence.entities.Activity.PROPERTY_OBJECT_NAME; -import static org.apache.usergrid.persistence.entities.Activity.PROPERTY_OBJECT_TYPE; +import static org.apache.usergrid.persistence.entities.Activity.*; import static org.apache.usergrid.persistence.entities.Activity.PROPERTY_TITLE; -import static org.apache.usergrid.persistence.entities.Activity.PROPERTY_VERB; -import org.apache.usergrid.persistence.index.query.Query.Level; -import static org.apache.usergrid.security.AuthPrincipalType.ADMIN_USER; -import static org.apache.usergrid.security.AuthPrincipalType.APPLICATION; -import static org.apache.usergrid.security.AuthPrincipalType.APPLICATION_USER; -import static org.apache.usergrid.security.AuthPrincipalType.ORGANIZATION; +import static org.apache.usergrid.security.AuthPrincipalType.*; import static org.apache.usergrid.security.oauth.ClientCredentialsInfo.getTypeFromClientId; import static org.apache.usergrid.security.oauth.ClientCredentialsInfo.getUUIDFromClientId; import static org.apache.usergrid.security.tokens.TokenCategory.ACCESS; @@ -176,8 +87,6 @@ import static org.apache.usergrid.utils.ListUtils.anyNull; import static org.apache.usergrid.utils.MapUtils.hashMap; import static org.apache.usergrid.utils.PasswordUtils.mongoPassword; -import static java.lang.Boolean.parseBoolean; - public class ManagementServiceImpl implements ManagementService { private static final Logger logger = LoggerFactory.getLogger( ManagementServiceImpl.class ); @@ -483,7 +392,7 @@ public class ManagementServiceImpl implements ManagementService { public OrganizationOwnerInfo createOwnerAndOrganization( String organizationName, String username, String name, String email, String password ) throws Exception { - logger.debug("createOwnerAndOrganization1"); + logger.debug( "createOwnerAndOrganization1" ); boolean activated = !newAdminUsersNeedSysAdminApproval() && !newOrganizationsNeedSysAdminApproval(); boolean disabled = newAdminUsersRequireConfirmation(); // if we are active and enabled, skip the send email step @@ -499,7 +408,7 @@ public class ManagementServiceImpl implements ManagementService { boolean disabled ) throws Exception { logger.debug("createOwnerAndOrganization2"); return createOwnerAndOrganization( organizationName, username, name, email, password, - activated, disabled, null, null ); + activated, disabled, null, null ); } @@ -595,8 +504,8 @@ public class ManagementServiceImpl implements ManagementService { writeUserToken( smf.getManagementAppId(), organizationEntity, encryptionService - .plainTextCredentials( generateOAuthSecretKey( AuthPrincipalType.ORGANIZATION ), user.getUuid(), - smf.getManagementAppId() ) ); + .plainTextCredentials( generateOAuthSecretKey( AuthPrincipalType.ORGANIZATION ), user.getUuid(), + smf.getManagementAppId() ) ); OrganizationInfo organization = new OrganizationInfo( organizationEntity.getUuid(), organizationName, properties ); @@ -1037,7 +946,7 @@ public class ManagementServiceImpl implements ManagementService { EntityManager em = emf.getEntityManager( smf.getManagementAppId() ); Results results = em.getCollection( new SimpleEntityRef( Group.ENTITY_TYPE, organizationId ), "users", null, 10000, - Level.ALL_PROPERTIES, false ); + Level.ALL_PROPERTIES, false ); for ( Entity entity : results.getEntities() ) { users.add( getUserInfo( smf.getManagementAppId(), entity ) ); } @@ -1476,7 +1385,7 @@ public class ManagementServiceImpl implements ManagementService { ? principal.getApplicationId() : smf.getManagementAppId() ); Entity entity = em.get( new SimpleEntityRef( - principal.getType().getEntityType(), principal.getUuid())); + principal.getType().getEntityType(), principal.getUuid() ) ); return entity; } @@ -1549,7 +1458,7 @@ public class ManagementServiceImpl implements ManagementService { BiMap<UUID, String> organizations = HashBiMap.create(); EntityManager em = emf.getEntityManager( smf.getManagementAppId() ); Results results = em.getCollection( new SimpleEntityRef( User.ENTITY_TYPE, userId ), "groups", null, 1000, - Level.ALL_PROPERTIES, false ); + Level.ALL_PROPERTIES, false ); String path = null; @@ -1696,7 +1605,7 @@ public class ManagementServiceImpl implements ManagementService { } em.removeFromCollection( new SimpleEntityRef( Group.ENTITY_TYPE, organizationId ), "users", - new SimpleEntityRef( User.ENTITY_TYPE, userId ) ); + new SimpleEntityRef( User.ENTITY_TYPE, userId ) ); } @@ -1765,8 +1674,8 @@ public class ManagementServiceImpl implements ManagementService { EntityManager em = emf.getEntityManager( smf.getManagementAppId() ); Results r = em.getConnectingEntities( - new SimpleEntityRef(APPLICATION_INFO, applicationInfoId), - "owns", "group", Level.ALL_PROPERTIES ); + new SimpleEntityRef( APPLICATION_INFO, applicationInfoId ), + "owns", "group", Level.ALL_PROPERTIES ); Entity entity = r.getEntity(); if ( entity != null ) { http://git-wip-us.apache.org/repos/asf/usergrid/blob/86fac5e3/stack/services/src/test/java/org/apache/usergrid/management/EmailFlowIT.java ---------------------------------------------------------------------- diff --git a/stack/services/src/test/java/org/apache/usergrid/management/EmailFlowIT.java b/stack/services/src/test/java/org/apache/usergrid/management/EmailFlowIT.java index 26f150a..fc4a486 100644 --- a/stack/services/src/test/java/org/apache/usergrid/management/EmailFlowIT.java +++ b/stack/services/src/test/java/org/apache/usergrid/management/EmailFlowIT.java @@ -17,74 +17,35 @@ package org.apache.usergrid.management; -import java.io.IOException; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; - -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMultipart; - -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestName; -import org.jvnet.mock_javamail.Mailbox; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - +import net.jcip.annotations.NotThreadSafe; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.text.StrSubstitutor; - import org.apache.usergrid.ServiceITSetup; import org.apache.usergrid.ServiceITSetupImpl; -import org.apache.usergrid.cassandra.SpringResource; import org.apache.usergrid.cassandra.ClearShiroSubject; import org.apache.usergrid.management.cassandra.ManagementServiceImpl; import org.apache.usergrid.persistence.EntityManager; import org.apache.usergrid.persistence.SimpleEntityRef; import org.apache.usergrid.persistence.entities.Application; import org.apache.usergrid.persistence.entities.User; -import org.apache.usergrid.persistence.index.impl.ElasticSearchResource; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TestName; +import org.jvnet.mock_javamail.Mailbox; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import net.jcip.annotations.NotThreadSafe; +import javax.mail.Message; +import javax.mail.MessagingException; +import javax.mail.internet.MimeMultipart; +import java.io.IOException; +import java.util.*; import static org.apache.commons.lang.StringUtils.isNotBlank; -import static org.apache.usergrid.TestHelper.uniqueApp; -import static org.apache.usergrid.TestHelper.uniqueEmail; -import static org.apache.usergrid.TestHelper.uniqueOrg; -import static org.apache.usergrid.TestHelper.uniqueUsername; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_USERS_REQUIRE_CONFIRMATION; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_ACTIVATED; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_CONFIRMATION; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_PASSWORD_RESET; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_USER_ACTIVATION; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ORGANIZATION_ACTIVATED; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ORGANIZATION_CONFIRMATION; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_SYSADMIN_ADMIN_ACTIVATION; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_SYSADMIN_ORGANIZATION_ACTIVATION; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_ACTIVATED; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_CONFIRMATION; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_PASSWORD_RESET; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_PIN_REQUEST; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_NOTIFY_ADMIN_OF_ACTIVATION; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_ORGANIZATIONS_REQUIRE_CONFIRMATION; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_APPROVES_ADMIN_USERS; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_APPROVES_ORGANIZATIONS; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_DEFAULT_SYSADMIN_EMAIL; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_SYSADMIN_EMAIL; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_ORG_SYSADMIN_EMAIL; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_USER_ACTIVATION_URL; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_USER_CONFIRMATION_URL; -import static org.apache.usergrid.management.AccountCreationProps.PROPERTIES_USER_RESETPW_URL; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertTrue; +import static org.apache.usergrid.TestHelper.*; +import static org.apache.usergrid.management.AccountCreationProps.*; +import static org.junit.Assert.*; /**
