You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/01/19 11:20:48 UTC
[01/23] Miscellaneous changes
Updated Branches:
refs/pull/30/head [created] 2e35e4901
refs/pull/30/merge [created] 77046b040
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationsResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationsResourceIT.java
index ecaa8a4..1fc7477 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationsResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationsResourceIT.java
@@ -78,7 +78,7 @@ public class OrganizationsResourceIT extends AbstractRestIT {
EntityManager em = setup.getEmf().getEntityManager( CassandraService.MANAGEMENT_APPLICATION_ID );
User user = em.get( ui.getUuid(), User.class );
assertEquals( "Test User", user.getName() );
- assertEquals( "Apigee", ( String ) user.getProperty( "company" ) );
+ assertEquals( "Apigee", user.getProperty( "company" ));
OrganizationInfo orgInfo = setup.getMgmtSvc().getOrganizationByName( "test-org-1" );
assertEquals( 5L, orgInfo.getProperties().get( "securityLevel" ) );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/management/ActivationState.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/management/ActivationState.java b/stack/services/src/main/java/org/usergrid/management/ActivationState.java
index 4836a6f..aaf0b43 100644
--- a/stack/services/src/main/java/org/usergrid/management/ActivationState.java
+++ b/stack/services/src/main/java/org/usergrid/management/ActivationState.java
@@ -3,6 +3,6 @@ package org.usergrid.management;
public enum ActivationState {
- UNKNOWN, UNCONFIRMED, CONFIRMED_AWAITING_ACTIVATION, ACTIVATED;
+ UNKNOWN, UNCONFIRMED, CONFIRMED_AWAITING_ACTIVATION, ACTIVATED
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java b/stack/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java
index f7cc99c..238ebdd 100644
--- a/stack/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java
+++ b/stack/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java
@@ -1251,9 +1251,8 @@ public class ManagementServiceImpl implements ManagementService {
boolean testUserEnabled = parseBoolean( properties.getProperty( PROPERTIES_SETUP_TEST_ACCOUNT ) );
- boolean userIsTestUser = !testUserEnabled ? false :
- properties.getProperty( PROPERTIES_SYSADMIN_LOGIN_EMAIL )
- .equals( userInfo.getEmail() );
+ boolean userIsTestUser = testUserEnabled && properties.getProperty(PROPERTIES_SYSADMIN_LOGIN_EMAIL)
+ .equals(userInfo.getEmail());
if ( !userIsSuperAdmin && !userIsTestUser ) {
@@ -2454,8 +2453,7 @@ public class ManagementServiceImpl implements ManagementService {
Boolean registration_requires_admin_approval = ( Boolean ) em
.getProperty( new SimpleEntityRef( Application.ENTITY_TYPE, applicationId ),
REGISTRATION_REQUIRES_ADMIN_APPROVAL );
- return registration_requires_admin_approval != null ? registration_requires_admin_approval.booleanValue() :
- false;
+ return registration_requires_admin_approval != null && registration_requires_admin_approval.booleanValue();
}
@@ -2465,8 +2463,7 @@ public class ManagementServiceImpl implements ManagementService {
Boolean registration_requires_email_confirmation = ( Boolean ) em
.getProperty( new SimpleEntityRef( Application.ENTITY_TYPE, applicationId ),
REGISTRATION_REQUIRES_EMAIL_CONFIRMATION );
- return registration_requires_email_confirmation != null ?
- registration_requires_email_confirmation.booleanValue() : false;
+ return registration_requires_email_confirmation != null && registration_requires_email_confirmation.booleanValue();
}
@@ -2475,7 +2472,7 @@ public class ManagementServiceImpl implements ManagementService {
Boolean notify_admin_of_new_users = ( Boolean ) em
.getProperty( new SimpleEntityRef( Application.ENTITY_TYPE, applicationId ),
NOTIFY_ADMIN_OF_NEW_USERS );
- return notify_admin_of_new_users != null ? notify_admin_of_new_users.booleanValue() : false;
+ return notify_admin_of_new_users != null && notify_admin_of_new_users.booleanValue();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/security/providers/FoursquareProvider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/providers/FoursquareProvider.java b/stack/services/src/main/java/org/usergrid/security/providers/FoursquareProvider.java
index 0c953c7..6e3dbe8 100644
--- a/stack/services/src/main/java/org/usergrid/security/providers/FoursquareProvider.java
+++ b/stack/services/src/main/java/org/usergrid/security/providers/FoursquareProvider.java
@@ -82,7 +82,7 @@ public class FoursquareProvider extends AbstractProvider {
String fq_user_username = ( String ) fq_user.get( "id" );
String fq_user_email = ( String ) ( ( Map<?, ?> ) fq_user.get( "contact" ) ).get( "email" );
String fq_user_picture = ( String ) ( ( Map<?, ?> ) fq_user.get( "photo" ) ).get( "suffix" );
- String fq_user_name = new String( "" );
+ String fq_user_name = "";
// Grab the last check-in so we can store that as the user location
Map<String, Object> fq_location =
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/security/providers/PingIdentityProvider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/providers/PingIdentityProvider.java b/stack/services/src/main/java/org/usergrid/security/providers/PingIdentityProvider.java
index 5930c28..a6de36c 100644
--- a/stack/services/src/main/java/org/usergrid/security/providers/PingIdentityProvider.java
+++ b/stack/services/src/main/java/org/usergrid/security/providers/PingIdentityProvider.java
@@ -136,8 +136,8 @@ public class PingIdentityProvider extends AbstractProvider {
public static long extractExpiration( User user ) {
Long expiration = ( Long ) user.getProperty( "expiration" );
if ( expiration == null ) {
- expiration = new Long( 7200 );
+ expiration = (long) 7200;
}
- return expiration.longValue() * 1000;
+ return expiration * 1000;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/security/shiro/CustomPermission.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/CustomPermission.java b/stack/services/src/main/java/org/usergrid/security/shiro/CustomPermission.java
index 7d510ae..7a6375e 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/CustomPermission.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/CustomPermission.java
@@ -185,10 +185,7 @@ public class CustomPermission extends WildcardPermission {
if ( matcher.match( p1, p2 ) ) {
return true;
}
- if ( matcher.match( normalizeIfPath( p1 ), normalizeIfPath( p2 ) ) ) {
- return true;
- }
- return false;
+ return matcher.match(normalizeIfPath(p1), normalizeIfPath(p2));
}
return p1.equalsIgnoreCase( p2 );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/security/shiro/PrincipalCredentialsToken.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/PrincipalCredentialsToken.java b/stack/services/src/main/java/org/usergrid/security/shiro/PrincipalCredentialsToken.java
index 6b69878..ec44c7c 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/PrincipalCredentialsToken.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/PrincipalCredentialsToken.java
@@ -129,11 +129,11 @@ public class PrincipalCredentialsToken implements org.apache.shiro.authc.Authent
public boolean isDisabled() {
- return ( principal != null ) ? principal.isDisabled() : false;
+ return (principal != null) && principal.isDisabled();
}
public boolean isActivated() {
- return ( principal != null ) ? principal.isActivated() : true;
+ return (principal == null) || principal.isActivated();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/security/shiro/Realm.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/Realm.java b/stack/services/src/main/java/org/usergrid/security/shiro/Realm.java
index 1b6e612..03f9a5a 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/Realm.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/Realm.java
@@ -276,7 +276,7 @@ public class Realm extends AuthorizingRealm {
// They have access to organizations and organization
// applications
- UserInfo user = ( ( AdminUserPrincipal ) principal ).getUser();
+ UserInfo user = principal.getUser();
if ( superUserEnabled && ( superUser != null ) && superUser.equals( user.getUsername() ) ) {
// The system user has access to everything
@@ -349,7 +349,7 @@ public class Realm extends AuthorizingRealm {
UUID applicationId = ( ( ApplicationUserPrincipal ) principal ).getApplicationId();
AccessTokenCredentials tokenCredentials =
- ( ( ApplicationUserPrincipal ) principal ).getAccessTokenCredentials();
+ principal.getAccessTokenCredentials();
TokenInfo token = null;
if ( tokenCredentials != null ) {
try {
@@ -388,7 +388,7 @@ public class Realm extends AuthorizingRealm {
logger.error( "Unable to get user default role permissions", e );
}
- UserInfo user = ( ( ApplicationUserPrincipal ) principal ).getUser();
+ UserInfo user = principal.getUser();
try {
Set<String> permissions = em.getUserPermissions( user.getUuid() );
grant( info, principal, applicationId, permissions );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/security/shiro/utils/SubjectUtils.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/utils/SubjectUtils.java b/stack/services/src/main/java/org/usergrid/security/shiro/utils/SubjectUtils.java
index 204cd13..de66a05 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/utils/SubjectUtils.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/utils/SubjectUtils.java
@@ -54,10 +54,7 @@ public class SubjectUtils {
if ( currentUser == null ) {
return true;
}
- if ( !currentUser.isAuthenticated() && !currentUser.isRemembered() ) {
- return true;
- }
- return false;
+ return !currentUser.isAuthenticated() && !currentUser.isRemembered();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/security/tokens/cassandra/TokenServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/tokens/cassandra/TokenServiceImpl.java b/stack/services/src/main/java/org/usergrid/security/tokens/cassandra/TokenServiceImpl.java
index 481c308..7d8fe72 100644
--- a/stack/services/src/main/java/org/usergrid/security/tokens/cassandra/TokenServiceImpl.java
+++ b/stack/services/src/main/java/org/usergrid/security/tokens/cassandra/TokenServiceImpl.java
@@ -2,12 +2,7 @@ package org.usergrid.security.tokens.cassandra;
import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.UUID;
+import java.util.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -86,20 +81,22 @@ public class TokenServiceImpl implements TokenService {
private static final ByteBufferSerializer BUFF_SER = ByteBufferSerializer.get();
private static final StringSerializer STR_SER = StringSerializer.get();
- private static final HashSet<String> TOKEN_PROPERTIES = new HashSet<String>();
+ private static final Set<String> TOKEN_PROPERTIES ;
static {
- TOKEN_PROPERTIES.add( TOKEN_UUID );
- TOKEN_PROPERTIES.add( TOKEN_TYPE );
- TOKEN_PROPERTIES.add( TOKEN_CREATED );
- TOKEN_PROPERTIES.add( TOKEN_ACCESSED );
- TOKEN_PROPERTIES.add( TOKEN_INACTIVE );
- TOKEN_PROPERTIES.add( TOKEN_PRINCIPAL_TYPE );
- TOKEN_PROPERTIES.add( TOKEN_ENTITY );
- TOKEN_PROPERTIES.add( TOKEN_APPLICATION );
- TOKEN_PROPERTIES.add( TOKEN_STATE );
- TOKEN_PROPERTIES.add( TOKEN_DURATION );
+ HashSet<String> set = new HashSet<String>();
+ set.add( TOKEN_UUID );
+ set.add( TOKEN_TYPE );
+ set.add( TOKEN_CREATED );
+ set.add( TOKEN_ACCESSED );
+ set.add( TOKEN_INACTIVE );
+ set.add( TOKEN_PRINCIPAL_TYPE );
+ set.add( TOKEN_ENTITY );
+ set.add( TOKEN_APPLICATION );
+ set.add( TOKEN_STATE );
+ set.add( TOKEN_DURATION );
+ TOKEN_PROPERTIES = Collections.unmodifiableSet(set);
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/services/ServiceAction.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceAction.java b/stack/services/src/main/java/org/usergrid/services/ServiceAction.java
index 7fdef55..83f1945 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceAction.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceAction.java
@@ -17,5 +17,5 @@ package org.usergrid.services;
public enum ServiceAction {
- POST, GET, PUT, DELETE, HEAD, OPTIONS;
+ POST, GET, PUT, DELETE, HEAD, OPTIONS
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/services/ServiceInfo.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceInfo.java b/stack/services/src/main/java/org/usergrid/services/ServiceInfo.java
index f1bb7d1..2765253 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceInfo.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceInfo.java
@@ -184,7 +184,7 @@ public class ServiceInfo {
}
String eType = determineType( collections, first, last - 1 );
- if ( eType != "entity" ) {
+ if (!eType.equals("entity")) {
return "/entities:" + eType + "/*/" + collections[last];
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/services/ServiceManager.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceManager.java b/stack/services/src/main/java/org/usergrid/services/ServiceManager.java
index 672c50f..a4778e5 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceManager.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceManager.java
@@ -17,10 +17,7 @@ package org.usergrid.services;
import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.UUID;
+import java.util.*;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
@@ -125,9 +122,7 @@ public class ServiceManager {
private void setServicePackagePrefixes( String packages ) {
List<String> packagePrefixes = new ArrayList<String>();
- for ( String prefix : package_prefixes ) {
- packagePrefixes.add( prefix );
- }
+ Collections.addAll(packagePrefixes, package_prefixes);
String[] prefixes = packages.split( ";" );
for ( String prefix : prefixes ) {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/services/ServiceRequest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceRequest.java b/stack/services/src/main/java/org/usergrid/services/ServiceRequest.java
index 70b9bdc..083ae22 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceRequest.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceRequest.java
@@ -324,7 +324,7 @@ public class ServiceRequest {
String q = p.toString();
if ( isNotBlank( q ) ) {
try {
- sb.append( "ql=" + URLEncoder.encode( q, "UTF-8" ) );
+ sb.append("ql=").append(URLEncoder.encode(q, "UTF-8"));
}
catch ( UnsupportedEncodingException e ) {
logger.error( "Unable to encode url", e );
@@ -336,14 +336,14 @@ public class ServiceRequest {
if ( has_prev_param ) {
sb.append( '&' );
}
- sb.append( "limit=" + limit );
+ sb.append("limit=").append(limit);
has_prev_param = true;
}
if ( p.getQuery().getStartResult() != null ) {
if ( has_prev_param ) {
sb.append( '&' );
}
- sb.append( "start=" + p.getQuery().getStartResult() );
+ sb.append("start=").append(p.getQuery().getStartResult());
has_prev_param = true;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/services/applications/ApplicationsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/applications/ApplicationsService.java b/stack/services/src/main/java/org/usergrid/services/applications/ApplicationsService.java
index ace9962..0f1b433 100644
--- a/stack/services/src/main/java/org/usergrid/services/applications/ApplicationsService.java
+++ b/stack/services/src/main/java/org/usergrid/services/applications/ApplicationsService.java
@@ -102,7 +102,7 @@ public class ApplicationsService extends AbstractService {
}
else if ( context.parameterCount() > 0 ) {
if ( context.getParameters().get( 0 ) instanceof QueryParameter ) {
- return getApplicationCounters( ( ( QueryParameter ) context.getParameters().get( 0 ) ).getQuery() );
+ return getApplicationCounters( context.getParameters().get( 0 ).getQuery() );
}
}
}
@@ -165,12 +165,9 @@ public class ApplicationsService extends AbstractService {
private boolean isReservedCollection( String collection ) {
- if ( StringUtils.equalsIgnoreCase( "applications", collection ) || StringUtils
- .equalsIgnoreCase( "application", collection ) ) {
- return true;
- }
+ return StringUtils.equalsIgnoreCase("applications", collection) || StringUtils
+ .equalsIgnoreCase("application", collection);
- return false;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/test-utils/src/main/java/org/usergrid/NoExitSecurityManager.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/usergrid/NoExitSecurityManager.java b/stack/test-utils/src/main/java/org/usergrid/NoExitSecurityManager.java
index ff3da16..1730bd6 100644
--- a/stack/test-utils/src/main/java/org/usergrid/NoExitSecurityManager.java
+++ b/stack/test-utils/src/main/java/org/usergrid/NoExitSecurityManager.java
@@ -31,7 +31,7 @@ public class NoExitSecurityManager extends java.rmi.RMISecurityManager {
Thread thread = Thread.currentThread();
try {
- thread.sleep( 100L );
+ Thread.sleep(100L);
}
catch ( InterruptedException e ) {
LOG.error( "failed to sleep", e );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/test-utils/src/main/java/org/usergrid/cassandra/AvailablePortFinder.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/usergrid/cassandra/AvailablePortFinder.java b/stack/test-utils/src/main/java/org/usergrid/cassandra/AvailablePortFinder.java
index 1029e29..54c35a5 100644
--- a/stack/test-utils/src/main/java/org/usergrid/cassandra/AvailablePortFinder.java
+++ b/stack/test-utils/src/main/java/org/usergrid/cassandra/AvailablePortFinder.java
@@ -189,7 +189,7 @@ public class AvailablePortFinder {
try {
s = new ServerSocket( i );
- result.add( new Integer( i ) );
+ result.add(i);
}
catch ( IOException e ) {
// Do nothing
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/test-utils/src/main/java/org/usergrid/cassandra/CassandraResource.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/usergrid/cassandra/CassandraResource.java b/stack/test-utils/src/main/java/org/usergrid/cassandra/CassandraResource.java
index 63f0c75..ec31d90 100644
--- a/stack/test-utils/src/main/java/org/usergrid/cassandra/CassandraResource.java
+++ b/stack/test-utils/src/main/java/org/usergrid/cassandra/CassandraResource.java
@@ -205,26 +205,8 @@ public class CassandraResource extends ExternalResource {
@Override
public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append( "\n" );
- sb.append( "cassandra.yaml = " ).append( new File( tempDir, "cassandra.yaml" ) );
- sb.append( "\n" );
- sb.append( RPC_PORT_KEY ).append( " = " ).append( rpcPort );
- sb.append( "\n" );
- sb.append( STORAGE_PORT_KEY ).append( " = " ).append( storagePort );
- sb.append( "\n" );
- sb.append( SSL_STORAGE_PORT_KEY ).append( " = " ).append( sslStoragePort );
- sb.append( "\n" );
- sb.append( NATIVE_TRANSPORT_PORT_KEY ).append( " = " ).append( nativeTransportPort );
- sb.append( "\n" );
- sb.append( DATA_FILE_DIR_KEY ).append( " = " ).append( new File( tempDir, "data" ).toString() );
- sb.append( "\n" );
- sb.append( COMMIT_FILE_DIR_KEY ).append( " = " ).append( new File( tempDir, "commitlog" ).toString() );
- sb.append( "\n" );
- sb.append( SAVED_CACHES_DIR_KEY ).append( " = " ).append( new File( tempDir, "saved_caches" ).toString() );
- sb.append( "\n" );
-
- return sb.toString();
+
+ return "\n" + "cassandra.yaml = " + new File(tempDir, "cassandra.yaml") + "\n" + RPC_PORT_KEY + " = " + rpcPort + "\n" + STORAGE_PORT_KEY + " = " + storagePort + "\n" + SSL_STORAGE_PORT_KEY + " = " + sslStoragePort + "\n" + NATIVE_TRANSPORT_PORT_KEY + " = " + nativeTransportPort + "\n" + DATA_FILE_DIR_KEY + " = " + new File(tempDir, "data").toString() + "\n" + COMMIT_FILE_DIR_KEY + " = " + new File(tempDir, "commitlog").toString() + "\n" + SAVED_CACHES_DIR_KEY + " = " + new File(tempDir, "saved_caches").toString() + "\n";
}
[19/23] organize imports only
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/CoreITSetup.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/CoreITSetup.java b/stack/core/src/test/java/org/usergrid/CoreITSetup.java
index 57dad2b..72958e0 100644
--- a/stack/core/src/test/java/org/usergrid/CoreITSetup.java
+++ b/stack/core/src/test/java/org/usergrid/CoreITSetup.java
@@ -16,14 +16,14 @@
package org.usergrid;
-import java.util.UUID;
-
import org.junit.rules.TestRule;
import org.usergrid.mq.QueueManagerFactory;
import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.persistence.IndexBucketLocator;
import org.usergrid.persistence.cassandra.CassandraService;
+import java.util.UUID;
+
public interface CoreITSetup extends TestRule {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/CoreITSetupImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/CoreITSetupImpl.java b/stack/core/src/test/java/org/usergrid/CoreITSetupImpl.java
index 038bd85..5b20946 100644
--- a/stack/core/src/test/java/org/usergrid/CoreITSetupImpl.java
+++ b/stack/core/src/test/java/org/usergrid/CoreITSetupImpl.java
@@ -1,8 +1,6 @@
package org.usergrid;
-import java.util.UUID;
-
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
import org.slf4j.Logger;
@@ -14,6 +12,8 @@ import org.usergrid.persistence.IndexBucketLocator;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.utils.JsonUtils;
+import java.util.UUID;
+
public class CoreITSetupImpl implements CoreITSetup {
private static final Logger LOG = LoggerFactory.getLogger( CoreITSetupImpl.class );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/CoreITSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/CoreITSuite.java b/stack/core/src/test/java/org/usergrid/CoreITSuite.java
index 3efeb7e..d769e6e 100644
--- a/stack/core/src/test/java/org/usergrid/CoreITSuite.java
+++ b/stack/core/src/test/java/org/usergrid/CoreITSuite.java
@@ -8,15 +8,7 @@ import org.usergrid.cassandra.CassandraResource;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.locking.cassandra.HectorLockManagerIT;
import org.usergrid.mq.MessagesIT;
-import org.usergrid.persistence.CollectionIT;
-import org.usergrid.persistence.CounterIT;
-import org.usergrid.persistence.EntityConnectionsIT;
-import org.usergrid.persistence.EntityDictionaryIT;
-import org.usergrid.persistence.EntityManagerIT;
-import org.usergrid.persistence.GeoIT;
-import org.usergrid.persistence.IndexIT;
-import org.usergrid.persistence.PathQueryIT;
-import org.usergrid.persistence.PermissionsIT;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.cassandra.EntityManagerFactoryImplIT;
import org.usergrid.system.UsergridSystemMonitorIT;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/CoreTestSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/CoreTestSuite.java b/stack/core/src/test/java/org/usergrid/CoreTestSuite.java
index 71064ea..fed5bff 100644
--- a/stack/core/src/test/java/org/usergrid/CoreTestSuite.java
+++ b/stack/core/src/test/java/org/usergrid/CoreTestSuite.java
@@ -21,11 +21,7 @@ import org.junit.runners.Suite;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.locking.zookeeper.ZookeeperLockManagerTest;
import org.usergrid.mq.QueuePathsTest;
-import org.usergrid.persistence.EntityTest;
-import org.usergrid.persistence.QueryTest;
-import org.usergrid.persistence.QueryUtilsTest;
-import org.usergrid.persistence.SchemaTest;
-import org.usergrid.persistence.UtilsTest;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.cassandra.QueryProcessorTest;
import org.usergrid.persistence.cassandra.SimpleIndexBucketLocatorImplTest;
import org.usergrid.persistence.query.ir.result.IntersectionIteratorTest;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/AppArgsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/AppArgsTest.java b/stack/core/src/test/java/org/usergrid/batch/AppArgsTest.java
index 186ea71..f34094d 100644
--- a/stack/core/src/test/java/org/usergrid/batch/AppArgsTest.java
+++ b/stack/core/src/test/java/org/usergrid/batch/AppArgsTest.java
@@ -1,11 +1,10 @@
package org.usergrid.batch;
+import com.google.common.base.CharMatcher;
import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
-import com.google.common.base.CharMatcher;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/BulkJobExecutionUnitTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/BulkJobExecutionUnitTest.java b/stack/core/src/test/java/org/usergrid/batch/BulkJobExecutionUnitTest.java
index f1eec0f..47ab071 100644
--- a/stack/core/src/test/java/org/usergrid/batch/BulkJobExecutionUnitTest.java
+++ b/stack/core/src/test/java/org/usergrid/batch/BulkJobExecutionUnitTest.java
@@ -1,8 +1,6 @@
package org.usergrid.batch;
-import java.util.UUID;
-
import org.junit.Test;
import org.usergrid.batch.JobExecution.Status;
import org.usergrid.batch.repository.JobDescriptor;
@@ -10,6 +8,8 @@ import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.entities.JobData;
import org.usergrid.persistence.entities.JobStat;
+import java.util.UUID;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/BulkTestUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/BulkTestUtils.java b/stack/core/src/test/java/org/usergrid/batch/BulkTestUtils.java
index a87eb78..62cfda0 100644
--- a/stack/core/src/test/java/org/usergrid/batch/BulkTestUtils.java
+++ b/stack/core/src/test/java/org/usergrid/batch/BulkTestUtils.java
@@ -1,12 +1,12 @@
package org.usergrid.batch;
-import java.util.Arrays;
-import java.util.List;
-
import org.junit.Ignore;
import org.usergrid.batch.repository.JobDescriptor;
+import java.util.Arrays;
+import java.util.List;
+
/** @author zznate */
@Ignore
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerITSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerITSuite.java b/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerITSuite.java
index 6c29c05..42b7765 100644
--- a/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerITSuite.java
+++ b/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerITSuite.java
@@ -4,14 +4,7 @@ package org.usergrid.batch;
import org.junit.ClassRule;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
-import org.usergrid.batch.job.SchedulerRuntime1IT;
-import org.usergrid.batch.job.SchedulerRuntime2IT;
-import org.usergrid.batch.job.SchedulerRuntime3IT;
-import org.usergrid.batch.job.SchedulerRuntime4IT;
-import org.usergrid.batch.job.SchedulerRuntime5IT;
-import org.usergrid.batch.job.SchedulerRuntime6IT;
-import org.usergrid.batch.job.SchedulerRuntime7IT;
-import org.usergrid.batch.job.SchedulerRuntime8IT;
+import org.usergrid.batch.job.*;
import org.usergrid.cassandra.CassandraResource;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.cassandra.ConcurrentSuite;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerTestSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerTestSuite.java b/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerTestSuite.java
index 7562a11..e83a59f 100644
--- a/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerTestSuite.java
+++ b/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerTestSuite.java
@@ -3,9 +3,6 @@ package org.usergrid.batch;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
-import org.usergrid.batch.AppArgsTest;
-import org.usergrid.batch.BulkJobExecutionUnitTest;
-import org.usergrid.batch.UsergridJobFactoryTest;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.cassandra.ConcurrentSuite;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/SchedulerITSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/SchedulerITSuite.java b/stack/core/src/test/java/org/usergrid/batch/SchedulerITSuite.java
index 069e3f1..f7bf908 100644
--- a/stack/core/src/test/java/org/usergrid/batch/SchedulerITSuite.java
+++ b/stack/core/src/test/java/org/usergrid/batch/SchedulerITSuite.java
@@ -5,14 +5,7 @@ import org.junit.ClassRule;
import org.junit.Ignore;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
-import org.usergrid.batch.job.SchedulerRuntime1IT;
-import org.usergrid.batch.job.SchedulerRuntime2IT;
-import org.usergrid.batch.job.SchedulerRuntime3IT;
-import org.usergrid.batch.job.SchedulerRuntime4IT;
-import org.usergrid.batch.job.SchedulerRuntime5IT;
-import org.usergrid.batch.job.SchedulerRuntime6IT;
-import org.usergrid.batch.job.SchedulerRuntime7IT;
-import org.usergrid.batch.job.SchedulerRuntime8IT;
+import org.usergrid.batch.job.*;
import org.usergrid.cassandra.CassandraResource;
import org.usergrid.cassandra.Concurrent;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/SchedulerTestSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/SchedulerTestSuite.java b/stack/core/src/test/java/org/usergrid/batch/SchedulerTestSuite.java
index 7eeef42..38306b7 100644
--- a/stack/core/src/test/java/org/usergrid/batch/SchedulerTestSuite.java
+++ b/stack/core/src/test/java/org/usergrid/batch/SchedulerTestSuite.java
@@ -3,9 +3,6 @@ package org.usergrid.batch;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
-import org.usergrid.batch.AppArgsTest;
-import org.usergrid.batch.BulkJobExecutionUnitTest;
-import org.usergrid.batch.UsergridJobFactoryTest;
import org.usergrid.cassandra.Concurrent;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/UsergridJobFactoryTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/UsergridJobFactoryTest.java b/stack/core/src/test/java/org/usergrid/batch/UsergridJobFactoryTest.java
index 4228ea6..d3f6ef3 100644
--- a/stack/core/src/test/java/org/usergrid/batch/UsergridJobFactoryTest.java
+++ b/stack/core/src/test/java/org/usergrid/batch/UsergridJobFactoryTest.java
@@ -1,13 +1,13 @@
package org.usergrid.batch;
-import java.util.List;
-import java.util.UUID;
-
import org.junit.Test;
import org.usergrid.batch.repository.JobDescriptor;
import org.usergrid.cassandra.Concurrent;
+import java.util.List;
+import java.util.UUID;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/AbstractSchedulerRuntimeIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/AbstractSchedulerRuntimeIT.java b/stack/core/src/test/java/org/usergrid/batch/job/AbstractSchedulerRuntimeIT.java
index 5bc9d51..e85d505 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/AbstractSchedulerRuntimeIT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/AbstractSchedulerRuntimeIT.java
@@ -17,16 +17,14 @@
package org.usergrid.batch.job;
-import java.util.Properties;
-
import com.google.common.util.concurrent.Service.State;
-
+import org.junit.Before;
import org.usergrid.batch.SchedulerITSuite;
import org.usergrid.batch.service.JobSchedulerService;
import org.usergrid.batch.service.SchedulerService;
import org.usergrid.cassandra.CassandraResource;
-import org.junit.Before;
+import java.util.Properties;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/CountdownLatchJob.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/CountdownLatchJob.java b/stack/core/src/test/java/org/usergrid/batch/job/CountdownLatchJob.java
index 8ab0f61..81ba3e0 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/CountdownLatchJob.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/CountdownLatchJob.java
@@ -17,14 +17,14 @@
package org.usergrid.batch.job;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
import org.junit.Ignore;
import org.springframework.stereotype.Component;
import org.usergrid.batch.Job;
import org.usergrid.batch.JobExecution;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
/**
* A simple job that does nothing but increment an atomic counter
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/DelayExecution.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/DelayExecution.java b/stack/core/src/test/java/org/usergrid/batch/job/DelayExecution.java
index a4e93bb..7f871b0 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/DelayExecution.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/DelayExecution.java
@@ -17,9 +17,6 @@
package org.usergrid.batch.job;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
import org.junit.Ignore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,6 +24,9 @@ import org.springframework.stereotype.Component;
import org.usergrid.batch.Job;
import org.usergrid.batch.JobExecution;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
/**
* A simple job that does nothing but increment an atomic counter
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/DelayHeartbeat.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/DelayHeartbeat.java b/stack/core/src/test/java/org/usergrid/batch/job/DelayHeartbeat.java
index d30a97e..b813fed 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/DelayHeartbeat.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/DelayHeartbeat.java
@@ -17,9 +17,6 @@
package org.usergrid.batch.job;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
import org.junit.Ignore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,6 +24,9 @@ import org.springframework.stereotype.Component;
import org.usergrid.batch.Job;
import org.usergrid.batch.JobExecution;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
/**
* A simple job that does nothing but increment an atomic counter and use heartbeat delay
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/FailureJobExceuction.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/FailureJobExceuction.java b/stack/core/src/test/java/org/usergrid/batch/job/FailureJobExceuction.java
index 330b143..08f7670 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/FailureJobExceuction.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/FailureJobExceuction.java
@@ -17,14 +17,14 @@
package org.usergrid.batch.job;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
import org.junit.Ignore;
import org.springframework.stereotype.Component;
import org.usergrid.batch.Job;
import org.usergrid.batch.JobExecution;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
/**
* A simple job that does nothing but increment an atomic counter
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceExceution.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceExceution.java b/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceExceution.java
index 7970c85..e39ba54 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceExceution.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceExceution.java
@@ -17,15 +17,15 @@
package org.usergrid.batch.job;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
import org.junit.Ignore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.usergrid.batch.JobExecution;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
/**
* A job that will sleep for the amount of time specified. Used to check that our counter is only ever run once.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceUnlockOnFailExceution.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceUnlockOnFailExceution.java b/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceUnlockOnFailExceution.java
index 09d2a20..0b694f4 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceUnlockOnFailExceution.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceUnlockOnFailExceution.java
@@ -17,15 +17,15 @@
package org.usergrid.batch.job;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
import org.junit.Ignore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.usergrid.batch.JobExecution;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
/**
* A job that will sleep for the amount of time specified. Used to check that our counter is only ever run once. Checks
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime1IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime1IT.java b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime1IT.java
index 8b7ec6f..763608c 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime1IT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime1IT.java
@@ -17,17 +17,17 @@
package org.usergrid.batch.job;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.concurrent.TimeUnit;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.entities.JobData;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
/**
* Class to test job runtimes
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime2IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime2IT.java b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime2IT.java
index bc3c3cd..4d28fe0 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime2IT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime2IT.java
@@ -17,17 +17,17 @@
package org.usergrid.batch.job;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.concurrent.TimeUnit;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.entities.JobData;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
/**
* Class to test job runtimes
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime3IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime3IT.java b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime3IT.java
index 304f5af..65d2872 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime3IT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime3IT.java
@@ -17,12 +17,11 @@
package org.usergrid.batch.job;
+import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.entities.JobData;
import org.usergrid.persistence.entities.JobStat;
-import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime4IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime4IT.java b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime4IT.java
index 67dc405..eaa60b6 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime4IT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime4IT.java
@@ -17,12 +17,11 @@
package org.usergrid.batch.job;
+import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.entities.JobData;
import org.usergrid.persistence.entities.JobStat;
-import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime5IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime5IT.java b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime5IT.java
index b88bee5..efd9c62 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime5IT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime5IT.java
@@ -17,12 +17,11 @@
package org.usergrid.batch.job;
+import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.entities.JobData;
import org.usergrid.persistence.entities.JobStat;
-import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime6IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime6IT.java b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime6IT.java
index 2da11cc..ddf50b6 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime6IT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime6IT.java
@@ -17,18 +17,14 @@
package org.usergrid.batch.job;
-import java.util.concurrent.TimeUnit;
-
+import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.entities.JobData;
import org.usergrid.persistence.entities.JobStat;
-import org.junit.Test;
+import java.util.concurrent.TimeUnit;
-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.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime7IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime7IT.java b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime7IT.java
index c017d82..34d33e7 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime7IT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime7IT.java
@@ -17,12 +17,11 @@
package org.usergrid.batch.job;
+import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.entities.JobData;
import org.usergrid.persistence.entities.JobStat;
-import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime8IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime8IT.java b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime8IT.java
index cdea0cf..5833b85 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime8IT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime8IT.java
@@ -17,15 +17,14 @@
package org.usergrid.batch.job;
-import java.util.UUID;
-
+import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.Results;
import org.usergrid.persistence.entities.JobData;
import org.usergrid.utils.UUIDUtils;
-import org.junit.Test;
+import java.util.UUID;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/TestJobListener.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/TestJobListener.java b/stack/core/src/test/java/org/usergrid/batch/job/TestJobListener.java
index 8932014..ad1a94d 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/TestJobListener.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/TestJobListener.java
@@ -18,13 +18,13 @@
package org.usergrid.batch.job;
-import java.util.concurrent.atomic.AtomicInteger;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.batch.JobExecution;
import org.usergrid.batch.service.JobListener;
+import java.util.concurrent.atomic.AtomicInteger;
+
/**
* Implementation of the JobListener for tests.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/TestJobListenerTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/TestJobListenerTest.java b/stack/core/src/test/java/org/usergrid/batch/job/TestJobListenerTest.java
index 0b47b1c..8405a10 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/TestJobListenerTest.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/TestJobListenerTest.java
@@ -18,13 +18,12 @@
package org.usergrid.batch.job;
-import org.usergrid.batch.JobExecution;
-import org.usergrid.persistence.entities.JobData;
-import org.usergrid.persistence.entities.JobStat;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.usergrid.batch.JobExecution;
+import org.usergrid.persistence.entities.JobData;
+import org.usergrid.persistence.entities.JobStat;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/clustering/hazelcast/HazelcastTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/clustering/hazelcast/HazelcastTest.java b/stack/core/src/test/java/org/usergrid/clustering/hazelcast/HazelcastTest.java
index 63a065e..f4c6bef 100644
--- a/stack/core/src/test/java/org/usergrid/clustering/hazelcast/HazelcastTest.java
+++ b/stack/core/src/test/java/org/usergrid/clustering/hazelcast/HazelcastTest.java
@@ -16,9 +16,7 @@
package org.usergrid.clustering.hazelcast;
-import java.util.Collection;
-import java.util.Set;
-
+import com.hazelcast.core.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
@@ -28,13 +26,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import com.hazelcast.core.Hazelcast;
-import com.hazelcast.core.ITopic;
-import com.hazelcast.core.Instance;
-import com.hazelcast.core.InstanceEvent;
-import com.hazelcast.core.InstanceListener;
-import com.hazelcast.core.Member;
-import com.hazelcast.core.MessageListener;
+import java.util.Collection;
+import java.util.Set;
@Ignore
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/count/BatchCountParallelismTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/count/BatchCountParallelismTest.java b/stack/core/src/test/java/org/usergrid/count/BatchCountParallelismTest.java
index f273860..5f79104 100644
--- a/stack/core/src/test/java/org/usergrid/count/BatchCountParallelismTest.java
+++ b/stack/core/src/test/java/org/usergrid/count/BatchCountParallelismTest.java
@@ -1,24 +1,19 @@
package org.usergrid.count;
-import static org.junit.Assert.assertEquals;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.count.common.Count;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicLong;
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.count.common.Count;
+import static org.junit.Assert.assertEquals;
/** @author zznate */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/count/SimpleBatcherTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/count/SimpleBatcherTest.java b/stack/core/src/test/java/org/usergrid/count/SimpleBatcherTest.java
index f3cc29d..e0aed8c 100644
--- a/stack/core/src/test/java/org/usergrid/count/SimpleBatcherTest.java
+++ b/stack/core/src/test/java/org/usergrid/count/SimpleBatcherTest.java
@@ -18,7 +18,6 @@ package org.usergrid.count;
import org.junit.Before;
import org.junit.Test;
-
import org.usergrid.count.common.Count;
import static junit.framework.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/locking/cassandra/HectorLockManagerIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/locking/cassandra/HectorLockManagerIT.java b/stack/core/src/test/java/org/usergrid/locking/cassandra/HectorLockManagerIT.java
index fc82ede..45d9875 100644
--- a/stack/core/src/test/java/org/usergrid/locking/cassandra/HectorLockManagerIT.java
+++ b/stack/core/src/test/java/org/usergrid/locking/cassandra/HectorLockManagerIT.java
@@ -16,18 +16,9 @@
package org.usergrid.locking.cassandra;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
import me.prettyprint.cassandra.model.ConfigurableConsistencyLevel;
import me.prettyprint.hector.api.ConsistencyLevelPolicy;
import me.prettyprint.hector.api.HConsistencyLevel;
-
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -40,6 +31,9 @@ import org.usergrid.locking.Lock;
import org.usergrid.locking.LockManager;
import org.usergrid.locking.exception.UGLockException;
+import java.util.UUID;
+import java.util.concurrent.*;
+
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/locking/singlenode/SingleNodeLockTestSingleNode.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/locking/singlenode/SingleNodeLockTestSingleNode.java b/stack/core/src/test/java/org/usergrid/locking/singlenode/SingleNodeLockTestSingleNode.java
index c8e3bbd..0b6e3cb 100644
--- a/stack/core/src/test/java/org/usergrid/locking/singlenode/SingleNodeLockTestSingleNode.java
+++ b/stack/core/src/test/java/org/usergrid/locking/singlenode/SingleNodeLockTestSingleNode.java
@@ -16,14 +16,6 @@
package org.usergrid.locking.singlenode;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -34,6 +26,9 @@ import org.usergrid.locking.Lock;
import org.usergrid.locking.LockManager;
import org.usergrid.locking.exception.UGLockException;
+import java.util.UUID;
+import java.util.concurrent.*;
+
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/locking/zookeeper/AbstractZooKeeperTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/locking/zookeeper/AbstractZooKeeperTest.java b/stack/core/src/test/java/org/usergrid/locking/zookeeper/AbstractZooKeeperTest.java
index 93bc508..f4211f2 100644
--- a/stack/core/src/test/java/org/usergrid/locking/zookeeper/AbstractZooKeeperTest.java
+++ b/stack/core/src/test/java/org/usergrid/locking/zookeeper/AbstractZooKeeperTest.java
@@ -16,16 +16,15 @@
package org.usergrid.locking.zookeeper;
-import java.io.File;
-import java.net.InetSocketAddress;
-
+import org.apache.zookeeper.server.ServerConfig;
+import org.apache.zookeeper.server.ZooKeeperServerMain;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.zookeeper.server.ServerConfig;
-import org.apache.zookeeper.server.ZooKeeperServerMain;
+import java.io.File;
+import java.net.InetSocketAddress;
/** Base test class for ZooKeeper tests. */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZooPut.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZooPut.java b/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZooPut.java
index 49e0e31..04143a5 100644
--- a/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZooPut.java
+++ b/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZooPut.java
@@ -16,15 +16,10 @@
package org.usergrid.locking.zookeeper;
-import java.io.IOException;
-
-import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.Watcher;
+import org.apache.zookeeper.*;
import org.apache.zookeeper.Watcher.Event.KeeperState;
-import org.apache.zookeeper.ZooDefs;
-import org.apache.zookeeper.ZooKeeper;
+
+import java.io.IOException;
/** Util for uploading and updating files in ZooKeeper. */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZookeeperLockManagerTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZookeeperLockManagerTest.java b/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZookeeperLockManagerTest.java
index 9cefa00..2837afa 100644
--- a/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZookeeperLockManagerTest.java
+++ b/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZookeeperLockManagerTest.java
@@ -16,25 +16,16 @@
package org.usergrid.locking.zookeeper;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.locking.Lock;
import org.usergrid.locking.LockManager;
import org.usergrid.locking.exception.UGLockException;
+import java.util.UUID;
+import java.util.concurrent.*;
+
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/mq/MessagesIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/mq/MessagesIT.java b/stack/core/src/test/java/org/usergrid/mq/MessagesIT.java
index 58c5b95..6dcf4d0 100644
--- a/stack/core/src/test/java/org/usergrid/mq/MessagesIT.java
+++ b/stack/core/src/test/java/org/usergrid/mq/MessagesIT.java
@@ -16,10 +16,6 @@
package org.usergrid.mq;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,10 +23,11 @@ import org.usergrid.AbstractCoreIT;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.utils.JsonUtils;
-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 java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/CollectionIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/CollectionIT.java b/stack/core/src/test/java/org/usergrid/persistence/CollectionIT.java
index 08c69af..c05247f 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/CollectionIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/CollectionIT.java
@@ -16,13 +16,6 @@
package org.usergrid.persistence;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.Rule;
import org.junit.Test;
import org.slf4j.Logger;
@@ -38,11 +31,9 @@ import org.usergrid.persistence.exceptions.NoIndexException;
import org.usergrid.utils.JsonUtils;
import org.usergrid.utils.UUIDUtils;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import java.util.*;
+
+import static org.junit.Assert.*;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/CoreSchemaManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/CoreSchemaManager.java b/stack/core/src/test/java/org/usergrid/persistence/CoreSchemaManager.java
index 4c9db0a..f3a47c3 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/CoreSchemaManager.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/CoreSchemaManager.java
@@ -1,6 +1,7 @@
package org.usergrid.persistence;
+import me.prettyprint.hector.api.Cluster;
import org.junit.Ignore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -8,8 +9,6 @@ import org.usergrid.cassandra.SchemaManager;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.persistence.cassandra.Setup;
-import me.prettyprint.hector.api.Cluster;
-
/** @author zznate */
@Ignore
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/CounterIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/CounterIT.java b/stack/core/src/test/java/org/usergrid/persistence/CounterIT.java
index 62483ab..ff73bd1 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/CounterIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/CounterIT.java
@@ -16,11 +16,6 @@
package org.usergrid.persistence;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
@@ -28,12 +23,16 @@ import org.slf4j.LoggerFactory;
import org.usergrid.AbstractCoreIT;
import org.usergrid.CoreITSuite;
import org.usergrid.cassandra.Concurrent;
+import org.usergrid.count.SimpleBatcher;
import org.usergrid.persistence.entities.Event;
import org.usergrid.persistence.entities.Group;
import org.usergrid.persistence.entities.User;
import org.usergrid.utils.JsonUtils;
-import org.usergrid.count.SimpleBatcher;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/EntityConnectionsIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/EntityConnectionsIT.java b/stack/core/src/test/java/org/usergrid/persistence/EntityConnectionsIT.java
index e2b6df3..17866cd 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/EntityConnectionsIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/EntityConnectionsIT.java
@@ -16,12 +16,6 @@
package org.usergrid.persistence;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -30,10 +24,9 @@ import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.Results.Level;
import org.usergrid.persistence.entities.User;
-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 java.util.*;
+
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/EntityDictionaryIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/EntityDictionaryIT.java b/stack/core/src/test/java/org/usergrid/persistence/EntityDictionaryIT.java
index 0136f65..2164469 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/EntityDictionaryIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/EntityDictionaryIT.java
@@ -16,10 +16,6 @@
package org.usergrid.persistence;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -28,9 +24,11 @@ import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.entities.Application;
import org.usergrid.utils.JsonUtils;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/EntityManagerIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/EntityManagerIT.java b/stack/core/src/test/java/org/usergrid/persistence/EntityManagerIT.java
index c71c90e..da29648 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/EntityManagerIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/EntityManagerIT.java
@@ -16,15 +16,6 @@
package org.usergrid.persistence;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
@@ -36,10 +27,10 @@ import org.usergrid.persistence.entities.Group;
import org.usergrid.persistence.entities.User;
import org.usergrid.utils.UUIDUtils;
-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 java.util.*;
+import java.util.Map.Entry;
+
+import static org.junit.Assert.*;
import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/EntityTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/EntityTest.java b/stack/core/src/test/java/org/usergrid/persistence/EntityTest.java
index fad93dd..e33e5d7 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/EntityTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/EntityTest.java
@@ -16,10 +16,6 @@
package org.usergrid.persistence;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -28,6 +24,10 @@ import org.usergrid.persistence.entities.Group;
import org.usergrid.persistence.entities.User;
import org.usergrid.utils.JsonUtils;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/GeoIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/GeoIT.java b/stack/core/src/test/java/org/usergrid/persistence/GeoIT.java
index 5ac304e..2e15ceb 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/GeoIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/GeoIT.java
@@ -16,13 +16,6 @@
package org.usergrid.persistence;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,6 +29,8 @@ import org.usergrid.persistence.query.ir.QuerySlice;
import org.usergrid.persistence.query.ir.result.GeoIterator;
import org.usergrid.utils.MapUtils;
+import java.util.*;
+
import static junit.framework.Assert.assertFalse;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/IndexIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/IndexIT.java b/stack/core/src/test/java/org/usergrid/persistence/IndexIT.java
index e66575d..96b3f8a 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/IndexIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/IndexIT.java
@@ -16,11 +16,9 @@
package org.usergrid.persistence;
-import java.nio.ByteBuffer;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.mutation.Mutator;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,14 +32,13 @@ import org.usergrid.persistence.cassandra.RelationManagerImpl;
import org.usergrid.utils.JsonUtils;
import org.usergrid.utils.UUIDUtils;
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.mutation.Mutator;
+import java.nio.ByteBuffer;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
import static me.prettyprint.hector.api.factory.HFactory.createMutator;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/PathQueryIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/PathQueryIT.java b/stack/core/src/test/java/org/usergrid/persistence/PathQueryIT.java
index 4252749..9a489de 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/PathQueryIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/PathQueryIT.java
@@ -1,17 +1,11 @@
package org.usergrid.persistence;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.Test;
import org.usergrid.AbstractCoreIT;
+import java.util.*;
+
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/PermissionsIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/PermissionsIT.java b/stack/core/src/test/java/org/usergrid/persistence/PermissionsIT.java
index d416c13..c5cb9fb 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/PermissionsIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/PermissionsIT.java
@@ -16,12 +16,6 @@
package org.usergrid.persistence;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -29,9 +23,9 @@ import org.usergrid.AbstractCoreIT;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.entities.Role;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import java.util.*;
+
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/QueryTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/QueryTest.java b/stack/core/src/test/java/org/usergrid/persistence/QueryTest.java
index 0bd48fb..0e0526a 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/QueryTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/QueryTest.java
@@ -16,10 +16,6 @@
package org.usergrid.persistence;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,22 +23,13 @@ import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.Query.SortDirection;
import org.usergrid.persistence.Query.SortPredicate;
import org.usergrid.persistence.exceptions.QueryParseException;
-import org.usergrid.persistence.query.tree.AndOperand;
-import org.usergrid.persistence.query.tree.ContainsOperand;
-import org.usergrid.persistence.query.tree.Equal;
-import org.usergrid.persistence.query.tree.FloatLiteral;
-import org.usergrid.persistence.query.tree.GreaterThan;
-import org.usergrid.persistence.query.tree.GreaterThanEqual;
-import org.usergrid.persistence.query.tree.LessThan;
-import org.usergrid.persistence.query.tree.LessThanEqual;
-import org.usergrid.persistence.query.tree.LongLiteral;
-import org.usergrid.persistence.query.tree.NotOperand;
-import org.usergrid.persistence.query.tree.StringLiteral;
-import org.usergrid.persistence.query.tree.WithinOperand;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import org.usergrid.persistence.query.tree.*;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/QueryUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/QueryUtilsTest.java b/stack/core/src/test/java/org/usergrid/persistence/QueryUtilsTest.java
index 78ac217..addc516 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/QueryUtilsTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/QueryUtilsTest.java
@@ -1,14 +1,14 @@
package org.usergrid.persistence;
+import org.junit.Test;
+import org.usergrid.cassandra.Concurrent;
+
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.junit.Test;
-import org.usergrid.cassandra.Concurrent;
-
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/SchemaTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/SchemaTest.java b/stack/core/src/test/java/org/usergrid/persistence/SchemaTest.java
index 6d9cdfb..920dff6 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/SchemaTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/SchemaTest.java
@@ -16,15 +16,14 @@
package org.usergrid.persistence;
-import java.util.List;
-
+import io.baas.Simple;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.entities.SampleEntity;
-import io.baas.Simple;
+import java.util.List;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java b/stack/core/src/test/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
index 72b80c0..cb2f9a1 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
@@ -16,17 +16,7 @@
package org.usergrid.persistence.cassandra;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.AbstractCoreIT;
@@ -40,10 +30,9 @@ import org.usergrid.persistence.cassandra.util.TraceTag;
import org.usergrid.persistence.cassandra.util.TraceTagManager;
import org.usergrid.persistence.cassandra.util.TraceTagReporter;
-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 java.util.*;
+
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/cassandra/QueryProcessorTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/cassandra/QueryProcessorTest.java b/stack/core/src/test/java/org/usergrid/persistence/cassandra/QueryProcessorTest.java
index 1d15f66..e418c87 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/cassandra/QueryProcessorTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/cassandra/QueryProcessorTest.java
@@ -16,29 +16,21 @@
package org.usergrid.persistence.cassandra;
-import java.math.BigInteger;
-import java.util.Iterator;
-import java.util.UUID;
-
import org.antlr.runtime.ANTLRStringStream;
import org.antlr.runtime.TokenRewriteStream;
import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.exceptions.PersistenceException;
-import org.usergrid.persistence.query.ir.AndNode;
-import org.usergrid.persistence.query.ir.NotNode;
-import org.usergrid.persistence.query.ir.OrNode;
-import org.usergrid.persistence.query.ir.QuerySlice;
-import org.usergrid.persistence.query.ir.SliceNode;
-import org.usergrid.persistence.query.ir.WithinNode;
+import org.usergrid.persistence.query.ir.*;
import org.usergrid.persistence.query.tree.QueryFilterLexer;
import org.usergrid.persistence.query.tree.QueryFilterParser;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import java.math.BigInteger;
+import java.util.Iterator;
+import java.util.UUID;
+
+import static org.junit.Assert.*;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImplTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImplTest.java b/stack/core/src/test/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImplTest.java
index 71c3ec6..5073ad3 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImplTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImplTest.java
@@ -16,21 +16,16 @@
package org.usergrid.persistence.cassandra;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
+import com.yammer.metrics.Metrics;
+import com.yammer.metrics.core.Timer;
+import com.yammer.metrics.core.TimerContext;
import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.IndexBucketLocator.IndexType;
import org.usergrid.utils.UUIDUtils;
-import com.yammer.metrics.Metrics;
-import com.yammer.metrics.core.Timer;
-import com.yammer.metrics.core.TimerContext;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/entities/SampleEntity.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/entities/SampleEntity.java b/stack/core/src/test/java/org/usergrid/persistence/entities/SampleEntity.java
index cb19b46..c58b403 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/entities/SampleEntity.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/entities/SampleEntity.java
@@ -16,16 +16,15 @@
package org.usergrid.persistence.entities;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
import org.usergrid.persistence.TypedEntity;
import org.usergrid.persistence.annotations.EntityDictionary;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Set;
+import java.util.UUID;
+
@XmlRootElement
public class SampleEntity extends TypedEntity {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparatorTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparatorTest.java b/stack/core/src/test/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparatorTest.java
index b783406..82fbcbb 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparatorTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparatorTest.java
@@ -16,12 +16,12 @@
package org.usergrid.persistence.geo;
-import java.util.UUID;
-
import org.junit.Test;
import org.usergrid.persistence.geo.model.Point;
import org.usergrid.utils.UUIDUtils;
+import java.util.UUID;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/query/AbstractIteratingQueryIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/query/AbstractIteratingQueryIT.java b/stack/core/src/test/java/org/usergrid/persistence/query/AbstractIteratingQueryIT.java
index d1aed3a..a78056b 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/query/AbstractIteratingQueryIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/query/AbstractIteratingQueryIT.java
@@ -16,15 +16,6 @@
package org.usergrid.persistence.query;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
import org.junit.ClassRule;
import org.junit.Rule;
import org.slf4j.Logger;
@@ -37,6 +28,8 @@ import org.usergrid.persistence.Entity;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.Results;
+import java.util.*;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/query/IntersectionUnionPagingIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/query/IntersectionUnionPagingIT.java b/stack/core/src/test/java/org/usergrid/persistence/query/IntersectionUnionPagingIT.java
index 5f554d3..adc1f4f 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/query/IntersectionUnionPagingIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/query/IntersectionUnionPagingIT.java
@@ -16,18 +16,14 @@
package org.usergrid.persistence.query;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.Results;
+import java.util.*;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/InOrderIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/InOrderIterator.java b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/InOrderIterator.java
index 85b124c..5c0f404 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/InOrderIterator.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/InOrderIterator.java
@@ -1,17 +1,12 @@
package org.usergrid.persistence.query.ir.result;
-import java.nio.ByteBuffer;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
+import com.google.common.collect.Iterables;
import org.junit.Ignore;
import org.usergrid.persistence.cassandra.CursorCache;
-import com.google.common.collect.Iterables;
+import java.nio.ByteBuffer;
+import java.util.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/IntersectionIteratorTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/IntersectionIteratorTest.java b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/IntersectionIteratorTest.java
index c165caa..dbe4cae 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/IntersectionIteratorTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/IntersectionIteratorTest.java
@@ -16,18 +16,12 @@
package org.usergrid.persistence.query.ir.result;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
import org.junit.Test;
import org.usergrid.utils.UUIDUtils;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import java.util.*;
+
+import static org.junit.Assert.*;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/SubtractionIteratorTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/SubtractionIteratorTest.java b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/SubtractionIteratorTest.java
index d184edb..9a5ea3a 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/SubtractionIteratorTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/SubtractionIteratorTest.java
@@ -16,15 +16,13 @@
package org.usergrid.persistence.query.ir.result;
-import java.util.Set;
-import java.util.UUID;
-
import org.junit.Test;
import org.usergrid.utils.UUIDUtils;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import java.util.Set;
+import java.util.UUID;
+
+import static org.junit.Assert.*;
import static org.usergrid.persistence.query.ir.result.IteratorHelper.uuidColumn;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/UnionIteratorTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/UnionIteratorTest.java b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/UnionIteratorTest.java
index 683f00d..0678547 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/UnionIteratorTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/UnionIteratorTest.java
@@ -16,17 +16,14 @@
package org.usergrid.persistence.query.ir.result;
+import org.junit.Test;
+import org.usergrid.utils.UUIDUtils;
+
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
-import org.junit.Test;
-import org.usergrid.utils.UUIDUtils;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
import static org.usergrid.persistence.query.ir.result.IteratorHelper.uuidColumn;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/query/tree/GrammarTreeTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/query/tree/GrammarTreeTest.java b/stack/core/src/test/java/org/usergrid/persistence/query/tree/GrammarTreeTest.java
index 30bf820..bf91f07 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/query/tree/GrammarTreeTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/query/tree/GrammarTreeTest.java
@@ -16,24 +16,18 @@
package org.usergrid.persistence.query.tree;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
import org.antlr.runtime.ANTLRStringStream;
import org.antlr.runtime.RecognitionException;
import org.antlr.runtime.TokenRewriteStream;
import org.junit.Test;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.exceptions.QueryParseException;
-import org.usergrid.persistence.query.ir.OrNode;
-import antlr.NoViableAltException;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/system/UsergridSystemMonitorIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/system/UsergridSystemMonitorIT.java b/stack/core/src/test/java/org/usergrid/system/UsergridSystemMonitorIT.java
index 3a2ec36..7c289f4 100644
--- a/stack/core/src/test/java/org/usergrid/system/UsergridSystemMonitorIT.java
+++ b/stack/core/src/test/java/org/usergrid/system/UsergridSystemMonitorIT.java
@@ -1,15 +1,14 @@
package org.usergrid.system;
-import java.util.Date;
-
+import org.apache.commons.lang.StringUtils;
import org.junit.Before;
import org.junit.Test;
import org.usergrid.CoreITSuite;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.utils.MapUtils;
-import org.apache.commons.lang.StringUtils;
+import java.util.Date;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/utils/ConversionUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/utils/ConversionUtilsTest.java b/stack/core/src/test/java/org/usergrid/utils/ConversionUtilsTest.java
index efa5316..38af953 100644
--- a/stack/core/src/test/java/org/usergrid/utils/ConversionUtilsTest.java
+++ b/stack/core/src/test/java/org/usergrid/utils/ConversionUtilsTest.java
@@ -17,10 +17,10 @@
package org.usergrid.utils;
-import java.util.UUID;
-
import org.junit.Test;
+import java.util.UUID;
+
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/utils/IndexUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/utils/IndexUtilsTest.java b/stack/core/src/test/java/org/usergrid/utils/IndexUtilsTest.java
index 1e7de0f..0b7c723 100644
--- a/stack/core/src/test/java/org/usergrid/utils/IndexUtilsTest.java
+++ b/stack/core/src/test/java/org/usergrid/utils/IndexUtilsTest.java
@@ -17,15 +17,14 @@
package org.usergrid.utils;
-import java.util.List;
-import java.util.Map.Entry;
-
-import org.usergrid.persistence.entities.Activity;
-import org.usergrid.persistence.entities.User;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.usergrid.persistence.entities.Activity;
+import org.usergrid.persistence.entities.User;
+
+import java.util.List;
+import java.util.Map.Entry;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/utils/JsonUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/utils/JsonUtilsTest.java b/stack/core/src/test/java/org/usergrid/utils/JsonUtilsTest.java
index f250c29..1cee013 100644
--- a/stack/core/src/test/java/org/usergrid/utils/JsonUtilsTest.java
+++ b/stack/core/src/test/java/org/usergrid/utils/JsonUtilsTest.java
@@ -17,17 +17,17 @@
package org.usergrid.utils;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
import org.codehaus.jackson.node.JsonNodeFactory;
import org.codehaus.jackson.node.ObjectNode;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/utils/ListUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/utils/ListUtilsTest.java b/stack/core/src/test/java/org/usergrid/utils/ListUtilsTest.java
index 930916e..c3d32a7 100644
--- a/stack/core/src/test/java/org/usergrid/utils/ListUtilsTest.java
+++ b/stack/core/src/test/java/org/usergrid/utils/ListUtilsTest.java
@@ -17,13 +17,13 @@
package org.usergrid.utils;
-import java.util.Arrays;
-import java.util.List;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Arrays;
+import java.util.List;
+
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/utils/MailUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/utils/MailUtilsTest.java b/stack/core/src/test/java/org/usergrid/utils/MailUtilsTest.java
index fe5b3d6..c392b26 100644
--- a/stack/core/src/test/java/org/usergrid/utils/MailUtilsTest.java
+++ b/stack/core/src/test/java/org/usergrid/utils/MailUtilsTest.java
@@ -17,14 +17,13 @@
package org.usergrid.utils;
-import java.util.List;
-import java.util.Properties;
-
-import javax.mail.Message;
-
import org.junit.Before;
import org.junit.Test;
+import javax.mail.Message;
+import java.util.List;
+import java.util.Properties;
+
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/utils/MapUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/utils/MapUtilsTest.java b/stack/core/src/test/java/org/usergrid/utils/MapUtilsTest.java
index e8c9b58..23dfcad 100644
--- a/stack/core/src/test/java/org/usergrid/utils/MapUtilsTest.java
+++ b/stack/core/src/test/java/org/usergrid/utils/MapUtilsTest.java
@@ -17,12 +17,12 @@
package org.usergrid.utils;
-import java.util.Map;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Map;
+
public class MapUtilsTest {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/utils/UUIDUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/utils/UUIDUtilsTest.java b/stack/core/src/test/java/org/usergrid/utils/UUIDUtilsTest.java
index 5311b63..6d33111 100644
--- a/stack/core/src/test/java/org/usergrid/utils/UUIDUtilsTest.java
+++ b/stack/core/src/test/java/org/usergrid/utils/UUIDUtilsTest.java
@@ -17,29 +17,17 @@
package org.usergrid.utils;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import static org.usergrid.utils.UUIDUtils.getTimestampInMillis;
-import static org.usergrid.utils.UUIDUtils.newTimeUUID;
-
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import java.util.*;
+import java.util.concurrent.*;
+
+import static org.junit.Assert.*;
+import static org.usergrid.utils.UUIDUtils.getTimestampInMillis;
+import static org.usergrid.utils.UUIDUtils.newTimeUUID;
public class UUIDUtilsTest {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/launcher/src/main/java/org/usergrid/launcher/App.java
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/java/org/usergrid/launcher/App.java b/stack/launcher/src/main/java/org/usergrid/launcher/App.java
index e896969..66d57f4 100644
--- a/stack/launcher/src/main/java/org/usergrid/launcher/App.java
+++ b/stack/launcher/src/main/java/org/usergrid/launcher/App.java
@@ -16,19 +16,6 @@
package org.usergrid.launcher;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.prefs.Preferences;
-
-import javax.swing.UIManager;
-
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.node.ArrayNode;
import org.codehaus.jackson.node.JsonNodeFactory;
@@ -36,6 +23,13 @@ import org.codehaus.jackson.type.TypeReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.swing.*;
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.prefs.Preferences;
+
public class App {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/launcher/src/main/java/org/usergrid/launcher/AppleUtils.java
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/java/org/usergrid/launcher/AppleUtils.java b/stack/launcher/src/main/java/org/usergrid/launcher/AppleUtils.java
index 9463f9e..1f09404 100644
--- a/stack/launcher/src/main/java/org/usergrid/launcher/AppleUtils.java
+++ b/stack/launcher/src/main/java/org/usergrid/launcher/AppleUtils.java
@@ -16,8 +16,7 @@
package org.usergrid.launcher;
-import javax.swing.ImageIcon;
-import javax.swing.JOptionPane;
+import javax.swing.*;
public class AppleUtils {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/launcher/src/main/java/org/usergrid/launcher/LauncherFrame.java
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/java/org/usergrid/launcher/LauncherFrame.java b/stack/launcher/src/main/java/org/usergrid/launcher/LauncherFrame.java
index 760b8e0..b5bf40b 100644
--- a/stack/launcher/src/main/java/org/usergrid/launcher/LauncherFrame.java
+++ b/stack/launcher/src/main/java/org/usergrid/launcher/LauncherFrame.java
@@ -16,18 +16,11 @@
package org.usergrid.launcher;
-import java.awt.Color;
-import java.awt.Container;
-import java.awt.Desktop;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.GradientPaint;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Image;
-import java.awt.Insets;
+import javax.swing.*;
+import javax.swing.border.EmptyBorder;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.IOException;
@@ -40,25 +33,6 @@ import java.util.List;
import java.util.Set;
import java.util.UUID;
-import javax.swing.BorderFactory;
-import javax.swing.ComboBoxEditor;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JComponent;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.JToolBar;
-import javax.swing.Timer;
-import javax.swing.WindowConstants;
-import javax.swing.border.EmptyBorder;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
public class LauncherFrame extends JFrame {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/launcher/src/main/java/org/usergrid/launcher/LogViewerFrame.java
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/java/org/usergrid/launcher/LogViewerFrame.java b/stack/launcher/src/main/java/org/usergrid/launcher/LogViewerFrame.java
index 68b5b19..a10de6e 100644
--- a/stack/launcher/src/main/java/org/usergrid/launcher/LogViewerFrame.java
+++ b/stack/launcher/src/main/java/org/usergrid/launcher/LogViewerFrame.java
@@ -16,20 +16,15 @@
package org.usergrid.launcher;
-import java.awt.BorderLayout;
-import java.io.IOException;
-
-import javax.swing.JFrame;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.SwingUtilities;
-import javax.swing.WindowConstants;
-
import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
import org.apache.log4j.spi.LoggingEvent;
+import javax.swing.*;
+import java.awt.*;
+import java.io.IOException;
+
public class LogViewerFrame extends JFrame {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoChannelHandler.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoChannelHandler.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoChannelHandler.java
index eb1d182..0ba0004 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoChannelHandler.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoChannelHandler.java
@@ -16,6 +16,10 @@
package org.usergrid.mongo;
+import org.apache.shiro.mgt.SessionsSecurityManager;
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.subject.support.SubjectThreadState;
+import org.apache.shiro.util.ThreadState;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ExceptionEvent;
import org.jboss.netty.channel.MessageEvent;
@@ -29,11 +33,6 @@ import org.usergrid.mongo.protocol.OpReply;
import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.services.ServiceManagerFactory;
-import org.apache.shiro.mgt.SessionsSecurityManager;
-import org.apache.shiro.subject.Subject;
-import org.apache.shiro.subject.support.SubjectThreadState;
-import org.apache.shiro.util.ThreadState;
-
public class MongoChannelHandler extends SimpleChannelUpstreamHandler {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoMessageDecoder.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoMessageDecoder.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoMessageDecoder.java
index cce7fd2..e27b8cb 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoMessageDecoder.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoMessageDecoder.java
@@ -22,15 +22,7 @@ import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.handler.codec.frame.FrameDecoder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.usergrid.mongo.protocol.Message;
-import org.usergrid.mongo.protocol.OpDelete;
-import org.usergrid.mongo.protocol.OpGetMore;
-import org.usergrid.mongo.protocol.OpInsert;
-import org.usergrid.mongo.protocol.OpKillCursors;
-import org.usergrid.mongo.protocol.OpMsg;
-import org.usergrid.mongo.protocol.OpQuery;
-import org.usergrid.mongo.protocol.OpReply;
-import org.usergrid.mongo.protocol.OpUpdate;
+import org.usergrid.mongo.protocol.*;
public class MongoMessageDecoder extends FrameDecoder {
[22/23] git commit: organize imports only
Posted by sn...@apache.org.
organize imports only
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/2e35e490
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2e35e490
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2e35e490
Branch: refs/pull/30/head
Commit: 2e35e4901b60388235b9f15701e9b2e5659e879f
Parents: f8ae7fe
Author: Strong Liu <st...@hibernate.org>
Authored: Sun Jan 19 18:00:01 2014 +0800
Committer: Strong Liu <st...@hibernate.org>
Committed: Sun Jan 19 18:00:01 2014 +0800
----------------------------------------------------------------------
.../java/org/usergrid/batch/JobExecution.java | 4 +-
.../org/usergrid/batch/JobExecutionImpl.java | 5 +-
.../java/org/usergrid/batch/JobFactory.java | 4 +-
.../org/usergrid/batch/UsergridJobFactory.java | 6 +-
.../org/usergrid/batch/job/OnlyOnceJob.java | 4 +-
.../usergrid/batch/repository/JobAccessor.java | 4 +-
.../batch/repository/JobDescriptor.java | 5 +-
.../java/org/usergrid/batch/service/App.java | 3 +-
.../batch/service/JobSchedulerService.java | 33 ++---
.../batch/service/SchedulerService.java | 4 +-
.../batch/service/SchedulerServiceImpl.java | 29 ++--
.../hazelcast/HazelcastLifecycleMonitor.java | 8 +-
.../org/usergrid/count/AbstractBatcher.java | 12 +-
.../java/org/usergrid/count/BatchSubmitter.java | 4 +-
.../usergrid/count/CassandraCounterStore.java | 20 ++-
.../org/usergrid/count/CassandraSubmitter.java | 17 +--
.../java/org/usergrid/count/CounterStore.java | 4 +-
.../java/org/usergrid/count/SimpleBatcher.java | 1 -
.../org/usergrid/count/Slf4JBatchSubmitter.java | 17 +--
.../java/org/usergrid/count/common/Count.java | 14 +-
.../usergrid/count/common/CountSerDeUtils.java | 4 +-
.../main/java/org/usergrid/locking/Lock.java | 4 +-
.../java/org/usergrid/locking/LockHelper.java | 5 +-
.../java/org/usergrid/locking/LockManager.java | 4 +-
.../locking/cassandra/HectorLockImpl.java | 11 +-
.../cassandra/HectorLockManagerImpl.java | 8 +-
.../org/usergrid/locking/noop/NoOpLockImpl.java | 4 +-
.../locking/noop/NoOpLockManagerImpl.java | 4 +-
.../locking/singlenode/SingleNodeLockImpl.java | 6 +-
.../singlenode/SingleNodeLockManagerImpl.java | 15 +-
.../zookeeper/ZooKeeperLockManagerImpl.java | 16 +--
.../locking/zookeeper/ZookeeperLockImpl.java | 5 +-
.../main/java/org/usergrid/mq/CounterQuery.java | 13 +-
.../src/main/java/org/usergrid/mq/Message.java | 36 +----
.../src/main/java/org/usergrid/mq/Query.java | 28 +---
.../java/org/usergrid/mq/QueryFilterLexer.java | 10 +-
.../java/org/usergrid/mq/QueryFilterParser.java | 10 +-
.../java/org/usergrid/mq/QueryProcessor.java | 18 +--
.../src/main/java/org/usergrid/mq/Queue.java | 19 +--
.../main/java/org/usergrid/mq/QueueManager.java | 8 +-
.../main/java/org/usergrid/mq/QueueQuery.java | 5 +-
.../main/java/org/usergrid/mq/QueueResults.java | 9 +-
.../src/main/java/org/usergrid/mq/QueueSet.java | 11 +-
.../usergrid/mq/cassandra/CassandraMQUtils.java | 36 ++---
.../mq/cassandra/MessageIndexUpdate.java | 20 +--
.../usergrid/mq/cassandra/QueueIndexUpdate.java | 21 +--
.../mq/cassandra/QueueManagerFactoryImpl.java | 10 +-
.../usergrid/mq/cassandra/QueueManagerImpl.java | 103 +++-----------
.../org/usergrid/mq/cassandra/QueuesCF.java | 5 +-
.../mq/cassandra/io/AbstractSearch.java | 46 ++----
.../mq/cassandra/io/ConsumerTransaction.java | 29 ++--
.../org/usergrid/mq/cassandra/io/EndSearch.java | 5 +-
.../usergrid/mq/cassandra/io/FilterSearch.java | 20 +--
.../mq/cassandra/io/NoTransactionSearch.java | 7 +-
.../usergrid/mq/cassandra/io/StartSearch.java | 5 +-
.../usergrid/persistence/AbstractEntity.java | 14 +-
.../persistence/AggregateCounterSet.java | 6 +-
.../org/usergrid/persistence/CounterQuery.java | 13 +-
.../usergrid/persistence/CredentialsInfo.java | 9 +-
.../org/usergrid/persistence/DynamicEntity.java | 9 +-
.../java/org/usergrid/persistence/Entity.java | 16 +--
.../org/usergrid/persistence/EntityFactory.java | 4 +-
.../org/usergrid/persistence/EntityManager.java | 8 +-
.../org/usergrid/persistence/Identifier.java | 6 +-
.../java/org/usergrid/persistence/Query.java | 44 ++----
.../org/usergrid/persistence/QueryUtils.java | 4 +-
.../usergrid/persistence/RelationManager.java | 4 +-
.../java/org/usergrid/persistence/Results.java | 17 +--
.../java/org/usergrid/persistence/Schema.java | 60 +++-----
.../persistence/SimpleCollectionRef.java | 4 +-
.../org/usergrid/persistence/SimpleRoleRef.java | 4 +-
.../persistence/cassandra/ApplicationCF.java | 4 +-
.../usergrid/persistence/cassandra/CFEnum.java | 4 +-
.../cassandra/CassandraPersistenceUtils.java | 44 ++----
.../persistence/cassandra/CassandraService.java | 70 +++-------
.../cassandra/ConnectedEntityRefImpl.java | 4 +-
.../cassandra/ConnectionRefImpl.java | 15 +-
.../persistence/cassandra/CounterUtils.java | 33 ++---
.../persistence/cassandra/CursorCache.java | 1 -
.../cassandra/EntityManagerFactoryImpl.java | 55 +++-----
.../cassandra/EntityManagerImpl.java | 139 ++++---------------
.../cassandra/EntityValueSerializer.java | 6 +-
.../persistence/cassandra/GeoIndexManager.java | 22 ++-
.../persistence/cassandra/IndexUpdate.java | 23 +--
.../persistence/cassandra/QueryProcessor.java | 47 +------
.../cassandra/RelationManagerImpl.java | 111 +++------------
.../usergrid/persistence/cassandra/Setup.java | 19 +--
.../cassandra/SimpleIndexBucketLocatorImpl.java | 4 +-
.../cassandra/index/ConnectedIndexScanner.java | 14 +-
.../cassandra/index/IndexBucketScanner.java | 16 +--
.../index/IndexMultiBucketSetLoader.java | 16 +--
.../cassandra/index/IndexScanner.java | 4 +-
.../cassandra/index/NoOpIndexScanner.java | 4 +-
.../cassandra/util/Slf4jTraceTagReporter.java | 4 +-
.../persistence/cassandra/util/TimedOpTag.java | 5 +-
.../cassandra/util/TraceTagAspect.java | 4 +-
.../cassandra/util/TraceTagManager.java | 5 +-
.../usergrid/persistence/entities/Activity.java | 12 +-
.../persistence/entities/Application.java | 13 +-
.../usergrid/persistence/entities/Asset.java | 9 +-
.../usergrid/persistence/entities/Device.java | 9 +-
.../usergrid/persistence/entities/Event.java | 13 +-
.../usergrid/persistence/entities/Folder.java | 9 +-
.../usergrid/persistence/entities/Group.java | 13 +-
.../usergrid/persistence/entities/JobStat.java | 4 +-
.../usergrid/persistence/entities/Message.java | 9 +-
.../org/usergrid/persistence/entities/Role.java | 11 +-
.../org/usergrid/persistence/entities/User.java | 13 +-
.../persistence/geo/CollectionGeoSearch.java | 11 +-
.../persistence/geo/ConnectionGeoSearch.java | 11 +-
.../persistence/geo/EntityLocationRef.java | 5 +-
.../EntityLocationRefDistanceComparator.java | 4 +-
.../persistence/geo/GeoIndexSearcher.java | 27 ++--
.../persistence/geo/GeocellManager.java | 8 +-
.../usergrid/persistence/geo/GeocellUtils.java | 8 +-
.../geo/comparator/DoubleTupleComparator.java | 4 +-
.../persistence/query/ir/OrderByNode.java | 4 +-
.../persistence/query/ir/QuerySlice.java | 7 +-
.../persistence/query/ir/SearchVisitor.java | 14 +-
.../persistence/query/ir/SliceNode.java | 4 +-
.../query/ir/result/AbstractScanColumn.java | 3 +-
.../ir/result/ConnectionIndexSliceParser.java | 7 +-
.../query/ir/result/ConnectionRefLoader.java | 8 +-
.../ir/result/ConnectionTypesIterator.java | 13 +-
.../query/ir/result/EmptyIterator.java | 4 +-
.../query/ir/result/EntityRefLoader.java | 6 +-
.../query/ir/result/EntityResultsLoader.java | 4 +-
.../query/ir/result/GeoIterator.java | 15 +-
.../persistence/query/ir/result/IDLoader.java | 4 +-
.../query/ir/result/IntersectionIterator.java | 7 +-
.../query/ir/result/OrderByIterator.java | 20 +--
.../query/ir/result/ResultIterator.java | 4 +-
.../query/ir/result/ResultsLoader.java | 4 +-
.../ir/result/SecondaryIndexSliceParser.java | 4 +-
.../query/ir/result/SliceIterator.java | 11 +-
.../query/ir/result/StaticIdIterator.java | 4 +-
.../query/ir/result/SubtractionIterator.java | 7 +-
.../query/ir/result/UUIDIndexSliceParser.java | 4 +-
.../query/ir/result/UnionIterator.java | 14 +-
.../persistence/query/tree/UUIDLiteral.java | 4 +-
.../persistence/schema/CollectionInfo.java | 6 +-
.../usergrid/persistence/schema/EntityInfo.java | 4 +-
.../usergrid/system/UsergridSystemMonitor.java | 7 +-
.../main/java/org/usergrid/utils/AESUtils.java | 9 +-
.../java/org/usergrid/utils/CodecUtils.java | 4 +-
.../java/org/usergrid/utils/CompositeUtils.java | 6 +-
.../org/usergrid/utils/ConversionUtils.java | 16 +--
.../main/java/org/usergrid/utils/HttpUtils.java | 6 +-
.../java/org/usergrid/utils/IndexUtils.java | 29 ++--
.../main/java/org/usergrid/utils/JsonUtils.java | 22 ++-
.../main/java/org/usergrid/utils/ListUtils.java | 9 +-
.../main/java/org/usergrid/utils/MailUtils.java | 18 +--
.../main/java/org/usergrid/utils/MapUtils.java | 12 +-
.../java/org/usergrid/utils/StringUtils.java | 5 +-
.../main/java/org/usergrid/utils/UUIDUtils.java | 18 +--
.../main/java/org/usergrid/utils/Version.java | 4 +-
.../src/test/java/org/usergrid/Application.java | 6 +-
.../org/usergrid/ConcurrentCoreITSuite.java | 10 +-
.../usergrid/ConcurrentCoreIteratorITSuite.java | 30 +---
.../org/usergrid/ConcurrentCoreTestSuite.java | 6 +-
.../test/java/org/usergrid/CoreApplication.java | 8 +-
.../src/test/java/org/usergrid/CoreITSetup.java | 4 +-
.../test/java/org/usergrid/CoreITSetupImpl.java | 4 +-
.../src/test/java/org/usergrid/CoreITSuite.java | 10 +-
.../test/java/org/usergrid/CoreTestSuite.java | 6 +-
.../java/org/usergrid/batch/AppArgsTest.java | 3 +-
.../batch/BulkJobExecutionUnitTest.java | 4 +-
.../java/org/usergrid/batch/BulkTestUtils.java | 6 +-
.../batch/ConcurrentSchedulerITSuite.java | 9 +-
.../batch/ConcurrentSchedulerTestSuite.java | 3 -
.../org/usergrid/batch/SchedulerITSuite.java | 9 +-
.../org/usergrid/batch/SchedulerTestSuite.java | 3 -
.../usergrid/batch/UsergridJobFactoryTest.java | 6 +-
.../batch/job/AbstractSchedulerRuntimeIT.java | 6 +-
.../usergrid/batch/job/CountdownLatchJob.java | 6 +-
.../org/usergrid/batch/job/DelayExecution.java | 6 +-
.../org/usergrid/batch/job/DelayHeartbeat.java | 6 +-
.../batch/job/FailureJobExceuction.java | 6 +-
.../usergrid/batch/job/OnlyOnceExceution.java | 6 +-
.../job/OnlyOnceUnlockOnFailExceution.java | 6 +-
.../usergrid/batch/job/SchedulerRuntime1IT.java | 10 +-
.../usergrid/batch/job/SchedulerRuntime2IT.java | 10 +-
.../usergrid/batch/job/SchedulerRuntime3IT.java | 3 +-
.../usergrid/batch/job/SchedulerRuntime4IT.java | 3 +-
.../usergrid/batch/job/SchedulerRuntime5IT.java | 3 +-
.../usergrid/batch/job/SchedulerRuntime6IT.java | 10 +-
.../usergrid/batch/job/SchedulerRuntime7IT.java | 3 +-
.../usergrid/batch/job/SchedulerRuntime8IT.java | 5 +-
.../org/usergrid/batch/job/TestJobListener.java | 4 +-
.../usergrid/batch/job/TestJobListenerTest.java | 7 +-
.../clustering/hazelcast/HazelcastTest.java | 13 +-
.../count/BatchCountParallelismTest.java | 19 +--
.../org/usergrid/count/SimpleBatcherTest.java | 1 -
.../locking/cassandra/HectorLockManagerIT.java | 12 +-
.../SingleNodeLockTestSingleNode.java | 11 +-
.../zookeeper/AbstractZooKeeperTest.java | 9 +-
.../org/usergrid/locking/zookeeper/ZooPut.java | 11 +-
.../zookeeper/ZookeeperLockManagerTest.java | 17 +--
.../test/java/org/usergrid/mq/MessagesIT.java | 13 +-
.../org/usergrid/persistence/CollectionIT.java | 15 +-
.../usergrid/persistence/CoreSchemaManager.java | 3 +-
.../org/usergrid/persistence/CounterIT.java | 11 +-
.../persistence/EntityConnectionsIT.java | 13 +-
.../persistence/EntityDictionaryIT.java | 12 +-
.../usergrid/persistence/EntityManagerIT.java | 17 +--
.../org/usergrid/persistence/EntityTest.java | 8 +-
.../java/org/usergrid/persistence/GeoIT.java | 9 +-
.../java/org/usergrid/persistence/IndexIT.java | 19 ++-
.../org/usergrid/persistence/PathQueryIT.java | 10 +-
.../org/usergrid/persistence/PermissionsIT.java | 12 +-
.../org/usergrid/persistence/QueryTest.java | 27 +---
.../usergrid/persistence/QueryUtilsTest.java | 6 +-
.../org/usergrid/persistence/SchemaTest.java | 5 +-
.../cassandra/EntityManagerFactoryImplIT.java | 19 +--
.../cassandra/QueryProcessorTest.java | 20 +--
.../SimpleIndexBucketLocatorImplTest.java | 15 +-
.../persistence/entities/SampleEntity.java | 9 +-
...EntityLocationRefDistanceComparatorTest.java | 4 +-
.../query/AbstractIteratingQueryIT.java | 11 +-
.../query/IntersectionUnionPagingIT.java | 8 +-
.../query/ir/result/InOrderIterator.java | 11 +-
.../ir/result/IntersectionIteratorTest.java | 12 +-
.../ir/result/SubtractionIteratorTest.java | 10 +-
.../query/ir/result/UnionIteratorTest.java | 11 +-
.../persistence/query/tree/GrammarTreeTest.java | 14 +-
.../system/UsergridSystemMonitorIT.java | 5 +-
.../org/usergrid/utils/ConversionUtilsTest.java | 4 +-
.../java/org/usergrid/utils/IndexUtilsTest.java | 11 +-
.../java/org/usergrid/utils/JsonUtilsTest.java | 10 +-
.../java/org/usergrid/utils/ListUtilsTest.java | 6 +-
.../java/org/usergrid/utils/MailUtilsTest.java | 9 +-
.../java/org/usergrid/utils/MapUtilsTest.java | 4 +-
.../java/org/usergrid/utils/UUIDUtilsTest.java | 24 +---
.../main/java/org/usergrid/launcher/App.java | 20 +--
.../java/org/usergrid/launcher/AppleUtils.java | 3 +-
.../org/usergrid/launcher/LauncherFrame.java | 36 +----
.../org/usergrid/launcher/LogViewerFrame.java | 13 +-
.../org/usergrid/mongo/MongoChannelHandler.java | 9 +-
.../org/usergrid/mongo/MongoMessageDecoder.java | 10 +-
.../java/org/usergrid/mongo/MongoServer.java | 15 +-
.../mongo/MongoServerPipelineFactory.java | 3 +-
.../usergrid/mongo/commands/ListDatabases.java | 10 +-
.../usergrid/mongo/commands/MongoCommand.java | 4 +-
.../org/usergrid/mongo/commands/Whatsmyuri.java | 4 +-
.../org/usergrid/mongo/protocol/Message.java | 12 +-
.../org/usergrid/mongo/protocol/OpDelete.java | 16 +--
.../org/usergrid/mongo/protocol/OpGetMore.java | 6 +-
.../org/usergrid/mongo/protocol/OpInsert.java | 12 +-
.../usergrid/mongo/protocol/OpKillCursors.java | 4 +-
.../java/org/usergrid/mongo/protocol/OpMsg.java | 4 +-
.../org/usergrid/mongo/protocol/OpQuery.java | 26 ++--
.../org/usergrid/mongo/protocol/OpReply.java | 12 +-
.../org/usergrid/mongo/protocol/OpUpdate.java | 14 +-
.../usergrid/mongo/query/MongoQueryParser.java | 13 +-
.../testproxy/MongoProxyInboundHandler.java | 15 +-
.../mongo/testproxy/MongoProxyServer.java | 10 +-
.../org/usergrid/mongo/AbstractMongoTest.java | 13 +-
.../java/org/usergrid/mongo/BasicMongoTest.java | 32 ++---
.../org/usergrid/mongo/DatabaseInitializer.java | 6 +-
.../java/org/usergrid/mongo/MongoQueryTest.java | 20 +--
.../query/validator/ApiServerRunner.java | 5 +-
.../usergrid/query/validator/QueryRunner.java | 3 +-
.../query/validator/QueryValidationTest.java | 2 +-
.../usergrid/rest/AbstractContextResource.java | 25 ++--
.../java/org/usergrid/rest/ApiResponse.java | 17 +--
.../rest/JacksonCustomMapperProvider.java | 10 +-
.../java/org/usergrid/rest/RootResource.java | 60 +++-----
.../java/org/usergrid/rest/SwaggerServlet.java | 27 ++--
.../java/org/usergrid/rest/SystemResource.java | 15 +-
.../org/usergrid/rest/TextToJsonSwapWriter.java | 23 ++-
.../rest/applications/ApplicationResource.java | 45 ++----
.../rest/applications/AuthResource.java | 29 ++--
.../rest/applications/ServiceResource.java | 57 ++------
.../applications/assets/AssetsResource.java | 32 ++---
.../applications/events/EventsResource.java | 17 ++-
.../rest/applications/queues/QueueResource.java | 32 ++---
.../queues/QueueSubscriberResource.java | 30 ++--
.../queues/QueueSubscriptionResource.java | 30 ++--
.../queues/QueueTransactionsResource.java | 20 +--
.../rest/applications/users/UserResource.java | 48 ++-----
.../rest/applications/users/UsersResource.java | 38 ++---
.../exceptions/AbstractExceptionMapper.java | 9 +-
.../AuthorizationExceptionMapper.java | 4 +-
...cateUniquePropertyExistsExceptionMapper.java | 4 +-
.../EntityNotFoundExceptionMapper.java | 4 +-
...orbiddenServiceOperationExceptionMapper.java | 4 +-
.../exceptions/JsonReadExceptionMapper.java | 4 +-
.../exceptions/JsonWriteExceptionMapper.java | 4 +-
.../exceptions/ManagementExceptionMapper.java | 4 +-
.../NotImplementedExceptionMapper.java | 4 +-
.../exceptions/OAuthProblemExceptionMapper.java | 8 +-
...rganizationApplicationNotFoundException.java | 4 +-
.../exceptions/PersistenceExceptionMapper.java | 4 +-
.../exceptions/QueryParseExceptionMapper.java | 5 +-
.../exceptions/QueryTokenExceptionMapper.java | 7 +-
.../RecentlyUsedPasswordExceptionMapper.java | 4 +-
...RequiredPropertyNotFoundExceptionMapper.java | 4 +-
.../rest/exceptions/SecurityException.java | 3 +-
.../rest/exceptions/ServiceExceptionMapper.java | 4 +-
.../ServiceResourceNotFoundExceptionMapper.java | 6 +-
.../TransactionNotFoundExceptionMapper.java | 4 +-
.../rest/filters/ContentTypeFilter.java | 30 +---
.../rest/filters/JSONPCallbackFilter.java | 9 +-
.../usergrid/rest/filters/MeteringFilter.java | 36 ++---
.../usergrid/rest/filters/TracingFilter.java | 13 +-
.../rest/management/ManagementResource.java | 48 +++----
.../management/metrics/MetricsResource.java | 13 +-
.../organizations/OrganizationResource.java | 23 +--
.../organizations/OrganizationsResource.java | 28 ++--
.../applications/ApplicationResource.java | 28 ++--
.../applications/ApplicationsResource.java | 30 ++--
.../organizations/users/UsersResource.java | 30 ++--
.../rest/management/users/UserResource.java | 31 ++---
.../rest/management/users/UsersResource.java | 33 ++---
.../organizations/OrganizationsResource.java | 28 ++--
.../organizations/OrganizationResource.java | 24 ++--
.../rest/security/CrossOriginRequestFilter.java | 7 +-
.../security/SecuredResourceFilterFactory.java | 29 ++--
.../security/shiro/RestSecurityManager.java | 9 +-
.../ShiroAuthenticationExceptionMapper.java | 11 +-
.../shiro/filters/BasicAuthSecurityFilter.java | 13 +-
.../ClientCredentialsSecurityFilter.java | 10 +-
.../OAuth2AccessTokenSecurityFilter.java | 27 ++--
.../security/shiro/filters/SecurityFilter.java | 23 ++-
.../session/HttpRequestSessionManager.java | 6 +-
.../session/HttpServletRequestSession.java | 11 +-
.../usergrid/rest/test/PropertiesResource.java | 21 ++-
.../java/org/usergrid/rest/utils/CORSUtils.java | 7 +-
.../org/usergrid/rest/utils/JSONPUtils.java | 11 +-
.../java/org/usergrid/rest/AbstractRestIT.java | 36 +++--
.../test/java/org/usergrid/rest/BasicIT.java | 16 +--
.../usergrid/rest/ConcurrentRestITSuite.java | 7 +-
.../org/usergrid/rest/DatabaseInitializer.java | 6 +-
.../test/java/org/usergrid/rest/ITSetup.java | 9 +-
.../java/org/usergrid/rest/RestITSuite.java | 7 +-
.../org/usergrid/rest/TestContextSetup.java | 3 +-
.../java/org/usergrid/rest/TomcatResource.java | 10 +-
.../ApplicationRequestCounterIT.java | 13 +-
.../applications/ApplicationResourceIT.java | 21 ++-
.../rest/applications/DevicesResourceIT.java | 13 +-
.../applications/assets/AssetResourceIT.java | 17 +--
.../collection/BadGrammarQueryTest.java | 9 +-
.../collection/BrowserCompatibilityTest.java | 6 +-
.../collection/PagingResourceIT.java | 13 +-
.../collection/activities/AndOrQueryTest.java | 6 +-
.../collection/activities/OrderByTest.java | 10 +-
.../activities/PagingEntitiesTest.java | 7 +-
.../collection/activities/PutTest.java | 6 +-
.../collection/groups/GeoPagingTest.java | 6 +-
.../collection/groups/UpdateGroupIT.java | 20 ++-
.../applications/events/EventsResourceIT.java | 9 +-
.../queues/AbstractQueueResourceIT.java | 20 +--
.../queues/QueueResourceLong1IT.java | 9 +-
.../queues/QueueResourceLong2IT.java | 7 +-
.../queues/QueueResourceLong3IT.java | 14 +-
.../queues/QueueResourceShortIT.java | 23 ++-
.../users/CollectionsResourceIT.java | 16 +--
.../users/ConnectionResourceTest.java | 14 +-
.../applications/users/GroupResourceIT.java | 12 +-
.../applications/users/OwnershipResourceIT.java | 6 +-
.../users/PermissionsResourceIT.java | 21 ++-
.../applications/users/RetrieveUsersTest.java | 6 +-
.../rest/applications/users/UserResourceIT.java | 22 +--
.../users/extensions/TestResource.java | 8 +-
.../rest/applications/utils/TestUtils.java | 4 +-
.../rest/applications/utils/UserRepo.java | 12 +-
.../rest/filters/ContentTypeResourceIT.java | 37 ++---
.../rest/management/ManagementResourceIT.java | 22 ++-
.../rest/management/RegistrationIT.java | 46 ++----
.../organizations/OrganizationResourceIT.java | 10 +-
.../organizations/OrganizationsResourceIT.java | 32 ++---
.../rest/management/users/MUUserResourceIT.java | 45 ++----
.../UsersOrganizationsResourceIT.java | 7 +-
.../rest/test/PropertiesResourceIT.java | 9 +-
.../usergrid/rest/test/resource/Connection.java | 4 +-
.../rest/test/resource/EntityResource.java | 9 +-
.../rest/test/resource/NamedResource.java | 12 +-
.../rest/test/resource/SetResource.java | 4 +-
.../rest/test/resource/TestContext.java | 5 +-
.../rest/test/resource/ValueResource.java | 7 +-
.../rest/test/resource/app/Application.java | 4 +-
.../usergrid/rest/test/resource/app/Device.java | 4 +-
.../usergrid/rest/test/resource/app/User.java | 4 +-
.../rest/test/resource/app/UsersCollection.java | 6 +-
.../rest/test/resource/app/queue/Queue.java | 7 +-
.../test/resource/app/queue/Transaction.java | 3 +-
.../rest/test/resource/mgmt/Application.java | 4 +-
.../resource/mgmt/ApplicationsCollection.java | 4 +-
.../rest/test/resource/mgmt/Management.java | 7 +-
.../rest/test/resource/mgmt/Organization.java | 4 +-
.../resource/mgmt/OrganizationsCollection.java | 4 +-
.../usergrid/rest/test/security/TestUser.java | 4 +-
.../usergrid/management/ApplicationInfo.java | 6 +-
.../usergrid/management/ManagementService.java | 9 +-
.../usergrid/management/OrganizationInfo.java | 6 +-
.../java/org/usergrid/management/UserInfo.java | 15 +-
.../cassandra/AccountCreationPropsImpl.java | 7 +-
.../cassandra/ApplicationCreatorImpl.java | 7 +-
.../cassandra/ManagementServiceImpl.java | 127 +++--------------
.../usergrid/security/AuthPrincipalType.java | 6 +-
.../security/crypto/EncryptionService.java | 4 +-
.../security/crypto/EncryptionServiceImpl.java | 15 +-
.../security/crypto/command/BcryptCommand.java | 6 +-
.../crypto/command/EncryptionCommand.java | 4 +-
.../security/crypto/command/Md5HashCommand.java | 5 +-
.../crypto/command/PlainTextCommand.java | 4 +-
.../crypto/command/SaltedHasherCommand.java | 6 +-
.../crypto/command/Sha1HashCommand.java | 6 +-
.../org/usergrid/security/oauth/AccessInfo.java | 9 +-
.../security/oauth/ClientCredentialsInfo.java | 4 +-
.../security/providers/AbstractProvider.java | 9 +-
.../security/providers/FacebookProvider.java | 9 +-
.../security/providers/FoursquareProvider.java | 20 ++-
.../providers/PingIdentityProvider.java | 11 +-
.../security/providers/SignInAsProvider.java | 4 +-
.../security/shiro/CustomPermission.java | 11 +-
.../shiro/PrincipalCredentialsToken.java | 15 +-
.../java/org/usergrid/security/shiro/Realm.java | 66 +++------
.../principals/ApplicationGuestPrincipal.java | 4 +-
.../shiro/principals/ApplicationPrincipal.java | 4 +-
.../principals/ApplicationUserPrincipal.java | 4 +-
.../shiro/principals/OrganizationPrincipal.java | 4 +-
.../shiro/principals/UserPrincipal.java | 4 +-
.../security/shiro/utils/SubjectUtils.java | 24 ++--
.../org/usergrid/security/tokens/TokenInfo.java | 4 +-
.../usergrid/security/tokens/TokenService.java | 4 +-
.../tokens/cassandra/TokenServiceImpl.java | 32 ++---
.../services/AbstractCollectionService.java | 14 +-
.../services/AbstractConnectionsService.java | 16 +--
.../AbstractPathBasedColllectionService.java | 10 +-
.../org/usergrid/services/AbstractService.java | 20 +--
.../java/org/usergrid/services/Service.java | 4 +-
.../org/usergrid/services/ServiceContext.java | 8 +-
.../java/org/usergrid/services/ServiceInfo.java | 17 +--
.../org/usergrid/services/ServiceManager.java | 18 ++-
.../services/ServiceManagerFactory.java | 8 +-
.../org/usergrid/services/ServiceParameter.java | 15 +-
.../org/usergrid/services/ServicePayload.java | 12 +-
.../org/usergrid/services/ServiceRequest.java | 13 +-
.../org/usergrid/services/ServiceResults.java | 12 +-
.../applications/ApplicationsService.java | 11 +-
.../usergrid/services/assets/AssetsService.java | 4 +-
.../services/assets/data/AssetMimeHandler.java | 18 +--
.../services/assets/data/AssetUtils.java | 16 +--
.../services/assets/data/BinaryStore.java | 4 +-
.../assets/data/LocalFileBinaryStore.java | 7 +-
.../services/assets/data/S3BinaryStore.java | 30 ++--
.../services/devices/DevicesService.java | 4 +-
.../usergrid/services/groups/GroupsService.java | 11 +-
.../groups/activities/ActivitiesService.java | 6 +-
.../users/activities/ActivitiesService.java | 6 +-
.../usergrid/services/roles/RolesService.java | 8 +-
.../services/roles/users/UsersService.java | 4 +-
.../usergrid/services/users/UsersService.java | 22 +--
.../users/activities/ActivitiesService.java | 10 +-
.../services/users/roles/RolesService.java | 4 +-
.../org/usergrid/ConcurrentServiceITSuite.java | 11 +-
.../java/org/usergrid/ServiceApplication.java | 10 +-
.../test/java/org/usergrid/ServiceITSetup.java | 4 +-
.../java/org/usergrid/ServiceITSetupImpl.java | 4 +-
.../test/java/org/usergrid/ServiceITSuite.java | 11 +-
.../org/usergrid/management/EmailFlowIT.java | 48 ++-----
.../management/ManagementTestHelper.java | 4 +-
.../org/usergrid/management/MockImapClient.java | 13 +-
.../org/usergrid/management/OrganizationIT.java | 15 +-
.../java/org/usergrid/management/RoleIT.java | 9 +-
.../cassandra/ApplicationCreatorIT.java | 8 +-
.../cassandra/ManagementServiceIT.java | 17 +--
.../cassandra/ManagementTestHelperImpl.java | 4 +-
.../usergrid/security/CustomResolverTest.java | 19 ++-
.../crypto/EncryptionServiceImplTest.java | 8 +-
.../crypto/command/BcryptCommandTest.java | 11 +-
.../crypto/command/Md5HashCommandTest.java | 5 +-
.../crypto/command/Sha1HashCommandTest.java | 6 +-
.../security/providers/FacebookProviderIT.java | 12 +-
.../providers/PingIdentityProviderIT.java | 12 +-
.../security/tokens/TokenServiceIT.java | 11 +-
.../usergrid/services/CollectionServiceIT.java | 4 +-
.../usergrid/services/ConnectionsServiceIT.java | 8 +-
.../org/usergrid/services/RolesServiceIT.java | 14 +-
.../org/usergrid/services/ServiceFactoryIT.java | 5 +-
.../org/usergrid/services/ServiceInfoTest.java | 4 +-
.../usergrid/services/ServiceInvocationIT.java | 8 +-
.../org/usergrid/services/ServiceRequestIT.java | 8 +-
.../services/assets/data/AssetUtilsTest.java | 4 +-
.../org/usergrid/NoExitSecurityManager.java | 4 +-
.../usergrid/cassandra/AvailablePortFinder.java | 6 +-
.../usergrid/cassandra/CassandraResource.java | 21 ++-
.../usergrid/cassandra/ClearShiroSubject.java | 7 +-
.../cassandra/ConcurrentJunitRunner.java | 15 +-
.../org/usergrid/cassandra/ConcurrentSuite.java | 19 +--
.../cassandra/CassandraResourceTest.java | 4 +-
.../main/java/org/usergrid/tools/ApiDoc.java | 30 ++--
.../main/java/org/usergrid/tools/AppAudit.java | 35 ++---
.../java/org/usergrid/tools/AppNameFix.java | 13 +-
.../src/main/java/org/usergrid/tools/Cli.java | 30 ++--
.../main/java/org/usergrid/tools/Command.java | 7 +-
.../java/org/usergrid/tools/CredExport.java | 11 +-
.../java/org/usergrid/tools/DupAdminRepair.java | 29 ++--
.../java/org/usergrid/tools/DupOrgRepair.java | 30 ++--
.../java/org/usergrid/tools/EntityCleanup.java | 26 ++--
.../usergrid/tools/EntityInsertBenchMark.java | 32 ++---
.../org/usergrid/tools/EntityReadBenchMark.java | 41 +++---
.../java/org/usergrid/tools/EntityUpdate.java | 24 ++--
.../main/java/org/usergrid/tools/Export.java | 24 +---
.../org/usergrid/tools/ExportDataCreator.java | 4 +-
.../org/usergrid/tools/ExportingToolBase.java | 17 ++-
.../main/java/org/usergrid/tools/Import.java | 21 ++-
.../main/java/org/usergrid/tools/ImportFB.java | 17 ++-
.../java/org/usergrid/tools/IndexRebuild.java | 20 +--
.../main/java/org/usergrid/tools/Metrics.java | 29 ++--
.../org/usergrid/tools/OrganizationExport.java | 20 ++-
.../java/org/usergrid/tools/PopulateSample.java | 15 +-
.../java/org/usergrid/tools/ResetSuperUser.java | 17 +--
.../main/java/org/usergrid/tools/SetupDB.java | 5 +-
.../src/main/java/org/usergrid/tools/Test.java | 5 +-
.../main/java/org/usergrid/tools/ToolBase.java | 17 +--
.../org/usergrid/tools/UniqueIndexCleanup.java | 40 ++----
.../java/org/usergrid/tools/UserManager.java | 3 +-
.../org/usergrid/tools/WarehouseExport.java | 57 +++-----
.../org/usergrid/tools/WarehouseUpsert.java | 11 +-
.../org/usergrid/tools/apidoc/swagger/Api.java | 4 +-
.../tools/apidoc/swagger/ApiListing.java | 13 +-
.../tools/apidoc/swagger/ApiOperation.java | 4 +-
.../apidoc/swagger/ApiParamAllowableValues.java | 4 +-
.../java/org/usergrid/tools/bean/ExportOrg.java | 4 +-
.../org/usergrid/tools/bean/MetricLine.java | 9 +-
.../org/usergrid/tools/bean/MetricQuery.java | 12 +-
.../websocket/WebSocketChannelHandler.java | 44 ++----
.../org/usergrid/websocket/WebSocketServer.java | 13 +-
.../WebSocketServerPipelineFactory.java | 5 +-
.../websocket/WebSocketSslContextFactory.java | 5 +-
.../websocket/SimpleMessageProducer.java | 13 +-
533 files changed, 2463 insertions(+), 4729 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/JobExecution.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/JobExecution.java b/stack/core/src/main/java/org/usergrid/batch/JobExecution.java
index 150de17..6b09f0e 100644
--- a/stack/core/src/main/java/org/usergrid/batch/JobExecution.java
+++ b/stack/core/src/main/java/org/usergrid/batch/JobExecution.java
@@ -16,11 +16,11 @@
package org.usergrid.batch;
-import java.util.UUID;
-
import org.usergrid.persistence.entities.JobData;
import org.usergrid.persistence.entities.JobStat;
+import java.util.UUID;
+
/**
* Interface to define all operations possible during a job execution. The job execution has several states.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/JobExecutionImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/JobExecutionImpl.java b/stack/core/src/main/java/org/usergrid/batch/JobExecutionImpl.java
index d5aecfc..4cbed78 100644
--- a/stack/core/src/main/java/org/usergrid/batch/JobExecutionImpl.java
+++ b/stack/core/src/main/java/org/usergrid/batch/JobExecutionImpl.java
@@ -1,14 +1,13 @@
package org.usergrid.batch;
-import java.util.UUID;
-
+import com.google.common.base.Preconditions;
import org.usergrid.batch.repository.JobDescriptor;
import org.usergrid.batch.service.JobRuntimeService;
import org.usergrid.persistence.entities.JobData;
import org.usergrid.persistence.entities.JobStat;
-import com.google.common.base.Preconditions;
+import java.util.UUID;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/JobFactory.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/JobFactory.java b/stack/core/src/main/java/org/usergrid/batch/JobFactory.java
index 6154858..a9e6409 100644
--- a/stack/core/src/main/java/org/usergrid/batch/JobFactory.java
+++ b/stack/core/src/main/java/org/usergrid/batch/JobFactory.java
@@ -1,10 +1,10 @@
package org.usergrid.batch;
-import java.util.List;
-
import org.usergrid.batch.repository.JobDescriptor;
+import java.util.List;
+
/**
* It is up to the implementation how many BulkJob instances to return, but this should be controled by the
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/UsergridJobFactory.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/UsergridJobFactory.java b/stack/core/src/main/java/org/usergrid/batch/UsergridJobFactory.java
index 951d10d..0204a6c 100644
--- a/stack/core/src/main/java/org/usergrid/batch/UsergridJobFactory.java
+++ b/stack/core/src/main/java/org/usergrid/batch/UsergridJobFactory.java
@@ -1,15 +1,15 @@
package org.usergrid.batch;
-import java.util.Collections;
-import java.util.List;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.usergrid.batch.repository.JobDescriptor;
+import java.util.Collections;
+import java.util.List;
+
/** @author tnine */
public class UsergridJobFactory implements JobFactory {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/job/OnlyOnceJob.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/job/OnlyOnceJob.java b/stack/core/src/main/java/org/usergrid/batch/job/OnlyOnceJob.java
index 4b1c3c3..a689ad4 100644
--- a/stack/core/src/main/java/org/usergrid/batch/job/OnlyOnceJob.java
+++ b/stack/core/src/main/java/org/usergrid/batch/job/OnlyOnceJob.java
@@ -16,8 +16,6 @@
package org.usergrid.batch.job;
-import java.util.concurrent.TimeUnit;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.usergrid.batch.Job;
@@ -25,6 +23,8 @@ import org.usergrid.batch.JobExecution;
import org.usergrid.locking.Lock;
import org.usergrid.locking.LockManager;
+import java.util.concurrent.TimeUnit;
+
import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/repository/JobAccessor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/repository/JobAccessor.java b/stack/core/src/main/java/org/usergrid/batch/repository/JobAccessor.java
index bc6e7dd..0e91abd 100644
--- a/stack/core/src/main/java/org/usergrid/batch/repository/JobAccessor.java
+++ b/stack/core/src/main/java/org/usergrid/batch/repository/JobAccessor.java
@@ -18,10 +18,10 @@
package org.usergrid.batch.repository;
-import java.util.List;
-
import org.usergrid.batch.JobExecution;
+import java.util.List;
+
public interface JobAccessor {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/repository/JobDescriptor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/repository/JobDescriptor.java b/stack/core/src/main/java/org/usergrid/batch/repository/JobDescriptor.java
index b245a89..e203f24 100644
--- a/stack/core/src/main/java/org/usergrid/batch/repository/JobDescriptor.java
+++ b/stack/core/src/main/java/org/usergrid/batch/repository/JobDescriptor.java
@@ -1,14 +1,13 @@
package org.usergrid.batch.repository;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.utils.Assert;
import org.usergrid.batch.service.JobRuntimeService;
import org.usergrid.persistence.TypedEntity;
import org.usergrid.persistence.entities.JobData;
import org.usergrid.persistence.entities.JobStat;
-import me.prettyprint.cassandra.utils.Assert;
+import java.util.UUID;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/service/App.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/service/App.java b/stack/core/src/main/java/org/usergrid/batch/service/App.java
index ba7eb09..23c1f17 100644
--- a/stack/core/src/main/java/org/usergrid/batch/service/App.java
+++ b/stack/core/src/main/java/org/usergrid/batch/service/App.java
@@ -1,14 +1,13 @@
package org.usergrid.batch.service;
+import com.google.common.base.CharMatcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.context.support.FileSystemXmlApplicationContext;
-import com.google.common.base.CharMatcher;
-
/**
* Entry point for CLI functions of Usergrid batch framework
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/service/JobSchedulerService.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/service/JobSchedulerService.java b/stack/core/src/main/java/org/usergrid/batch/service/JobSchedulerService.java
index c35a9c8..6631167 100644
--- a/stack/core/src/main/java/org/usergrid/batch/service/JobSchedulerService.java
+++ b/stack/core/src/main/java/org/usergrid/batch/service/JobSchedulerService.java
@@ -18,34 +18,23 @@
package org.usergrid.batch.service;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
-
-import com.google.common.util.concurrent.AbstractScheduledService;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningScheduledExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
+import com.google.common.util.concurrent.*;
import com.yammer.metrics.annotation.ExceptionMetered;
import com.yammer.metrics.annotation.Timed;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.usergrid.batch.Job;
-import org.usergrid.batch.JobExecution;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.batch.*;
import org.usergrid.batch.JobExecution.Status;
-import org.usergrid.batch.JobExecutionImpl;
-import org.usergrid.batch.JobFactory;
-import org.usergrid.batch.JobNotFoundException;
import org.usergrid.batch.repository.JobAccessor;
import org.usergrid.batch.repository.JobDescriptor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/service/SchedulerService.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/service/SchedulerService.java b/stack/core/src/main/java/org/usergrid/batch/service/SchedulerService.java
index 92d5161..e711432 100644
--- a/stack/core/src/main/java/org/usergrid/batch/service/SchedulerService.java
+++ b/stack/core/src/main/java/org/usergrid/batch/service/SchedulerService.java
@@ -17,13 +17,13 @@
package org.usergrid.batch.service;
-import java.util.UUID;
-
import org.usergrid.persistence.Query;
import org.usergrid.persistence.Results;
import org.usergrid.persistence.entities.JobData;
import org.usergrid.persistence.entities.JobStat;
+import java.util.UUID;
+
/**
* Simple interface for performing job scheduling
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/service/SchedulerServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/service/SchedulerServiceImpl.java b/stack/core/src/main/java/org/usergrid/batch/service/SchedulerServiceImpl.java
index 0c875f3..9940d6f 100644
--- a/stack/core/src/main/java/org/usergrid/batch/service/SchedulerServiceImpl.java
+++ b/stack/core/src/main/java/org/usergrid/batch/service/SchedulerServiceImpl.java
@@ -17,37 +17,28 @@
package org.usergrid.batch.service;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import javax.annotation.PostConstruct;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
import org.usergrid.batch.JobExecution;
import org.usergrid.batch.JobExecution.Status;
import org.usergrid.batch.JobRuntime;
import org.usergrid.batch.JobRuntimeException;
import org.usergrid.batch.repository.JobAccessor;
import org.usergrid.batch.repository.JobDescriptor;
-import org.usergrid.mq.Message;
-import org.usergrid.mq.QueueManager;
-import org.usergrid.mq.QueueManagerFactory;
-import org.usergrid.mq.QueueQuery;
-import org.usergrid.mq.QueueResults;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.EntityManagerFactory;
+import org.usergrid.mq.*;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.SimpleEntityRef;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.persistence.entities.JobData;
import org.usergrid.persistence.entities.JobStat;
import org.usergrid.persistence.exceptions.TransactionNotFoundException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.Assert;
+import javax.annotation.PostConstruct;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/clustering/hazelcast/HazelcastLifecycleMonitor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/clustering/hazelcast/HazelcastLifecycleMonitor.java b/stack/core/src/main/java/org/usergrid/clustering/hazelcast/HazelcastLifecycleMonitor.java
index 9221fa3..8f73cc6 100644
--- a/stack/core/src/main/java/org/usergrid/clustering/hazelcast/HazelcastLifecycleMonitor.java
+++ b/stack/core/src/main/java/org/usergrid/clustering/hazelcast/HazelcastLifecycleMonitor.java
@@ -16,16 +16,10 @@
package org.usergrid.clustering.hazelcast;
+import com.hazelcast.core.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.hazelcast.core.Hazelcast;
-import com.hazelcast.core.Instance;
-import com.hazelcast.core.InstanceEvent;
-import com.hazelcast.core.InstanceListener;
-import com.hazelcast.core.MembershipEvent;
-import com.hazelcast.core.MembershipListener;
-
public class HazelcastLifecycleMonitor implements InstanceListener, MembershipListener {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/AbstractBatcher.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/AbstractBatcher.java b/stack/core/src/main/java/org/usergrid/count/AbstractBatcher.java
index f682ab3..a7d1624 100644
--- a/stack/core/src/main/java/org/usergrid/count/AbstractBatcher.java
+++ b/stack/core/src/main/java/org/usergrid/count/AbstractBatcher.java
@@ -16,6 +16,12 @@
package org.usergrid.count;
+import com.yammer.metrics.Metrics;
+import com.yammer.metrics.core.Counter;
+import com.yammer.metrics.core.Timer;
+import com.yammer.metrics.core.TimerContext;
+import org.usergrid.count.common.Count;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.concurrent.ArrayBlockingQueue;
@@ -26,12 +32,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import org.usergrid.count.common.Count;
-import com.yammer.metrics.Metrics;
-import com.yammer.metrics.core.Counter;
-import com.yammer.metrics.core.Timer;
-import com.yammer.metrics.core.TimerContext;
-
/**
* Base batcher implementation, handles concurrency and locking throughput throttling.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/BatchSubmitter.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/BatchSubmitter.java b/stack/core/src/main/java/org/usergrid/count/BatchSubmitter.java
index bb44709..3f4e423 100644
--- a/stack/core/src/main/java/org/usergrid/count/BatchSubmitter.java
+++ b/stack/core/src/main/java/org/usergrid/count/BatchSubmitter.java
@@ -16,11 +16,11 @@
package org.usergrid.count;
+import org.usergrid.count.common.Count;
+
import java.util.Collection;
import java.util.concurrent.Future;
-import org.usergrid.count.common.Count;
-
/** @author zznate */
public interface BatchSubmitter {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/CassandraCounterStore.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/CassandraCounterStore.java b/stack/core/src/main/java/org/usergrid/count/CassandraCounterStore.java
index 216d80f..bd3db3b 100644
--- a/stack/core/src/main/java/org/usergrid/count/CassandraCounterStore.java
+++ b/stack/core/src/main/java/org/usergrid/count/CassandraCounterStore.java
@@ -16,22 +16,20 @@
package org.usergrid.count;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.usergrid.count.common.Count;
-
import me.prettyprint.cassandra.model.HCounterColumnImpl;
import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
import me.prettyprint.hector.api.Keyspace;
import me.prettyprint.hector.api.factory.HFactory;
import me.prettyprint.hector.api.mutation.Mutator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.count.common.Count;
+
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/CassandraSubmitter.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/CassandraSubmitter.java b/stack/core/src/main/java/org/usergrid/count/CassandraSubmitter.java
index 8fd6d01..532320c 100644
--- a/stack/core/src/main/java/org/usergrid/count/CassandraSubmitter.java
+++ b/stack/core/src/main/java/org/usergrid/count/CassandraSubmitter.java
@@ -16,20 +16,15 @@
package org.usergrid.count;
-import java.util.Collection;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.usergrid.count.common.Count;
import com.yammer.metrics.Metrics;
import com.yammer.metrics.core.Timer;
import com.yammer.metrics.core.TimerContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.count.common.Count;
+
+import java.util.Collection;
+import java.util.concurrent.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/CounterStore.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/CounterStore.java b/stack/core/src/main/java/org/usergrid/count/CounterStore.java
index afa9678..709ac63 100644
--- a/stack/core/src/main/java/org/usergrid/count/CounterStore.java
+++ b/stack/core/src/main/java/org/usergrid/count/CounterStore.java
@@ -16,10 +16,10 @@
package org.usergrid.count;
-import java.util.Collection;
-
import org.usergrid.count.common.Count;
+import java.util.Collection;
+
/** @author zznate */
public interface CounterStore {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/SimpleBatcher.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/SimpleBatcher.java b/stack/core/src/main/java/org/usergrid/count/SimpleBatcher.java
index bd73466..4e28add 100644
--- a/stack/core/src/main/java/org/usergrid/count/SimpleBatcher.java
+++ b/stack/core/src/main/java/org/usergrid/count/SimpleBatcher.java
@@ -18,7 +18,6 @@ package org.usergrid.count;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import org.usergrid.count.common.Count;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/Slf4JBatchSubmitter.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/Slf4JBatchSubmitter.java b/stack/core/src/main/java/org/usergrid/count/Slf4JBatchSubmitter.java
index 34162f1..5fe98a1 100644
--- a/stack/core/src/main/java/org/usergrid/count/Slf4JBatchSubmitter.java
+++ b/stack/core/src/main/java/org/usergrid/count/Slf4JBatchSubmitter.java
@@ -16,20 +16,15 @@
package org.usergrid.count;
-import java.util.Collection;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.usergrid.count.common.Count;
import com.yammer.metrics.Metrics;
import com.yammer.metrics.core.Timer;
import com.yammer.metrics.core.TimerContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.count.common.Count;
+
+import java.util.Collection;
+import java.util.concurrent.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/common/Count.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/common/Count.java b/stack/core/src/main/java/org/usergrid/count/common/Count.java
index 243ee90..9fb0b12 100644
--- a/stack/core/src/main/java/org/usergrid/count/common/Count.java
+++ b/stack/core/src/main/java/org/usergrid/count/common/Count.java
@@ -16,19 +16,17 @@
package org.usergrid.count.common;
-import java.nio.ByteBuffer;
-
+import me.prettyprint.cassandra.serializers.SerializerTypeInferer;
+import me.prettyprint.cassandra.serializers.StringSerializer;
+import me.prettyprint.hector.api.Serializer;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonProperty;
-import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.lang.StringUtils;
-
-import me.prettyprint.cassandra.serializers.SerializerTypeInferer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.hector.api.Serializer;
+import java.nio.ByteBuffer;
import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/common/CountSerDeUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/common/CountSerDeUtils.java b/stack/core/src/main/java/org/usergrid/count/common/CountSerDeUtils.java
index 719c0cc..63ad66a 100644
--- a/stack/core/src/main/java/org/usergrid/count/common/CountSerDeUtils.java
+++ b/stack/core/src/main/java/org/usergrid/count/common/CountSerDeUtils.java
@@ -16,12 +16,12 @@
package org.usergrid.count.common;
-import java.io.IOException;
-
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonMethod;
import org.codehaus.jackson.map.ObjectMapper;
+import java.io.IOException;
+
/** @author zznate */
public class CountSerDeUtils {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/Lock.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/Lock.java b/stack/core/src/main/java/org/usergrid/locking/Lock.java
index 01bd471..99dc13c 100644
--- a/stack/core/src/main/java/org/usergrid/locking/Lock.java
+++ b/stack/core/src/main/java/org/usergrid/locking/Lock.java
@@ -16,10 +16,10 @@
package org.usergrid.locking;
-import java.util.concurrent.TimeUnit;
-
import org.usergrid.locking.exception.UGLockException;
+import java.util.concurrent.TimeUnit;
+
/**
* The lock object to acquire
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/LockHelper.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/LockHelper.java b/stack/core/src/main/java/org/usergrid/locking/LockHelper.java
index 47c1c61..b5b576a 100644
--- a/stack/core/src/main/java/org/usergrid/locking/LockHelper.java
+++ b/stack/core/src/main/java/org/usergrid/locking/LockHelper.java
@@ -16,12 +16,11 @@
package org.usergrid.locking;
-import java.util.UUID;
-
+import org.apache.commons.codec.binary.Hex;
import org.usergrid.locking.exception.UGLockException;
import org.usergrid.locking.noop.NoOpLockImpl;
-import org.apache.commons.codec.binary.Hex;
+import java.util.UUID;
import static org.usergrid.locking.LockPathBuilder.buildPath;
import static org.usergrid.utils.ConversionUtils.bytes;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/LockManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/LockManager.java b/stack/core/src/main/java/org/usergrid/locking/LockManager.java
index cd023b8..77c3efe 100644
--- a/stack/core/src/main/java/org/usergrid/locking/LockManager.java
+++ b/stack/core/src/main/java/org/usergrid/locking/LockManager.java
@@ -16,10 +16,10 @@
package org.usergrid.locking;
-import java.util.UUID;
-
import org.usergrid.locking.exception.UGLockException;
+import java.util.UUID;
+
/**
* This Interface to a class responsible for distributed lock across system.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockImpl.java b/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockImpl.java
index af69781..784a70e 100644
--- a/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockImpl.java
+++ b/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockImpl.java
@@ -16,15 +16,14 @@
package org.usergrid.locking.cassandra;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.usergrid.locking.Lock;
-import org.usergrid.locking.exception.UGLockException;
-
import me.prettyprint.hector.api.locking.HLock;
import me.prettyprint.hector.api.locking.HLockManager;
import me.prettyprint.hector.api.locking.HLockTimeoutException;
+import org.usergrid.locking.Lock;
+import org.usergrid.locking.exception.UGLockException;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockManagerImpl.java b/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockManagerImpl.java
index 9d8e9a7..1339a1a 100644
--- a/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockManagerImpl.java
+++ b/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockManagerImpl.java
@@ -16,21 +16,19 @@
package org.usergrid.locking.cassandra;
-import java.util.UUID;
-
-import javax.annotation.PostConstruct;
-
import me.prettyprint.cassandra.locking.HLockManagerImpl;
import me.prettyprint.hector.api.Cluster;
import me.prettyprint.hector.api.ConsistencyLevelPolicy;
import me.prettyprint.hector.api.locking.HLockManager;
import me.prettyprint.hector.api.locking.HLockManagerConfigurator;
-
import org.springframework.util.Assert;
import org.usergrid.locking.Lock;
import org.usergrid.locking.LockManager;
import org.usergrid.locking.LockPathBuilder;
+import javax.annotation.PostConstruct;
+import java.util.UUID;
+
/**
* Uses the hector based locking implementation to obtain locks
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockImpl.java b/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockImpl.java
index 4af8bd9..32015a8 100644
--- a/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockImpl.java
+++ b/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockImpl.java
@@ -16,11 +16,11 @@
package org.usergrid.locking.noop;
-import java.util.concurrent.TimeUnit;
-
import org.usergrid.locking.Lock;
import org.usergrid.locking.exception.UGLockException;
+import java.util.concurrent.TimeUnit;
+
/** @author tnine */
public class NoOpLockImpl implements Lock {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockManagerImpl.java b/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockManagerImpl.java
index e451228..0ed7ded 100644
--- a/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockManagerImpl.java
+++ b/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockManagerImpl.java
@@ -16,11 +16,11 @@
package org.usergrid.locking.noop;
-import java.util.UUID;
-
import org.usergrid.locking.Lock;
import org.usergrid.locking.LockManager;
+import java.util.UUID;
+
/** This is a no-op manager used for testing. */
public class NoOpLockManagerImpl implements LockManager {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockImpl.java b/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockImpl.java
index 56e0f9f..c693bdc 100644
--- a/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockImpl.java
+++ b/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockImpl.java
@@ -16,12 +16,12 @@
package org.usergrid.locking.singlenode;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.ReentrantLock;
-
import org.usergrid.locking.Lock;
import org.usergrid.locking.exception.UGLockException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
+
/** @author tnine */
public class SingleNodeLockImpl implements Lock {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockManagerImpl.java b/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockManagerImpl.java
index acf53bb..8d5c1ca 100644
--- a/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockManagerImpl.java
+++ b/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockManagerImpl.java
@@ -16,22 +16,17 @@
package org.usergrid.locking.singlenode;
-import java.util.UUID;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.ReentrantLock;
-
+import com.google.common.cache.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.locking.Lock;
import org.usergrid.locking.LockManager;
import org.usergrid.locking.LockPathBuilder;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.cache.RemovalListener;
-import com.google.common.cache.RemovalNotification;
+import java.util.UUID;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZooKeeperLockManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZooKeeperLockManagerImpl.java b/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZooKeeperLockManagerImpl.java
index 96b599f..3be836b 100644
--- a/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZooKeeperLockManagerImpl.java
+++ b/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZooKeeperLockManagerImpl.java
@@ -16,21 +16,19 @@
package org.usergrid.locking.zookeeper;
-import java.util.UUID;
-
-import javax.annotation.PostConstruct;
-
+import com.netflix.curator.RetryPolicy;
+import com.netflix.curator.framework.CuratorFramework;
+import com.netflix.curator.framework.CuratorFrameworkFactory;
+import com.netflix.curator.framework.recipes.locks.InterProcessMutex;
+import com.netflix.curator.retry.ExponentialBackoffRetry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.locking.Lock;
import org.usergrid.locking.LockManager;
import org.usergrid.locking.LockPathBuilder;
-import com.netflix.curator.RetryPolicy;
-import com.netflix.curator.framework.CuratorFramework;
-import com.netflix.curator.framework.CuratorFrameworkFactory;
-import com.netflix.curator.framework.recipes.locks.InterProcessMutex;
-import com.netflix.curator.retry.ExponentialBackoffRetry;
+import javax.annotation.PostConstruct;
+import java.util.UUID;
/** Implementation for Zookeeper service that handles global locks. */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZookeeperLockImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZookeeperLockImpl.java b/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZookeeperLockImpl.java
index 1e33422..838825f 100644
--- a/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZookeeperLockImpl.java
+++ b/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZookeeperLockImpl.java
@@ -16,12 +16,11 @@
package org.usergrid.locking.zookeeper;
-import java.util.concurrent.TimeUnit;
-
+import com.netflix.curator.framework.recipes.locks.InterProcessMutex;
import org.usergrid.locking.Lock;
import org.usergrid.locking.exception.UGLockException;
-import com.netflix.curator.framework.recipes.locks.InterProcessMutex;
+import java.util.concurrent.TimeUnit;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/CounterQuery.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/CounterQuery.java b/stack/core/src/main/java/org/usergrid/mq/CounterQuery.java
index adb5cd1..3958f64 100644
--- a/stack/core/src/main/java/org/usergrid/mq/CounterQuery.java
+++ b/stack/core/src/main/java/org/usergrid/mq/CounterQuery.java
@@ -16,21 +16,18 @@
package org.usergrid.mq;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.mq.Query.CounterFilterPredicate;
import org.usergrid.persistence.CounterResolution;
import org.usergrid.utils.JsonUtils;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
import static org.usergrid.utils.ClassUtils.cast;
-import static org.usergrid.utils.ListUtils.firstBoolean;
-import static org.usergrid.utils.ListUtils.firstInteger;
-import static org.usergrid.utils.ListUtils.firstLong;
-import static org.usergrid.utils.ListUtils.isEmpty;
+import static org.usergrid.utils.ListUtils.*;
import static org.usergrid.utils.MapUtils.toMapList;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/Message.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/Message.java b/stack/core/src/main/java/org/usergrid/mq/Message.java
index 644f9b4..cc89648 100644
--- a/stack/core/src/main/java/org/usergrid/mq/Message.java
+++ b/stack/core/src/main/java/org/usergrid/mq/Message.java
@@ -16,19 +16,7 @@
package org.usergrid.mq;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.TreeMap;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
+import com.fasterxml.uuid.UUIDComparator;
import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonIgnore;
@@ -36,26 +24,16 @@ import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
import org.usergrid.utils.UUIDUtils;
-import com.fasterxml.uuid.UUIDComparator;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.*;
+import java.util.Map.Entry;
import static org.apache.commons.collections.IteratorUtils.asEnumeration;
-import static org.apache.commons.collections.MapUtils.getBooleanValue;
-import static org.apache.commons.collections.MapUtils.getByteValue;
-import static org.apache.commons.collections.MapUtils.getDoubleValue;
-import static org.apache.commons.collections.MapUtils.getFloatValue;
-import static org.apache.commons.collections.MapUtils.getIntValue;
-import static org.apache.commons.collections.MapUtils.getLongValue;
-import static org.apache.commons.collections.MapUtils.getShortValue;
-import static org.apache.commons.collections.MapUtils.getString;
+import static org.apache.commons.collections.MapUtils.*;
import static org.usergrid.utils.ClassUtils.cast;
-import static org.usergrid.utils.ConversionUtils.bytes;
-import static org.usergrid.utils.ConversionUtils.coerceMap;
-import static org.usergrid.utils.ConversionUtils.getInt;
-import static org.usergrid.utils.ConversionUtils.uuid;
+import static org.usergrid.utils.ConversionUtils.*;
import static org.usergrid.utils.MapUtils.hashMap;
-import static org.usergrid.utils.UUIDUtils.getTimestampInMillis;
-import static org.usergrid.utils.UUIDUtils.isTimeBased;
-import static org.usergrid.utils.UUIDUtils.newTimeUUID;
+import static org.usergrid.utils.UUIDUtils.*;
@XmlRootElement
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/Query.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/Query.java b/stack/core/src/main/java/org/usergrid/mq/Query.java
index cf1e39c..9439586 100644
--- a/stack/core/src/main/java/org/usergrid/mq/Query.java
+++ b/stack/core/src/main/java/org/usergrid/mq/Query.java
@@ -16,23 +16,9 @@
package org.usergrid.mq;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.EnumSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-
import org.antlr.runtime.ANTLRStringStream;
import org.antlr.runtime.CommonTokenStream;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.CounterResolution;
@@ -42,7 +28,10 @@ import org.usergrid.persistence.Results;
import org.usergrid.persistence.Results.Level;
import org.usergrid.utils.JsonUtils;
-import org.apache.commons.lang.StringUtils;
+import java.io.Serializable;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
import static org.apache.commons.codec.binary.Base64.decodeBase64;
import static org.apache.commons.lang.StringUtils.isBlank;
@@ -51,12 +40,7 @@ import static org.usergrid.persistence.Schema.PROPERTY_TYPE;
import static org.usergrid.persistence.Schema.PROPERTY_UUID;
import static org.usergrid.utils.ClassUtils.cast;
import static org.usergrid.utils.ConversionUtils.uuid;
-import static org.usergrid.utils.ListUtils.first;
-import static org.usergrid.utils.ListUtils.firstBoolean;
-import static org.usergrid.utils.ListUtils.firstInteger;
-import static org.usergrid.utils.ListUtils.firstLong;
-import static org.usergrid.utils.ListUtils.firstUuid;
-import static org.usergrid.utils.ListUtils.isEmpty;
+import static org.usergrid.utils.ListUtils.*;
import static org.usergrid.utils.MapUtils.toMapList;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/QueryFilterLexer.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueryFilterLexer.java b/stack/core/src/main/java/org/usergrid/mq/QueryFilterLexer.java
index a7eccd7..5b6f339 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueryFilterLexer.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueryFilterLexer.java
@@ -3,15 +3,7 @@
package org.usergrid.mq;
-import org.antlr.runtime.BaseRecognizer;
-import org.antlr.runtime.CharStream;
-import org.antlr.runtime.DFA;
-import org.antlr.runtime.EarlyExitException;
-import org.antlr.runtime.Lexer;
-import org.antlr.runtime.MismatchedSetException;
-import org.antlr.runtime.NoViableAltException;
-import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.RecognizerSharedState;
+import org.antlr.runtime.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/QueryFilterParser.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueryFilterParser.java b/stack/core/src/main/java/org/usergrid/mq/QueryFilterParser.java
index dea193b..60c6423 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueryFilterParser.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueryFilterParser.java
@@ -3,15 +3,7 @@
package org.usergrid.mq;
-import org.antlr.runtime.BitSet;
-import org.antlr.runtime.MismatchedSetException;
-import org.antlr.runtime.NoViableAltException;
-import org.antlr.runtime.Parser;
-import org.antlr.runtime.ParserRuleReturnScope;
-import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.RecognizerSharedState;
-import org.antlr.runtime.Token;
-import org.antlr.runtime.TokenStream;
+import org.antlr.runtime.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.mq.Query.FilterPredicate;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/QueryProcessor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueryProcessor.java b/stack/core/src/main/java/org/usergrid/mq/QueryProcessor.java
index 16e3afc..87c9643 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueryProcessor.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueryProcessor.java
@@ -1,14 +1,7 @@
package org.usergrid.mq;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Set;
-
+import org.apache.commons.collections.comparators.ComparatorChain;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.mq.Query.FilterOperator;
@@ -20,15 +13,12 @@ import org.usergrid.utils.ListUtils;
import org.usergrid.utils.NumberUtils;
import org.usergrid.utils.StringUtils;
-import org.apache.commons.collections.comparators.ComparatorChain;
+import java.nio.ByteBuffer;
+import java.util.*;
import static java.lang.Integer.parseInt;
-
import static org.apache.commons.codec.binary.Base64.decodeBase64;
-import static org.apache.commons.lang.StringUtils.isBlank;
-import static org.apache.commons.lang.StringUtils.isNotBlank;
-import static org.apache.commons.lang.StringUtils.removeEnd;
-import static org.apache.commons.lang.StringUtils.split;
+import static org.apache.commons.lang.StringUtils.*;
import static org.usergrid.mq.Query.SortDirection.DESCENDING;
import static org.usergrid.persistence.cassandra.IndexUpdate.indexValueCode;
import static org.usergrid.persistence.cassandra.IndexUpdate.toIndexableValue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/Queue.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/Queue.java b/stack/core/src/main/java/org/usergrid/mq/Queue.java
index deb5745..af75ead 100644
--- a/stack/core/src/main/java/org/usergrid/mq/Queue.java
+++ b/stack/core/src/main/java/org/usergrid/mq/Queue.java
@@ -16,27 +16,18 @@
package org.usergrid.mq;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.UUID;
-
+import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.usergrid.utils.UUIDUtils;
-import org.apache.commons.lang.StringUtils;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.UUID;
import static java.util.UUID.nameUUIDFromBytes;
-
-import static org.apache.commons.collections.MapUtils.getBooleanValue;
-import static org.apache.commons.collections.MapUtils.getByteValue;
-import static org.apache.commons.collections.MapUtils.getDoubleValue;
-import static org.apache.commons.collections.MapUtils.getFloatValue;
-import static org.apache.commons.collections.MapUtils.getIntValue;
-import static org.apache.commons.collections.MapUtils.getLongValue;
-import static org.apache.commons.collections.MapUtils.getShortValue;
-import static org.apache.commons.collections.MapUtils.getString;
+import static org.apache.commons.collections.MapUtils.*;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/QueueManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueueManager.java b/stack/core/src/main/java/org/usergrid/mq/QueueManager.java
index a656425..4ba0a61 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueueManager.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueueManager.java
@@ -16,15 +16,15 @@
package org.usergrid.mq;
+import org.usergrid.persistence.CounterResolution;
+import org.usergrid.persistence.Results;
+import org.usergrid.persistence.exceptions.TransactionNotFoundException;
+
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
-import org.usergrid.persistence.CounterResolution;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.exceptions.TransactionNotFoundException;
-
public interface QueueManager {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/QueueQuery.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueueQuery.java b/stack/core/src/main/java/org/usergrid/mq/QueueQuery.java
index a689437..f5d6b86 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueueQuery.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueueQuery.java
@@ -16,14 +16,13 @@
package org.usergrid.mq;
+import org.usergrid.utils.ConversionUtils;
+
import java.util.List;
import java.util.Map;
import java.util.UUID;
-import org.usergrid.utils.ConversionUtils;
-
import static java.util.UUID.nameUUIDFromBytes;
-
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.usergrid.utils.ConversionUtils.getLong;
import static org.usergrid.utils.ListUtils.first;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/QueueResults.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueueResults.java b/stack/core/src/main/java/org/usergrid/mq/QueueResults.java
index f150cad..1cda104 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueueResults.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueueResults.java
@@ -16,15 +16,14 @@
package org.usergrid.mq;
+import org.codehaus.jackson.map.annotate.JsonSerialize;
+import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
+import javax.xml.bind.annotation.XmlRootElement;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
-
@XmlRootElement
public class QueueResults {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/QueueSet.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueueSet.java b/stack/core/src/main/java/org/usergrid/mq/QueueSet.java
index b1fc63d..63e31c7 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueueSet.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueueSet.java
@@ -16,17 +16,12 @@
package org.usergrid.mq;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.*;
+
@XmlRootElement
public class QueueSet {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/CassandraMQUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/CassandraMQUtils.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/CassandraMQUtils.java
index 266a15d..4d6cf42 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/CassandraMQUtils.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/CassandraMQUtils.java
@@ -16,13 +16,9 @@
package org.usergrid.mq.cassandra;
-import java.nio.ByteBuffer;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.*;
+import me.prettyprint.hector.api.beans.HColumn;
+import me.prettyprint.hector.api.mutation.Mutator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.mq.Message;
@@ -32,26 +28,18 @@ import org.usergrid.utils.ConversionUtils;
import org.usergrid.utils.JsonUtils;
import org.usergrid.utils.UUIDUtils;
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.cassandra.serializers.BytesArraySerializer;
-import me.prettyprint.cassandra.serializers.DynamicCompositeSerializer;
-import me.prettyprint.cassandra.serializers.LongSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.mutation.Mutator;
+import java.nio.ByteBuffer;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.UUID;
import static me.prettyprint.hector.api.factory.HFactory.createColumn;
-import static org.usergrid.mq.Message.MESSAGE_ID;
-import static org.usergrid.mq.Message.MESSAGE_PROPERTIES;
-import static org.usergrid.mq.Message.MESSAGE_TYPE;
-import static org.usergrid.mq.Queue.QUEUE_NEWEST;
-import static org.usergrid.mq.Queue.QUEUE_OLDEST;
-import static org.usergrid.mq.Queue.QUEUE_PROPERTIES;
+import static org.usergrid.mq.Message.*;
+import static org.usergrid.mq.Queue.*;
import static org.usergrid.mq.QueuePosition.CONSUMER;
-import static org.usergrid.utils.ConversionUtils.bytebuffer;
-import static org.usergrid.utils.ConversionUtils.getLong;
-import static org.usergrid.utils.ConversionUtils.object;
+import static org.usergrid.utils.ConversionUtils.*;
public class CassandraMQUtils {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/MessageIndexUpdate.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/MessageIndexUpdate.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/MessageIndexUpdate.java
index 8626174..30aff4d 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/MessageIndexUpdate.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/MessageIndexUpdate.java
@@ -16,6 +16,11 @@
package org.usergrid.mq.cassandra;
+import me.prettyprint.cassandra.serializers.*;
+import me.prettyprint.hector.api.beans.DynamicComposite;
+import me.prettyprint.hector.api.mutation.Mutator;
+import org.usergrid.mq.Message;
+
import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.List;
@@ -23,22 +28,9 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
-import org.usergrid.mq.Message;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.cassandra.serializers.BytesArraySerializer;
-import me.prettyprint.cassandra.serializers.DynamicCompositeSerializer;
-import me.prettyprint.cassandra.serializers.LongSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.mutation.Mutator;
-
import static me.prettyprint.hector.api.factory.HFactory.createColumn;
import static org.usergrid.mq.Message.MESSAGE_PROPERTIES;
-import static org.usergrid.mq.cassandra.QueueIndexUpdate.indexValueCode;
-import static org.usergrid.mq.cassandra.QueueIndexUpdate.validIndexableValue;
-import static org.usergrid.mq.cassandra.QueueIndexUpdate.validIndexableValueOrJson;
+import static org.usergrid.mq.cassandra.QueueIndexUpdate.*;
import static org.usergrid.mq.cassandra.QueueManagerImpl.DICTIONARY_MESSAGE_INDEXES;
import static org.usergrid.mq.cassandra.QueuesCF.PROPERTY_INDEX;
import static org.usergrid.mq.cassandra.QueuesCF.QUEUE_DICTIONARIES;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueIndexUpdate.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueIndexUpdate.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueIndexUpdate.java
index e1c31a0..59d790c 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueIndexUpdate.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueIndexUpdate.java
@@ -16,26 +16,17 @@
package org.usergrid.mq.cassandra;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import org.codehaus.jackson.JsonNode;
-
import com.fasterxml.uuid.UUIDComparator;
-
import me.prettyprint.hector.api.beans.DynamicComposite;
import me.prettyprint.hector.api.mutation.Mutator;
+import org.codehaus.jackson.JsonNode;
-import static java.nio.ByteBuffer.wrap;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.util.*;
+import static java.nio.ByteBuffer.wrap;
import static org.usergrid.utils.JsonUtils.toJsonNode;
import static org.usergrid.utils.UUIDUtils.getTimestampInMicros;
[08/23] organize imports only
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/filters/ContentTypeFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/filters/ContentTypeFilter.java b/stack/rest/src/main/java/org/usergrid/rest/filters/ContentTypeFilter.java
index 38704a8..95c1d2e 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/filters/ContentTypeFilter.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/filters/ContentTypeFilter.java
@@ -16,34 +16,18 @@
package org.usergrid.rest.filters;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PushbackInputStream;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.Assert;
+
+import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import javax.ws.rs.HttpMethod;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.util.Assert;
+import java.io.*;
+import java.util.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/filters/JSONPCallbackFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/filters/JSONPCallbackFilter.java b/stack/rest/src/main/java/org/usergrid/rest/filters/JSONPCallbackFilter.java
index 12a94ab..1903bf8 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/filters/JSONPCallbackFilter.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/filters/JSONPCallbackFilter.java
@@ -16,15 +16,14 @@
package org.usergrid.rest.filters;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-
+import com.sun.jersey.spi.container.ContainerRequest;
+import com.sun.jersey.spi.container.ContainerRequestFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerRequestFilter;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Context;
import static org.apache.commons.lang.StringUtils.isNotBlank;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/filters/MeteringFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/filters/MeteringFilter.java b/stack/rest/src/main/java/org/usergrid/rest/filters/MeteringFilter.java
index ca0e264..bff0bad 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/filters/MeteringFilter.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/filters/MeteringFilter.java
@@ -16,20 +16,11 @@
package org.usergrid.rest.filters;
-import java.io.FilterInputStream;
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-
+import com.sun.jersey.spi.container.*;
+import com.yammer.metrics.Metrics;
+import com.yammer.metrics.core.Counter;
+import com.yammer.metrics.core.Timer;
+import com.yammer.metrics.core.TimerContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,15 +31,14 @@ import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.services.ServiceManagerFactory;
import org.usergrid.system.UsergridSystemMonitor;
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerRequestFilter;
-import com.sun.jersey.spi.container.ContainerResponse;
-import com.sun.jersey.spi.container.ContainerResponseFilter;
-import com.sun.jersey.spi.container.ContainerResponseWriter;
-import com.yammer.metrics.Metrics;
-import com.yammer.metrics.core.Counter;
-import com.yammer.metrics.core.Timer;
-import com.yammer.metrics.core.TimerContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Context;
+import java.io.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
@Component
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/filters/TracingFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/filters/TracingFilter.java b/stack/rest/src/main/java/org/usergrid/rest/filters/TracingFilter.java
index b0fe1d0..6f7f9c4 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/filters/TracingFilter.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/filters/TracingFilter.java
@@ -1,9 +1,10 @@
package org.usergrid.rest.filters;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-
+import com.sun.jersey.spi.container.ContainerRequest;
+import com.sun.jersey.spi.container.ContainerRequestFilter;
+import com.sun.jersey.spi.container.ContainerResponse;
+import com.sun.jersey.spi.container.ContainerResponseFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -13,10 +14,8 @@ import org.usergrid.persistence.cassandra.util.TraceTagManager;
import org.usergrid.persistence.cassandra.util.TraceTagReporter;
import org.usergrid.utils.StringUtils;
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerRequestFilter;
-import com.sun.jersey.spi.container.ContainerResponse;
-import com.sun.jersey.spi.container.ContainerResponseFilter;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Context;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/management/ManagementResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/ManagementResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/ManagementResource.java
index 9b1fc65..0a1f986 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/ManagementResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/ManagementResource.java
@@ -16,23 +16,13 @@
package org.usergrid.rest.management;
-import java.net.URLEncoder;
-import java.util.Map;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.view.Viewable;
+import org.apache.amber.oauth2.common.error.OAuthError;
+import org.apache.amber.oauth2.common.exception.OAuthProblemException;
+import org.apache.amber.oauth2.common.message.OAuthResponse;
+import org.apache.amber.oauth2.common.message.types.GrantType;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.codec.Base64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -48,22 +38,16 @@ import org.usergrid.rest.management.users.UsersResource;
import org.usergrid.security.oauth.AccessInfo;
import org.usergrid.security.shiro.utils.SubjectUtils;
-import org.apache.amber.oauth2.common.error.OAuthError;
-import org.apache.amber.oauth2.common.exception.OAuthProblemException;
-import org.apache.amber.oauth2.common.message.OAuthResponse;
-import org.apache.amber.oauth2.common.message.types.GrantType;
-import org.apache.commons.lang.StringUtils;
-import org.apache.shiro.codec.Base64;
-
-import com.sun.jersey.api.view.Viewable;
-
-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
-import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
-import static javax.servlet.http.HttpServletResponse.SC_OK;
-import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+import java.net.URLEncoder;
+import java.util.Map;
+import static javax.servlet.http.HttpServletResponse.*;
+import static javax.ws.rs.core.MediaType.*;
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.usergrid.utils.JsonUtils.mapToJsonString;
import static org.usergrid.utils.StringUtils.stringOrSubstringAfterFirst;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/management/metrics/MetricsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/metrics/MetricsResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/metrics/MetricsResource.java
index 4e47aa1..609dee7 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/metrics/MetricsResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/metrics/MetricsResource.java
@@ -1,6 +1,12 @@
package org.usergrid.rest.management.metrics;
+import com.sun.jersey.api.json.JSONWithPadding;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+import org.usergrid.rest.AbstractContextResource;
+import org.usergrid.rest.ApiResponse;
+
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
@@ -8,13 +14,6 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.UriInfo;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-import org.usergrid.rest.AbstractContextResource;
-import org.usergrid.rest.ApiResponse;
-
-import com.sun.jersey.api.json.JSONWithPadding;
-
/** @author zznate */
@Component("org.usergrid.rest.management.metrics.MetricsResource")
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationResource.java
index 2d92936..f83772d 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationResource.java
@@ -16,20 +16,8 @@
package org.usergrid.rest.management.organizations;
-import java.util.Map;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.api.view.Viewable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -46,8 +34,11 @@ import org.usergrid.security.oauth.ClientCredentialsInfo;
import org.usergrid.security.tokens.exceptions.TokenException;
import org.usergrid.services.ServiceResults;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.api.view.Viewable;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.Map;
@Component("org.usergrid.rest.management.organizations.OrganizationResource")
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationsResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationsResource.java
index 519d150..5f89b8b 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationsResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationsResource.java
@@ -16,21 +16,9 @@
package org.usergrid.rest.management.organizations;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.google.common.base.Preconditions;
+import com.sun.jersey.api.json.JSONWithPadding;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -45,10 +33,12 @@ import org.usergrid.rest.ApiResponse;
import org.usergrid.rest.RootResource;
import org.usergrid.rest.security.annotations.RequireOrganizationAccess;
-import org.apache.commons.lang.StringUtils;
-
-import com.google.common.base.Preconditions;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.Map;
+import java.util.UUID;
@Component( "org.usergrid.rest.management.organizations.OrganizationsResource" )
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationResource.java
index 48b9f60..9921a53 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationResource.java
@@ -16,21 +16,9 @@
package org.usergrid.rest.management.organizations.applications;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.google.common.base.Preconditions;
+import com.sun.jersey.api.json.JSONWithPadding;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
@@ -44,10 +32,12 @@ import org.usergrid.security.providers.SignInAsProvider;
import org.usergrid.security.providers.SignInProviderFactory;
import org.usergrid.services.ServiceManager;
-import org.apache.commons.lang.StringUtils;
-
-import com.google.common.base.Preconditions;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.Map;
+import java.util.UUID;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationsResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationsResource.java
index 40edbb9..c20d4ad 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationsResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationsResource.java
@@ -16,23 +16,9 @@
package org.usergrid.rest.management.organizations.applications;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.google.common.base.Preconditions;
+import com.google.common.collect.BiMap;
+import com.sun.jersey.api.json.JSONWithPadding;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -45,9 +31,13 @@ import org.usergrid.rest.ApiResponse;
import org.usergrid.rest.RootResource;
import org.usergrid.rest.security.annotations.RequireOrganizationAccess;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.BiMap;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
import static org.apache.commons.lang.StringUtils.isEmpty;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/management/organizations/users/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/users/UsersResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/users/UsersResource.java
index f7c09ea..a42b19c 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/users/UsersResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/users/UsersResource.java
@@ -16,26 +16,7 @@
package org.usergrid.rest.management.organizations.users;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -49,7 +30,14 @@ import org.usergrid.rest.RootResource;
import org.usergrid.rest.security.annotations.RequireOrganizationAccess;
import org.usergrid.security.shiro.utils.SubjectUtils;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
import static org.apache.commons.collections.MapUtils.getObject;
import static org.usergrid.rest.exceptions.SecurityException.mappableSecurityException;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/management/users/UserResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/users/UserResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/users/UserResource.java
index eea49aa..40e1488 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/users/UserResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/users/UserResource.java
@@ -16,22 +16,10 @@
package org.usergrid.rest.management.users;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.api.view.Viewable;
+import net.tanesha.recaptcha.ReCaptchaImpl;
+import net.tanesha.recaptcha.ReCaptchaResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -47,11 +35,12 @@ import org.usergrid.security.shiro.utils.SubjectUtils;
import org.usergrid.security.tokens.exceptions.TokenException;
import org.usergrid.services.ServiceResults;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.api.view.Viewable;
-
-import net.tanesha.recaptcha.ReCaptchaImpl;
-import net.tanesha.recaptcha.ReCaptchaResponse;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.Map;
+import java.util.UUID;
import static org.usergrid.security.shiro.utils.SubjectUtils.isServiceAdmin;
import static org.usergrid.utils.ConversionUtils.string;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/management/users/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/users/UsersResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/users/UsersResource.java
index fe04134..d1b4948 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/users/UsersResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/users/UsersResource.java
@@ -16,23 +16,10 @@
package org.usergrid.rest.management.users;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.api.view.Viewable;
+import net.tanesha.recaptcha.ReCaptchaImpl;
+import net.tanesha.recaptcha.ReCaptchaResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
@@ -44,11 +31,13 @@ import org.usergrid.rest.exceptions.AuthErrorInfo;
import org.usergrid.rest.exceptions.RedirectionException;
import org.usergrid.security.shiro.utils.SubjectUtils;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.api.view.Viewable;
-
-import net.tanesha.recaptcha.ReCaptchaImpl;
-import net.tanesha.recaptcha.ReCaptchaResponse;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
import static org.apache.commons.lang.StringUtils.isBlank;
import static org.usergrid.rest.exceptions.SecurityException.mappableSecurityException;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/management/users/organizations/OrganizationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/users/organizations/OrganizationsResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/users/organizations/OrganizationsResource.java
index 2f40f67..8851f04 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/users/organizations/OrganizationsResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/users/organizations/OrganizationsResource.java
@@ -16,24 +16,8 @@
package org.usergrid.rest.management.users.organizations;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.google.common.collect.BiMap;
+import com.sun.jersey.api.json.JSONWithPadding;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.usergrid.management.OrganizationInfo;
@@ -46,8 +30,12 @@ import org.usergrid.rest.security.annotations.RequireAdminUserAccess;
import org.usergrid.rest.security.annotations.RequireOrganizationAccess;
import org.usergrid.security.shiro.utils.SubjectUtils;
-import com.google.common.collect.BiMap;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.Map;
+import java.util.UUID;
@Component( "org.usergrid.rest.management.users.organizations.OrganizationsResource" )
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/organizations/OrganizationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/organizations/OrganizationResource.java b/stack/rest/src/main/java/org/usergrid/rest/organizations/OrganizationResource.java
index deda09a..3082347 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/organizations/OrganizationResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/organizations/OrganizationResource.java
@@ -1,18 +1,9 @@
package org.usergrid.rest.organizations;
-import java.util.UUID;
-
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.google.common.collect.BiMap;
+import com.sun.jersey.api.json.JSONWithPadding;
+import org.apache.shiro.authz.UnauthorizedException;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.usergrid.exception.NotImplementedException;
@@ -26,10 +17,11 @@ import org.usergrid.rest.security.annotations.RequireOrganizationAccess;
import org.usergrid.rest.utils.PathingUtils;
import org.usergrid.security.shiro.utils.SubjectUtils;
-import org.apache.shiro.authz.UnauthorizedException;
-
-import com.google.common.collect.BiMap;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.UUID;
import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/security/CrossOriginRequestFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/security/CrossOriginRequestFilter.java b/stack/rest/src/main/java/org/usergrid/rest/security/CrossOriginRequestFilter.java
index ddd4dd1..24b75e3 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/security/CrossOriginRequestFilter.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/security/CrossOriginRequestFilter.java
@@ -16,13 +16,12 @@
package org.usergrid.rest.security;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.rest.utils.CORSUtils;
-
import com.sun.jersey.spi.container.ContainerRequest;
import com.sun.jersey.spi.container.ContainerResponse;
import com.sun.jersey.spi.container.ContainerResponseFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.rest.utils.CORSUtils;
public class CrossOriginRequestFilter implements ContainerResponseFilter {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/security/SecuredResourceFilterFactory.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/security/SecuredResourceFilterFactory.java b/stack/rest/src/main/java/org/usergrid/rest/security/SecuredResourceFilterFactory.java
index 78366c8..d55c5c2 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/security/SecuredResourceFilterFactory.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/security/SecuredResourceFilterFactory.java
@@ -16,15 +16,8 @@
package org.usergrid.rest.security;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.model.AbstractMethod;
+import com.sun.jersey.spi.container.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -43,19 +36,17 @@ import org.usergrid.rest.utils.PathingUtils;
import org.usergrid.security.shiro.utils.SubjectUtils;
import org.usergrid.services.ServiceManagerFactory;
-import com.sun.jersey.api.model.AbstractMethod;
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerRequestFilter;
-import com.sun.jersey.spi.container.ContainerResponseFilter;
-import com.sun.jersey.spi.container.ResourceFilter;
-import com.sun.jersey.spi.container.ResourceFilterFactory;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.UriInfo;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
import static org.apache.commons.lang.StringUtils.isNotEmpty;
import static org.usergrid.rest.exceptions.SecurityException.mappableSecurityException;
-import static org.usergrid.security.shiro.utils.SubjectUtils.isPermittedAccessToApplication;
-import static org.usergrid.security.shiro.utils.SubjectUtils.isPermittedAccessToOrganization;
-import static org.usergrid.security.shiro.utils.SubjectUtils.isUser;
-import static org.usergrid.security.shiro.utils.SubjectUtils.loginApplicationGuest;
+import static org.usergrid.security.shiro.utils.SubjectUtils.*;
@Component
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/security/shiro/RestSecurityManager.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/RestSecurityManager.java b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/RestSecurityManager.java
index 1f1c391..17d2a43 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/RestSecurityManager.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/RestSecurityManager.java
@@ -16,15 +16,14 @@
package org.usergrid.rest.security.shiro;
-import java.util.Collection;
-
+import org.apache.shiro.realm.Realm;
+import org.apache.shiro.session.mgt.SessionManager;
+import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.rest.security.shiro.session.HttpRequestSessionManager;
-import org.apache.shiro.realm.Realm;
-import org.apache.shiro.session.mgt.SessionManager;
-import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
+import java.util.Collection;
public class RestSecurityManager extends DefaultWebSecurityManager {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/security/shiro/ShiroAuthenticationExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/ShiroAuthenticationExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/ShiroAuthenticationExceptionMapper.java
index 91c4354..7210b2a 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/ShiroAuthenticationExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/ShiroAuthenticationExceptionMapper.java
@@ -16,16 +16,15 @@
package org.usergrid.rest.security.shiro;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
+import org.apache.shiro.authc.AuthenticationException;
import org.usergrid.rest.ApiResponse;
import org.usergrid.security.tokens.exceptions.BadTokenException;
import org.usergrid.security.tokens.exceptions.ExpiredTokenException;
-import org.apache.shiro.authc.AuthenticationException;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
import static org.usergrid.rest.exceptions.AuthErrorInfo.BAD_ACCESS_TOKEN_ERROR;
import static org.usergrid.rest.exceptions.AuthErrorInfo.EXPIRED_ACCESS_TOKEN_ERROR;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/BasicAuthSecurityFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/BasicAuthSecurityFilter.java b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/BasicAuthSecurityFilter.java
index a135207..222d20e 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/BasicAuthSecurityFilter.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/BasicAuthSecurityFilter.java
@@ -16,18 +16,15 @@
package org.usergrid.rest.security.shiro.filters;
-import java.security.Principal;
-import java.util.Map;
-
-import javax.ws.rs.core.SecurityContext;
-
+import com.sun.jersey.spi.container.ContainerRequest;
+import org.apache.shiro.codec.Base64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
-import org.apache.shiro.codec.Base64;
-
-import com.sun.jersey.spi.container.ContainerRequest;
+import javax.ws.rs.core.SecurityContext;
+import java.security.Principal;
+import java.util.Map;
@Component
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/ClientCredentialsSecurityFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/ClientCredentialsSecurityFilter.java b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/ClientCredentialsSecurityFilter.java
index 5160a7b..7bc7f23 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/ClientCredentialsSecurityFilter.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/ClientCredentialsSecurityFilter.java
@@ -16,18 +16,16 @@
package org.usergrid.rest.security.shiro.filters;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-
+import com.sun.jersey.spi.container.ContainerRequest;
+import org.apache.shiro.subject.Subject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.usergrid.security.shiro.PrincipalCredentialsToken;
import org.usergrid.security.shiro.utils.SubjectUtils;
-import org.apache.shiro.subject.Subject;
-
-import com.sun.jersey.spi.container.ContainerRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Context;
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.usergrid.rest.exceptions.AuthErrorInfo.OAUTH2_INVALID_CLIENT;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/OAuth2AccessTokenSecurityFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/OAuth2AccessTokenSecurityFilter.java b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/OAuth2AccessTokenSecurityFilter.java
index 89b2d1c..1d8a4c1 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/OAuth2AccessTokenSecurityFilter.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/OAuth2AccessTokenSecurityFilter.java
@@ -16,9 +16,14 @@
package org.usergrid.rest.security.shiro.filters;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-
+import com.sun.jersey.api.container.MappableContainerException;
+import com.sun.jersey.spi.container.ContainerRequest;
+import org.apache.amber.oauth2.common.exception.OAuthProblemException;
+import org.apache.amber.oauth2.common.exception.OAuthSystemException;
+import org.apache.amber.oauth2.common.message.types.ParameterStyle;
+import org.apache.amber.oauth2.common.utils.OAuthUtils;
+import org.apache.amber.oauth2.rs.request.OAuthAccessResourceRequest;
+import org.apache.shiro.subject.Subject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
@@ -35,20 +40,10 @@ import org.usergrid.security.tokens.exceptions.BadTokenException;
import org.usergrid.security.tokens.exceptions.ExpiredTokenException;
import org.usergrid.security.tokens.exceptions.InvalidTokenException;
-import org.apache.amber.oauth2.common.exception.OAuthProblemException;
-import org.apache.amber.oauth2.common.exception.OAuthSystemException;
-import org.apache.amber.oauth2.common.message.types.ParameterStyle;
-import org.apache.amber.oauth2.common.utils.OAuthUtils;
-import org.apache.amber.oauth2.rs.request.OAuthAccessResourceRequest;
-import org.apache.shiro.subject.Subject;
-
-import com.sun.jersey.api.container.MappableContainerException;
-import com.sun.jersey.spi.container.ContainerRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Context;
-import static org.usergrid.rest.exceptions.AuthErrorInfo.BAD_ACCESS_TOKEN_ERROR;
-import static org.usergrid.rest.exceptions.AuthErrorInfo.EXPIRED_ACCESS_TOKEN_ERROR;
-import static org.usergrid.rest.exceptions.AuthErrorInfo.INVALID_AUTH_ERROR;
-import static org.usergrid.rest.exceptions.AuthErrorInfo.UNVERIFIED_OAUTH_ERROR;
+import static org.usergrid.rest.exceptions.AuthErrorInfo.*;
import static org.usergrid.rest.exceptions.SecurityException.mappableSecurityException;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/SecurityFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/SecurityFilter.java b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/SecurityFilter.java
index 4953772..b43235b 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/SecurityFilter.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/SecurityFilter.java
@@ -16,25 +16,22 @@
package org.usergrid.rest.security.shiro.filters;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.core.HttpContext;
+import com.sun.jersey.spi.container.ContainerRequest;
+import com.sun.jersey.spi.container.ContainerRequestFilter;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.usergrid.management.ManagementService;
import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.security.tokens.TokenService;
import org.usergrid.services.ServiceManagerFactory;
-import org.apache.commons.lang.StringUtils;
-
-import com.sun.jersey.api.core.HttpContext;
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerRequestFilter;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.UriInfo;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Properties;
import static org.usergrid.utils.StringUtils.stringOrSubstringAfterFirst;
import static org.usergrid.utils.StringUtils.stringOrSubstringBeforeFirst;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/security/shiro/session/HttpRequestSessionManager.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/session/HttpRequestSessionManager.java b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/session/HttpRequestSessionManager.java
index 0be3f95..c099334 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/session/HttpRequestSessionManager.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/session/HttpRequestSessionManager.java
@@ -16,9 +16,6 @@
package org.usergrid.rest.security.shiro.session;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.shiro.authz.AuthorizationException;
import org.apache.shiro.session.Session;
import org.apache.shiro.session.SessionException;
@@ -27,6 +24,9 @@ import org.apache.shiro.session.mgt.SessionKey;
import org.apache.shiro.session.mgt.SessionManager;
import org.apache.shiro.web.util.WebUtils;
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+
/**
* Intended to keep session request-scoped and therefore not persist them across multiple requests - a user must login
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/security/shiro/session/HttpServletRequestSession.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/session/HttpServletRequestSession.java b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/session/HttpServletRequestSession.java
index 1152b93..0455a69 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/session/HttpServletRequestSession.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/session/HttpServletRequestSession.java
@@ -16,17 +16,16 @@
package org.usergrid.rest.security.shiro.session;
+import org.apache.commons.collections.EnumerationUtils;
+import org.apache.shiro.session.InvalidSessionException;
+import org.apache.shiro.session.Session;
+
+import javax.servlet.http.HttpServletRequest;
import java.io.Serializable;
import java.util.Collection;
import java.util.Date;
import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.collections.EnumerationUtils;
-import org.apache.shiro.session.InvalidSessionException;
-import org.apache.shiro.session.Session;
-
/**
* Session that is only tied to an HttpServletRequest. This can be used for applications that prefer to remain
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/test/PropertiesResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/test/PropertiesResource.java b/stack/rest/src/main/java/org/usergrid/rest/test/PropertiesResource.java
index d7608ba..c103e82 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/test/PropertiesResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/test/PropertiesResource.java
@@ -16,17 +16,6 @@
package org.usergrid.rest.test;
-import java.io.IOException;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.type.TypeReference;
import org.slf4j.Logger;
@@ -35,6 +24,16 @@ import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.usergrid.rest.AbstractContextResource;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Properties;
+
/** For testing purposes only and only works with usergrid.test=true */
@Component
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/utils/CORSUtils.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/utils/CORSUtils.java b/stack/rest/src/main/java/org/usergrid/rest/utils/CORSUtils.java
index 703d537..9175d7e 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/utils/CORSUtils.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/utils/CORSUtils.java
@@ -16,13 +16,12 @@
package org.usergrid.rest.utils;
-import java.util.Enumeration;
+import com.sun.jersey.spi.container.ContainerRequest;
+import com.sun.jersey.spi.container.ContainerResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerResponse;
+import java.util.Enumeration;
/* Note: At one point there was a special case in this code that would
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/utils/JSONPUtils.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/utils/JSONPUtils.java b/stack/rest/src/main/java/org/usergrid/rest/utils/JSONPUtils.java
index 06a6532..8b404dd 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/utils/JSONPUtils.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/utils/JSONPUtils.java
@@ -16,19 +16,12 @@
package org.usergrid.rest.utils;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import org.usergrid.security.oauth.AccessInfo;
import javax.ws.rs.core.MediaType;
-
-import org.usergrid.security.oauth.AccessInfo;
+import java.util.*;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
-
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.usergrid.utils.JsonUtils.mapToJsonString;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/AbstractRestIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/AbstractRestIT.java b/stack/rest/src/test/java/org/usergrid/rest/AbstractRestIT.java
index f5cde00..e6cfd27 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/AbstractRestIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/AbstractRestIT.java
@@ -16,25 +16,6 @@
package org.usergrid.rest;
-import java.net.URI;
-import java.net.URLClassLoader;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriBuilder;
-
-import org.codehaus.jackson.JsonNode;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.cassandra.Concurrent;
-import org.usergrid.java.client.Client;
-
import com.sun.jersey.api.client.WebResource;
import com.sun.jersey.api.client.config.ClientConfig;
import com.sun.jersey.api.client.config.DefaultClientConfig;
@@ -44,6 +25,23 @@ import com.sun.jersey.test.framework.JerseyTest;
import com.sun.jersey.test.framework.WebAppDescriptor;
import com.sun.jersey.test.framework.spi.container.TestContainerException;
import com.sun.jersey.test.framework.spi.container.TestContainerFactory;
+import org.codehaus.jackson.JsonNode;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.cassandra.Concurrent;
+import org.usergrid.java.client.Client;
+
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriBuilder;
+import java.net.URI;
+import java.net.URLClassLoader;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/BasicIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/BasicIT.java b/stack/rest/src/test/java/org/usergrid/rest/BasicIT.java
index 9f3c91c..3738f57 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/BasicIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/BasicIT.java
@@ -16,20 +16,18 @@
package org.usergrid.rest;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-
+import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.api.client.WebResource;
+import com.sun.jersey.core.util.MultivaluedMapImpl;
import org.codehaus.jackson.JsonNode;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.core.util.MultivaluedMapImpl;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import java.util.Map;
+import java.util.UUID;
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/ConcurrentRestITSuite.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/ConcurrentRestITSuite.java b/stack/rest/src/test/java/org/usergrid/rest/ConcurrentRestITSuite.java
index 25fbc7b..efb70f6 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/ConcurrentRestITSuite.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/ConcurrentRestITSuite.java
@@ -13,12 +13,7 @@ import org.usergrid.rest.applications.DevicesResourceIT;
import org.usergrid.rest.applications.assets.AssetResourceIT;
import org.usergrid.rest.applications.collection.PagingResourceIT;
import org.usergrid.rest.applications.events.EventsResourceIT;
-import org.usergrid.rest.applications.users.ActivityResourceIT;
-import org.usergrid.rest.applications.users.CollectionsResourceIT;
-import org.usergrid.rest.applications.users.GroupResourceIT;
-import org.usergrid.rest.applications.users.OwnershipResourceIT;
-import org.usergrid.rest.applications.users.PermissionsResourceIT;
-import org.usergrid.rest.applications.users.UserResourceIT;
+import org.usergrid.rest.applications.users.*;
import org.usergrid.rest.filters.ContentTypeResourceIT;
import org.usergrid.rest.management.ManagementResourceIT;
import org.usergrid.rest.management.RegistrationIT;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/DatabaseInitializer.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/DatabaseInitializer.java b/stack/rest/src/test/java/org/usergrid/rest/DatabaseInitializer.java
index 9071d47..c3fe87a 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/DatabaseInitializer.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/DatabaseInitializer.java
@@ -16,9 +16,6 @@
package org.usergrid.rest;
-import java.util.Map;
-import java.util.Properties;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +24,9 @@ import org.usergrid.mq.QueueManagerFactory;
import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.services.ServiceManagerFactory;
+import java.util.Map;
+import java.util.Properties;
+
public class DatabaseInitializer {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/ITSetup.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/ITSetup.java b/stack/rest/src/test/java/org/usergrid/rest/ITSetup.java
index 2701202..ba3039b 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/ITSetup.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/ITSetup.java
@@ -15,11 +15,6 @@
package org.usergrid.rest;
-import java.net.URI;
-import java.util.Properties;
-
-import javax.ws.rs.core.UriBuilder;
-
import org.junit.rules.ExternalResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,6 +26,10 @@ import org.usergrid.security.providers.SignInProviderFactory;
import org.usergrid.security.tokens.TokenService;
import org.usergrid.services.ServiceManagerFactory;
+import javax.ws.rs.core.UriBuilder;
+import java.net.URI;
+import java.util.Properties;
+
/** A {@link org.junit.rules.TestRule} that sets up services. */
public class ITSetup extends ExternalResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/RestITSuite.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/RestITSuite.java b/stack/rest/src/test/java/org/usergrid/rest/RestITSuite.java
index 325f2dd..17ab6d1 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/RestITSuite.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/RestITSuite.java
@@ -25,12 +25,7 @@ import org.usergrid.rest.applications.DevicesResourceIT;
import org.usergrid.rest.applications.assets.AssetResourceIT;
import org.usergrid.rest.applications.collection.PagingResourceIT;
import org.usergrid.rest.applications.events.EventsResourceIT;
-import org.usergrid.rest.applications.users.ActivityResourceIT;
-import org.usergrid.rest.applications.users.CollectionsResourceIT;
-import org.usergrid.rest.applications.users.GroupResourceIT;
-import org.usergrid.rest.applications.users.OwnershipResourceIT;
-import org.usergrid.rest.applications.users.PermissionsResourceIT;
-import org.usergrid.rest.applications.users.UserResourceIT;
+import org.usergrid.rest.applications.users.*;
import org.usergrid.rest.filters.ContentTypeResourceIT;
import org.usergrid.rest.management.organizations.AdminEmailEncodingIT;
import org.usergrid.rest.management.organizations.OrganizationResourceIT;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/TestContextSetup.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/TestContextSetup.java b/stack/rest/src/test/java/org/usergrid/rest/TestContextSetup.java
index 8ac5181..9c25e16 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/TestContextSetup.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/TestContextSetup.java
@@ -1,14 +1,13 @@
package org.usergrid.rest;
+import com.sun.jersey.test.framework.JerseyTest;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
import org.usergrid.rest.test.resource.TestContext;
import org.usergrid.rest.test.security.TestAdminUser;
-import com.sun.jersey.test.framework.JerseyTest;
-
/**
* A self configuring TestContext which sets itself up it implements TestRule. With a @Rule annotation, an instance of
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/TomcatResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/TomcatResource.java b/stack/rest/src/test/java/org/usergrid/rest/TomcatResource.java
index 8ba697f..c455b49 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/TomcatResource.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/TomcatResource.java
@@ -1,15 +1,13 @@
package org.usergrid.rest;
-import java.io.File;
-
-import org.junit.rules.ExternalResource;
-import org.usergrid.cassandra.AvailablePortFinder;
-
+import com.google.common.io.Files;
import org.apache.catalina.startup.Tomcat;
import org.apache.commons.lang.math.RandomUtils;
+import org.junit.rules.ExternalResource;
+import org.usergrid.cassandra.AvailablePortFinder;
-import com.google.common.io.Files;
+import java.io.File;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/ApplicationRequestCounterIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/ApplicationRequestCounterIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/ApplicationRequestCounterIT.java
index bbb9865..66ad394 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/ApplicationRequestCounterIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/ApplicationRequestCounterIT.java
@@ -15,24 +15,19 @@
package org.usergrid.rest.applications;
-import java.util.UUID;
-
-import javax.ws.rs.core.MediaType;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.cassandra.Concurrent;
-import org.usergrid.persistence.CounterResolution;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.EntityManagerFactory;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
+import org.usergrid.persistence.*;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.services.ServiceManager;
import org.usergrid.utils.UUIDUtils;
+import javax.ws.rs.core.MediaType;
+import java.util.UUID;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/ApplicationResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/ApplicationResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/ApplicationResourceIT.java
index e316bef..1e1fe37 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/ApplicationResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/ApplicationResourceIT.java
@@ -15,10 +15,11 @@
package org.usergrid.rest.applications;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.ClientResponse.Status;
+import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.api.representation.Form;
+import org.apache.shiro.codec.Base64;
import org.codehaus.jackson.JsonNode;
import org.junit.Ignore;
import org.junit.Test;
@@ -27,16 +28,10 @@ import org.usergrid.management.ApplicationInfo;
import org.usergrid.management.OrganizationInfo;
import org.usergrid.rest.AbstractRestIT;
-import org.apache.shiro.codec.Base64;
-
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.ClientResponse.Status;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.representation.Form;
+import javax.ws.rs.core.MediaType;
+import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/DevicesResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/DevicesResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/DevicesResourceIT.java
index 6b2c6c9..0d35f0e 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/DevicesResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/DevicesResourceIT.java
@@ -1,20 +1,17 @@
package org.usergrid.rest.applications;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
+import com.sun.jersey.api.client.UniformInterfaceException;
import org.codehaus.jackson.JsonNode;
import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.rest.AbstractRestIT;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/assets/AssetResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/assets/AssetResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/assets/AssetResourceIT.java
index 468719a..2827922 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/assets/AssetResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/assets/AssetResourceIT.java
@@ -1,13 +1,8 @@
package org.usergrid.rest.applications.assets;
-import java.io.InputStream;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.TimeoutException;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.multipart.FormDataMultiPart;
+import org.apache.commons.io.IOUtils;
import org.codehaus.jackson.JsonNode;
import org.junit.Assert;
import org.junit.Ignore;
@@ -19,9 +14,11 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.applications.utils.UserRepo;
import org.usergrid.services.assets.data.AssetUtils;
-import org.apache.commons.io.IOUtils;
-
-import com.sun.jersey.multipart.FormDataMultiPart;
+import javax.ws.rs.core.MediaType;
+import java.io.InputStream;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.TimeoutException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/collection/BadGrammarQueryTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/BadGrammarQueryTest.java b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/BadGrammarQueryTest.java
index 11fa979..152baa3 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/BadGrammarQueryTest.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/BadGrammarQueryTest.java
@@ -1,9 +1,8 @@
package org.usergrid.rest.applications.collection;
-import java.util.HashMap;
-import java.util.Map;
-
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.UniformInterfaceException;
import org.codehaus.jackson.JsonNode;
import org.junit.Rule;
import org.junit.Test;
@@ -11,8 +10,8 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.test.resource.CustomCollection;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import java.util.HashMap;
+import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/collection/BrowserCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/BrowserCompatibilityTest.java b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/BrowserCompatibilityTest.java
index b363193..50706ae 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/BrowserCompatibilityTest.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/BrowserCompatibilityTest.java
@@ -16,9 +16,6 @@
package org.usergrid.rest.applications.collection;
-import java.util.Map;
-import java.util.UUID;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Rule;
import org.junit.Test;
@@ -27,6 +24,9 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.test.resource.CustomCollection;
+import java.util.Map;
+import java.util.UUID;
+
import static junit.framework.Assert.assertNotNull;
import static org.junit.Assert.assertEquals;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/collection/PagingResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/PagingResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/PagingResourceIT.java
index 1b123a1..ba621e2 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/PagingResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/PagingResourceIT.java
@@ -16,12 +16,6 @@
package org.usergrid.rest.applications.collection;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.map.ObjectMapper;
import org.junit.Rule;
@@ -34,10 +28,9 @@ import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.test.resource.CustomCollection;
import org.usergrid.rest.test.resource.EntityResource;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import java.util.*;
+
+import static org.junit.Assert.*;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/AndOrQueryTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/AndOrQueryTest.java b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/AndOrQueryTest.java
index 60dc437..6ea975d 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/AndOrQueryTest.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/AndOrQueryTest.java
@@ -1,9 +1,6 @@
package org.usergrid.rest.applications.collection.activities;
-import java.util.HashMap;
-import java.util.Map;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Ignore;
import org.junit.Rule;
@@ -12,6 +9,9 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.test.resource.CustomCollection;
+import java.util.HashMap;
+import java.util.Map;
+
import static org.junit.Assert.assertEquals;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/OrderByTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/OrderByTest.java b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/OrderByTest.java
index 88ab2c1..eea3e4b 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/OrderByTest.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/OrderByTest.java
@@ -1,11 +1,6 @@
package org.usergrid.rest.applications.collection.activities;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Rule;
import org.junit.Test;
@@ -13,6 +8,11 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.test.resource.CustomCollection;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import static org.junit.Assert.assertEquals;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/PagingEntitiesTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/PagingEntitiesTest.java b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/PagingEntitiesTest.java
index 279505f..4894287 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/PagingEntitiesTest.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/PagingEntitiesTest.java
@@ -1,9 +1,7 @@
package org.usergrid.rest.applications.collection.activities;
-import java.util.HashMap;
-import java.util.Map;
-
+import org.apache.commons.lang.ArrayUtils;
import org.codehaus.jackson.JsonNode;
import org.junit.Rule;
import org.junit.Test;
@@ -11,7 +9,8 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.test.resource.CustomCollection;
-import org.apache.commons.lang.ArrayUtils;
+import java.util.HashMap;
+import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/PutTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/PutTest.java b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/PutTest.java
index 62c1b52..39c1be4 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/PutTest.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/PutTest.java
@@ -1,9 +1,6 @@
package org.usergrid.rest.applications.collection.activities;
-import java.util.HashMap;
-import java.util.Map;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Rule;
import org.junit.Test;
@@ -11,6 +8,9 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.test.resource.CustomCollection;
+import java.util.HashMap;
+import java.util.Map;
+
import static org.junit.Assert.assertEquals;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/collection/groups/GeoPagingTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/groups/GeoPagingTest.java b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/groups/GeoPagingTest.java
index 828f249..a5f46a6 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/groups/GeoPagingTest.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/groups/GeoPagingTest.java
@@ -15,9 +15,6 @@
package org.usergrid.rest.applications.collection.groups;
-import java.util.HashMap;
-import java.util.Map;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Rule;
import org.junit.Test;
@@ -25,6 +22,9 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.test.resource.CustomCollection;
+import java.util.HashMap;
+import java.util.Map;
+
import static org.junit.Assert.assertEquals;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/collection/groups/UpdateGroupIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/groups/UpdateGroupIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/groups/UpdateGroupIT.java
index 18449cf..e9c5dea 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/groups/UpdateGroupIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/groups/UpdateGroupIT.java
@@ -15,12 +15,10 @@
package org.usergrid.rest.applications.collection.groups;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.api.client.WebResource;
+import junit.framework.Assert;
+import org.apache.commons.io.IOUtils;
import org.codehaus.jackson.JsonNode;
import org.junit.Rule;
import org.junit.Test;
@@ -29,12 +27,10 @@ import org.slf4j.LoggerFactory;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
-import org.apache.commons.io.IOUtils;
-
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.client.WebResource;
-
-import junit.framework.Assert;
+import javax.ws.rs.core.MediaType;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/events/EventsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/events/EventsResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/events/EventsResourceIT.java
index e5dd903..76a0056 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/events/EventsResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/events/EventsResourceIT.java
@@ -1,11 +1,6 @@
package org.usergrid.rest.applications.events;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Test;
import org.slf4j.Logger;
@@ -13,6 +8,10 @@ import org.slf4j.LoggerFactory;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.rest.AbstractRestIT;
+import javax.ws.rs.core.MediaType;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/queues/AbstractQueueResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/queues/AbstractQueueResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/queues/AbstractQueueResourceIT.java
index d889f63..bad4c3e 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/queues/AbstractQueueResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/queues/AbstractQueueResourceIT.java
@@ -1,25 +1,17 @@
package org.usergrid.rest.applications.queues;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.concurrent.Callable;
-import java.util.concurrent.atomic.AtomicInteger;
-
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.test.resource.app.queue.Queue;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
+import java.util.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicInteger;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
public class AbstractQueueResourceIT extends AbstractRestIT {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong1IT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong1IT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong1IT.java
index 76a105b..d3222b2 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong1IT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong1IT.java
@@ -1,8 +1,7 @@
package org.usergrid.rest.applications.queues;
-import java.util.List;
-
+import com.google.common.collect.BiMap;
import org.junit.Rule;
import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
@@ -11,11 +10,9 @@ import org.usergrid.rest.test.resource.app.queue.Queue;
import org.usergrid.rest.test.resource.app.queue.Transaction;
import org.usergrid.utils.MapUtils;
-import com.google.common.collect.BiMap;
+import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong2IT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong2IT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong2IT.java
index fb64ee2..ec051c4 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong2IT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong2IT.java
@@ -1,9 +1,7 @@
package org.usergrid.rest.applications.queues;
-import java.util.List;
-import java.util.Map;
-
+import com.google.common.collect.BiMap;
import org.junit.Rule;
import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
@@ -12,7 +10,8 @@ import org.usergrid.rest.test.resource.app.queue.Queue;
import org.usergrid.rest.test.resource.app.queue.Transaction;
import org.usergrid.utils.MapUtils;
-import com.google.common.collect.BiMap;
+import java.util.List;
+import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong3IT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong3IT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong3IT.java
index ace39e4..1d87280 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong3IT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong3IT.java
@@ -1,9 +1,8 @@
package org.usergrid.rest.applications.queues;
-import java.util.List;
-import java.util.Map;
-
+import com.google.common.collect.BiMap;
+import com.sun.jersey.api.client.UniformInterfaceException;
import org.junit.Rule;
import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
@@ -12,13 +11,10 @@ import org.usergrid.rest.test.resource.app.queue.Queue;
import org.usergrid.rest.test.resource.app.queue.Transaction;
import org.usergrid.utils.MapUtils;
-import com.google.common.collect.BiMap;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import java.util.List;
+import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceShortIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceShortIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceShortIT.java
index 9b460b9..26f5447 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceShortIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceShortIT.java
@@ -1,15 +1,7 @@
package org.usergrid.rest.applications.queues;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
+import com.sun.jersey.api.client.UniformInterfaceException;
import org.codehaus.jackson.JsonNode;
import org.junit.Ignore;
import org.junit.Rule;
@@ -20,11 +12,16 @@ import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.test.resource.app.queue.Queue;
import org.usergrid.utils.MapUtils;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/users/CollectionsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/CollectionsResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/CollectionsResourceIT.java
index ca42047..d7a1970 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/CollectionsResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/CollectionsResourceIT.java
@@ -16,12 +16,7 @@
package org.usergrid.rest.applications.users;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.UniformInterfaceException;
import org.codehaus.jackson.JsonNode;
import org.junit.Assert;
import org.junit.Test;
@@ -31,11 +26,12 @@ import org.usergrid.cassandra.Concurrent;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.utils.UUIDUtils;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.*;
import static org.usergrid.utils.MapUtils.hashMap;
[11/23] organize imports only
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/Setup.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/Setup.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/Setup.java
index 9c73648..939acca 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/Setup.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/Setup.java
@@ -16,30 +16,17 @@
package org.usergrid.persistence.cassandra;
-import java.util.UUID;
-
+import me.prettyprint.hector.api.ddl.ComparatorType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.mq.cassandra.QueuesCF;
import org.usergrid.persistence.entities.Application;
-import me.prettyprint.hector.api.ddl.ComparatorType;
+import java.util.UUID;
import static me.prettyprint.hector.api.factory.HFactory.createColumnFamilyDefinition;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.getCfDefs;
-import static org.usergrid.persistence.cassandra.CassandraService.APPLICATIONS_CF;
-import static org.usergrid.persistence.cassandra.CassandraService.DEFAULT_APPLICATION;
-import static org.usergrid.persistence.cassandra.CassandraService.DEFAULT_APPLICATION_ID;
-import static org.usergrid.persistence.cassandra.CassandraService.DEFAULT_ORGANIZATION;
-import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION;
-import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
-import static org.usergrid.persistence.cassandra.CassandraService.PRINCIPAL_TOKEN_CF;
-import static org.usergrid.persistence.cassandra.CassandraService.PROPERTIES_CF;
-import static org.usergrid.persistence.cassandra.CassandraService.STATIC_APPLICATION_KEYSPACE;
-import static org.usergrid.persistence.cassandra.CassandraService.SYSTEM_KEYSPACE;
-import static org.usergrid.persistence.cassandra.CassandraService.TOKENS_CF;
-import static org.usergrid.persistence.cassandra.CassandraService.USE_VIRTUAL_KEYSPACES;
-import static org.usergrid.persistence.cassandra.CassandraService.keyspaceForApplication;
+import static org.usergrid.persistence.cassandra.CassandraService.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImpl.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImpl.java
index c8d105c..dbf4451 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImpl.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImpl.java
@@ -16,14 +16,14 @@
package org.usergrid.persistence.cassandra;
+import org.usergrid.persistence.IndexBucketLocator;
+
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.UUID;
-import org.usergrid.persistence.IndexBucketLocator;
-
import static org.apache.commons.codec.digest.DigestUtils.md5;
import static org.usergrid.utils.ConversionUtils.bytes;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/ConnectedIndexScanner.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/ConnectedIndexScanner.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/ConnectedIndexScanner.java
index 265dc4d..637ba91 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/ConnectedIndexScanner.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/ConnectedIndexScanner.java
@@ -16,19 +16,13 @@
package org.usergrid.persistence.cassandra.index;
-import java.nio.ByteBuffer;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
+import com.yammer.metrics.annotation.Metered;
+import me.prettyprint.hector.api.beans.HColumn;
import org.springframework.util.Assert;
import org.usergrid.persistence.cassandra.CassandraService;
-import com.yammer.metrics.annotation.Metered;
-
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.*;
import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_COMPOSITE_DICTIONARIES;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.key;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexBucketScanner.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexBucketScanner.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexBucketScanner.java
index 1a0776a..91d7551 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexBucketScanner.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexBucketScanner.java
@@ -16,23 +16,15 @@
package org.usergrid.persistence.cassandra.index;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NavigableSet;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.UUID;
-
+import com.yammer.metrics.annotation.Metered;
+import me.prettyprint.hector.api.beans.HColumn;
import org.usergrid.persistence.IndexBucketLocator;
import org.usergrid.persistence.IndexBucketLocator.IndexType;
import org.usergrid.persistence.cassandra.ApplicationCF;
import org.usergrid.persistence.cassandra.CassandraService;
-import com.yammer.metrics.annotation.Metered;
-
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.*;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.key;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexMultiBucketSetLoader.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexMultiBucketSetLoader.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexMultiBucketSetLoader.java
index 7a26d66..137e73e 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexMultiBucketSetLoader.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexMultiBucketSetLoader.java
@@ -16,20 +16,14 @@
package org.usergrid.persistence.cassandra.index;
-import java.nio.ByteBuffer;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeSet;
-import java.util.UUID;
-
-import org.usergrid.persistence.cassandra.ApplicationCF;
-import org.usergrid.persistence.cassandra.CassandraService;
-
+import me.prettyprint.hector.api.beans.HColumn;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.TypeParser;
+import org.usergrid.persistence.cassandra.ApplicationCF;
+import org.usergrid.persistence.cassandra.CassandraService;
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.*;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexScanner.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexScanner.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexScanner.java
index d87f37a..aef01e5 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexScanner.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexScanner.java
@@ -16,12 +16,12 @@
package org.usergrid.persistence.cassandra.index;
+import me.prettyprint.hector.api.beans.HColumn;
+
import java.nio.ByteBuffer;
import java.util.Iterator;
import java.util.Set;
-import me.prettyprint.hector.api.beans.HColumn;
-
/**
* Interface for scanning all index buckets.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/NoOpIndexScanner.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/NoOpIndexScanner.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/NoOpIndexScanner.java
index d948af8..25bb0d0 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/NoOpIndexScanner.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/NoOpIndexScanner.java
@@ -16,13 +16,13 @@
package org.usergrid.persistence.cassandra.index;
+import me.prettyprint.hector.api.beans.HColumn;
+
import java.nio.ByteBuffer;
import java.util.Iterator;
import java.util.NavigableSet;
import java.util.Set;
-import me.prettyprint.hector.api.beans.HColumn;
-
/**
* Index scanner that doesn't return anything. This is used if our cursor has advanced beyond the end of all scannable
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/Slf4jTraceTagReporter.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/Slf4jTraceTagReporter.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/Slf4jTraceTagReporter.java
index 753b149..10682d3 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/Slf4jTraceTagReporter.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/Slf4jTraceTagReporter.java
@@ -1,11 +1,11 @@
package org.usergrid.persistence.cassandra.util;
-import java.util.Date;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Date;
+
/**
* Simple reporter which dumps to class logger at info level.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TimedOpTag.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TimedOpTag.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TimedOpTag.java
index d30c2f2..a3c8774 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TimedOpTag.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TimedOpTag.java
@@ -1,11 +1,10 @@
package org.usergrid.persistence.cassandra.util;
-import java.util.UUID;
-
+import com.google.common.base.Objects;
import org.usergrid.utils.UUIDUtils;
-import com.google.common.base.Objects;
+import java.util.UUID;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagAspect.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagAspect.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagAspect.java
index 30166d7..2cbd161 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagAspect.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagAspect.java
@@ -1,12 +1,12 @@
package org.usergrid.persistence.cassandra.util;
-import javax.annotation.Resource;
-
import org.aspectj.lang.ProceedingJoinPoint;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.annotation.Resource;
+
/**
* Use Aspects to apply a trace
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagManager.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagManager.java
index 6cdeb3a..85d83ca 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagManager.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagManager.java
@@ -1,13 +1,12 @@
package org.usergrid.persistence.cassandra.util;
-import javax.annotation.Resource;
-
+import com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.utils.UUIDUtils;
-import com.google.common.base.Preconditions;
+import javax.annotation.Resource;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/entities/Activity.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Activity.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Activity.java
index 81b77cb..7f2e8ad 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Activity.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Activity.java
@@ -16,15 +16,6 @@
package org.usergrid.persistence.entities;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.map.annotate.JsonSerialize;
@@ -35,6 +26,9 @@ import org.usergrid.persistence.TypedEntity;
import org.usergrid.persistence.annotations.EntityDictionary;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.*;
+
import static org.usergrid.utils.StringUtils.toStringFormat;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/entities/Application.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Application.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Application.java
index 2028b26..62a70ad 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Application.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Application.java
@@ -16,13 +16,6 @@
package org.usergrid.persistence.entities;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
@@ -31,6 +24,12 @@ import org.usergrid.persistence.annotations.EntityCollection;
import org.usergrid.persistence.annotations.EntityDictionary;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
/** Applications represent the topmost container for all entities. */
@XmlRootElement
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/entities/Asset.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Asset.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Asset.java
index 518b391..805c507 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Asset.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Asset.java
@@ -16,17 +16,16 @@
package org.usergrid.persistence.entities;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
import org.usergrid.persistence.TypedEntity;
import org.usergrid.persistence.annotations.EntityDictionary;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Set;
+import java.util.UUID;
+
/**
* Asset entity for representing file-like objects.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/entities/Device.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Device.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Device.java
index 43b0dd5..b303031 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Device.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Device.java
@@ -16,17 +16,16 @@
package org.usergrid.persistence.entities;
-import java.util.List;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
import org.usergrid.persistence.TypedEntity;
import org.usergrid.persistence.annotations.EntityCollection;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+import java.util.UUID;
+
/** The Device entity class for representing devices in the service. */
@XmlRootElement
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/entities/Event.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Event.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Event.java
index d85cbf5..e948324 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Event.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Event.java
@@ -16,19 +16,18 @@
package org.usergrid.persistence.entities;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
import org.usergrid.persistence.TypedEntity;
import org.usergrid.persistence.annotations.EntityDictionary;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
/** An event type posted by the application. */
@XmlRootElement
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/entities/Folder.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Folder.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Folder.java
index a218d2e..2826bcf 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Folder.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Folder.java
@@ -16,17 +16,16 @@
package org.usergrid.persistence.entities;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
import org.usergrid.persistence.TypedEntity;
import org.usergrid.persistence.annotations.EntityDictionary;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Set;
+import java.util.UUID;
+
/**
* Asset entity for representing folder-like objects.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/entities/Group.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Group.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Group.java
index 9ffe504..3789cc9 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Group.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Group.java
@@ -16,13 +16,6 @@
package org.usergrid.persistence.entities;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
import org.usergrid.persistence.CredentialsInfo;
@@ -31,6 +24,12 @@ import org.usergrid.persistence.annotations.EntityCollection;
import org.usergrid.persistence.annotations.EntityDictionary;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
/** Groups are used to organize users. */
@XmlRootElement
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/entities/JobStat.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/JobStat.java b/stack/core/src/main/java/org/usergrid/persistence/entities/JobStat.java
index 06a324d..50434ff 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/JobStat.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/JobStat.java
@@ -16,11 +16,11 @@
package org.usergrid.persistence.entities;
-import java.util.UUID;
-
import org.usergrid.persistence.TypedEntity;
import org.usergrid.persistence.annotations.EntityProperty;
+import java.util.UUID;
+
/**
* All job execution info should be in this entity
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/entities/Message.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Message.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Message.java
index 30864e8..b46884b 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Message.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Message.java
@@ -16,17 +16,16 @@
package org.usergrid.persistence.entities;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
import org.usergrid.persistence.TypedEntity;
import org.usergrid.persistence.annotations.EntityDictionary;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Set;
+import java.util.UUID;
+
/**
* A generic Message type for message queue type operations. For status updates and other social actions, use Activity
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/entities/Role.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Role.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Role.java
index e8dd05a..f3b89f7 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Role.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Role.java
@@ -16,12 +16,6 @@
package org.usergrid.persistence.entities;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
import org.usergrid.persistence.TypedEntity;
@@ -29,6 +23,11 @@ import org.usergrid.persistence.annotations.EntityCollection;
import org.usergrid.persistence.annotations.EntityDictionary;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
/** Groups are used to organize users. */
@XmlRootElement
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/entities/User.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/User.java b/stack/core/src/main/java/org/usergrid/persistence/entities/User.java
index 32a1078..e260556 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/User.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/User.java
@@ -16,13 +16,6 @@
package org.usergrid.persistence.entities;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
@@ -32,6 +25,12 @@ import org.usergrid.persistence.annotations.EntityCollection;
import org.usergrid.persistence.annotations.EntityDictionary;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
import static org.apache.commons.lang.StringUtils.isNotBlank;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/geo/CollectionGeoSearch.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/CollectionGeoSearch.java b/stack/core/src/main/java/org/usergrid/persistence/geo/CollectionGeoSearch.java
index 43e8ff3..29086a1 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/CollectionGeoSearch.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/CollectionGeoSearch.java
@@ -1,18 +1,17 @@
package org.usergrid.persistence.geo;
-import java.nio.ByteBuffer;
-import java.util.List;
-import java.util.TreeSet;
-import java.util.UUID;
-
+import me.prettyprint.hector.api.beans.HColumn;
import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.EntityRef;
import org.usergrid.persistence.IndexBucketLocator;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.persistence.geo.model.Point;
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.TreeSet;
+import java.util.UUID;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.key;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/geo/ConnectionGeoSearch.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/ConnectionGeoSearch.java b/stack/core/src/main/java/org/usergrid/persistence/geo/ConnectionGeoSearch.java
index 3928ac9..fd46168 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/ConnectionGeoSearch.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/ConnectionGeoSearch.java
@@ -1,17 +1,16 @@
package org.usergrid.persistence.geo;
-import java.nio.ByteBuffer;
-import java.util.List;
-import java.util.TreeSet;
-import java.util.UUID;
-
+import me.prettyprint.hector.api.beans.HColumn;
import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.IndexBucketLocator;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.persistence.geo.model.Point;
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.TreeSet;
+import java.util.UUID;
import static org.usergrid.persistence.Schema.INDEX_CONNECTIONS;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.key;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRef.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRef.java b/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRef.java
index da25424..7b7468a 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRef.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRef.java
@@ -1,13 +1,12 @@
package org.usergrid.persistence.geo;
-import java.util.UUID;
-
+import me.prettyprint.hector.api.beans.DynamicComposite;
import org.usergrid.persistence.EntityRef;
import org.usergrid.persistence.geo.model.Point;
import org.usergrid.utils.UUIDUtils;
-import me.prettyprint.hector.api.beans.DynamicComposite;
+import java.util.UUID;
import static org.apache.commons.lang.math.NumberUtils.toDouble;
import static org.usergrid.utils.StringUtils.stringOrSubstringAfterLast;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparator.java b/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparator.java
index 5d1b228..9b7b70f 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparator.java
@@ -16,10 +16,10 @@
package org.usergrid.persistence.geo;
-import java.util.Comparator;
-
import org.usergrid.utils.UUIDUtils;
+import java.util.Comparator;
+
/**
* Compares 2 entity location refs by distance. The one with the larger distance is considered greater than one with a
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/geo/GeoIndexSearcher.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/GeoIndexSearcher.java b/stack/core/src/main/java/org/usergrid/persistence/geo/GeoIndexSearcher.java
index 98629b2..3f6fc6f 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/GeoIndexSearcher.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/GeoIndexSearcher.java
@@ -1,16 +1,13 @@
package org.usergrid.persistence.geo;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.DoubleSerializer;
+import me.prettyprint.cassandra.serializers.StringSerializer;
+import me.prettyprint.cassandra.serializers.UUIDSerializer;
+import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
+import me.prettyprint.hector.api.beans.DynamicComposite;
+import me.prettyprint.hector.api.beans.HColumn;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.EntityManager;
@@ -22,14 +19,8 @@ import org.usergrid.persistence.cassandra.index.IndexMultiBucketSetLoader;
import org.usergrid.persistence.geo.model.Point;
import org.usergrid.persistence.geo.model.Tuple;
-import org.apache.commons.lang.StringUtils;
-
-import me.prettyprint.cassandra.serializers.DoubleSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.*;
import static org.usergrid.persistence.Schema.DICTIONARY_GEOCELL;
import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_INDEX;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellManager.java b/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellManager.java
index be6f52a..dc0b588 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellManager.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellManager.java
@@ -1,16 +1,16 @@
package org.usergrid.persistence.geo;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
import org.usergrid.persistence.cassandra.GeoIndexManager;
import org.usergrid.persistence.geo.model.BoundingBox;
import org.usergrid.persistence.geo.model.CostFunction;
import org.usergrid.persistence.geo.model.DefaultCostFunction;
import org.usergrid.persistence.geo.model.Point;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
/**
#
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellUtils.java b/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellUtils.java
index 5b112c9..dbbdbc5 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellUtils.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellUtils.java
@@ -13,17 +13,13 @@ and limitations under the License.
package org.usergrid.persistence.geo;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
import org.usergrid.persistence.geo.comparator.DoubleTupleComparator;
import org.usergrid.persistence.geo.model.BoundingBox;
import org.usergrid.persistence.geo.model.Point;
import org.usergrid.persistence.geo.model.Tuple;
+import java.util.*;
+
/**
#
# Copyright 2010 Alexandre Gellibert
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/geo/comparator/DoubleTupleComparator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/comparator/DoubleTupleComparator.java b/stack/core/src/main/java/org/usergrid/persistence/geo/comparator/DoubleTupleComparator.java
index 6780662..b31530f 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/comparator/DoubleTupleComparator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/comparator/DoubleTupleComparator.java
@@ -1,10 +1,10 @@
package org.usergrid.persistence.geo.comparator;
-import java.util.Comparator;
-
import org.usergrid.persistence.geo.model.Tuple;
+import java.util.Comparator;
+
public class DoubleTupleComparator implements Comparator<Tuple<int[], Double>> {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/OrderByNode.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/OrderByNode.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/OrderByNode.java
index 089e66f..c30f844 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/OrderByNode.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/OrderByNode.java
@@ -16,10 +16,10 @@
package org.usergrid.persistence.query.ir;
-import java.util.List;
-
import org.usergrid.persistence.Query.SortPredicate;
+import java.util.List;
+
/**
* Intermediate representation of ordering operations
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/QuerySlice.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/QuerySlice.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/QuerySlice.java
index da94494..79aca6a 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/QuerySlice.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/QuerySlice.java
@@ -16,12 +16,11 @@
package org.usergrid.persistence.query.ir;
-import java.nio.ByteBuffer;
-
-import org.usergrid.utils.NumberUtils;
-
import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
import me.prettyprint.hector.api.beans.DynamicComposite;
+import org.usergrid.utils.NumberUtils;
+
+import java.nio.ByteBuffer;
import static org.usergrid.utils.CompositeUtils.setEqualityFlag;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/SearchVisitor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/SearchVisitor.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/SearchVisitor.java
index 665ddd2..60a3cad 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/SearchVisitor.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/SearchVisitor.java
@@ -1,23 +1,15 @@
package org.usergrid.persistence.query.ir;
-import java.util.Stack;
-
import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.EntityRef;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.cassandra.QueryProcessor;
import org.usergrid.persistence.cassandra.index.IndexScanner;
import org.usergrid.persistence.cassandra.index.NoOpIndexScanner;
-import org.usergrid.persistence.query.ir.result.EmptyIterator;
-import org.usergrid.persistence.query.ir.result.IntersectionIterator;
-import org.usergrid.persistence.query.ir.result.OrderByIterator;
-import org.usergrid.persistence.query.ir.result.ResultIterator;
-import org.usergrid.persistence.query.ir.result.SecondaryIndexSliceParser;
-import org.usergrid.persistence.query.ir.result.SliceIterator;
-import org.usergrid.persistence.query.ir.result.StaticIdIterator;
-import org.usergrid.persistence.query.ir.result.SubtractionIterator;
-import org.usergrid.persistence.query.ir.result.UnionIterator;
+import org.usergrid.persistence.query.ir.result.*;
+
+import java.util.Stack;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/SliceNode.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/SliceNode.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/SliceNode.java
index dd2a933..dc3dd6e 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/SliceNode.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/SliceNode.java
@@ -16,12 +16,12 @@
package org.usergrid.persistence.query.ir;
+import org.usergrid.persistence.query.ir.QuerySlice.RangeValue;
+
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.usergrid.persistence.query.ir.QuerySlice.RangeValue;
-
import static org.usergrid.persistence.cassandra.IndexUpdate.indexValueCode;
import static org.usergrid.persistence.cassandra.IndexUpdate.toIndexableValue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java
index e63529b..fbb7d6c 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java
@@ -1,9 +1,10 @@
package org.usergrid.persistence.query.ir.result;
+import org.apache.cassandra.utils.ByteBufferUtil;
+
import java.nio.ByteBuffer;
import java.util.UUID;
-import org.apache.cassandra.utils.ByteBufferUtil;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionIndexSliceParser.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionIndexSliceParser.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionIndexSliceParser.java
index 21e407b..6626793 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionIndexSliceParser.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionIndexSliceParser.java
@@ -16,12 +16,11 @@
package org.usergrid.persistence.query.ir.result;
-import java.nio.ByteBuffer;
-import java.util.UUID;
-
+import me.prettyprint.hector.api.beans.DynamicComposite;
import org.usergrid.persistence.Schema;
-import me.prettyprint.hector.api.beans.DynamicComposite;
+import java.nio.ByteBuffer;
+import java.util.UUID;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionRefLoader.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionRefLoader.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionRefLoader.java
index 4466a53..4b04e7d 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionRefLoader.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionRefLoader.java
@@ -1,16 +1,16 @@
package org.usergrid.persistence.query.ir.result;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
import org.usergrid.persistence.ConnectionRef;
import org.usergrid.persistence.EntityRef;
import org.usergrid.persistence.Results;
import org.usergrid.persistence.SimpleEntityRef;
import org.usergrid.persistence.cassandra.ConnectionRefImpl;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionTypesIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionTypesIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionTypesIterator.java
index 67cceb6..568cc6d 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionTypesIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionTypesIterator.java
@@ -1,18 +1,13 @@
package org.usergrid.persistence.query.ir.result;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.StringSerializer;
+import me.prettyprint.hector.api.beans.HColumn;
import org.usergrid.persistence.Schema;
import org.usergrid.persistence.cassandra.CassandraService;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.*;
import static org.usergrid.persistence.Schema.DICTIONARY_CONNECTED_TYPES;
import static org.usergrid.persistence.Schema.DICTIONARY_CONNECTING_TYPES;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EmptyIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EmptyIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EmptyIterator.java
index 8236043..14501ec 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EmptyIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EmptyIterator.java
@@ -1,12 +1,12 @@
package org.usergrid.persistence.query.ir.result;
+import org.usergrid.persistence.cassandra.CursorCache;
+
import java.util.Iterator;
import java.util.Set;
import java.util.UUID;
-import org.usergrid.persistence.cassandra.CursorCache;
-
/** Iterator that never returns results */
public class EmptyIterator implements ResultIterator {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityRefLoader.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityRefLoader.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityRefLoader.java
index 68f521d..bf6231d 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityRefLoader.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityRefLoader.java
@@ -16,13 +16,13 @@
package org.usergrid.persistence.query.ir.result;
-import java.util.ArrayList;
-import java.util.List;
-
import org.usergrid.persistence.EntityRef;
import org.usergrid.persistence.Results;
import org.usergrid.persistence.SimpleEntityRef;
+import java.util.ArrayList;
+import java.util.List;
+
public class EntityRefLoader implements ResultsLoader {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityResultsLoader.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityResultsLoader.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityResultsLoader.java
index 6cbdbef..f821483 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityResultsLoader.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityResultsLoader.java
@@ -16,11 +16,11 @@
package org.usergrid.persistence.query.ir.result;
-import java.util.List;
-
import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.Results;
+import java.util.List;
+
/** @author tnine */
public class EntityResultsLoader implements ResultsLoader {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/GeoIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/GeoIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/GeoIterator.java
index 121f257..5c82268 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/GeoIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/GeoIterator.java
@@ -16,17 +16,7 @@
package org.usergrid.persistence.query.ir.result;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.StringSerializer;
import org.usergrid.persistence.cassandra.CursorCache;
import org.usergrid.persistence.geo.EntityLocationRef;
import org.usergrid.persistence.geo.GeoIndexSearcher;
@@ -34,7 +24,8 @@ import org.usergrid.persistence.geo.GeoIndexSearcher.SearchResults;
import org.usergrid.persistence.geo.model.Point;
import org.usergrid.persistence.query.ir.QuerySlice;
-import me.prettyprint.cassandra.serializers.StringSerializer;
+import java.nio.ByteBuffer;
+import java.util.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IDLoader.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IDLoader.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IDLoader.java
index 49d891a..6d03047 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IDLoader.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IDLoader.java
@@ -1,10 +1,10 @@
package org.usergrid.persistence.query.ir.result;
-import java.util.List;
-
import org.usergrid.persistence.Results;
+import java.util.List;
+
public class IDLoader implements ResultsLoader {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IntersectionIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IntersectionIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IntersectionIterator.java
index 4ffad1b..d2e8277 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IntersectionIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IntersectionIterator.java
@@ -16,14 +16,13 @@
package org.usergrid.persistence.query.ir.result;
+import com.google.common.collect.Sets;
+import org.usergrid.persistence.cassandra.CursorCache;
+
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.UUID;
-import org.usergrid.persistence.cassandra.CursorCache;
-
-import com.google.common.collect.Sets;
-
/**
* An iterator that unions 1 or more subsets. It makes the assuming that sub iterators iterate from min(uuid) to
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/OrderByIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/OrderByIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/OrderByIterator.java
index 1c1bc31..a7ad3d4 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/OrderByIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/OrderByIterator.java
@@ -16,19 +16,8 @@
package org.usergrid.persistence.query.ir.result;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.UUIDSerializer;
+import org.apache.commons.collections.comparators.ComparatorChain;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
@@ -39,9 +28,8 @@ import org.usergrid.persistence.Query.SortPredicate;
import org.usergrid.persistence.cassandra.CursorCache;
import org.usergrid.persistence.query.ir.QuerySlice;
-import org.apache.commons.collections.comparators.ComparatorChain;
-
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
+import java.nio.ByteBuffer;
+import java.util.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultIterator.java
index 5b3e666..f45afc6 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultIterator.java
@@ -16,12 +16,12 @@
package org.usergrid.persistence.query.ir.result;
+import org.usergrid.persistence.cassandra.CursorCache;
+
import java.util.Iterator;
import java.util.Set;
import java.util.UUID;
-import org.usergrid.persistence.cassandra.CursorCache;
-
/**
* Interface for iterating slice results per node. This is to be used to iterate and join or intersect values Each
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultsLoader.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultsLoader.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultsLoader.java
index d7a925a..9802885 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultsLoader.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultsLoader.java
@@ -16,10 +16,10 @@
package org.usergrid.persistence.query.ir.result;
-import java.util.List;
-
import org.usergrid.persistence.Results;
+import java.util.List;
+
/** @author tnine */
public interface ResultsLoader {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SecondaryIndexSliceParser.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SecondaryIndexSliceParser.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SecondaryIndexSliceParser.java
index f003c96..76f7f55 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SecondaryIndexSliceParser.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SecondaryIndexSliceParser.java
@@ -16,11 +16,11 @@
package org.usergrid.persistence.query.ir.result;
+import me.prettyprint.hector.api.beans.DynamicComposite;
+
import java.nio.ByteBuffer;
import java.util.UUID;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-
/**
* Parser for reading and writing secondary index composites
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SliceIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SliceIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SliceIterator.java
index 6cc833d..7ea0610 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SliceIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SliceIterator.java
@@ -16,13 +16,7 @@
package org.usergrid.persistence.query.ir.result;
-import java.nio.ByteBuffer;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.UUID;
-
+import me.prettyprint.hector.api.beans.HColumn;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.cassandra.CursorCache;
@@ -30,7 +24,8 @@ import org.usergrid.persistence.cassandra.index.IndexScanner;
import org.usergrid.persistence.exceptions.QueryIterationException;
import org.usergrid.persistence.query.ir.QuerySlice;
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/StaticIdIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/StaticIdIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/StaticIdIterator.java
index 6ca1e89..87e3268 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/StaticIdIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/StaticIdIterator.java
@@ -1,14 +1,14 @@
package org.usergrid.persistence.query.ir.result;
+import org.usergrid.persistence.cassandra.CursorCache;
+
import java.nio.ByteBuffer;
import java.util.Collections;
import java.util.Iterator;
import java.util.Set;
import java.util.UUID;
-import org.usergrid.persistence.cassandra.CursorCache;
-
/** Simple iterator that just returns UUIDs that are set into it */
public class StaticIdIterator implements ResultIterator {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SubtractionIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SubtractionIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SubtractionIterator.java
index b654496..0aac486 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SubtractionIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SubtractionIterator.java
@@ -16,14 +16,13 @@
package org.usergrid.persistence.query.ir.result;
+import com.google.common.collect.Sets;
+import org.usergrid.persistence.cassandra.CursorCache;
+
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.UUID;
-import org.usergrid.persistence.cassandra.CursorCache;
-
-import com.google.common.collect.Sets;
-
/**
* Simple iterator to perform Unions
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UUIDIndexSliceParser.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UUIDIndexSliceParser.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UUIDIndexSliceParser.java
index c3278de..cb9c6d6 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UUIDIndexSliceParser.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UUIDIndexSliceParser.java
@@ -16,11 +16,11 @@
package org.usergrid.persistence.query.ir.result;
+import me.prettyprint.cassandra.serializers.UUIDSerializer;
+
import java.nio.ByteBuffer;
import java.util.UUID;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-
/**
* Parser for reading and writing secondary index composites
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java
index efd4e3d..091e745 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java
@@ -16,20 +16,12 @@
package org.usergrid.persistence.query.ir.result;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.UUIDSerializer;
import org.usergrid.persistence.cassandra.CursorCache;
import org.usergrid.utils.UUIDUtils;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
+import java.nio.ByteBuffer;
+import java.util.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/tree/UUIDLiteral.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/tree/UUIDLiteral.java b/stack/core/src/main/java/org/usergrid/persistence/query/tree/UUIDLiteral.java
index b1420da..5d8969e 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/tree/UUIDLiteral.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/tree/UUIDLiteral.java
@@ -16,11 +16,11 @@
package org.usergrid.persistence.query.tree;
-import java.util.UUID;
-
import org.antlr.runtime.ClassicToken;
import org.antlr.runtime.Token;
+import java.util.UUID;
+
/** @author tnine */
public class UUIDLiteral extends Literal<UUID> {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/schema/CollectionInfo.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/schema/CollectionInfo.java b/stack/core/src/main/java/org/usergrid/persistence/schema/CollectionInfo.java
index 6cc01e5..9e46b32 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/schema/CollectionInfo.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/schema/CollectionInfo.java
@@ -16,14 +16,14 @@
package org.usergrid.persistence.schema;
+import org.usergrid.persistence.Schema;
+import org.usergrid.persistence.annotations.EntityCollection;
+
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.TreeSet;
-import org.usergrid.persistence.Schema;
-import org.usergrid.persistence.annotations.EntityCollection;
-
public class CollectionInfo {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/schema/EntityInfo.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/schema/EntityInfo.java b/stack/core/src/main/java/org/usergrid/persistence/schema/EntityInfo.java
index e6480d3..db6c103 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/schema/EntityInfo.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/schema/EntityInfo.java
@@ -16,14 +16,14 @@
package org.usergrid.persistence.schema;
+import org.usergrid.persistence.Schema;
+
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
-import org.usergrid.persistence.Schema;
-
public class EntityInfo {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/system/UsergridSystemMonitor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/system/UsergridSystemMonitor.java b/stack/core/src/main/java/org/usergrid/system/UsergridSystemMonitor.java
index 68dad28..c40aaae 100644
--- a/stack/core/src/main/java/org/usergrid/system/UsergridSystemMonitor.java
+++ b/stack/core/src/main/java/org/usergrid/system/UsergridSystemMonitor.java
@@ -1,16 +1,15 @@
package org.usergrid.system;
-import java.util.Properties;
-
+import me.prettyprint.hector.api.Cluster;
+import me.prettyprint.hector.api.exceptions.HectorException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.utils.JsonUtils;
import org.usergrid.utils.MapUtils;
import org.usergrid.utils.TimeUtils;
-import me.prettyprint.hector.api.Cluster;
-import me.prettyprint.hector.api.exceptions.HectorException;
+import java.util.Properties;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/AESUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/AESUtils.java b/stack/core/src/main/java/org/usergrid/utils/AESUtils.java
index b409599..eca8c58 100644
--- a/stack/core/src/main/java/org/usergrid/utils/AESUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/AESUtils.java
@@ -18,15 +18,14 @@
package org.usergrid.utils;
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.SecretKeySpec;
-
import org.apache.commons.codec.binary.Base64;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+
import static org.apache.commons.lang.StringUtils.rightPad;
import static org.apache.commons.lang.StringUtils.substring;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/CodecUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/CodecUtils.java b/stack/core/src/main/java/org/usergrid/utils/CodecUtils.java
index 56acce5..e2be6bb 100644
--- a/stack/core/src/main/java/org/usergrid/utils/CodecUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/CodecUtils.java
@@ -17,10 +17,10 @@
package org.usergrid.utils;
-import java.util.UUID;
-
import org.apache.commons.codec.binary.Base64;
+import java.util.UUID;
+
import static org.usergrid.utils.ConversionUtils.bytes;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/CompositeUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/CompositeUtils.java b/stack/core/src/main/java/org/usergrid/utils/CompositeUtils.java
index db63d86..85b36ab 100644
--- a/stack/core/src/main/java/org/usergrid/utils/CompositeUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/CompositeUtils.java
@@ -17,13 +17,13 @@
package org.usergrid.utils;
-import java.nio.ByteBuffer;
-import java.util.List;
-
import me.prettyprint.hector.api.beans.AbstractComposite.Component;
import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
import me.prettyprint.hector.api.beans.DynamicComposite;
+import java.nio.ByteBuffer;
+import java.util.List;
+
public class CompositeUtils {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/ConversionUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/ConversionUtils.java b/stack/core/src/main/java/org/usergrid/utils/ConversionUtils.java
index 83cd5e4..8e48506 100644
--- a/stack/core/src/main/java/org/usergrid/utils/ConversionUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/ConversionUtils.java
@@ -17,20 +17,14 @@
package org.usergrid.utils;
-import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
+import org.apache.commons.lang.math.NumberUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.commons.lang.math.NumberUtils;
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.*;
/** Convenience methods for converting to and from formats, primarily between byte arrays and UUIDs, Strings,
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/HttpUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/HttpUtils.java b/stack/core/src/main/java/org/usergrid/utils/HttpUtils.java
index a088a37..1b398ad 100644
--- a/stack/core/src/main/java/org/usergrid/utils/HttpUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/HttpUtils.java
@@ -17,15 +17,15 @@
package org.usergrid.utils;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.utils.URLEncodedUtils;
+
import java.net.URI;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.utils.URLEncodedUtils;
-
public class HttpUtils {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/IndexUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/IndexUtils.java b/stack/core/src/main/java/org/usergrid/utils/IndexUtils.java
index 91f2a87..168fa9d 100644
--- a/stack/core/src/main/java/org/usergrid/utils/IndexUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/IndexUtils.java
@@ -17,36 +17,27 @@
package org.usergrid.utils;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.UUID;
-
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.analysis.tokenattributes.TermAttribute;
import org.apache.lucene.util.Version;
-
-import static org.usergrid.utils.ClassUtils.cast;
-import static org.usergrid.utils.ClassUtils.isBasicType;
-import static org.usergrid.utils.JsonUtils.quoteString;
-import static org.usergrid.utils.JsonUtils.toJsonNode;
-
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.node.ArrayNode;
import org.codehaus.jackson.node.ObjectNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.*;
+import java.util.Map.Entry;
+
+import static org.usergrid.utils.ClassUtils.cast;
+import static org.usergrid.utils.ClassUtils.isBasicType;
+import static org.usergrid.utils.JsonUtils.quoteString;
+import static org.usergrid.utils.JsonUtils.toJsonNode;
+
public class IndexUtils {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/JsonUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/JsonUtils.java b/stack/core/src/main/java/org/usergrid/utils/JsonUtils.java
index 6bd8300..17ff56e 100644
--- a/stack/core/src/main/java/org/usergrid/utils/JsonUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/JsonUtils.java
@@ -17,19 +17,6 @@
package org.usergrid.utils;
-import java.io.File;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.usergrid.exception.JsonReadException;
-import org.usergrid.exception.JsonWriteException;
-import org.usergrid.persistence.Entity;
-
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.io.JsonStringEncoder;
import org.codehaus.jackson.map.ObjectMapper;
@@ -37,9 +24,16 @@ import org.codehaus.jackson.map.SerializationConfig.Feature;
import org.codehaus.jackson.smile.SmileFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.usergrid.exception.JsonReadException;
+import org.usergrid.exception.JsonWriteException;
+import org.usergrid.persistence.Entity;
-import static org.apache.commons.lang.StringUtils.substringAfter;
+import java.io.File;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.util.*;
+import static org.apache.commons.lang.StringUtils.substringAfter;
import static org.usergrid.utils.StringUtils.stringOrSubstringBeforeFirst;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/ListUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/ListUtils.java b/stack/core/src/main/java/org/usergrid/utils/ListUtils.java
index 63050ee..e861506 100644
--- a/stack/core/src/main/java/org/usergrid/utils/ListUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/ListUtils.java
@@ -17,16 +17,15 @@
package org.usergrid.utils;
+import org.apache.commons.lang.math.NumberUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.UUID;
-import org.apache.commons.lang.math.NumberUtils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
public class ListUtils extends org.apache.commons.collections.ListUtils {
private static final Logger LOG = LoggerFactory.getLogger( ListUtils.class );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/MailUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/MailUtils.java b/stack/core/src/main/java/org/usergrid/utils/MailUtils.java
index a74d172..06120c9 100644
--- a/stack/core/src/main/java/org/usergrid/utils/MailUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/MailUtils.java
@@ -17,23 +17,17 @@
package org.usergrid.utils;
-import java.util.Properties;
+import com.google.common.base.Preconditions;
+import org.jsoup.Jsoup;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Session;
import javax.mail.Transport;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
-
-import org.jsoup.Jsoup;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Preconditions;
+import javax.mail.internet.*;
+import java.util.Properties;
import static org.usergrid.utils.MapUtils.filter;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/MapUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/MapUtils.java b/stack/core/src/main/java/org/usergrid/utils/MapUtils.java
index bf1e1b8..c5e513d 100644
--- a/stack/core/src/main/java/org/usergrid/utils/MapUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/MapUtils.java
@@ -17,20 +17,10 @@
package org.usergrid.utils;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
import static org.apache.commons.lang.StringUtils.isNotBlank;
-
import static org.usergrid.utils.ClassUtils.cast;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/StringUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/StringUtils.java b/stack/core/src/main/java/org/usergrid/utils/StringUtils.java
index 373748a..7f5c4c3 100644
--- a/stack/core/src/main/java/org/usergrid/utils/StringUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/StringUtils.java
@@ -17,13 +17,12 @@
package org.usergrid.utils;
-import java.util.Arrays;
-
import org.apache.commons.io.IOUtils;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Arrays;
+
import static org.usergrid.utils.ConversionUtils.string;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/UUIDUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/UUIDUtils.java b/stack/core/src/main/java/org/usergrid/utils/UUIDUtils.java
index 110a20c..9b994c8 100644
--- a/stack/core/src/main/java/org/usergrid/utils/UUIDUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/UUIDUtils.java
@@ -17,6 +17,11 @@
package org.usergrid.utils;
+import com.fasterxml.uuid.EthernetAddress;
+import com.fasterxml.uuid.UUIDComparator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.Collections;
import java.util.List;
import java.util.Random;
@@ -25,20 +30,9 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantLock;
-import com.fasterxml.uuid.EthernetAddress;
-import com.fasterxml.uuid.UUIDComparator;
-
-import static com.fasterxml.uuid.impl.UUIDUtil.BYTE_OFFSET_CLOCK_HI;
-import static com.fasterxml.uuid.impl.UUIDUtil.BYTE_OFFSET_CLOCK_LO;
-import static com.fasterxml.uuid.impl.UUIDUtil.BYTE_OFFSET_CLOCK_MID;
-import static com.fasterxml.uuid.impl.UUIDUtil.BYTE_OFFSET_CLOCK_SEQUENCE;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import static com.fasterxml.uuid.impl.UUIDUtil.*;
import static org.apache.commons.codec.binary.Base64.decodeBase64;
import static org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString;
-
import static org.usergrid.utils.ConversionUtils.bytes;
import static org.usergrid.utils.ConversionUtils.uuid;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/Version.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/Version.java b/stack/core/src/main/java/org/usergrid/utils/Version.java
index 0c4ac32..51e7e82 100644
--- a/stack/core/src/main/java/org/usergrid/utils/Version.java
+++ b/stack/core/src/main/java/org/usergrid/utils/Version.java
@@ -46,12 +46,12 @@ package org.usergrid.utils;
* POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
+import org.apache.commons.lang.StringUtils;
+
import java.io.Serializable;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.lang.StringUtils;
-
/**
* The Version class can be used to parse a standard version string into its four components,
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/Application.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/Application.java b/stack/core/src/test/java/org/usergrid/Application.java
index 861c89a..c55b0af 100644
--- a/stack/core/src/test/java/org/usergrid/Application.java
+++ b/stack/core/src/test/java/org/usergrid/Application.java
@@ -1,14 +1,14 @@
package org.usergrid;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.rules.TestRule;
import org.usergrid.persistence.Entity;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.Results;
+import java.util.Map;
+import java.util.UUID;
+
/**
* A Usergrid Application object used to simplify Test code by making it much more readable and removing unnecessary
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/ConcurrentCoreITSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/ConcurrentCoreITSuite.java b/stack/core/src/test/java/org/usergrid/ConcurrentCoreITSuite.java
index e5bdb05..7bac7ab 100644
--- a/stack/core/src/test/java/org/usergrid/ConcurrentCoreITSuite.java
+++ b/stack/core/src/test/java/org/usergrid/ConcurrentCoreITSuite.java
@@ -23,15 +23,7 @@ import org.usergrid.cassandra.CassandraResource;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.cassandra.ConcurrentSuite;
import org.usergrid.mq.MessagesIT;
-import org.usergrid.persistence.CollectionIT;
-import org.usergrid.persistence.CounterIT;
-import org.usergrid.persistence.EntityConnectionsIT;
-import org.usergrid.persistence.EntityDictionaryIT;
-import org.usergrid.persistence.EntityManagerIT;
-import org.usergrid.persistence.GeoIT;
-import org.usergrid.persistence.IndexIT;
-import org.usergrid.persistence.PathQueryIT;
-import org.usergrid.persistence.PermissionsIT;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.cassandra.EntityManagerFactoryImplIT;
import org.usergrid.system.UsergridSystemMonitorIT;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/ConcurrentCoreIteratorITSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/ConcurrentCoreIteratorITSuite.java b/stack/core/src/test/java/org/usergrid/ConcurrentCoreIteratorITSuite.java
index 9787dcb..e431845 100644
--- a/stack/core/src/test/java/org/usergrid/ConcurrentCoreIteratorITSuite.java
+++ b/stack/core/src/test/java/org/usergrid/ConcurrentCoreIteratorITSuite.java
@@ -7,35 +7,7 @@ import org.junit.runners.Suite;
import org.usergrid.cassandra.CassandraResource;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.cassandra.ConcurrentSuite;
-import org.usergrid.persistence.query.AllInCollectionIT;
-import org.usergrid.persistence.query.AllInConnectionIT;
-import org.usergrid.persistence.query.AllInConnectionNoTypeIT;
-import org.usergrid.persistence.query.MultiOrderByCollectionIT;
-import org.usergrid.persistence.query.MultiOrderByComplexUnionCollectionIT;
-import org.usergrid.persistence.query.MultiOrderByComplexUnionConnectionIT;
-import org.usergrid.persistence.query.SingleOrderByBoundRangeScanAscCollectionIT;
-import org.usergrid.persistence.query.SingleOrderByBoundRangeScanAscConnectionIT;
-import org.usergrid.persistence.query.SingleOrderByBoundRangeScanDescCollectionIT;
-import org.usergrid.persistence.query.SingleOrderByBoundRangeScanDescConnectionIT;
-import org.usergrid.persistence.query.SingleOrderByComplexIntersectionCollectionIT;
-import org.usergrid.persistence.query.SingleOrderByComplexIntersectionConnectionIT;
-import org.usergrid.persistence.query.SingleOrderByComplexUnionCollectionIT;
-import org.usergrid.persistence.query.SingleOrderByComplexUnionConnectionIT;
-import org.usergrid.persistence.query.SingleOrderByLessThanLimitCollectionIT;
-import org.usergrid.persistence.query.SingleOrderByLessThanLimitConnectionIT;
-import org.usergrid.persistence.query.SingleOrderByMaxLimitCollectionIT;
-import org.usergrid.persistence.query.SingleOrderByMaxLimitConnectionIT;
-import org.usergrid.persistence.query.SingleOrderByNoIntersectionCollectionIT;
-import org.usergrid.persistence.query.SingleOrderByNoIntersectionConnectionIT;
-import org.usergrid.persistence.query.SingleOrderByNotCollectionIT;
-import org.usergrid.persistence.query.SingleOrderByNotConnectionIT;
-import org.usergrid.persistence.query.SingleOrderBySameRangeScanGreaterCollectionIT;
-import org.usergrid.persistence.query.SingleOrderBySameRangeScanGreaterConnectionIT;
-import org.usergrid.persistence.query.SingleOrderBySameRangeScanGreaterThanEqualCollectionIT;
-import org.usergrid.persistence.query.SingleOrderBySameRangeScanLessCollectionIT;
-import org.usergrid.persistence.query.SingleOrderBySameRangeScanLessConnectionIT;
-import org.usergrid.persistence.query.SingleOrderBySameRangeScanLessThanEqualCollectionIT;
-import org.usergrid.persistence.query.SingleOrderBySameRangeScanLessThanEqualConnectionIT;
+import org.usergrid.persistence.query.*;
@RunWith(ConcurrentSuite.class)
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/ConcurrentCoreTestSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/ConcurrentCoreTestSuite.java b/stack/core/src/test/java/org/usergrid/ConcurrentCoreTestSuite.java
index 319a3ff..c5c3d03 100644
--- a/stack/core/src/test/java/org/usergrid/ConcurrentCoreTestSuite.java
+++ b/stack/core/src/test/java/org/usergrid/ConcurrentCoreTestSuite.java
@@ -7,11 +7,7 @@ import org.usergrid.cassandra.Concurrent;
import org.usergrid.cassandra.ConcurrentSuite;
import org.usergrid.locking.zookeeper.ZookeeperLockManagerTest;
import org.usergrid.mq.QueuePathsTest;
-import org.usergrid.persistence.EntityTest;
-import org.usergrid.persistence.QueryTest;
-import org.usergrid.persistence.QueryUtilsTest;
-import org.usergrid.persistence.SchemaTest;
-import org.usergrid.persistence.UtilsTest;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.cassandra.QueryProcessorTest;
import org.usergrid.persistence.cassandra.SimpleIndexBucketLocatorImplTest;
import org.usergrid.persistence.query.ir.result.IntersectionIteratorTest;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/CoreApplication.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/CoreApplication.java b/stack/core/src/test/java/org/usergrid/CoreApplication.java
index 9f2218b..a6fc172 100644
--- a/stack/core/src/test/java/org/usergrid/CoreApplication.java
+++ b/stack/core/src/test/java/org/usergrid/CoreApplication.java
@@ -16,10 +16,6 @@
package org.usergrid;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
@@ -31,6 +27,10 @@ import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.Results;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
+
import static junit.framework.Assert.assertNotNull;
[14/23] organize imports only
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/test-utils/src/main/java/org/usergrid/cassandra/AvailablePortFinder.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/usergrid/cassandra/AvailablePortFinder.java b/stack/test-utils/src/main/java/org/usergrid/cassandra/AvailablePortFinder.java
index 54c35a5..b0ab346 100644
--- a/stack/test-utils/src/main/java/org/usergrid/cassandra/AvailablePortFinder.java
+++ b/stack/test-utils/src/main/java/org/usergrid/cassandra/AvailablePortFinder.java
@@ -20,6 +20,9 @@
package org.usergrid.cassandra;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.IOException;
import java.net.DatagramSocket;
import java.net.InetAddress;
@@ -29,9 +32,6 @@ import java.util.NoSuchElementException;
import java.util.Set;
import java.util.TreeSet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* Finds currently available server ports.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/test-utils/src/main/java/org/usergrid/cassandra/CassandraResource.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/usergrid/cassandra/CassandraResource.java b/stack/test-utils/src/main/java/org/usergrid/cassandra/CassandraResource.java
index ec31d90..9848d97 100644
--- a/stack/test-utils/src/main/java/org/usergrid/cassandra/CassandraResource.java
+++ b/stack/test-utils/src/main/java/org/usergrid/cassandra/CassandraResource.java
@@ -1,13 +1,10 @@
package org.usergrid.cassandra;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Map;
-import java.util.Properties;
-
+import org.apache.cassandra.service.CassandraDaemon;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang.math.RandomUtils;
import org.junit.rules.ExternalResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -15,10 +12,12 @@ import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.yaml.snakeyaml.Yaml;
-import org.apache.cassandra.service.CassandraDaemon;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.RandomStringUtils;
-import org.apache.commons.lang.math.RandomUtils;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Map;
+import java.util.Properties;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/test-utils/src/main/java/org/usergrid/cassandra/ClearShiroSubject.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/usergrid/cassandra/ClearShiroSubject.java b/stack/test-utils/src/main/java/org/usergrid/cassandra/ClearShiroSubject.java
index 10874e9..abe0e31 100644
--- a/stack/test-utils/src/main/java/org/usergrid/cassandra/ClearShiroSubject.java
+++ b/stack/test-utils/src/main/java/org/usergrid/cassandra/ClearShiroSubject.java
@@ -1,13 +1,12 @@
package org.usergrid.cassandra;
-import org.junit.rules.ExternalResource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.apache.shiro.subject.support.SubjectThreadState;
+import org.junit.rules.ExternalResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/** A {@link org.junit.rules.TestRule} that cleans up the Shiro Subject's ThreadState. */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentJunitRunner.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentJunitRunner.java b/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentJunitRunner.java
index 09fd8ec..1a72fe0 100644
--- a/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentJunitRunner.java
+++ b/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentJunitRunner.java
@@ -1,20 +1,15 @@
package org.usergrid.cassandra;
-import java.util.LinkedList;
-import java.util.Queue;
-import java.util.concurrent.CompletionService;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.atomic.AtomicInteger;
-
import org.junit.runners.BlockJUnit4ClassRunner;
import org.junit.runners.model.InitializationError;
import org.junit.runners.model.RunnerScheduler;
+import java.util.LinkedList;
+import java.util.Queue;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
/** @author Mathieu Carbou (mathieu.carbou@gmail.com) */
public class ConcurrentJunitRunner extends BlockJUnit4ClassRunner {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentSuite.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentSuite.java b/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentSuite.java
index 9bbadd4..e3f9192 100644
--- a/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentSuite.java
+++ b/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentSuite.java
@@ -1,18 +1,6 @@
package org.usergrid.cassandra;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Queue;
-import java.util.concurrent.CompletionService;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.atomic.AtomicInteger;
-
import org.junit.internal.builders.AllDefaultPossibilitiesBuilder;
import org.junit.runner.Runner;
import org.junit.runners.Suite;
@@ -20,6 +8,13 @@ import org.junit.runners.model.InitializationError;
import org.junit.runners.model.RunnerBuilder;
import org.junit.runners.model.RunnerScheduler;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
/** @author Mathieu Carbou (mathieu.carbou@gmail.com) */
public final class ConcurrentSuite extends Suite {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/test-utils/src/test/java/org/usergrid/cassandra/CassandraResourceTest.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/test/java/org/usergrid/cassandra/CassandraResourceTest.java b/stack/test-utils/src/test/java/org/usergrid/cassandra/CassandraResourceTest.java
index bd51c8d..db2b406 100644
--- a/stack/test-utils/src/test/java/org/usergrid/cassandra/CassandraResourceTest.java
+++ b/stack/test-utils/src/test/java/org/usergrid/cassandra/CassandraResourceTest.java
@@ -1,12 +1,12 @@
package org.usergrid.cassandra;
-import java.io.File;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+
import static junit.framework.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/ApiDoc.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/ApiDoc.java b/stack/tools/src/main/java/org/usergrid/tools/ApiDoc.java
index ef110ff..a35c3ed 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/ApiDoc.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/ApiDoc.java
@@ -16,17 +16,11 @@
package org.usergrid.tools;
-import java.io.File;
-import java.io.IOException;
-import java.util.Map;
-
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
+import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Schema;
@@ -38,11 +32,15 @@ import org.w3c.dom.Document;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-import org.apache.commons.io.FileUtils;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
import static org.usergrid.utils.StringUtils.readClasspathFileAsString;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/AppAudit.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/AppAudit.java b/stack/tools/src/main/java/org/usergrid/tools/AppAudit.java
index 97ad9e1..0973452 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/AppAudit.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/AppAudit.java
@@ -16,36 +16,21 @@
package org.usergrid.tools;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.management.ApplicationInfo;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.SimpleEntityRef;
-import org.usergrid.persistence.cassandra.CassandraService;
-
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.management.ApplicationInfo;
+import org.usergrid.persistence.*;
+import org.usergrid.persistence.cassandra.CassandraService;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import java.util.*;
+import java.util.Map.Entry;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/AppNameFix.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/AppNameFix.java b/stack/tools/src/main/java/org/usergrid/tools/AppNameFix.java
index d6286ae..f7de2dd 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/AppNameFix.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/AppNameFix.java
@@ -16,19 +16,18 @@
package org.usergrid.tools;
-import java.util.Map.Entry;
-import java.util.UUID;
-
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.persistence.entities.Application;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
+import java.util.Map.Entry;
+import java.util.UUID;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/Cli.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/Cli.java b/stack/tools/src/main/java/org/usergrid/tools/Cli.java
index ce55621..3e59f70 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/Cli.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/Cli.java
@@ -16,33 +16,27 @@
package org.usergrid.tools;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
import org.codehaus.jackson.JsonFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.exceptions.QueryParseException;
-import org.usergrid.services.ServiceAction;
-import org.usergrid.services.ServiceManager;
-import org.usergrid.services.ServiceParameter;
-import org.usergrid.services.ServicePayload;
-import org.usergrid.services.ServiceRequest;
-import org.usergrid.services.ServiceResults;
+import org.usergrid.services.*;
import org.usergrid.utils.HttpUtils;
import org.usergrid.utils.JsonUtils;
import org.usergrid.utils.UUIDUtils;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
import static org.usergrid.persistence.cassandra.CassandraService.DEFAULT_APPLICATION_ID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/Command.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/Command.java b/stack/tools/src/main/java/org/usergrid/tools/Command.java
index e674dea..40b90d7 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/Command.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/Command.java
@@ -16,12 +16,11 @@
package org.usergrid.tools;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-
+import org.apache.commons.beanutils.MethodUtils;
import org.springframework.util.StringUtils;
-import org.apache.commons.beanutils.MethodUtils;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
public class Command {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/CredExport.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/CredExport.java b/stack/tools/src/main/java/org/usergrid/tools/CredExport.java
index c022b94..bb5699f 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/CredExport.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/CredExport.java
@@ -16,16 +16,15 @@
package org.usergrid.tools;
-import java.util.UUID;
-
-import org.usergrid.management.ApplicationInfo;
-import org.usergrid.management.OrganizationInfo;
-import org.usergrid.utils.UUIDUtils;
-
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
+import org.usergrid.management.ApplicationInfo;
+import org.usergrid.management.OrganizationInfo;
+import org.usergrid.utils.UUIDUtils;
+
+import java.util.UUID;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/DupAdminRepair.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/DupAdminRepair.java b/stack/tools/src/main/java/org/usergrid/tools/DupAdminRepair.java
index d08d1ed..8ae1c6e 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/DupAdminRepair.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/DupAdminRepair.java
@@ -16,36 +16,25 @@
package org.usergrid.tools;
-import java.io.FileWriter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.OrganizationInfo;
import org.usergrid.management.UserInfo;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.SimpleEntityRef;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.persistence.entities.Application;
import org.usergrid.persistence.entities.User;
import org.usergrid.persistence.exceptions.DuplicateUniquePropertyExistsException;
import org.usergrid.utils.JsonUtils;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
+import java.io.FileWriter;
+import java.util.*;
import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/DupOrgRepair.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/DupOrgRepair.java b/stack/tools/src/main/java/org/usergrid/tools/DupOrgRepair.java
index d5bf2f2..2fee736 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/DupOrgRepair.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/DupOrgRepair.java
@@ -16,32 +16,26 @@
package org.usergrid.tools;
-import java.io.FileWriter;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.UUID;
-
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.OrganizationInfo;
import org.usergrid.management.UserInfo;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.SimpleEntityRef;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.persistence.entities.Application;
import org.usergrid.utils.JsonUtils;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
+import java.io.FileWriter;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.UUID;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/EntityCleanup.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/EntityCleanup.java b/stack/tools/src/main/java/org/usergrid/tools/EntityCleanup.java
index ba79980..72a9538 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/EntityCleanup.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/EntityCleanup.java
@@ -16,12 +16,13 @@
package org.usergrid.tools;
-import java.nio.ByteBuffer;
-import java.util.LinkedHashSet;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.mutation.Mutator;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
@@ -37,14 +38,11 @@ import org.usergrid.persistence.query.ir.result.ScanColumnTransformer;
import org.usergrid.persistence.query.ir.result.SliceIterator;
import org.usergrid.persistence.query.ir.result.UUIDIndexSliceParser;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.mutation.Mutator;
+import java.nio.ByteBuffer;
+import java.util.LinkedHashSet;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.UUID;
import static me.prettyprint.hector.api.factory.HFactory.createMutator;
import static org.usergrid.persistence.Schema.DICTIONARY_COLLECTIONS;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/EntityInsertBenchMark.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/EntityInsertBenchMark.java b/stack/tools/src/main/java/org/usergrid/tools/EntityInsertBenchMark.java
index 917206e..c2f5216 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/EntityInsertBenchMark.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/EntityInsertBenchMark.java
@@ -16,14 +16,14 @@
package org.usergrid.tools;
-import java.nio.ByteBuffer;
-import java.util.Stack;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.beans.DynamicComposite;
+import me.prettyprint.hector.api.mutation.Mutator;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.DynamicEntity;
@@ -32,15 +32,13 @@ import org.usergrid.persistence.IndexBucketLocator.IndexType;
import org.usergrid.persistence.cassandra.EntityManagerImpl;
import org.usergrid.utils.UUIDUtils;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.mutation.Mutator;
+import java.nio.ByteBuffer;
+import java.util.Stack;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
import static me.prettyprint.hector.api.factory.HFactory.createMutator;
import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_INDEX;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/EntityReadBenchMark.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/EntityReadBenchMark.java b/stack/tools/src/main/java/org/usergrid/tools/EntityReadBenchMark.java
index 9483ddc..05c20d0 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/EntityReadBenchMark.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/EntityReadBenchMark.java
@@ -16,35 +16,11 @@
package org.usergrid.tools;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Stack;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.util.Assert;
-import org.usergrid.persistence.IndexBucketLocator;
-import org.usergrid.persistence.IndexBucketLocator.IndexType;
-import org.usergrid.persistence.cassandra.EntityManagerImpl;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
import com.yammer.metrics.Metrics;
import com.yammer.metrics.core.MetricPredicate;
import com.yammer.metrics.core.Timer;
import com.yammer.metrics.core.TimerContext;
import com.yammer.metrics.reporting.ConsoleReporter;
-
import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
import me.prettyprint.cassandra.serializers.DynamicCompositeSerializer;
import me.prettyprint.hector.api.Keyspace;
@@ -56,6 +32,23 @@ import me.prettyprint.hector.api.beans.Rows;
import me.prettyprint.hector.api.factory.HFactory;
import me.prettyprint.hector.api.query.MultigetSliceQuery;
import me.prettyprint.hector.api.query.QueryResult;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.Assert;
+import org.usergrid.persistence.IndexBucketLocator;
+import org.usergrid.persistence.IndexBucketLocator.IndexType;
+import org.usergrid.persistence.cassandra.EntityManagerImpl;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Stack;
+import java.util.UUID;
+import java.util.concurrent.*;
import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_INDEX;
import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_UNIQUE;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/EntityUpdate.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/EntityUpdate.java b/stack/tools/src/main/java/org/usergrid/tools/EntityUpdate.java
index a99ea3a..0d3159f 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/EntityUpdate.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/EntityUpdate.java
@@ -1,27 +1,19 @@
package org.usergrid.tools;
-import java.io.File;
-import java.util.Map;
-
-import org.codehaus.jackson.map.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.management.ApplicationInfo;
-import org.usergrid.persistence.DynamicEntity;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.PagingResultsIterator;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.management.ApplicationInfo;
+import org.usergrid.persistence.*;
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import java.io.File;
+import java.util.Map;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/Export.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/Export.java b/stack/tools/src/main/java/org/usergrid/tools/Export.java
index f35da6b..15532dc 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/Export.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/Export.java
@@ -16,15 +16,8 @@
package org.usergrid.tools;
-import java.io.File;
-import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-
+import com.google.common.collect.BiMap;
+import org.apache.commons.cli.CommandLine;
import org.codehaus.jackson.JsonEncoding;
import org.codehaus.jackson.JsonFactory;
import org.codehaus.jackson.JsonGenerator;
@@ -32,19 +25,16 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.OrganizationInfo;
import org.usergrid.management.UserInfo;
-import org.usergrid.persistence.ConnectionRef;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.Results.Level;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.tools.bean.ExportOrg;
import org.usergrid.utils.JsonUtils;
-import org.apache.commons.cli.CommandLine;
-
-import com.google.common.collect.BiMap;
+import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.util.*;
+import java.util.Map.Entry;
public class Export extends ExportingToolBase {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/ExportDataCreator.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/ExportDataCreator.java b/stack/tools/src/main/java/org/usergrid/tools/ExportDataCreator.java
index 6e5a9bc..6213904 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/ExportDataCreator.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/ExportDataCreator.java
@@ -16,8 +16,6 @@
package org.usergrid.tools;
-import java.util.UUID;
-
import org.usergrid.management.ManagementService;
import org.usergrid.management.OrganizationOwnerInfo;
import org.usergrid.persistence.Entity;
@@ -26,6 +24,8 @@ import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.persistence.entities.Activity;
import org.usergrid.persistence.entities.User;
+import java.util.UUID;
+
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/ExportingToolBase.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/ExportingToolBase.java b/stack/tools/src/main/java/org/usergrid/tools/ExportingToolBase.java
index 88ee07a..c7864b5 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/ExportingToolBase.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/ExportingToolBase.java
@@ -14,11 +14,10 @@
package org.usergrid.tools;
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.UUID;
-
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
import org.codehaus.jackson.JsonFactory;
import org.codehaus.jackson.JsonGenerator;
import org.codehaus.jackson.impl.DefaultPrettyPrinter;
@@ -27,10 +26,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.utils.ConversionUtils;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.UUID;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/Import.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/Import.java b/stack/tools/src/main/java/org/usergrid/tools/Import.java
index 974cb51..7d9f346 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/Import.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/Import.java
@@ -16,14 +16,11 @@
package org.usergrid.tools;
-import java.io.File;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.UUID;
-
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
+import org.apache.commons.io.filefilter.PrefixFileFilter;
import org.codehaus.jackson.JsonFactory;
import org.codehaus.jackson.JsonParser;
import org.codehaus.jackson.JsonToken;
@@ -42,11 +39,9 @@ import org.usergrid.persistence.exceptions.DuplicateUniquePropertyExistsExceptio
import org.usergrid.tools.bean.ExportOrg;
import org.usergrid.utils.JsonUtils;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-import org.apache.commons.io.filefilter.PrefixFileFilter;
+import java.io.File;
+import java.util.*;
+import java.util.Map.Entry;
import static org.usergrid.persistence.Schema.PROPERTY_TYPE;
import static org.usergrid.persistence.Schema.PROPERTY_UUID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/ImportFB.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/ImportFB.java b/stack/tools/src/main/java/org/usergrid/tools/ImportFB.java
index ffdb3e3..20da217 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/ImportFB.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/ImportFB.java
@@ -16,6 +16,14 @@
package org.usergrid.tools;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.utils.JsonUtils;
+
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
@@ -24,15 +32,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.utils.JsonUtils;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
public class ImportFB extends ToolBase {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/IndexRebuild.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/IndexRebuild.java b/stack/tools/src/main/java/org/usergrid/tools/IndexRebuild.java
index fc33c56..a78a48d 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/IndexRebuild.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/IndexRebuild.java
@@ -16,13 +16,11 @@
package org.usergrid.tools;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
@@ -33,12 +31,8 @@ import org.usergrid.persistence.entities.Application;
import org.usergrid.persistence.exceptions.DuplicateUniquePropertyExistsException;
import org.usergrid.utils.UUIDUtils;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import java.util.*;
+import java.util.Map.Entry;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/Metrics.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/Metrics.java b/stack/tools/src/main/java/org/usergrid/tools/Metrics.java
index 5d36b81..f508951 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/Metrics.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/Metrics.java
@@ -1,15 +1,15 @@
package org.usergrid.tools;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.ListMultimap;
+import com.google.common.collect.Ordering;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
+import org.apache.commons.lang.time.DateUtils;
import org.codehaus.jackson.JsonGenerator;
import org.usergrid.management.ApplicationInfo;
import org.usergrid.management.OrganizationInfo;
@@ -21,16 +21,7 @@ import org.usergrid.tools.bean.MetricQuery;
import org.usergrid.tools.bean.MetricSort;
import org.usergrid.utils.TimeUtils;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-import org.apache.commons.lang.time.DateUtils;
-
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.ListMultimap;
-import com.google.common.collect.Ordering;
+import java.util.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/OrganizationExport.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/OrganizationExport.java b/stack/tools/src/main/java/org/usergrid/tools/OrganizationExport.java
index f5c2dc6..7834652 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/OrganizationExport.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/OrganizationExport.java
@@ -1,23 +1,21 @@
package org.usergrid.tools;
-import java.io.FileWriter;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.UUID;
-
+import au.com.bytecode.opencsv.CSVWriter;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
import org.usergrid.management.UserInfo;
import org.usergrid.persistence.Entity;
import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.Results;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import au.com.bytecode.opencsv.CSVWriter;
+import java.io.FileWriter;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.UUID;
import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/PopulateSample.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/PopulateSample.java b/stack/tools/src/main/java/org/usergrid/tools/PopulateSample.java
index c30039d..ec8b67f 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/PopulateSample.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/PopulateSample.java
@@ -16,10 +16,10 @@
package org.usergrid.tools;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.OrganizationInfo;
@@ -32,10 +32,9 @@ import org.usergrid.services.ServiceManager;
import org.usergrid.services.ServiceRequest;
import org.usergrid.services.ServiceResults;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/ResetSuperUser.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/ResetSuperUser.java b/stack/tools/src/main/java/org/usergrid/tools/ResetSuperUser.java
index 34294df..93da3a5 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/ResetSuperUser.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/ResetSuperUser.java
@@ -16,22 +16,17 @@
package org.usergrid.tools;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.management.AccountCreationProps;
-import org.usergrid.management.cassandra.ManagementServiceImpl;
-
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.management.AccountCreationProps;
+import org.usergrid.management.cassandra.ManagementServiceImpl;
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_LOGIN_ALLOWED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_LOGIN_EMAIL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_LOGIN_NAME;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_LOGIN_PASSWORD;
+import static org.usergrid.management.AccountCreationProps.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/SetupDB.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/SetupDB.java b/stack/tools/src/main/java/org/usergrid/tools/SetupDB.java
index 87f6921..6b810cc 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/SetupDB.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/SetupDB.java
@@ -16,13 +16,12 @@
package org.usergrid.tools;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SetupDB extends ToolBase {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/Test.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/Test.java b/stack/tools/src/main/java/org/usergrid/tools/Test.java
index e1b6166..e1b0309 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/Test.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/Test.java
@@ -16,13 +16,12 @@
package org.usergrid.tools;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class Test extends ToolBase {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/ToolBase.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/ToolBase.java b/stack/tools/src/main/java/org/usergrid/tools/ToolBase.java
index 3de74c8..af85679 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/ToolBase.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/ToolBase.java
@@ -17,8 +17,9 @@
package org.usergrid.tools;
-import java.util.Properties;
-
+import me.prettyprint.hector.testutils.EmbeddedServerHelper;
+import org.apache.commons.cli.*;
+import org.apache.commons.lang.ClassUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,17 +33,7 @@ import org.usergrid.persistence.cassandra.EntityManagerFactoryImpl;
import org.usergrid.persistence.cassandra.Setup;
import org.usergrid.services.ServiceManagerFactory;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.GnuParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.apache.commons.lang.ClassUtils;
-
-import me.prettyprint.hector.testutils.EmbeddedServerHelper;
+import java.util.Properties;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/UniqueIndexCleanup.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/UniqueIndexCleanup.java b/stack/tools/src/main/java/org/usergrid/tools/UniqueIndexCleanup.java
index 367d1da..4cee671 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/UniqueIndexCleanup.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/UniqueIndexCleanup.java
@@ -16,24 +16,20 @@
package org.usergrid.tools;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
+import me.prettyprint.hector.api.beans.DynamicComposite;
+import me.prettyprint.hector.api.beans.HColumn;
+import me.prettyprint.hector.api.mutation.Mutator;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.ApplicationInfo;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.EntityManagerFactory;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.IndexBucketLocator;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.IndexBucketLocator.IndexType;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.persistence.cassandra.EntityManagerImpl;
@@ -44,17 +40,9 @@ import org.usergrid.persistence.query.ir.result.SliceIterator;
import org.usergrid.persistence.query.ir.result.UUIDIndexSliceParser;
import org.usergrid.persistence.schema.CollectionInfo;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.mutation.Mutator;
+import java.nio.ByteBuffer;
+import java.util.*;
+import java.util.Map.Entry;
import static me.prettyprint.hector.api.factory.HFactory.createMutator;
import static org.usergrid.persistence.Schema.DICTIONARY_COLLECTIONS;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/UserManager.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/UserManager.java b/stack/tools/src/main/java/org/usergrid/tools/UserManager.java
index 727fde5..cb7095d 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/UserManager.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/UserManager.java
@@ -1,10 +1,9 @@
package org.usergrid.tools;
-import org.usergrid.management.UserInfo;
-
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Options;
+import org.usergrid.management.UserInfo;
import static org.usergrid.utils.JsonUtils.mapToFormattedJsonString;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/WarehouseExport.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/WarehouseExport.java b/stack/tools/src/main/java/org/usergrid/tools/WarehouseExport.java
index d6caed2..85c4a2c 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/WarehouseExport.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/WarehouseExport.java
@@ -17,27 +17,16 @@
package org.usergrid.tools;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.FilenameFilter;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
+import au.com.bytecode.opencsv.CSVReader;
+import au.com.bytecode.opencsv.CSVWriter;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Module;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
import org.jclouds.ContextBuilder;
import org.jclouds.blobstore.AsyncBlobStore;
import org.jclouds.blobstore.BlobStoreContext;
@@ -50,28 +39,20 @@ import org.jclouds.netty.config.NettyPayloadModule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.OrganizationInfo;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.Results.Level;
-import org.usergrid.persistence.Schema;
import org.usergrid.persistence.entities.Application;
import org.usergrid.persistence.schema.CollectionInfo;
import org.usergrid.utils.InflectionUtils;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import com.google.common.collect.BiMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.inject.Module;
-
-import au.com.bytecode.opencsv.CSVReader;
-import au.com.bytecode.opencsv.CSVWriter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.FilenameFilter;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.TimeUnit;
import static org.usergrid.persistence.Schema.getDefaultSchema;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/WarehouseUpsert.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/WarehouseUpsert.java b/stack/tools/src/main/java/org/usergrid/tools/WarehouseUpsert.java
index 2c75e81..a4128a0 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/WarehouseUpsert.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/WarehouseUpsert.java
@@ -14,15 +14,14 @@
package org.usergrid.tools;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.io.IOUtils;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
/** Upserts data from files found in an S3 bucket. */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/Api.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/Api.java b/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/Api.java
index 3a1b4ca..cb67f16 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/Api.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/Api.java
@@ -16,13 +16,13 @@
package org.usergrid.tools.apidoc.swagger;
-import java.util.List;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.usergrid.utils.JsonUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import java.util.List;
+
import static org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_NULL;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiListing.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiListing.java b/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiListing.java
index 1370fbf..1a37142 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiListing.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiListing.java
@@ -16,19 +16,18 @@
package org.usergrid.tools.apidoc.swagger;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.usergrid.utils.JsonUtils;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.util.List;
+import java.util.Map;
+
import static org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_NULL;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiOperation.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiOperation.java b/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiOperation.java
index 8c56ab6..c0acb89 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiOperation.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiOperation.java
@@ -16,13 +16,13 @@
package org.usergrid.tools.apidoc.swagger;
-import java.util.List;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.usergrid.utils.JsonUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import java.util.List;
+
import static org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_NULL;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiParamAllowableValues.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiParamAllowableValues.java b/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiParamAllowableValues.java
index bbe549c..8fa7025 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiParamAllowableValues.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiParamAllowableValues.java
@@ -16,11 +16,11 @@
package org.usergrid.tools.apidoc.swagger;
-import java.util.List;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.usergrid.utils.JsonUtils;
+import java.util.List;
+
import static org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_NULL;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/bean/ExportOrg.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/bean/ExportOrg.java b/stack/tools/src/main/java/org/usergrid/tools/bean/ExportOrg.java
index bb78c1e..af93d4d 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/bean/ExportOrg.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/bean/ExportOrg.java
@@ -16,11 +16,11 @@
package org.usergrid.tools.bean;
+import org.usergrid.management.OrganizationInfo;
+
import java.util.ArrayList;
import java.util.List;
-import org.usergrid.management.OrganizationInfo;
-
/** @author tnine */
public class ExportOrg extends OrganizationInfo {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/bean/MetricLine.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/bean/MetricLine.java b/stack/tools/src/main/java/org/usergrid/tools/bean/MetricLine.java
index dd4870f..8fb11c8 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/bean/MetricLine.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/bean/MetricLine.java
@@ -1,14 +1,13 @@
package org.usergrid.tools.bean;
-import java.util.List;
-import java.util.UUID;
-
-import org.usergrid.persistence.AggregateCounter;
-
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
+import org.usergrid.persistence.AggregateCounter;
+
+import java.util.List;
+import java.util.UUID;
/** @author zznate */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/bean/MetricQuery.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/bean/MetricQuery.java b/stack/tools/src/main/java/org/usergrid/tools/bean/MetricQuery.java
index 117c635..aaa18d3 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/bean/MetricQuery.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/bean/MetricQuery.java
@@ -1,19 +1,13 @@
package org.usergrid.tools.bean;
+import com.google.common.base.Preconditions;
+import org.usergrid.persistence.*;
+
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-import org.usergrid.persistence.AggregateCounter;
-import org.usergrid.persistence.AggregateCounterSet;
-import org.usergrid.persistence.CounterResolution;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-
-import com.google.common.base.Preconditions;
-
/** @author zznate */
public class MetricQuery {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketChannelHandler.java
----------------------------------------------------------------------
diff --git a/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketChannelHandler.java b/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketChannelHandler.java
index 2e3c0c1..009f39b 100644
--- a/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketChannelHandler.java
+++ b/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketChannelHandler.java
@@ -16,31 +16,16 @@
package org.usergrid.websocket;
-import java.security.MessageDigest;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-
+import org.apache.shiro.mgt.SessionsSecurityManager;
+import org.apache.shiro.subject.Subject;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import org.jboss.netty.channel.*;
import org.jboss.netty.channel.group.ChannelGroup;
import org.jboss.netty.channel.group.DefaultChannelGroup;
-import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
-import org.jboss.netty.handler.codec.http.HttpHeaders;
+import org.jboss.netty.handler.codec.http.*;
import org.jboss.netty.handler.codec.http.HttpHeaders.Names;
import org.jboss.netty.handler.codec.http.HttpHeaders.Values;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.handler.codec.http.HttpResponseStatus;
-import org.jboss.netty.handler.codec.http.QueryStringDecoder;
import org.jboss.netty.handler.codec.http.websocket.DefaultWebSocketFrame;
import org.jboss.netty.handler.codec.http.websocket.WebSocketFrame;
import org.jboss.netty.handler.codec.http.websocket.WebSocketFrameDecoder;
@@ -52,23 +37,12 @@ import org.usergrid.management.ManagementService;
import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.services.ServiceManagerFactory;
-import org.apache.shiro.mgt.SessionsSecurityManager;
-import org.apache.shiro.subject.Subject;
+import java.security.MessageDigest;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
-import static org.apache.commons.lang.StringUtils.isEmpty;
-import static org.apache.commons.lang.StringUtils.removeEnd;
-import static org.apache.commons.lang.StringUtils.split;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.CONNECTION;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.CONTENT_TYPE;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.ORIGIN;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_KEY1;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_KEY2;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_LOCATION;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_ORIGIN;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_PROTOCOL;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.WEBSOCKET_LOCATION;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.WEBSOCKET_ORIGIN;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.WEBSOCKET_PROTOCOL;
+import static org.apache.commons.lang.StringUtils.*;
+import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.*;
import static org.jboss.netty.handler.codec.http.HttpHeaders.Values.WEBSOCKET;
import static org.jboss.netty.handler.codec.http.HttpHeaders.isKeepAlive;
import static org.jboss.netty.handler.codec.http.HttpHeaders.setContentLength;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServer.java
----------------------------------------------------------------------
diff --git a/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServer.java b/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServer.java
index 3731609..da2e72a 100644
--- a/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServer.java
+++ b/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServer.java
@@ -31,10 +31,9 @@
package org.usergrid.websocket;
-import java.net.InetSocketAddress;
-import java.util.Properties;
-import java.util.concurrent.Executors;
-
+import org.apache.shiro.mgt.DefaultSecurityManager;
+import org.apache.shiro.mgt.SessionsSecurityManager;
+import org.apache.shiro.realm.Realm;
import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
@@ -51,9 +50,9 @@ import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.persistence.cassandra.EntityManagerFactoryImpl;
import org.usergrid.services.ServiceManagerFactory;
-import org.apache.shiro.mgt.DefaultSecurityManager;
-import org.apache.shiro.mgt.SessionsSecurityManager;
-import org.apache.shiro.realm.Realm;
+import java.net.InetSocketAddress;
+import java.util.Properties;
+import java.util.concurrent.Executors;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServerPipelineFactory.java
----------------------------------------------------------------------
diff --git a/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServerPipelineFactory.java b/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServerPipelineFactory.java
index ed88120..f296521 100644
--- a/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServerPipelineFactory.java
+++ b/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServerPipelineFactory.java
@@ -16,8 +16,7 @@
package org.usergrid.websocket;
-import javax.net.ssl.SSLEngine;
-
+import org.apache.shiro.mgt.SessionsSecurityManager;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelPipelineFactory;
import org.jboss.netty.handler.codec.http.HttpChunkAggregator;
@@ -29,7 +28,7 @@ import org.usergrid.management.ManagementService;
import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.services.ServiceManagerFactory;
-import org.apache.shiro.mgt.SessionsSecurityManager;
+import javax.net.ssl.SSLEngine;
import static org.jboss.netty.channel.Channels.pipeline;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketSslContextFactory.java
----------------------------------------------------------------------
diff --git a/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketSslContextFactory.java b/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketSslContextFactory.java
index 2780583..9ff6156 100644
--- a/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketSslContextFactory.java
+++ b/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketSslContextFactory.java
@@ -16,11 +16,10 @@
package org.usergrid.websocket;
-import java.security.KeyStore;
-import java.security.Security;
-
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
+import java.security.KeyStore;
+import java.security.Security;
public class WebSocketSslContextFactory {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/websocket/src/test/java/org/usergrid/websocket/SimpleMessageProducer.java
----------------------------------------------------------------------
diff --git a/stack/websocket/src/test/java/org/usergrid/websocket/SimpleMessageProducer.java b/stack/websocket/src/test/java/org/usergrid/websocket/SimpleMessageProducer.java
index 0dcf495..367b3d1 100644
--- a/stack/websocket/src/test/java/org/usergrid/websocket/SimpleMessageProducer.java
+++ b/stack/websocket/src/test/java/org/usergrid/websocket/SimpleMessageProducer.java
@@ -16,19 +16,18 @@
package org.usergrid.websocket;
-import java.util.Date;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jms.core.JmsTemplate;
import org.springframework.jms.core.MessageCreator;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import java.util.Date;
+
public class SimpleMessageProducer {
[18/23] organize imports only
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServer.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServer.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServer.java
index 1fb6c1c..4a5e787 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServer.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServer.java
@@ -16,11 +16,9 @@
package org.usergrid.mongo;
-import java.net.InetSocketAddress;
-import java.nio.ByteOrder;
-import java.util.Properties;
-import java.util.concurrent.Executors;
-
+import org.apache.shiro.mgt.DefaultSecurityManager;
+import org.apache.shiro.mgt.SessionsSecurityManager;
+import org.apache.shiro.realm.Realm;
import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.buffer.HeapChannelBufferFactory;
import org.jboss.netty.channel.Channel;
@@ -38,9 +36,10 @@ import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.persistence.cassandra.EntityManagerFactoryImpl;
import org.usergrid.services.ServiceManagerFactory;
-import org.apache.shiro.mgt.DefaultSecurityManager;
-import org.apache.shiro.mgt.SessionsSecurityManager;
-import org.apache.shiro.realm.Realm;
+import java.net.InetSocketAddress;
+import java.nio.ByteOrder;
+import java.util.Properties;
+import java.util.concurrent.Executors;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServerPipelineFactory.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServerPipelineFactory.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServerPipelineFactory.java
index 8b2f8ef..3a83d7a 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServerPipelineFactory.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServerPipelineFactory.java
@@ -16,6 +16,7 @@
package org.usergrid.mongo;
+import org.apache.shiro.mgt.SessionsSecurityManager;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelPipelineFactory;
import org.jboss.netty.channel.Channels;
@@ -24,8 +25,6 @@ import org.usergrid.management.ManagementService;
import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.services.ServiceManagerFactory;
-import org.apache.shiro.mgt.SessionsSecurityManager;
-
public class MongoServerPipelineFactory implements ChannelPipelineFactory {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/ListDatabases.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/ListDatabases.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/ListDatabases.java
index 30413ac..e67e594 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/ListDatabases.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/ListDatabases.java
@@ -16,11 +16,6 @@
package org.usergrid.mongo.commands;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.MessageEvent;
import org.usergrid.mongo.MongoChannelHandler;
@@ -28,6 +23,11 @@ import org.usergrid.mongo.protocol.OpQuery;
import org.usergrid.mongo.protocol.OpReply;
import org.usergrid.security.shiro.utils.SubjectUtils;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import static org.usergrid.utils.MapUtils.map;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/MongoCommand.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/MongoCommand.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/MongoCommand.java
index 445a589..d87d05b 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/MongoCommand.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/MongoCommand.java
@@ -16,8 +16,6 @@
package org.usergrid.mongo.commands;
-import java.util.concurrent.ConcurrentHashMap;
-
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.MessageEvent;
import org.slf4j.Logger;
@@ -27,6 +25,8 @@ import org.usergrid.mongo.MongoChannelHandler;
import org.usergrid.mongo.protocol.OpQuery;
import org.usergrid.mongo.protocol.OpReply;
+import java.util.concurrent.ConcurrentHashMap;
+
public abstract class MongoCommand {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/Whatsmyuri.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/Whatsmyuri.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/Whatsmyuri.java
index dea8b03..0ef1e24 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/Whatsmyuri.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/Whatsmyuri.java
@@ -16,14 +16,14 @@
package org.usergrid.mongo.commands;
-import java.net.InetSocketAddress;
-
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.MessageEvent;
import org.usergrid.mongo.MongoChannelHandler;
import org.usergrid.mongo.protocol.OpQuery;
import org.usergrid.mongo.protocol.OpReply;
+import java.net.InetSocketAddress;
+
import static org.usergrid.utils.MapUtils.entry;
import static org.usergrid.utils.MapUtils.map;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/Message.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/Message.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/Message.java
index e573abc..fab2c5b 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/Message.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/Message.java
@@ -16,6 +16,12 @@
package org.usergrid.mongo.protocol;
+import org.bson.BSONObject;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.usergrid.mongo.utils.BSONUtils;
+import org.usergrid.utils.StringUtils;
+
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
@@ -23,12 +29,6 @@ import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;
-import org.bson.BSONObject;
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.usergrid.mongo.utils.BSONUtils;
-import org.usergrid.utils.StringUtils;
-
public class Message {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpDelete.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpDelete.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpDelete.java
index 1c20b39..ed29738 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpDelete.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpDelete.java
@@ -16,11 +16,6 @@
package org.usergrid.mongo.protocol;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Map;
-import java.util.UUID;
-
import org.bson.BSONObject;
import org.bson.BasicBSONObject;
import org.jboss.netty.buffer.ChannelBuffer;
@@ -33,14 +28,15 @@ import org.usergrid.management.ApplicationInfo;
import org.usergrid.mongo.MongoChannelHandler;
import org.usergrid.mongo.query.MongoQueryParser;
import org.usergrid.mongo.utils.BSONUtils;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.Results.Level;
-import org.usergrid.persistence.SimpleEntityRef;
import org.usergrid.security.shiro.utils.SubjectUtils;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Map;
+import java.util.UUID;
+
public class OpDelete extends OpCrud {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpGetMore.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpGetMore.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpGetMore.java
index 632b7a3..186fe11 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpGetMore.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpGetMore.java
@@ -16,14 +16,14 @@
package org.usergrid.mongo.protocol;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.MessageEvent;
import org.usergrid.mongo.MongoChannelHandler;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
public class OpGetMore extends OpCrud {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpInsert.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpInsert.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpInsert.java
index e179ecb..df77251 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpInsert.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpInsert.java
@@ -16,12 +16,6 @@
package org.usergrid.mongo.protocol;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
import org.bson.BSONObject;
import org.bson.BasicBSONObject;
import org.bson.types.ObjectId;
@@ -38,6 +32,12 @@ import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.Identifier;
import org.usergrid.security.shiro.utils.SubjectUtils;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
public class OpInsert extends OpCrud {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpKillCursors.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpKillCursors.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpKillCursors.java
index 98ef335..373bced 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpKillCursors.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpKillCursors.java
@@ -16,12 +16,12 @@
package org.usergrid.mongo.protocol;
+import org.jboss.netty.buffer.ChannelBuffer;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.jboss.netty.buffer.ChannelBuffer;
-
public class OpKillCursors extends Message {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpMsg.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpMsg.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpMsg.java
index 3acebd3..af6002f 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpMsg.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpMsg.java
@@ -16,11 +16,11 @@
package org.usergrid.mongo.protocol;
+import org.jboss.netty.buffer.ChannelBuffer;
+
import java.io.IOException;
import java.nio.ByteBuffer;
-import org.jboss.netty.buffer.ChannelBuffer;
-
public class OpMsg extends Message {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpQuery.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpQuery.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpQuery.java
index 3374c2b..3fb2a9e 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpQuery.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpQuery.java
@@ -16,14 +16,8 @@
package org.usergrid.mongo.protocol;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.subject.Subject;
import org.bson.BSONObject;
import org.bson.BasicBSONObject;
import org.bson.types.ObjectId;
@@ -39,18 +33,18 @@ import org.usergrid.mongo.MongoChannelHandler;
import org.usergrid.mongo.commands.MongoCommand;
import org.usergrid.mongo.query.MongoQueryParser;
import org.usergrid.mongo.utils.BSONUtils;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.Schema;
+import org.usergrid.persistence.*;
import org.usergrid.security.shiro.PrincipalCredentialsToken;
import org.usergrid.security.shiro.utils.SubjectUtils;
import org.usergrid.utils.MapUtils;
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.subject.Subject;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
import static org.usergrid.utils.JsonUtils.toJsonMap;
import static org.usergrid.utils.MapUtils.entry;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpReply.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpReply.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpReply.java
index 92a6a6d..eb471b8 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpReply.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpReply.java
@@ -16,18 +16,18 @@
package org.usergrid.mongo.protocol;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
import org.bson.BSONObject;
import org.bson.BasicBSONObject;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBufferInputStream;
import org.usergrid.mongo.utils.BSONUtils;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
public class OpReply extends Message {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpUpdate.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpUpdate.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpUpdate.java
index 3e11d45..545bee5 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpUpdate.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpUpdate.java
@@ -16,10 +16,6 @@
package org.usergrid.mongo.protocol;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Map;
-
import org.bson.BSONObject;
import org.bson.BasicBSONObject;
import org.jboss.netty.buffer.ChannelBuffer;
@@ -32,13 +28,13 @@ import org.usergrid.management.ApplicationInfo;
import org.usergrid.mongo.MongoChannelHandler;
import org.usergrid.mongo.query.MongoQueryParser;
import org.usergrid.mongo.utils.BSONUtils;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
+import org.usergrid.persistence.*;
import org.usergrid.security.shiro.utils.SubjectUtils;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Map;
+
public class OpUpdate extends OpCrud {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/query/MongoQueryParser.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/query/MongoQueryParser.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/query/MongoQueryParser.java
index 89bd8cc..dc9bcdd 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/query/MongoQueryParser.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/query/MongoQueryParser.java
@@ -16,22 +16,15 @@
package org.usergrid.mongo.query;
-import java.util.Stack;
-
import org.antlr.runtime.ClassicToken;
import org.bson.BSONObject;
import org.bson.BasicBSONObject;
import org.bson.types.BasicBSONList;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.Query.SortDirection;
-import org.usergrid.persistence.query.tree.AndOperand;
-import org.usergrid.persistence.query.tree.Equal;
-import org.usergrid.persistence.query.tree.GreaterThan;
-import org.usergrid.persistence.query.tree.GreaterThanEqual;
-import org.usergrid.persistence.query.tree.LessThan;
-import org.usergrid.persistence.query.tree.LessThanEqual;
-import org.usergrid.persistence.query.tree.Operand;
-import org.usergrid.persistence.query.tree.OrOperand;
+import org.usergrid.persistence.query.tree.*;
+
+import java.util.Stack;
import static org.apache.commons.collections.MapUtils.getIntValue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyInboundHandler.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyInboundHandler.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyInboundHandler.java
index 9ee6f11..df2a88b 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyInboundHandler.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyInboundHandler.java
@@ -16,25 +16,18 @@
package org.usergrid.mongo.testproxy;
-import java.net.InetSocketAddress;
-import java.nio.ByteOrder;
-
import org.jboss.netty.bootstrap.ClientBootstrap;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
import org.jboss.netty.buffer.HeapChannelBufferFactory;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import org.jboss.netty.channel.*;
import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
import org.usergrid.mongo.MongoMessageDecoder;
import org.usergrid.mongo.protocol.Message;
+import java.net.InetSocketAddress;
+import java.nio.ByteOrder;
+
public class MongoProxyInboundHandler extends SimpleChannelUpstreamHandler {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyServer.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyServer.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyServer.java
index 24222da..cc97d37 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyServer.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyServer.java
@@ -16,11 +16,6 @@
package org.usergrid.mongo.testproxy;
-import java.net.InetSocketAddress;
-import java.nio.ByteOrder;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-
import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.buffer.HeapChannelBufferFactory;
import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
@@ -29,6 +24,11 @@ import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.net.InetSocketAddress;
+import java.nio.ByteOrder;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
public class MongoProxyServer {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/test/java/org/usergrid/mongo/AbstractMongoTest.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/test/java/org/usergrid/mongo/AbstractMongoTest.java b/stack/mongo-emulator/src/test/java/org/usergrid/mongo/AbstractMongoTest.java
index 7e9393c..60dd3e6 100644
--- a/stack/mongo-emulator/src/test/java/org/usergrid/mongo/AbstractMongoTest.java
+++ b/stack/mongo-emulator/src/test/java/org/usergrid/mongo/AbstractMongoTest.java
@@ -16,18 +16,17 @@
package org.usergrid.mongo;
-import java.net.UnknownHostException;
-import java.util.Properties;
-
+import com.mongodb.DB;
+import com.mongodb.Mongo;
+import com.mongodb.MongoException;
+import com.mongodb.WriteConcern;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.cassandra.EntityManagerFactoryImpl;
import org.usergrid.services.ServiceManagerFactory;
-import com.mongodb.DB;
-import com.mongodb.Mongo;
-import com.mongodb.MongoException;
-import com.mongodb.WriteConcern;
+import java.net.UnknownHostException;
+import java.util.Properties;
public abstract class AbstractMongoTest {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/test/java/org/usergrid/mongo/BasicMongoTest.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/test/java/org/usergrid/mongo/BasicMongoTest.java b/stack/mongo-emulator/src/test/java/org/usergrid/mongo/BasicMongoTest.java
index 55d660c..ce436ff 100644
--- a/stack/mongo-emulator/src/test/java/org/usergrid/mongo/BasicMongoTest.java
+++ b/stack/mongo-emulator/src/test/java/org/usergrid/mongo/BasicMongoTest.java
@@ -1,35 +1,19 @@
package org.usergrid.mongo;
+import com.mongodb.*;
+import org.bson.types.ObjectId;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.usergrid.mongo.protocol.OpDelete;
+import org.usergrid.persistence.*;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.UUID;
-import org.bson.types.ObjectId;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.usergrid.mongo.protocol.OpDelete;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.SimpleEntityRef;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DB;
-import com.mongodb.DBCollection;
-import com.mongodb.DBCursor;
-import com.mongodb.DBObject;
-import com.mongodb.MongoException;
-import com.mongodb.WriteConcern;
-import com.mongodb.WriteResult;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
@Ignore
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/test/java/org/usergrid/mongo/DatabaseInitializer.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/test/java/org/usergrid/mongo/DatabaseInitializer.java b/stack/mongo-emulator/src/test/java/org/usergrid/mongo/DatabaseInitializer.java
index f309035..5e07a27 100644
--- a/stack/mongo-emulator/src/test/java/org/usergrid/mongo/DatabaseInitializer.java
+++ b/stack/mongo-emulator/src/test/java/org/usergrid/mongo/DatabaseInitializer.java
@@ -16,9 +16,6 @@
package org.usergrid.mongo;
-import java.util.Map;
-import java.util.Properties;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +24,9 @@ import org.usergrid.mq.QueueManagerFactory;
import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.services.ServiceManagerFactory;
+import java.util.Map;
+import java.util.Properties;
+
public class DatabaseInitializer {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/test/java/org/usergrid/mongo/MongoQueryTest.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/test/java/org/usergrid/mongo/MongoQueryTest.java b/stack/mongo-emulator/src/test/java/org/usergrid/mongo/MongoQueryTest.java
index 3543933..dafbc89 100644
--- a/stack/mongo-emulator/src/test/java/org/usergrid/mongo/MongoQueryTest.java
+++ b/stack/mongo-emulator/src/test/java/org/usergrid/mongo/MongoQueryTest.java
@@ -1,26 +1,18 @@
package org.usergrid.mongo;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
+import com.mongodb.*;
import org.bson.types.BasicBSONList;
import org.junit.Ignore;
import org.junit.Test;
import org.usergrid.persistence.EntityManager;
-import com.mongodb.BasicDBObject;
-import com.mongodb.DB;
-import com.mongodb.DBCollection;
-import com.mongodb.DBCursor;
-import com.mongodb.DBObject;
-import com.mongodb.Mongo;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
@Ignore
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/query-validator/src/main/java/org/usergrid/query/validator/ApiServerRunner.java
----------------------------------------------------------------------
diff --git a/stack/query-validator/src/main/java/org/usergrid/query/validator/ApiServerRunner.java b/stack/query-validator/src/main/java/org/usergrid/query/validator/ApiServerRunner.java
index b7c5739..1624636 100644
--- a/stack/query-validator/src/main/java/org/usergrid/query/validator/ApiServerRunner.java
+++ b/stack/query-validator/src/main/java/org/usergrid/query/validator/ApiServerRunner.java
@@ -19,15 +19,14 @@ import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.JsonNode;
import org.springframework.http.HttpMethod;
import org.springframework.stereotype.Component;
+import org.usergrid.java.client.Client;
import org.usergrid.java.client.response.ApiResponse;
import org.usergrid.persistence.Entity;
+import org.usergrid.persistence.Schema;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import org.usergrid.java.client.Client;
-import org.usergrid.persistence.Schema;
-
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/query-validator/src/main/java/org/usergrid/query/validator/QueryRunner.java
----------------------------------------------------------------------
diff --git a/stack/query-validator/src/main/java/org/usergrid/query/validator/QueryRunner.java b/stack/query-validator/src/main/java/org/usergrid/query/validator/QueryRunner.java
index caabb96..8f89c1d 100644
--- a/stack/query-validator/src/main/java/org/usergrid/query/validator/QueryRunner.java
+++ b/stack/query-validator/src/main/java/org/usergrid/query/validator/QueryRunner.java
@@ -15,9 +15,10 @@
******************************************************************************/
package org.usergrid.query.validator;
-import java.util.List;
import org.usergrid.persistence.Entity;
+import java.util.List;
+
/**
* @author Sung-ju Jin(realbeast)
*/
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/query-validator/src/test/java/org/usergrid/query/validator/QueryValidationTest.java
----------------------------------------------------------------------
diff --git a/stack/query-validator/src/test/java/org/usergrid/query/validator/QueryValidationTest.java b/stack/query-validator/src/test/java/org/usergrid/query/validator/QueryValidationTest.java
index 5fbacb3..8716139 100644
--- a/stack/query-validator/src/test/java/org/usergrid/query/validator/QueryValidationTest.java
+++ b/stack/query-validator/src/test/java/org/usergrid/query/validator/QueryValidationTest.java
@@ -15,10 +15,10 @@
******************************************************************************/
package org.usergrid.query.validator;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.junit.Assert;
/**
* @author Sung-ju Jin(realbeast)
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/AbstractContextResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/AbstractContextResource.java b/stack/rest/src/main/java/org/usergrid/rest/AbstractContextResource.java
index ed56e00..9a82b1a 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/AbstractContextResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/AbstractContextResource.java
@@ -16,15 +16,12 @@
package org.usergrid.rest;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.Request;
-import javax.ws.rs.core.SecurityContext;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.core.HttpContext;
+import com.sun.jersey.api.core.ResourceContext;
+import com.sun.jersey.api.view.Viewable;
+import com.sun.jersey.spi.CloseableService;
+import net.tanesha.recaptcha.ReCaptcha;
+import net.tanesha.recaptcha.ReCaptchaFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.usergrid.management.ManagementService;
import org.usergrid.mq.QueueManagerFactory;
@@ -33,13 +30,9 @@ import org.usergrid.rest.exceptions.RedirectionException;
import org.usergrid.security.tokens.TokenService;
import org.usergrid.services.ServiceManagerFactory;
-import com.sun.jersey.api.core.HttpContext;
-import com.sun.jersey.api.core.ResourceContext;
-import com.sun.jersey.api.view.Viewable;
-import com.sun.jersey.spi.CloseableService;
-
-import net.tanesha.recaptcha.ReCaptcha;
-import net.tanesha.recaptcha.ReCaptchaFactory;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.*;
+import java.util.List;
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.apache.commons.lang.StringUtils.removeEnd;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/ApiResponse.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/ApiResponse.java b/stack/rest/src/main/java/org/usergrid/rest/ApiResponse.java
index 64ea870..c66fdec 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/ApiResponse.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/ApiResponse.java
@@ -16,16 +16,8 @@
package org.usergrid.rest;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
+import org.apache.commons.lang.ClassUtils;
+import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
@@ -41,8 +33,9 @@ import org.usergrid.services.ServiceRequest;
import org.usergrid.services.ServiceResults;
import org.usergrid.utils.InflectionUtils;
-import org.apache.commons.lang.ClassUtils;
-import org.apache.commons.lang.StringUtils;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.*;
import static org.usergrid.utils.InflectionUtils.pluralize;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/JacksonCustomMapperProvider.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/JacksonCustomMapperProvider.java b/stack/rest/src/main/java/org/usergrid/rest/JacksonCustomMapperProvider.java
index e25bf0b..838da83 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/JacksonCustomMapperProvider.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/JacksonCustomMapperProvider.java
@@ -16,11 +16,6 @@
package org.usergrid.rest;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.ext.ContextResolver;
-import javax.ws.rs.ext.Provider;
-
import org.codehaus.jackson.jaxrs.Annotations;
import org.codehaus.jackson.jaxrs.MapperConfigurator;
import org.codehaus.jackson.map.ObjectMapper;
@@ -30,6 +25,11 @@ import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.ContextResolver;
+import javax.ws.rs.ext.Provider;
+
@Provider
@Component
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/RootResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/RootResource.java b/stack/rest/src/main/java/org/usergrid/rest/RootResource.java
index bee1f27..f5e53a7 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/RootResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/RootResource.java
@@ -16,25 +16,15 @@
package org.usergrid.rest;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.UUID;
-
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.UriInfo;
-
+import com.google.common.collect.BiMap;
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.yammer.metrics.Metrics;
+import com.yammer.metrics.annotation.ExceptionMetered;
+import com.yammer.metrics.annotation.Timed;
+import com.yammer.metrics.core.*;
+import com.yammer.metrics.stats.Snapshot;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.UnauthorizedException;
import org.codehaus.jackson.node.JsonNodeFactory;
import org.codehaus.jackson.node.ObjectNode;
import org.slf4j.Logger;
@@ -49,26 +39,18 @@ import org.usergrid.rest.organizations.OrganizationResource;
import org.usergrid.rest.security.annotations.RequireSystemAccess;
import org.usergrid.system.UsergridSystemMonitor;
-import org.apache.commons.lang.StringUtils;
-import org.apache.shiro.authz.UnauthorizedException;
-
-import com.google.common.collect.BiMap;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.yammer.metrics.Metrics;
-import com.yammer.metrics.annotation.ExceptionMetered;
-import com.yammer.metrics.annotation.Timed;
-import com.yammer.metrics.core.Counter;
-import com.yammer.metrics.core.Gauge;
-import com.yammer.metrics.core.Histogram;
-import com.yammer.metrics.core.Metered;
-import com.yammer.metrics.core.Metric;
-import com.yammer.metrics.core.MetricName;
-import com.yammer.metrics.core.MetricProcessor;
-import com.yammer.metrics.core.MetricsRegistry;
-import com.yammer.metrics.core.Sampling;
-import com.yammer.metrics.core.Summarizable;
-import com.yammer.metrics.core.Timer;
-import com.yammer.metrics.stats.Snapshot;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
+import javax.ws.rs.core.UriInfo;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.UUID;
import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/SwaggerServlet.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/SwaggerServlet.java b/stack/rest/src/main/java/org/usergrid/rest/SwaggerServlet.java
index 3c19ab5..f792acd 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/SwaggerServlet.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/SwaggerServlet.java
@@ -16,28 +16,19 @@
package org.usergrid.rest;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import org.apache.commons.lang.text.StrSubstitutor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
-import org.apache.commons.lang.text.StrSubstitutor;
+import javax.servlet.*;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
import static org.apache.commons.lang.StringUtils.isEmpty;
import static org.springframework.web.context.support.WebApplicationContextUtils.getRequiredWebApplicationContext;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/SystemResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/SystemResource.java b/stack/rest/src/main/java/org/usergrid/rest/SystemResource.java
index eb03173..efad0e8 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/SystemResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/SystemResource.java
@@ -16,22 +16,17 @@
package org.usergrid.rest;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.usergrid.rest.security.annotations.RequireSystemAccess;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
@Path("/system")
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/TextToJsonSwapWriter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/TextToJsonSwapWriter.java b/stack/rest/src/main/java/org/usergrid/rest/TextToJsonSwapWriter.java
index d39ea45..41162bc 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/TextToJsonSwapWriter.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/TextToJsonSwapWriter.java
@@ -1,27 +1,20 @@
package org.usergrid.rest;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.spi.MessageBodyWorkers;
+import org.codehaus.jackson.map.JsonSerializableWithType;
import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.GenericEntity;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.*;
import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;
import javax.xml.bind.annotation.XmlRootElement;
-
-import org.codehaus.jackson.map.JsonSerializable;
-import org.codehaus.jackson.map.JsonSerializableWithType;
-
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.spi.MessageBodyWorkers;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/ApplicationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/ApplicationResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/ApplicationResource.java
index 453538a..17095e2 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/ApplicationResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/ApplicationResource.java
@@ -16,27 +16,14 @@
package org.usergrid.rest.applications;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.api.view.Viewable;
+import org.apache.amber.oauth2.common.error.OAuthError;
+import org.apache.amber.oauth2.common.exception.OAuthProblemException;
+import org.apache.amber.oauth2.common.message.OAuthResponse;
+import org.apache.amber.oauth2.common.message.types.GrantType;
+import org.apache.shiro.authz.UnauthorizedException;
+import org.apache.shiro.codec.Base64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -64,21 +51,17 @@ import org.usergrid.rest.security.annotations.RequireApplicationAccess;
import org.usergrid.security.oauth.AccessInfo;
import org.usergrid.security.oauth.ClientCredentialsInfo;
-import org.apache.amber.oauth2.common.error.OAuthError;
-import org.apache.amber.oauth2.common.exception.OAuthProblemException;
-import org.apache.amber.oauth2.common.message.OAuthResponse;
-import org.apache.amber.oauth2.common.message.types.GrantType;
-import org.apache.shiro.authz.UnauthorizedException;
-import org.apache.shiro.codec.Base64;
-
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.api.view.Viewable;
+import javax.ws.rs.*;
+import javax.ws.rs.core.*;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Map;
+import java.util.UUID;
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.usergrid.rest.exceptions.SecurityException.mappableSecurityException;
import static org.usergrid.security.oauth.ClientCredentialsInfo.getUUIDFromClientId;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/AuthResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/AuthResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/AuthResource.java
index 3a5c71d..8d74792 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/AuthResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/AuthResource.java
@@ -16,19 +16,9 @@
package org.usergrid.rest.applications;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
+import org.apache.amber.oauth2.common.error.OAuthError;
+import org.apache.amber.oauth2.common.message.OAuthResponse;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,17 +32,16 @@ import org.usergrid.security.providers.SignInAsProvider;
import org.usergrid.security.providers.SignInProviderFactory;
import org.usergrid.services.ServiceManager;
-import org.apache.amber.oauth2.common.error.OAuthError;
-import org.apache.amber.oauth2.common.message.OAuthResponse;
-import org.apache.commons.lang.StringUtils;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
-
-import static org.usergrid.rest.utils.JSONPUtils.jsonMediaType;
-import static org.usergrid.rest.utils.JSONPUtils.wrapJSONPResponse;
-import static org.usergrid.rest.utils.JSONPUtils.wrapWithCallback;
+import static org.usergrid.rest.utils.JSONPUtils.*;
@Component
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java
index 33ab281..dcd3489 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java
@@ -16,32 +16,13 @@
package org.usergrid.rest.applications;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.core.provider.EntityHolder;
+import com.sun.jersey.multipart.BodyPart;
+import com.sun.jersey.multipart.BodyPartEntity;
+import com.sun.jersey.multipart.FormDataBodyPart;
+import com.sun.jersey.multipart.FormDataMultiPart;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -56,32 +37,20 @@ import org.usergrid.rest.RootResource;
import org.usergrid.rest.applications.assets.AssetsResource;
import org.usergrid.rest.security.annotations.RequireApplicationAccess;
import org.usergrid.security.oauth.AccessInfo;
-import org.usergrid.services.ServiceAction;
-import org.usergrid.services.ServiceManager;
-import org.usergrid.services.ServiceParameter;
-import org.usergrid.services.ServicePayload;
-import org.usergrid.services.ServiceRequest;
-import org.usergrid.services.ServiceResults;
+import org.usergrid.services.*;
import org.usergrid.services.assets.data.AssetUtils;
import org.usergrid.services.assets.data.BinaryStore;
import org.usergrid.utils.InflectionUtils;
-import org.apache.commons.lang.StringUtils;
-
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.core.provider.EntityHolder;
-import com.sun.jersey.multipart.BodyPart;
-import com.sun.jersey.multipart.BodyPartEntity;
-import com.sun.jersey.multipart.FormDataBodyPart;
-import com.sun.jersey.multipart.FormDataMultiPart;
+import javax.ws.rs.*;
+import javax.ws.rs.core.*;
+import java.io.InputStream;
+import java.util.*;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
-
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.usergrid.services.ServiceParameter.addParameter;
-import static org.usergrid.services.ServicePayload.batchPayload;
-import static org.usergrid.services.ServicePayload.idListPayload;
-import static org.usergrid.services.ServicePayload.payload;
+import static org.usergrid.services.ServicePayload.*;
import static org.usergrid.utils.JsonUtils.mapToJsonString;
import static org.usergrid.utils.JsonUtils.normalizeJsonTree;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/assets/AssetsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/assets/AssetsResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/assets/AssetsResource.java
index 2af9925..e7a08b7 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/assets/AssetsResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/assets/AssetsResource.java
@@ -1,27 +1,8 @@
package org.usergrid.rest.applications.assets;
-import java.io.InputStream;
-import java.util.Date;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.multipart.FormDataParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,9 +17,12 @@ import org.usergrid.services.assets.data.AssetUtils;
import org.usergrid.services.assets.data.BinaryStore;
import org.usergrid.utils.StringUtils;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.core.header.FormDataContentDisposition;
-import com.sun.jersey.multipart.FormDataParam;
+import javax.ws.rs.*;
+import javax.ws.rs.core.*;
+import java.io.InputStream;
+import java.util.Date;
+import java.util.Map;
+import java.util.UUID;
/** @deprecated */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/events/EventsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/events/EventsResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/events/EventsResource.java
index 28b68ce..025f244 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/events/EventsResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/events/EventsResource.java
@@ -16,14 +16,7 @@
package org.usergrid.rest.applications.events;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -35,7 +28,13 @@ import org.usergrid.persistence.entities.User;
import org.usergrid.rest.applications.ApplicationResource;
import org.usergrid.rest.applications.ServiceResource;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
@Component("org.usergrid.rest.applications.events.EventsResource")
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueResource.java
index edbe028..528143a 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueResource.java
@@ -16,24 +16,9 @@
package org.usergrid.rest.applications.queues;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.core.provider.EntityHolder;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -45,10 +30,13 @@ import org.usergrid.mq.QueueQuery;
import org.usergrid.mq.QueueResults;
import org.usergrid.rest.AbstractContextResource;
-import org.apache.commons.lang.StringUtils;
-
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.core.provider.EntityHolder;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@Component
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriberResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriberResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriberResource.java
index 2c398fb..9a4ff07 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriberResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriberResource.java
@@ -16,23 +16,9 @@
package org.usergrid.rest.applications.queues;
-import java.util.List;
-import java.util.Map;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.core.provider.EntityHolder;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -41,10 +27,12 @@ import org.usergrid.mq.QueueManager;
import org.usergrid.mq.QueueSet;
import org.usergrid.rest.AbstractContextResource;
-import org.apache.commons.lang.StringUtils;
-
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.core.provider.EntityHolder;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.List;
+import java.util.Map;
@Component
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriptionResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriptionResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriptionResource.java
index a163c4c..033d621 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriptionResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriptionResource.java
@@ -16,23 +16,9 @@
package org.usergrid.rest.applications.queues;
-import java.util.List;
-import java.util.Map;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.core.provider.EntityHolder;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -41,10 +27,12 @@ import org.usergrid.mq.QueueManager;
import org.usergrid.mq.QueueSet;
import org.usergrid.rest.AbstractContextResource;
-import org.apache.commons.lang.StringUtils;
-
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.core.provider.EntityHolder;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.List;
+import java.util.Map;
@Component
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueTransactionsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueTransactionsResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueTransactionsResource.java
index 3bae506..b5e0b15 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueTransactionsResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueTransactionsResource.java
@@ -16,19 +16,7 @@
package org.usergrid.rest.applications.queues;
-import java.util.UUID;
-
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -38,7 +26,11 @@ import org.usergrid.mq.QueueQuery;
import org.usergrid.persistence.Results;
import org.usergrid.rest.AbstractContextResource;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.UUID;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/users/UserResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/users/UserResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/users/UserResource.java
index 10e5595..9c0dd96 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/users/UserResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/users/UserResource.java
@@ -16,25 +16,13 @@
package org.usergrid.rest.applications.users;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.api.view.Viewable;
+import net.tanesha.recaptcha.ReCaptchaImpl;
+import net.tanesha.recaptcha.ReCaptchaResponse;
+import org.apache.amber.oauth2.common.exception.OAuthProblemException;
+import org.apache.amber.oauth2.common.message.OAuthResponse;
+import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.JsonNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,23 +40,13 @@ import org.usergrid.rest.security.annotations.RequireApplicationAccess;
import org.usergrid.security.oauth.AccessInfo;
import org.usergrid.security.tokens.exceptions.TokenException;
-import org.apache.amber.oauth2.common.exception.OAuthProblemException;
-import org.apache.amber.oauth2.common.message.OAuthResponse;
-import org.apache.commons.lang.StringUtils;
-
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.api.view.Viewable;
-
-import net.tanesha.recaptcha.ReCaptchaImpl;
-import net.tanesha.recaptcha.ReCaptchaResponse;
-
-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
-import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
-import static javax.servlet.http.HttpServletResponse.SC_OK;
+import javax.ws.rs.*;
+import javax.ws.rs.core.*;
+import java.util.Map;
+import java.util.UUID;
-import static org.usergrid.security.shiro.utils.SubjectUtils.getSubjectUserId;
-import static org.usergrid.security.shiro.utils.SubjectUtils.isApplicationAdmin;
-import static org.usergrid.security.shiro.utils.SubjectUtils.isApplicationUser;
+import static javax.servlet.http.HttpServletResponse.*;
+import static org.usergrid.security.shiro.utils.SubjectUtils.*;
import static org.usergrid.utils.ConversionUtils.string;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/users/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/users/UsersResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/users/UsersResource.java
index 4a36c97..fa9a841 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/users/UsersResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/users/UsersResource.java
@@ -16,25 +16,11 @@
package org.usergrid.rest.applications.users;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.api.view.Viewable;
+import com.sun.jersey.core.provider.EntityHolder;
+import net.tanesha.recaptcha.ReCaptchaImpl;
+import net.tanesha.recaptcha.ReCaptchaResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -50,12 +36,14 @@ import org.usergrid.rest.applications.ServiceResource;
import org.usergrid.rest.exceptions.RedirectionException;
import org.usergrid.rest.security.annotations.RequireApplicationAccess;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.api.view.Viewable;
-import com.sun.jersey.core.provider.EntityHolder;
-
-import net.tanesha.recaptcha.ReCaptchaImpl;
-import net.tanesha.recaptcha.ReCaptchaResponse;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.PathSegment;
+import javax.ws.rs.core.UriInfo;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
import static org.apache.commons.lang.StringUtils.isBlank;
import static org.apache.commons.lang.StringUtils.isNotBlank;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/AbstractExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/AbstractExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/AbstractExceptionMapper.java
index 23e3453..b087c80 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/AbstractExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/AbstractExceptionMapper.java
@@ -16,6 +16,10 @@
package org.usergrid.rest.exceptions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.rest.ApiResponse;
+
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
@@ -23,14 +27,9 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import javax.ws.rs.ext.ExceptionMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.rest.ApiResponse;
-
import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
import static javax.ws.rs.core.Response.Status.OK;
-
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.usergrid.rest.utils.JSONPUtils.isJavascript;
import static org.usergrid.rest.utils.JSONPUtils.wrapJSONPResponse;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/AuthorizationExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/AuthorizationExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/AuthorizationExceptionMapper.java
index 1cc5535..8a97b3b 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/AuthorizationExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/AuthorizationExceptionMapper.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.exceptions;
+import org.apache.shiro.authz.AuthorizationException;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
-import org.apache.shiro.authz.AuthorizationException;
-
import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/DuplicateUniquePropertyExistsExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/DuplicateUniquePropertyExistsExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/DuplicateUniquePropertyExistsExceptionMapper.java
index 1b0e4dc..d6926e9 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/DuplicateUniquePropertyExistsExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/DuplicateUniquePropertyExistsExceptionMapper.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.exceptions;
+import org.usergrid.persistence.exceptions.DuplicateUniquePropertyExistsException;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
-import org.usergrid.persistence.exceptions.DuplicateUniquePropertyExistsException;
-
import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/EntityNotFoundExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/EntityNotFoundExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/EntityNotFoundExceptionMapper.java
index 1ee5a07..18e4a87 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/EntityNotFoundExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/EntityNotFoundExceptionMapper.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.exceptions;
+import org.usergrid.persistence.exceptions.EntityNotFoundException;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
-import org.usergrid.persistence.exceptions.EntityNotFoundException;
-
import static javax.ws.rs.core.Response.Status.NOT_FOUND;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/ForbiddenServiceOperationExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/ForbiddenServiceOperationExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/ForbiddenServiceOperationExceptionMapper.java
index 06f3ca2..1c846ea 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/ForbiddenServiceOperationExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/ForbiddenServiceOperationExceptionMapper.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.exceptions;
+import org.usergrid.services.exceptions.ForbiddenServiceOperationException;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
-import org.usergrid.services.exceptions.ForbiddenServiceOperationException;
-
import static javax.ws.rs.core.Response.Status.FORBIDDEN;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonReadExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonReadExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonReadExceptionMapper.java
index 70508b2..c48fc27 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonReadExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonReadExceptionMapper.java
@@ -17,11 +17,11 @@
package org.usergrid.rest.exceptions;
+import org.usergrid.exception.JsonReadException;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
-import org.usergrid.exception.JsonReadException;
-
import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonWriteExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonWriteExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonWriteExceptionMapper.java
index 5743fdf..ea0a776 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonWriteExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonWriteExceptionMapper.java
@@ -17,11 +17,11 @@
package org.usergrid.rest.exceptions;
+import org.usergrid.exception.JsonWriteException;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
-import org.usergrid.exception.JsonWriteException;
-
import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/ManagementExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/ManagementExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/ManagementExceptionMapper.java
index 8208e0c..84ba7a5 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/ManagementExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/ManagementExceptionMapper.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.exceptions;
+import org.usergrid.management.exceptions.ManagementException;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
-import org.usergrid.management.exceptions.ManagementException;
-
import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/NotImplementedExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/NotImplementedExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/NotImplementedExceptionMapper.java
index 2cf22e2..a1b3435 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/NotImplementedExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/NotImplementedExceptionMapper.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.exceptions;
+import org.usergrid.exception.NotImplementedException;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
-import org.usergrid.exception.NotImplementedException;
-
@Provider
public class NotImplementedExceptionMapper extends AbstractExceptionMapper<NotImplementedException> {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/OAuthProblemExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/OAuthProblemExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/OAuthProblemExceptionMapper.java
index 4e81353..7b0ba71 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/OAuthProblemExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/OAuthProblemExceptionMapper.java
@@ -16,14 +16,14 @@
package org.usergrid.rest.exceptions;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
import org.apache.amber.oauth2.common.exception.OAuthProblemException;
import org.apache.amber.oauth2.common.exception.OAuthSystemException;
import org.apache.amber.oauth2.common.message.OAuthResponse;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/OrganizationApplicationNotFoundException.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/OrganizationApplicationNotFoundException.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/OrganizationApplicationNotFoundException.java
index 1435e69..5e1dafd 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/OrganizationApplicationNotFoundException.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/OrganizationApplicationNotFoundException.java
@@ -1,11 +1,11 @@
package org.usergrid.rest.exceptions;
-import javax.ws.rs.core.UriInfo;
-
import org.usergrid.rest.ApiResponse;
import org.usergrid.rest.ServerEnvironmentProperties;
+import javax.ws.rs.core.UriInfo;
+
import static org.usergrid.utils.JsonUtils.mapToJsonString;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/PersistenceExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/PersistenceExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/PersistenceExceptionMapper.java
index 25d2be0..d652449 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/PersistenceExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/PersistenceExceptionMapper.java
@@ -16,10 +16,10 @@
package org.usergrid.rest.exceptions;
-import javax.ws.rs.ext.Provider;
-
import org.usergrid.persistence.exceptions.PersistenceException;
+import javax.ws.rs.ext.Provider;
+
@Provider
public class PersistenceExceptionMapper extends AbstractExceptionMapper<PersistenceException> {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryParseExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryParseExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryParseExceptionMapper.java
index 7a4b5f9..a62a51f 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryParseExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryParseExceptionMapper.java
@@ -16,12 +16,11 @@
package org.usergrid.rest.exceptions;
+import org.usergrid.persistence.exceptions.QueryParseException;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
-
-import org.usergrid.persistence.exceptions.QueryParseException;
-
import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryTokenExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryTokenExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryTokenExceptionMapper.java
index 510a5d5..74d70ef 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryTokenExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryTokenExceptionMapper.java
@@ -16,13 +16,10 @@
package org.usergrid.rest.exceptions;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.Provider;
-
-import org.usergrid.persistence.exceptions.QueryParseException;
import org.usergrid.persistence.exceptions.QueryTokenException;
-import antlr.NoViableAltException;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/RecentlyUsedPasswordExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/RecentlyUsedPasswordExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/RecentlyUsedPasswordExceptionMapper.java
index 3ebedfe..9de9d1f 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/RecentlyUsedPasswordExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/RecentlyUsedPasswordExceptionMapper.java
@@ -1,11 +1,11 @@
package org.usergrid.rest.exceptions;
+import org.usergrid.management.exceptions.RecentlyUsedPasswordException;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
-import org.usergrid.management.exceptions.RecentlyUsedPasswordException;
-
import static javax.ws.rs.core.Response.Status.CONFLICT;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/RequiredPropertyNotFoundExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/RequiredPropertyNotFoundExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/RequiredPropertyNotFoundExceptionMapper.java
index cb93d2f..d8c8a0c 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/RequiredPropertyNotFoundExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/RequiredPropertyNotFoundExceptionMapper.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.exceptions;
+import org.usergrid.persistence.exceptions.RequiredPropertyNotFoundException;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
-import org.usergrid.persistence.exceptions.RequiredPropertyNotFoundException;
-
import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/SecurityException.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/SecurityException.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/SecurityException.java
index 784f238..e1d2130 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/SecurityException.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/SecurityException.java
@@ -16,9 +16,8 @@
package org.usergrid.rest.exceptions;
-import org.usergrid.rest.ApiResponse;
-
import com.sun.jersey.api.container.MappableContainerException;
+import org.usergrid.rest.ApiResponse;
import static org.usergrid.utils.JsonUtils.mapToJsonString;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceExceptionMapper.java
index 2d8d361..efa349c 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceExceptionMapper.java
@@ -16,10 +16,10 @@
package org.usergrid.rest.exceptions;
-import javax.ws.rs.ext.Provider;
-
import org.usergrid.services.exceptions.ServiceException;
+import javax.ws.rs.ext.Provider;
+
/** Will map to HTTP 500 INTERNAL_SERVER_ERROR because parent does */
@Provider
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceResourceNotFoundExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceResourceNotFoundExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceResourceNotFoundExceptionMapper.java
index 32fb5f3..960a7f5 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceResourceNotFoundExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceResourceNotFoundExceptionMapper.java
@@ -16,12 +16,12 @@
package org.usergrid.rest.exceptions;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.Provider;
-
import org.usergrid.security.shiro.utils.SubjectUtils;
import org.usergrid.services.exceptions.ServiceResourceNotFoundException;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
+
import static javax.ws.rs.core.Response.Status.NOT_FOUND;
import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/TransactionNotFoundExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/TransactionNotFoundExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/TransactionNotFoundExceptionMapper.java
index ef8a99f..f14b4d0 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/TransactionNotFoundExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/TransactionNotFoundExceptionMapper.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.exceptions;
+import org.usergrid.persistence.exceptions.TransactionNotFoundException;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
-import org.usergrid.persistence.exceptions.TransactionNotFoundException;
-
import static javax.ws.rs.core.Response.Status.NOT_FOUND;
[15/23] organize imports only
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationGuestPrincipal.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationGuestPrincipal.java b/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationGuestPrincipal.java
index af904de..8585459 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationGuestPrincipal.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationGuestPrincipal.java
@@ -16,10 +16,10 @@
package org.usergrid.security.shiro.principals;
-import java.util.UUID;
-
import org.usergrid.management.ApplicationInfo;
+import java.util.UUID;
+
public class ApplicationGuestPrincipal extends PrincipalIdentifier {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationPrincipal.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationPrincipal.java b/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationPrincipal.java
index 77de19f..1b0ea72 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationPrincipal.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationPrincipal.java
@@ -16,10 +16,10 @@
package org.usergrid.security.shiro.principals;
-import java.util.UUID;
-
import org.usergrid.management.ApplicationInfo;
+import java.util.UUID;
+
public class ApplicationPrincipal extends PrincipalIdentifier {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationUserPrincipal.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationUserPrincipal.java b/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationUserPrincipal.java
index a22e8c7..8ad3e0e 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationUserPrincipal.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationUserPrincipal.java
@@ -16,10 +16,10 @@
package org.usergrid.security.shiro.principals;
-import java.util.UUID;
-
import org.usergrid.management.UserInfo;
+import java.util.UUID;
+
public class ApplicationUserPrincipal extends UserPrincipal {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/shiro/principals/OrganizationPrincipal.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/principals/OrganizationPrincipal.java b/stack/services/src/main/java/org/usergrid/security/shiro/principals/OrganizationPrincipal.java
index 6d5b5c7..7953185 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/principals/OrganizationPrincipal.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/principals/OrganizationPrincipal.java
@@ -16,10 +16,10 @@
package org.usergrid.security.shiro.principals;
-import java.util.UUID;
-
import org.usergrid.management.OrganizationInfo;
+import java.util.UUID;
+
public class OrganizationPrincipal extends PrincipalIdentifier {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/shiro/principals/UserPrincipal.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/principals/UserPrincipal.java b/stack/services/src/main/java/org/usergrid/security/shiro/principals/UserPrincipal.java
index 22a8dda..f7fcf86 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/principals/UserPrincipal.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/principals/UserPrincipal.java
@@ -16,10 +16,10 @@
package org.usergrid.security.shiro.principals;
-import java.util.UUID;
-
import org.usergrid.management.UserInfo;
+import java.util.UUID;
+
public abstract class UserPrincipal extends PrincipalIdentifier {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/shiro/utils/SubjectUtils.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/utils/SubjectUtils.java b/stack/services/src/main/java/org/usergrid/security/shiro/utils/SubjectUtils.java
index de66a05..def615d 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/utils/SubjectUtils.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/utils/SubjectUtils.java
@@ -16,9 +16,12 @@
package org.usergrid.security.shiro.utils;
-import java.util.Set;
-import java.util.UUID;
-
+import com.google.common.collect.BiMap;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.UnavailableSecurityManagerException;
+import org.apache.shiro.session.Session;
+import org.apache.shiro.subject.Subject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.ApplicationInfo;
@@ -28,20 +31,11 @@ import org.usergrid.persistence.Identifier;
import org.usergrid.security.shiro.PrincipalCredentialsToken;
import org.usergrid.security.shiro.principals.UserPrincipal;
-import org.apache.commons.lang.StringUtils;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.UnavailableSecurityManagerException;
-import org.apache.shiro.session.Session;
-import org.apache.shiro.subject.Subject;
-
-import com.google.common.collect.BiMap;
+import java.util.Set;
+import java.util.UUID;
import static org.apache.commons.lang.StringUtils.isNotBlank;
-import static org.usergrid.security.shiro.Realm.ROLE_ADMIN_USER;
-import static org.usergrid.security.shiro.Realm.ROLE_APPLICATION_ADMIN;
-import static org.usergrid.security.shiro.Realm.ROLE_APPLICATION_USER;
-import static org.usergrid.security.shiro.Realm.ROLE_ORGANIZATION_ADMIN;
-import static org.usergrid.security.shiro.Realm.ROLE_SERVICE_ADMIN;
+import static org.usergrid.security.shiro.Realm.*;
public class SubjectUtils {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/tokens/TokenInfo.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/tokens/TokenInfo.java b/stack/services/src/main/java/org/usergrid/security/tokens/TokenInfo.java
index 1fa7069..109ee0d 100644
--- a/stack/services/src/main/java/org/usergrid/security/tokens/TokenInfo.java
+++ b/stack/services/src/main/java/org/usergrid/security/tokens/TokenInfo.java
@@ -1,11 +1,11 @@
package org.usergrid.security.tokens;
+import org.usergrid.security.AuthPrincipalInfo;
+
import java.util.Map;
import java.util.UUID;
-import org.usergrid.security.AuthPrincipalInfo;
-
public class TokenInfo {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/tokens/TokenService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/tokens/TokenService.java b/stack/services/src/main/java/org/usergrid/security/tokens/TokenService.java
index e1d0e09..0b369c7 100644
--- a/stack/services/src/main/java/org/usergrid/security/tokens/TokenService.java
+++ b/stack/services/src/main/java/org/usergrid/security/tokens/TokenService.java
@@ -1,10 +1,10 @@
package org.usergrid.security.tokens;
-import java.util.Map;
-
import org.usergrid.security.AuthPrincipalInfo;
+import java.util.Map;
+
public interface TokenService {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/tokens/cassandra/TokenServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/tokens/cassandra/TokenServiceImpl.java b/stack/services/src/main/java/org/usergrid/security/tokens/cassandra/TokenServiceImpl.java
index 7d8fe72..4ce146b 100644
--- a/stack/services/src/main/java/org/usergrid/security/tokens/cassandra/TokenServiceImpl.java
+++ b/stack/services/src/main/java/org/usergrid/security/tokens/cassandra/TokenServiceImpl.java
@@ -1,9 +1,13 @@
package org.usergrid.security.tokens.cassandra;
-import java.nio.ByteBuffer;
-import java.util.*;
-
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import me.prettyprint.cassandra.serializers.LongSerializer;
+import me.prettyprint.cassandra.serializers.StringSerializer;
+import me.prettyprint.cassandra.serializers.UUIDSerializer;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.beans.HColumn;
+import me.prettyprint.hector.api.mutation.Mutator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,16 +27,10 @@ import org.usergrid.security.tokens.exceptions.InvalidTokenException;
import org.usergrid.utils.JsonUtils;
import org.usergrid.utils.UUIDUtils;
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.cassandra.serializers.LongSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.mutation.Mutator;
+import java.nio.ByteBuffer;
+import java.util.*;
import static java.lang.System.currentTimeMillis;
-
import static me.prettyprint.hector.api.factory.HFactory.createColumn;
import static me.prettyprint.hector.api.factory.HFactory.createMutator;
import static org.apache.commons.codec.binary.Base64.decodeBase64;
@@ -41,16 +39,8 @@ import static org.apache.commons.codec.digest.DigestUtils.sha;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.getColumnMap;
import static org.usergrid.persistence.cassandra.CassandraService.PRINCIPAL_TOKEN_CF;
import static org.usergrid.persistence.cassandra.CassandraService.TOKENS_CF;
-import static org.usergrid.security.tokens.TokenCategory.ACCESS;
-import static org.usergrid.security.tokens.TokenCategory.EMAIL;
-import static org.usergrid.security.tokens.TokenCategory.OFFLINE;
-import static org.usergrid.security.tokens.TokenCategory.REFRESH;
-import static org.usergrid.utils.ConversionUtils.HOLDER;
-import static org.usergrid.utils.ConversionUtils.bytebuffer;
-import static org.usergrid.utils.ConversionUtils.bytes;
-import static org.usergrid.utils.ConversionUtils.getLong;
-import static org.usergrid.utils.ConversionUtils.string;
-import static org.usergrid.utils.ConversionUtils.uuid;
+import static org.usergrid.security.tokens.TokenCategory.*;
+import static org.usergrid.utils.ConversionUtils.*;
import static org.usergrid.utils.MapUtils.hasKeys;
import static org.usergrid.utils.MapUtils.hashMap;
import static org.usergrid.utils.UUIDUtils.getTimestampInMillis;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/AbstractCollectionService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/AbstractCollectionService.java b/stack/services/src/main/java/org/usergrid/services/AbstractCollectionService.java
index 7a84653..b89de3d 100644
--- a/stack/services/src/main/java/org/usergrid/services/AbstractCollectionService.java
+++ b/stack/services/src/main/java/org/usergrid/services/AbstractCollectionService.java
@@ -16,25 +16,17 @@
package org.usergrid.services;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.Results.Level;
-import org.usergrid.persistence.Schema;
import org.usergrid.persistence.exceptions.UnexpectedEntityTypeException;
import org.usergrid.services.ServiceResults.Type;
import org.usergrid.services.exceptions.ForbiddenServiceOperationException;
import org.usergrid.services.exceptions.ServiceResourceNotFoundException;
+import java.util.*;
+
import static org.usergrid.utils.ClassUtils.cast;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/AbstractConnectionsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/AbstractConnectionsService.java b/stack/services/src/main/java/org/usergrid/services/AbstractConnectionsService.java
index 5190645..7d42b28 100644
--- a/stack/services/src/main/java/org/usergrid/services/AbstractConnectionsService.java
+++ b/stack/services/src/main/java/org/usergrid/services/AbstractConnectionsService.java
@@ -16,26 +16,20 @@
package org.usergrid.services;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.usergrid.persistence.ConnectionRef;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.Results.Level;
-import org.usergrid.persistence.Schema;
import org.usergrid.services.ServiceParameter.IdParameter;
import org.usergrid.services.ServiceParameter.NameParameter;
import org.usergrid.services.ServiceParameter.QueryParameter;
import org.usergrid.services.ServiceResults.Type;
import org.usergrid.services.exceptions.ServiceResourceNotFoundException;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
import static org.usergrid.services.ServiceParameter.filter;
import static org.usergrid.services.ServiceParameter.firstParameterIsName;
import static org.usergrid.utils.ClassUtils.cast;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/AbstractPathBasedColllectionService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/AbstractPathBasedColllectionService.java b/stack/services/src/main/java/org/usergrid/services/AbstractPathBasedColllectionService.java
index fd58736..f8a90d4 100644
--- a/stack/services/src/main/java/org/usergrid/services/AbstractPathBasedColllectionService.java
+++ b/stack/services/src/main/java/org/usergrid/services/AbstractPathBasedColllectionService.java
@@ -16,11 +16,6 @@
package org.usergrid.services;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.EntityRef;
@@ -31,6 +26,11 @@ import org.usergrid.services.ServiceParameter.NameParameter;
import org.usergrid.services.ServiceParameter.QueryParameter;
import org.usergrid.services.exceptions.ServiceInvocationException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
import static org.usergrid.services.ServiceParameter.filter;
import static org.usergrid.services.ServiceParameter.mergeQueries;
import static org.usergrid.utils.InflectionUtils.pluralize;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/AbstractService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/AbstractService.java b/stack/services/src/main/java/org/usergrid/services/AbstractService.java
index 419d988..3801252 100644
--- a/stack/services/src/main/java/org/usergrid/services/AbstractService.java
+++ b/stack/services/src/main/java/org/usergrid/services/AbstractService.java
@@ -16,23 +16,12 @@
package org.usergrid.services;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
+import org.apache.commons.lang.NotImplementedException;
+import org.apache.shiro.subject.Subject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.Schema;
+import org.usergrid.persistence.*;
import org.usergrid.security.shiro.utils.SubjectUtils;
import org.usergrid.services.ServiceParameter.IdParameter;
import org.usergrid.services.ServiceParameter.NameParameter;
@@ -42,8 +31,7 @@ import org.usergrid.services.exceptions.ServiceInvocationException;
import org.usergrid.services.exceptions.ServiceResourceNotFoundException;
import org.usergrid.services.exceptions.UnsupportedServiceOperationException;
-import org.apache.commons.lang.NotImplementedException;
-import org.apache.shiro.subject.Subject;
+import java.util.*;
import static org.usergrid.security.shiro.utils.SubjectUtils.getPermissionFromPath;
import static org.usergrid.services.ServiceParameter.filter;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/Service.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/Service.java b/stack/services/src/main/java/org/usergrid/services/Service.java
index 75888e7..ff4f77c 100644
--- a/stack/services/src/main/java/org/usergrid/services/Service.java
+++ b/stack/services/src/main/java/org/usergrid/services/Service.java
@@ -16,11 +16,11 @@
package org.usergrid.services;
-import java.util.UUID;
-
import org.usergrid.persistence.Entity;
import org.usergrid.persistence.EntityRef;
+import java.util.UUID;
+
public interface Service {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/ServiceContext.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceContext.java b/stack/services/src/main/java/org/usergrid/services/ServiceContext.java
index f1efd9c..5696dd5 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceContext.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceContext.java
@@ -16,15 +16,15 @@
package org.usergrid.services;
+import org.usergrid.persistence.EntityRef;
+import org.usergrid.persistence.Query;
+import org.usergrid.services.exceptions.ServiceResourceNotFoundException;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.Query;
-import org.usergrid.services.exceptions.ServiceResourceNotFoundException;
-
import static org.usergrid.services.ServiceInfo.normalizeServicePattern;
import static org.usergrid.utils.ListUtils.dequeueCopy;
import static org.usergrid.utils.ListUtils.isEmpty;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/ServiceInfo.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceInfo.java b/stack/services/src/main/java/org/usergrid/services/ServiceInfo.java
index 2765253..f3dc82b 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceInfo.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceInfo.java
@@ -16,29 +16,22 @@
package org.usergrid.services;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-
-import org.usergrid.persistence.Schema;
-
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.google.common.hash.Hasher;
import com.google.common.hash.Hashing;
+import org.usergrid.persistence.Schema;
+
+import java.util.*;
+import java.util.concurrent.ExecutionException;
import static org.apache.commons.lang.StringUtils.capitalize;
import static org.apache.commons.lang.StringUtils.removeEnd;
import static org.apache.commons.lang.StringUtils.split;
import static org.usergrid.utils.InflectionUtils.pluralize;
import static org.usergrid.utils.InflectionUtils.singularize;
-import static org.usergrid.utils.StringUtils.stringOrSubstringAfterLast;
-import static org.usergrid.utils.StringUtils.stringOrSubstringBeforeFirst;
-import static org.usergrid.utils.StringUtils.stringOrSubstringBeforeLast;
+import static org.usergrid.utils.StringUtils.*;
public class ServiceInfo {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/ServiceManager.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceManager.java b/stack/services/src/main/java/org/usergrid/services/ServiceManager.java
index a4778e5..c48e3da 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceManager.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceManager.java
@@ -16,11 +16,10 @@
package org.usergrid.services;
-import java.lang.reflect.Modifier;
-import java.util.*;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
@@ -37,11 +36,10 @@ import org.usergrid.services.applications.ApplicationsService;
import org.usergrid.services.exceptions.UndefinedServiceEntityTypeException;
import org.usergrid.utils.ListUtils;
-import org.apache.commons.lang.StringUtils;
-
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
+import java.lang.reflect.Modifier;
+import java.util.*;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
import static org.usergrid.persistence.SimpleEntityRef.ref;
import static org.usergrid.utils.InflectionUtils.pluralize;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/ServiceManagerFactory.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceManagerFactory.java b/stack/services/src/main/java/org/usergrid/services/ServiceManagerFactory.java
index d1ef31d..e62de49 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceManagerFactory.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceManagerFactory.java
@@ -16,10 +16,6 @@
package org.usergrid.services;
-import java.util.List;
-import java.util.Properties;
-import java.util.UUID;
-
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -30,6 +26,10 @@ import org.usergrid.mq.QueueManagerFactory;
import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.EntityManagerFactory;
+import java.util.List;
+import java.util.Properties;
+import java.util.UUID;
+
public class ServiceManagerFactory implements ApplicationContextAware {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/ServiceParameter.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceParameter.java b/stack/services/src/main/java/org/usergrid/services/ServiceParameter.java
index a5586b5..240f0f5 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceParameter.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceParameter.java
@@ -16,22 +16,19 @@
package org.usergrid.services;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.persistence.Identifier;
+import org.usergrid.persistence.Query;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.Query;
-
import static org.apache.commons.lang.StringUtils.isNotBlank;
-import static org.usergrid.utils.ListUtils.dequeue;
-import static org.usergrid.utils.ListUtils.dequeueCopy;
-import static org.usergrid.utils.ListUtils.isEmpty;
-import static org.usergrid.utils.ListUtils.queue;
+import static org.usergrid.utils.ListUtils.*;
public abstract class ServiceParameter {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/ServicePayload.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServicePayload.java b/stack/services/src/main/java/org/usergrid/services/ServicePayload.java
index 672118d..4147ed3 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServicePayload.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServicePayload.java
@@ -16,17 +16,11 @@
package org.usergrid.services;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.usergrid.utils.JsonUtils;
-
import org.apache.commons.collections.iterators.EmptyIterator;
import org.apache.commons.collections.iterators.SingletonListIterator;
+import org.usergrid.utils.JsonUtils;
+
+import java.util.*;
import static org.usergrid.utils.JsonUtils.normalizeJsonTree;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/ServiceRequest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceRequest.java b/stack/services/src/main/java/org/usergrid/services/ServiceRequest.java
index 083ae22..4a4f8e9 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceRequest.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceRequest.java
@@ -16,12 +16,7 @@
package org.usergrid.services;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
+import org.apache.shiro.SecurityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.EntityRef;
@@ -29,7 +24,11 @@ import org.usergrid.persistence.Query;
import org.usergrid.services.ServiceParameter.QueryParameter;
import org.usergrid.services.ServiceResults.Type;
-import org.apache.shiro.SecurityUtils;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.usergrid.utils.ListUtils.isEmpty;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/ServiceResults.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceResults.java b/stack/services/src/main/java/org/usergrid/services/ServiceResults.java
index 369a819..a801f6b 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceResults.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceResults.java
@@ -16,18 +16,14 @@
package org.usergrid.services;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.persistence.*;
+
import java.util.List;
import java.util.Map;
import java.util.UUID;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.persistence.AggregateCounterSet;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-
public class ServiceResults extends Results {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/applications/ApplicationsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/applications/ApplicationsService.java b/stack/services/src/main/java/org/usergrid/services/applications/ApplicationsService.java
index 0f1b433..80bb636 100644
--- a/stack/services/src/main/java/org/usergrid/services/applications/ApplicationsService.java
+++ b/stack/services/src/main/java/org/usergrid/services/applications/ApplicationsService.java
@@ -16,11 +16,7 @@
package org.usergrid.services.applications;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
@@ -34,7 +30,10 @@ import org.usergrid.services.ServicePayload;
import org.usergrid.services.ServiceResults;
import org.usergrid.services.ServiceResults.Type;
-import org.apache.commons.lang.StringUtils;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
import static org.usergrid.services.ServiceResults.genericServiceResults;
import static org.usergrid.services.ServiceResults.simpleServiceResults;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/assets/AssetsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/assets/AssetsService.java b/stack/services/src/main/java/org/usergrid/services/assets/AssetsService.java
index 5581423..1a883cc 100644
--- a/stack/services/src/main/java/org/usergrid/services/assets/AssetsService.java
+++ b/stack/services/src/main/java/org/usergrid/services/assets/AssetsService.java
@@ -16,8 +16,6 @@
package org.usergrid.services.assets;
-import java.util.List;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.EntityRef;
@@ -25,6 +23,8 @@ import org.usergrid.services.AbstractPathBasedColllectionService;
import org.usergrid.services.ServiceContext;
import org.usergrid.services.ServiceResults;
+import java.util.List;
+
public class AssetsService extends AbstractPathBasedColllectionService {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/assets/data/AssetMimeHandler.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/assets/data/AssetMimeHandler.java b/stack/services/src/main/java/org/usergrid/services/assets/data/AssetMimeHandler.java
index 1a0f771..215dd95 100644
--- a/stack/services/src/main/java/org/usergrid/services/assets/data/AssetMimeHandler.java
+++ b/stack/services/src/main/java/org/usergrid/services/assets/data/AssetMimeHandler.java
@@ -1,22 +1,16 @@
package org.usergrid.services.assets.data;
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.persistence.Entity;
-
import org.apache.tika.detect.DefaultDetector;
import org.apache.tika.detect.Detector;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.persistence.Entity;
+
+import java.io.*;
+import java.util.Map;
/** Detect the mime type of an Asset */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/assets/data/AssetUtils.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/assets/data/AssetUtils.java b/stack/services/src/main/java/org/usergrid/services/assets/data/AssetUtils.java
index 44d8e88..69c9a4a 100644
--- a/stack/services/src/main/java/org/usergrid/services/assets/data/AssetUtils.java
+++ b/stack/services/src/main/java/org/usergrid/services/assets/data/AssetUtils.java
@@ -1,20 +1,18 @@
package org.usergrid.services.assets.data;
-import java.text.ParseException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
+import com.google.common.base.Preconditions;
+import org.apache.commons.lang.time.DateUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
import org.usergrid.utils.StringUtils;
-import org.apache.commons.lang.time.DateUtils;
-
-import com.google.common.base.Preconditions;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
public class AssetUtils {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/assets/data/BinaryStore.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/assets/data/BinaryStore.java b/stack/services/src/main/java/org/usergrid/services/assets/data/BinaryStore.java
index fcc3fa1..a8c1211 100644
--- a/stack/services/src/main/java/org/usergrid/services/assets/data/BinaryStore.java
+++ b/stack/services/src/main/java/org/usergrid/services/assets/data/BinaryStore.java
@@ -1,12 +1,12 @@
package org.usergrid.services.assets.data;
+import org.usergrid.persistence.Entity;
+
import java.io.IOException;
import java.io.InputStream;
import java.util.UUID;
-import org.usergrid.persistence.Entity;
-
public interface BinaryStore {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/assets/data/LocalFileBinaryStore.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/assets/data/LocalFileBinaryStore.java b/stack/services/src/main/java/org/usergrid/services/assets/data/LocalFileBinaryStore.java
index 2547ace..9609f62 100644
--- a/stack/services/src/main/java/org/usergrid/services/assets/data/LocalFileBinaryStore.java
+++ b/stack/services/src/main/java/org/usergrid/services/assets/data/LocalFileBinaryStore.java
@@ -1,6 +1,9 @@
package org.usergrid.services.assets.data;
+import org.apache.commons.io.FileUtils;
+import org.usergrid.persistence.Entity;
+
import java.io.BufferedInputStream;
import java.io.File;
import java.io.IOException;
@@ -8,10 +11,6 @@ import java.io.InputStream;
import java.util.Map;
import java.util.UUID;
-import org.usergrid.persistence.Entity;
-
-import org.apache.commons.io.FileUtils;
-
/** A binary store implementation using the local file system */
public class LocalFileBinaryStore implements BinaryStore {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/assets/data/S3BinaryStore.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/assets/data/S3BinaryStore.java b/stack/services/src/main/java/org/usergrid/services/assets/data/S3BinaryStore.java
index f766f2c..a17fc3b 100644
--- a/stack/services/src/main/java/org/usergrid/services/assets/data/S3BinaryStore.java
+++ b/stack/services/src/main/java/org/usergrid/services/assets/data/S3BinaryStore.java
@@ -1,18 +1,12 @@
package org.usergrid.services.assets.data;
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
+import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Module;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
import org.jclouds.ContextBuilder;
import org.jclouds.blobstore.AsyncBlobStore;
import org.jclouds.blobstore.BlobStore;
@@ -31,13 +25,11 @@ import org.usergrid.persistence.Entity;
import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.EntityManagerFactory;
-import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.inject.Module;
+import java.io.*;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
public class S3BinaryStore implements BinaryStore {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/devices/DevicesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/devices/DevicesService.java b/stack/services/src/main/java/org/usergrid/services/devices/DevicesService.java
index c4abb62..b3dc34c 100644
--- a/stack/services/src/main/java/org/usergrid/services/devices/DevicesService.java
+++ b/stack/services/src/main/java/org/usergrid/services/devices/DevicesService.java
@@ -16,14 +16,14 @@
package org.usergrid.services.devices;
-import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.services.AbstractCollectionService;
import org.usergrid.services.ServiceContext;
import org.usergrid.services.ServiceResults;
+import java.util.UUID;
+
public class DevicesService extends AbstractCollectionService {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/groups/GroupsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/groups/GroupsService.java b/stack/services/src/main/java/org/usergrid/services/groups/GroupsService.java
index 83ad9a6..b906d2b 100644
--- a/stack/services/src/main/java/org/usergrid/services/groups/GroupsService.java
+++ b/stack/services/src/main/java/org/usergrid/services/groups/GroupsService.java
@@ -16,12 +16,8 @@
package org.usergrid.services.groups;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
+import com.google.common.base.CharMatcher;
+import com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.EntityRef;
@@ -32,8 +28,7 @@ import org.usergrid.services.ServiceContext;
import org.usergrid.services.ServicePayload;
import org.usergrid.services.ServiceResults;
-import com.google.common.base.CharMatcher;
-import com.google.common.base.Preconditions;
+import java.util.*;
import static org.apache.commons.lang.StringUtils.isBlank;
import static org.usergrid.services.ServiceResults.genericServiceResults;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/groups/activities/ActivitiesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/groups/activities/ActivitiesService.java b/stack/services/src/main/java/org/usergrid/services/groups/activities/ActivitiesService.java
index 25d1019..2c70dc7 100644
--- a/stack/services/src/main/java/org/usergrid/services/groups/activities/ActivitiesService.java
+++ b/stack/services/src/main/java/org/usergrid/services/groups/activities/ActivitiesService.java
@@ -16,9 +16,6 @@
package org.usergrid.services.groups.activities;
-import java.util.List;
-import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
@@ -28,6 +25,9 @@ import org.usergrid.services.ServiceContext;
import org.usergrid.services.ServiceResults;
import org.usergrid.services.generic.GenericCollectionService;
+import java.util.List;
+import java.util.UUID;
+
public class ActivitiesService extends GenericCollectionService {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/groups/users/activities/ActivitiesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/groups/users/activities/ActivitiesService.java b/stack/services/src/main/java/org/usergrid/services/groups/users/activities/ActivitiesService.java
index 35fa6c6..405f412 100644
--- a/stack/services/src/main/java/org/usergrid/services/groups/users/activities/ActivitiesService.java
+++ b/stack/services/src/main/java/org/usergrid/services/groups/users/activities/ActivitiesService.java
@@ -16,9 +16,6 @@
package org.usergrid.services.groups.users.activities;
-import java.util.List;
-import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
@@ -29,6 +26,9 @@ import org.usergrid.services.ServiceContext;
import org.usergrid.services.ServiceResults;
import org.usergrid.services.generic.GenericCollectionService;
+import java.util.List;
+import java.util.UUID;
+
public class ActivitiesService extends GenericCollectionService {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/roles/RolesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/roles/RolesService.java b/stack/services/src/main/java/org/usergrid/services/roles/RolesService.java
index 6e1b91e..e57be7d 100644
--- a/stack/services/src/main/java/org/usergrid/services/roles/RolesService.java
+++ b/stack/services/src/main/java/org/usergrid/services/roles/RolesService.java
@@ -16,10 +16,6 @@
package org.usergrid.services.roles;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.EntityRef;
@@ -31,6 +27,10 @@ import org.usergrid.services.ServiceContext;
import org.usergrid.services.ServicePayload;
import org.usergrid.services.ServiceResults;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import static org.apache.commons.lang.StringUtils.isBlank;
import static org.usergrid.services.ServiceResults.genericServiceResults;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/roles/users/UsersService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/roles/users/UsersService.java b/stack/services/src/main/java/org/usergrid/services/roles/users/UsersService.java
index 4da043c..c57a54c 100644
--- a/stack/services/src/main/java/org/usergrid/services/roles/users/UsersService.java
+++ b/stack/services/src/main/java/org/usergrid/services/roles/users/UsersService.java
@@ -16,8 +16,6 @@
package org.usergrid.services.roles.users;
-import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
@@ -27,6 +25,8 @@ import org.usergrid.services.ServiceContext;
import org.usergrid.services.ServiceResults;
import org.usergrid.services.ServiceResults.Type;
+import java.util.UUID;
+
public class UsersService extends org.usergrid.services.users.UsersService {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/users/UsersService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/users/UsersService.java b/stack/services/src/main/java/org/usergrid/services/users/UsersService.java
index 6248e96..38cf6b1 100644
--- a/stack/services/src/main/java/org/usergrid/services/users/UsersService.java
+++ b/stack/services/src/main/java/org/usergrid/services/users/UsersService.java
@@ -16,31 +16,17 @@
package org.usergrid.services.users;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.UserInfo;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.Schema;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.entities.Role;
import org.usergrid.security.shiro.utils.SubjectUtils;
-import org.usergrid.services.AbstractCollectionService;
-import org.usergrid.services.ServiceContext;
-import org.usergrid.services.ServicePayload;
-import org.usergrid.services.ServiceRequest;
-import org.usergrid.services.ServiceResults;
+import org.usergrid.services.*;
import org.usergrid.services.exceptions.ServiceResourceNotFoundException;
+import java.util.*;
+
import static org.apache.commons.codec.digest.DigestUtils.md5Hex;
import static org.apache.commons.lang.StringUtils.isBlank;
import static org.apache.commons.lang.StringUtils.isNotBlank;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/users/activities/ActivitiesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/users/activities/ActivitiesService.java b/stack/services/src/main/java/org/usergrid/services/users/activities/ActivitiesService.java
index 49d4b70..f7baef7 100644
--- a/stack/services/src/main/java/org/usergrid/services/users/activities/ActivitiesService.java
+++ b/stack/services/src/main/java/org/usergrid/services/users/activities/ActivitiesService.java
@@ -16,11 +16,6 @@
package org.usergrid.services.users.activities;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
@@ -34,6 +29,11 @@ import org.usergrid.services.ServicePayload;
import org.usergrid.services.ServiceResults;
import org.usergrid.services.generic.GenericCollectionService;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
public class ActivitiesService extends GenericCollectionService {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/users/roles/RolesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/users/roles/RolesService.java b/stack/services/src/main/java/org/usergrid/services/users/roles/RolesService.java
index 58e40f8..3174905 100644
--- a/stack/services/src/main/java/org/usergrid/services/users/roles/RolesService.java
+++ b/stack/services/src/main/java/org/usergrid/services/users/roles/RolesService.java
@@ -16,8 +16,6 @@
package org.usergrid.services.users.roles;
-import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
@@ -27,6 +25,8 @@ import org.usergrid.services.ServiceContext;
import org.usergrid.services.ServiceResults;
import org.usergrid.services.ServiceResults.Type;
+import java.util.UUID;
+
public class RolesService extends org.usergrid.services.roles.RolesService {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/ConcurrentServiceITSuite.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/ConcurrentServiceITSuite.java b/stack/services/src/test/java/org/usergrid/ConcurrentServiceITSuite.java
index b7cd486..be644ee 100644
--- a/stack/services/src/test/java/org/usergrid/ConcurrentServiceITSuite.java
+++ b/stack/services/src/test/java/org/usergrid/ConcurrentServiceITSuite.java
@@ -15,16 +15,7 @@ import org.usergrid.management.cassandra.ManagementServiceIT;
import org.usergrid.security.providers.FacebookProviderIT;
import org.usergrid.security.providers.PingIdentityProviderIT;
import org.usergrid.security.tokens.TokenServiceIT;
-import org.usergrid.services.ActivitiesServiceIT;
-import org.usergrid.services.ApplicationsServiceIT;
-import org.usergrid.services.CollectionServiceIT;
-import org.usergrid.services.ConnectionsServiceIT;
-import org.usergrid.services.GroupServiceIT;
-import org.usergrid.services.RolesServiceIT;
-import org.usergrid.services.ServiceFactoryIT;
-import org.usergrid.services.ServiceInvocationIT;
-import org.usergrid.services.ServiceRequestIT;
-import org.usergrid.services.UsersServiceIT;
+import org.usergrid.services.*;
@RunWith(ConcurrentSuite.class)
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/ServiceApplication.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/ServiceApplication.java b/stack/services/src/test/java/org/usergrid/ServiceApplication.java
index bd70b56..33d3fdd 100644
--- a/stack/services/src/test/java/org/usergrid/ServiceApplication.java
+++ b/stack/services/src/test/java/org/usergrid/ServiceApplication.java
@@ -1,11 +1,6 @@
package org.usergrid;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
import org.junit.runner.Description;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -19,6 +14,11 @@ import org.usergrid.services.ServiceRequest;
import org.usergrid.services.ServiceResults;
import org.usergrid.utils.JsonUtils;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.usergrid.services.ServiceParameter.parameters;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/ServiceITSetup.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/ServiceITSetup.java b/stack/services/src/test/java/org/usergrid/ServiceITSetup.java
index fbfb923..2a41406 100644
--- a/stack/services/src/test/java/org/usergrid/ServiceITSetup.java
+++ b/stack/services/src/test/java/org/usergrid/ServiceITSetup.java
@@ -1,14 +1,14 @@
package org.usergrid;
-import java.util.Properties;
-
import org.usergrid.management.ApplicationCreator;
import org.usergrid.management.ManagementService;
import org.usergrid.security.providers.SignInProviderFactory;
import org.usergrid.security.tokens.TokenService;
import org.usergrid.services.ServiceManagerFactory;
+import java.util.Properties;
+
public interface ServiceITSetup extends CoreITSetup {
ManagementService getMgmtSvc();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/ServiceITSetupImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/ServiceITSetupImpl.java b/stack/services/src/test/java/org/usergrid/ServiceITSetupImpl.java
index cf6068f..1de23ac 100644
--- a/stack/services/src/test/java/org/usergrid/ServiceITSetupImpl.java
+++ b/stack/services/src/test/java/org/usergrid/ServiceITSetupImpl.java
@@ -1,8 +1,6 @@
package org.usergrid;
-import java.util.Properties;
-
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
import org.slf4j.Logger;
@@ -16,6 +14,8 @@ import org.usergrid.security.providers.SignInProviderFactory;
import org.usergrid.security.tokens.TokenService;
import org.usergrid.services.ServiceManagerFactory;
+import java.util.Properties;
+
/** A {@link org.junit.rules.TestRule} that sets up services. */
public class ServiceITSetupImpl extends CoreITSetupImpl implements ServiceITSetup {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/ServiceITSuite.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/ServiceITSuite.java b/stack/services/src/test/java/org/usergrid/ServiceITSuite.java
index b02f6c0..443afdd 100644
--- a/stack/services/src/test/java/org/usergrid/ServiceITSuite.java
+++ b/stack/services/src/test/java/org/usergrid/ServiceITSuite.java
@@ -13,16 +13,7 @@ import org.usergrid.management.cassandra.ApplicationCreatorIT;
import org.usergrid.management.cassandra.ManagementServiceIT;
import org.usergrid.security.providers.FacebookProviderIT;
import org.usergrid.security.providers.PingIdentityProviderIT;
-import org.usergrid.services.ActivitiesServiceIT;
-import org.usergrid.services.ApplicationsServiceIT;
-import org.usergrid.services.CollectionServiceIT;
-import org.usergrid.services.ConnectionsServiceIT;
-import org.usergrid.services.GroupServiceIT;
-import org.usergrid.services.RolesServiceIT;
-import org.usergrid.services.ServiceFactoryIT;
-import org.usergrid.services.ServiceInvocationIT;
-import org.usergrid.services.ServiceRequestIT;
-import org.usergrid.services.UsersServiceIT;
+import org.usergrid.services.*;
@RunWith(Suite.class)
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/management/EmailFlowIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/management/EmailFlowIT.java b/stack/services/src/test/java/org/usergrid/management/EmailFlowIT.java
index 0340f27..a29afa1 100644
--- a/stack/services/src/test/java/org/usergrid/management/EmailFlowIT.java
+++ b/stack/services/src/test/java/org/usergrid/management/EmailFlowIT.java
@@ -16,17 +16,8 @@
package org.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.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.text.StrSubstitutor;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
@@ -45,36 +36,15 @@ import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.persistence.entities.Application;
import org.usergrid.persistence.entities.User;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.text.StrSubstitutor;
+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.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.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_USERS_REQUIRE_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_ACTIVATED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_PASSWORD_RESET;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_USER_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ORGANIZATION_ACTIVATED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ORGANIZATION_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_SYSADMIN_ADMIN_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_SYSADMIN_ORGANIZATION_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_ACTIVATED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_PASSWORD_RESET;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_PIN_REQUEST;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_NOTIFY_ADMIN_OF_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ORGANIZATIONS_REQUIRE_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_APPROVES_ADMIN_USERS;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_APPROVES_ORGANIZATIONS;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_EMAIL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_USER_ACTIVATION_URL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_USER_CONFIRMATION_URL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_USER_RESETPW_URL;
+import static org.junit.Assert.*;
+import static org.usergrid.management.AccountCreationProps.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/management/ManagementTestHelper.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/management/ManagementTestHelper.java b/stack/services/src/test/java/org/usergrid/management/ManagementTestHelper.java
index 959d04a..a2fc557 100644
--- a/stack/services/src/test/java/org/usergrid/management/ManagementTestHelper.java
+++ b/stack/services/src/test/java/org/usergrid/management/ManagementTestHelper.java
@@ -16,11 +16,11 @@
package org.usergrid.management;
-import java.util.Properties;
-
import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.security.tokens.TokenService;
+import java.util.Properties;
+
public interface ManagementTestHelper {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/management/MockImapClient.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/management/MockImapClient.java b/stack/services/src/test/java/org/usergrid/management/MockImapClient.java
index 0f5effc..017eabe 100644
--- a/stack/services/src/test/java/org/usergrid/management/MockImapClient.java
+++ b/stack/services/src/test/java/org/usergrid/management/MockImapClient.java
@@ -1,18 +1,13 @@
package org.usergrid.management;
-import java.io.IOException;
-import java.util.Properties;
-
-import javax.mail.Folder;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.Store;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.mail.*;
+import java.io.IOException;
+import java.util.Properties;
+
public class MockImapClient {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/management/OrganizationIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/management/OrganizationIT.java b/stack/services/src/test/java/org/usergrid/management/OrganizationIT.java
index 0b5aede..16a200f 100644
--- a/stack/services/src/test/java/org/usergrid/management/OrganizationIT.java
+++ b/stack/services/src/test/java/org/usergrid/management/OrganizationIT.java
@@ -16,11 +16,6 @@
package org.usergrid.management;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
@@ -33,10 +28,12 @@ import org.usergrid.management.cassandra.ManagementServiceImpl;
import org.usergrid.management.exceptions.RecentlyUsedPasswordException;
import org.usergrid.security.AuthPrincipalInfo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/management/RoleIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/management/RoleIT.java b/stack/services/src/test/java/org/usergrid/management/RoleIT.java
index 6bdb93e..d191fe0 100644
--- a/stack/services/src/test/java/org/usergrid/management/RoleIT.java
+++ b/stack/services/src/test/java/org/usergrid/management/RoleIT.java
@@ -16,10 +16,7 @@
package org.usergrid.management;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
+import org.apache.shiro.subject.Subject;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
@@ -35,7 +32,9 @@ import org.usergrid.persistence.entities.User;
import org.usergrid.security.shiro.PrincipalCredentialsToken;
import org.usergrid.security.shiro.utils.SubjectUtils;
-import org.apache.shiro.subject.Subject;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
import static org.junit.Assert.assertFalse;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/management/cassandra/ApplicationCreatorIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/management/cassandra/ApplicationCreatorIT.java b/stack/services/src/test/java/org/usergrid/management/cassandra/ApplicationCreatorIT.java
index 917e182..0bf0121 100644
--- a/stack/services/src/test/java/org/usergrid/management/cassandra/ApplicationCreatorIT.java
+++ b/stack/services/src/test/java/org/usergrid/management/cassandra/ApplicationCreatorIT.java
@@ -1,8 +1,6 @@
package org.usergrid.management.cassandra;
-import java.util.Set;
-
import org.junit.Rule;
import org.junit.Test;
import org.slf4j.Logger;
@@ -16,9 +14,9 @@ import org.usergrid.cassandra.Concurrent;
import org.usergrid.management.ApplicationInfo;
import org.usergrid.management.OrganizationOwnerInfo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import java.util.Set;
+
+import static org.junit.Assert.*;
/** @author zznate */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementServiceIT.java b/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementServiceIT.java
index a27ebb2..560e920 100644
--- a/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementServiceIT.java
+++ b/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementServiceIT.java
@@ -1,11 +1,6 @@
package org.usergrid.management.cassandra;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -18,6 +13,7 @@ import org.usergrid.ServiceITSuite;
import org.usergrid.cassandra.CassandraResource;
import org.usergrid.cassandra.ClearShiroSubject;
import org.usergrid.cassandra.Concurrent;
+import org.usergrid.count.SimpleBatcher;
import org.usergrid.management.OrganizationInfo;
import org.usergrid.management.UserInfo;
import org.usergrid.persistence.CredentialsInfo;
@@ -32,14 +28,13 @@ import org.usergrid.security.tokens.exceptions.InvalidTokenException;
import org.usergrid.utils.JsonUtils;
import org.usergrid.utils.UUIDUtils;
-import org.usergrid.count.SimpleBatcher;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
import static org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
import static org.usergrid.persistence.Schema.DICTIONARY_CREDENTIALS;
import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementTestHelperImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementTestHelperImpl.java b/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementTestHelperImpl.java
index baa9fc8..961386a 100644
--- a/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementTestHelperImpl.java
+++ b/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementTestHelperImpl.java
@@ -19,8 +19,6 @@ package org.usergrid.management.cassandra;
* Copyright 2010,2011 Ed Anuff and Usergrid, all rights reserved.
******************************************************************************/
-import java.util.Properties;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +28,8 @@ import org.usergrid.management.ManagementTestHelper;
import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.security.tokens.TokenService;
+import java.util.Properties;
+
@Component
public class ManagementTestHelperImpl implements ManagementTestHelper {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/security/CustomResolverTest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/security/CustomResolverTest.java b/stack/services/src/test/java/org/usergrid/security/CustomResolverTest.java
index 4ca7fa5..e9fbac2 100644
--- a/stack/services/src/test/java/org/usergrid/security/CustomResolverTest.java
+++ b/stack/services/src/test/java/org/usergrid/security/CustomResolverTest.java
@@ -16,8 +16,14 @@
package org.usergrid.security;
-import java.util.UUID;
-
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.UnavailableSecurityManagerException;
+import org.apache.shiro.mgt.DefaultSecurityManager;
+import org.apache.shiro.subject.SimplePrincipalCollection;
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.subject.support.SubjectThreadState;
+import org.apache.shiro.util.LifecycleUtils;
+import org.apache.shiro.util.ThreadState;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -29,14 +35,7 @@ import org.usergrid.security.shiro.CustomPermission;
import org.usergrid.security.shiro.principals.ApplicationUserPrincipal;
import org.usergrid.utils.UUIDUtils;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.UnavailableSecurityManagerException;
-import org.apache.shiro.mgt.DefaultSecurityManager;
-import org.apache.shiro.subject.SimplePrincipalCollection;
-import org.apache.shiro.subject.Subject;
-import org.apache.shiro.subject.support.SubjectThreadState;
-import org.apache.shiro.util.LifecycleUtils;
-import org.apache.shiro.util.ThreadState;
+import java.util.UUID;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/security/crypto/EncryptionServiceImplTest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/security/crypto/EncryptionServiceImplTest.java b/stack/services/src/test/java/org/usergrid/security/crypto/EncryptionServiceImplTest.java
index 3707c9d..40fb829 100644
--- a/stack/services/src/test/java/org/usergrid/security/crypto/EncryptionServiceImplTest.java
+++ b/stack/services/src/test/java/org/usergrid/security/crypto/EncryptionServiceImplTest.java
@@ -16,16 +16,16 @@
package org.usergrid.security.crypto;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
import org.junit.Test;
import org.usergrid.persistence.CredentialsInfo;
import org.usergrid.security.crypto.command.EncryptionCommand;
import org.usergrid.security.crypto.command.Md5HashCommand;
import org.usergrid.security.crypto.command.Sha1HashCommand;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/security/crypto/command/BcryptCommandTest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/security/crypto/command/BcryptCommandTest.java b/stack/services/src/test/java/org/usergrid/security/crypto/command/BcryptCommandTest.java
index a7b4dc1..5387f71 100644
--- a/stack/services/src/test/java/org/usergrid/security/crypto/command/BcryptCommandTest.java
+++ b/stack/services/src/test/java/org/usergrid/security/crypto/command/BcryptCommandTest.java
@@ -16,17 +16,16 @@
package org.usergrid.security.crypto.command;
-import java.io.UnsupportedEncodingException;
-import java.util.UUID;
-
-import org.junit.Test;
-import org.usergrid.persistence.CredentialsInfo;
-
import com.yammer.metrics.Metrics;
import com.yammer.metrics.core.MetricPredicate;
import com.yammer.metrics.core.Timer;
import com.yammer.metrics.core.TimerContext;
import com.yammer.metrics.reporting.ConsoleReporter;
+import org.junit.Test;
+import org.usergrid.persistence.CredentialsInfo;
+
+import java.io.UnsupportedEncodingException;
+import java.util.UUID;
import static org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString;
import static org.junit.Assert.assertArrayEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/security/crypto/command/Md5HashCommandTest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/security/crypto/command/Md5HashCommandTest.java b/stack/services/src/test/java/org/usergrid/security/crypto/command/Md5HashCommandTest.java
index ed5966e..2a6b094 100644
--- a/stack/services/src/test/java/org/usergrid/security/crypto/command/Md5HashCommandTest.java
+++ b/stack/services/src/test/java/org/usergrid/security/crypto/command/Md5HashCommandTest.java
@@ -16,12 +16,11 @@
package org.usergrid.security.crypto.command;
-import java.io.UnsupportedEncodingException;
-
+import org.apache.commons.codec.digest.DigestUtils;
import org.junit.Test;
import org.usergrid.persistence.CredentialsInfo;
-import org.apache.commons.codec.digest.DigestUtils;
+import java.io.UnsupportedEncodingException;
import static org.junit.Assert.assertArrayEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/security/crypto/command/Sha1HashCommandTest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/security/crypto/command/Sha1HashCommandTest.java b/stack/services/src/test/java/org/usergrid/security/crypto/command/Sha1HashCommandTest.java
index 2c0b468..28e68be 100644
--- a/stack/services/src/test/java/org/usergrid/security/crypto/command/Sha1HashCommandTest.java
+++ b/stack/services/src/test/java/org/usergrid/security/crypto/command/Sha1HashCommandTest.java
@@ -16,13 +16,13 @@
package org.usergrid.security.crypto.command;
+import org.junit.Test;
+import org.usergrid.persistence.CredentialsInfo;
+
import java.io.UnsupportedEncodingException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import org.junit.Test;
-import org.usergrid.persistence.CredentialsInfo;
-
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/security/providers/FacebookProviderIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/security/providers/FacebookProviderIT.java b/stack/services/src/test/java/org/usergrid/security/providers/FacebookProviderIT.java
index 45e9631..3d3ed34 100644
--- a/stack/services/src/test/java/org/usergrid/security/providers/FacebookProviderIT.java
+++ b/stack/services/src/test/java/org/usergrid/security/providers/FacebookProviderIT.java
@@ -1,14 +1,7 @@
package org.usergrid.security.providers;
-import java.util.Map;
-import java.util.UUID;
-
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.*;
import org.usergrid.ServiceITSetup;
import org.usergrid.ServiceITSetupImpl;
import org.usergrid.ServiceITSuite;
@@ -20,6 +13,9 @@ import org.usergrid.persistence.entities.Application;
import org.usergrid.persistence.entities.User;
import org.usergrid.utils.MapUtils;
+import java.util.Map;
+import java.util.UUID;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/security/providers/PingIdentityProviderIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/security/providers/PingIdentityProviderIT.java b/stack/services/src/test/java/org/usergrid/security/providers/PingIdentityProviderIT.java
index 6aaf993..7eb2327 100644
--- a/stack/services/src/test/java/org/usergrid/security/providers/PingIdentityProviderIT.java
+++ b/stack/services/src/test/java/org/usergrid/security/providers/PingIdentityProviderIT.java
@@ -1,14 +1,7 @@
package org.usergrid.security.providers;
-import java.util.Map;
-import java.util.UUID;
-
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.*;
import org.usergrid.ServiceITSetup;
import org.usergrid.ServiceITSetupImpl;
import org.usergrid.ServiceITSuite;
@@ -20,6 +13,9 @@ import org.usergrid.persistence.entities.Application;
import org.usergrid.persistence.entities.User;
import org.usergrid.utils.MapUtils;
+import java.util.Map;
+import java.util.UUID;
+
import static junit.framework.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/security/tokens/TokenServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/security/tokens/TokenServiceIT.java b/stack/services/src/test/java/org/usergrid/security/tokens/TokenServiceIT.java
index 499f9e2..0d0316b 100644
--- a/stack/services/src/test/java/org/usergrid/security/tokens/TokenServiceIT.java
+++ b/stack/services/src/test/java/org/usergrid/security/tokens/TokenServiceIT.java
@@ -1,9 +1,6 @@
package org.usergrid.security.tokens;
-import java.util.HashMap;
-import java.util.Map;
-
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -28,10 +25,10 @@ import org.usergrid.security.tokens.exceptions.ExpiredTokenException;
import org.usergrid.security.tokens.exceptions.InvalidTokenException;
import org.usergrid.utils.UUIDUtils;
-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 java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/services/CollectionServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/services/CollectionServiceIT.java b/stack/services/src/test/java/org/usergrid/services/CollectionServiceIT.java
index 80e758d..d78a609 100644
--- a/stack/services/src/test/java/org/usergrid/services/CollectionServiceIT.java
+++ b/stack/services/src/test/java/org/usergrid/services/CollectionServiceIT.java
@@ -26,9 +26,7 @@ import org.usergrid.persistence.exceptions.UnexpectedEntityTypeException;
import org.usergrid.persistence.schema.CollectionInfo;
import org.usergrid.services.exceptions.ServiceResourceNotFoundException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.*;
import static org.usergrid.persistence.Schema.TYPE_APPLICATION;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/services/ConnectionsServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/services/ConnectionsServiceIT.java b/stack/services/src/test/java/org/usergrid/services/ConnectionsServiceIT.java
index 5b70c02..720b74b 100644
--- a/stack/services/src/test/java/org/usergrid/services/ConnectionsServiceIT.java
+++ b/stack/services/src/test/java/org/usergrid/services/ConnectionsServiceIT.java
@@ -16,15 +16,13 @@
package org.usergrid.services;
-import java.util.Map;
-
import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.Entity;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import java.util.Map;
+
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/services/RolesServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/services/RolesServiceIT.java b/stack/services/src/test/java/org/usergrid/services/RolesServiceIT.java
index 98751e0..2892e19 100644
--- a/stack/services/src/test/java/org/usergrid/services/RolesServiceIT.java
+++ b/stack/services/src/test/java/org/usergrid/services/RolesServiceIT.java
@@ -16,21 +16,17 @@
package org.usergrid.services;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-
import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.Entity;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.entities.Role;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+import static org.junit.Assert.*;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/services/ServiceFactoryIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/services/ServiceFactoryIT.java b/stack/services/src/test/java/org/usergrid/services/ServiceFactoryIT.java
index 97351bb..c50eaa3 100644
--- a/stack/services/src/test/java/org/usergrid/services/ServiceFactoryIT.java
+++ b/stack/services/src/test/java/org/usergrid/services/ServiceFactoryIT.java
@@ -16,15 +16,14 @@
package org.usergrid.services;
-import java.util.UUID;
-
+import baas.io.simple.SimpleService;
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.cassandra.Concurrent;
-import baas.io.simple.SimpleService;
+import java.util.UUID;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/services/ServiceInfoTest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/services/ServiceInfoTest.java b/stack/services/src/test/java/org/usergrid/services/ServiceInfoTest.java
index 700e499..5255b38 100644
--- a/stack/services/src/test/java/org/usergrid/services/ServiceInfoTest.java
+++ b/stack/services/src/test/java/org/usergrid/services/ServiceInfoTest.java
@@ -16,13 +16,13 @@
package org.usergrid.services;
-import java.util.List;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.utils.JsonUtils;
+import java.util.List;
+
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/services/ServiceInvocationIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/services/ServiceInvocationIT.java b/stack/services/src/test/java/org/usergrid/services/ServiceInvocationIT.java
index e622fbd..95e19c7 100644
--- a/stack/services/src/test/java/org/usergrid/services/ServiceInvocationIT.java
+++ b/stack/services/src/test/java/org/usergrid/services/ServiceInvocationIT.java
@@ -16,18 +16,14 @@
package org.usergrid.services;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
import org.usergrid.persistence.Query;
+import java.util.*;
+
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/services/ServiceRequestIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/services/ServiceRequestIT.java b/stack/services/src/test/java/org/usergrid/services/ServiceRequestIT.java
index 4c51cec..3950766 100644
--- a/stack/services/src/test/java/org/usergrid/services/ServiceRequestIT.java
+++ b/stack/services/src/test/java/org/usergrid/services/ServiceRequestIT.java
@@ -16,12 +16,6 @@
package org.usergrid.services;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.Rule;
import org.junit.Test;
import org.slf4j.Logger;
@@ -32,6 +26,8 @@ import org.usergrid.ServiceITSuite;
import org.usergrid.cassandra.ClearShiroSubject;
import org.usergrid.cassandra.Concurrent;
+import java.util.*;
+
import static org.usergrid.persistence.cassandra.CassandraService.DEFAULT_APPLICATION_ID;
import static org.usergrid.services.ServiceParameter.filter;
import static org.usergrid.services.ServiceParameter.parameters;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/services/assets/data/AssetUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/services/assets/data/AssetUtilsTest.java b/stack/services/src/test/java/org/usergrid/services/assets/data/AssetUtilsTest.java
index df0811a..e2e7f48 100644
--- a/stack/services/src/test/java/org/usergrid/services/assets/data/AssetUtilsTest.java
+++ b/stack/services/src/test/java/org/usergrid/services/assets/data/AssetUtilsTest.java
@@ -1,11 +1,11 @@
package org.usergrid.services.assets.data;
-import java.util.UUID;
-
import org.junit.Test;
import org.usergrid.persistence.entities.Asset;
+import java.util.UUID;
+
import static junit.framework.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/test-utils/src/main/java/org/usergrid/NoExitSecurityManager.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/usergrid/NoExitSecurityManager.java b/stack/test-utils/src/main/java/org/usergrid/NoExitSecurityManager.java
index 1730bd6..213faaf 100644
--- a/stack/test-utils/src/main/java/org/usergrid/NoExitSecurityManager.java
+++ b/stack/test-utils/src/main/java/org/usergrid/NoExitSecurityManager.java
@@ -1,11 +1,11 @@
package org.usergrid;
-import java.security.Permission;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.security.Permission;
+
/**
* Used to prevent System.exit() calls when testing funky Cassandra exit code and race conditions in the ForkedBooter
[13/23] git commit: organize imports only
Posted by sn...@apache.org.
organize imports only
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/2e35e490
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2e35e490
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2e35e490
Branch: refs/pull/30/merge
Commit: 2e35e4901b60388235b9f15701e9b2e5659e879f
Parents: f8ae7fe
Author: Strong Liu <st...@hibernate.org>
Authored: Sun Jan 19 18:00:01 2014 +0800
Committer: Strong Liu <st...@hibernate.org>
Committed: Sun Jan 19 18:00:01 2014 +0800
----------------------------------------------------------------------
.../java/org/usergrid/batch/JobExecution.java | 4 +-
.../org/usergrid/batch/JobExecutionImpl.java | 5 +-
.../java/org/usergrid/batch/JobFactory.java | 4 +-
.../org/usergrid/batch/UsergridJobFactory.java | 6 +-
.../org/usergrid/batch/job/OnlyOnceJob.java | 4 +-
.../usergrid/batch/repository/JobAccessor.java | 4 +-
.../batch/repository/JobDescriptor.java | 5 +-
.../java/org/usergrid/batch/service/App.java | 3 +-
.../batch/service/JobSchedulerService.java | 33 ++---
.../batch/service/SchedulerService.java | 4 +-
.../batch/service/SchedulerServiceImpl.java | 29 ++--
.../hazelcast/HazelcastLifecycleMonitor.java | 8 +-
.../org/usergrid/count/AbstractBatcher.java | 12 +-
.../java/org/usergrid/count/BatchSubmitter.java | 4 +-
.../usergrid/count/CassandraCounterStore.java | 20 ++-
.../org/usergrid/count/CassandraSubmitter.java | 17 +--
.../java/org/usergrid/count/CounterStore.java | 4 +-
.../java/org/usergrid/count/SimpleBatcher.java | 1 -
.../org/usergrid/count/Slf4JBatchSubmitter.java | 17 +--
.../java/org/usergrid/count/common/Count.java | 14 +-
.../usergrid/count/common/CountSerDeUtils.java | 4 +-
.../main/java/org/usergrid/locking/Lock.java | 4 +-
.../java/org/usergrid/locking/LockHelper.java | 5 +-
.../java/org/usergrid/locking/LockManager.java | 4 +-
.../locking/cassandra/HectorLockImpl.java | 11 +-
.../cassandra/HectorLockManagerImpl.java | 8 +-
.../org/usergrid/locking/noop/NoOpLockImpl.java | 4 +-
.../locking/noop/NoOpLockManagerImpl.java | 4 +-
.../locking/singlenode/SingleNodeLockImpl.java | 6 +-
.../singlenode/SingleNodeLockManagerImpl.java | 15 +-
.../zookeeper/ZooKeeperLockManagerImpl.java | 16 +--
.../locking/zookeeper/ZookeeperLockImpl.java | 5 +-
.../main/java/org/usergrid/mq/CounterQuery.java | 13 +-
.../src/main/java/org/usergrid/mq/Message.java | 36 +----
.../src/main/java/org/usergrid/mq/Query.java | 28 +---
.../java/org/usergrid/mq/QueryFilterLexer.java | 10 +-
.../java/org/usergrid/mq/QueryFilterParser.java | 10 +-
.../java/org/usergrid/mq/QueryProcessor.java | 18 +--
.../src/main/java/org/usergrid/mq/Queue.java | 19 +--
.../main/java/org/usergrid/mq/QueueManager.java | 8 +-
.../main/java/org/usergrid/mq/QueueQuery.java | 5 +-
.../main/java/org/usergrid/mq/QueueResults.java | 9 +-
.../src/main/java/org/usergrid/mq/QueueSet.java | 11 +-
.../usergrid/mq/cassandra/CassandraMQUtils.java | 36 ++---
.../mq/cassandra/MessageIndexUpdate.java | 20 +--
.../usergrid/mq/cassandra/QueueIndexUpdate.java | 21 +--
.../mq/cassandra/QueueManagerFactoryImpl.java | 10 +-
.../usergrid/mq/cassandra/QueueManagerImpl.java | 103 +++-----------
.../org/usergrid/mq/cassandra/QueuesCF.java | 5 +-
.../mq/cassandra/io/AbstractSearch.java | 46 ++----
.../mq/cassandra/io/ConsumerTransaction.java | 29 ++--
.../org/usergrid/mq/cassandra/io/EndSearch.java | 5 +-
.../usergrid/mq/cassandra/io/FilterSearch.java | 20 +--
.../mq/cassandra/io/NoTransactionSearch.java | 7 +-
.../usergrid/mq/cassandra/io/StartSearch.java | 5 +-
.../usergrid/persistence/AbstractEntity.java | 14 +-
.../persistence/AggregateCounterSet.java | 6 +-
.../org/usergrid/persistence/CounterQuery.java | 13 +-
.../usergrid/persistence/CredentialsInfo.java | 9 +-
.../org/usergrid/persistence/DynamicEntity.java | 9 +-
.../java/org/usergrid/persistence/Entity.java | 16 +--
.../org/usergrid/persistence/EntityFactory.java | 4 +-
.../org/usergrid/persistence/EntityManager.java | 8 +-
.../org/usergrid/persistence/Identifier.java | 6 +-
.../java/org/usergrid/persistence/Query.java | 44 ++----
.../org/usergrid/persistence/QueryUtils.java | 4 +-
.../usergrid/persistence/RelationManager.java | 4 +-
.../java/org/usergrid/persistence/Results.java | 17 +--
.../java/org/usergrid/persistence/Schema.java | 60 +++-----
.../persistence/SimpleCollectionRef.java | 4 +-
.../org/usergrid/persistence/SimpleRoleRef.java | 4 +-
.../persistence/cassandra/ApplicationCF.java | 4 +-
.../usergrid/persistence/cassandra/CFEnum.java | 4 +-
.../cassandra/CassandraPersistenceUtils.java | 44 ++----
.../persistence/cassandra/CassandraService.java | 70 +++-------
.../cassandra/ConnectedEntityRefImpl.java | 4 +-
.../cassandra/ConnectionRefImpl.java | 15 +-
.../persistence/cassandra/CounterUtils.java | 33 ++---
.../persistence/cassandra/CursorCache.java | 1 -
.../cassandra/EntityManagerFactoryImpl.java | 55 +++-----
.../cassandra/EntityManagerImpl.java | 139 ++++---------------
.../cassandra/EntityValueSerializer.java | 6 +-
.../persistence/cassandra/GeoIndexManager.java | 22 ++-
.../persistence/cassandra/IndexUpdate.java | 23 +--
.../persistence/cassandra/QueryProcessor.java | 47 +------
.../cassandra/RelationManagerImpl.java | 111 +++------------
.../usergrid/persistence/cassandra/Setup.java | 19 +--
.../cassandra/SimpleIndexBucketLocatorImpl.java | 4 +-
.../cassandra/index/ConnectedIndexScanner.java | 14 +-
.../cassandra/index/IndexBucketScanner.java | 16 +--
.../index/IndexMultiBucketSetLoader.java | 16 +--
.../cassandra/index/IndexScanner.java | 4 +-
.../cassandra/index/NoOpIndexScanner.java | 4 +-
.../cassandra/util/Slf4jTraceTagReporter.java | 4 +-
.../persistence/cassandra/util/TimedOpTag.java | 5 +-
.../cassandra/util/TraceTagAspect.java | 4 +-
.../cassandra/util/TraceTagManager.java | 5 +-
.../usergrid/persistence/entities/Activity.java | 12 +-
.../persistence/entities/Application.java | 13 +-
.../usergrid/persistence/entities/Asset.java | 9 +-
.../usergrid/persistence/entities/Device.java | 9 +-
.../usergrid/persistence/entities/Event.java | 13 +-
.../usergrid/persistence/entities/Folder.java | 9 +-
.../usergrid/persistence/entities/Group.java | 13 +-
.../usergrid/persistence/entities/JobStat.java | 4 +-
.../usergrid/persistence/entities/Message.java | 9 +-
.../org/usergrid/persistence/entities/Role.java | 11 +-
.../org/usergrid/persistence/entities/User.java | 13 +-
.../persistence/geo/CollectionGeoSearch.java | 11 +-
.../persistence/geo/ConnectionGeoSearch.java | 11 +-
.../persistence/geo/EntityLocationRef.java | 5 +-
.../EntityLocationRefDistanceComparator.java | 4 +-
.../persistence/geo/GeoIndexSearcher.java | 27 ++--
.../persistence/geo/GeocellManager.java | 8 +-
.../usergrid/persistence/geo/GeocellUtils.java | 8 +-
.../geo/comparator/DoubleTupleComparator.java | 4 +-
.../persistence/query/ir/OrderByNode.java | 4 +-
.../persistence/query/ir/QuerySlice.java | 7 +-
.../persistence/query/ir/SearchVisitor.java | 14 +-
.../persistence/query/ir/SliceNode.java | 4 +-
.../query/ir/result/AbstractScanColumn.java | 3 +-
.../ir/result/ConnectionIndexSliceParser.java | 7 +-
.../query/ir/result/ConnectionRefLoader.java | 8 +-
.../ir/result/ConnectionTypesIterator.java | 13 +-
.../query/ir/result/EmptyIterator.java | 4 +-
.../query/ir/result/EntityRefLoader.java | 6 +-
.../query/ir/result/EntityResultsLoader.java | 4 +-
.../query/ir/result/GeoIterator.java | 15 +-
.../persistence/query/ir/result/IDLoader.java | 4 +-
.../query/ir/result/IntersectionIterator.java | 7 +-
.../query/ir/result/OrderByIterator.java | 20 +--
.../query/ir/result/ResultIterator.java | 4 +-
.../query/ir/result/ResultsLoader.java | 4 +-
.../ir/result/SecondaryIndexSliceParser.java | 4 +-
.../query/ir/result/SliceIterator.java | 11 +-
.../query/ir/result/StaticIdIterator.java | 4 +-
.../query/ir/result/SubtractionIterator.java | 7 +-
.../query/ir/result/UUIDIndexSliceParser.java | 4 +-
.../query/ir/result/UnionIterator.java | 14 +-
.../persistence/query/tree/UUIDLiteral.java | 4 +-
.../persistence/schema/CollectionInfo.java | 6 +-
.../usergrid/persistence/schema/EntityInfo.java | 4 +-
.../usergrid/system/UsergridSystemMonitor.java | 7 +-
.../main/java/org/usergrid/utils/AESUtils.java | 9 +-
.../java/org/usergrid/utils/CodecUtils.java | 4 +-
.../java/org/usergrid/utils/CompositeUtils.java | 6 +-
.../org/usergrid/utils/ConversionUtils.java | 16 +--
.../main/java/org/usergrid/utils/HttpUtils.java | 6 +-
.../java/org/usergrid/utils/IndexUtils.java | 29 ++--
.../main/java/org/usergrid/utils/JsonUtils.java | 22 ++-
.../main/java/org/usergrid/utils/ListUtils.java | 9 +-
.../main/java/org/usergrid/utils/MailUtils.java | 18 +--
.../main/java/org/usergrid/utils/MapUtils.java | 12 +-
.../java/org/usergrid/utils/StringUtils.java | 5 +-
.../main/java/org/usergrid/utils/UUIDUtils.java | 18 +--
.../main/java/org/usergrid/utils/Version.java | 4 +-
.../src/test/java/org/usergrid/Application.java | 6 +-
.../org/usergrid/ConcurrentCoreITSuite.java | 10 +-
.../usergrid/ConcurrentCoreIteratorITSuite.java | 30 +---
.../org/usergrid/ConcurrentCoreTestSuite.java | 6 +-
.../test/java/org/usergrid/CoreApplication.java | 8 +-
.../src/test/java/org/usergrid/CoreITSetup.java | 4 +-
.../test/java/org/usergrid/CoreITSetupImpl.java | 4 +-
.../src/test/java/org/usergrid/CoreITSuite.java | 10 +-
.../test/java/org/usergrid/CoreTestSuite.java | 6 +-
.../java/org/usergrid/batch/AppArgsTest.java | 3 +-
.../batch/BulkJobExecutionUnitTest.java | 4 +-
.../java/org/usergrid/batch/BulkTestUtils.java | 6 +-
.../batch/ConcurrentSchedulerITSuite.java | 9 +-
.../batch/ConcurrentSchedulerTestSuite.java | 3 -
.../org/usergrid/batch/SchedulerITSuite.java | 9 +-
.../org/usergrid/batch/SchedulerTestSuite.java | 3 -
.../usergrid/batch/UsergridJobFactoryTest.java | 6 +-
.../batch/job/AbstractSchedulerRuntimeIT.java | 6 +-
.../usergrid/batch/job/CountdownLatchJob.java | 6 +-
.../org/usergrid/batch/job/DelayExecution.java | 6 +-
.../org/usergrid/batch/job/DelayHeartbeat.java | 6 +-
.../batch/job/FailureJobExceuction.java | 6 +-
.../usergrid/batch/job/OnlyOnceExceution.java | 6 +-
.../job/OnlyOnceUnlockOnFailExceution.java | 6 +-
.../usergrid/batch/job/SchedulerRuntime1IT.java | 10 +-
.../usergrid/batch/job/SchedulerRuntime2IT.java | 10 +-
.../usergrid/batch/job/SchedulerRuntime3IT.java | 3 +-
.../usergrid/batch/job/SchedulerRuntime4IT.java | 3 +-
.../usergrid/batch/job/SchedulerRuntime5IT.java | 3 +-
.../usergrid/batch/job/SchedulerRuntime6IT.java | 10 +-
.../usergrid/batch/job/SchedulerRuntime7IT.java | 3 +-
.../usergrid/batch/job/SchedulerRuntime8IT.java | 5 +-
.../org/usergrid/batch/job/TestJobListener.java | 4 +-
.../usergrid/batch/job/TestJobListenerTest.java | 7 +-
.../clustering/hazelcast/HazelcastTest.java | 13 +-
.../count/BatchCountParallelismTest.java | 19 +--
.../org/usergrid/count/SimpleBatcherTest.java | 1 -
.../locking/cassandra/HectorLockManagerIT.java | 12 +-
.../SingleNodeLockTestSingleNode.java | 11 +-
.../zookeeper/AbstractZooKeeperTest.java | 9 +-
.../org/usergrid/locking/zookeeper/ZooPut.java | 11 +-
.../zookeeper/ZookeeperLockManagerTest.java | 17 +--
.../test/java/org/usergrid/mq/MessagesIT.java | 13 +-
.../org/usergrid/persistence/CollectionIT.java | 15 +-
.../usergrid/persistence/CoreSchemaManager.java | 3 +-
.../org/usergrid/persistence/CounterIT.java | 11 +-
.../persistence/EntityConnectionsIT.java | 13 +-
.../persistence/EntityDictionaryIT.java | 12 +-
.../usergrid/persistence/EntityManagerIT.java | 17 +--
.../org/usergrid/persistence/EntityTest.java | 8 +-
.../java/org/usergrid/persistence/GeoIT.java | 9 +-
.../java/org/usergrid/persistence/IndexIT.java | 19 ++-
.../org/usergrid/persistence/PathQueryIT.java | 10 +-
.../org/usergrid/persistence/PermissionsIT.java | 12 +-
.../org/usergrid/persistence/QueryTest.java | 27 +---
.../usergrid/persistence/QueryUtilsTest.java | 6 +-
.../org/usergrid/persistence/SchemaTest.java | 5 +-
.../cassandra/EntityManagerFactoryImplIT.java | 19 +--
.../cassandra/QueryProcessorTest.java | 20 +--
.../SimpleIndexBucketLocatorImplTest.java | 15 +-
.../persistence/entities/SampleEntity.java | 9 +-
...EntityLocationRefDistanceComparatorTest.java | 4 +-
.../query/AbstractIteratingQueryIT.java | 11 +-
.../query/IntersectionUnionPagingIT.java | 8 +-
.../query/ir/result/InOrderIterator.java | 11 +-
.../ir/result/IntersectionIteratorTest.java | 12 +-
.../ir/result/SubtractionIteratorTest.java | 10 +-
.../query/ir/result/UnionIteratorTest.java | 11 +-
.../persistence/query/tree/GrammarTreeTest.java | 14 +-
.../system/UsergridSystemMonitorIT.java | 5 +-
.../org/usergrid/utils/ConversionUtilsTest.java | 4 +-
.../java/org/usergrid/utils/IndexUtilsTest.java | 11 +-
.../java/org/usergrid/utils/JsonUtilsTest.java | 10 +-
.../java/org/usergrid/utils/ListUtilsTest.java | 6 +-
.../java/org/usergrid/utils/MailUtilsTest.java | 9 +-
.../java/org/usergrid/utils/MapUtilsTest.java | 4 +-
.../java/org/usergrid/utils/UUIDUtilsTest.java | 24 +---
.../main/java/org/usergrid/launcher/App.java | 20 +--
.../java/org/usergrid/launcher/AppleUtils.java | 3 +-
.../org/usergrid/launcher/LauncherFrame.java | 36 +----
.../org/usergrid/launcher/LogViewerFrame.java | 13 +-
.../org/usergrid/mongo/MongoChannelHandler.java | 9 +-
.../org/usergrid/mongo/MongoMessageDecoder.java | 10 +-
.../java/org/usergrid/mongo/MongoServer.java | 15 +-
.../mongo/MongoServerPipelineFactory.java | 3 +-
.../usergrid/mongo/commands/ListDatabases.java | 10 +-
.../usergrid/mongo/commands/MongoCommand.java | 4 +-
.../org/usergrid/mongo/commands/Whatsmyuri.java | 4 +-
.../org/usergrid/mongo/protocol/Message.java | 12 +-
.../org/usergrid/mongo/protocol/OpDelete.java | 16 +--
.../org/usergrid/mongo/protocol/OpGetMore.java | 6 +-
.../org/usergrid/mongo/protocol/OpInsert.java | 12 +-
.../usergrid/mongo/protocol/OpKillCursors.java | 4 +-
.../java/org/usergrid/mongo/protocol/OpMsg.java | 4 +-
.../org/usergrid/mongo/protocol/OpQuery.java | 26 ++--
.../org/usergrid/mongo/protocol/OpReply.java | 12 +-
.../org/usergrid/mongo/protocol/OpUpdate.java | 14 +-
.../usergrid/mongo/query/MongoQueryParser.java | 13 +-
.../testproxy/MongoProxyInboundHandler.java | 15 +-
.../mongo/testproxy/MongoProxyServer.java | 10 +-
.../org/usergrid/mongo/AbstractMongoTest.java | 13 +-
.../java/org/usergrid/mongo/BasicMongoTest.java | 32 ++---
.../org/usergrid/mongo/DatabaseInitializer.java | 6 +-
.../java/org/usergrid/mongo/MongoQueryTest.java | 20 +--
.../query/validator/ApiServerRunner.java | 5 +-
.../usergrid/query/validator/QueryRunner.java | 3 +-
.../query/validator/QueryValidationTest.java | 2 +-
.../usergrid/rest/AbstractContextResource.java | 25 ++--
.../java/org/usergrid/rest/ApiResponse.java | 17 +--
.../rest/JacksonCustomMapperProvider.java | 10 +-
.../java/org/usergrid/rest/RootResource.java | 60 +++-----
.../java/org/usergrid/rest/SwaggerServlet.java | 27 ++--
.../java/org/usergrid/rest/SystemResource.java | 15 +-
.../org/usergrid/rest/TextToJsonSwapWriter.java | 23 ++-
.../rest/applications/ApplicationResource.java | 45 ++----
.../rest/applications/AuthResource.java | 29 ++--
.../rest/applications/ServiceResource.java | 57 ++------
.../applications/assets/AssetsResource.java | 32 ++---
.../applications/events/EventsResource.java | 17 ++-
.../rest/applications/queues/QueueResource.java | 32 ++---
.../queues/QueueSubscriberResource.java | 30 ++--
.../queues/QueueSubscriptionResource.java | 30 ++--
.../queues/QueueTransactionsResource.java | 20 +--
.../rest/applications/users/UserResource.java | 48 ++-----
.../rest/applications/users/UsersResource.java | 38 ++---
.../exceptions/AbstractExceptionMapper.java | 9 +-
.../AuthorizationExceptionMapper.java | 4 +-
...cateUniquePropertyExistsExceptionMapper.java | 4 +-
.../EntityNotFoundExceptionMapper.java | 4 +-
...orbiddenServiceOperationExceptionMapper.java | 4 +-
.../exceptions/JsonReadExceptionMapper.java | 4 +-
.../exceptions/JsonWriteExceptionMapper.java | 4 +-
.../exceptions/ManagementExceptionMapper.java | 4 +-
.../NotImplementedExceptionMapper.java | 4 +-
.../exceptions/OAuthProblemExceptionMapper.java | 8 +-
...rganizationApplicationNotFoundException.java | 4 +-
.../exceptions/PersistenceExceptionMapper.java | 4 +-
.../exceptions/QueryParseExceptionMapper.java | 5 +-
.../exceptions/QueryTokenExceptionMapper.java | 7 +-
.../RecentlyUsedPasswordExceptionMapper.java | 4 +-
...RequiredPropertyNotFoundExceptionMapper.java | 4 +-
.../rest/exceptions/SecurityException.java | 3 +-
.../rest/exceptions/ServiceExceptionMapper.java | 4 +-
.../ServiceResourceNotFoundExceptionMapper.java | 6 +-
.../TransactionNotFoundExceptionMapper.java | 4 +-
.../rest/filters/ContentTypeFilter.java | 30 +---
.../rest/filters/JSONPCallbackFilter.java | 9 +-
.../usergrid/rest/filters/MeteringFilter.java | 36 ++---
.../usergrid/rest/filters/TracingFilter.java | 13 +-
.../rest/management/ManagementResource.java | 48 +++----
.../management/metrics/MetricsResource.java | 13 +-
.../organizations/OrganizationResource.java | 23 +--
.../organizations/OrganizationsResource.java | 28 ++--
.../applications/ApplicationResource.java | 28 ++--
.../applications/ApplicationsResource.java | 30 ++--
.../organizations/users/UsersResource.java | 30 ++--
.../rest/management/users/UserResource.java | 31 ++---
.../rest/management/users/UsersResource.java | 33 ++---
.../organizations/OrganizationsResource.java | 28 ++--
.../organizations/OrganizationResource.java | 24 ++--
.../rest/security/CrossOriginRequestFilter.java | 7 +-
.../security/SecuredResourceFilterFactory.java | 29 ++--
.../security/shiro/RestSecurityManager.java | 9 +-
.../ShiroAuthenticationExceptionMapper.java | 11 +-
.../shiro/filters/BasicAuthSecurityFilter.java | 13 +-
.../ClientCredentialsSecurityFilter.java | 10 +-
.../OAuth2AccessTokenSecurityFilter.java | 27 ++--
.../security/shiro/filters/SecurityFilter.java | 23 ++-
.../session/HttpRequestSessionManager.java | 6 +-
.../session/HttpServletRequestSession.java | 11 +-
.../usergrid/rest/test/PropertiesResource.java | 21 ++-
.../java/org/usergrid/rest/utils/CORSUtils.java | 7 +-
.../org/usergrid/rest/utils/JSONPUtils.java | 11 +-
.../java/org/usergrid/rest/AbstractRestIT.java | 36 +++--
.../test/java/org/usergrid/rest/BasicIT.java | 16 +--
.../usergrid/rest/ConcurrentRestITSuite.java | 7 +-
.../org/usergrid/rest/DatabaseInitializer.java | 6 +-
.../test/java/org/usergrid/rest/ITSetup.java | 9 +-
.../java/org/usergrid/rest/RestITSuite.java | 7 +-
.../org/usergrid/rest/TestContextSetup.java | 3 +-
.../java/org/usergrid/rest/TomcatResource.java | 10 +-
.../ApplicationRequestCounterIT.java | 13 +-
.../applications/ApplicationResourceIT.java | 21 ++-
.../rest/applications/DevicesResourceIT.java | 13 +-
.../applications/assets/AssetResourceIT.java | 17 +--
.../collection/BadGrammarQueryTest.java | 9 +-
.../collection/BrowserCompatibilityTest.java | 6 +-
.../collection/PagingResourceIT.java | 13 +-
.../collection/activities/AndOrQueryTest.java | 6 +-
.../collection/activities/OrderByTest.java | 10 +-
.../activities/PagingEntitiesTest.java | 7 +-
.../collection/activities/PutTest.java | 6 +-
.../collection/groups/GeoPagingTest.java | 6 +-
.../collection/groups/UpdateGroupIT.java | 20 ++-
.../applications/events/EventsResourceIT.java | 9 +-
.../queues/AbstractQueueResourceIT.java | 20 +--
.../queues/QueueResourceLong1IT.java | 9 +-
.../queues/QueueResourceLong2IT.java | 7 +-
.../queues/QueueResourceLong3IT.java | 14 +-
.../queues/QueueResourceShortIT.java | 23 ++-
.../users/CollectionsResourceIT.java | 16 +--
.../users/ConnectionResourceTest.java | 14 +-
.../applications/users/GroupResourceIT.java | 12 +-
.../applications/users/OwnershipResourceIT.java | 6 +-
.../users/PermissionsResourceIT.java | 21 ++-
.../applications/users/RetrieveUsersTest.java | 6 +-
.../rest/applications/users/UserResourceIT.java | 22 +--
.../users/extensions/TestResource.java | 8 +-
.../rest/applications/utils/TestUtils.java | 4 +-
.../rest/applications/utils/UserRepo.java | 12 +-
.../rest/filters/ContentTypeResourceIT.java | 37 ++---
.../rest/management/ManagementResourceIT.java | 22 ++-
.../rest/management/RegistrationIT.java | 46 ++----
.../organizations/OrganizationResourceIT.java | 10 +-
.../organizations/OrganizationsResourceIT.java | 32 ++---
.../rest/management/users/MUUserResourceIT.java | 45 ++----
.../UsersOrganizationsResourceIT.java | 7 +-
.../rest/test/PropertiesResourceIT.java | 9 +-
.../usergrid/rest/test/resource/Connection.java | 4 +-
.../rest/test/resource/EntityResource.java | 9 +-
.../rest/test/resource/NamedResource.java | 12 +-
.../rest/test/resource/SetResource.java | 4 +-
.../rest/test/resource/TestContext.java | 5 +-
.../rest/test/resource/ValueResource.java | 7 +-
.../rest/test/resource/app/Application.java | 4 +-
.../usergrid/rest/test/resource/app/Device.java | 4 +-
.../usergrid/rest/test/resource/app/User.java | 4 +-
.../rest/test/resource/app/UsersCollection.java | 6 +-
.../rest/test/resource/app/queue/Queue.java | 7 +-
.../test/resource/app/queue/Transaction.java | 3 +-
.../rest/test/resource/mgmt/Application.java | 4 +-
.../resource/mgmt/ApplicationsCollection.java | 4 +-
.../rest/test/resource/mgmt/Management.java | 7 +-
.../rest/test/resource/mgmt/Organization.java | 4 +-
.../resource/mgmt/OrganizationsCollection.java | 4 +-
.../usergrid/rest/test/security/TestUser.java | 4 +-
.../usergrid/management/ApplicationInfo.java | 6 +-
.../usergrid/management/ManagementService.java | 9 +-
.../usergrid/management/OrganizationInfo.java | 6 +-
.../java/org/usergrid/management/UserInfo.java | 15 +-
.../cassandra/AccountCreationPropsImpl.java | 7 +-
.../cassandra/ApplicationCreatorImpl.java | 7 +-
.../cassandra/ManagementServiceImpl.java | 127 +++--------------
.../usergrid/security/AuthPrincipalType.java | 6 +-
.../security/crypto/EncryptionService.java | 4 +-
.../security/crypto/EncryptionServiceImpl.java | 15 +-
.../security/crypto/command/BcryptCommand.java | 6 +-
.../crypto/command/EncryptionCommand.java | 4 +-
.../security/crypto/command/Md5HashCommand.java | 5 +-
.../crypto/command/PlainTextCommand.java | 4 +-
.../crypto/command/SaltedHasherCommand.java | 6 +-
.../crypto/command/Sha1HashCommand.java | 6 +-
.../org/usergrid/security/oauth/AccessInfo.java | 9 +-
.../security/oauth/ClientCredentialsInfo.java | 4 +-
.../security/providers/AbstractProvider.java | 9 +-
.../security/providers/FacebookProvider.java | 9 +-
.../security/providers/FoursquareProvider.java | 20 ++-
.../providers/PingIdentityProvider.java | 11 +-
.../security/providers/SignInAsProvider.java | 4 +-
.../security/shiro/CustomPermission.java | 11 +-
.../shiro/PrincipalCredentialsToken.java | 15 +-
.../java/org/usergrid/security/shiro/Realm.java | 66 +++------
.../principals/ApplicationGuestPrincipal.java | 4 +-
.../shiro/principals/ApplicationPrincipal.java | 4 +-
.../principals/ApplicationUserPrincipal.java | 4 +-
.../shiro/principals/OrganizationPrincipal.java | 4 +-
.../shiro/principals/UserPrincipal.java | 4 +-
.../security/shiro/utils/SubjectUtils.java | 24 ++--
.../org/usergrid/security/tokens/TokenInfo.java | 4 +-
.../usergrid/security/tokens/TokenService.java | 4 +-
.../tokens/cassandra/TokenServiceImpl.java | 32 ++---
.../services/AbstractCollectionService.java | 14 +-
.../services/AbstractConnectionsService.java | 16 +--
.../AbstractPathBasedColllectionService.java | 10 +-
.../org/usergrid/services/AbstractService.java | 20 +--
.../java/org/usergrid/services/Service.java | 4 +-
.../org/usergrid/services/ServiceContext.java | 8 +-
.../java/org/usergrid/services/ServiceInfo.java | 17 +--
.../org/usergrid/services/ServiceManager.java | 18 ++-
.../services/ServiceManagerFactory.java | 8 +-
.../org/usergrid/services/ServiceParameter.java | 15 +-
.../org/usergrid/services/ServicePayload.java | 12 +-
.../org/usergrid/services/ServiceRequest.java | 13 +-
.../org/usergrid/services/ServiceResults.java | 12 +-
.../applications/ApplicationsService.java | 11 +-
.../usergrid/services/assets/AssetsService.java | 4 +-
.../services/assets/data/AssetMimeHandler.java | 18 +--
.../services/assets/data/AssetUtils.java | 16 +--
.../services/assets/data/BinaryStore.java | 4 +-
.../assets/data/LocalFileBinaryStore.java | 7 +-
.../services/assets/data/S3BinaryStore.java | 30 ++--
.../services/devices/DevicesService.java | 4 +-
.../usergrid/services/groups/GroupsService.java | 11 +-
.../groups/activities/ActivitiesService.java | 6 +-
.../users/activities/ActivitiesService.java | 6 +-
.../usergrid/services/roles/RolesService.java | 8 +-
.../services/roles/users/UsersService.java | 4 +-
.../usergrid/services/users/UsersService.java | 22 +--
.../users/activities/ActivitiesService.java | 10 +-
.../services/users/roles/RolesService.java | 4 +-
.../org/usergrid/ConcurrentServiceITSuite.java | 11 +-
.../java/org/usergrid/ServiceApplication.java | 10 +-
.../test/java/org/usergrid/ServiceITSetup.java | 4 +-
.../java/org/usergrid/ServiceITSetupImpl.java | 4 +-
.../test/java/org/usergrid/ServiceITSuite.java | 11 +-
.../org/usergrid/management/EmailFlowIT.java | 48 ++-----
.../management/ManagementTestHelper.java | 4 +-
.../org/usergrid/management/MockImapClient.java | 13 +-
.../org/usergrid/management/OrganizationIT.java | 15 +-
.../java/org/usergrid/management/RoleIT.java | 9 +-
.../cassandra/ApplicationCreatorIT.java | 8 +-
.../cassandra/ManagementServiceIT.java | 17 +--
.../cassandra/ManagementTestHelperImpl.java | 4 +-
.../usergrid/security/CustomResolverTest.java | 19 ++-
.../crypto/EncryptionServiceImplTest.java | 8 +-
.../crypto/command/BcryptCommandTest.java | 11 +-
.../crypto/command/Md5HashCommandTest.java | 5 +-
.../crypto/command/Sha1HashCommandTest.java | 6 +-
.../security/providers/FacebookProviderIT.java | 12 +-
.../providers/PingIdentityProviderIT.java | 12 +-
.../security/tokens/TokenServiceIT.java | 11 +-
.../usergrid/services/CollectionServiceIT.java | 4 +-
.../usergrid/services/ConnectionsServiceIT.java | 8 +-
.../org/usergrid/services/RolesServiceIT.java | 14 +-
.../org/usergrid/services/ServiceFactoryIT.java | 5 +-
.../org/usergrid/services/ServiceInfoTest.java | 4 +-
.../usergrid/services/ServiceInvocationIT.java | 8 +-
.../org/usergrid/services/ServiceRequestIT.java | 8 +-
.../services/assets/data/AssetUtilsTest.java | 4 +-
.../org/usergrid/NoExitSecurityManager.java | 4 +-
.../usergrid/cassandra/AvailablePortFinder.java | 6 +-
.../usergrid/cassandra/CassandraResource.java | 21 ++-
.../usergrid/cassandra/ClearShiroSubject.java | 7 +-
.../cassandra/ConcurrentJunitRunner.java | 15 +-
.../org/usergrid/cassandra/ConcurrentSuite.java | 19 +--
.../cassandra/CassandraResourceTest.java | 4 +-
.../main/java/org/usergrid/tools/ApiDoc.java | 30 ++--
.../main/java/org/usergrid/tools/AppAudit.java | 35 ++---
.../java/org/usergrid/tools/AppNameFix.java | 13 +-
.../src/main/java/org/usergrid/tools/Cli.java | 30 ++--
.../main/java/org/usergrid/tools/Command.java | 7 +-
.../java/org/usergrid/tools/CredExport.java | 11 +-
.../java/org/usergrid/tools/DupAdminRepair.java | 29 ++--
.../java/org/usergrid/tools/DupOrgRepair.java | 30 ++--
.../java/org/usergrid/tools/EntityCleanup.java | 26 ++--
.../usergrid/tools/EntityInsertBenchMark.java | 32 ++---
.../org/usergrid/tools/EntityReadBenchMark.java | 41 +++---
.../java/org/usergrid/tools/EntityUpdate.java | 24 ++--
.../main/java/org/usergrid/tools/Export.java | 24 +---
.../org/usergrid/tools/ExportDataCreator.java | 4 +-
.../org/usergrid/tools/ExportingToolBase.java | 17 ++-
.../main/java/org/usergrid/tools/Import.java | 21 ++-
.../main/java/org/usergrid/tools/ImportFB.java | 17 ++-
.../java/org/usergrid/tools/IndexRebuild.java | 20 +--
.../main/java/org/usergrid/tools/Metrics.java | 29 ++--
.../org/usergrid/tools/OrganizationExport.java | 20 ++-
.../java/org/usergrid/tools/PopulateSample.java | 15 +-
.../java/org/usergrid/tools/ResetSuperUser.java | 17 +--
.../main/java/org/usergrid/tools/SetupDB.java | 5 +-
.../src/main/java/org/usergrid/tools/Test.java | 5 +-
.../main/java/org/usergrid/tools/ToolBase.java | 17 +--
.../org/usergrid/tools/UniqueIndexCleanup.java | 40 ++----
.../java/org/usergrid/tools/UserManager.java | 3 +-
.../org/usergrid/tools/WarehouseExport.java | 57 +++-----
.../org/usergrid/tools/WarehouseUpsert.java | 11 +-
.../org/usergrid/tools/apidoc/swagger/Api.java | 4 +-
.../tools/apidoc/swagger/ApiListing.java | 13 +-
.../tools/apidoc/swagger/ApiOperation.java | 4 +-
.../apidoc/swagger/ApiParamAllowableValues.java | 4 +-
.../java/org/usergrid/tools/bean/ExportOrg.java | 4 +-
.../org/usergrid/tools/bean/MetricLine.java | 9 +-
.../org/usergrid/tools/bean/MetricQuery.java | 12 +-
.../websocket/WebSocketChannelHandler.java | 44 ++----
.../org/usergrid/websocket/WebSocketServer.java | 13 +-
.../WebSocketServerPipelineFactory.java | 5 +-
.../websocket/WebSocketSslContextFactory.java | 5 +-
.../websocket/SimpleMessageProducer.java | 13 +-
533 files changed, 2463 insertions(+), 4729 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/JobExecution.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/JobExecution.java b/stack/core/src/main/java/org/usergrid/batch/JobExecution.java
index 150de17..6b09f0e 100644
--- a/stack/core/src/main/java/org/usergrid/batch/JobExecution.java
+++ b/stack/core/src/main/java/org/usergrid/batch/JobExecution.java
@@ -16,11 +16,11 @@
package org.usergrid.batch;
-import java.util.UUID;
-
import org.usergrid.persistence.entities.JobData;
import org.usergrid.persistence.entities.JobStat;
+import java.util.UUID;
+
/**
* Interface to define all operations possible during a job execution. The job execution has several states.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/JobExecutionImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/JobExecutionImpl.java b/stack/core/src/main/java/org/usergrid/batch/JobExecutionImpl.java
index d5aecfc..4cbed78 100644
--- a/stack/core/src/main/java/org/usergrid/batch/JobExecutionImpl.java
+++ b/stack/core/src/main/java/org/usergrid/batch/JobExecutionImpl.java
@@ -1,14 +1,13 @@
package org.usergrid.batch;
-import java.util.UUID;
-
+import com.google.common.base.Preconditions;
import org.usergrid.batch.repository.JobDescriptor;
import org.usergrid.batch.service.JobRuntimeService;
import org.usergrid.persistence.entities.JobData;
import org.usergrid.persistence.entities.JobStat;
-import com.google.common.base.Preconditions;
+import java.util.UUID;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/JobFactory.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/JobFactory.java b/stack/core/src/main/java/org/usergrid/batch/JobFactory.java
index 6154858..a9e6409 100644
--- a/stack/core/src/main/java/org/usergrid/batch/JobFactory.java
+++ b/stack/core/src/main/java/org/usergrid/batch/JobFactory.java
@@ -1,10 +1,10 @@
package org.usergrid.batch;
-import java.util.List;
-
import org.usergrid.batch.repository.JobDescriptor;
+import java.util.List;
+
/**
* It is up to the implementation how many BulkJob instances to return, but this should be controled by the
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/UsergridJobFactory.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/UsergridJobFactory.java b/stack/core/src/main/java/org/usergrid/batch/UsergridJobFactory.java
index 951d10d..0204a6c 100644
--- a/stack/core/src/main/java/org/usergrid/batch/UsergridJobFactory.java
+++ b/stack/core/src/main/java/org/usergrid/batch/UsergridJobFactory.java
@@ -1,15 +1,15 @@
package org.usergrid.batch;
-import java.util.Collections;
-import java.util.List;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.usergrid.batch.repository.JobDescriptor;
+import java.util.Collections;
+import java.util.List;
+
/** @author tnine */
public class UsergridJobFactory implements JobFactory {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/job/OnlyOnceJob.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/job/OnlyOnceJob.java b/stack/core/src/main/java/org/usergrid/batch/job/OnlyOnceJob.java
index 4b1c3c3..a689ad4 100644
--- a/stack/core/src/main/java/org/usergrid/batch/job/OnlyOnceJob.java
+++ b/stack/core/src/main/java/org/usergrid/batch/job/OnlyOnceJob.java
@@ -16,8 +16,6 @@
package org.usergrid.batch.job;
-import java.util.concurrent.TimeUnit;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.usergrid.batch.Job;
@@ -25,6 +23,8 @@ import org.usergrid.batch.JobExecution;
import org.usergrid.locking.Lock;
import org.usergrid.locking.LockManager;
+import java.util.concurrent.TimeUnit;
+
import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/repository/JobAccessor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/repository/JobAccessor.java b/stack/core/src/main/java/org/usergrid/batch/repository/JobAccessor.java
index bc6e7dd..0e91abd 100644
--- a/stack/core/src/main/java/org/usergrid/batch/repository/JobAccessor.java
+++ b/stack/core/src/main/java/org/usergrid/batch/repository/JobAccessor.java
@@ -18,10 +18,10 @@
package org.usergrid.batch.repository;
-import java.util.List;
-
import org.usergrid.batch.JobExecution;
+import java.util.List;
+
public interface JobAccessor {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/repository/JobDescriptor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/repository/JobDescriptor.java b/stack/core/src/main/java/org/usergrid/batch/repository/JobDescriptor.java
index b245a89..e203f24 100644
--- a/stack/core/src/main/java/org/usergrid/batch/repository/JobDescriptor.java
+++ b/stack/core/src/main/java/org/usergrid/batch/repository/JobDescriptor.java
@@ -1,14 +1,13 @@
package org.usergrid.batch.repository;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.utils.Assert;
import org.usergrid.batch.service.JobRuntimeService;
import org.usergrid.persistence.TypedEntity;
import org.usergrid.persistence.entities.JobData;
import org.usergrid.persistence.entities.JobStat;
-import me.prettyprint.cassandra.utils.Assert;
+import java.util.UUID;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/service/App.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/service/App.java b/stack/core/src/main/java/org/usergrid/batch/service/App.java
index ba7eb09..23c1f17 100644
--- a/stack/core/src/main/java/org/usergrid/batch/service/App.java
+++ b/stack/core/src/main/java/org/usergrid/batch/service/App.java
@@ -1,14 +1,13 @@
package org.usergrid.batch.service;
+import com.google.common.base.CharMatcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.context.support.FileSystemXmlApplicationContext;
-import com.google.common.base.CharMatcher;
-
/**
* Entry point for CLI functions of Usergrid batch framework
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/service/JobSchedulerService.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/service/JobSchedulerService.java b/stack/core/src/main/java/org/usergrid/batch/service/JobSchedulerService.java
index c35a9c8..6631167 100644
--- a/stack/core/src/main/java/org/usergrid/batch/service/JobSchedulerService.java
+++ b/stack/core/src/main/java/org/usergrid/batch/service/JobSchedulerService.java
@@ -18,34 +18,23 @@
package org.usergrid.batch.service;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
-
-import com.google.common.util.concurrent.AbstractScheduledService;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningScheduledExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
+import com.google.common.util.concurrent.*;
import com.yammer.metrics.annotation.ExceptionMetered;
import com.yammer.metrics.annotation.Timed;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.usergrid.batch.Job;
-import org.usergrid.batch.JobExecution;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.batch.*;
import org.usergrid.batch.JobExecution.Status;
-import org.usergrid.batch.JobExecutionImpl;
-import org.usergrid.batch.JobFactory;
-import org.usergrid.batch.JobNotFoundException;
import org.usergrid.batch.repository.JobAccessor;
import org.usergrid.batch.repository.JobDescriptor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/service/SchedulerService.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/service/SchedulerService.java b/stack/core/src/main/java/org/usergrid/batch/service/SchedulerService.java
index 92d5161..e711432 100644
--- a/stack/core/src/main/java/org/usergrid/batch/service/SchedulerService.java
+++ b/stack/core/src/main/java/org/usergrid/batch/service/SchedulerService.java
@@ -17,13 +17,13 @@
package org.usergrid.batch.service;
-import java.util.UUID;
-
import org.usergrid.persistence.Query;
import org.usergrid.persistence.Results;
import org.usergrid.persistence.entities.JobData;
import org.usergrid.persistence.entities.JobStat;
+import java.util.UUID;
+
/**
* Simple interface for performing job scheduling
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/batch/service/SchedulerServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/service/SchedulerServiceImpl.java b/stack/core/src/main/java/org/usergrid/batch/service/SchedulerServiceImpl.java
index 0c875f3..9940d6f 100644
--- a/stack/core/src/main/java/org/usergrid/batch/service/SchedulerServiceImpl.java
+++ b/stack/core/src/main/java/org/usergrid/batch/service/SchedulerServiceImpl.java
@@ -17,37 +17,28 @@
package org.usergrid.batch.service;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-import javax.annotation.PostConstruct;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
import org.usergrid.batch.JobExecution;
import org.usergrid.batch.JobExecution.Status;
import org.usergrid.batch.JobRuntime;
import org.usergrid.batch.JobRuntimeException;
import org.usergrid.batch.repository.JobAccessor;
import org.usergrid.batch.repository.JobDescriptor;
-import org.usergrid.mq.Message;
-import org.usergrid.mq.QueueManager;
-import org.usergrid.mq.QueueManagerFactory;
-import org.usergrid.mq.QueueQuery;
-import org.usergrid.mq.QueueResults;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.EntityManagerFactory;
+import org.usergrid.mq.*;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.SimpleEntityRef;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.persistence.entities.JobData;
import org.usergrid.persistence.entities.JobStat;
import org.usergrid.persistence.exceptions.TransactionNotFoundException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.Assert;
+import javax.annotation.PostConstruct;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/clustering/hazelcast/HazelcastLifecycleMonitor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/clustering/hazelcast/HazelcastLifecycleMonitor.java b/stack/core/src/main/java/org/usergrid/clustering/hazelcast/HazelcastLifecycleMonitor.java
index 9221fa3..8f73cc6 100644
--- a/stack/core/src/main/java/org/usergrid/clustering/hazelcast/HazelcastLifecycleMonitor.java
+++ b/stack/core/src/main/java/org/usergrid/clustering/hazelcast/HazelcastLifecycleMonitor.java
@@ -16,16 +16,10 @@
package org.usergrid.clustering.hazelcast;
+import com.hazelcast.core.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.hazelcast.core.Hazelcast;
-import com.hazelcast.core.Instance;
-import com.hazelcast.core.InstanceEvent;
-import com.hazelcast.core.InstanceListener;
-import com.hazelcast.core.MembershipEvent;
-import com.hazelcast.core.MembershipListener;
-
public class HazelcastLifecycleMonitor implements InstanceListener, MembershipListener {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/AbstractBatcher.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/AbstractBatcher.java b/stack/core/src/main/java/org/usergrid/count/AbstractBatcher.java
index f682ab3..a7d1624 100644
--- a/stack/core/src/main/java/org/usergrid/count/AbstractBatcher.java
+++ b/stack/core/src/main/java/org/usergrid/count/AbstractBatcher.java
@@ -16,6 +16,12 @@
package org.usergrid.count;
+import com.yammer.metrics.Metrics;
+import com.yammer.metrics.core.Counter;
+import com.yammer.metrics.core.Timer;
+import com.yammer.metrics.core.TimerContext;
+import org.usergrid.count.common.Count;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.concurrent.ArrayBlockingQueue;
@@ -26,12 +32,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import org.usergrid.count.common.Count;
-import com.yammer.metrics.Metrics;
-import com.yammer.metrics.core.Counter;
-import com.yammer.metrics.core.Timer;
-import com.yammer.metrics.core.TimerContext;
-
/**
* Base batcher implementation, handles concurrency and locking throughput throttling.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/BatchSubmitter.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/BatchSubmitter.java b/stack/core/src/main/java/org/usergrid/count/BatchSubmitter.java
index bb44709..3f4e423 100644
--- a/stack/core/src/main/java/org/usergrid/count/BatchSubmitter.java
+++ b/stack/core/src/main/java/org/usergrid/count/BatchSubmitter.java
@@ -16,11 +16,11 @@
package org.usergrid.count;
+import org.usergrid.count.common.Count;
+
import java.util.Collection;
import java.util.concurrent.Future;
-import org.usergrid.count.common.Count;
-
/** @author zznate */
public interface BatchSubmitter {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/CassandraCounterStore.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/CassandraCounterStore.java b/stack/core/src/main/java/org/usergrid/count/CassandraCounterStore.java
index 216d80f..bd3db3b 100644
--- a/stack/core/src/main/java/org/usergrid/count/CassandraCounterStore.java
+++ b/stack/core/src/main/java/org/usergrid/count/CassandraCounterStore.java
@@ -16,22 +16,20 @@
package org.usergrid.count;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.usergrid.count.common.Count;
-
import me.prettyprint.cassandra.model.HCounterColumnImpl;
import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
import me.prettyprint.hector.api.Keyspace;
import me.prettyprint.hector.api.factory.HFactory;
import me.prettyprint.hector.api.mutation.Mutator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.count.common.Count;
+
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/CassandraSubmitter.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/CassandraSubmitter.java b/stack/core/src/main/java/org/usergrid/count/CassandraSubmitter.java
index 8fd6d01..532320c 100644
--- a/stack/core/src/main/java/org/usergrid/count/CassandraSubmitter.java
+++ b/stack/core/src/main/java/org/usergrid/count/CassandraSubmitter.java
@@ -16,20 +16,15 @@
package org.usergrid.count;
-import java.util.Collection;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.usergrid.count.common.Count;
import com.yammer.metrics.Metrics;
import com.yammer.metrics.core.Timer;
import com.yammer.metrics.core.TimerContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.count.common.Count;
+
+import java.util.Collection;
+import java.util.concurrent.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/CounterStore.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/CounterStore.java b/stack/core/src/main/java/org/usergrid/count/CounterStore.java
index afa9678..709ac63 100644
--- a/stack/core/src/main/java/org/usergrid/count/CounterStore.java
+++ b/stack/core/src/main/java/org/usergrid/count/CounterStore.java
@@ -16,10 +16,10 @@
package org.usergrid.count;
-import java.util.Collection;
-
import org.usergrid.count.common.Count;
+import java.util.Collection;
+
/** @author zznate */
public interface CounterStore {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/SimpleBatcher.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/SimpleBatcher.java b/stack/core/src/main/java/org/usergrid/count/SimpleBatcher.java
index bd73466..4e28add 100644
--- a/stack/core/src/main/java/org/usergrid/count/SimpleBatcher.java
+++ b/stack/core/src/main/java/org/usergrid/count/SimpleBatcher.java
@@ -18,7 +18,6 @@ package org.usergrid.count;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import org.usergrid.count.common.Count;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/Slf4JBatchSubmitter.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/Slf4JBatchSubmitter.java b/stack/core/src/main/java/org/usergrid/count/Slf4JBatchSubmitter.java
index 34162f1..5fe98a1 100644
--- a/stack/core/src/main/java/org/usergrid/count/Slf4JBatchSubmitter.java
+++ b/stack/core/src/main/java/org/usergrid/count/Slf4JBatchSubmitter.java
@@ -16,20 +16,15 @@
package org.usergrid.count;
-import java.util.Collection;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.usergrid.count.common.Count;
import com.yammer.metrics.Metrics;
import com.yammer.metrics.core.Timer;
import com.yammer.metrics.core.TimerContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.count.common.Count;
+
+import java.util.Collection;
+import java.util.concurrent.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/common/Count.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/common/Count.java b/stack/core/src/main/java/org/usergrid/count/common/Count.java
index 243ee90..9fb0b12 100644
--- a/stack/core/src/main/java/org/usergrid/count/common/Count.java
+++ b/stack/core/src/main/java/org/usergrid/count/common/Count.java
@@ -16,19 +16,17 @@
package org.usergrid.count.common;
-import java.nio.ByteBuffer;
-
+import me.prettyprint.cassandra.serializers.SerializerTypeInferer;
+import me.prettyprint.cassandra.serializers.StringSerializer;
+import me.prettyprint.hector.api.Serializer;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonProperty;
-import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.lang.StringUtils;
-
-import me.prettyprint.cassandra.serializers.SerializerTypeInferer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.hector.api.Serializer;
+import java.nio.ByteBuffer;
import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/count/common/CountSerDeUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/count/common/CountSerDeUtils.java b/stack/core/src/main/java/org/usergrid/count/common/CountSerDeUtils.java
index 719c0cc..63ad66a 100644
--- a/stack/core/src/main/java/org/usergrid/count/common/CountSerDeUtils.java
+++ b/stack/core/src/main/java/org/usergrid/count/common/CountSerDeUtils.java
@@ -16,12 +16,12 @@
package org.usergrid.count.common;
-import java.io.IOException;
-
import org.codehaus.jackson.annotate.JsonAutoDetect;
import org.codehaus.jackson.annotate.JsonMethod;
import org.codehaus.jackson.map.ObjectMapper;
+import java.io.IOException;
+
/** @author zznate */
public class CountSerDeUtils {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/Lock.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/Lock.java b/stack/core/src/main/java/org/usergrid/locking/Lock.java
index 01bd471..99dc13c 100644
--- a/stack/core/src/main/java/org/usergrid/locking/Lock.java
+++ b/stack/core/src/main/java/org/usergrid/locking/Lock.java
@@ -16,10 +16,10 @@
package org.usergrid.locking;
-import java.util.concurrent.TimeUnit;
-
import org.usergrid.locking.exception.UGLockException;
+import java.util.concurrent.TimeUnit;
+
/**
* The lock object to acquire
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/LockHelper.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/LockHelper.java b/stack/core/src/main/java/org/usergrid/locking/LockHelper.java
index 47c1c61..b5b576a 100644
--- a/stack/core/src/main/java/org/usergrid/locking/LockHelper.java
+++ b/stack/core/src/main/java/org/usergrid/locking/LockHelper.java
@@ -16,12 +16,11 @@
package org.usergrid.locking;
-import java.util.UUID;
-
+import org.apache.commons.codec.binary.Hex;
import org.usergrid.locking.exception.UGLockException;
import org.usergrid.locking.noop.NoOpLockImpl;
-import org.apache.commons.codec.binary.Hex;
+import java.util.UUID;
import static org.usergrid.locking.LockPathBuilder.buildPath;
import static org.usergrid.utils.ConversionUtils.bytes;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/LockManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/LockManager.java b/stack/core/src/main/java/org/usergrid/locking/LockManager.java
index cd023b8..77c3efe 100644
--- a/stack/core/src/main/java/org/usergrid/locking/LockManager.java
+++ b/stack/core/src/main/java/org/usergrid/locking/LockManager.java
@@ -16,10 +16,10 @@
package org.usergrid.locking;
-import java.util.UUID;
-
import org.usergrid.locking.exception.UGLockException;
+import java.util.UUID;
+
/**
* This Interface to a class responsible for distributed lock across system.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockImpl.java b/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockImpl.java
index af69781..784a70e 100644
--- a/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockImpl.java
+++ b/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockImpl.java
@@ -16,15 +16,14 @@
package org.usergrid.locking.cassandra;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.usergrid.locking.Lock;
-import org.usergrid.locking.exception.UGLockException;
-
import me.prettyprint.hector.api.locking.HLock;
import me.prettyprint.hector.api.locking.HLockManager;
import me.prettyprint.hector.api.locking.HLockTimeoutException;
+import org.usergrid.locking.Lock;
+import org.usergrid.locking.exception.UGLockException;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockManagerImpl.java b/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockManagerImpl.java
index 9d8e9a7..1339a1a 100644
--- a/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockManagerImpl.java
+++ b/stack/core/src/main/java/org/usergrid/locking/cassandra/HectorLockManagerImpl.java
@@ -16,21 +16,19 @@
package org.usergrid.locking.cassandra;
-import java.util.UUID;
-
-import javax.annotation.PostConstruct;
-
import me.prettyprint.cassandra.locking.HLockManagerImpl;
import me.prettyprint.hector.api.Cluster;
import me.prettyprint.hector.api.ConsistencyLevelPolicy;
import me.prettyprint.hector.api.locking.HLockManager;
import me.prettyprint.hector.api.locking.HLockManagerConfigurator;
-
import org.springframework.util.Assert;
import org.usergrid.locking.Lock;
import org.usergrid.locking.LockManager;
import org.usergrid.locking.LockPathBuilder;
+import javax.annotation.PostConstruct;
+import java.util.UUID;
+
/**
* Uses the hector based locking implementation to obtain locks
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockImpl.java b/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockImpl.java
index 4af8bd9..32015a8 100644
--- a/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockImpl.java
+++ b/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockImpl.java
@@ -16,11 +16,11 @@
package org.usergrid.locking.noop;
-import java.util.concurrent.TimeUnit;
-
import org.usergrid.locking.Lock;
import org.usergrid.locking.exception.UGLockException;
+import java.util.concurrent.TimeUnit;
+
/** @author tnine */
public class NoOpLockImpl implements Lock {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockManagerImpl.java b/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockManagerImpl.java
index e451228..0ed7ded 100644
--- a/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockManagerImpl.java
+++ b/stack/core/src/main/java/org/usergrid/locking/noop/NoOpLockManagerImpl.java
@@ -16,11 +16,11 @@
package org.usergrid.locking.noop;
-import java.util.UUID;
-
import org.usergrid.locking.Lock;
import org.usergrid.locking.LockManager;
+import java.util.UUID;
+
/** This is a no-op manager used for testing. */
public class NoOpLockManagerImpl implements LockManager {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockImpl.java b/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockImpl.java
index 56e0f9f..c693bdc 100644
--- a/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockImpl.java
+++ b/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockImpl.java
@@ -16,12 +16,12 @@
package org.usergrid.locking.singlenode;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.ReentrantLock;
-
import org.usergrid.locking.Lock;
import org.usergrid.locking.exception.UGLockException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
+
/** @author tnine */
public class SingleNodeLockImpl implements Lock {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockManagerImpl.java b/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockManagerImpl.java
index acf53bb..8d5c1ca 100644
--- a/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockManagerImpl.java
+++ b/stack/core/src/main/java/org/usergrid/locking/singlenode/SingleNodeLockManagerImpl.java
@@ -16,22 +16,17 @@
package org.usergrid.locking.singlenode;
-import java.util.UUID;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.ReentrantLock;
-
+import com.google.common.cache.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.locking.Lock;
import org.usergrid.locking.LockManager;
import org.usergrid.locking.LockPathBuilder;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.cache.RemovalListener;
-import com.google.common.cache.RemovalNotification;
+import java.util.UUID;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZooKeeperLockManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZooKeeperLockManagerImpl.java b/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZooKeeperLockManagerImpl.java
index 96b599f..3be836b 100644
--- a/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZooKeeperLockManagerImpl.java
+++ b/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZooKeeperLockManagerImpl.java
@@ -16,21 +16,19 @@
package org.usergrid.locking.zookeeper;
-import java.util.UUID;
-
-import javax.annotation.PostConstruct;
-
+import com.netflix.curator.RetryPolicy;
+import com.netflix.curator.framework.CuratorFramework;
+import com.netflix.curator.framework.CuratorFrameworkFactory;
+import com.netflix.curator.framework.recipes.locks.InterProcessMutex;
+import com.netflix.curator.retry.ExponentialBackoffRetry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.locking.Lock;
import org.usergrid.locking.LockManager;
import org.usergrid.locking.LockPathBuilder;
-import com.netflix.curator.RetryPolicy;
-import com.netflix.curator.framework.CuratorFramework;
-import com.netflix.curator.framework.CuratorFrameworkFactory;
-import com.netflix.curator.framework.recipes.locks.InterProcessMutex;
-import com.netflix.curator.retry.ExponentialBackoffRetry;
+import javax.annotation.PostConstruct;
+import java.util.UUID;
/** Implementation for Zookeeper service that handles global locks. */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZookeeperLockImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZookeeperLockImpl.java b/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZookeeperLockImpl.java
index 1e33422..838825f 100644
--- a/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZookeeperLockImpl.java
+++ b/stack/core/src/main/java/org/usergrid/locking/zookeeper/ZookeeperLockImpl.java
@@ -16,12 +16,11 @@
package org.usergrid.locking.zookeeper;
-import java.util.concurrent.TimeUnit;
-
+import com.netflix.curator.framework.recipes.locks.InterProcessMutex;
import org.usergrid.locking.Lock;
import org.usergrid.locking.exception.UGLockException;
-import com.netflix.curator.framework.recipes.locks.InterProcessMutex;
+import java.util.concurrent.TimeUnit;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/CounterQuery.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/CounterQuery.java b/stack/core/src/main/java/org/usergrid/mq/CounterQuery.java
index adb5cd1..3958f64 100644
--- a/stack/core/src/main/java/org/usergrid/mq/CounterQuery.java
+++ b/stack/core/src/main/java/org/usergrid/mq/CounterQuery.java
@@ -16,21 +16,18 @@
package org.usergrid.mq;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.mq.Query.CounterFilterPredicate;
import org.usergrid.persistence.CounterResolution;
import org.usergrid.utils.JsonUtils;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
import static org.usergrid.utils.ClassUtils.cast;
-import static org.usergrid.utils.ListUtils.firstBoolean;
-import static org.usergrid.utils.ListUtils.firstInteger;
-import static org.usergrid.utils.ListUtils.firstLong;
-import static org.usergrid.utils.ListUtils.isEmpty;
+import static org.usergrid.utils.ListUtils.*;
import static org.usergrid.utils.MapUtils.toMapList;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/Message.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/Message.java b/stack/core/src/main/java/org/usergrid/mq/Message.java
index 644f9b4..cc89648 100644
--- a/stack/core/src/main/java/org/usergrid/mq/Message.java
+++ b/stack/core/src/main/java/org/usergrid/mq/Message.java
@@ -16,19 +16,7 @@
package org.usergrid.mq;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.TreeMap;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
+import com.fasterxml.uuid.UUIDComparator;
import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonIgnore;
@@ -36,26 +24,16 @@ import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
import org.usergrid.utils.UUIDUtils;
-import com.fasterxml.uuid.UUIDComparator;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.*;
+import java.util.Map.Entry;
import static org.apache.commons.collections.IteratorUtils.asEnumeration;
-import static org.apache.commons.collections.MapUtils.getBooleanValue;
-import static org.apache.commons.collections.MapUtils.getByteValue;
-import static org.apache.commons.collections.MapUtils.getDoubleValue;
-import static org.apache.commons.collections.MapUtils.getFloatValue;
-import static org.apache.commons.collections.MapUtils.getIntValue;
-import static org.apache.commons.collections.MapUtils.getLongValue;
-import static org.apache.commons.collections.MapUtils.getShortValue;
-import static org.apache.commons.collections.MapUtils.getString;
+import static org.apache.commons.collections.MapUtils.*;
import static org.usergrid.utils.ClassUtils.cast;
-import static org.usergrid.utils.ConversionUtils.bytes;
-import static org.usergrid.utils.ConversionUtils.coerceMap;
-import static org.usergrid.utils.ConversionUtils.getInt;
-import static org.usergrid.utils.ConversionUtils.uuid;
+import static org.usergrid.utils.ConversionUtils.*;
import static org.usergrid.utils.MapUtils.hashMap;
-import static org.usergrid.utils.UUIDUtils.getTimestampInMillis;
-import static org.usergrid.utils.UUIDUtils.isTimeBased;
-import static org.usergrid.utils.UUIDUtils.newTimeUUID;
+import static org.usergrid.utils.UUIDUtils.*;
@XmlRootElement
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/Query.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/Query.java b/stack/core/src/main/java/org/usergrid/mq/Query.java
index cf1e39c..9439586 100644
--- a/stack/core/src/main/java/org/usergrid/mq/Query.java
+++ b/stack/core/src/main/java/org/usergrid/mq/Query.java
@@ -16,23 +16,9 @@
package org.usergrid.mq;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.EnumSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-
import org.antlr.runtime.ANTLRStringStream;
import org.antlr.runtime.CommonTokenStream;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.CounterResolution;
@@ -42,7 +28,10 @@ import org.usergrid.persistence.Results;
import org.usergrid.persistence.Results.Level;
import org.usergrid.utils.JsonUtils;
-import org.apache.commons.lang.StringUtils;
+import java.io.Serializable;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
import static org.apache.commons.codec.binary.Base64.decodeBase64;
import static org.apache.commons.lang.StringUtils.isBlank;
@@ -51,12 +40,7 @@ import static org.usergrid.persistence.Schema.PROPERTY_TYPE;
import static org.usergrid.persistence.Schema.PROPERTY_UUID;
import static org.usergrid.utils.ClassUtils.cast;
import static org.usergrid.utils.ConversionUtils.uuid;
-import static org.usergrid.utils.ListUtils.first;
-import static org.usergrid.utils.ListUtils.firstBoolean;
-import static org.usergrid.utils.ListUtils.firstInteger;
-import static org.usergrid.utils.ListUtils.firstLong;
-import static org.usergrid.utils.ListUtils.firstUuid;
-import static org.usergrid.utils.ListUtils.isEmpty;
+import static org.usergrid.utils.ListUtils.*;
import static org.usergrid.utils.MapUtils.toMapList;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/QueryFilterLexer.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueryFilterLexer.java b/stack/core/src/main/java/org/usergrid/mq/QueryFilterLexer.java
index a7eccd7..5b6f339 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueryFilterLexer.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueryFilterLexer.java
@@ -3,15 +3,7 @@
package org.usergrid.mq;
-import org.antlr.runtime.BaseRecognizer;
-import org.antlr.runtime.CharStream;
-import org.antlr.runtime.DFA;
-import org.antlr.runtime.EarlyExitException;
-import org.antlr.runtime.Lexer;
-import org.antlr.runtime.MismatchedSetException;
-import org.antlr.runtime.NoViableAltException;
-import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.RecognizerSharedState;
+import org.antlr.runtime.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/QueryFilterParser.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueryFilterParser.java b/stack/core/src/main/java/org/usergrid/mq/QueryFilterParser.java
index dea193b..60c6423 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueryFilterParser.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueryFilterParser.java
@@ -3,15 +3,7 @@
package org.usergrid.mq;
-import org.antlr.runtime.BitSet;
-import org.antlr.runtime.MismatchedSetException;
-import org.antlr.runtime.NoViableAltException;
-import org.antlr.runtime.Parser;
-import org.antlr.runtime.ParserRuleReturnScope;
-import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.RecognizerSharedState;
-import org.antlr.runtime.Token;
-import org.antlr.runtime.TokenStream;
+import org.antlr.runtime.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.mq.Query.FilterPredicate;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/QueryProcessor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueryProcessor.java b/stack/core/src/main/java/org/usergrid/mq/QueryProcessor.java
index 16e3afc..87c9643 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueryProcessor.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueryProcessor.java
@@ -1,14 +1,7 @@
package org.usergrid.mq;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Set;
-
+import org.apache.commons.collections.comparators.ComparatorChain;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.mq.Query.FilterOperator;
@@ -20,15 +13,12 @@ import org.usergrid.utils.ListUtils;
import org.usergrid.utils.NumberUtils;
import org.usergrid.utils.StringUtils;
-import org.apache.commons.collections.comparators.ComparatorChain;
+import java.nio.ByteBuffer;
+import java.util.*;
import static java.lang.Integer.parseInt;
-
import static org.apache.commons.codec.binary.Base64.decodeBase64;
-import static org.apache.commons.lang.StringUtils.isBlank;
-import static org.apache.commons.lang.StringUtils.isNotBlank;
-import static org.apache.commons.lang.StringUtils.removeEnd;
-import static org.apache.commons.lang.StringUtils.split;
+import static org.apache.commons.lang.StringUtils.*;
import static org.usergrid.mq.Query.SortDirection.DESCENDING;
import static org.usergrid.persistence.cassandra.IndexUpdate.indexValueCode;
import static org.usergrid.persistence.cassandra.IndexUpdate.toIndexableValue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/Queue.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/Queue.java b/stack/core/src/main/java/org/usergrid/mq/Queue.java
index deb5745..af75ead 100644
--- a/stack/core/src/main/java/org/usergrid/mq/Queue.java
+++ b/stack/core/src/main/java/org/usergrid/mq/Queue.java
@@ -16,27 +16,18 @@
package org.usergrid.mq;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.UUID;
-
+import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.usergrid.utils.UUIDUtils;
-import org.apache.commons.lang.StringUtils;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.UUID;
import static java.util.UUID.nameUUIDFromBytes;
-
-import static org.apache.commons.collections.MapUtils.getBooleanValue;
-import static org.apache.commons.collections.MapUtils.getByteValue;
-import static org.apache.commons.collections.MapUtils.getDoubleValue;
-import static org.apache.commons.collections.MapUtils.getFloatValue;
-import static org.apache.commons.collections.MapUtils.getIntValue;
-import static org.apache.commons.collections.MapUtils.getLongValue;
-import static org.apache.commons.collections.MapUtils.getShortValue;
-import static org.apache.commons.collections.MapUtils.getString;
+import static org.apache.commons.collections.MapUtils.*;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/QueueManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueueManager.java b/stack/core/src/main/java/org/usergrid/mq/QueueManager.java
index a656425..4ba0a61 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueueManager.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueueManager.java
@@ -16,15 +16,15 @@
package org.usergrid.mq;
+import org.usergrid.persistence.CounterResolution;
+import org.usergrid.persistence.Results;
+import org.usergrid.persistence.exceptions.TransactionNotFoundException;
+
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
-import org.usergrid.persistence.CounterResolution;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.exceptions.TransactionNotFoundException;
-
public interface QueueManager {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/QueueQuery.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueueQuery.java b/stack/core/src/main/java/org/usergrid/mq/QueueQuery.java
index a689437..f5d6b86 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueueQuery.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueueQuery.java
@@ -16,14 +16,13 @@
package org.usergrid.mq;
+import org.usergrid.utils.ConversionUtils;
+
import java.util.List;
import java.util.Map;
import java.util.UUID;
-import org.usergrid.utils.ConversionUtils;
-
import static java.util.UUID.nameUUIDFromBytes;
-
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.usergrid.utils.ConversionUtils.getLong;
import static org.usergrid.utils.ListUtils.first;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/QueueResults.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueueResults.java b/stack/core/src/main/java/org/usergrid/mq/QueueResults.java
index f150cad..1cda104 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueueResults.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueueResults.java
@@ -16,15 +16,14 @@
package org.usergrid.mq;
+import org.codehaus.jackson.map.annotate.JsonSerialize;
+import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+
+import javax.xml.bind.annotation.XmlRootElement;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
-
@XmlRootElement
public class QueueResults {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/QueueSet.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueueSet.java b/stack/core/src/main/java/org/usergrid/mq/QueueSet.java
index b1fc63d..63e31c7 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueueSet.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueueSet.java
@@ -16,17 +16,12 @@
package org.usergrid.mq;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.*;
+
@XmlRootElement
public class QueueSet {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/CassandraMQUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/CassandraMQUtils.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/CassandraMQUtils.java
index 266a15d..4d6cf42 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/CassandraMQUtils.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/CassandraMQUtils.java
@@ -16,13 +16,9 @@
package org.usergrid.mq.cassandra;
-import java.nio.ByteBuffer;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.*;
+import me.prettyprint.hector.api.beans.HColumn;
+import me.prettyprint.hector.api.mutation.Mutator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.mq.Message;
@@ -32,26 +28,18 @@ import org.usergrid.utils.ConversionUtils;
import org.usergrid.utils.JsonUtils;
import org.usergrid.utils.UUIDUtils;
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.cassandra.serializers.BytesArraySerializer;
-import me.prettyprint.cassandra.serializers.DynamicCompositeSerializer;
-import me.prettyprint.cassandra.serializers.LongSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.mutation.Mutator;
+import java.nio.ByteBuffer;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.UUID;
import static me.prettyprint.hector.api.factory.HFactory.createColumn;
-import static org.usergrid.mq.Message.MESSAGE_ID;
-import static org.usergrid.mq.Message.MESSAGE_PROPERTIES;
-import static org.usergrid.mq.Message.MESSAGE_TYPE;
-import static org.usergrid.mq.Queue.QUEUE_NEWEST;
-import static org.usergrid.mq.Queue.QUEUE_OLDEST;
-import static org.usergrid.mq.Queue.QUEUE_PROPERTIES;
+import static org.usergrid.mq.Message.*;
+import static org.usergrid.mq.Queue.*;
import static org.usergrid.mq.QueuePosition.CONSUMER;
-import static org.usergrid.utils.ConversionUtils.bytebuffer;
-import static org.usergrid.utils.ConversionUtils.getLong;
-import static org.usergrid.utils.ConversionUtils.object;
+import static org.usergrid.utils.ConversionUtils.*;
public class CassandraMQUtils {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/MessageIndexUpdate.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/MessageIndexUpdate.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/MessageIndexUpdate.java
index 8626174..30aff4d 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/MessageIndexUpdate.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/MessageIndexUpdate.java
@@ -16,6 +16,11 @@
package org.usergrid.mq.cassandra;
+import me.prettyprint.cassandra.serializers.*;
+import me.prettyprint.hector.api.beans.DynamicComposite;
+import me.prettyprint.hector.api.mutation.Mutator;
+import org.usergrid.mq.Message;
+
import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.List;
@@ -23,22 +28,9 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
-import org.usergrid.mq.Message;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.cassandra.serializers.BytesArraySerializer;
-import me.prettyprint.cassandra.serializers.DynamicCompositeSerializer;
-import me.prettyprint.cassandra.serializers.LongSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.mutation.Mutator;
-
import static me.prettyprint.hector.api.factory.HFactory.createColumn;
import static org.usergrid.mq.Message.MESSAGE_PROPERTIES;
-import static org.usergrid.mq.cassandra.QueueIndexUpdate.indexValueCode;
-import static org.usergrid.mq.cassandra.QueueIndexUpdate.validIndexableValue;
-import static org.usergrid.mq.cassandra.QueueIndexUpdate.validIndexableValueOrJson;
+import static org.usergrid.mq.cassandra.QueueIndexUpdate.*;
import static org.usergrid.mq.cassandra.QueueManagerImpl.DICTIONARY_MESSAGE_INDEXES;
import static org.usergrid.mq.cassandra.QueuesCF.PROPERTY_INDEX;
import static org.usergrid.mq.cassandra.QueuesCF.QUEUE_DICTIONARIES;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueIndexUpdate.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueIndexUpdate.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueIndexUpdate.java
index e1c31a0..59d790c 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueIndexUpdate.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueIndexUpdate.java
@@ -16,26 +16,17 @@
package org.usergrid.mq.cassandra;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import org.codehaus.jackson.JsonNode;
-
import com.fasterxml.uuid.UUIDComparator;
-
import me.prettyprint.hector.api.beans.DynamicComposite;
import me.prettyprint.hector.api.mutation.Mutator;
+import org.codehaus.jackson.JsonNode;
-import static java.nio.ByteBuffer.wrap;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.util.*;
+import static java.nio.ByteBuffer.wrap;
import static org.usergrid.utils.JsonUtils.toJsonNode;
import static org.usergrid.utils.UUIDUtils.getTimestampInMicros;
[03/23] Miscellaneous changes
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationsResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationsResourceIT.java
index ecaa8a4..1fc7477 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationsResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationsResourceIT.java
@@ -78,7 +78,7 @@ public class OrganizationsResourceIT extends AbstractRestIT {
EntityManager em = setup.getEmf().getEntityManager( CassandraService.MANAGEMENT_APPLICATION_ID );
User user = em.get( ui.getUuid(), User.class );
assertEquals( "Test User", user.getName() );
- assertEquals( "Apigee", ( String ) user.getProperty( "company" ) );
+ assertEquals( "Apigee", user.getProperty( "company" ));
OrganizationInfo orgInfo = setup.getMgmtSvc().getOrganizationByName( "test-org-1" );
assertEquals( 5L, orgInfo.getProperties().get( "securityLevel" ) );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/management/ActivationState.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/management/ActivationState.java b/stack/services/src/main/java/org/usergrid/management/ActivationState.java
index 4836a6f..aaf0b43 100644
--- a/stack/services/src/main/java/org/usergrid/management/ActivationState.java
+++ b/stack/services/src/main/java/org/usergrid/management/ActivationState.java
@@ -3,6 +3,6 @@ package org.usergrid.management;
public enum ActivationState {
- UNKNOWN, UNCONFIRMED, CONFIRMED_AWAITING_ACTIVATION, ACTIVATED;
+ UNKNOWN, UNCONFIRMED, CONFIRMED_AWAITING_ACTIVATION, ACTIVATED
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java b/stack/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java
index f7cc99c..238ebdd 100644
--- a/stack/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java
+++ b/stack/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java
@@ -1251,9 +1251,8 @@ public class ManagementServiceImpl implements ManagementService {
boolean testUserEnabled = parseBoolean( properties.getProperty( PROPERTIES_SETUP_TEST_ACCOUNT ) );
- boolean userIsTestUser = !testUserEnabled ? false :
- properties.getProperty( PROPERTIES_SYSADMIN_LOGIN_EMAIL )
- .equals( userInfo.getEmail() );
+ boolean userIsTestUser = testUserEnabled && properties.getProperty(PROPERTIES_SYSADMIN_LOGIN_EMAIL)
+ .equals(userInfo.getEmail());
if ( !userIsSuperAdmin && !userIsTestUser ) {
@@ -2454,8 +2453,7 @@ public class ManagementServiceImpl implements ManagementService {
Boolean registration_requires_admin_approval = ( Boolean ) em
.getProperty( new SimpleEntityRef( Application.ENTITY_TYPE, applicationId ),
REGISTRATION_REQUIRES_ADMIN_APPROVAL );
- return registration_requires_admin_approval != null ? registration_requires_admin_approval.booleanValue() :
- false;
+ return registration_requires_admin_approval != null && registration_requires_admin_approval.booleanValue();
}
@@ -2465,8 +2463,7 @@ public class ManagementServiceImpl implements ManagementService {
Boolean registration_requires_email_confirmation = ( Boolean ) em
.getProperty( new SimpleEntityRef( Application.ENTITY_TYPE, applicationId ),
REGISTRATION_REQUIRES_EMAIL_CONFIRMATION );
- return registration_requires_email_confirmation != null ?
- registration_requires_email_confirmation.booleanValue() : false;
+ return registration_requires_email_confirmation != null && registration_requires_email_confirmation.booleanValue();
}
@@ -2475,7 +2472,7 @@ public class ManagementServiceImpl implements ManagementService {
Boolean notify_admin_of_new_users = ( Boolean ) em
.getProperty( new SimpleEntityRef( Application.ENTITY_TYPE, applicationId ),
NOTIFY_ADMIN_OF_NEW_USERS );
- return notify_admin_of_new_users != null ? notify_admin_of_new_users.booleanValue() : false;
+ return notify_admin_of_new_users != null && notify_admin_of_new_users.booleanValue();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/security/providers/FoursquareProvider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/providers/FoursquareProvider.java b/stack/services/src/main/java/org/usergrid/security/providers/FoursquareProvider.java
index 0c953c7..6e3dbe8 100644
--- a/stack/services/src/main/java/org/usergrid/security/providers/FoursquareProvider.java
+++ b/stack/services/src/main/java/org/usergrid/security/providers/FoursquareProvider.java
@@ -82,7 +82,7 @@ public class FoursquareProvider extends AbstractProvider {
String fq_user_username = ( String ) fq_user.get( "id" );
String fq_user_email = ( String ) ( ( Map<?, ?> ) fq_user.get( "contact" ) ).get( "email" );
String fq_user_picture = ( String ) ( ( Map<?, ?> ) fq_user.get( "photo" ) ).get( "suffix" );
- String fq_user_name = new String( "" );
+ String fq_user_name = "";
// Grab the last check-in so we can store that as the user location
Map<String, Object> fq_location =
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/security/providers/PingIdentityProvider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/providers/PingIdentityProvider.java b/stack/services/src/main/java/org/usergrid/security/providers/PingIdentityProvider.java
index 5930c28..a6de36c 100644
--- a/stack/services/src/main/java/org/usergrid/security/providers/PingIdentityProvider.java
+++ b/stack/services/src/main/java/org/usergrid/security/providers/PingIdentityProvider.java
@@ -136,8 +136,8 @@ public class PingIdentityProvider extends AbstractProvider {
public static long extractExpiration( User user ) {
Long expiration = ( Long ) user.getProperty( "expiration" );
if ( expiration == null ) {
- expiration = new Long( 7200 );
+ expiration = (long) 7200;
}
- return expiration.longValue() * 1000;
+ return expiration * 1000;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/security/shiro/CustomPermission.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/CustomPermission.java b/stack/services/src/main/java/org/usergrid/security/shiro/CustomPermission.java
index 7d510ae..7a6375e 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/CustomPermission.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/CustomPermission.java
@@ -185,10 +185,7 @@ public class CustomPermission extends WildcardPermission {
if ( matcher.match( p1, p2 ) ) {
return true;
}
- if ( matcher.match( normalizeIfPath( p1 ), normalizeIfPath( p2 ) ) ) {
- return true;
- }
- return false;
+ return matcher.match(normalizeIfPath(p1), normalizeIfPath(p2));
}
return p1.equalsIgnoreCase( p2 );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/security/shiro/PrincipalCredentialsToken.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/PrincipalCredentialsToken.java b/stack/services/src/main/java/org/usergrid/security/shiro/PrincipalCredentialsToken.java
index 6b69878..ec44c7c 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/PrincipalCredentialsToken.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/PrincipalCredentialsToken.java
@@ -129,11 +129,11 @@ public class PrincipalCredentialsToken implements org.apache.shiro.authc.Authent
public boolean isDisabled() {
- return ( principal != null ) ? principal.isDisabled() : false;
+ return (principal != null) && principal.isDisabled();
}
public boolean isActivated() {
- return ( principal != null ) ? principal.isActivated() : true;
+ return (principal == null) || principal.isActivated();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/security/shiro/Realm.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/Realm.java b/stack/services/src/main/java/org/usergrid/security/shiro/Realm.java
index 1b6e612..03f9a5a 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/Realm.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/Realm.java
@@ -276,7 +276,7 @@ public class Realm extends AuthorizingRealm {
// They have access to organizations and organization
// applications
- UserInfo user = ( ( AdminUserPrincipal ) principal ).getUser();
+ UserInfo user = principal.getUser();
if ( superUserEnabled && ( superUser != null ) && superUser.equals( user.getUsername() ) ) {
// The system user has access to everything
@@ -349,7 +349,7 @@ public class Realm extends AuthorizingRealm {
UUID applicationId = ( ( ApplicationUserPrincipal ) principal ).getApplicationId();
AccessTokenCredentials tokenCredentials =
- ( ( ApplicationUserPrincipal ) principal ).getAccessTokenCredentials();
+ principal.getAccessTokenCredentials();
TokenInfo token = null;
if ( tokenCredentials != null ) {
try {
@@ -388,7 +388,7 @@ public class Realm extends AuthorizingRealm {
logger.error( "Unable to get user default role permissions", e );
}
- UserInfo user = ( ( ApplicationUserPrincipal ) principal ).getUser();
+ UserInfo user = principal.getUser();
try {
Set<String> permissions = em.getUserPermissions( user.getUuid() );
grant( info, principal, applicationId, permissions );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/security/shiro/utils/SubjectUtils.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/utils/SubjectUtils.java b/stack/services/src/main/java/org/usergrid/security/shiro/utils/SubjectUtils.java
index 204cd13..de66a05 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/utils/SubjectUtils.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/utils/SubjectUtils.java
@@ -54,10 +54,7 @@ public class SubjectUtils {
if ( currentUser == null ) {
return true;
}
- if ( !currentUser.isAuthenticated() && !currentUser.isRemembered() ) {
- return true;
- }
- return false;
+ return !currentUser.isAuthenticated() && !currentUser.isRemembered();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/security/tokens/cassandra/TokenServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/tokens/cassandra/TokenServiceImpl.java b/stack/services/src/main/java/org/usergrid/security/tokens/cassandra/TokenServiceImpl.java
index 481c308..7d8fe72 100644
--- a/stack/services/src/main/java/org/usergrid/security/tokens/cassandra/TokenServiceImpl.java
+++ b/stack/services/src/main/java/org/usergrid/security/tokens/cassandra/TokenServiceImpl.java
@@ -2,12 +2,7 @@ package org.usergrid.security.tokens.cassandra;
import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.UUID;
+import java.util.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -86,20 +81,22 @@ public class TokenServiceImpl implements TokenService {
private static final ByteBufferSerializer BUFF_SER = ByteBufferSerializer.get();
private static final StringSerializer STR_SER = StringSerializer.get();
- private static final HashSet<String> TOKEN_PROPERTIES = new HashSet<String>();
+ private static final Set<String> TOKEN_PROPERTIES ;
static {
- TOKEN_PROPERTIES.add( TOKEN_UUID );
- TOKEN_PROPERTIES.add( TOKEN_TYPE );
- TOKEN_PROPERTIES.add( TOKEN_CREATED );
- TOKEN_PROPERTIES.add( TOKEN_ACCESSED );
- TOKEN_PROPERTIES.add( TOKEN_INACTIVE );
- TOKEN_PROPERTIES.add( TOKEN_PRINCIPAL_TYPE );
- TOKEN_PROPERTIES.add( TOKEN_ENTITY );
- TOKEN_PROPERTIES.add( TOKEN_APPLICATION );
- TOKEN_PROPERTIES.add( TOKEN_STATE );
- TOKEN_PROPERTIES.add( TOKEN_DURATION );
+ HashSet<String> set = new HashSet<String>();
+ set.add( TOKEN_UUID );
+ set.add( TOKEN_TYPE );
+ set.add( TOKEN_CREATED );
+ set.add( TOKEN_ACCESSED );
+ set.add( TOKEN_INACTIVE );
+ set.add( TOKEN_PRINCIPAL_TYPE );
+ set.add( TOKEN_ENTITY );
+ set.add( TOKEN_APPLICATION );
+ set.add( TOKEN_STATE );
+ set.add( TOKEN_DURATION );
+ TOKEN_PROPERTIES = Collections.unmodifiableSet(set);
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/services/ServiceAction.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceAction.java b/stack/services/src/main/java/org/usergrid/services/ServiceAction.java
index 7fdef55..83f1945 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceAction.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceAction.java
@@ -17,5 +17,5 @@ package org.usergrid.services;
public enum ServiceAction {
- POST, GET, PUT, DELETE, HEAD, OPTIONS;
+ POST, GET, PUT, DELETE, HEAD, OPTIONS
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/services/ServiceInfo.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceInfo.java b/stack/services/src/main/java/org/usergrid/services/ServiceInfo.java
index f1bb7d1..2765253 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceInfo.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceInfo.java
@@ -184,7 +184,7 @@ public class ServiceInfo {
}
String eType = determineType( collections, first, last - 1 );
- if ( eType != "entity" ) {
+ if (!eType.equals("entity")) {
return "/entities:" + eType + "/*/" + collections[last];
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/services/ServiceManager.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceManager.java b/stack/services/src/main/java/org/usergrid/services/ServiceManager.java
index 672c50f..a4778e5 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceManager.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceManager.java
@@ -17,10 +17,7 @@ package org.usergrid.services;
import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import java.util.UUID;
+import java.util.*;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
@@ -125,9 +122,7 @@ public class ServiceManager {
private void setServicePackagePrefixes( String packages ) {
List<String> packagePrefixes = new ArrayList<String>();
- for ( String prefix : package_prefixes ) {
- packagePrefixes.add( prefix );
- }
+ Collections.addAll(packagePrefixes, package_prefixes);
String[] prefixes = packages.split( ";" );
for ( String prefix : prefixes ) {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/services/ServiceRequest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceRequest.java b/stack/services/src/main/java/org/usergrid/services/ServiceRequest.java
index 70b9bdc..083ae22 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceRequest.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceRequest.java
@@ -324,7 +324,7 @@ public class ServiceRequest {
String q = p.toString();
if ( isNotBlank( q ) ) {
try {
- sb.append( "ql=" + URLEncoder.encode( q, "UTF-8" ) );
+ sb.append("ql=").append(URLEncoder.encode(q, "UTF-8"));
}
catch ( UnsupportedEncodingException e ) {
logger.error( "Unable to encode url", e );
@@ -336,14 +336,14 @@ public class ServiceRequest {
if ( has_prev_param ) {
sb.append( '&' );
}
- sb.append( "limit=" + limit );
+ sb.append("limit=").append(limit);
has_prev_param = true;
}
if ( p.getQuery().getStartResult() != null ) {
if ( has_prev_param ) {
sb.append( '&' );
}
- sb.append( "start=" + p.getQuery().getStartResult() );
+ sb.append("start=").append(p.getQuery().getStartResult());
has_prev_param = true;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/services/src/main/java/org/usergrid/services/applications/ApplicationsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/applications/ApplicationsService.java b/stack/services/src/main/java/org/usergrid/services/applications/ApplicationsService.java
index ace9962..0f1b433 100644
--- a/stack/services/src/main/java/org/usergrid/services/applications/ApplicationsService.java
+++ b/stack/services/src/main/java/org/usergrid/services/applications/ApplicationsService.java
@@ -102,7 +102,7 @@ public class ApplicationsService extends AbstractService {
}
else if ( context.parameterCount() > 0 ) {
if ( context.getParameters().get( 0 ) instanceof QueryParameter ) {
- return getApplicationCounters( ( ( QueryParameter ) context.getParameters().get( 0 ) ).getQuery() );
+ return getApplicationCounters( context.getParameters().get( 0 ).getQuery() );
}
}
}
@@ -165,12 +165,9 @@ public class ApplicationsService extends AbstractService {
private boolean isReservedCollection( String collection ) {
- if ( StringUtils.equalsIgnoreCase( "applications", collection ) || StringUtils
- .equalsIgnoreCase( "application", collection ) ) {
- return true;
- }
+ return StringUtils.equalsIgnoreCase("applications", collection) || StringUtils
+ .equalsIgnoreCase("application", collection);
- return false;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/test-utils/src/main/java/org/usergrid/NoExitSecurityManager.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/usergrid/NoExitSecurityManager.java b/stack/test-utils/src/main/java/org/usergrid/NoExitSecurityManager.java
index ff3da16..1730bd6 100644
--- a/stack/test-utils/src/main/java/org/usergrid/NoExitSecurityManager.java
+++ b/stack/test-utils/src/main/java/org/usergrid/NoExitSecurityManager.java
@@ -31,7 +31,7 @@ public class NoExitSecurityManager extends java.rmi.RMISecurityManager {
Thread thread = Thread.currentThread();
try {
- thread.sleep( 100L );
+ Thread.sleep(100L);
}
catch ( InterruptedException e ) {
LOG.error( "failed to sleep", e );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/test-utils/src/main/java/org/usergrid/cassandra/AvailablePortFinder.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/usergrid/cassandra/AvailablePortFinder.java b/stack/test-utils/src/main/java/org/usergrid/cassandra/AvailablePortFinder.java
index 1029e29..54c35a5 100644
--- a/stack/test-utils/src/main/java/org/usergrid/cassandra/AvailablePortFinder.java
+++ b/stack/test-utils/src/main/java/org/usergrid/cassandra/AvailablePortFinder.java
@@ -189,7 +189,7 @@ public class AvailablePortFinder {
try {
s = new ServerSocket( i );
- result.add( new Integer( i ) );
+ result.add(i);
}
catch ( IOException e ) {
// Do nothing
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/test-utils/src/main/java/org/usergrid/cassandra/CassandraResource.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/usergrid/cassandra/CassandraResource.java b/stack/test-utils/src/main/java/org/usergrid/cassandra/CassandraResource.java
index 63f0c75..ec31d90 100644
--- a/stack/test-utils/src/main/java/org/usergrid/cassandra/CassandraResource.java
+++ b/stack/test-utils/src/main/java/org/usergrid/cassandra/CassandraResource.java
@@ -205,26 +205,8 @@ public class CassandraResource extends ExternalResource {
@Override
public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append( "\n" );
- sb.append( "cassandra.yaml = " ).append( new File( tempDir, "cassandra.yaml" ) );
- sb.append( "\n" );
- sb.append( RPC_PORT_KEY ).append( " = " ).append( rpcPort );
- sb.append( "\n" );
- sb.append( STORAGE_PORT_KEY ).append( " = " ).append( storagePort );
- sb.append( "\n" );
- sb.append( SSL_STORAGE_PORT_KEY ).append( " = " ).append( sslStoragePort );
- sb.append( "\n" );
- sb.append( NATIVE_TRANSPORT_PORT_KEY ).append( " = " ).append( nativeTransportPort );
- sb.append( "\n" );
- sb.append( DATA_FILE_DIR_KEY ).append( " = " ).append( new File( tempDir, "data" ).toString() );
- sb.append( "\n" );
- sb.append( COMMIT_FILE_DIR_KEY ).append( " = " ).append( new File( tempDir, "commitlog" ).toString() );
- sb.append( "\n" );
- sb.append( SAVED_CACHES_DIR_KEY ).append( " = " ).append( new File( tempDir, "saved_caches" ).toString() );
- sb.append( "\n" );
-
- return sb.toString();
+
+ return "\n" + "cassandra.yaml = " + new File(tempDir, "cassandra.yaml") + "\n" + RPC_PORT_KEY + " = " + rpcPort + "\n" + STORAGE_PORT_KEY + " = " + storagePort + "\n" + SSL_STORAGE_PORT_KEY + " = " + sslStoragePort + "\n" + NATIVE_TRANSPORT_PORT_KEY + " = " + nativeTransportPort + "\n" + DATA_FILE_DIR_KEY + " = " + new File(tempDir, "data").toString() + "\n" + COMMIT_FILE_DIR_KEY + " = " + new File(tempDir, "commitlog").toString() + "\n" + SAVED_CACHES_DIR_KEY + " = " + new File(tempDir, "saved_caches").toString() + "\n";
}
[16/23] organize imports only
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/users/ConnectionResourceTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/ConnectionResourceTest.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/ConnectionResourceTest.java
index 6923cff..a1bd3ec 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/ConnectionResourceTest.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/ConnectionResourceTest.java
@@ -1,12 +1,8 @@
package org.usergrid.rest.applications.users;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.UniformInterfaceException;
import org.codehaus.jackson.JsonNode;
import org.junit.Rule;
import org.junit.Test;
@@ -14,8 +10,10 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.test.resource.CustomCollection;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import javax.ws.rs.core.MediaType;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/users/GroupResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/GroupResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/GroupResourceIT.java
index c440d9b..d537701 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/GroupResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/GroupResourceIT.java
@@ -16,10 +16,6 @@
package org.usergrid.rest.applications.users;
-import java.util.UUID;
-
-import javax.ws.rs.core.MediaType;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Before;
import org.junit.Test;
@@ -31,10 +27,10 @@ import org.usergrid.java.client.response.ApiResponse;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.utils.UUIDUtils;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import javax.ws.rs.core.MediaType;
+import java.util.UUID;
+
+import static org.junit.Assert.*;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/users/OwnershipResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/OwnershipResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/OwnershipResourceIT.java
index 114f798..06989bb 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/OwnershipResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/OwnershipResourceIT.java
@@ -29,11 +29,7 @@ import org.usergrid.rest.test.security.TestAppUser;
import org.usergrid.rest.test.security.TestUser;
import org.usergrid.utils.MapUtils;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/users/PermissionsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/PermissionsResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/PermissionsResourceIT.java
index f7173e9..fd2346e 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/PermissionsResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/PermissionsResourceIT.java
@@ -16,12 +16,9 @@
package org.usergrid.rest.applications.users;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.ClientResponse.Status;
+import com.sun.jersey.api.client.UniformInterfaceException;
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.node.ArrayNode;
import org.junit.Ignore;
@@ -33,14 +30,12 @@ import org.usergrid.management.OrganizationOwnerInfo;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.utils.UUIDUtils;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.ClientResponse.Status;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import javax.ws.rs.core.MediaType;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.UUID;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/users/RetrieveUsersTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/RetrieveUsersTest.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/RetrieveUsersTest.java
index 9383cbf..1036be3 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/RetrieveUsersTest.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/RetrieveUsersTest.java
@@ -1,9 +1,6 @@
package org.usergrid.rest.applications.users;
-import java.util.HashMap;
-import java.util.Map;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Assert;
import org.junit.Rule;
@@ -14,6 +11,9 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.test.resource.CustomCollection;
+import java.util.HashMap;
+import java.util.Map;
+
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/users/UserResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/UserResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/UserResourceIT.java
index 8c212a5..4198b1c 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/UserResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/UserResourceIT.java
@@ -16,15 +16,8 @@
package org.usergrid.rest.applications.users;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.ClientResponse.Status;
+import com.sun.jersey.api.client.UniformInterfaceException;
import org.codehaus.jackson.JsonNode;
import org.junit.Test;
import org.slf4j.Logger;
@@ -42,15 +35,10 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.applications.utils.UserRepo;
import org.usergrid.utils.UUIDUtils;
-import com.sun.jersey.api.client.ClientResponse.Status;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import javax.ws.rs.core.MediaType;
+import java.util.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
import static org.usergrid.rest.applications.utils.TestUtils.getIdFromSearchResults;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/users/extensions/TestResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/extensions/TestResource.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/extensions/TestResource.java
index 331996e..0e26692 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/extensions/TestResource.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/extensions/TestResource.java
@@ -16,10 +16,6 @@
package org.usergrid.rest.applications.users.extensions;
-import javax.ws.rs.GET;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
import org.junit.Ignore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,6 +23,10 @@ import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.usergrid.rest.applications.users.AbstractUserExtensionResource;
+import javax.ws.rs.GET;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
@Ignore
@Component("org.usergrid.rest.applications.users.extensions.TestResource")
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/utils/TestUtils.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/utils/TestUtils.java b/stack/rest/src/test/java/org/usergrid/rest/applications/utils/TestUtils.java
index abd93e7..0f6e57d 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/utils/TestUtils.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/utils/TestUtils.java
@@ -16,12 +16,12 @@
package org.usergrid.rest.applications.utils;
-import java.util.UUID;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Ignore;
import org.usergrid.utils.UUIDUtils;
+import java.util.UUID;
+
/** @author tnine */
@Ignore("Not a test")
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/utils/UserRepo.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/utils/UserRepo.java b/stack/rest/src/test/java/org/usergrid/rest/applications/utils/UserRepo.java
index 4a87a32..6b9e9b9 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/utils/UserRepo.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/utils/UserRepo.java
@@ -1,16 +1,14 @@
package org.usergrid.rest.applications.utils;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.WebResource;
import org.codehaus.jackson.JsonNode;
import org.usergrid.utils.UUIDUtils;
-import com.sun.jersey.api.client.WebResource;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/filters/ContentTypeResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/filters/ContentTypeResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/filters/ContentTypeResourceIT.java
index 8b16db2..d2669fe 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/filters/ContentTypeResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/filters/ContentTypeResourceIT.java
@@ -16,14 +16,15 @@
package org.usergrid.rest.filters;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-
+import org.apache.http.*;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.params.BasicHttpParams;
+import org.apache.http.util.EntityUtils;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
@@ -33,20 +34,12 @@ import org.usergrid.rest.TestContextSetup;
import org.usergrid.utils.JsonUtils;
import org.usergrid.utils.UUIDUtils;
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpResponse;
-import org.apache.http.NameValuePair;
-import org.apache.http.ParseException;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.util.EntityUtils;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/management/ManagementResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/management/ManagementResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/management/ManagementResourceIT.java
index 9a7b873..9685edb 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/management/ManagementResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/management/ManagementResourceIT.java
@@ -16,11 +16,10 @@
package org.usergrid.rest.management;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.ClientResponse.Status;
+import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.api.representation.Form;
+import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.JsonNode;
import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
@@ -29,16 +28,11 @@ import org.usergrid.management.OrganizationOwnerInfo;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.management.organizations.OrganizationsResource;
-import org.apache.commons.lang.StringUtils;
-
-import com.sun.jersey.api.client.ClientResponse.Status;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.representation.Form;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/management/RegistrationIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/management/RegistrationIT.java b/stack/rest/src/test/java/org/usergrid/rest/management/RegistrationIT.java
index a5fb6e8..ee31dcd 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/management/RegistrationIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/management/RegistrationIT.java
@@ -14,21 +14,10 @@
package org.usergrid.rest.management;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.UUID;
-
-import javax.mail.Folder;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.Store;
-import javax.mail.internet.MimeMultipart;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.core.util.MultivaluedMapImpl;
+import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.JsonNode;
import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
@@ -38,23 +27,18 @@ import org.usergrid.management.UserInfo;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.rest.AbstractRestIT;
-import org.apache.commons.lang.StringUtils;
-
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.core.util.MultivaluedMapImpl;
+import javax.mail.*;
+import javax.mail.internet.MimeMultipart;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.UUID;
-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.junit.Assert.fail;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_RESETPW_URL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_USERS_REQUIRE_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_APPROVES_ADMIN_USERS;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_APPROVES_ORGANIZATIONS;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_EMAIL;
+import static org.junit.Assert.*;
+import static org.usergrid.management.AccountCreationProps.*;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationResourceIT.java
index 39c9c4a..39e9744 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationResourceIT.java
@@ -1,11 +1,7 @@
package org.usergrid.rest.management.organizations;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
+import junit.framework.Assert;
import org.codehaus.jackson.JsonNode;
import org.junit.Rule;
import org.junit.Test;
@@ -14,7 +10,9 @@ import org.usergrid.management.OrganizationInfo;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
-import junit.framework.Assert;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationsResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationsResourceIT.java
index 1fc7477..34daa6c 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationsResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationsResourceIT.java
@@ -1,14 +1,14 @@
package org.usergrid.rest.management.organizations;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.ClientResponse.Status;
+import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.api.representation.Form;
+import junit.framework.Assert;
import org.codehaus.jackson.JsonNode;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.usergrid.management.ApplicationInfo;
import org.usergrid.management.OrganizationInfo;
import org.usergrid.management.UserInfo;
@@ -17,22 +17,14 @@ import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.persistence.entities.User;
import org.usergrid.rest.AbstractRestIT;
-import com.sun.jersey.api.client.ClientResponse.Status;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.representation.Form;
-
-import junit.framework.Assert;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
import static junit.framework.Assert.fail;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_USERS_REQUIRE_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_APPROVES_ADMIN_USERS;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_APPROVES_ORGANIZATIONS;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_EMAIL;
+import static org.junit.Assert.*;
+import static org.usergrid.management.AccountCreationProps.*;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/management/users/MUUserResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/management/users/MUUserResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/management/users/MUUserResourceIT.java
index 31e4517..0a9395b 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/management/users/MUUserResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/management/users/MUUserResourceIT.java
@@ -14,16 +14,9 @@
package org.usergrid.rest.management.users;
-import java.io.IOException;
-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 javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.api.representation.Form;
+import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.JsonNode;
import org.junit.Ignore;
import org.junit.Rule;
@@ -31,12 +24,7 @@ import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.usergrid.management.AccountCreationProps;
-import org.usergrid.management.ActivationState;
-import org.usergrid.management.MockImapClient;
-import org.usergrid.management.OrganizationInfo;
-import org.usergrid.management.OrganizationOwnerInfo;
-import org.usergrid.management.UserInfo;
+import org.usergrid.management.*;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.management.organizations.OrganizationsResource;
@@ -47,22 +35,17 @@ import org.usergrid.security.AuthPrincipalInfo;
import org.usergrid.security.AuthPrincipalType;
import org.usergrid.utils.UUIDUtils;
-import org.apache.commons.lang.StringUtils;
-
-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 javax.ws.rs.core.MediaType;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_USERS_REQUIRE_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_NOTIFY_ADMIN_OF_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_APPROVES_ADMIN_USERS;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_APPROVES_ORGANIZATIONS;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_EMAIL;
+import static org.junit.Assert.*;
+import static org.usergrid.management.AccountCreationProps.*;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/management/users/organizations/UsersOrganizationsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/management/users/organizations/UsersOrganizationsResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/management/users/organizations/UsersOrganizationsResourceIT.java
index b9c0cd8..021395c 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/management/users/organizations/UsersOrganizationsResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/management/users/organizations/UsersOrganizationsResourceIT.java
@@ -1,15 +1,14 @@
package org.usergrid.rest.management.users.organizations;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.rest.AbstractRestIT;
+import javax.ws.rs.core.MediaType;
+import java.util.Map;
+
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/PropertiesResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/PropertiesResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/test/PropertiesResourceIT.java
index d344f88..4e43b8c 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/PropertiesResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/PropertiesResourceIT.java
@@ -17,11 +17,6 @@
package org.usergrid.rest.test;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
@@ -30,6 +25,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.services.ServiceManagerFactory;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.Map;
+
import static org.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_USERS_REQUIRE_CONFIRMATION;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/Connection.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/Connection.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/Connection.java
index 26e0d3c..c1d9f17 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/Connection.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/Connection.java
@@ -16,10 +16,10 @@
package org.usergrid.rest.test.resource;
-import java.util.UUID;
-
import org.usergrid.rest.test.resource.app.queue.DevicesCollection;
+import java.util.UUID;
+
/** @author tnine */
public class Connection extends ValueResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/EntityResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/EntityResource.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/EntityResource.java
index 5102c41..6a94bd2 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/EntityResource.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/EntityResource.java
@@ -16,15 +16,14 @@
package org.usergrid.rest.test.resource;
+import com.sun.jersey.api.client.ClientResponse.Status;
+import com.sun.jersey.api.client.UniformInterfaceException;
+import org.codehaus.jackson.JsonNode;
+
import java.util.Collections;
import java.util.Map;
import java.util.UUID;
-import org.codehaus.jackson.JsonNode;
-
-import com.sun.jersey.api.client.ClientResponse.Status;
-import com.sun.jersey.api.client.UniformInterfaceException;
-
/** @author tnine */
public class EntityResource extends ValueResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/NamedResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/NamedResource.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/NamedResource.java
index c8b0e73..83abdf0 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/NamedResource.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/NamedResource.java
@@ -16,17 +16,15 @@
package org.usergrid.rest.test.resource;
+import com.sun.jersey.api.client.WebResource;
+import com.sun.jersey.api.client.WebResource.Builder;
+import org.codehaus.jackson.JsonNode;
+
+import javax.ws.rs.core.MediaType;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-import javax.ws.rs.core.MediaType;
-
-import org.codehaus.jackson.JsonNode;
-
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.WebResource.Builder;
-
/**
* @author tnine
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/SetResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/SetResource.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/SetResource.java
index 0c6ddc1..fca105b 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/SetResource.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/SetResource.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.test.resource;
+import org.codehaus.jackson.JsonNode;
+
import java.util.Map;
import java.util.UUID;
-import org.codehaus.jackson.JsonNode;
-
/** @author tnine */
public abstract class SetResource extends ValueResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/TestContext.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/TestContext.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/TestContext.java
index 10cb6ed..70bfb26 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/TestContext.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/TestContext.java
@@ -15,15 +15,14 @@
package org.usergrid.rest.test.resource;
-import java.util.UUID;
-
+import com.sun.jersey.test.framework.JerseyTest;
import org.usergrid.rest.test.resource.app.Application;
import org.usergrid.rest.test.resource.app.User;
import org.usergrid.rest.test.resource.app.UsersCollection;
import org.usergrid.rest.test.resource.mgmt.Management;
import org.usergrid.rest.test.security.TestUser;
-import com.sun.jersey.test.framework.JerseyTest;
+import java.util.UUID;
public class TestContext {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/ValueResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/ValueResource.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/ValueResource.java
index f5c8d18..817e30b 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/ValueResource.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/ValueResource.java
@@ -16,15 +16,14 @@
package org.usergrid.rest.test.resource;
+import com.sun.jersey.api.client.WebResource;
+import org.codehaus.jackson.JsonNode;
+
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
-import org.codehaus.jackson.JsonNode;
-
-import com.sun.jersey.api.client.WebResource;
-
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Application.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Application.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Application.java
index e076939..2be7375 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Application.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Application.java
@@ -16,8 +16,6 @@
package org.usergrid.rest.test.resource.app;
-import javax.ws.rs.core.MediaType;
-
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.test.resource.CustomCollection;
import org.usergrid.rest.test.resource.RootResource;
@@ -25,6 +23,8 @@ import org.usergrid.rest.test.resource.ValueResource;
import org.usergrid.rest.test.resource.app.queue.DevicesCollection;
import org.usergrid.rest.test.resource.app.queue.QueuesCollection;
+import javax.ws.rs.core.MediaType;
+
/** @author tnine */
public class Application extends ValueResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Device.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Device.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Device.java
index 91f7f06..5a66551 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Device.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Device.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.test.resource.app;
-import java.util.UUID;
-
import org.usergrid.rest.test.resource.EntityResource;
import org.usergrid.rest.test.resource.NamedResource;
+import java.util.UUID;
+
/**
* A resource for testing queues
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/User.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/User.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/User.java
index 68e897a..eabb5e2 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/User.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/User.java
@@ -16,12 +16,12 @@
package org.usergrid.rest.test.resource.app;
-import java.util.UUID;
-
import org.usergrid.rest.test.resource.EntityResource;
import org.usergrid.rest.test.resource.NamedResource;
import org.usergrid.rest.test.resource.app.queue.DevicesCollection;
+import java.util.UUID;
+
/**
* A resource for testing queues
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/UsersCollection.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/UsersCollection.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/UsersCollection.java
index df5ac39..8e56d58 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/UsersCollection.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/UsersCollection.java
@@ -16,15 +16,15 @@
package org.usergrid.rest.test.resource.app;
-import java.util.Map;
-import java.util.UUID;
-
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.test.resource.CollectionResource;
import org.usergrid.rest.test.resource.Me;
import org.usergrid.rest.test.resource.NamedResource;
import org.usergrid.utils.MapUtils;
+import java.util.Map;
+import java.util.UUID;
+
/** @author tnine */
public class UsersCollection extends CollectionResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Queue.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Queue.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Queue.java
index 23bb526..32a8c0c 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Queue.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Queue.java
@@ -16,14 +16,13 @@
package org.usergrid.rest.test.resource.app.queue;
-import java.util.List;
-import java.util.Map;
-
+import com.sun.jersey.api.client.WebResource;
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.test.resource.CollectionResource;
import org.usergrid.rest.test.resource.NamedResource;
-import com.sun.jersey.api.client.WebResource;
+import java.util.List;
+import java.util.Map;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Transaction.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Transaction.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Transaction.java
index 47d5dd7..98d03ce 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Transaction.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Transaction.java
@@ -16,12 +16,11 @@
package org.usergrid.rest.test.resource.app.queue;
+import com.sun.jersey.api.client.WebResource;
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.test.resource.CollectionResource;
import org.usergrid.rest.test.resource.NamedResource;
-import com.sun.jersey.api.client.WebResource;
-
/**
* A resource for testing queues
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Application.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Application.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Application.java
index 01ad317..2b2bcb2 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Application.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Application.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.test.resource.mgmt;
-import java.util.UUID;
-
import org.usergrid.rest.test.resource.EntityResource;
import org.usergrid.rest.test.resource.NamedResource;
+import java.util.UUID;
+
/**
* A resource for testing queues
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/ApplicationsCollection.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/ApplicationsCollection.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/ApplicationsCollection.java
index 293c1f0..765b44b 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/ApplicationsCollection.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/ApplicationsCollection.java
@@ -16,13 +16,13 @@
package org.usergrid.rest.test.resource.mgmt;
-import java.util.UUID;
-
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.test.resource.CollectionResource;
import org.usergrid.rest.test.resource.NamedResource;
import org.usergrid.utils.MapUtils;
+import java.util.UUID;
+
/** @author tnine */
public class ApplicationsCollection extends CollectionResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Management.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Management.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Management.java
index 758c701..091e408 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Management.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Management.java
@@ -16,10 +16,6 @@
package org.usergrid.rest.test.resource.mgmt;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.test.resource.Me;
import org.usergrid.rest.test.resource.NamedResource;
@@ -27,6 +23,9 @@ import org.usergrid.rest.test.resource.RootResource;
import org.usergrid.rest.test.resource.app.UsersCollection;
import org.usergrid.utils.MapUtils;
+import javax.ws.rs.core.MediaType;
+import java.util.Map;
+
/** @author tnine */
public class Management extends NamedResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Organization.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Organization.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Organization.java
index 9deedd7..3449484 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Organization.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Organization.java
@@ -16,12 +16,12 @@
package org.usergrid.rest.test.resource.mgmt;
-import java.util.UUID;
-
import org.usergrid.rest.test.resource.EntityResource;
import org.usergrid.rest.test.resource.NamedResource;
import org.usergrid.rest.test.resource.app.UsersCollection;
+import java.util.UUID;
+
/**
* A resource for testing queues
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/OrganizationsCollection.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/OrganizationsCollection.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/OrganizationsCollection.java
index e96ba95..0fc8a9d 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/OrganizationsCollection.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/OrganizationsCollection.java
@@ -16,14 +16,14 @@
package org.usergrid.rest.test.resource.mgmt;
-import java.util.UUID;
-
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.test.resource.CollectionResource;
import org.usergrid.rest.test.resource.NamedResource;
import org.usergrid.rest.test.security.TestUser;
import org.usergrid.utils.MapUtils;
+import java.util.UUID;
+
/** @author tnine */
public class OrganizationsCollection extends CollectionResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/security/TestUser.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/security/TestUser.java b/stack/rest/src/test/java/org/usergrid/rest/test/security/TestUser.java
index 4f67dd2..4366590 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/security/TestUser.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/security/TestUser.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.test.security;
-import java.util.UUID;
-
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.test.resource.TestContext;
+import java.util.UUID;
+
/** @author tnine */
public abstract class TestUser {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/management/ApplicationInfo.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/management/ApplicationInfo.java b/stack/services/src/main/java/org/usergrid/management/ApplicationInfo.java
index 968e0ac..f059024 100644
--- a/stack/services/src/main/java/org/usergrid/management/ApplicationInfo.java
+++ b/stack/services/src/main/java/org/usergrid/management/ApplicationInfo.java
@@ -16,12 +16,8 @@
package org.usergrid.management;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.Map.Entry;
-import java.util.UUID;
import static org.usergrid.persistence.Schema.PROPERTY_NAME;
import static org.usergrid.persistence.Schema.PROPERTY_UUID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/management/ManagementService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/management/ManagementService.java b/stack/services/src/main/java/org/usergrid/management/ManagementService.java
index d3926f5..7af7124 100644
--- a/stack/services/src/main/java/org/usergrid/management/ManagementService.java
+++ b/stack/services/src/main/java/org/usergrid/management/ManagementService.java
@@ -16,12 +16,7 @@
package org.usergrid.management;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.UUID;
-
+import com.google.common.collect.BiMap;
import org.usergrid.persistence.CredentialsInfo;
import org.usergrid.persistence.Entity;
import org.usergrid.persistence.EntityRef;
@@ -33,7 +28,7 @@ import org.usergrid.security.oauth.AccessInfo;
import org.usergrid.security.shiro.PrincipalCredentialsToken;
import org.usergrid.services.ServiceResults;
-import com.google.common.collect.BiMap;
+import java.util.*;
public interface ManagementService {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/management/OrganizationInfo.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/management/OrganizationInfo.java b/stack/services/src/main/java/org/usergrid/management/OrganizationInfo.java
index a38aeca..ff7a2d5 100644
--- a/stack/services/src/main/java/org/usergrid/management/OrganizationInfo.java
+++ b/stack/services/src/main/java/org/usergrid/management/OrganizationInfo.java
@@ -16,12 +16,8 @@
package org.usergrid.management;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.Map.Entry;
-import java.util.UUID;
import static org.usergrid.persistence.Schema.PROPERTY_PATH;
import static org.usergrid.persistence.Schema.PROPERTY_UUID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/management/UserInfo.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/management/UserInfo.java b/stack/services/src/main/java/org/usergrid/management/UserInfo.java
index cbf27ef..7561ede 100644
--- a/stack/services/src/main/java/org/usergrid/management/UserInfo.java
+++ b/stack/services/src/main/java/org/usergrid/management/UserInfo.java
@@ -16,23 +16,14 @@
package org.usergrid.management;
+import javax.xml.bind.annotation.XmlRootElement;
import java.util.Map;
import java.util.UUID;
-import javax.xml.bind.annotation.XmlRootElement;
-
import static org.apache.commons.lang.StringUtils.isNotBlank;
-import static org.usergrid.persistence.Schema.PROPERTY_ACTIVATED;
-import static org.usergrid.persistence.Schema.PROPERTY_CONFIRMED;
-import static org.usergrid.persistence.Schema.PROPERTY_DISABLED;
-import static org.usergrid.persistence.Schema.PROPERTY_EMAIL;
-import static org.usergrid.persistence.Schema.PROPERTY_NAME;
-import static org.usergrid.persistence.Schema.PROPERTY_USERNAME;
-import static org.usergrid.persistence.Schema.PROPERTY_UUID;
+import static org.usergrid.persistence.Schema.*;
import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
-import static org.usergrid.utils.ConversionUtils.getBoolean;
-import static org.usergrid.utils.ConversionUtils.string;
-import static org.usergrid.utils.ConversionUtils.uuid;
+import static org.usergrid.utils.ConversionUtils.*;
@XmlRootElement
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/management/cassandra/AccountCreationPropsImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/management/cassandra/AccountCreationPropsImpl.java b/stack/services/src/main/java/org/usergrid/management/cassandra/AccountCreationPropsImpl.java
index 98e70c7..4a3149d 100644
--- a/stack/services/src/main/java/org/usergrid/management/cassandra/AccountCreationPropsImpl.java
+++ b/stack/services/src/main/java/org/usergrid/management/cassandra/AccountCreationPropsImpl.java
@@ -16,15 +16,14 @@
package org.usergrid.management.cassandra;
-import java.util.Enumeration;
-import java.util.Properties;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.AccountCreationProps;
-import static java.lang.Boolean.parseBoolean;
+import java.util.Enumeration;
+import java.util.Properties;
+import static java.lang.Boolean.parseBoolean;
import static org.apache.commons.lang.StringUtils.isBlank;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/management/cassandra/ApplicationCreatorImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/management/cassandra/ApplicationCreatorImpl.java b/stack/services/src/main/java/org/usergrid/management/cassandra/ApplicationCreatorImpl.java
index f46cfbb..e36d65f 100644
--- a/stack/services/src/main/java/org/usergrid/management/cassandra/ApplicationCreatorImpl.java
+++ b/stack/services/src/main/java/org/usergrid/management/cassandra/ApplicationCreatorImpl.java
@@ -1,9 +1,7 @@
package org.usergrid.management.cassandra;
-import java.util.Arrays;
-import java.util.UUID;
-
+import com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.ApplicationCreator;
@@ -14,7 +12,8 @@ import org.usergrid.management.exceptions.ApplicationCreationException;
import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.EntityManagerFactory;
-import com.google.common.base.Preconditions;
+import java.util.Arrays;
+import java.util.UUID;
/** @author zznate */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java b/stack/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java
index 238ebdd..b917047 100644
--- a/stack/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java
+++ b/stack/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java
@@ -17,47 +17,20 @@
package org.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 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.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.usergrid.locking.Lock;
import org.usergrid.locking.LockManager;
-import org.usergrid.management.AccountCreationProps;
-import org.usergrid.management.ActivationState;
-import org.usergrid.management.ApplicationInfo;
-import org.usergrid.management.ManagementService;
-import org.usergrid.management.OrganizationInfo;
-import org.usergrid.management.OrganizationOwnerInfo;
-import org.usergrid.management.UserInfo;
-import org.usergrid.management.exceptions.DisabledAdminUserException;
-import org.usergrid.management.exceptions.DisabledAppUserException;
-import org.usergrid.management.exceptions.IncorrectPasswordException;
-import org.usergrid.management.exceptions.ManagementException;
-import org.usergrid.management.exceptions.RecentlyUsedPasswordException;
-import org.usergrid.management.exceptions.UnableToLeaveOrganizationException;
-import org.usergrid.management.exceptions.UnactivatedAdminUserException;
-import org.usergrid.management.exceptions.UnactivatedAppUserException;
-import org.usergrid.management.exceptions.UnconfirmedAdminUserException;
-import org.usergrid.persistence.CredentialsInfo;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.EntityManagerFactory;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.Results;
+import org.usergrid.management.*;
+import org.usergrid.management.exceptions.*;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.Results.Level;
-import org.usergrid.persistence.SimpleEntityRef;
import org.usergrid.persistence.entities.Application;
import org.usergrid.persistence.entities.Group;
import org.usergrid.persistence.entities.User;
@@ -79,92 +52,26 @@ import org.usergrid.security.tokens.TokenCategory;
import org.usergrid.security.tokens.TokenInfo;
import org.usergrid.security.tokens.TokenService;
import org.usergrid.security.tokens.exceptions.TokenException;
-import org.usergrid.services.ServiceAction;
-import org.usergrid.services.ServiceManager;
-import org.usergrid.services.ServiceManagerFactory;
-import org.usergrid.services.ServiceRequest;
-import org.usergrid.services.ServiceResults;
-import org.usergrid.utils.ConversionUtils;
-import org.usergrid.utils.JsonUtils;
-import org.usergrid.utils.MailUtils;
-import org.usergrid.utils.StringUtils;
-import org.usergrid.utils.UUIDUtils;
+import org.usergrid.services.*;
+import org.usergrid.utils.*;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang.text.StrSubstitutor;
-import org.apache.shiro.UnavailableSecurityManagerException;
-
-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.usergrid.locking.LockHelper.getUniqueUpdateLock;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_ACTIVATION_URL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_CONFIRMATION_URL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_RESETPW_URL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_ACTIVATED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_CONFIRMED_AWAITING_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_INVITED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_PASSWORD_RESET;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_USER_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_FOOTER;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ORGANIZATION_ACTIVATED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ORGANIZATION_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ORGANIZATION_CONFIRMED_AWAITING_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_SYSADMIN_ADMIN_ACTIVATED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_SYSADMIN_ADMIN_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_SYSADMIN_ORGANIZATION_ACTIVATED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_SYSADMIN_ORGANIZATION_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_ACTIVATED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_CONFIRMED_AWAITING_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_PASSWORD_RESET;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_PIN_REQUEST;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_MAILER_EMAIL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ORGANIZATION_ACTIVATION_URL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SETUP_TEST_ACCOUNT;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_EMAIL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_LOGIN_ALLOWED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_LOGIN_EMAIL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_LOGIN_NAME;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_LOGIN_PASSWORD;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_ADMIN_USER_EMAIL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_ADMIN_USER_NAME;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_ADMIN_USER_PASSWORD;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_ADMIN_USER_USERNAME;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_APP;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_ORGANIZATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_USER_ACTIVATION_URL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_USER_CONFIRMATION_URL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_USER_RESETPW_URL;
+import static org.usergrid.management.AccountCreationProps.*;
import static org.usergrid.persistence.CredentialsInfo.getCredentialsSecret;
-import static org.usergrid.persistence.Schema.DICTIONARY_CREDENTIALS;
-import static org.usergrid.persistence.Schema.PROPERTY_NAME;
-import static org.usergrid.persistence.Schema.PROPERTY_PATH;
-import static org.usergrid.persistence.Schema.PROPERTY_SECRET;
+import static org.usergrid.persistence.Schema.*;
import static org.usergrid.persistence.Schema.PROPERTY_UUID;
import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_ACTOR;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_ACTOR_NAME;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_CATEGORY;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_CONTENT;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_DISPLAY_NAME;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_ENTITY_TYPE;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_OBJECT;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_OBJECT_ENTITY_TYPE;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_OBJECT_NAME;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_OBJECT_TYPE;
+import static org.usergrid.persistence.entities.Activity.*;
import static org.usergrid.persistence.entities.Activity.PROPERTY_TITLE;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_VERB;
-import static org.usergrid.security.AuthPrincipalType.ADMIN_USER;
-import static org.usergrid.security.AuthPrincipalType.APPLICATION;
-import static org.usergrid.security.AuthPrincipalType.APPLICATION_USER;
-import static org.usergrid.security.AuthPrincipalType.ORGANIZATION;
+import static org.usergrid.security.AuthPrincipalType.*;
import static org.usergrid.security.oauth.ClientCredentialsInfo.getTypeFromClientId;
import static org.usergrid.security.oauth.ClientCredentialsInfo.getUUIDFromClientId;
import static org.usergrid.security.tokens.TokenCategory.ACCESS;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/AuthPrincipalType.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/AuthPrincipalType.java b/stack/services/src/main/java/org/usergrid/security/AuthPrincipalType.java
index 091092c..582e0d7 100644
--- a/stack/services/src/main/java/org/usergrid/security/AuthPrincipalType.java
+++ b/stack/services/src/main/java/org/usergrid/security/AuthPrincipalType.java
@@ -16,12 +16,12 @@
package org.usergrid.security;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
import org.usergrid.persistence.entities.Group;
import org.usergrid.persistence.entities.User;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
import static org.usergrid.utils.CodecUtils.base64;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionService.java b/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionService.java
index 47fcfee..ab0ce01 100644
--- a/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionService.java
+++ b/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionService.java
@@ -16,11 +16,11 @@
package org.usergrid.security.crypto;
-import java.util.UUID;
-
import org.usergrid.persistence.CredentialsInfo;
import org.usergrid.security.crypto.command.EncryptionCommand;
+import java.util.UUID;
+
/** @author tnine */
public interface EncryptionService {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionServiceImpl.java b/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionServiceImpl.java
index 68cb9f0..28dd59f 100644
--- a/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionServiceImpl.java
+++ b/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionServiceImpl.java
@@ -16,20 +16,19 @@
package org.usergrid.security.crypto;
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.annotation.PostConstruct;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import org.usergrid.persistence.CredentialsInfo;
import org.usergrid.security.crypto.command.EncryptionCommand;
+import javax.annotation.PostConstruct;
+import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
import static org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/crypto/command/BcryptCommand.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/crypto/command/BcryptCommand.java b/stack/services/src/main/java/org/usergrid/security/crypto/command/BcryptCommand.java
index 230c85a..15c68ae 100644
--- a/stack/services/src/main/java/org/usergrid/security/crypto/command/BcryptCommand.java
+++ b/stack/services/src/main/java/org/usergrid/security/crypto/command/BcryptCommand.java
@@ -16,14 +16,14 @@
package org.usergrid.security.crypto.command;
-import java.nio.charset.Charset;
-import java.util.UUID;
-
import org.springframework.stereotype.Component;
import org.springframework.util.Assert;
import org.usergrid.persistence.CredentialsInfo;
import org.usergrid.utils.BCrypt;
+import java.nio.charset.Charset;
+import java.util.UUID;
+
import static org.apache.commons.codec.binary.Base64.decodeBase64;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/crypto/command/EncryptionCommand.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/crypto/command/EncryptionCommand.java b/stack/services/src/main/java/org/usergrid/security/crypto/command/EncryptionCommand.java
index 82e7a32..725d4a8 100644
--- a/stack/services/src/main/java/org/usergrid/security/crypto/command/EncryptionCommand.java
+++ b/stack/services/src/main/java/org/usergrid/security/crypto/command/EncryptionCommand.java
@@ -16,10 +16,10 @@
package org.usergrid.security.crypto.command;
-import java.util.UUID;
-
import org.usergrid.persistence.CredentialsInfo;
+import java.util.UUID;
+
/**
* Simple chain of responsibility algorithm for password cryptography.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/crypto/command/Md5HashCommand.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/crypto/command/Md5HashCommand.java b/stack/services/src/main/java/org/usergrid/security/crypto/command/Md5HashCommand.java
index bdb04e9..9fb47a1 100644
--- a/stack/services/src/main/java/org/usergrid/security/crypto/command/Md5HashCommand.java
+++ b/stack/services/src/main/java/org/usergrid/security/crypto/command/Md5HashCommand.java
@@ -16,12 +16,11 @@
package org.usergrid.security.crypto.command;
-import java.util.UUID;
-
+import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.stereotype.Component;
import org.usergrid.persistence.CredentialsInfo;
-import org.apache.commons.codec.digest.DigestUtils;
+import java.util.UUID;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/crypto/command/PlainTextCommand.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/crypto/command/PlainTextCommand.java b/stack/services/src/main/java/org/usergrid/security/crypto/command/PlainTextCommand.java
index f796a28..c84f3d0 100644
--- a/stack/services/src/main/java/org/usergrid/security/crypto/command/PlainTextCommand.java
+++ b/stack/services/src/main/java/org/usergrid/security/crypto/command/PlainTextCommand.java
@@ -16,11 +16,11 @@
package org.usergrid.security.crypto.command;
-import java.util.UUID;
-
import org.springframework.stereotype.Component;
import org.usergrid.persistence.CredentialsInfo;
+import java.util.UUID;
+
/**
* A no-op provider
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/crypto/command/SaltedHasherCommand.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/crypto/command/SaltedHasherCommand.java b/stack/services/src/main/java/org/usergrid/security/crypto/command/SaltedHasherCommand.java
index 22eebfa..f051dac 100644
--- a/stack/services/src/main/java/org/usergrid/security/crypto/command/SaltedHasherCommand.java
+++ b/stack/services/src/main/java/org/usergrid/security/crypto/command/SaltedHasherCommand.java
@@ -16,13 +16,13 @@
package org.usergrid.security.crypto.command;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.usergrid.security.salt.SaltProvider;
+
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.util.UUID;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.usergrid.security.salt.SaltProvider;
-
/**
* Class that provides salt options
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/crypto/command/Sha1HashCommand.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/crypto/command/Sha1HashCommand.java b/stack/services/src/main/java/org/usergrid/security/crypto/command/Sha1HashCommand.java
index 77402a0..017faaf 100644
--- a/stack/services/src/main/java/org/usergrid/security/crypto/command/Sha1HashCommand.java
+++ b/stack/services/src/main/java/org/usergrid/security/crypto/command/Sha1HashCommand.java
@@ -16,14 +16,14 @@
package org.usergrid.security.crypto.command;
-import java.security.NoSuchAlgorithmException;
-import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.usergrid.persistence.CredentialsInfo;
+import java.security.NoSuchAlgorithmException;
+import java.util.UUID;
+
/** @author tnine */
@Component("org.usergrid.security.crypto.command.Sha1HashCommand")
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/oauth/AccessInfo.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/oauth/AccessInfo.java b/stack/services/src/main/java/org/usergrid/security/oauth/AccessInfo.java
index 28dd8fa..af00d52 100644
--- a/stack/services/src/main/java/org/usergrid/security/oauth/AccessInfo.java
+++ b/stack/services/src/main/java/org/usergrid/security/oauth/AccessInfo.java
@@ -16,17 +16,16 @@
package org.usergrid.security.oauth;
-import java.util.Map;
-import java.util.TreeMap;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Map;
+import java.util.TreeMap;
+
@XmlRootElement
public class AccessInfo {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/oauth/ClientCredentialsInfo.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/oauth/ClientCredentialsInfo.java b/stack/services/src/main/java/org/usergrid/security/oauth/ClientCredentialsInfo.java
index aa035ba..320e341 100644
--- a/stack/services/src/main/java/org/usergrid/security/oauth/ClientCredentialsInfo.java
+++ b/stack/services/src/main/java/org/usergrid/security/oauth/ClientCredentialsInfo.java
@@ -16,13 +16,13 @@
package org.usergrid.security.oauth;
-import java.util.UUID;
-
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonProperty;
import org.usergrid.security.AuthPrincipalType;
import org.usergrid.utils.UUIDUtils;
+import java.util.UUID;
+
public class ClientCredentialsInfo {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/providers/AbstractProvider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/providers/AbstractProvider.java b/stack/services/src/main/java/org/usergrid/security/providers/AbstractProvider.java
index 2015ba7..84752f9 100644
--- a/stack/services/src/main/java/org/usergrid/security/providers/AbstractProvider.java
+++ b/stack/services/src/main/java/org/usergrid/security/providers/AbstractProvider.java
@@ -1,15 +1,14 @@
package org.usergrid.security.providers;
-import java.util.Map;
-
-import org.usergrid.management.ManagementService;
-import org.usergrid.persistence.EntityManager;
-
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.config.ClientConfig;
import com.sun.jersey.api.client.config.DefaultClientConfig;
import com.sun.jersey.api.json.JSONConfiguration;
+import org.usergrid.management.ManagementService;
+import org.usergrid.persistence.EntityManager;
+
+import java.util.Map;
/** @author zznate */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/providers/FacebookProvider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/providers/FacebookProvider.java b/stack/services/src/main/java/org/usergrid/security/providers/FacebookProvider.java
index 0881b24..8ce6086 100644
--- a/stack/services/src/main/java/org/usergrid/security/providers/FacebookProvider.java
+++ b/stack/services/src/main/java/org/usergrid/security/providers/FacebookProvider.java
@@ -1,11 +1,6 @@
package org.usergrid.security.providers;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.ManagementService;
@@ -17,6 +12,10 @@ import org.usergrid.persistence.entities.User;
import org.usergrid.security.tokens.exceptions.BadTokenException;
import org.usergrid.utils.JsonUtils;
+import javax.ws.rs.core.MediaType;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
import static org.usergrid.persistence.Schema.PROPERTY_MODIFIED;
import static org.usergrid.utils.ListUtils.anyNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/providers/FoursquareProvider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/providers/FoursquareProvider.java b/stack/services/src/main/java/org/usergrid/security/providers/FoursquareProvider.java
index 6e3dbe8..adc0432 100644
--- a/stack/services/src/main/java/org/usergrid/security/providers/FoursquareProvider.java
+++ b/stack/services/src/main/java/org/usergrid/security/providers/FoursquareProvider.java
@@ -1,12 +1,11 @@
package org.usergrid.security.providers;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.WebResource;
+import com.sun.jersey.api.client.config.ClientConfig;
+import com.sun.jersey.api.client.config.DefaultClientConfig;
+import com.sun.jersey.api.json.JSONConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.ManagementService;
@@ -17,11 +16,10 @@ import org.usergrid.persistence.entities.User;
import org.usergrid.security.tokens.exceptions.BadTokenException;
import org.usergrid.utils.JsonUtils;
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.config.ClientConfig;
-import com.sun.jersey.api.client.config.DefaultClientConfig;
-import com.sun.jersey.api.json.JSONConfiguration;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.Map;
import static org.usergrid.utils.ListUtils.anyNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/providers/PingIdentityProvider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/providers/PingIdentityProvider.java b/stack/services/src/main/java/org/usergrid/security/providers/PingIdentityProvider.java
index a6de36c..b0a034b 100644
--- a/stack/services/src/main/java/org/usergrid/security/providers/PingIdentityProvider.java
+++ b/stack/services/src/main/java/org/usergrid/security/providers/PingIdentityProvider.java
@@ -1,12 +1,6 @@
package org.usergrid.security.providers;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
import org.codehaus.jackson.JsonNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -16,6 +10,11 @@ import org.usergrid.persistence.Identifier;
import org.usergrid.persistence.entities.User;
import org.usergrid.security.tokens.exceptions.BadTokenException;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
/**
* Provider implementation for accessing Ping Identity
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/providers/SignInAsProvider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/providers/SignInAsProvider.java b/stack/services/src/main/java/org/usergrid/security/providers/SignInAsProvider.java
index c8c0233..2ac3dc5 100644
--- a/stack/services/src/main/java/org/usergrid/security/providers/SignInAsProvider.java
+++ b/stack/services/src/main/java/org/usergrid/security/providers/SignInAsProvider.java
@@ -1,11 +1,11 @@
package org.usergrid.security.providers;
-import java.util.Map;
-
import org.usergrid.persistence.entities.User;
import org.usergrid.security.tokens.exceptions.BadTokenException;
+import java.util.Map;
+
/** @author zznate */
public interface SignInAsProvider {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/shiro/CustomPermission.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/CustomPermission.java b/stack/services/src/main/java/org/usergrid/security/shiro/CustomPermission.java
index 7a6375e..1ab26ee 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/CustomPermission.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/CustomPermission.java
@@ -16,16 +16,15 @@
package org.usergrid.security.shiro;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
+import org.apache.shiro.authz.Permission;
+import org.apache.shiro.authz.permission.WildcardPermission;
import org.springframework.util.AntPathMatcher;
import org.usergrid.management.UserInfo;
import org.usergrid.security.shiro.utils.SubjectUtils;
-import org.apache.shiro.authz.Permission;
-import org.apache.shiro.authz.permission.WildcardPermission;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
public class CustomPermission extends WildcardPermission {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/shiro/PrincipalCredentialsToken.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/PrincipalCredentialsToken.java b/stack/services/src/main/java/org/usergrid/security/shiro/PrincipalCredentialsToken.java
index ec44c7c..5063461 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/PrincipalCredentialsToken.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/PrincipalCredentialsToken.java
@@ -19,19 +19,8 @@ package org.usergrid.security.shiro;
import org.usergrid.management.ApplicationInfo;
import org.usergrid.management.OrganizationInfo;
import org.usergrid.management.UserInfo;
-import org.usergrid.security.shiro.credentials.AdminUserAccessToken;
-import org.usergrid.security.shiro.credentials.AdminUserPassword;
-import org.usergrid.security.shiro.credentials.ApplicationAccessToken;
-import org.usergrid.security.shiro.credentials.ApplicationGuest;
-import org.usergrid.security.shiro.credentials.ApplicationUserAccessToken;
-import org.usergrid.security.shiro.credentials.OrganizationAccessToken;
-import org.usergrid.security.shiro.credentials.PrincipalCredentials;
-import org.usergrid.security.shiro.principals.AdminUserPrincipal;
-import org.usergrid.security.shiro.principals.ApplicationGuestPrincipal;
-import org.usergrid.security.shiro.principals.ApplicationPrincipal;
-import org.usergrid.security.shiro.principals.ApplicationUserPrincipal;
-import org.usergrid.security.shiro.principals.OrganizationPrincipal;
-import org.usergrid.security.shiro.principals.PrincipalIdentifier;
+import org.usergrid.security.shiro.credentials.*;
+import org.usergrid.security.shiro.principals.*;
public class PrincipalCredentialsToken implements org.apache.shiro.authc.AuthenticationToken {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/shiro/Realm.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/Realm.java b/stack/services/src/main/java/org/usergrid/security/shiro/Realm.java
index 03f9a5a..cb5f4fe 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/Realm.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/Realm.java
@@ -16,53 +16,10 @@
package org.usergrid.security.shiro;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.usergrid.management.AccountCreationProps;
-import org.usergrid.management.ApplicationInfo;
-import org.usergrid.management.ManagementService;
-import org.usergrid.management.OrganizationInfo;
-import org.usergrid.management.UserInfo;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.EntityManagerFactory;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.Results.Level;
-import org.usergrid.persistence.SimpleEntityRef;
-import org.usergrid.persistence.entities.Group;
-import org.usergrid.persistence.entities.Role;
-import org.usergrid.persistence.entities.User;
-import org.usergrid.security.shiro.credentials.AccessTokenCredentials;
-import org.usergrid.security.shiro.credentials.AdminUserAccessToken;
-import org.usergrid.security.shiro.credentials.AdminUserPassword;
-import org.usergrid.security.shiro.credentials.ApplicationAccessToken;
-import org.usergrid.security.shiro.credentials.ApplicationUserAccessToken;
-import org.usergrid.security.shiro.credentials.ClientCredentials;
-import org.usergrid.security.shiro.credentials.OrganizationAccessToken;
-import org.usergrid.security.shiro.credentials.PrincipalCredentials;
-import org.usergrid.security.shiro.principals.AdminUserPrincipal;
-import org.usergrid.security.shiro.principals.ApplicationGuestPrincipal;
-import org.usergrid.security.shiro.principals.ApplicationPrincipal;
-import org.usergrid.security.shiro.principals.ApplicationUserPrincipal;
-import org.usergrid.security.shiro.principals.OrganizationPrincipal;
-import org.usergrid.security.shiro.principals.PrincipalIdentifier;
-import org.usergrid.security.tokens.TokenInfo;
-import org.usergrid.security.tokens.TokenService;
-
+import com.google.common.collect.HashBiMap;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.authc.AuthenticationInfo;
-import org.apache.shiro.authc.AuthenticationToken;
-import org.apache.shiro.authc.CredentialsException;
-import org.apache.shiro.authc.SimpleAuthenticationInfo;
+import org.apache.shiro.authc.*;
import org.apache.shiro.authc.credential.AllowAllCredentialsMatcher;
import org.apache.shiro.authc.credential.CredentialsMatcher;
import org.apache.shiro.authz.AuthorizationInfo;
@@ -73,8 +30,25 @@ import org.apache.shiro.realm.AuthorizingRealm;
import org.apache.shiro.session.Session;
import org.apache.shiro.subject.PrincipalCollection;
import org.apache.shiro.subject.Subject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.usergrid.management.*;
+import org.usergrid.persistence.*;
+import org.usergrid.persistence.Results.Level;
+import org.usergrid.persistence.entities.Group;
+import org.usergrid.persistence.entities.Role;
+import org.usergrid.persistence.entities.User;
+import org.usergrid.security.shiro.credentials.*;
+import org.usergrid.security.shiro.principals.*;
+import org.usergrid.security.tokens.TokenInfo;
+import org.usergrid.security.tokens.TokenService;
-import com.google.common.collect.HashBiMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
import static org.apache.commons.lang.StringUtils.isBlank;
import static org.apache.commons.lang.StringUtils.isNotBlank;
[20/23] organize imports only
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/Setup.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/Setup.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/Setup.java
index 9c73648..939acca 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/Setup.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/Setup.java
@@ -16,30 +16,17 @@
package org.usergrid.persistence.cassandra;
-import java.util.UUID;
-
+import me.prettyprint.hector.api.ddl.ComparatorType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.mq.cassandra.QueuesCF;
import org.usergrid.persistence.entities.Application;
-import me.prettyprint.hector.api.ddl.ComparatorType;
+import java.util.UUID;
import static me.prettyprint.hector.api.factory.HFactory.createColumnFamilyDefinition;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.getCfDefs;
-import static org.usergrid.persistence.cassandra.CassandraService.APPLICATIONS_CF;
-import static org.usergrid.persistence.cassandra.CassandraService.DEFAULT_APPLICATION;
-import static org.usergrid.persistence.cassandra.CassandraService.DEFAULT_APPLICATION_ID;
-import static org.usergrid.persistence.cassandra.CassandraService.DEFAULT_ORGANIZATION;
-import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION;
-import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
-import static org.usergrid.persistence.cassandra.CassandraService.PRINCIPAL_TOKEN_CF;
-import static org.usergrid.persistence.cassandra.CassandraService.PROPERTIES_CF;
-import static org.usergrid.persistence.cassandra.CassandraService.STATIC_APPLICATION_KEYSPACE;
-import static org.usergrid.persistence.cassandra.CassandraService.SYSTEM_KEYSPACE;
-import static org.usergrid.persistence.cassandra.CassandraService.TOKENS_CF;
-import static org.usergrid.persistence.cassandra.CassandraService.USE_VIRTUAL_KEYSPACES;
-import static org.usergrid.persistence.cassandra.CassandraService.keyspaceForApplication;
+import static org.usergrid.persistence.cassandra.CassandraService.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImpl.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImpl.java
index c8d105c..dbf4451 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImpl.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImpl.java
@@ -16,14 +16,14 @@
package org.usergrid.persistence.cassandra;
+import org.usergrid.persistence.IndexBucketLocator;
+
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.UUID;
-import org.usergrid.persistence.IndexBucketLocator;
-
import static org.apache.commons.codec.digest.DigestUtils.md5;
import static org.usergrid.utils.ConversionUtils.bytes;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/ConnectedIndexScanner.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/ConnectedIndexScanner.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/ConnectedIndexScanner.java
index 265dc4d..637ba91 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/ConnectedIndexScanner.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/ConnectedIndexScanner.java
@@ -16,19 +16,13 @@
package org.usergrid.persistence.cassandra.index;
-import java.nio.ByteBuffer;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
+import com.yammer.metrics.annotation.Metered;
+import me.prettyprint.hector.api.beans.HColumn;
import org.springframework.util.Assert;
import org.usergrid.persistence.cassandra.CassandraService;
-import com.yammer.metrics.annotation.Metered;
-
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.*;
import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_COMPOSITE_DICTIONARIES;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.key;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexBucketScanner.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexBucketScanner.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexBucketScanner.java
index 1a0776a..91d7551 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexBucketScanner.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexBucketScanner.java
@@ -16,23 +16,15 @@
package org.usergrid.persistence.cassandra.index;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NavigableSet;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.UUID;
-
+import com.yammer.metrics.annotation.Metered;
+import me.prettyprint.hector.api.beans.HColumn;
import org.usergrid.persistence.IndexBucketLocator;
import org.usergrid.persistence.IndexBucketLocator.IndexType;
import org.usergrid.persistence.cassandra.ApplicationCF;
import org.usergrid.persistence.cassandra.CassandraService;
-import com.yammer.metrics.annotation.Metered;
-
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.*;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.key;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexMultiBucketSetLoader.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexMultiBucketSetLoader.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexMultiBucketSetLoader.java
index 7a26d66..137e73e 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexMultiBucketSetLoader.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexMultiBucketSetLoader.java
@@ -16,20 +16,14 @@
package org.usergrid.persistence.cassandra.index;
-import java.nio.ByteBuffer;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeSet;
-import java.util.UUID;
-
-import org.usergrid.persistence.cassandra.ApplicationCF;
-import org.usergrid.persistence.cassandra.CassandraService;
-
+import me.prettyprint.hector.api.beans.HColumn;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.TypeParser;
+import org.usergrid.persistence.cassandra.ApplicationCF;
+import org.usergrid.persistence.cassandra.CassandraService;
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.*;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexScanner.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexScanner.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexScanner.java
index d87f37a..aef01e5 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexScanner.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/IndexScanner.java
@@ -16,12 +16,12 @@
package org.usergrid.persistence.cassandra.index;
+import me.prettyprint.hector.api.beans.HColumn;
+
import java.nio.ByteBuffer;
import java.util.Iterator;
import java.util.Set;
-import me.prettyprint.hector.api.beans.HColumn;
-
/**
* Interface for scanning all index buckets.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/NoOpIndexScanner.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/NoOpIndexScanner.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/NoOpIndexScanner.java
index d948af8..25bb0d0 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/NoOpIndexScanner.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/index/NoOpIndexScanner.java
@@ -16,13 +16,13 @@
package org.usergrid.persistence.cassandra.index;
+import me.prettyprint.hector.api.beans.HColumn;
+
import java.nio.ByteBuffer;
import java.util.Iterator;
import java.util.NavigableSet;
import java.util.Set;
-import me.prettyprint.hector.api.beans.HColumn;
-
/**
* Index scanner that doesn't return anything. This is used if our cursor has advanced beyond the end of all scannable
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/Slf4jTraceTagReporter.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/Slf4jTraceTagReporter.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/Slf4jTraceTagReporter.java
index 753b149..10682d3 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/Slf4jTraceTagReporter.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/Slf4jTraceTagReporter.java
@@ -1,11 +1,11 @@
package org.usergrid.persistence.cassandra.util;
-import java.util.Date;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Date;
+
/**
* Simple reporter which dumps to class logger at info level.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TimedOpTag.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TimedOpTag.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TimedOpTag.java
index d30c2f2..a3c8774 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TimedOpTag.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TimedOpTag.java
@@ -1,11 +1,10 @@
package org.usergrid.persistence.cassandra.util;
-import java.util.UUID;
-
+import com.google.common.base.Objects;
import org.usergrid.utils.UUIDUtils;
-import com.google.common.base.Objects;
+import java.util.UUID;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagAspect.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagAspect.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagAspect.java
index 30166d7..2cbd161 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagAspect.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagAspect.java
@@ -1,12 +1,12 @@
package org.usergrid.persistence.cassandra.util;
-import javax.annotation.Resource;
-
import org.aspectj.lang.ProceedingJoinPoint;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.annotation.Resource;
+
/**
* Use Aspects to apply a trace
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagManager.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagManager.java
index 6cdeb3a..85d83ca 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagManager.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/util/TraceTagManager.java
@@ -1,13 +1,12 @@
package org.usergrid.persistence.cassandra.util;
-import javax.annotation.Resource;
-
+import com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.utils.UUIDUtils;
-import com.google.common.base.Preconditions;
+import javax.annotation.Resource;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/entities/Activity.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Activity.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Activity.java
index 81b77cb..7f2e8ad 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Activity.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Activity.java
@@ -16,15 +16,6 @@
package org.usergrid.persistence.entities;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.map.annotate.JsonSerialize;
@@ -35,6 +26,9 @@ import org.usergrid.persistence.TypedEntity;
import org.usergrid.persistence.annotations.EntityDictionary;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.*;
+
import static org.usergrid.utils.StringUtils.toStringFormat;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/entities/Application.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Application.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Application.java
index 2028b26..62a70ad 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Application.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Application.java
@@ -16,13 +16,6 @@
package org.usergrid.persistence.entities;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
@@ -31,6 +24,12 @@ import org.usergrid.persistence.annotations.EntityCollection;
import org.usergrid.persistence.annotations.EntityDictionary;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
/** Applications represent the topmost container for all entities. */
@XmlRootElement
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/entities/Asset.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Asset.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Asset.java
index 518b391..805c507 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Asset.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Asset.java
@@ -16,17 +16,16 @@
package org.usergrid.persistence.entities;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
import org.usergrid.persistence.TypedEntity;
import org.usergrid.persistence.annotations.EntityDictionary;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Set;
+import java.util.UUID;
+
/**
* Asset entity for representing file-like objects.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/entities/Device.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Device.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Device.java
index 43b0dd5..b303031 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Device.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Device.java
@@ -16,17 +16,16 @@
package org.usergrid.persistence.entities;
-import java.util.List;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
import org.usergrid.persistence.TypedEntity;
import org.usergrid.persistence.annotations.EntityCollection;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+import java.util.UUID;
+
/** The Device entity class for representing devices in the service. */
@XmlRootElement
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/entities/Event.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Event.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Event.java
index d85cbf5..e948324 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Event.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Event.java
@@ -16,19 +16,18 @@
package org.usergrid.persistence.entities;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
import org.usergrid.persistence.TypedEntity;
import org.usergrid.persistence.annotations.EntityDictionary;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
/** An event type posted by the application. */
@XmlRootElement
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/entities/Folder.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Folder.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Folder.java
index a218d2e..2826bcf 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Folder.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Folder.java
@@ -16,17 +16,16 @@
package org.usergrid.persistence.entities;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
import org.usergrid.persistence.TypedEntity;
import org.usergrid.persistence.annotations.EntityDictionary;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Set;
+import java.util.UUID;
+
/**
* Asset entity for representing folder-like objects.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/entities/Group.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Group.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Group.java
index 9ffe504..3789cc9 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Group.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Group.java
@@ -16,13 +16,6 @@
package org.usergrid.persistence.entities;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
import org.usergrid.persistence.CredentialsInfo;
@@ -31,6 +24,12 @@ import org.usergrid.persistence.annotations.EntityCollection;
import org.usergrid.persistence.annotations.EntityDictionary;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
/** Groups are used to organize users. */
@XmlRootElement
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/entities/JobStat.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/JobStat.java b/stack/core/src/main/java/org/usergrid/persistence/entities/JobStat.java
index 06a324d..50434ff 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/JobStat.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/JobStat.java
@@ -16,11 +16,11 @@
package org.usergrid.persistence.entities;
-import java.util.UUID;
-
import org.usergrid.persistence.TypedEntity;
import org.usergrid.persistence.annotations.EntityProperty;
+import java.util.UUID;
+
/**
* All job execution info should be in this entity
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/entities/Message.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Message.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Message.java
index 30864e8..b46884b 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Message.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Message.java
@@ -16,17 +16,16 @@
package org.usergrid.persistence.entities;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
import org.usergrid.persistence.TypedEntity;
import org.usergrid.persistence.annotations.EntityDictionary;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Set;
+import java.util.UUID;
+
/**
* A generic Message type for message queue type operations. For status updates and other social actions, use Activity
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/entities/Role.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/Role.java b/stack/core/src/main/java/org/usergrid/persistence/entities/Role.java
index e8dd05a..f3b89f7 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/Role.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/Role.java
@@ -16,12 +16,6 @@
package org.usergrid.persistence.entities;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
import org.usergrid.persistence.TypedEntity;
@@ -29,6 +23,11 @@ import org.usergrid.persistence.annotations.EntityCollection;
import org.usergrid.persistence.annotations.EntityDictionary;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
/** Groups are used to organize users. */
@XmlRootElement
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/entities/User.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/User.java b/stack/core/src/main/java/org/usergrid/persistence/entities/User.java
index 32a1078..e260556 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/User.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/User.java
@@ -16,13 +16,6 @@
package org.usergrid.persistence.entities;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
@@ -32,6 +25,12 @@ import org.usergrid.persistence.annotations.EntityCollection;
import org.usergrid.persistence.annotations.EntityDictionary;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
import static org.apache.commons.lang.StringUtils.isNotBlank;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/geo/CollectionGeoSearch.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/CollectionGeoSearch.java b/stack/core/src/main/java/org/usergrid/persistence/geo/CollectionGeoSearch.java
index 43e8ff3..29086a1 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/CollectionGeoSearch.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/CollectionGeoSearch.java
@@ -1,18 +1,17 @@
package org.usergrid.persistence.geo;
-import java.nio.ByteBuffer;
-import java.util.List;
-import java.util.TreeSet;
-import java.util.UUID;
-
+import me.prettyprint.hector.api.beans.HColumn;
import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.EntityRef;
import org.usergrid.persistence.IndexBucketLocator;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.persistence.geo.model.Point;
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.TreeSet;
+import java.util.UUID;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.key;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/geo/ConnectionGeoSearch.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/ConnectionGeoSearch.java b/stack/core/src/main/java/org/usergrid/persistence/geo/ConnectionGeoSearch.java
index 3928ac9..fd46168 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/ConnectionGeoSearch.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/ConnectionGeoSearch.java
@@ -1,17 +1,16 @@
package org.usergrid.persistence.geo;
-import java.nio.ByteBuffer;
-import java.util.List;
-import java.util.TreeSet;
-import java.util.UUID;
-
+import me.prettyprint.hector.api.beans.HColumn;
import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.IndexBucketLocator;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.persistence.geo.model.Point;
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.TreeSet;
+import java.util.UUID;
import static org.usergrid.persistence.Schema.INDEX_CONNECTIONS;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.key;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRef.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRef.java b/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRef.java
index da25424..7b7468a 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRef.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRef.java
@@ -1,13 +1,12 @@
package org.usergrid.persistence.geo;
-import java.util.UUID;
-
+import me.prettyprint.hector.api.beans.DynamicComposite;
import org.usergrid.persistence.EntityRef;
import org.usergrid.persistence.geo.model.Point;
import org.usergrid.utils.UUIDUtils;
-import me.prettyprint.hector.api.beans.DynamicComposite;
+import java.util.UUID;
import static org.apache.commons.lang.math.NumberUtils.toDouble;
import static org.usergrid.utils.StringUtils.stringOrSubstringAfterLast;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparator.java b/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparator.java
index 5d1b228..9b7b70f 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparator.java
@@ -16,10 +16,10 @@
package org.usergrid.persistence.geo;
-import java.util.Comparator;
-
import org.usergrid.utils.UUIDUtils;
+import java.util.Comparator;
+
/**
* Compares 2 entity location refs by distance. The one with the larger distance is considered greater than one with a
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/geo/GeoIndexSearcher.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/GeoIndexSearcher.java b/stack/core/src/main/java/org/usergrid/persistence/geo/GeoIndexSearcher.java
index 98629b2..3f6fc6f 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/GeoIndexSearcher.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/GeoIndexSearcher.java
@@ -1,16 +1,13 @@
package org.usergrid.persistence.geo;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.DoubleSerializer;
+import me.prettyprint.cassandra.serializers.StringSerializer;
+import me.prettyprint.cassandra.serializers.UUIDSerializer;
+import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
+import me.prettyprint.hector.api.beans.DynamicComposite;
+import me.prettyprint.hector.api.beans.HColumn;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.EntityManager;
@@ -22,14 +19,8 @@ import org.usergrid.persistence.cassandra.index.IndexMultiBucketSetLoader;
import org.usergrid.persistence.geo.model.Point;
import org.usergrid.persistence.geo.model.Tuple;
-import org.apache.commons.lang.StringUtils;
-
-import me.prettyprint.cassandra.serializers.DoubleSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.*;
import static org.usergrid.persistence.Schema.DICTIONARY_GEOCELL;
import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_INDEX;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellManager.java b/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellManager.java
index be6f52a..dc0b588 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellManager.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellManager.java
@@ -1,16 +1,16 @@
package org.usergrid.persistence.geo;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
import org.usergrid.persistence.cassandra.GeoIndexManager;
import org.usergrid.persistence.geo.model.BoundingBox;
import org.usergrid.persistence.geo.model.CostFunction;
import org.usergrid.persistence.geo.model.DefaultCostFunction;
import org.usergrid.persistence.geo.model.Point;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
/**
#
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellUtils.java b/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellUtils.java
index 5b112c9..dbbdbc5 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellUtils.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellUtils.java
@@ -13,17 +13,13 @@ and limitations under the License.
package org.usergrid.persistence.geo;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
import org.usergrid.persistence.geo.comparator.DoubleTupleComparator;
import org.usergrid.persistence.geo.model.BoundingBox;
import org.usergrid.persistence.geo.model.Point;
import org.usergrid.persistence.geo.model.Tuple;
+import java.util.*;
+
/**
#
# Copyright 2010 Alexandre Gellibert
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/geo/comparator/DoubleTupleComparator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/comparator/DoubleTupleComparator.java b/stack/core/src/main/java/org/usergrid/persistence/geo/comparator/DoubleTupleComparator.java
index 6780662..b31530f 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/comparator/DoubleTupleComparator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/comparator/DoubleTupleComparator.java
@@ -1,10 +1,10 @@
package org.usergrid.persistence.geo.comparator;
-import java.util.Comparator;
-
import org.usergrid.persistence.geo.model.Tuple;
+import java.util.Comparator;
+
public class DoubleTupleComparator implements Comparator<Tuple<int[], Double>> {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/OrderByNode.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/OrderByNode.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/OrderByNode.java
index 089e66f..c30f844 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/OrderByNode.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/OrderByNode.java
@@ -16,10 +16,10 @@
package org.usergrid.persistence.query.ir;
-import java.util.List;
-
import org.usergrid.persistence.Query.SortPredicate;
+import java.util.List;
+
/**
* Intermediate representation of ordering operations
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/QuerySlice.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/QuerySlice.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/QuerySlice.java
index da94494..79aca6a 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/QuerySlice.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/QuerySlice.java
@@ -16,12 +16,11 @@
package org.usergrid.persistence.query.ir;
-import java.nio.ByteBuffer;
-
-import org.usergrid.utils.NumberUtils;
-
import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
import me.prettyprint.hector.api.beans.DynamicComposite;
+import org.usergrid.utils.NumberUtils;
+
+import java.nio.ByteBuffer;
import static org.usergrid.utils.CompositeUtils.setEqualityFlag;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/SearchVisitor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/SearchVisitor.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/SearchVisitor.java
index 665ddd2..60a3cad 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/SearchVisitor.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/SearchVisitor.java
@@ -1,23 +1,15 @@
package org.usergrid.persistence.query.ir;
-import java.util.Stack;
-
import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.EntityRef;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.cassandra.QueryProcessor;
import org.usergrid.persistence.cassandra.index.IndexScanner;
import org.usergrid.persistence.cassandra.index.NoOpIndexScanner;
-import org.usergrid.persistence.query.ir.result.EmptyIterator;
-import org.usergrid.persistence.query.ir.result.IntersectionIterator;
-import org.usergrid.persistence.query.ir.result.OrderByIterator;
-import org.usergrid.persistence.query.ir.result.ResultIterator;
-import org.usergrid.persistence.query.ir.result.SecondaryIndexSliceParser;
-import org.usergrid.persistence.query.ir.result.SliceIterator;
-import org.usergrid.persistence.query.ir.result.StaticIdIterator;
-import org.usergrid.persistence.query.ir.result.SubtractionIterator;
-import org.usergrid.persistence.query.ir.result.UnionIterator;
+import org.usergrid.persistence.query.ir.result.*;
+
+import java.util.Stack;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/SliceNode.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/SliceNode.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/SliceNode.java
index dd2a933..dc3dd6e 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/SliceNode.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/SliceNode.java
@@ -16,12 +16,12 @@
package org.usergrid.persistence.query.ir;
+import org.usergrid.persistence.query.ir.QuerySlice.RangeValue;
+
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.usergrid.persistence.query.ir.QuerySlice.RangeValue;
-
import static org.usergrid.persistence.cassandra.IndexUpdate.indexValueCode;
import static org.usergrid.persistence.cassandra.IndexUpdate.toIndexableValue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java
index e63529b..fbb7d6c 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java
@@ -1,9 +1,10 @@
package org.usergrid.persistence.query.ir.result;
+import org.apache.cassandra.utils.ByteBufferUtil;
+
import java.nio.ByteBuffer;
import java.util.UUID;
-import org.apache.cassandra.utils.ByteBufferUtil;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionIndexSliceParser.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionIndexSliceParser.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionIndexSliceParser.java
index 21e407b..6626793 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionIndexSliceParser.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionIndexSliceParser.java
@@ -16,12 +16,11 @@
package org.usergrid.persistence.query.ir.result;
-import java.nio.ByteBuffer;
-import java.util.UUID;
-
+import me.prettyprint.hector.api.beans.DynamicComposite;
import org.usergrid.persistence.Schema;
-import me.prettyprint.hector.api.beans.DynamicComposite;
+import java.nio.ByteBuffer;
+import java.util.UUID;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionRefLoader.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionRefLoader.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionRefLoader.java
index 4466a53..4b04e7d 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionRefLoader.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionRefLoader.java
@@ -1,16 +1,16 @@
package org.usergrid.persistence.query.ir.result;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
import org.usergrid.persistence.ConnectionRef;
import org.usergrid.persistence.EntityRef;
import org.usergrid.persistence.Results;
import org.usergrid.persistence.SimpleEntityRef;
import org.usergrid.persistence.cassandra.ConnectionRefImpl;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
/**
*
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionTypesIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionTypesIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionTypesIterator.java
index 67cceb6..568cc6d 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionTypesIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ConnectionTypesIterator.java
@@ -1,18 +1,13 @@
package org.usergrid.persistence.query.ir.result;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.StringSerializer;
+import me.prettyprint.hector.api.beans.HColumn;
import org.usergrid.persistence.Schema;
import org.usergrid.persistence.cassandra.CassandraService;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.*;
import static org.usergrid.persistence.Schema.DICTIONARY_CONNECTED_TYPES;
import static org.usergrid.persistence.Schema.DICTIONARY_CONNECTING_TYPES;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EmptyIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EmptyIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EmptyIterator.java
index 8236043..14501ec 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EmptyIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EmptyIterator.java
@@ -1,12 +1,12 @@
package org.usergrid.persistence.query.ir.result;
+import org.usergrid.persistence.cassandra.CursorCache;
+
import java.util.Iterator;
import java.util.Set;
import java.util.UUID;
-import org.usergrid.persistence.cassandra.CursorCache;
-
/** Iterator that never returns results */
public class EmptyIterator implements ResultIterator {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityRefLoader.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityRefLoader.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityRefLoader.java
index 68f521d..bf6231d 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityRefLoader.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityRefLoader.java
@@ -16,13 +16,13 @@
package org.usergrid.persistence.query.ir.result;
-import java.util.ArrayList;
-import java.util.List;
-
import org.usergrid.persistence.EntityRef;
import org.usergrid.persistence.Results;
import org.usergrid.persistence.SimpleEntityRef;
+import java.util.ArrayList;
+import java.util.List;
+
public class EntityRefLoader implements ResultsLoader {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityResultsLoader.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityResultsLoader.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityResultsLoader.java
index 6cbdbef..f821483 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityResultsLoader.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/EntityResultsLoader.java
@@ -16,11 +16,11 @@
package org.usergrid.persistence.query.ir.result;
-import java.util.List;
-
import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.Results;
+import java.util.List;
+
/** @author tnine */
public class EntityResultsLoader implements ResultsLoader {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/GeoIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/GeoIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/GeoIterator.java
index 121f257..5c82268 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/GeoIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/GeoIterator.java
@@ -16,17 +16,7 @@
package org.usergrid.persistence.query.ir.result;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.StringSerializer;
import org.usergrid.persistence.cassandra.CursorCache;
import org.usergrid.persistence.geo.EntityLocationRef;
import org.usergrid.persistence.geo.GeoIndexSearcher;
@@ -34,7 +24,8 @@ import org.usergrid.persistence.geo.GeoIndexSearcher.SearchResults;
import org.usergrid.persistence.geo.model.Point;
import org.usergrid.persistence.query.ir.QuerySlice;
-import me.prettyprint.cassandra.serializers.StringSerializer;
+import java.nio.ByteBuffer;
+import java.util.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IDLoader.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IDLoader.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IDLoader.java
index 49d891a..6d03047 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IDLoader.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IDLoader.java
@@ -1,10 +1,10 @@
package org.usergrid.persistence.query.ir.result;
-import java.util.List;
-
import org.usergrid.persistence.Results;
+import java.util.List;
+
public class IDLoader implements ResultsLoader {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IntersectionIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IntersectionIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IntersectionIterator.java
index 4ffad1b..d2e8277 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IntersectionIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/IntersectionIterator.java
@@ -16,14 +16,13 @@
package org.usergrid.persistence.query.ir.result;
+import com.google.common.collect.Sets;
+import org.usergrid.persistence.cassandra.CursorCache;
+
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.UUID;
-import org.usergrid.persistence.cassandra.CursorCache;
-
-import com.google.common.collect.Sets;
-
/**
* An iterator that unions 1 or more subsets. It makes the assuming that sub iterators iterate from min(uuid) to
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/OrderByIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/OrderByIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/OrderByIterator.java
index 1c1bc31..a7ad3d4 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/OrderByIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/OrderByIterator.java
@@ -16,19 +16,8 @@
package org.usergrid.persistence.query.ir.result;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.UUIDSerializer;
+import org.apache.commons.collections.comparators.ComparatorChain;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
@@ -39,9 +28,8 @@ import org.usergrid.persistence.Query.SortPredicate;
import org.usergrid.persistence.cassandra.CursorCache;
import org.usergrid.persistence.query.ir.QuerySlice;
-import org.apache.commons.collections.comparators.ComparatorChain;
-
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
+import java.nio.ByteBuffer;
+import java.util.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultIterator.java
index 5b3e666..f45afc6 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultIterator.java
@@ -16,12 +16,12 @@
package org.usergrid.persistence.query.ir.result;
+import org.usergrid.persistence.cassandra.CursorCache;
+
import java.util.Iterator;
import java.util.Set;
import java.util.UUID;
-import org.usergrid.persistence.cassandra.CursorCache;
-
/**
* Interface for iterating slice results per node. This is to be used to iterate and join or intersect values Each
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultsLoader.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultsLoader.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultsLoader.java
index d7a925a..9802885 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultsLoader.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/ResultsLoader.java
@@ -16,10 +16,10 @@
package org.usergrid.persistence.query.ir.result;
-import java.util.List;
-
import org.usergrid.persistence.Results;
+import java.util.List;
+
/** @author tnine */
public interface ResultsLoader {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SecondaryIndexSliceParser.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SecondaryIndexSliceParser.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SecondaryIndexSliceParser.java
index f003c96..76f7f55 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SecondaryIndexSliceParser.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SecondaryIndexSliceParser.java
@@ -16,11 +16,11 @@
package org.usergrid.persistence.query.ir.result;
+import me.prettyprint.hector.api.beans.DynamicComposite;
+
import java.nio.ByteBuffer;
import java.util.UUID;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-
/**
* Parser for reading and writing secondary index composites
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SliceIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SliceIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SliceIterator.java
index 6cc833d..7ea0610 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SliceIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SliceIterator.java
@@ -16,13 +16,7 @@
package org.usergrid.persistence.query.ir.result;
-import java.nio.ByteBuffer;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.UUID;
-
+import me.prettyprint.hector.api.beans.HColumn;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.cassandra.CursorCache;
@@ -30,7 +24,8 @@ import org.usergrid.persistence.cassandra.index.IndexScanner;
import org.usergrid.persistence.exceptions.QueryIterationException;
import org.usergrid.persistence.query.ir.QuerySlice;
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/StaticIdIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/StaticIdIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/StaticIdIterator.java
index 6ca1e89..87e3268 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/StaticIdIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/StaticIdIterator.java
@@ -1,14 +1,14 @@
package org.usergrid.persistence.query.ir.result;
+import org.usergrid.persistence.cassandra.CursorCache;
+
import java.nio.ByteBuffer;
import java.util.Collections;
import java.util.Iterator;
import java.util.Set;
import java.util.UUID;
-import org.usergrid.persistence.cassandra.CursorCache;
-
/** Simple iterator that just returns UUIDs that are set into it */
public class StaticIdIterator implements ResultIterator {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SubtractionIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SubtractionIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SubtractionIterator.java
index b654496..0aac486 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SubtractionIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SubtractionIterator.java
@@ -16,14 +16,13 @@
package org.usergrid.persistence.query.ir.result;
+import com.google.common.collect.Sets;
+import org.usergrid.persistence.cassandra.CursorCache;
+
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.UUID;
-import org.usergrid.persistence.cassandra.CursorCache;
-
-import com.google.common.collect.Sets;
-
/**
* Simple iterator to perform Unions
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UUIDIndexSliceParser.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UUIDIndexSliceParser.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UUIDIndexSliceParser.java
index c3278de..cb9c6d6 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UUIDIndexSliceParser.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UUIDIndexSliceParser.java
@@ -16,11 +16,11 @@
package org.usergrid.persistence.query.ir.result;
+import me.prettyprint.cassandra.serializers.UUIDSerializer;
+
import java.nio.ByteBuffer;
import java.util.UUID;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-
/**
* Parser for reading and writing secondary index composites
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java
index efd4e3d..091e745 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java
@@ -16,20 +16,12 @@
package org.usergrid.persistence.query.ir.result;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.UUIDSerializer;
import org.usergrid.persistence.cassandra.CursorCache;
import org.usergrid.utils.UUIDUtils;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
+import java.nio.ByteBuffer;
+import java.util.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/query/tree/UUIDLiteral.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/tree/UUIDLiteral.java b/stack/core/src/main/java/org/usergrid/persistence/query/tree/UUIDLiteral.java
index b1420da..5d8969e 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/tree/UUIDLiteral.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/tree/UUIDLiteral.java
@@ -16,11 +16,11 @@
package org.usergrid.persistence.query.tree;
-import java.util.UUID;
-
import org.antlr.runtime.ClassicToken;
import org.antlr.runtime.Token;
+import java.util.UUID;
+
/** @author tnine */
public class UUIDLiteral extends Literal<UUID> {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/schema/CollectionInfo.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/schema/CollectionInfo.java b/stack/core/src/main/java/org/usergrid/persistence/schema/CollectionInfo.java
index 6cc01e5..9e46b32 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/schema/CollectionInfo.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/schema/CollectionInfo.java
@@ -16,14 +16,14 @@
package org.usergrid.persistence.schema;
+import org.usergrid.persistence.Schema;
+import org.usergrid.persistence.annotations.EntityCollection;
+
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.TreeSet;
-import org.usergrid.persistence.Schema;
-import org.usergrid.persistence.annotations.EntityCollection;
-
public class CollectionInfo {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/schema/EntityInfo.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/schema/EntityInfo.java b/stack/core/src/main/java/org/usergrid/persistence/schema/EntityInfo.java
index e6480d3..db6c103 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/schema/EntityInfo.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/schema/EntityInfo.java
@@ -16,14 +16,14 @@
package org.usergrid.persistence.schema;
+import org.usergrid.persistence.Schema;
+
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
-import org.usergrid.persistence.Schema;
-
public class EntityInfo {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/system/UsergridSystemMonitor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/system/UsergridSystemMonitor.java b/stack/core/src/main/java/org/usergrid/system/UsergridSystemMonitor.java
index 68dad28..c40aaae 100644
--- a/stack/core/src/main/java/org/usergrid/system/UsergridSystemMonitor.java
+++ b/stack/core/src/main/java/org/usergrid/system/UsergridSystemMonitor.java
@@ -1,16 +1,15 @@
package org.usergrid.system;
-import java.util.Properties;
-
+import me.prettyprint.hector.api.Cluster;
+import me.prettyprint.hector.api.exceptions.HectorException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.utils.JsonUtils;
import org.usergrid.utils.MapUtils;
import org.usergrid.utils.TimeUtils;
-import me.prettyprint.hector.api.Cluster;
-import me.prettyprint.hector.api.exceptions.HectorException;
+import java.util.Properties;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/AESUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/AESUtils.java b/stack/core/src/main/java/org/usergrid/utils/AESUtils.java
index b409599..eca8c58 100644
--- a/stack/core/src/main/java/org/usergrid/utils/AESUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/AESUtils.java
@@ -18,15 +18,14 @@
package org.usergrid.utils;
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.SecretKeySpec;
-
import org.apache.commons.codec.binary.Base64;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+
import static org.apache.commons.lang.StringUtils.rightPad;
import static org.apache.commons.lang.StringUtils.substring;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/CodecUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/CodecUtils.java b/stack/core/src/main/java/org/usergrid/utils/CodecUtils.java
index 56acce5..e2be6bb 100644
--- a/stack/core/src/main/java/org/usergrid/utils/CodecUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/CodecUtils.java
@@ -17,10 +17,10 @@
package org.usergrid.utils;
-import java.util.UUID;
-
import org.apache.commons.codec.binary.Base64;
+import java.util.UUID;
+
import static org.usergrid.utils.ConversionUtils.bytes;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/CompositeUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/CompositeUtils.java b/stack/core/src/main/java/org/usergrid/utils/CompositeUtils.java
index db63d86..85b36ab 100644
--- a/stack/core/src/main/java/org/usergrid/utils/CompositeUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/CompositeUtils.java
@@ -17,13 +17,13 @@
package org.usergrid.utils;
-import java.nio.ByteBuffer;
-import java.util.List;
-
import me.prettyprint.hector.api.beans.AbstractComposite.Component;
import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
import me.prettyprint.hector.api.beans.DynamicComposite;
+import java.nio.ByteBuffer;
+import java.util.List;
+
public class CompositeUtils {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/ConversionUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/ConversionUtils.java b/stack/core/src/main/java/org/usergrid/utils/ConversionUtils.java
index 83cd5e4..8e48506 100644
--- a/stack/core/src/main/java/org/usergrid/utils/ConversionUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/ConversionUtils.java
@@ -17,20 +17,14 @@
package org.usergrid.utils;
-import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
+import org.apache.commons.lang.math.NumberUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.commons.lang.math.NumberUtils;
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.*;
/** Convenience methods for converting to and from formats, primarily between byte arrays and UUIDs, Strings,
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/HttpUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/HttpUtils.java b/stack/core/src/main/java/org/usergrid/utils/HttpUtils.java
index a088a37..1b398ad 100644
--- a/stack/core/src/main/java/org/usergrid/utils/HttpUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/HttpUtils.java
@@ -17,15 +17,15 @@
package org.usergrid.utils;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.utils.URLEncodedUtils;
+
import java.net.URI;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.utils.URLEncodedUtils;
-
public class HttpUtils {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/IndexUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/IndexUtils.java b/stack/core/src/main/java/org/usergrid/utils/IndexUtils.java
index 91f2a87..168fa9d 100644
--- a/stack/core/src/main/java/org/usergrid/utils/IndexUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/IndexUtils.java
@@ -17,36 +17,27 @@
package org.usergrid.utils;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.UUID;
-
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.analysis.tokenattributes.TermAttribute;
import org.apache.lucene.util.Version;
-
-import static org.usergrid.utils.ClassUtils.cast;
-import static org.usergrid.utils.ClassUtils.isBasicType;
-import static org.usergrid.utils.JsonUtils.quoteString;
-import static org.usergrid.utils.JsonUtils.toJsonNode;
-
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.node.ArrayNode;
import org.codehaus.jackson.node.ObjectNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.*;
+import java.util.Map.Entry;
+
+import static org.usergrid.utils.ClassUtils.cast;
+import static org.usergrid.utils.ClassUtils.isBasicType;
+import static org.usergrid.utils.JsonUtils.quoteString;
+import static org.usergrid.utils.JsonUtils.toJsonNode;
+
public class IndexUtils {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/JsonUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/JsonUtils.java b/stack/core/src/main/java/org/usergrid/utils/JsonUtils.java
index 6bd8300..17ff56e 100644
--- a/stack/core/src/main/java/org/usergrid/utils/JsonUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/JsonUtils.java
@@ -17,19 +17,6 @@
package org.usergrid.utils;
-import java.io.File;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.usergrid.exception.JsonReadException;
-import org.usergrid.exception.JsonWriteException;
-import org.usergrid.persistence.Entity;
-
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.io.JsonStringEncoder;
import org.codehaus.jackson.map.ObjectMapper;
@@ -37,9 +24,16 @@ import org.codehaus.jackson.map.SerializationConfig.Feature;
import org.codehaus.jackson.smile.SmileFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.usergrid.exception.JsonReadException;
+import org.usergrid.exception.JsonWriteException;
+import org.usergrid.persistence.Entity;
-import static org.apache.commons.lang.StringUtils.substringAfter;
+import java.io.File;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.util.*;
+import static org.apache.commons.lang.StringUtils.substringAfter;
import static org.usergrid.utils.StringUtils.stringOrSubstringBeforeFirst;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/ListUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/ListUtils.java b/stack/core/src/main/java/org/usergrid/utils/ListUtils.java
index 63050ee..e861506 100644
--- a/stack/core/src/main/java/org/usergrid/utils/ListUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/ListUtils.java
@@ -17,16 +17,15 @@
package org.usergrid.utils;
+import org.apache.commons.lang.math.NumberUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.UUID;
-import org.apache.commons.lang.math.NumberUtils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
public class ListUtils extends org.apache.commons.collections.ListUtils {
private static final Logger LOG = LoggerFactory.getLogger( ListUtils.class );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/MailUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/MailUtils.java b/stack/core/src/main/java/org/usergrid/utils/MailUtils.java
index a74d172..06120c9 100644
--- a/stack/core/src/main/java/org/usergrid/utils/MailUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/MailUtils.java
@@ -17,23 +17,17 @@
package org.usergrid.utils;
-import java.util.Properties;
+import com.google.common.base.Preconditions;
+import org.jsoup.Jsoup;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Session;
import javax.mail.Transport;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
-
-import org.jsoup.Jsoup;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Preconditions;
+import javax.mail.internet.*;
+import java.util.Properties;
import static org.usergrid.utils.MapUtils.filter;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/MapUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/MapUtils.java b/stack/core/src/main/java/org/usergrid/utils/MapUtils.java
index bf1e1b8..c5e513d 100644
--- a/stack/core/src/main/java/org/usergrid/utils/MapUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/MapUtils.java
@@ -17,20 +17,10 @@
package org.usergrid.utils;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
import static org.apache.commons.lang.StringUtils.isNotBlank;
-
import static org.usergrid.utils.ClassUtils.cast;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/StringUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/StringUtils.java b/stack/core/src/main/java/org/usergrid/utils/StringUtils.java
index 373748a..7f5c4c3 100644
--- a/stack/core/src/main/java/org/usergrid/utils/StringUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/StringUtils.java
@@ -17,13 +17,12 @@
package org.usergrid.utils;
-import java.util.Arrays;
-
import org.apache.commons.io.IOUtils;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Arrays;
+
import static org.usergrid.utils.ConversionUtils.string;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/UUIDUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/UUIDUtils.java b/stack/core/src/main/java/org/usergrid/utils/UUIDUtils.java
index 110a20c..9b994c8 100644
--- a/stack/core/src/main/java/org/usergrid/utils/UUIDUtils.java
+++ b/stack/core/src/main/java/org/usergrid/utils/UUIDUtils.java
@@ -17,6 +17,11 @@
package org.usergrid.utils;
+import com.fasterxml.uuid.EthernetAddress;
+import com.fasterxml.uuid.UUIDComparator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.Collections;
import java.util.List;
import java.util.Random;
@@ -25,20 +30,9 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantLock;
-import com.fasterxml.uuid.EthernetAddress;
-import com.fasterxml.uuid.UUIDComparator;
-
-import static com.fasterxml.uuid.impl.UUIDUtil.BYTE_OFFSET_CLOCK_HI;
-import static com.fasterxml.uuid.impl.UUIDUtil.BYTE_OFFSET_CLOCK_LO;
-import static com.fasterxml.uuid.impl.UUIDUtil.BYTE_OFFSET_CLOCK_MID;
-import static com.fasterxml.uuid.impl.UUIDUtil.BYTE_OFFSET_CLOCK_SEQUENCE;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import static com.fasterxml.uuid.impl.UUIDUtil.*;
import static org.apache.commons.codec.binary.Base64.decodeBase64;
import static org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString;
-
import static org.usergrid.utils.ConversionUtils.bytes;
import static org.usergrid.utils.ConversionUtils.uuid;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/utils/Version.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/utils/Version.java b/stack/core/src/main/java/org/usergrid/utils/Version.java
index 0c4ac32..51e7e82 100644
--- a/stack/core/src/main/java/org/usergrid/utils/Version.java
+++ b/stack/core/src/main/java/org/usergrid/utils/Version.java
@@ -46,12 +46,12 @@ package org.usergrid.utils;
* POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
+import org.apache.commons.lang.StringUtils;
+
import java.io.Serializable;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.lang.StringUtils;
-
/**
* The Version class can be used to parse a standard version string into its four components,
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/Application.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/Application.java b/stack/core/src/test/java/org/usergrid/Application.java
index 861c89a..c55b0af 100644
--- a/stack/core/src/test/java/org/usergrid/Application.java
+++ b/stack/core/src/test/java/org/usergrid/Application.java
@@ -1,14 +1,14 @@
package org.usergrid;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.rules.TestRule;
import org.usergrid.persistence.Entity;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.Results;
+import java.util.Map;
+import java.util.UUID;
+
/**
* A Usergrid Application object used to simplify Test code by making it much more readable and removing unnecessary
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/ConcurrentCoreITSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/ConcurrentCoreITSuite.java b/stack/core/src/test/java/org/usergrid/ConcurrentCoreITSuite.java
index e5bdb05..7bac7ab 100644
--- a/stack/core/src/test/java/org/usergrid/ConcurrentCoreITSuite.java
+++ b/stack/core/src/test/java/org/usergrid/ConcurrentCoreITSuite.java
@@ -23,15 +23,7 @@ import org.usergrid.cassandra.CassandraResource;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.cassandra.ConcurrentSuite;
import org.usergrid.mq.MessagesIT;
-import org.usergrid.persistence.CollectionIT;
-import org.usergrid.persistence.CounterIT;
-import org.usergrid.persistence.EntityConnectionsIT;
-import org.usergrid.persistence.EntityDictionaryIT;
-import org.usergrid.persistence.EntityManagerIT;
-import org.usergrid.persistence.GeoIT;
-import org.usergrid.persistence.IndexIT;
-import org.usergrid.persistence.PathQueryIT;
-import org.usergrid.persistence.PermissionsIT;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.cassandra.EntityManagerFactoryImplIT;
import org.usergrid.system.UsergridSystemMonitorIT;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/ConcurrentCoreIteratorITSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/ConcurrentCoreIteratorITSuite.java b/stack/core/src/test/java/org/usergrid/ConcurrentCoreIteratorITSuite.java
index 9787dcb..e431845 100644
--- a/stack/core/src/test/java/org/usergrid/ConcurrentCoreIteratorITSuite.java
+++ b/stack/core/src/test/java/org/usergrid/ConcurrentCoreIteratorITSuite.java
@@ -7,35 +7,7 @@ import org.junit.runners.Suite;
import org.usergrid.cassandra.CassandraResource;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.cassandra.ConcurrentSuite;
-import org.usergrid.persistence.query.AllInCollectionIT;
-import org.usergrid.persistence.query.AllInConnectionIT;
-import org.usergrid.persistence.query.AllInConnectionNoTypeIT;
-import org.usergrid.persistence.query.MultiOrderByCollectionIT;
-import org.usergrid.persistence.query.MultiOrderByComplexUnionCollectionIT;
-import org.usergrid.persistence.query.MultiOrderByComplexUnionConnectionIT;
-import org.usergrid.persistence.query.SingleOrderByBoundRangeScanAscCollectionIT;
-import org.usergrid.persistence.query.SingleOrderByBoundRangeScanAscConnectionIT;
-import org.usergrid.persistence.query.SingleOrderByBoundRangeScanDescCollectionIT;
-import org.usergrid.persistence.query.SingleOrderByBoundRangeScanDescConnectionIT;
-import org.usergrid.persistence.query.SingleOrderByComplexIntersectionCollectionIT;
-import org.usergrid.persistence.query.SingleOrderByComplexIntersectionConnectionIT;
-import org.usergrid.persistence.query.SingleOrderByComplexUnionCollectionIT;
-import org.usergrid.persistence.query.SingleOrderByComplexUnionConnectionIT;
-import org.usergrid.persistence.query.SingleOrderByLessThanLimitCollectionIT;
-import org.usergrid.persistence.query.SingleOrderByLessThanLimitConnectionIT;
-import org.usergrid.persistence.query.SingleOrderByMaxLimitCollectionIT;
-import org.usergrid.persistence.query.SingleOrderByMaxLimitConnectionIT;
-import org.usergrid.persistence.query.SingleOrderByNoIntersectionCollectionIT;
-import org.usergrid.persistence.query.SingleOrderByNoIntersectionConnectionIT;
-import org.usergrid.persistence.query.SingleOrderByNotCollectionIT;
-import org.usergrid.persistence.query.SingleOrderByNotConnectionIT;
-import org.usergrid.persistence.query.SingleOrderBySameRangeScanGreaterCollectionIT;
-import org.usergrid.persistence.query.SingleOrderBySameRangeScanGreaterConnectionIT;
-import org.usergrid.persistence.query.SingleOrderBySameRangeScanGreaterThanEqualCollectionIT;
-import org.usergrid.persistence.query.SingleOrderBySameRangeScanLessCollectionIT;
-import org.usergrid.persistence.query.SingleOrderBySameRangeScanLessConnectionIT;
-import org.usergrid.persistence.query.SingleOrderBySameRangeScanLessThanEqualCollectionIT;
-import org.usergrid.persistence.query.SingleOrderBySameRangeScanLessThanEqualConnectionIT;
+import org.usergrid.persistence.query.*;
@RunWith(ConcurrentSuite.class)
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/ConcurrentCoreTestSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/ConcurrentCoreTestSuite.java b/stack/core/src/test/java/org/usergrid/ConcurrentCoreTestSuite.java
index 319a3ff..c5c3d03 100644
--- a/stack/core/src/test/java/org/usergrid/ConcurrentCoreTestSuite.java
+++ b/stack/core/src/test/java/org/usergrid/ConcurrentCoreTestSuite.java
@@ -7,11 +7,7 @@ import org.usergrid.cassandra.Concurrent;
import org.usergrid.cassandra.ConcurrentSuite;
import org.usergrid.locking.zookeeper.ZookeeperLockManagerTest;
import org.usergrid.mq.QueuePathsTest;
-import org.usergrid.persistence.EntityTest;
-import org.usergrid.persistence.QueryTest;
-import org.usergrid.persistence.QueryUtilsTest;
-import org.usergrid.persistence.SchemaTest;
-import org.usergrid.persistence.UtilsTest;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.cassandra.QueryProcessorTest;
import org.usergrid.persistence.cassandra.SimpleIndexBucketLocatorImplTest;
import org.usergrid.persistence.query.ir.result.IntersectionIteratorTest;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/CoreApplication.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/CoreApplication.java b/stack/core/src/test/java/org/usergrid/CoreApplication.java
index 9f2218b..a6fc172 100644
--- a/stack/core/src/test/java/org/usergrid/CoreApplication.java
+++ b/stack/core/src/test/java/org/usergrid/CoreApplication.java
@@ -16,10 +16,6 @@
package org.usergrid;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
@@ -31,6 +27,10 @@ import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.Results;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
+
import static junit.framework.Assert.assertNotNull;
[04/23] git commit: Miscellaneous changes
Posted by sn...@apache.org.
Miscellaneous changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f8ae7fe7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f8ae7fe7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f8ae7fe7
Branch: refs/pull/30/merge
Commit: f8ae7fe7883175729968b260feb24971f1c924a5
Parents: 1150e47
Author: Strong Liu <st...@hibernate.org>
Authored: Sun Jan 19 17:47:15 2014 +0800
Committer: Strong Liu <st...@hibernate.org>
Committed: Sun Jan 19 17:47:15 2014 +0800
----------------------------------------------------------------------
.../src/main/java/org/usergrid/batch/Job.java | 2 +-
.../src/main/java/org/usergrid/mq/Query.java | 7 +-
.../java/org/usergrid/mq/QueryFilterLexer.java | 3 +-
.../java/org/usergrid/mq/QueryFilterParser.java | 27 -----
.../java/org/usergrid/mq/QueryProcessor.java | 1 -
.../usergrid/persistence/CredentialsInfo.java | 2 +-
.../org/usergrid/persistence/Identifier.java | 5 +-
.../java/org/usergrid/persistence/Results.java | 2 -
.../java/org/usergrid/persistence/Schema.java | 116 +++++--------------
.../java/org/usergrid/persistence/Update.java | 2 +-
.../cassandra/CassandraPersistenceUtils.java | 2 +-
.../persistence/cassandra/CassandraService.java | 2 +-
.../cassandra/ConnectionRefImpl.java | 10 +-
.../cassandra/EntityManagerImpl.java | 10 +-
.../cassandra/RelationManagerImpl.java | 4 +-
.../usergrid/persistence/entities/JobStat.java | 7 +-
.../persistence/geo/GeoIndexSearcher.java | 14 +--
.../usergrid/persistence/geo/GeocellUtils.java | 4 +-
.../query/ir/result/AbstractScanColumn.java | 5 +-
.../query/ir/result/GeoIterator.java | 9 +-
.../persistence/query/tree/BooleanOperand.java | 5 -
.../persistence/query/tree/ContainsOperand.java | 16 ---
.../persistence/query/tree/EqualityOperand.java | 4 -
.../persistence/schema/DictionaryInfo.java | 1 -
.../usergrid/persistence/schema/EntityInfo.java | 16 +--
.../batch/ConcurrentSchedulerTestSuite.java | 2 +-
.../org/usergrid/batch/SchedulerTestSuite.java | 2 +-
.../batch/job/AbstractSchedulerRuntimeIT.java | 2 +-
.../count/BatchCountParallelismTest.java | 2 +-
.../org/usergrid/locking/zookeeper/ZooPut.java | 2 +-
.../usergrid/persistence/EntityManagerIT.java | 6 +-
.../launcher/ClasspathStaticHttpHandler.java | 9 +-
.../launcher/CustomJSPTemplateProcessor.java | 2 +-
.../main/java/org/usergrid/launcher/Server.java | 1 +
.../org/usergrid/mongo/protocol/OpQuery.java | 2 +-
.../usergrid/mongo/query/MongoQueryParser.java | 16 +--
stack/pom.xml | 2 +-
.../java/org/usergrid/rest/RootResource.java | 13 ++-
.../rest/applications/ApplicationResource.java | 2 +-
.../rest/applications/ServiceResource.java | 7 +-
.../rest/applications/users/UsersResource.java | 3 +-
.../organizations/OrganizationsResource.java | 3 +-
.../applications/ApplicationsResource.java | 3 +-
.../organizations/users/UsersResource.java | 9 +-
.../rest/management/users/UsersResource.java | 5 +-
.../organizations/OrganizationsResource.java | 5 +-
.../organizations/OrganizationResource.java | 9 +-
.../org/usergrid/rest/utils/JSONPUtils.java | 8 +-
.../org/usergrid/rest/utils/PathingUtils.java | 2 +-
.../collection/activities/AndOrQueryTest.java | 7 +-
.../queues/QueueResourceLong2IT.java | 8 +-
.../users/ConnectionResourceTest.java | 1 -
.../rest/management/RegistrationIT.java | 4 +-
.../organizations/OrganizationsResourceIT.java | 2 +-
.../usergrid/management/ActivationState.java | 2 +-
.../cassandra/ManagementServiceImpl.java | 13 +--
.../security/providers/FoursquareProvider.java | 2 +-
.../providers/PingIdentityProvider.java | 4 +-
.../security/shiro/CustomPermission.java | 5 +-
.../shiro/PrincipalCredentialsToken.java | 4 +-
.../java/org/usergrid/security/shiro/Realm.java | 6 +-
.../security/shiro/utils/SubjectUtils.java | 5 +-
.../tokens/cassandra/TokenServiceImpl.java | 31 +++--
.../org/usergrid/services/ServiceAction.java | 2 +-
.../java/org/usergrid/services/ServiceInfo.java | 2 +-
.../org/usergrid/services/ServiceManager.java | 9 +-
.../org/usergrid/services/ServiceRequest.java | 6 +-
.../applications/ApplicationsService.java | 9 +-
.../org/usergrid/NoExitSecurityManager.java | 2 +-
.../usergrid/cassandra/AvailablePortFinder.java | 2 +-
.../usergrid/cassandra/CassandraResource.java | 22 +---
71 files changed, 186 insertions(+), 355 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/batch/Job.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/Job.java b/stack/core/src/main/java/org/usergrid/batch/Job.java
index 34240c8..454e52b 100644
--- a/stack/core/src/main/java/org/usergrid/batch/Job.java
+++ b/stack/core/src/main/java/org/usergrid/batch/Job.java
@@ -14,7 +14,7 @@ public interface Job {
* @param execution The execution information. This will be the same from the last run. By default you should call
* exeuction.start() once processing starts
*
- * @throws JobExecutionException If the job cannot be executed
+ * @throws Exception If the job cannot be executed
*/
public void execute( JobExecution execution ) throws Exception;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/mq/Query.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/Query.java b/stack/core/src/main/java/org/usergrid/mq/Query.java
index f7e2530..cf1e39c 100644
--- a/stack/core/src/main/java/org/usergrid/mq/Query.java
+++ b/stack/core/src/main/java/org/usergrid/mq/Query.java
@@ -498,12 +498,7 @@ public class Query {
return this;
}
- if ( StringUtils.isNotEmpty( output ) ) {
- mergeSelectResults = true;
- }
- else {
- mergeSelectResults = false;
- }
+ mergeSelectResults = StringUtils.isNotEmpty(output);
if ( output == null ) {
output = "";
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/mq/QueryFilterLexer.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueryFilterLexer.java b/stack/core/src/main/java/org/usergrid/mq/QueryFilterLexer.java
index ebef342..a7eccd7 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueryFilterLexer.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueryFilterLexer.java
@@ -70,7 +70,8 @@ public class QueryFilterLexer extends Lexer {
// delegators
- public QueryFilterLexer() {;}
+ public QueryFilterLexer() {
+ }
public QueryFilterLexer( CharStream input ) {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/mq/QueryFilterParser.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueryFilterParser.java b/stack/core/src/main/java/org/usergrid/mq/QueryFilterParser.java
index 0f0c913..dea193b 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueryFilterParser.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueryFilterParser.java
@@ -98,9 +98,6 @@ public class QueryFilterParser extends Parser {
public static class property_return extends ParserRuleReturnScope {}
- ;
-
-
// $ANTLR start "property"
// org/usergrid/persistence/query/QueryFilter.g:101:1: property : ( ID ) ;
public final QueryFilterParser.property_return property() throws RecognitionException {
@@ -134,9 +131,6 @@ public class QueryFilterParser extends Parser {
public static class operator_return extends ParserRuleReturnScope {}
- ;
-
-
// $ANTLR start "operator"
// org/usergrid/persistence/query/QueryFilter.g:104:1: operator : ( '<' | '<=' | '=' | '>' | '>=' | 'in' | 'eq' |
// 'lt' | 'gt' | 'lte' | 'gte' | 'contains' | 'within' ) ;
@@ -176,9 +170,6 @@ public class QueryFilterParser extends Parser {
public static class value_return extends ParserRuleReturnScope {}
- ;
-
-
// $ANTLR start "value"
// org/usergrid/persistence/query/QueryFilter.g:107:1: value : ( BOOLEAN | STRING | INT | FLOAT | UUID ) ;
public final QueryFilterParser.value_return value() throws RecognitionException {
@@ -216,9 +207,6 @@ public class QueryFilterParser extends Parser {
public static class second_value_return extends ParserRuleReturnScope {}
- ;
-
-
// $ANTLR start "second_value"
// org/usergrid/persistence/query/QueryFilter.g:109:1: second_value : ( BOOLEAN | STRING | INT | FLOAT | UUID ) ;
public final QueryFilterParser.second_value_return second_value() throws RecognitionException {
@@ -256,9 +244,6 @@ public class QueryFilterParser extends Parser {
public static class third_value_return extends ParserRuleReturnScope {}
- ;
-
-
// $ANTLR start "third_value"
// org/usergrid/persistence/query/QueryFilter.g:111:1: third_value : ( BOOLEAN | STRING | INT | FLOAT | UUID ) ;
public final QueryFilterParser.third_value_return third_value() throws RecognitionException {
@@ -411,9 +396,6 @@ public class QueryFilterParser extends Parser {
public static class select_subject_return extends ParserRuleReturnScope {}
- ;
-
-
// $ANTLR start "select_subject"
// org/usergrid/persistence/query/QueryFilter.g:127:1: select_subject : ID ;
public final QueryFilterParser.select_subject_return select_subject() throws RecognitionException {
@@ -446,9 +428,6 @@ public class QueryFilterParser extends Parser {
public static class select_assign_target_return extends ParserRuleReturnScope {}
- ;
-
-
// $ANTLR start "select_assign_target"
// org/usergrid/persistence/query/QueryFilter.g:134:1: select_assign_target : ID ;
public final QueryFilterParser.select_assign_target_return select_assign_target() throws RecognitionException {
@@ -478,9 +457,6 @@ public class QueryFilterParser extends Parser {
public static class select_assign_source_return extends ParserRuleReturnScope {}
- ;
-
-
// $ANTLR start "select_assign_source"
// org/usergrid/persistence/query/QueryFilter.g:137:1: select_assign_source : ID ;
public final QueryFilterParser.select_assign_source_return select_assign_source() throws RecognitionException {
@@ -683,9 +659,6 @@ public class QueryFilterParser extends Parser {
public static class direction_return extends ParserRuleReturnScope {}
- ;
-
-
// $ANTLR start "direction"
// org/usergrid/persistence/query/QueryFilter.g:165:1: direction : ( 'asc' | 'desc' ) ;
public final QueryFilterParser.direction_return direction() throws RecognitionException {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/mq/QueryProcessor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueryProcessor.java b/stack/core/src/main/java/org/usergrid/mq/QueryProcessor.java
index 6cc805a..16e3afc 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueryProcessor.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueryProcessor.java
@@ -394,7 +394,6 @@ public class QueryProcessor {
}
if ( searchFinishValue == null ) {
searchFinishValue = searchStartValue;
- ;
}
if ( ( searchStartValue != null ) && searchStartValue.toString().endsWith( "*" ) ) {
searchStartValue = removeEnd( searchStartValue.toString(), "*" );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/CredentialsInfo.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/CredentialsInfo.java b/stack/core/src/main/java/org/usergrid/persistence/CredentialsInfo.java
index 146af43..f8a635d 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/CredentialsInfo.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/CredentialsInfo.java
@@ -165,7 +165,7 @@ public class CredentialsInfo implements Comparable<CredentialsInfo> {
@Override
public int compareTo( CredentialsInfo o ) {
- if ( created == o.created ) {
+ if (created.equals(o.created)) {
return 0;
}
if ( o.created == null ) {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/Identifier.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/Identifier.java b/stack/core/src/main/java/org/usergrid/persistence/Identifier.java
index 7139e43..226ded0 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/Identifier.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/Identifier.java
@@ -29,6 +29,9 @@ import org.usergrid.utils.UUIDUtils;
public class Identifier implements Serializable {
+ public static final String UUID_REX = "[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}";
+ public static final String EMAIL_REX = "[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,4}";
+
public enum Type {
UUID, NAME, EMAIL
}
@@ -37,7 +40,7 @@ public class Identifier implements Serializable {
Type type;
Object value;
- static Pattern emailRegEx = Pattern.compile( "[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,4}" );
+ static Pattern emailRegEx = Pattern.compile( EMAIL_REX );
static Pattern nameRegEx = Pattern.compile( "[a-zA-Z0-9_\\-./]*" );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/Results.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/Results.java b/stack/core/src/main/java/org/usergrid/persistence/Results.java
index a6329d6..ea7da45 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/Results.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/Results.java
@@ -706,7 +706,6 @@ public class Results implements Iterable<Entity> {
idSet.addAll( results.idSet );
ids = new ArrayList<UUID>( idSet );
- return;
}
}
@@ -756,7 +755,6 @@ public class Results implements Iterable<Entity> {
idSet = newSet;
ids = new ArrayList<UUID>( idSet );
level = Level.IDS;
- return;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/Schema.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/Schema.java b/stack/core/src/main/java/org/usergrid/persistence/Schema.java
index 587a65f..2d233c1 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/Schema.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/Schema.java
@@ -160,8 +160,8 @@ public class Schema {
public static final String DICTIONARY_COUNTERS = "counters";
public static final String DICTIONARY_GEOCELL = "geocell";
- private static List<String> entitiesPackage = new ArrayList<String>();
- private static List<String> entitiesScanPath = new ArrayList<String>();
+ private static final List<String> entitiesPackage = new ArrayList<String>();
+ private static final List<String> entitiesScanPath = new ArrayList<String>();
@SuppressWarnings("rawtypes")
public static Map<String, Class> DEFAULT_DICTIONARIES =
@@ -216,7 +216,6 @@ public class Schema {
new ConcurrentHashMap<Class<? extends Entity>, EntityInfo>();
Map<String, EntityInfo> entityMap = new TreeMap<String, EntityInfo>( String.CASE_INSENSITIVE_ORDER );
- ;
Map<String, Map<String, Set<CollectionInfo>>> entityContainerCollections =
new TreeMap<String, Map<String, Set<CollectionInfo>>>( String.CASE_INSENSITIVE_ORDER );
@@ -500,7 +499,8 @@ public class Schema {
public String[] getAllPropertyNamesAsArray() {
- return allProperties.keySet().toArray( new String[0] );
+ Set<String> strings = allProperties.keySet();
+ return strings.toArray(new String[strings.size()]);
}
@@ -639,11 +639,8 @@ public class Schema {
public boolean hasProperties( String entityType ) {
EntityInfo entity = getEntityInfo( entityType );
- if ( entity == null ) {
- return false;
- }
+ return entity != null && entity.hasProperties();
- return entity.hasProperties();
}
@@ -667,7 +664,8 @@ public class Schema {
return new String[0];
}
- return entity.getProperties().keySet().toArray( new String[0] );
+ Set<String> strings = entity.getProperties().keySet();
+ return strings.toArray(new String[strings.size()]);
}
@@ -679,11 +677,8 @@ public class Schema {
}
EntityInfo entity = getEntityInfo( entityType );
- if ( entity == null ) {
- return false;
- }
+ return entity != null && entity.hasProperty(propertyName);
- return entity.hasProperty( propertyName );
}
@@ -702,63 +697,40 @@ public class Schema {
public boolean isPropertyMutable( String entityType, String propertyName ) {
EntityInfo entity = getEntityInfo( entityType );
- if ( entity == null ) {
- return false;
- }
+ return entity != null && entity.isPropertyMutable(propertyName);
- return entity.isPropertyMutable( propertyName );
}
public boolean isPropertyUnique( String entityType, String propertyName ) {
EntityInfo entity = getEntityInfo( entityType );
- if ( entity == null ) {
- return false;
- }
+ return entity != null && entity.isPropertyUnique(propertyName);
- return entity.isPropertyUnique( propertyName );
}
public boolean isPropertyIndexed( String entityType, String propertyName ) {
EntityInfo entity = getEntityInfo( entityType );
- if ( entity == null ) {
- return true;
- }
-
- if ( entity.hasProperty( propertyName ) ) {
- return entity.isPropertyIndexed( propertyName );
- }
+ return entity == null || !entity.hasProperty(propertyName) || entity.isPropertyIndexed(propertyName);
- return true;
}
public boolean isPropertyFulltextIndexed( String entityType, String propertyName ) {
EntityInfo entity = getEntityInfo( entityType );
- if ( entity == null ) {
- return true;
- }
-
- if ( entity.hasProperty( propertyName ) ) {
- return entity.isPropertyFulltextIndexed( propertyName );
- }
+ return entity == null || !entity.hasProperty(propertyName) || entity.isPropertyFulltextIndexed(propertyName);
- return true;
}
public boolean isPropertyTimestamp( String entityType, String propertyName ) {
EntityInfo entity = getEntityInfo( entityType );
- if ( entity == null ) {
- return false;
- }
+ return entity != null && entity.isPropertyTimestamp(propertyName);
- return entity.isPropertyTimestamp( propertyName );
}
@@ -782,11 +754,8 @@ public class Schema {
}
EntityInfo entity = getEntityInfo( entityType );
- if ( entity == null ) {
- return false;
- }
+ return entity != null && entity.isPropertyRequired(propertyName);
- return entity.isPropertyRequired( propertyName );
}
@@ -811,11 +780,8 @@ public class Schema {
public boolean isPropertyIndexedInCollection( String containerType, String collectionName, String propertyName ) {
CollectionInfo collection = getCollection( containerType, collectionName );
- if ( collection == null ) {
- return false;
- }
+ return collection != null && collection.isPropertyIndexed(propertyName);
- return collection.isPropertyIndexed( propertyName );
}
@@ -823,11 +789,8 @@ public class Schema {
public boolean hasDictionaries( String entityType ) {
EntityInfo entity = getEntityInfo( entityType );
- if ( entity == null ) {
- return false;
- }
+ return entity != null && entity.hasDictionaries();
- return entity.hasDictionaries();
}
@@ -847,11 +810,8 @@ public class Schema {
public boolean hasDictionary( String entityType, String dictionaryName ) {
EntityInfo entity = getEntityInfo( entityType );
- if ( entity == null ) {
- return false;
- }
+ return entity != null && entity.hasDictionary(dictionaryName);
- return entity.hasDictionary( dictionaryName );
}
@@ -897,11 +857,8 @@ public class Schema {
}
DictionaryInfo dictionary = entity.getDictionary( dictionaryName );
- if ( dictionary == null ) {
- return false;
- }
+ return dictionary != null && dictionary.isKeysIndexedInConnections();
- return dictionary.isKeysIndexedInConnections();
}
@@ -910,11 +867,8 @@ public class Schema {
String dictionaryName ) {
CollectionInfo collection = getCollection( containerType, collectionName );
- if ( collection == null ) {
- return false;
- }
+ return collection != null && collection.isDictionaryIndexed(dictionaryName);
- return collection.isDictionaryIndexed( dictionaryName );
}
@@ -938,22 +892,16 @@ public class Schema {
}
PropertyInfo property = item.getAliasPropertyObject();
- if ( property == null ) {
- return false;
- }
+ return property != null && property.isPathBasedName();
- return property.isPathBasedName();
}
public boolean isCollectionReversed( String containerType, String collectionName ) {
CollectionInfo collection = getCollection( containerType, collectionName );
- if ( collection == null ) {
- return false;
- }
+ return collection != null && collection.isReversed();
- return collection.isReversed();
}
@@ -1260,10 +1208,7 @@ public class Schema {
public static boolean isAssociatedEntityType( String entityType ) {
- if ( entityType == null ) {
- return false;
- }
- return entityType.indexOf( ':' ) != -1;
+ return entityType != null && entityType.contains(":");
}
@@ -1389,7 +1334,7 @@ public class Schema {
continue;
}
Object propertyValue = entry.getValue();
- if ( ( propertyValue instanceof String ) && ( ( ( String ) propertyValue ) == "" ) ) {
+ if ( ( propertyValue instanceof String ) && (propertyValue.equals("")) ) {
propertyValue = null;
}
if ( ( propertyValue == null ) && isRequiredProperty( entityType, entry.getKey() ) ) {
@@ -1406,7 +1351,7 @@ public class Schema {
entityType = normalizeEntityType( entityType );
- if ( ( propertyValue instanceof String ) && ( ( String ) propertyValue ).equals( "" ) ) {
+ if ( ( propertyValue instanceof String ) && propertyValue.equals("") ) {
propertyValue = null;
}
@@ -1439,7 +1384,7 @@ public class Schema {
entityType = normalizeEntityType( entityType );
- if ( ( elementValue instanceof String ) && ( ( String ) elementValue ).equals( "" ) ) {
+ if ( ( elementValue instanceof String ) && elementValue.equals("") ) {
elementValue = null;
}
@@ -1466,8 +1411,7 @@ public class Schema {
if ( entityClass == null ) {
entityClass = DynamicEntity.class;
}
- Entity entity = mapper.convertValue( map, entityClass );
- return entity;
+ return mapper.convertValue( map, entityClass );
}
/*
@@ -1483,8 +1427,7 @@ public class Schema {
public Map<String, Object> toMap( Entity entity ) {
- Map<String, Object> map = mapper.convertValue( entity, new TypeReference<Map<String, Object>>() {} );
- return map;
+ return mapper.convertValue( entity, new TypeReference<Map<String, Object>>() {} );
}
@@ -1724,11 +1667,8 @@ public class Schema {
}
PropertyInfo property = entity.getProperty( propertyName );
- if ( property == null ) {
- return false;
- }
+ return property != null && property.isEncrypted();
- return property.isEncrypted();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/Update.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/Update.java b/stack/core/src/main/java/org/usergrid/persistence/Update.java
index 0f5d018..07a4551 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/Update.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/Update.java
@@ -55,7 +55,7 @@ public class Update {
public static enum UpdateOperator {
- UPDATE, DELETE, ADD_TO_LIST, REMOVE_FROM_LIST;
+ UPDATE, DELETE, ADD_TO_LIST, REMOVE_FROM_LIST
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java
index 00dc4bc..0046397 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java
@@ -442,7 +442,7 @@ public class CassandraPersistenceUtils {
CFEnum[] values = null;
try {
- values = ( CFEnum[] ) invokeStaticMethod( cfEnum, "values", ( Object[] ) null );
+ values = ( CFEnum[] ) invokeStaticMethod( cfEnum, "values", null);
}
catch ( Exception e ) {
logger.error( "Couldn't get CFEnum values", e );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java
index a6b6268..c471294 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java
@@ -884,7 +884,7 @@ public class CassandraService {
* @return a timestamp
*/
public long createTimestamp() {
- return chc.getClockResolution().createClock();
+ return CassandraHostConfigurator.getClockResolution().createClock();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectionRefImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectionRefImpl.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectionRefImpl.java
index e16d780..c37d45d 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectionRefImpl.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectionRefImpl.java
@@ -328,8 +328,9 @@ public class ConnectionRefImpl implements ConnectionRef {
@Override
public UUID getUuid() {
if ( id == null ) {
+ List<ConnectedEntityRef> var = getPairedConnections();
id = getId( getConnectingEntity(), getConnectedEntity(),
- getPairedConnections().toArray( new ConnectedEntityRef[0] ) );
+ var.toArray(new ConnectedEntityRef[var.size()]));
}
return id;
}
@@ -343,13 +344,13 @@ public class ConnectionRefImpl implements ConnectionRef {
public UUID getIndexId() {
return getIndexId( getConnectingEntity(), getConnectionType(), getConnectedEntityType(),
- pairedConnections.toArray( new ConnectedEntityRef[0] ) );
+ pairedConnections.toArray(new ConnectedEntityRef[pairedConnections.size()]));
}
public UUID getConnectingIndexId() {
return getIndexId( getConnectingEntity(), getConnectionType(), null,
- pairedConnections.toArray( new ConnectedEntityRef[0] ) );
+ pairedConnections.toArray(new ConnectedEntityRef[pairedConnections.size()]));
}
@@ -362,8 +363,9 @@ public class ConnectionRefImpl implements ConnectionRef {
/** @return index ids */
public UUID[] getIndexIds() {
+ List<ConnectedEntityRef> var = getPairedConnections();
return getIndexIds( getConnectingEntity(), getConnectedEntity().getConnectionType(),
- getConnectedEntity().getType(), getPairedConnections().toArray( new ConnectedEntityRef[0] ) );
+ getConnectedEntity().getType(), var.toArray(new ConnectedEntityRef[var.size()]));
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java
index f7d4069..fda492d 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java
@@ -912,7 +912,7 @@ public class EntityManagerImpl implements EntityManager {
private void incrementEntityCollection( String collection_name, long cassandraTimestamp ) {
try {
- incrementAggregateCounters( null, null, null, new String( APPLICATION_COLLECTION + collection_name ),
+ incrementAggregateCounters( null, null, null, APPLICATION_COLLECTION + collection_name,
ONE_COUNT, cassandraTimestamp );
}
catch ( Exception e ) {
@@ -1027,9 +1027,7 @@ public class EntityManagerImpl implements EntityManager {
column_names.add( PROPERTY_TYPE );
column_names.add( PROPERTY_UUID );
- for ( String propertyName : propertyNames ) {
- column_names.add( propertyName );
- }
+ Collections.addAll(column_names, propertyNames);
results = cass.getColumns( cass.getApplicationKeyspace( applicationId ), ENTITY_PROPERTIES, key( entityId ),
column_names, se, be );
@@ -2255,14 +2253,14 @@ public class EntityManagerImpl implements EntityManager {
if ( roleNames != null ) {
nameResults = getDictionaryElementValues( getApplicationRef(), DICTIONARY_ROLENAMES,
- roleNames.toArray( new String[0] ) );
+ roleNames.toArray(new String[roleNames.size()]));
}
else {
nameResults = cast( getDictionaryAsMap( getApplicationRef(), DICTIONARY_ROLENAMES ) );
roleNames = nameResults.keySet();
}
Map<String, Object> timeResults = getDictionaryElementValues( getApplicationRef(), DICTIONARY_ROLETIMES,
- roleNames.toArray( new String[0] ) );
+ roleNames.toArray(new String[roleNames.size()]));
for ( String roleName : roleNames ) {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/cassandra/RelationManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/RelationManagerImpl.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/RelationManagerImpl.java
index 4f565c7..d56a1ed 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/RelationManagerImpl.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/RelationManagerImpl.java
@@ -2128,7 +2128,7 @@ public class RelationManagerImpl implements RelationManager {
startId = UUID_PARSER.parse( slice.getCursor() ).getUUID();
}
- boolean skipFirst = node.isForceKeepFirst() ? false : slice.hasCursor();
+ boolean skipFirst = !node.isForceKeepFirst() && slice.hasCursor();
IndexScanner indexScanner = cass.getIdList( cass.getApplicationKeyspace( applicationId ),
key( headEntity.getUuid(), DICTIONARY_COLLECTIONS, collectionName ), startId, null,
@@ -2272,7 +2272,7 @@ public class RelationManagerImpl implements RelationManager {
size++;
}
- boolean skipFirst = node.isForceKeepFirst() ? false : slice.hasCursor();
+ boolean skipFirst = !node.isForceKeepFirst() && slice.hasCursor();
UUID entityIdToUse;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/entities/JobStat.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/JobStat.java b/stack/core/src/main/java/org/usergrid/persistence/entities/JobStat.java
index 8c31a5e..06a324d 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/JobStat.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/JobStat.java
@@ -48,11 +48,6 @@ public class JobStat extends TypedEntity {
@EntityProperty(required = true, basic = true, indexed = true)
private long duration;
-
- /**
- * @param jobName
- * @param startTime
- */
public JobStat() {
}
@@ -117,7 +112,7 @@ public class JobStat extends TypedEntity {
/**
* DON'T CALL THIS, USE THE INRECMENT METHOD!
*
- * @param failCount the failCount to set
+ * @param runCount the runCount to set
*/
public void setRunCount( int runCount ) {
this.runCount = runCount;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/geo/GeoIndexSearcher.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/GeoIndexSearcher.java b/stack/core/src/main/java/org/usergrid/persistence/geo/GeoIndexSearcher.java
index 052e9ac..98629b2 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/GeoIndexSearcher.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/GeoIndexSearcher.java
@@ -238,9 +238,7 @@ public abstract class GeoIndexSearcher {
// final check - top level tiles
curGeocells.clear();
String[] items = "0123456789abcdef".split( "(?!^)" );
- for ( String item : items ) {
- curGeocells.add( item );
- }
+ Collections.addAll(curGeocells, items);
done = true;
}
else {
@@ -260,17 +258,17 @@ public abstract class GeoIndexSearcher {
// Get adjacent in one direction.
// TODO(romannurik): Watch for +/- 90 degree latitude edge case
// geocells.
- for ( int i = 0; i < sortedEdgesDistances.size(); i++ ) {
+ for (Tuple<int[], Double> sortedEdgesDistance : sortedEdgesDistances) {
- int nearestEdge[] = sortedEdgesDistances.get( i ).getFirst();
- String edge = GeocellUtils.adjacent( curGeocells.get( 0 ), nearestEdge );
+ int nearestEdge[] = sortedEdgesDistance.getFirst();
+ String edge = GeocellUtils.adjacent(curGeocells.get(0), nearestEdge);
// we're at the edge of the world, search in a different direction
- if ( edge == null ) {
+ if (edge == null) {
continue;
}
- curGeocells.add( edge );
+ curGeocells.add(edge);
break;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellUtils.java b/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellUtils.java
index 9d9df0f..5b112c9 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellUtils.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellUtils.java
@@ -443,7 +443,7 @@ public final class GeocellUtils {
// NOTE: This only works for grid size 4.
int charI = GEOCELL_ALPHABET.indexOf( char_ );
return new int[] {
- ( charI & 4 ) >> 1 | ( charI & 1 ) >> 0, ( charI & 8 ) >> 2 | ( charI & 2 ) >> 1
+ ( charI & 4 ) >> 1 | (charI & 1), ( charI & 8 ) >> 2 | ( charI & 2 ) >> 1
};
}
@@ -458,7 +458,7 @@ public final class GeocellUtils {
return GEOCELL_ALPHABET.charAt( ( pos[1] & 2 ) << 2 |
( pos[0] & 2 ) << 1 |
( pos[1] & 1 ) << 1 |
- ( pos[0] & 1 ) << 0 );
+ (pos[0] & 1));
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java
index 94fb2b3..e63529b 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java
@@ -46,11 +46,8 @@ public abstract class AbstractScanColumn implements ScanColumn {
AbstractScanColumn that = ( AbstractScanColumn ) o;
- if ( !uuid.equals( that.uuid ) ) {
- return false;
- }
+ return uuid.equals(that.uuid);
- return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/GeoIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/GeoIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/GeoIterator.java
index cf831c9..121f257 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/GeoIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/GeoIterator.java
@@ -141,15 +141,14 @@ public class GeoIterator implements ResultIterator {
lastCellsSearched = results.lastSearchedGeoCells;
- for ( int i = 0; i < locations.size(); i++ ) {
+ for (final EntityLocationRef location : locations) {
- final EntityLocationRef location = locations.get( i );
final UUID id = location.getUuid();
- final LocationScanColumn locationScan = new LocationScanColumn( location );
+ final LocationScanColumn locationScan = new LocationScanColumn(location);
- idOrder.put( id, locationScan );
- lastLoaded.add( locationScan );
+ idOrder.put(id, locationScan);
+ lastLoaded.add(locationScan);
last = location;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/query/tree/BooleanOperand.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/tree/BooleanOperand.java b/stack/core/src/main/java/org/usergrid/persistence/query/tree/BooleanOperand.java
index 9bc4cdd..8c6dc91 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/tree/BooleanOperand.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/tree/BooleanOperand.java
@@ -27,11 +27,6 @@ import org.antlr.runtime.Token;
*/
public abstract class BooleanOperand extends Operand {
-
- /**
- * @param property
- * @param literal
- */
public BooleanOperand( Token t ) {
super( t );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/query/tree/ContainsOperand.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/tree/ContainsOperand.java b/stack/core/src/main/java/org/usergrid/persistence/query/tree/ContainsOperand.java
index 1b9058e..5c03350 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/tree/ContainsOperand.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/tree/ContainsOperand.java
@@ -23,22 +23,10 @@ import org.usergrid.persistence.exceptions.PersistenceException;
/** @author tnine */
public class ContainsOperand extends EqualityOperand {
- /**
- * @param property
- * @param literal
- */
public ContainsOperand( Token t ) {
super( t );
}
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.usergrid.persistence.query.tree.Operand#visit(org.usergrid.persistence
- * .query.tree.QueryVisitor)
- */
@Override
public void visit( QueryVisitor visitor ) throws PersistenceException {
visitor.visit( this );
@@ -49,10 +37,6 @@ public class ContainsOperand extends EqualityOperand {
return ( StringLiteral ) getLiteral();
}
-
- /* (non-Javadoc)
- * @see org.usergrid.persistence.query.tree.EqualityOperand#newProperty(java.lang.String)
- */
@Override
protected Property newProperty( String name ) {
return new ContainsProperty( name );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/query/tree/EqualityOperand.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/tree/EqualityOperand.java b/stack/core/src/main/java/org/usergrid/persistence/query/tree/EqualityOperand.java
index 93e3c37..3f8a8b9 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/tree/EqualityOperand.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/tree/EqualityOperand.java
@@ -27,10 +27,6 @@ import org.antlr.runtime.Token;
*/
public abstract class EqualityOperand extends Operand {
- /**
- * @param property
- * @param literal
- */
public EqualityOperand( Token t ) {
super( t );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/schema/DictionaryInfo.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/schema/DictionaryInfo.java b/stack/core/src/main/java/org/usergrid/persistence/schema/DictionaryInfo.java
index 3d88358..56a3ffd 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/schema/DictionaryInfo.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/schema/DictionaryInfo.java
@@ -27,7 +27,6 @@ public class DictionaryInfo {
private boolean keysIndexedInConnections;
private boolean publicVisible = true;
private boolean includedInExport = true;
- ;
public DictionaryInfo() {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/schema/EntityInfo.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/schema/EntityInfo.java b/stack/core/src/main/java/org/usergrid/persistence/schema/EntityInfo.java
index 843412d..e6480d3 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/schema/EntityInfo.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/schema/EntityInfo.java
@@ -44,7 +44,6 @@ public class EntityInfo {
private boolean publicVisible = true;
private boolean includedInExport = true;
- ;
public EntityInfo() {
@@ -115,29 +114,20 @@ public class EntityInfo {
public boolean isPropertyMutable( String propertyName ) {
PropertyInfo property = properties.get( propertyName );
- if ( property == null ) {
- return false;
- }
- return property.isMutable();
+ return property != null && property.isMutable();
}
/** A property is unique if it has either been declared as unique, or as an alias property */
public boolean isPropertyUnique( String propertyName ) {
PropertyInfo property = properties.get( propertyName );
- if ( property == null ) {
- return false;
- }
- return property.isUnique() || property.isAliasProperty();
+ return property != null && (property.isUnique() || property.isAliasProperty());
}
public boolean isPropertyTimestamp( String propertyName ) {
PropertyInfo property = properties.get( propertyName );
- if ( property == null ) {
- return false;
- }
- return property.isTimestamp();
+ return property != null && property.isTimestamp();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerTestSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerTestSuite.java b/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerTestSuite.java
index 0555830..7562a11 100644
--- a/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerTestSuite.java
+++ b/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerTestSuite.java
@@ -13,7 +13,7 @@ import org.usergrid.cassandra.ConcurrentSuite;
@RunWith(ConcurrentSuite.class)
@Suite.SuiteClasses(
{
- AppArgsTest.class, UsergridJobFactoryTest.class, BulkJobExecutionUnitTest.class,
+ AppArgsTest.class, UsergridJobFactoryTest.class, BulkJobExecutionUnitTest.class
})
@Concurrent()
public class ConcurrentSchedulerTestSuite {}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/test/java/org/usergrid/batch/SchedulerTestSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/SchedulerTestSuite.java b/stack/core/src/test/java/org/usergrid/batch/SchedulerTestSuite.java
index ca73689..7eeef42 100644
--- a/stack/core/src/test/java/org/usergrid/batch/SchedulerTestSuite.java
+++ b/stack/core/src/test/java/org/usergrid/batch/SchedulerTestSuite.java
@@ -12,7 +12,7 @@ import org.usergrid.cassandra.Concurrent;
@RunWith(Suite.class)
@Suite.SuiteClasses(
{
- AppArgsTest.class, UsergridJobFactoryTest.class, BulkJobExecutionUnitTest.class,
+ AppArgsTest.class, UsergridJobFactoryTest.class, BulkJobExecutionUnitTest.class
})
@Concurrent()
public class SchedulerTestSuite {}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/test/java/org/usergrid/batch/job/AbstractSchedulerRuntimeIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/AbstractSchedulerRuntimeIT.java b/stack/core/src/test/java/org/usergrid/batch/job/AbstractSchedulerRuntimeIT.java
index ca81d01..5bc9d51 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/AbstractSchedulerRuntimeIT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/AbstractSchedulerRuntimeIT.java
@@ -45,7 +45,7 @@ public class AbstractSchedulerRuntimeIT {
private int count = DEFAULT_COUNT;
protected SchedulerService scheduler;
protected Properties props;
- protected long waitTime = listener.WAIT_MAX_MILLIS;
+ protected long waitTime = TestJobListener.WAIT_MAX_MILLIS;
@Before
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/test/java/org/usergrid/count/BatchCountParallelismTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/count/BatchCountParallelismTest.java b/stack/core/src/test/java/org/usergrid/count/BatchCountParallelismTest.java
index a728ddb..f273860 100644
--- a/stack/core/src/test/java/org/usergrid/count/BatchCountParallelismTest.java
+++ b/stack/core/src/test/java/org/usergrid/count/BatchCountParallelismTest.java
@@ -65,7 +65,7 @@ public class BatchCountParallelismTest {
}
LOG.info( "Task iteration # {} : ", c );
cdl.countDown();
- return new Boolean( true );
+ return true;
}
} ) );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZooPut.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZooPut.java b/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZooPut.java
index 70d5ac7..49e0e31 100644
--- a/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZooPut.java
+++ b/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZooPut.java
@@ -86,7 +86,7 @@ public class ZooPut implements Watcher {
StringBuilder sbPath = new StringBuilder();
for ( int i = 0; i < paths.length; i++ ) {
String pathPiece = paths[i];
- sbPath.append( "/" + pathPiece );
+ sbPath.append("/").append(pathPiece);
String currentPath = sbPath.toString();
Object exists = keeper.exists( currentPath, null );
if ( exists == null ) {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/test/java/org/usergrid/persistence/EntityManagerIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/EntityManagerIT.java b/stack/core/src/test/java/org/usergrid/persistence/EntityManagerIT.java
index 21b1a5e..c71c90e 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/EntityManagerIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/EntityManagerIT.java
@@ -244,9 +244,9 @@ public class EntityManagerIT extends AbstractCoreIT {
assertNotNull( "properties should not be null", props );
assertEquals( "wrong number of properties", 8, props.size() );
- assertEquals( "wrong value for property alpha", new Long( 1 ), props.get( "alpha" ) );
- assertEquals( "wrong value for property beta", new Long( 2 ), props.get( "beta" ) );
- assertEquals( "wrong value for property gamma", new Long( 3 ), props.get( "gamma" ) );
+ assertEquals( "wrong value for property alpha", (long) 1, props.get( "alpha" ) );
+ assertEquals( "wrong value for property beta", (long) 2, props.get( "beta" ) );
+ assertEquals( "wrong value for property gamma", (long) 3, props.get( "gamma" ) );
for ( Entry<String, Object> entry : props.entrySet() ) {
LOG.info( entry.getKey() + " : " + entry.getValue() );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/launcher/src/main/java/org/usergrid/launcher/ClasspathStaticHttpHandler.java
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/java/org/usergrid/launcher/ClasspathStaticHttpHandler.java b/stack/launcher/src/main/java/org/usergrid/launcher/ClasspathStaticHttpHandler.java
index 83099f5..8bdfc87 100644
--- a/stack/launcher/src/main/java/org/usergrid/launcher/ClasspathStaticHttpHandler.java
+++ b/stack/launcher/src/main/java/org/usergrid/launcher/ClasspathStaticHttpHandler.java
@@ -62,6 +62,8 @@ package org.usergrid.launcher;
*/
+import org.springframework.core.io.Resource;
+
/**
* Modified version of the StaticHttpHandler to serve resources from the classpath.
* <p/>
@@ -246,13 +248,12 @@ public class ClasspathStaticHttpHandler extends org.glassfish.grizzly.http.serve
org.springframework.core.io.Resource resource = null;
- for ( int i = 0; i < fileFolders.length; i++ ) {
- final org.springframework.core.io.Resource webDir = fileFolders[i];
+ for (final Resource webDir : fileFolders) {
// local file
- resource = webDir.createRelative( uri );
+ resource = webDir.createRelative(uri);
final boolean exists = resource.exists();
- if ( exists ) {
+ if (exists) {
found = true;
break;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/launcher/src/main/java/org/usergrid/launcher/CustomJSPTemplateProcessor.java
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/java/org/usergrid/launcher/CustomJSPTemplateProcessor.java b/stack/launcher/src/main/java/org/usergrid/launcher/CustomJSPTemplateProcessor.java
index 2704efb..a29591b 100644
--- a/stack/launcher/src/main/java/org/usergrid/launcher/CustomJSPTemplateProcessor.java
+++ b/stack/launcher/src/main/java/org/usergrid/launcher/CustomJSPTemplateProcessor.java
@@ -86,7 +86,7 @@ public class CustomJSPTemplateProcessor implements com.sun.jersey.spi.template.V
return null;
}
- if ( basePath != "" ) {
+ if (!basePath.equals("")) {
path = basePath + path;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/launcher/src/main/java/org/usergrid/launcher/Server.java
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/java/org/usergrid/launcher/Server.java b/stack/launcher/src/main/java/org/usergrid/launcher/Server.java
index 14d2de2..f2eadca 100644
--- a/stack/launcher/src/main/java/org/usergrid/launcher/Server.java
+++ b/stack/launcher/src/main/java/org/usergrid/launcher/Server.java
@@ -100,6 +100,7 @@ public class Server implements org.springframework.context.ApplicationContextAwa
}
+ @SuppressWarnings("InfiniteLoopStatement")
public synchronized void startServer() {
if ( startDatabaseWithServer ) {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpQuery.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpQuery.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpQuery.java
index 5449c0e..3374c2b 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpQuery.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpQuery.java
@@ -70,7 +70,7 @@ public class OpQuery extends OpCrud {
static Set<String> operators = new HashSet<String>();
- {
+ static {
operators.add( "all" );
operators.add( "and" );
operators.add( "elemMatch" );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/mongo-emulator/src/main/java/org/usergrid/mongo/query/MongoQueryParser.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/query/MongoQueryParser.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/query/MongoQueryParser.java
index f5feaf0..89bd8cc 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/query/MongoQueryParser.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/query/MongoQueryParser.java
@@ -155,8 +155,8 @@ public class MongoQueryParser {
Stack<Operand> expressions = new Stack<Operand>();
- for ( int i = 0; i < size; i++ ) {
- expressions.push( eval( ( BSONObject ) values.get( i ) ) );
+ for (Object value : values) {
+ expressions.push(eval((BSONObject) value));
}
// we need to build a tree of expressions
@@ -178,8 +178,8 @@ public class MongoQueryParser {
Stack<Operand> expressions = new Stack<Operand>();
- for ( int i = 0; i < size; i++ ) {
- expressions.push( eval( ( BSONObject ) values.get( i ) ) );
+ for (Object value : values) {
+ expressions.push(eval((BSONObject) value));
}
while ( expressions.size() > 1 ) {
@@ -265,12 +265,12 @@ public class MongoQueryParser {
Stack<Operand> expressions = new Stack<Operand>();
- for ( int i = 0; i < size; i++ ) {
+ for (Object value1 : values) {
Equal equal = new Equal();
- equal.setProperty( sourceField );
- equal.setLiteral( values.get( i ) );
+ equal.setProperty(sourceField);
+ equal.setLiteral(value1);
- expressions.push( equal );
+ expressions.push(equal);
}
// we need to build a tree of expressions
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 2ec4757..d9f9f70 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -1760,7 +1760,7 @@
<version>1.6.0</version>
</requireJavaVersion>
<requireMavenVersion>
- <version>[3.0,3.1)</version>
+ <version>[3.0,3.1.1]</version>
</requireMavenVersion>
</rules>
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/main/java/org/usergrid/rest/RootResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/RootResource.java b/stack/rest/src/main/java/org/usergrid/rest/RootResource.java
index 0719190..bee1f27 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/RootResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/RootResource.java
@@ -42,6 +42,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
+import org.usergrid.persistence.Identifier;
import org.usergrid.rest.applications.ApplicationResource;
import org.usergrid.rest.exceptions.NoOpException;
import org.usergrid.rest.organizations.OrganizationResource;
@@ -237,24 +238,28 @@ public class RootResource extends AbstractContextResource implements MetricProce
}
- @Path("applications/{applicationId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}")
+ @Path("applications/"+APPLICATION_ID_PATH)
public ApplicationResource getApplicationById2( @PathParam("applicationId") String applicationId )
throws Exception {
return getApplicationById( applicationId );
}
- @Path("apps/{applicationId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}")
+ @Path("apps/"+APPLICATION_ID_PATH)
public ApplicationResource getApplicationById3( @PathParam("applicationId") String applicationId )
throws Exception {
return getApplicationById( applicationId );
}
+ public static final String APPLICATION_ID_PATH = "{applicationId: " + Identifier.UUID_REX + "}";
+ public static final String ORGANIZATION_ID_PATH = "{organizationId: " + Identifier.UUID_REX + "}";
+ public static final String USER_ID_PATH = "{userId: " + Identifier.UUID_REX + "}";
+ public static final String ENTITY_ID_PATH = "{entityId: " + Identifier.UUID_REX + "}";
+ public static final String EMAIL_PATH = "{email: " + Identifier.EMAIL_REX + "}";
@Timed(name = "getApplicationByUuids_timer", group = "rest_timers")
@ExceptionMetered(group = "rest_exceptions", name = "getApplicationByUuids_exceptions")
- @Path("{organizationId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12"
- + "}}/{applicationId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}")
+ @Path(ORGANIZATION_ID_PATH+"/"+APPLICATION_ID_PATH)
public ApplicationResource getApplicationByUuids( @PathParam("organizationId") String organizationIdStr,
@PathParam("applicationId") String applicationIdStr )
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/main/java/org/usergrid/rest/applications/ApplicationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/ApplicationResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/ApplicationResource.java
index 0278623..453538a 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/ApplicationResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/ApplicationResource.java
@@ -597,7 +597,7 @@ public class ApplicationResource extends ServiceResource {
public JSONWithPadding getAPMConfig( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- EntityManager em = ( EntityManager ) emf.getEntityManager( applicationId );
+ EntityManager em = emf.getEntityManager( applicationId );
Object value = em.getProperty( new SimpleEntityRef( Application.ENTITY_TYPE, applicationId ),
APIGEE_MOBILE_APM_CONFIG_JSON_KEY );
//If there is no apm configuration then try to create apm config on the fly
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java
index eeb5704..33ab281 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java
@@ -52,6 +52,7 @@ import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.Query;
import org.usergrid.rest.AbstractContextResource;
import org.usergrid.rest.ApiResponse;
+import org.usergrid.rest.RootResource;
import org.usergrid.rest.applications.assets.AssetsResource;
import org.usergrid.rest.security.annotations.RequireApplicationAccess;
import org.usergrid.security.oauth.AccessInfo;
@@ -194,7 +195,7 @@ public class ServiceResource extends AbstractContextResource {
}
- @Path("{entityId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}")
+ @Path(RootResource.ENTITY_ID_PATH)
public AbstractContextResource addIdParameter( @Context UriInfo ui, @PathParam("entityId") PathSegment entityId )
throws Exception {
@@ -242,8 +243,8 @@ public class ServiceResource extends AbstractContextResource {
boolean tree = "true".equalsIgnoreCase( ui.getQueryParameters().getFirst( "tree" ) );
boolean collectionGet = false;
if ( action == ServiceAction.GET ) {
- collectionGet = ( getServiceParameters().size() == 1 && InflectionUtils
- .isPlural( getServiceParameters().get( 0 ) ) ) ? true : false;
+ collectionGet = (getServiceParameters().size() == 1 && InflectionUtils
+ .isPlural(getServiceParameters().get(0)));
}
addQueryParams( getServiceParameters(), ui );
ServiceRequest r = services.newRequest( action, tree, getServiceParameters(), payload );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/main/java/org/usergrid/rest/applications/users/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/users/UsersResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/users/UsersResource.java
index 877f7fd..4a36c97 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/users/UsersResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/users/UsersResource.java
@@ -45,6 +45,7 @@ import org.usergrid.persistence.Query;
import org.usergrid.persistence.entities.User;
import org.usergrid.rest.AbstractContextResource;
import org.usergrid.rest.ApiResponse;
+import org.usergrid.rest.RootResource;
import org.usergrid.rest.applications.ServiceResource;
import org.usergrid.rest.exceptions.RedirectionException;
import org.usergrid.rest.security.annotations.RequireApplicationAccess;
@@ -77,7 +78,7 @@ public class UsersResource extends ServiceResource {
@Override
- @Path("{entityId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}")
+ @Path(RootResource.ENTITY_ID_PATH)
public AbstractContextResource addIdParameter( @Context UriInfo ui, @PathParam("entityId") PathSegment entityId )
throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationsResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationsResource.java
index adce2ab..519d150 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationsResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationsResource.java
@@ -42,6 +42,7 @@ import org.usergrid.management.OrganizationOwnerInfo;
import org.usergrid.management.exceptions.ManagementException;
import org.usergrid.rest.AbstractContextResource;
import org.usergrid.rest.ApiResponse;
+import org.usergrid.rest.RootResource;
import org.usergrid.rest.security.annotations.RequireOrganizationAccess;
import org.apache.commons.lang.StringUtils;
@@ -70,7 +71,7 @@ public class OrganizationsResource extends AbstractContextResource {
}
- @Path( "{organizationId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}" )
+ @Path(RootResource.ORGANIZATION_ID_PATH)
@RequireOrganizationAccess
public OrganizationResource getOrganizationById( @Context UriInfo ui,
@PathParam( "organizationId" ) String organizationIdStr )
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationsResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationsResource.java
index 9a3b248..40edbb9 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationsResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationsResource.java
@@ -42,6 +42,7 @@ import org.usergrid.management.OrganizationInfo;
import org.usergrid.persistence.exceptions.EntityNotFoundException;
import org.usergrid.rest.AbstractContextResource;
import org.usergrid.rest.ApiResponse;
+import org.usergrid.rest.RootResource;
import org.usergrid.rest.security.annotations.RequireOrganizationAccess;
import com.google.common.base.Preconditions;
@@ -127,7 +128,7 @@ public class ApplicationsResource extends AbstractContextResource {
@RequireOrganizationAccess
- @Path( "{applicationId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}" )
+ @Path(RootResource.APPLICATION_ID_PATH)
public ApplicationResource applicationFromOrganizationByApplicationId( @Context UriInfo ui,
@PathParam( "applicationId" )
String applicationIdStr ) throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/main/java/org/usergrid/rest/management/organizations/users/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/users/UsersResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/users/UsersResource.java
index 57ac7ff..f7c09ea 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/users/UsersResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/users/UsersResource.java
@@ -45,6 +45,7 @@ import org.usergrid.management.UserInfo;
import org.usergrid.management.exceptions.ManagementException;
import org.usergrid.rest.AbstractContextResource;
import org.usergrid.rest.ApiResponse;
+import org.usergrid.rest.RootResource;
import org.usergrid.rest.security.annotations.RequireOrganizationAccess;
import org.usergrid.security.shiro.utils.SubjectUtils;
@@ -174,7 +175,7 @@ public class UsersResource extends AbstractContextResource {
@RequireOrganizationAccess
@PUT
- @Path("{userId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}")
+ @Path(RootResource.USER_ID_PATH)
public JSONWithPadding addUserToOrganization( @Context UriInfo ui, @PathParam("userId") String userIdStr,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -199,7 +200,7 @@ public class UsersResource extends AbstractContextResource {
@RequireOrganizationAccess
@PUT
- @Path("{email: [A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,4}}")
+ @Path(RootResource.EMAIL_PATH)
public JSONWithPadding addUserToOrganizationByEmail( @Context UriInfo ui, @PathParam("email") String email,
@QueryParam("callback") @DefaultValue("callback")
String callback ) throws Exception {
@@ -257,7 +258,7 @@ public class UsersResource extends AbstractContextResource {
@RequireOrganizationAccess
@DELETE
- @Path("{userId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}")
+ @Path(RootResource.USER_ID_PATH)
public JSONWithPadding removeUserFromOrganizationByUserId( @Context UriInfo ui,
@PathParam("userId") String userIdStr,
@QueryParam("callback") @DefaultValue("callback")
@@ -317,7 +318,7 @@ public class UsersResource extends AbstractContextResource {
@RequireOrganizationAccess
@DELETE
- @Path("{email: [A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,4}}")
+ @Path(RootResource.EMAIL_PATH)
public JSONWithPadding removeUserFromOrganizationByEmail( @Context UriInfo ui, @PathParam("email") String email,
@QueryParam("callback") @DefaultValue("callback")
String callback ) throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/main/java/org/usergrid/rest/management/users/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/users/UsersResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/users/UsersResource.java
index 5e345e6..fe04134 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/users/UsersResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/users/UsersResource.java
@@ -39,6 +39,7 @@ import org.springframework.stereotype.Component;
import org.usergrid.management.UserInfo;
import org.usergrid.rest.AbstractContextResource;
import org.usergrid.rest.ApiResponse;
+import org.usergrid.rest.RootResource;
import org.usergrid.rest.exceptions.AuthErrorInfo;
import org.usergrid.rest.exceptions.RedirectionException;
import org.usergrid.security.shiro.utils.SubjectUtils;
@@ -71,7 +72,7 @@ public class UsersResource extends AbstractContextResource {
}
- @Path( "{userId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}" )
+ @Path(RootResource.USER_ID_PATH)
public UserResource getUserById( @Context UriInfo ui, @PathParam( "userId" ) String userIdStr ) throws Exception {
return getSubResource( UserResource.class )
@@ -95,7 +96,7 @@ public class UsersResource extends AbstractContextResource {
}
- @Path( "{email: [a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,4}}" )
+ @Path(RootResource.EMAIL_PATH)
public UserResource getUserByEmail( @Context UriInfo ui, @PathParam( "email" ) String email ) throws Exception {
return getSubResource( UserResource.class ).init( management.getAdminUserByEmail( email ) );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/main/java/org/usergrid/rest/management/users/organizations/OrganizationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/users/organizations/OrganizationsResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/users/organizations/OrganizationsResource.java
index b969c2b..2f40f67 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/users/organizations/OrganizationsResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/users/organizations/OrganizationsResource.java
@@ -41,6 +41,7 @@ import org.usergrid.management.UserInfo;
import org.usergrid.management.exceptions.ManagementException;
import org.usergrid.rest.AbstractContextResource;
import org.usergrid.rest.ApiResponse;
+import org.usergrid.rest.RootResource;
import org.usergrid.rest.security.annotations.RequireAdminUserAccess;
import org.usergrid.rest.security.annotations.RequireOrganizationAccess;
import org.usergrid.security.shiro.utils.SubjectUtils;
@@ -151,7 +152,7 @@ public class OrganizationsResource extends AbstractContextResource {
@RequireOrganizationAccess
@PUT
- @Path( "{organizationId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}" )
+ @Path(RootResource.ORGANIZATION_ID_PATH)
public JSONWithPadding addUserToOrganizationByOrganizationId( @Context UriInfo ui, @PathParam( "organizationId" )
String organizationIdStr, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception {
@@ -167,7 +168,7 @@ public class OrganizationsResource extends AbstractContextResource {
@RequireOrganizationAccess
@DELETE
- @Path( "{organizationId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}" )
+ @Path( RootResource.ORGANIZATION_ID_PATH )
public JSONWithPadding removeUserFromOrganizationByOrganizationId( @Context UriInfo ui,
@PathParam( "organizationId" )
String organizationIdStr,
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/main/java/org/usergrid/rest/organizations/OrganizationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/organizations/OrganizationResource.java b/stack/rest/src/main/java/org/usergrid/rest/organizations/OrganizationResource.java
index d26581d..deda09a 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/organizations/OrganizationResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/organizations/OrganizationResource.java
@@ -18,6 +18,7 @@ import org.springframework.stereotype.Component;
import org.usergrid.exception.NotImplementedException;
import org.usergrid.management.OrganizationInfo;
import org.usergrid.rest.AbstractContextResource;
+import org.usergrid.rest.RootResource;
import org.usergrid.rest.applications.ApplicationResource;
import org.usergrid.rest.exceptions.NoOpException;
import org.usergrid.rest.exceptions.OrganizationApplicationNotFoundException;
@@ -64,7 +65,7 @@ public class OrganizationResource extends AbstractContextResource {
}
- @Path("{applicationId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}")
+ @Path(RootResource.APPLICATION_ID_PATH)
public ApplicationResource getApplicationById( @PathParam("applicationId") String applicationIdStr )
throws Exception {
@@ -82,7 +83,7 @@ public class OrganizationResource extends AbstractContextResource {
if ( org_info != null ) {
organizationId = org_info.getUuid();
}
- if ( applicationId == null || organizationId == null ) {
+ if (organizationId == null) {
return null;
}
BiMap<UUID, String> apps = management.getApplicationsForOrganization( organizationId );
@@ -94,14 +95,14 @@ public class OrganizationResource extends AbstractContextResource {
}
- @Path("applications/{applicationId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}")
+ @Path("applications/"+RootResource.APPLICATION_ID_PATH)
public ApplicationResource getApplicationById2( @PathParam("applicationId") String applicationId )
throws Exception {
return getApplicationById( applicationId );
}
- @Path("apps/{applicationId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}")
+ @Path("apps/"+RootResource.APPLICATION_ID_PATH)
public ApplicationResource getApplicationById3( @PathParam("applicationId") String applicationId )
throws Exception {
return getApplicationById( applicationId );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/main/java/org/usergrid/rest/utils/JSONPUtils.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/utils/JSONPUtils.java b/stack/rest/src/main/java/org/usergrid/rest/utils/JSONPUtils.java
index 2b962bb..06a6532 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/utils/JSONPUtils.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/utils/JSONPUtils.java
@@ -53,11 +53,8 @@ public class JSONPUtils {
}
Set<String> subtypes = javascriptTypes.get( m.getType() );
- if ( subtypes == null ) {
- return false;
- }
+ return subtypes != null && subtypes.contains(m.getSubtype());
- return subtypes.contains( m.getSubtype() );
}
@@ -83,8 +80,7 @@ public class JSONPUtils {
public static String wrapJSONPResponse( MediaType m, String callback, String jsonResponse ) {
if ( isJavascript( m ) && isNotBlank( callback ) ) {
- String jsResponse = callback + "(" + jsonResponse + ")";
- return jsResponse;
+ return callback + "(" + jsonResponse + ")";
}
else {
return jsonResponse;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/main/java/org/usergrid/rest/utils/PathingUtils.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/utils/PathingUtils.java b/stack/rest/src/main/java/org/usergrid/rest/utils/PathingUtils.java
index 3ae9004..ee3ea60 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/utils/PathingUtils.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/utils/PathingUtils.java
@@ -24,7 +24,7 @@ public class PathingUtils {
* @return a new string in the format "organizationName/applicationName"
*/
public static String assembleAppName( String organizationName, String applicationName ) {
- return new String( organizationName.toLowerCase() + SLASH + applicationName.toLowerCase() );
+ return organizationName.toLowerCase() + SLASH + applicationName.toLowerCase();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/AndOrQueryTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/AndOrQueryTest.java b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/AndOrQueryTest.java
index 1dece05..60dc437 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/AndOrQueryTest.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/AndOrQueryTest.java
@@ -109,13 +109,12 @@ public class AndOrQueryTest extends AbstractRestIT {
int numValuesTested = 20;
- JsonNode[] correctValues = new JsonNode[numValuesTested];
props.put( "actor", actor );
props.put( "verb", "go" );
props.put( "content", "bragh" );
- correctValues = activities.createEntitiesWithOrdinal( props, numValuesTested );
+ JsonNode[] correctValues = activities.createEntitiesWithOrdinal( props, numValuesTested );
String inCorrectQuery = "select * where verb = 'go' and ordinal >= 10 ";
@@ -129,9 +128,7 @@ public class AndOrQueryTest extends AbstractRestIT {
CustomCollection madeupStuff = context.collection( "imagination" );
Map character = hashMap( "WhoHelpedYou", "Ruff" );
- JsonNode[] correctValues = new JsonNode[1000];
-
-
+ JsonNode[] correctValues;
correctValues = madeupStuff.createEntitiesWithOrdinal( character, 1000 );
String inquisitiveQuery =
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong2IT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong2IT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong2IT.java
index 154a581..fb64ee2 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong2IT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong2IT.java
@@ -58,15 +58,15 @@ public class QueueResourceLong2IT extends AbstractQueueResourceIT {
List<String> originalMessageIds = transHandler.getMessageIds();
BiMap<String, String> transactionInfo = transHandler.getTransactionToMessageId();
- for ( int i = 0; i < originalMessageIds.size(); i++ ) {
+ for (String originalMessageId : originalMessageIds) {
// check the messages come back in the same order, they should
- assertEquals( originalMessageIds.get( i ), originalMessageIds.get( i ) );
+ assertEquals(originalMessageId, originalMessageId);
- assertNotNull( transactionInfo.get( originalMessageIds.get( i ) ) );
+ assertNotNull(transactionInfo.get(originalMessageId));
// ack the transaction we were returned
Transaction transaction =
- queue.transactions().transaction( transactionInfo.get( originalMessageIds.get( i ) ) );
+ queue.transactions().transaction(transactionInfo.get(originalMessageId));
transaction.delete();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/test/java/org/usergrid/rest/applications/users/ConnectionResourceTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/ConnectionResourceTest.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/ConnectionResourceTest.java
index ab29ea8..6923cff 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/ConnectionResourceTest.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/ConnectionResourceTest.java
@@ -85,7 +85,6 @@ public class ConnectionResourceTest extends AbstractRestIT {
}
catch ( UniformInterfaceException uie ) {
assertEquals( 404, uie.getResponse().getClientResponseStatus().getStatusCode() );
- return;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/test/java/org/usergrid/rest/management/RegistrationIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/management/RegistrationIT.java b/stack/rest/src/test/java/org/usergrid/rest/management/RegistrationIT.java
index 66dd62e..a5fb6e8 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/management/RegistrationIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/management/RegistrationIT.java
@@ -342,9 +342,9 @@ public class RegistrationIT extends AbstractRestIT {
for ( Message m : msgs ) {
logger.info( "Subject: " + m.getSubject() );
logger.info(
- "Body content 0 " + ( String ) ( ( MimeMultipart ) m.getContent() ).getBodyPart( 0 ).getContent() );
+ "Body content 0 " + ( ( MimeMultipart ) m.getContent() ).getBodyPart( 0 ).getContent());
logger.info(
- "Body content 1 " + ( String ) ( ( MimeMultipart ) m.getContent() ).getBodyPart( 1 ).getContent() );
+ "Body content 1 " + ( ( MimeMultipart ) m.getContent() ).getBodyPart( 1 ).getContent());
}
return msgs;
}
[05/23] organize imports only
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/test-utils/src/main/java/org/usergrid/cassandra/AvailablePortFinder.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/usergrid/cassandra/AvailablePortFinder.java b/stack/test-utils/src/main/java/org/usergrid/cassandra/AvailablePortFinder.java
index 54c35a5..b0ab346 100644
--- a/stack/test-utils/src/main/java/org/usergrid/cassandra/AvailablePortFinder.java
+++ b/stack/test-utils/src/main/java/org/usergrid/cassandra/AvailablePortFinder.java
@@ -20,6 +20,9 @@
package org.usergrid.cassandra;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.IOException;
import java.net.DatagramSocket;
import java.net.InetAddress;
@@ -29,9 +32,6 @@ import java.util.NoSuchElementException;
import java.util.Set;
import java.util.TreeSet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* Finds currently available server ports.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/test-utils/src/main/java/org/usergrid/cassandra/CassandraResource.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/usergrid/cassandra/CassandraResource.java b/stack/test-utils/src/main/java/org/usergrid/cassandra/CassandraResource.java
index ec31d90..9848d97 100644
--- a/stack/test-utils/src/main/java/org/usergrid/cassandra/CassandraResource.java
+++ b/stack/test-utils/src/main/java/org/usergrid/cassandra/CassandraResource.java
@@ -1,13 +1,10 @@
package org.usergrid.cassandra;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Map;
-import java.util.Properties;
-
+import org.apache.cassandra.service.CassandraDaemon;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang.math.RandomUtils;
import org.junit.rules.ExternalResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -15,10 +12,12 @@ import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.yaml.snakeyaml.Yaml;
-import org.apache.cassandra.service.CassandraDaemon;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.RandomStringUtils;
-import org.apache.commons.lang.math.RandomUtils;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Map;
+import java.util.Properties;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/test-utils/src/main/java/org/usergrid/cassandra/ClearShiroSubject.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/usergrid/cassandra/ClearShiroSubject.java b/stack/test-utils/src/main/java/org/usergrid/cassandra/ClearShiroSubject.java
index 10874e9..abe0e31 100644
--- a/stack/test-utils/src/main/java/org/usergrid/cassandra/ClearShiroSubject.java
+++ b/stack/test-utils/src/main/java/org/usergrid/cassandra/ClearShiroSubject.java
@@ -1,13 +1,12 @@
package org.usergrid.cassandra;
-import org.junit.rules.ExternalResource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.apache.shiro.subject.support.SubjectThreadState;
+import org.junit.rules.ExternalResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/** A {@link org.junit.rules.TestRule} that cleans up the Shiro Subject's ThreadState. */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentJunitRunner.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentJunitRunner.java b/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentJunitRunner.java
index 09fd8ec..1a72fe0 100644
--- a/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentJunitRunner.java
+++ b/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentJunitRunner.java
@@ -1,20 +1,15 @@
package org.usergrid.cassandra;
-import java.util.LinkedList;
-import java.util.Queue;
-import java.util.concurrent.CompletionService;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.atomic.AtomicInteger;
-
import org.junit.runners.BlockJUnit4ClassRunner;
import org.junit.runners.model.InitializationError;
import org.junit.runners.model.RunnerScheduler;
+import java.util.LinkedList;
+import java.util.Queue;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
/** @author Mathieu Carbou (mathieu.carbou@gmail.com) */
public class ConcurrentJunitRunner extends BlockJUnit4ClassRunner {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentSuite.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentSuite.java b/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentSuite.java
index 9bbadd4..e3f9192 100644
--- a/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentSuite.java
+++ b/stack/test-utils/src/main/java/org/usergrid/cassandra/ConcurrentSuite.java
@@ -1,18 +1,6 @@
package org.usergrid.cassandra;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Queue;
-import java.util.concurrent.CompletionService;
-import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.atomic.AtomicInteger;
-
import org.junit.internal.builders.AllDefaultPossibilitiesBuilder;
import org.junit.runner.Runner;
import org.junit.runners.Suite;
@@ -20,6 +8,13 @@ import org.junit.runners.model.InitializationError;
import org.junit.runners.model.RunnerBuilder;
import org.junit.runners.model.RunnerScheduler;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
/** @author Mathieu Carbou (mathieu.carbou@gmail.com) */
public final class ConcurrentSuite extends Suite {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/test-utils/src/test/java/org/usergrid/cassandra/CassandraResourceTest.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/test/java/org/usergrid/cassandra/CassandraResourceTest.java b/stack/test-utils/src/test/java/org/usergrid/cassandra/CassandraResourceTest.java
index bd51c8d..db2b406 100644
--- a/stack/test-utils/src/test/java/org/usergrid/cassandra/CassandraResourceTest.java
+++ b/stack/test-utils/src/test/java/org/usergrid/cassandra/CassandraResourceTest.java
@@ -1,12 +1,12 @@
package org.usergrid.cassandra;
-import java.io.File;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+
import static junit.framework.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/ApiDoc.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/ApiDoc.java b/stack/tools/src/main/java/org/usergrid/tools/ApiDoc.java
index ef110ff..a35c3ed 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/ApiDoc.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/ApiDoc.java
@@ -16,17 +16,11 @@
package org.usergrid.tools;
-import java.io.File;
-import java.io.IOException;
-import java.util.Map;
-
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
+import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Schema;
@@ -38,11 +32,15 @@ import org.w3c.dom.Document;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-import org.apache.commons.io.FileUtils;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
import static org.usergrid.utils.StringUtils.readClasspathFileAsString;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/AppAudit.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/AppAudit.java b/stack/tools/src/main/java/org/usergrid/tools/AppAudit.java
index 97ad9e1..0973452 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/AppAudit.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/AppAudit.java
@@ -16,36 +16,21 @@
package org.usergrid.tools;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.management.ApplicationInfo;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.SimpleEntityRef;
-import org.usergrid.persistence.cassandra.CassandraService;
-
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.management.ApplicationInfo;
+import org.usergrid.persistence.*;
+import org.usergrid.persistence.cassandra.CassandraService;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import java.util.*;
+import java.util.Map.Entry;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/AppNameFix.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/AppNameFix.java b/stack/tools/src/main/java/org/usergrid/tools/AppNameFix.java
index d6286ae..f7de2dd 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/AppNameFix.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/AppNameFix.java
@@ -16,19 +16,18 @@
package org.usergrid.tools;
-import java.util.Map.Entry;
-import java.util.UUID;
-
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.persistence.entities.Application;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
+import java.util.Map.Entry;
+import java.util.UUID;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/Cli.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/Cli.java b/stack/tools/src/main/java/org/usergrid/tools/Cli.java
index ce55621..3e59f70 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/Cli.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/Cli.java
@@ -16,33 +16,27 @@
package org.usergrid.tools;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
import org.codehaus.jackson.JsonFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.exceptions.QueryParseException;
-import org.usergrid.services.ServiceAction;
-import org.usergrid.services.ServiceManager;
-import org.usergrid.services.ServiceParameter;
-import org.usergrid.services.ServicePayload;
-import org.usergrid.services.ServiceRequest;
-import org.usergrid.services.ServiceResults;
+import org.usergrid.services.*;
import org.usergrid.utils.HttpUtils;
import org.usergrid.utils.JsonUtils;
import org.usergrid.utils.UUIDUtils;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
import static org.usergrid.persistence.cassandra.CassandraService.DEFAULT_APPLICATION_ID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/Command.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/Command.java b/stack/tools/src/main/java/org/usergrid/tools/Command.java
index e674dea..40b90d7 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/Command.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/Command.java
@@ -16,12 +16,11 @@
package org.usergrid.tools;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-
+import org.apache.commons.beanutils.MethodUtils;
import org.springframework.util.StringUtils;
-import org.apache.commons.beanutils.MethodUtils;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
public class Command {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/CredExport.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/CredExport.java b/stack/tools/src/main/java/org/usergrid/tools/CredExport.java
index c022b94..bb5699f 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/CredExport.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/CredExport.java
@@ -16,16 +16,15 @@
package org.usergrid.tools;
-import java.util.UUID;
-
-import org.usergrid.management.ApplicationInfo;
-import org.usergrid.management.OrganizationInfo;
-import org.usergrid.utils.UUIDUtils;
-
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
+import org.usergrid.management.ApplicationInfo;
+import org.usergrid.management.OrganizationInfo;
+import org.usergrid.utils.UUIDUtils;
+
+import java.util.UUID;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/DupAdminRepair.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/DupAdminRepair.java b/stack/tools/src/main/java/org/usergrid/tools/DupAdminRepair.java
index d08d1ed..8ae1c6e 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/DupAdminRepair.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/DupAdminRepair.java
@@ -16,36 +16,25 @@
package org.usergrid.tools;
-import java.io.FileWriter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.OrganizationInfo;
import org.usergrid.management.UserInfo;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.SimpleEntityRef;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.persistence.entities.Application;
import org.usergrid.persistence.entities.User;
import org.usergrid.persistence.exceptions.DuplicateUniquePropertyExistsException;
import org.usergrid.utils.JsonUtils;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
+import java.io.FileWriter;
+import java.util.*;
import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/DupOrgRepair.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/DupOrgRepair.java b/stack/tools/src/main/java/org/usergrid/tools/DupOrgRepair.java
index d5bf2f2..2fee736 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/DupOrgRepair.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/DupOrgRepair.java
@@ -16,32 +16,26 @@
package org.usergrid.tools;
-import java.io.FileWriter;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.UUID;
-
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.OrganizationInfo;
import org.usergrid.management.UserInfo;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.SimpleEntityRef;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.persistence.entities.Application;
import org.usergrid.utils.JsonUtils;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
+import java.io.FileWriter;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.UUID;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/EntityCleanup.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/EntityCleanup.java b/stack/tools/src/main/java/org/usergrid/tools/EntityCleanup.java
index ba79980..72a9538 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/EntityCleanup.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/EntityCleanup.java
@@ -16,12 +16,13 @@
package org.usergrid.tools;
-import java.nio.ByteBuffer;
-import java.util.LinkedHashSet;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.mutation.Mutator;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
@@ -37,14 +38,11 @@ import org.usergrid.persistence.query.ir.result.ScanColumnTransformer;
import org.usergrid.persistence.query.ir.result.SliceIterator;
import org.usergrid.persistence.query.ir.result.UUIDIndexSliceParser;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.mutation.Mutator;
+import java.nio.ByteBuffer;
+import java.util.LinkedHashSet;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.UUID;
import static me.prettyprint.hector.api.factory.HFactory.createMutator;
import static org.usergrid.persistence.Schema.DICTIONARY_COLLECTIONS;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/EntityInsertBenchMark.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/EntityInsertBenchMark.java b/stack/tools/src/main/java/org/usergrid/tools/EntityInsertBenchMark.java
index 917206e..c2f5216 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/EntityInsertBenchMark.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/EntityInsertBenchMark.java
@@ -16,14 +16,14 @@
package org.usergrid.tools;
-import java.nio.ByteBuffer;
-import java.util.Stack;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.beans.DynamicComposite;
+import me.prettyprint.hector.api.mutation.Mutator;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.DynamicEntity;
@@ -32,15 +32,13 @@ import org.usergrid.persistence.IndexBucketLocator.IndexType;
import org.usergrid.persistence.cassandra.EntityManagerImpl;
import org.usergrid.utils.UUIDUtils;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.mutation.Mutator;
+import java.nio.ByteBuffer;
+import java.util.Stack;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
import static me.prettyprint.hector.api.factory.HFactory.createMutator;
import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_INDEX;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/EntityReadBenchMark.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/EntityReadBenchMark.java b/stack/tools/src/main/java/org/usergrid/tools/EntityReadBenchMark.java
index 9483ddc..05c20d0 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/EntityReadBenchMark.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/EntityReadBenchMark.java
@@ -16,35 +16,11 @@
package org.usergrid.tools;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Stack;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.util.Assert;
-import org.usergrid.persistence.IndexBucketLocator;
-import org.usergrid.persistence.IndexBucketLocator.IndexType;
-import org.usergrid.persistence.cassandra.EntityManagerImpl;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
import com.yammer.metrics.Metrics;
import com.yammer.metrics.core.MetricPredicate;
import com.yammer.metrics.core.Timer;
import com.yammer.metrics.core.TimerContext;
import com.yammer.metrics.reporting.ConsoleReporter;
-
import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
import me.prettyprint.cassandra.serializers.DynamicCompositeSerializer;
import me.prettyprint.hector.api.Keyspace;
@@ -56,6 +32,23 @@ import me.prettyprint.hector.api.beans.Rows;
import me.prettyprint.hector.api.factory.HFactory;
import me.prettyprint.hector.api.query.MultigetSliceQuery;
import me.prettyprint.hector.api.query.QueryResult;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.Assert;
+import org.usergrid.persistence.IndexBucketLocator;
+import org.usergrid.persistence.IndexBucketLocator.IndexType;
+import org.usergrid.persistence.cassandra.EntityManagerImpl;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Stack;
+import java.util.UUID;
+import java.util.concurrent.*;
import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_INDEX;
import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_UNIQUE;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/EntityUpdate.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/EntityUpdate.java b/stack/tools/src/main/java/org/usergrid/tools/EntityUpdate.java
index a99ea3a..0d3159f 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/EntityUpdate.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/EntityUpdate.java
@@ -1,27 +1,19 @@
package org.usergrid.tools;
-import java.io.File;
-import java.util.Map;
-
-import org.codehaus.jackson.map.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.management.ApplicationInfo;
-import org.usergrid.persistence.DynamicEntity;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.PagingResultsIterator;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.management.ApplicationInfo;
+import org.usergrid.persistence.*;
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import java.io.File;
+import java.util.Map;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/Export.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/Export.java b/stack/tools/src/main/java/org/usergrid/tools/Export.java
index f35da6b..15532dc 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/Export.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/Export.java
@@ -16,15 +16,8 @@
package org.usergrid.tools;
-import java.io.File;
-import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-
+import com.google.common.collect.BiMap;
+import org.apache.commons.cli.CommandLine;
import org.codehaus.jackson.JsonEncoding;
import org.codehaus.jackson.JsonFactory;
import org.codehaus.jackson.JsonGenerator;
@@ -32,19 +25,16 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.OrganizationInfo;
import org.usergrid.management.UserInfo;
-import org.usergrid.persistence.ConnectionRef;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.Results.Level;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.tools.bean.ExportOrg;
import org.usergrid.utils.JsonUtils;
-import org.apache.commons.cli.CommandLine;
-
-import com.google.common.collect.BiMap;
+import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.util.*;
+import java.util.Map.Entry;
public class Export extends ExportingToolBase {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/ExportDataCreator.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/ExportDataCreator.java b/stack/tools/src/main/java/org/usergrid/tools/ExportDataCreator.java
index 6e5a9bc..6213904 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/ExportDataCreator.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/ExportDataCreator.java
@@ -16,8 +16,6 @@
package org.usergrid.tools;
-import java.util.UUID;
-
import org.usergrid.management.ManagementService;
import org.usergrid.management.OrganizationOwnerInfo;
import org.usergrid.persistence.Entity;
@@ -26,6 +24,8 @@ import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.persistence.entities.Activity;
import org.usergrid.persistence.entities.User;
+import java.util.UUID;
+
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/ExportingToolBase.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/ExportingToolBase.java b/stack/tools/src/main/java/org/usergrid/tools/ExportingToolBase.java
index 88ee07a..c7864b5 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/ExportingToolBase.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/ExportingToolBase.java
@@ -14,11 +14,10 @@
package org.usergrid.tools;
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.UUID;
-
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
import org.codehaus.jackson.JsonFactory;
import org.codehaus.jackson.JsonGenerator;
import org.codehaus.jackson.impl.DefaultPrettyPrinter;
@@ -27,10 +26,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.utils.ConversionUtils;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.UUID;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/Import.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/Import.java b/stack/tools/src/main/java/org/usergrid/tools/Import.java
index 974cb51..7d9f346 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/Import.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/Import.java
@@ -16,14 +16,11 @@
package org.usergrid.tools;
-import java.io.File;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.UUID;
-
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
+import org.apache.commons.io.filefilter.PrefixFileFilter;
import org.codehaus.jackson.JsonFactory;
import org.codehaus.jackson.JsonParser;
import org.codehaus.jackson.JsonToken;
@@ -42,11 +39,9 @@ import org.usergrid.persistence.exceptions.DuplicateUniquePropertyExistsExceptio
import org.usergrid.tools.bean.ExportOrg;
import org.usergrid.utils.JsonUtils;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-import org.apache.commons.io.filefilter.PrefixFileFilter;
+import java.io.File;
+import java.util.*;
+import java.util.Map.Entry;
import static org.usergrid.persistence.Schema.PROPERTY_TYPE;
import static org.usergrid.persistence.Schema.PROPERTY_UUID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/ImportFB.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/ImportFB.java b/stack/tools/src/main/java/org/usergrid/tools/ImportFB.java
index ffdb3e3..20da217 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/ImportFB.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/ImportFB.java
@@ -16,6 +16,14 @@
package org.usergrid.tools;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.utils.JsonUtils;
+
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
@@ -24,15 +32,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.utils.JsonUtils;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
public class ImportFB extends ToolBase {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/IndexRebuild.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/IndexRebuild.java b/stack/tools/src/main/java/org/usergrid/tools/IndexRebuild.java
index fc33c56..a78a48d 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/IndexRebuild.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/IndexRebuild.java
@@ -16,13 +16,11 @@
package org.usergrid.tools;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
@@ -33,12 +31,8 @@ import org.usergrid.persistence.entities.Application;
import org.usergrid.persistence.exceptions.DuplicateUniquePropertyExistsException;
import org.usergrid.utils.UUIDUtils;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import java.util.*;
+import java.util.Map.Entry;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/Metrics.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/Metrics.java b/stack/tools/src/main/java/org/usergrid/tools/Metrics.java
index 5d36b81..f508951 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/Metrics.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/Metrics.java
@@ -1,15 +1,15 @@
package org.usergrid.tools;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.ListMultimap;
+import com.google.common.collect.Ordering;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
+import org.apache.commons.lang.time.DateUtils;
import org.codehaus.jackson.JsonGenerator;
import org.usergrid.management.ApplicationInfo;
import org.usergrid.management.OrganizationInfo;
@@ -21,16 +21,7 @@ import org.usergrid.tools.bean.MetricQuery;
import org.usergrid.tools.bean.MetricSort;
import org.usergrid.utils.TimeUtils;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-import org.apache.commons.lang.time.DateUtils;
-
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.ListMultimap;
-import com.google.common.collect.Ordering;
+import java.util.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/OrganizationExport.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/OrganizationExport.java b/stack/tools/src/main/java/org/usergrid/tools/OrganizationExport.java
index f5c2dc6..7834652 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/OrganizationExport.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/OrganizationExport.java
@@ -1,23 +1,21 @@
package org.usergrid.tools;
-import java.io.FileWriter;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.UUID;
-
+import au.com.bytecode.opencsv.CSVWriter;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
import org.usergrid.management.UserInfo;
import org.usergrid.persistence.Entity;
import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.Results;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import au.com.bytecode.opencsv.CSVWriter;
+import java.io.FileWriter;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.UUID;
import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/PopulateSample.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/PopulateSample.java b/stack/tools/src/main/java/org/usergrid/tools/PopulateSample.java
index c30039d..ec8b67f 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/PopulateSample.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/PopulateSample.java
@@ -16,10 +16,10 @@
package org.usergrid.tools;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.OrganizationInfo;
@@ -32,10 +32,9 @@ import org.usergrid.services.ServiceManager;
import org.usergrid.services.ServiceRequest;
import org.usergrid.services.ServiceResults;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/ResetSuperUser.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/ResetSuperUser.java b/stack/tools/src/main/java/org/usergrid/tools/ResetSuperUser.java
index 34294df..93da3a5 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/ResetSuperUser.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/ResetSuperUser.java
@@ -16,22 +16,17 @@
package org.usergrid.tools;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.management.AccountCreationProps;
-import org.usergrid.management.cassandra.ManagementServiceImpl;
-
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.management.AccountCreationProps;
+import org.usergrid.management.cassandra.ManagementServiceImpl;
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_LOGIN_ALLOWED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_LOGIN_EMAIL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_LOGIN_NAME;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_LOGIN_PASSWORD;
+import static org.usergrid.management.AccountCreationProps.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/SetupDB.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/SetupDB.java b/stack/tools/src/main/java/org/usergrid/tools/SetupDB.java
index 87f6921..6b810cc 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/SetupDB.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/SetupDB.java
@@ -16,13 +16,12 @@
package org.usergrid.tools;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SetupDB extends ToolBase {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/Test.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/Test.java b/stack/tools/src/main/java/org/usergrid/tools/Test.java
index e1b6166..e1b0309 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/Test.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/Test.java
@@ -16,13 +16,12 @@
package org.usergrid.tools;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class Test extends ToolBase {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/ToolBase.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/ToolBase.java b/stack/tools/src/main/java/org/usergrid/tools/ToolBase.java
index 3de74c8..af85679 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/ToolBase.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/ToolBase.java
@@ -17,8 +17,9 @@
package org.usergrid.tools;
-import java.util.Properties;
-
+import me.prettyprint.hector.testutils.EmbeddedServerHelper;
+import org.apache.commons.cli.*;
+import org.apache.commons.lang.ClassUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,17 +33,7 @@ import org.usergrid.persistence.cassandra.EntityManagerFactoryImpl;
import org.usergrid.persistence.cassandra.Setup;
import org.usergrid.services.ServiceManagerFactory;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.GnuParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.apache.commons.lang.ClassUtils;
-
-import me.prettyprint.hector.testutils.EmbeddedServerHelper;
+import java.util.Properties;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/UniqueIndexCleanup.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/UniqueIndexCleanup.java b/stack/tools/src/main/java/org/usergrid/tools/UniqueIndexCleanup.java
index 367d1da..4cee671 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/UniqueIndexCleanup.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/UniqueIndexCleanup.java
@@ -16,24 +16,20 @@
package org.usergrid.tools;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
+import me.prettyprint.hector.api.beans.DynamicComposite;
+import me.prettyprint.hector.api.beans.HColumn;
+import me.prettyprint.hector.api.mutation.Mutator;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.ApplicationInfo;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.EntityManagerFactory;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.IndexBucketLocator;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.IndexBucketLocator.IndexType;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.persistence.cassandra.EntityManagerImpl;
@@ -44,17 +40,9 @@ import org.usergrid.persistence.query.ir.result.SliceIterator;
import org.usergrid.persistence.query.ir.result.UUIDIndexSliceParser;
import org.usergrid.persistence.schema.CollectionInfo;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.mutation.Mutator;
+import java.nio.ByteBuffer;
+import java.util.*;
+import java.util.Map.Entry;
import static me.prettyprint.hector.api.factory.HFactory.createMutator;
import static org.usergrid.persistence.Schema.DICTIONARY_COLLECTIONS;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/UserManager.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/UserManager.java b/stack/tools/src/main/java/org/usergrid/tools/UserManager.java
index 727fde5..cb7095d 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/UserManager.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/UserManager.java
@@ -1,10 +1,9 @@
package org.usergrid.tools;
-import org.usergrid.management.UserInfo;
-
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Options;
+import org.usergrid.management.UserInfo;
import static org.usergrid.utils.JsonUtils.mapToFormattedJsonString;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/WarehouseExport.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/WarehouseExport.java b/stack/tools/src/main/java/org/usergrid/tools/WarehouseExport.java
index d6caed2..85c4a2c 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/WarehouseExport.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/WarehouseExport.java
@@ -17,27 +17,16 @@
package org.usergrid.tools;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.FilenameFilter;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
+import au.com.bytecode.opencsv.CSVReader;
+import au.com.bytecode.opencsv.CSVWriter;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Module;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Options;
import org.jclouds.ContextBuilder;
import org.jclouds.blobstore.AsyncBlobStore;
import org.jclouds.blobstore.BlobStoreContext;
@@ -50,28 +39,20 @@ import org.jclouds.netty.config.NettyPayloadModule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.OrganizationInfo;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.Results.Level;
-import org.usergrid.persistence.Schema;
import org.usergrid.persistence.entities.Application;
import org.usergrid.persistence.schema.CollectionInfo;
import org.usergrid.utils.InflectionUtils;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-import com.google.common.collect.BiMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.inject.Module;
-
-import au.com.bytecode.opencsv.CSVReader;
-import au.com.bytecode.opencsv.CSVWriter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.FilenameFilter;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.TimeUnit;
import static org.usergrid.persistence.Schema.getDefaultSchema;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/WarehouseUpsert.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/WarehouseUpsert.java b/stack/tools/src/main/java/org/usergrid/tools/WarehouseUpsert.java
index 2c75e81..a4128a0 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/WarehouseUpsert.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/WarehouseUpsert.java
@@ -14,15 +14,14 @@
package org.usergrid.tools;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.io.IOUtils;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
/** Upserts data from files found in an S3 bucket. */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/Api.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/Api.java b/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/Api.java
index 3a1b4ca..cb67f16 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/Api.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/Api.java
@@ -16,13 +16,13 @@
package org.usergrid.tools.apidoc.swagger;
-import java.util.List;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.usergrid.utils.JsonUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import java.util.List;
+
import static org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_NULL;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiListing.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiListing.java b/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiListing.java
index 1370fbf..1a37142 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiListing.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiListing.java
@@ -16,19 +16,18 @@
package org.usergrid.tools.apidoc.swagger;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.usergrid.utils.JsonUtils;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.util.List;
+import java.util.Map;
+
import static org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_NULL;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiOperation.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiOperation.java b/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiOperation.java
index 8c56ab6..c0acb89 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiOperation.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiOperation.java
@@ -16,13 +16,13 @@
package org.usergrid.tools.apidoc.swagger;
-import java.util.List;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.usergrid.utils.JsonUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import java.util.List;
+
import static org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_NULL;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiParamAllowableValues.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiParamAllowableValues.java b/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiParamAllowableValues.java
index bbe549c..8fa7025 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiParamAllowableValues.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/apidoc/swagger/ApiParamAllowableValues.java
@@ -16,11 +16,11 @@
package org.usergrid.tools.apidoc.swagger;
-import java.util.List;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.usergrid.utils.JsonUtils;
+import java.util.List;
+
import static org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion.NON_NULL;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/bean/ExportOrg.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/bean/ExportOrg.java b/stack/tools/src/main/java/org/usergrid/tools/bean/ExportOrg.java
index bb78c1e..af93d4d 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/bean/ExportOrg.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/bean/ExportOrg.java
@@ -16,11 +16,11 @@
package org.usergrid.tools.bean;
+import org.usergrid.management.OrganizationInfo;
+
import java.util.ArrayList;
import java.util.List;
-import org.usergrid.management.OrganizationInfo;
-
/** @author tnine */
public class ExportOrg extends OrganizationInfo {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/bean/MetricLine.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/bean/MetricLine.java b/stack/tools/src/main/java/org/usergrid/tools/bean/MetricLine.java
index dd4870f..8fb11c8 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/bean/MetricLine.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/bean/MetricLine.java
@@ -1,14 +1,13 @@
package org.usergrid.tools.bean;
-import java.util.List;
-import java.util.UUID;
-
-import org.usergrid.persistence.AggregateCounter;
-
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
+import org.usergrid.persistence.AggregateCounter;
+
+import java.util.List;
+import java.util.UUID;
/** @author zznate */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/tools/src/main/java/org/usergrid/tools/bean/MetricQuery.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/usergrid/tools/bean/MetricQuery.java b/stack/tools/src/main/java/org/usergrid/tools/bean/MetricQuery.java
index 117c635..aaa18d3 100644
--- a/stack/tools/src/main/java/org/usergrid/tools/bean/MetricQuery.java
+++ b/stack/tools/src/main/java/org/usergrid/tools/bean/MetricQuery.java
@@ -1,19 +1,13 @@
package org.usergrid.tools.bean;
+import com.google.common.base.Preconditions;
+import org.usergrid.persistence.*;
+
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-import org.usergrid.persistence.AggregateCounter;
-import org.usergrid.persistence.AggregateCounterSet;
-import org.usergrid.persistence.CounterResolution;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-
-import com.google.common.base.Preconditions;
-
/** @author zznate */
public class MetricQuery {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketChannelHandler.java
----------------------------------------------------------------------
diff --git a/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketChannelHandler.java b/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketChannelHandler.java
index 2e3c0c1..009f39b 100644
--- a/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketChannelHandler.java
+++ b/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketChannelHandler.java
@@ -16,31 +16,16 @@
package org.usergrid.websocket;
-import java.security.MessageDigest;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-
+import org.apache.shiro.mgt.SessionsSecurityManager;
+import org.apache.shiro.subject.Subject;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import org.jboss.netty.channel.*;
import org.jboss.netty.channel.group.ChannelGroup;
import org.jboss.netty.channel.group.DefaultChannelGroup;
-import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
-import org.jboss.netty.handler.codec.http.HttpHeaders;
+import org.jboss.netty.handler.codec.http.*;
import org.jboss.netty.handler.codec.http.HttpHeaders.Names;
import org.jboss.netty.handler.codec.http.HttpHeaders.Values;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.handler.codec.http.HttpResponseStatus;
-import org.jboss.netty.handler.codec.http.QueryStringDecoder;
import org.jboss.netty.handler.codec.http.websocket.DefaultWebSocketFrame;
import org.jboss.netty.handler.codec.http.websocket.WebSocketFrame;
import org.jboss.netty.handler.codec.http.websocket.WebSocketFrameDecoder;
@@ -52,23 +37,12 @@ import org.usergrid.management.ManagementService;
import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.services.ServiceManagerFactory;
-import org.apache.shiro.mgt.SessionsSecurityManager;
-import org.apache.shiro.subject.Subject;
+import java.security.MessageDigest;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
-import static org.apache.commons.lang.StringUtils.isEmpty;
-import static org.apache.commons.lang.StringUtils.removeEnd;
-import static org.apache.commons.lang.StringUtils.split;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.CONNECTION;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.CONTENT_TYPE;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.ORIGIN;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_KEY1;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_KEY2;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_LOCATION;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_ORIGIN;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_PROTOCOL;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.WEBSOCKET_LOCATION;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.WEBSOCKET_ORIGIN;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.WEBSOCKET_PROTOCOL;
+import static org.apache.commons.lang.StringUtils.*;
+import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.*;
import static org.jboss.netty.handler.codec.http.HttpHeaders.Values.WEBSOCKET;
import static org.jboss.netty.handler.codec.http.HttpHeaders.isKeepAlive;
import static org.jboss.netty.handler.codec.http.HttpHeaders.setContentLength;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServer.java
----------------------------------------------------------------------
diff --git a/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServer.java b/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServer.java
index 3731609..da2e72a 100644
--- a/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServer.java
+++ b/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServer.java
@@ -31,10 +31,9 @@
package org.usergrid.websocket;
-import java.net.InetSocketAddress;
-import java.util.Properties;
-import java.util.concurrent.Executors;
-
+import org.apache.shiro.mgt.DefaultSecurityManager;
+import org.apache.shiro.mgt.SessionsSecurityManager;
+import org.apache.shiro.realm.Realm;
import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
@@ -51,9 +50,9 @@ import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.persistence.cassandra.EntityManagerFactoryImpl;
import org.usergrid.services.ServiceManagerFactory;
-import org.apache.shiro.mgt.DefaultSecurityManager;
-import org.apache.shiro.mgt.SessionsSecurityManager;
-import org.apache.shiro.realm.Realm;
+import java.net.InetSocketAddress;
+import java.util.Properties;
+import java.util.concurrent.Executors;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServerPipelineFactory.java
----------------------------------------------------------------------
diff --git a/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServerPipelineFactory.java b/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServerPipelineFactory.java
index ed88120..f296521 100644
--- a/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServerPipelineFactory.java
+++ b/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketServerPipelineFactory.java
@@ -16,8 +16,7 @@
package org.usergrid.websocket;
-import javax.net.ssl.SSLEngine;
-
+import org.apache.shiro.mgt.SessionsSecurityManager;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelPipelineFactory;
import org.jboss.netty.handler.codec.http.HttpChunkAggregator;
@@ -29,7 +28,7 @@ import org.usergrid.management.ManagementService;
import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.services.ServiceManagerFactory;
-import org.apache.shiro.mgt.SessionsSecurityManager;
+import javax.net.ssl.SSLEngine;
import static org.jboss.netty.channel.Channels.pipeline;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketSslContextFactory.java
----------------------------------------------------------------------
diff --git a/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketSslContextFactory.java b/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketSslContextFactory.java
index 2780583..9ff6156 100644
--- a/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketSslContextFactory.java
+++ b/stack/websocket/src/main/java/org/usergrid/websocket/WebSocketSslContextFactory.java
@@ -16,11 +16,10 @@
package org.usergrid.websocket;
-import java.security.KeyStore;
-import java.security.Security;
-
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
+import java.security.KeyStore;
+import java.security.Security;
public class WebSocketSslContextFactory {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/websocket/src/test/java/org/usergrid/websocket/SimpleMessageProducer.java
----------------------------------------------------------------------
diff --git a/stack/websocket/src/test/java/org/usergrid/websocket/SimpleMessageProducer.java b/stack/websocket/src/test/java/org/usergrid/websocket/SimpleMessageProducer.java
index 0dcf495..367b3d1 100644
--- a/stack/websocket/src/test/java/org/usergrid/websocket/SimpleMessageProducer.java
+++ b/stack/websocket/src/test/java/org/usergrid/websocket/SimpleMessageProducer.java
@@ -16,19 +16,18 @@
package org.usergrid.websocket;
-import java.util.Date;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jms.core.JmsTemplate;
import org.springframework.jms.core.MessageCreator;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import java.util.Date;
+
public class SimpleMessageProducer {
[12/23] organize imports only
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerFactoryImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerFactoryImpl.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerFactoryImpl.java
index 4783452..8f225cc 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerFactoryImpl.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerFactoryImpl.java
@@ -16,8 +16,7 @@
package org.usergrid.mq.cassandra;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.locking.LockManager;
@@ -26,12 +25,7 @@ import org.usergrid.mq.QueueManagerFactory;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.persistence.cassandra.CounterUtils;
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.cassandra.serializers.BytesArraySerializer;
-import me.prettyprint.cassandra.serializers.DynamicCompositeSerializer;
-import me.prettyprint.cassandra.serializers.LongSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
+import java.util.UUID;
public class QueueManagerFactoryImpl implements QueueManagerFactory {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerImpl.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerImpl.java
index fd18e55..1ef29f4 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerImpl.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerImpl.java
@@ -16,41 +16,27 @@
package org.usergrid.mq.cassandra;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.UUID;
-
+import com.fasterxml.uuid.UUIDComparator;
+import me.prettyprint.cassandra.serializers.*;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
+import me.prettyprint.hector.api.beans.*;
+import me.prettyprint.hector.api.factory.HFactory;
+import me.prettyprint.hector.api.mutation.Mutator;
+import me.prettyprint.hector.api.query.MultigetSliceCounterQuery;
+import me.prettyprint.hector.api.query.QueryResult;
+import me.prettyprint.hector.api.query.SliceCounterQuery;
+import me.prettyprint.hector.api.query.SliceQuery;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.locking.LockManager;
-import org.usergrid.mq.CounterQuery;
-import org.usergrid.mq.Message;
-import org.usergrid.mq.Query;
+import org.usergrid.mq.*;
import org.usergrid.mq.Query.CounterFilterPredicate;
-import org.usergrid.mq.QueryProcessor;
import org.usergrid.mq.QueryProcessor.QuerySlice;
import org.usergrid.mq.Queue;
-import org.usergrid.mq.QueueManager;
-import org.usergrid.mq.QueueQuery;
-import org.usergrid.mq.QueueResults;
-import org.usergrid.mq.QueueSet;
import org.usergrid.mq.QueueSet.QueueInfo;
-import org.usergrid.mq.cassandra.QueueIndexUpdate.QueueIndexEntry;
-import org.usergrid.mq.cassandra.io.ConsumerTransaction;
-import org.usergrid.mq.cassandra.io.EndSearch;
-import org.usergrid.mq.cassandra.io.FilterSearch;
-import org.usergrid.mq.cassandra.io.NoTransactionSearch;
-import org.usergrid.mq.cassandra.io.QueueBounds;
-import org.usergrid.mq.cassandra.io.QueueSearch;
-import org.usergrid.mq.cassandra.io.StartSearch;
+import org.usergrid.mq.cassandra.QueueIndexUpdate.*;
+import org.usergrid.mq.cassandra.io.*;
import org.usergrid.persistence.AggregateCounter;
import org.usergrid.persistence.AggregateCounterSet;
import org.usergrid.persistence.CounterResolution;
@@ -62,62 +48,17 @@ import org.usergrid.persistence.cassandra.CounterUtils.AggregateCounterSelection
import org.usergrid.persistence.exceptions.TransactionNotFoundException;
import org.usergrid.utils.UUIDUtils;
-import com.fasterxml.uuid.UUIDComparator;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.cassandra.serializers.BytesArraySerializer;
-import me.prettyprint.cassandra.serializers.DynamicCompositeSerializer;
-import me.prettyprint.cassandra.serializers.LongSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
-import me.prettyprint.hector.api.beans.ColumnSlice;
-import me.prettyprint.hector.api.beans.CounterRow;
-import me.prettyprint.hector.api.beans.CounterRows;
-import me.prettyprint.hector.api.beans.CounterSlice;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.beans.HCounterColumn;
-import me.prettyprint.hector.api.factory.HFactory;
-import me.prettyprint.hector.api.mutation.Mutator;
-import me.prettyprint.hector.api.query.MultigetSliceCounterQuery;
-import me.prettyprint.hector.api.query.QueryResult;
-import me.prettyprint.hector.api.query.SliceCounterQuery;
-import me.prettyprint.hector.api.query.SliceQuery;
+import java.nio.ByteBuffer;
+import java.util.*;
-import static me.prettyprint.hector.api.factory.HFactory.createColumn;
-import static me.prettyprint.hector.api.factory.HFactory.createCounterSliceQuery;
-import static me.prettyprint.hector.api.factory.HFactory.createMutator;
-import static me.prettyprint.hector.api.factory.HFactory.createSliceQuery;
-import static org.usergrid.mq.Queue.QUEUE_CREATED;
-import static org.usergrid.mq.Queue.QUEUE_MODIFIED;
-import static org.usergrid.mq.Queue.QUEUE_NEWEST;
-import static org.usergrid.mq.Queue.QUEUE_OLDEST;
+import static me.prettyprint.hector.api.factory.HFactory.*;
+import static org.usergrid.mq.Queue.*;
import static org.usergrid.mq.Queue.getQueueId;
-import static org.usergrid.mq.Queue.normalizeQueuePath;
-import static org.usergrid.mq.QueuePosition.CONSUMER;
-import static org.usergrid.mq.QueuePosition.END;
-import static org.usergrid.mq.QueuePosition.LAST;
-import static org.usergrid.mq.QueuePosition.START;
-import static org.usergrid.mq.cassandra.CassandraMQUtils.addMessageToMutator;
-import static org.usergrid.mq.cassandra.CassandraMQUtils.addQueueToMutator;
-import static org.usergrid.mq.cassandra.CassandraMQUtils.deserializeMessage;
-import static org.usergrid.mq.cassandra.CassandraMQUtils.deserializeQueue;
-import static org.usergrid.mq.cassandra.CassandraMQUtils.getQueueShardRowKey;
-import static org.usergrid.mq.cassandra.QueueIndexUpdate.indexValueCode;
-import static org.usergrid.mq.cassandra.QueueIndexUpdate.toIndexableValue;
-import static org.usergrid.mq.cassandra.QueueIndexUpdate.validIndexableValue;
-import static org.usergrid.mq.cassandra.QueueIndexUpdate.validIndexableValueOrJson;
-import static org.usergrid.mq.cassandra.QueuesCF.COUNTERS;
-import static org.usergrid.mq.cassandra.QueuesCF.MESSAGE_PROPERTIES;
-import static org.usergrid.mq.cassandra.QueuesCF.PROPERTY_INDEX;
-import static org.usergrid.mq.cassandra.QueuesCF.PROPERTY_INDEX_ENTRIES;
-import static org.usergrid.mq.cassandra.QueuesCF.QUEUE_DICTIONARIES;
-import static org.usergrid.mq.cassandra.QueuesCF.QUEUE_INBOX;
+import static org.usergrid.mq.QueuePosition.*;
+import static org.usergrid.mq.cassandra.CassandraMQUtils.*;
+import static org.usergrid.mq.cassandra.QueueIndexUpdate.*;
+import static org.usergrid.mq.cassandra.QueuesCF.*;
import static org.usergrid.mq.cassandra.QueuesCF.QUEUE_PROPERTIES;
-import static org.usergrid.mq.cassandra.QueuesCF.QUEUE_SUBSCRIBERS;
-import static org.usergrid.mq.cassandra.QueuesCF.QUEUE_SUBSCRIPTIONS;
import static org.usergrid.persistence.Schema.DICTIONARY_COUNTERS;
import static org.usergrid.persistence.cassandra.ApplicationCF.APPLICATION_AGGREGATE_COUNTERS;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.batchExecute;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/QueuesCF.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/QueuesCF.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/QueuesCF.java
index 96e25e3..b8c8c43 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/QueuesCF.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/QueuesCF.java
@@ -16,11 +16,10 @@
package org.usergrid.mq.cassandra;
-import java.util.List;
-
+import me.prettyprint.hector.api.ddl.ColumnDefinition;
import org.usergrid.persistence.cassandra.CFEnum;
-import me.prettyprint.hector.api.ddl.ColumnDefinition;
+import java.util.List;
import static me.prettyprint.hector.api.ddl.ComparatorType.COUNTERTYPE;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.getIndexMetadata;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/io/AbstractSearch.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/AbstractSearch.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/AbstractSearch.java
index 089d025..efb376d 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/AbstractSearch.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/AbstractSearch.java
@@ -16,24 +16,6 @@
package org.usergrid.mq.cassandra.io;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.mq.Message;
-import org.usergrid.mq.QueueResults;
-import org.usergrid.mq.cassandra.io.NoTransactionSearch.SearchParam;
-import org.usergrid.persistence.exceptions.QueueException;
-import org.usergrid.utils.UUIDUtils;
-
import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
import me.prettyprint.cassandra.serializers.UUIDSerializer;
import me.prettyprint.hector.api.Keyspace;
@@ -44,26 +26,26 @@ import me.prettyprint.hector.api.beans.Rows;
import me.prettyprint.hector.api.factory.HFactory;
import me.prettyprint.hector.api.mutation.Mutator;
import me.prettyprint.hector.api.query.SliceQuery;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.mq.Message;
+import org.usergrid.mq.QueueResults;
+import org.usergrid.mq.cassandra.io.NoTransactionSearch.SearchParam;
+import org.usergrid.persistence.exceptions.QueueException;
+import org.usergrid.utils.UUIDUtils;
+
+import java.nio.ByteBuffer;
+import java.util.*;
-import static me.prettyprint.hector.api.factory.HFactory.createColumn;
-import static me.prettyprint.hector.api.factory.HFactory.createMultigetSliceQuery;
-import static me.prettyprint.hector.api.factory.HFactory.createMutator;
-import static me.prettyprint.hector.api.factory.HFactory.createSliceQuery;
+import static me.prettyprint.hector.api.factory.HFactory.*;
import static org.usergrid.mq.Queue.QUEUE_NEWEST;
import static org.usergrid.mq.Queue.QUEUE_OLDEST;
import static org.usergrid.mq.cassandra.CassandraMQUtils.deserializeMessage;
import static org.usergrid.mq.cassandra.CassandraMQUtils.getQueueShardRowKey;
-import static org.usergrid.mq.cassandra.QueueManagerImpl.ALL_COUNT;
-import static org.usergrid.mq.cassandra.QueueManagerImpl.QUEUE_SHARD_INTERVAL;
-import static org.usergrid.mq.cassandra.QueueManagerImpl.se;
-import static org.usergrid.mq.cassandra.QueuesCF.CONSUMERS;
-import static org.usergrid.mq.cassandra.QueuesCF.MESSAGE_PROPERTIES;
-import static org.usergrid.mq.cassandra.QueuesCF.QUEUE_INBOX;
-import static org.usergrid.mq.cassandra.QueuesCF.QUEUE_PROPERTIES;
+import static org.usergrid.mq.cassandra.QueueManagerImpl.*;
+import static org.usergrid.mq.cassandra.QueuesCF.*;
import static org.usergrid.utils.NumberUtils.roundLong;
-import static org.usergrid.utils.UUIDUtils.MAX_TIME_UUID;
-import static org.usergrid.utils.UUIDUtils.MIN_TIME_UUID;
-import static org.usergrid.utils.UUIDUtils.getTimestampInMillis;
+import static org.usergrid.utils.UUIDUtils.*;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/io/ConsumerTransaction.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/ConsumerTransaction.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/ConsumerTransaction.java
index 6466c47..cd8b0d3 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/ConsumerTransaction.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/ConsumerTransaction.java
@@ -16,13 +16,10 @@
package org.usergrid.mq.cassandra.io;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.beans.HColumn;
+import me.prettyprint.hector.api.mutation.Mutator;
+import me.prettyprint.hector.api.query.SliceQuery;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.locking.Lock;
@@ -36,17 +33,15 @@ import org.usergrid.persistence.exceptions.QueueException;
import org.usergrid.persistence.exceptions.TransactionNotFoundException;
import org.usergrid.utils.UUIDUtils;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.mutation.Mutator;
-import me.prettyprint.hector.api.query.SliceQuery;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
-import static me.prettyprint.hector.api.factory.HFactory.createColumn;
-import static me.prettyprint.hector.api.factory.HFactory.createMutator;
-import static me.prettyprint.hector.api.factory.HFactory.createSliceQuery;
-import static org.usergrid.mq.cassandra.CassandraMQUtils.getConsumerId;
-import static org.usergrid.mq.cassandra.CassandraMQUtils.getQueueClientTransactionKey;
-import static org.usergrid.mq.cassandra.CassandraMQUtils.getQueueId;
+import static me.prettyprint.hector.api.factory.HFactory.*;
+import static org.usergrid.mq.cassandra.CassandraMQUtils.*;
import static org.usergrid.mq.cassandra.QueuesCF.CONSUMER_QUEUE_TIMEOUTS;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/io/EndSearch.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/EndSearch.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/EndSearch.java
index 4ca09aa..caf62f6 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/EndSearch.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/EndSearch.java
@@ -16,11 +16,10 @@
package org.usergrid.mq.cassandra.io;
-import java.util.UUID;
-
+import me.prettyprint.hector.api.Keyspace;
import org.usergrid.mq.QueueQuery;
-import me.prettyprint.hector.api.Keyspace;
+import java.util.UUID;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/io/FilterSearch.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/FilterSearch.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/FilterSearch.java
index 0f629a3..8d43d4f 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/FilterSearch.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/FilterSearch.java
@@ -16,13 +16,11 @@
package org.usergrid.mq.cassandra.io;
-import java.nio.ByteBuffer;
-import java.util.Iterator;
-import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.UUID;
-
+import com.fasterxml.uuid.UUIDComparator;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
+import me.prettyprint.hector.api.beans.DynamicComposite;
+import me.prettyprint.hector.api.beans.HColumn;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.mq.Message;
@@ -31,12 +29,8 @@ import org.usergrid.mq.QueryProcessor.QuerySlice;
import org.usergrid.mq.QueueQuery;
import org.usergrid.mq.QueueResults;
-import com.fasterxml.uuid.UUIDComparator;
-
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.*;
import static me.prettyprint.hector.api.factory.HFactory.createSliceQuery;
import static org.usergrid.mq.Queue.getQueueId;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/io/NoTransactionSearch.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/NoTransactionSearch.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/NoTransactionSearch.java
index 3ac4f6f..ad06355 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/NoTransactionSearch.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/NoTransactionSearch.java
@@ -16,16 +16,15 @@
package org.usergrid.mq.cassandra.io;
-import java.util.List;
-import java.util.UUID;
-
+import me.prettyprint.hector.api.Keyspace;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.mq.Message;
import org.usergrid.mq.QueueQuery;
import org.usergrid.mq.QueueResults;
-import me.prettyprint.hector.api.Keyspace;
+import java.util.List;
+import java.util.UUID;
import static org.usergrid.mq.cassandra.CassandraMQUtils.getConsumerId;
import static org.usergrid.mq.cassandra.CassandraMQUtils.getQueueId;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/io/StartSearch.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/StartSearch.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/StartSearch.java
index fbef8dd..e0522ef 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/StartSearch.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/StartSearch.java
@@ -16,11 +16,10 @@
package org.usergrid.mq.cassandra.io;
-import java.util.UUID;
-
+import me.prettyprint.hector.api.Keyspace;
import org.usergrid.mq.QueueQuery;
-import me.prettyprint.hector.api.Keyspace;
+import java.util.UUID;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/AbstractEntity.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/AbstractEntity.java b/stack/core/src/main/java/org/usergrid/persistence/AbstractEntity.java
index 4c7e9c3..f7d3bac 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/AbstractEntity.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/AbstractEntity.java
@@ -16,16 +16,6 @@
package org.usergrid.persistence;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonIgnore;
@@ -33,6 +23,10 @@ import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.*;
+import java.util.Map.Entry;
+
import static org.usergrid.persistence.Schema.PROPERTY_NAME;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/AggregateCounterSet.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/AggregateCounterSet.java b/stack/core/src/main/java/org/usergrid/persistence/AggregateCounterSet.java
index 44c1d34..1356cfe 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/AggregateCounterSet.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/AggregateCounterSet.java
@@ -16,12 +16,12 @@
package org.usergrid.persistence;
-import java.util.List;
-import java.util.UUID;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import java.util.List;
+import java.util.UUID;
+
public class AggregateCounterSet {
private String name;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/CounterQuery.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/CounterQuery.java b/stack/core/src/main/java/org/usergrid/persistence/CounterQuery.java
index 9c645ce..93711d0 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/CounterQuery.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/CounterQuery.java
@@ -16,20 +16,17 @@
package org.usergrid.persistence;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Query.CounterFilterPredicate;
import org.usergrid.utils.JsonUtils;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
import static org.usergrid.utils.ClassUtils.cast;
-import static org.usergrid.utils.ListUtils.firstBoolean;
-import static org.usergrid.utils.ListUtils.firstInteger;
-import static org.usergrid.utils.ListUtils.firstLong;
-import static org.usergrid.utils.ListUtils.isEmpty;
+import static org.usergrid.utils.ListUtils.*;
import static org.usergrid.utils.MapUtils.toMapList;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/CredentialsInfo.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/CredentialsInfo.java b/stack/core/src/main/java/org/usergrid/persistence/CredentialsInfo.java
index f8a635d..35c14ff 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/CredentialsInfo.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/CredentialsInfo.java
@@ -16,16 +16,15 @@
package org.usergrid.persistence;
-import java.util.Map;
-import java.util.TreeMap;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Map;
+import java.util.TreeMap;
+
@XmlRootElement
public class CredentialsInfo implements Comparable<CredentialsInfo> {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/DynamicEntity.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/DynamicEntity.java b/stack/core/src/main/java/org/usergrid/persistence/DynamicEntity.java
index 455cfbc..66bf07b 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/DynamicEntity.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/DynamicEntity.java
@@ -16,14 +16,13 @@
package org.usergrid.persistence;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.usergrid.persistence.annotations.EntityProperty;
import org.usergrid.utils.UUIDUtils;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Map;
+import java.util.UUID;
+
/**
* Dynamic entities can represent any entity type whether specified in the Schema or not.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/Entity.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/Entity.java b/stack/core/src/main/java/org/usergrid/persistence/Entity.java
index 2b47060..4dded5d 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/Entity.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/Entity.java
@@ -16,22 +16,18 @@
package org.usergrid.persistence;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonPropertyOrder;
import org.usergrid.persistence.annotations.EntityProperty;
-import static org.usergrid.persistence.Schema.PROPERTY_NAME;
-import static org.usergrid.persistence.Schema.PROPERTY_TYPE;
-import static org.usergrid.persistence.Schema.PROPERTY_URI;
-import static org.usergrid.persistence.Schema.PROPERTY_UUID;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.usergrid.persistence.Schema.*;
/** Entities are the base object type in the service. */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/EntityFactory.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/EntityFactory.java b/stack/core/src/main/java/org/usergrid/persistence/EntityFactory.java
index e4c4ae9..5f9f928 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/EntityFactory.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/EntityFactory.java
@@ -16,11 +16,11 @@
package org.usergrid.persistence;
-import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.UUID;
+
/** A factory for creating Entity objects. */
public class EntityFactory {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/EntityManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/EntityManager.java b/stack/core/src/main/java/org/usergrid/persistence/EntityManager.java
index 29f9019..6575159 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/EntityManager.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/EntityManager.java
@@ -16,17 +16,13 @@
package org.usergrid.persistence;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
import org.usergrid.persistence.Results.Level;
import org.usergrid.persistence.cassandra.GeoIndexManager;
import org.usergrid.persistence.entities.Application;
import org.usergrid.persistence.entities.Role;
+import java.util.*;
+
/**
* The interface class for the data access object for Applications. Each application contains a set of users as well as
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/Identifier.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/Identifier.java b/stack/core/src/main/java/org/usergrid/persistence/Identifier.java
index 226ded0..59d9697 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/Identifier.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/Identifier.java
@@ -16,6 +16,9 @@
package org.usergrid.persistence;
+import org.codehaus.jackson.annotate.JsonIgnore;
+import org.usergrid.utils.UUIDUtils;
+
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -23,9 +26,6 @@ import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.usergrid.utils.UUIDUtils;
-
public class Identifier implements Serializable {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/Query.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/Query.java b/stack/core/src/main/java/org/usergrid/persistence/Query.java
index b6ef324..c743dbe 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/Query.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/Query.java
@@ -16,42 +16,21 @@
package org.usergrid.persistence;
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-
-import org.antlr.runtime.ANTLRStringStream;
-import org.antlr.runtime.ClassicToken;
-import org.antlr.runtime.CommonTokenStream;
-import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.Token;
-import org.antlr.runtime.TokenRewriteStream;
+import org.antlr.runtime.*;
+import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Results.Level;
import org.usergrid.persistence.exceptions.QueryParseException;
-import org.usergrid.persistence.query.tree.AndOperand;
-import org.usergrid.persistence.query.tree.ContainsOperand;
-import org.usergrid.persistence.query.tree.Equal;
-import org.usergrid.persistence.query.tree.EqualityOperand;
-import org.usergrid.persistence.query.tree.GreaterThan;
-import org.usergrid.persistence.query.tree.GreaterThanEqual;
-import org.usergrid.persistence.query.tree.LessThan;
-import org.usergrid.persistence.query.tree.LessThanEqual;
-import org.usergrid.persistence.query.tree.Operand;
-import org.usergrid.persistence.query.tree.QueryFilterLexer;
-import org.usergrid.persistence.query.tree.QueryFilterParser;
+import org.usergrid.persistence.query.tree.*;
import org.usergrid.utils.JsonUtils;
-import org.apache.commons.lang.StringUtils;
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.*;
+import java.util.Map.Entry;
import static org.apache.commons.codec.binary.Base64.decodeBase64;
import static org.apache.commons.lang.StringUtils.isBlank;
@@ -59,12 +38,7 @@ import static org.apache.commons.lang.StringUtils.split;
import static org.usergrid.persistence.Schema.PROPERTY_UUID;
import static org.usergrid.utils.ClassUtils.cast;
import static org.usergrid.utils.ConversionUtils.uuid;
-import static org.usergrid.utils.ListUtils.first;
-import static org.usergrid.utils.ListUtils.firstBoolean;
-import static org.usergrid.utils.ListUtils.firstInteger;
-import static org.usergrid.utils.ListUtils.firstLong;
-import static org.usergrid.utils.ListUtils.firstUuid;
-import static org.usergrid.utils.ListUtils.isEmpty;
+import static org.usergrid.utils.ListUtils.*;
import static org.usergrid.utils.MapUtils.toMapList;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/QueryUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/QueryUtils.java b/stack/core/src/main/java/org/usergrid/persistence/QueryUtils.java
index 892aeff..a4183f6 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/QueryUtils.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/QueryUtils.java
@@ -1,11 +1,11 @@
package org.usergrid.persistence;
+import org.usergrid.utils.ListUtils;
+
import java.util.List;
import java.util.Map;
-import org.usergrid.utils.ListUtils;
-
/**
* Utilities to deal with query extraction and generation
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/RelationManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/RelationManager.java b/stack/core/src/main/java/org/usergrid/persistence/RelationManager.java
index dab436d..afd0082 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/RelationManager.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/RelationManager.java
@@ -16,13 +16,13 @@
package org.usergrid.persistence;
+import org.usergrid.persistence.Results.Level;
+
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
-import org.usergrid.persistence.Results.Level;
-
public interface RelationManager {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/Results.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/Results.java b/stack/core/src/main/java/org/usergrid/persistence/Results.java
index ea7da45..52294ec 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/Results.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/Results.java
@@ -16,19 +16,6 @@
package org.usergrid.persistence;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
import org.usergrid.persistence.cassandra.QueryProcessor;
@@ -36,6 +23,10 @@ import org.usergrid.persistence.query.ir.SearchVisitor;
import org.usergrid.utils.MapUtils;
import org.usergrid.utils.StringUtils;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.*;
+import java.util.Map.Entry;
+
import static org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString;
import static org.usergrid.persistence.SimpleEntityRef.ref;
import static org.usergrid.utils.ClassUtils.cast;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/Schema.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/Schema.java b/stack/core/src/main/java/org/usergrid/persistence/Schema.java
index 2d233c1..f89ce56 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/Schema.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/Schema.java
@@ -16,30 +16,14 @@
package org.usergrid.persistence;
-import java.beans.PropertyDescriptor;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.nio.ByteBuffer;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
-import javax.crypto.Cipher;
-import javax.crypto.KeyGenerator;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.SecretKeySpec;
-
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import me.prettyprint.hector.api.beans.ColumnSlice;
+import me.prettyprint.hector.api.beans.HColumn;
+import me.prettyprint.hector.api.beans.Row;
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.lang.reflect.FieldUtils;
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.SerializationConfig;
@@ -65,21 +49,23 @@ import org.usergrid.utils.InflectionUtils;
import org.usergrid.utils.JsonUtils;
import org.usergrid.utils.MapUtils;
-import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.commons.lang.reflect.FieldUtils;
-
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-
-import me.prettyprint.hector.api.beans.ColumnSlice;
-import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.beans.Row;
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+import java.beans.PropertyDescriptor;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.nio.ByteBuffer;
+import java.security.SecureRandom;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
import static org.apache.commons.lang.StringUtils.isNotBlank;
-import static org.usergrid.utils.ConversionUtils.bytebuffer;
-import static org.usergrid.utils.ConversionUtils.string;
-import static org.usergrid.utils.ConversionUtils.uuid;
+import static org.usergrid.utils.ConversionUtils.*;
import static org.usergrid.utils.InflectionUtils.pluralize;
import static org.usergrid.utils.InflectionUtils.singularize;
import static org.usergrid.utils.JsonUtils.toJsonNode;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/SimpleCollectionRef.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/SimpleCollectionRef.java b/stack/core/src/main/java/org/usergrid/persistence/SimpleCollectionRef.java
index dab819b..8e7114c 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/SimpleCollectionRef.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/SimpleCollectionRef.java
@@ -16,10 +16,10 @@
package org.usergrid.persistence;
-import java.util.UUID;
-
import org.usergrid.persistence.cassandra.CassandraPersistenceUtils;
+import java.util.UUID;
+
public class SimpleCollectionRef implements CollectionRef {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/SimpleRoleRef.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/SimpleRoleRef.java b/stack/core/src/main/java/org/usergrid/persistence/SimpleRoleRef.java
index d77b23c..a34414d 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/SimpleRoleRef.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/SimpleRoleRef.java
@@ -16,14 +16,14 @@
package org.usergrid.persistence;
-import java.util.UUID;
-
import org.springframework.util.Assert;
import org.usergrid.persistence.cassandra.CassandraPersistenceUtils;
import org.usergrid.persistence.entities.Group;
import org.usergrid.utils.StringUtils;
import org.usergrid.utils.UUIDUtils;
+import java.util.UUID;
+
public class SimpleRoleRef implements RoleRef {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/ApplicationCF.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/ApplicationCF.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/ApplicationCF.java
index 0cca4c5..b33e80b 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/ApplicationCF.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/ApplicationCF.java
@@ -16,10 +16,10 @@
package org.usergrid.persistence.cassandra;
-import java.util.List;
-
import me.prettyprint.hector.api.ddl.ColumnDefinition;
+import java.util.List;
+
import static me.prettyprint.hector.api.ddl.ComparatorType.COUNTERTYPE;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.getIndexMetadata;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/CFEnum.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CFEnum.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CFEnum.java
index 859dd1a..ad34b4c 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CFEnum.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CFEnum.java
@@ -16,10 +16,10 @@
package org.usergrid.persistence.cassandra;
-import java.util.List;
-
import me.prettyprint.hector.api.ddl.ColumnDefinition;
+import java.util.List;
+
public interface CFEnum {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java
index 0046397..9363e8b 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java
@@ -16,27 +16,6 @@
package org.usergrid.persistence.cassandra;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.TreeMap;
-import java.util.UUID;
-
-import org.codehaus.jackson.JsonNode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.utils.JsonUtils;
-
-import org.apache.cassandra.thrift.ColumnDef;
-import org.apache.cassandra.thrift.IndexType;
-import org.apache.commons.lang.StringUtils;
-
import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
import me.prettyprint.cassandra.serializers.StringSerializer;
import me.prettyprint.cassandra.serializers.UUIDSerializer;
@@ -51,19 +30,26 @@ import me.prettyprint.hector.api.ddl.KeyspaceDefinition;
import me.prettyprint.hector.api.factory.HFactory;
import me.prettyprint.hector.api.mutation.MutationResult;
import me.prettyprint.hector.api.mutation.Mutator;
+import org.apache.cassandra.thrift.ColumnDef;
+import org.apache.cassandra.thrift.IndexType;
+import org.apache.commons.lang.StringUtils;
+import org.codehaus.jackson.JsonNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.utils.JsonUtils;
-import static java.nio.ByteBuffer.wrap;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.util.*;
+import java.util.Map.Entry;
+import static java.nio.ByteBuffer.wrap;
import static me.prettyprint.hector.api.factory.HFactory.createClockResolution;
import static me.prettyprint.hector.api.factory.HFactory.createColumn;
import static org.apache.commons.beanutils.MethodUtils.invokeStaticMethod;
-import static org.apache.commons.lang.StringUtils.removeEnd;
-import static org.apache.commons.lang.StringUtils.removeStart;
-import static org.apache.commons.lang.StringUtils.split;
-import static org.apache.commons.lang.StringUtils.substringAfterLast;
-import static org.usergrid.persistence.Schema.PROPERTY_TYPE;
-import static org.usergrid.persistence.Schema.PROPERTY_UUID;
-import static org.usergrid.persistence.Schema.serializeEntityProperty;
+import static org.apache.commons.lang.StringUtils.*;
+import static org.usergrid.persistence.Schema.*;
import static org.usergrid.utils.ClassUtils.isBasicType;
import static org.usergrid.utils.ConversionUtils.bytebuffer;
import static org.usergrid.utils.JsonUtils.toJsonNode;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java
index c471294..256e61e 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java
@@ -16,68 +16,34 @@
package org.usergrid.persistence.cassandra;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.locking.LockManager;
-import org.usergrid.persistence.IndexBucketLocator;
-import org.usergrid.persistence.IndexBucketLocator.IndexType;
-import org.usergrid.persistence.cassandra.index.IndexBucketScanner;
-import org.usergrid.persistence.cassandra.index.IndexScanner;
-
import me.prettyprint.cassandra.connection.HConnectionManager;
import me.prettyprint.cassandra.model.ConfigurableConsistencyLevel;
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.cassandra.serializers.BytesArraySerializer;
-import me.prettyprint.cassandra.serializers.DynamicCompositeSerializer;
-import me.prettyprint.cassandra.serializers.LongSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
+import me.prettyprint.cassandra.serializers.*;
import me.prettyprint.cassandra.service.CassandraHostConfigurator;
import me.prettyprint.cassandra.service.ThriftKsDef;
-import me.prettyprint.hector.api.Cluster;
-import me.prettyprint.hector.api.ConsistencyLevelPolicy;
-import me.prettyprint.hector.api.HConsistencyLevel;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.Serializer;
-import me.prettyprint.hector.api.beans.ColumnSlice;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.beans.OrderedRows;
-import me.prettyprint.hector.api.beans.Row;
-import me.prettyprint.hector.api.beans.Rows;
+import me.prettyprint.hector.api.*;
+import me.prettyprint.hector.api.beans.*;
import me.prettyprint.hector.api.ddl.ColumnFamilyDefinition;
import me.prettyprint.hector.api.ddl.KeyspaceDefinition;
import me.prettyprint.hector.api.factory.HFactory;
import me.prettyprint.hector.api.mutation.Mutator;
-import me.prettyprint.hector.api.query.ColumnQuery;
-import me.prettyprint.hector.api.query.CountQuery;
-import me.prettyprint.hector.api.query.MultigetSliceQuery;
-import me.prettyprint.hector.api.query.QueryResult;
-import me.prettyprint.hector.api.query.RangeSlicesQuery;
-import me.prettyprint.hector.api.query.SliceQuery;
+import me.prettyprint.hector.api.query.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.locking.LockManager;
+import org.usergrid.persistence.IndexBucketLocator;
+import org.usergrid.persistence.IndexBucketLocator.IndexType;
+import org.usergrid.persistence.cassandra.index.IndexBucketScanner;
+import org.usergrid.persistence.cassandra.index.IndexScanner;
+
+import java.nio.ByteBuffer;
+import java.util.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
import static me.prettyprint.cassandra.service.FailoverPolicy.ON_FAIL_TRY_ALL_AVAILABLE;
-import static me.prettyprint.hector.api.factory.HFactory.createColumn;
-import static me.prettyprint.hector.api.factory.HFactory.createMultigetSliceQuery;
-import static me.prettyprint.hector.api.factory.HFactory.createMutator;
-import static me.prettyprint.hector.api.factory.HFactory.createRangeSlicesQuery;
-import static me.prettyprint.hector.api.factory.HFactory.createSliceQuery;
-import static me.prettyprint.hector.api.factory.HFactory.createVirtualKeyspace;
+import static me.prettyprint.hector.api.factory.HFactory.*;
import static org.apache.commons.collections.MapUtils.getIntValue;
import static org.apache.commons.collections.MapUtils.getString;
import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_ID_SETS;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectedEntityRefImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectedEntityRefImpl.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectedEntityRefImpl.java
index c093329..9c92eaf 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectedEntityRefImpl.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectedEntityRefImpl.java
@@ -16,12 +16,12 @@
package org.usergrid.persistence.cassandra;
-import java.util.UUID;
-
import org.usergrid.persistence.ConnectedEntityRef;
import org.usergrid.persistence.EntityRef;
import org.usergrid.persistence.SimpleEntityRef;
+import java.util.UUID;
+
public class ConnectedEntityRefImpl extends SimpleEntityRef implements ConnectedEntityRef {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectionRefImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectionRefImpl.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectionRefImpl.java
index c37d45d..36562ff 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectionRefImpl.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectionRefImpl.java
@@ -16,14 +16,8 @@
package org.usergrid.persistence.cassandra;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.UUID;
-
+import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.ConnectedEntityRef;
@@ -31,8 +25,9 @@ import org.usergrid.persistence.ConnectionRef;
import org.usergrid.persistence.EntityRef;
import org.usergrid.persistence.SimpleEntityRef;
-import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.lang.StringUtils;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.*;
import static org.usergrid.persistence.SimpleEntityRef.ref;
import static org.usergrid.utils.ConversionUtils.ascii;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/CounterUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CounterUtils.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CounterUtils.java
index 4962fb6..d76bede 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CounterUtils.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CounterUtils.java
@@ -16,40 +16,27 @@
package org.usergrid.persistence.cassandra;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.*;
+import me.prettyprint.hector.api.beans.HCounterColumn;
+import me.prettyprint.hector.api.mutation.Mutator;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.usergrid.count.Batcher;
+import org.usergrid.count.common.Count;
import org.usergrid.mq.Message;
import org.usergrid.mq.cassandra.QueuesCF;
import org.usergrid.persistence.CounterResolution;
import org.usergrid.persistence.entities.Event;
-import org.apache.commons.lang.StringUtils;
-
-import org.usergrid.count.Batcher;
-import org.usergrid.count.common.Count;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.cassandra.serializers.LongSerializer;
-import me.prettyprint.cassandra.serializers.PrefixedSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-import me.prettyprint.hector.api.beans.HCounterColumn;
-import me.prettyprint.hector.api.mutation.Mutator;
+import java.nio.ByteBuffer;
+import java.util.*;
+import java.util.Map.Entry;
import static me.prettyprint.hector.api.factory.HFactory.createColumn;
import static me.prettyprint.hector.api.factory.HFactory.createCounterColumn;
import static org.usergrid.persistence.Schema.DICTIONARY_COUNTERS;
-import static org.usergrid.persistence.cassandra.ApplicationCF.APPLICATION_AGGREGATE_COUNTERS;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_COUNTERS;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_DICTIONARIES;
+import static org.usergrid.persistence.cassandra.ApplicationCF.*;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.addInsertToMutator;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.key;
import static org.usergrid.utils.ConversionUtils.bytebuffer;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/CursorCache.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CursorCache.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CursorCache.java
index 7b29a2b..2614e39 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CursorCache.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CursorCache.java
@@ -7,7 +7,6 @@ import java.util.Map;
import java.util.Map.Entry;
import static java.lang.Integer.parseInt;
-
import static org.apache.commons.codec.binary.Base64.decodeBase64;
import static org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString;
import static org.apache.commons.lang.StringUtils.split;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
index 1868f9a..5b5b26d 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
@@ -16,11 +16,17 @@
package org.usergrid.persistence.cassandra;
-import java.nio.ByteBuffer;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.UUID;
-
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.yammer.metrics.annotation.Metered;
+import me.prettyprint.cassandra.serializers.*;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.beans.*;
+import me.prettyprint.hector.api.mutation.Mutator;
+import me.prettyprint.hector.api.query.QueryResult;
+import me.prettyprint.hector.api.query.RangeSlicesQuery;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
@@ -33,42 +39,17 @@ import org.usergrid.persistence.entities.Application;
import org.usergrid.persistence.exceptions.ApplicationAlreadyExistsException;
import org.usergrid.utils.UUIDUtils;
-import org.apache.commons.lang.StringUtils;
-
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.yammer.metrics.annotation.Metered;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.cassandra.serializers.BytesArraySerializer;
-import me.prettyprint.cassandra.serializers.DynamicCompositeSerializer;
-import me.prettyprint.cassandra.serializers.LongSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.beans.ColumnSlice;
-import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.beans.OrderedRows;
-import me.prettyprint.hector.api.beans.Row;
-import me.prettyprint.hector.api.beans.Rows;
-import me.prettyprint.hector.api.mutation.Mutator;
-import me.prettyprint.hector.api.query.QueryResult;
-import me.prettyprint.hector.api.query.RangeSlicesQuery;
+import java.nio.ByteBuffer;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.UUID;
import static java.lang.String.CASE_INSENSITIVE_ORDER;
-
import static me.prettyprint.hector.api.factory.HFactory.createMutator;
import static me.prettyprint.hector.api.factory.HFactory.createRangeSlicesQuery;
-import static org.usergrid.persistence.Schema.PROPERTY_NAME;
-import static org.usergrid.persistence.Schema.PROPERTY_UUID;
-import static org.usergrid.persistence.Schema.TYPE_APPLICATION;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.addInsertToMutator;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.asMap;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.batchExecute;
-import static org.usergrid.persistence.cassandra.CassandraService.APPLICATIONS_CF;
-import static org.usergrid.persistence.cassandra.CassandraService.PROPERTIES_CF;
-import static org.usergrid.persistence.cassandra.CassandraService.RETRY_COUNT;
+import static org.usergrid.persistence.Schema.*;
+import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.*;
+import static org.usergrid.persistence.cassandra.CassandraService.*;
import static org.usergrid.utils.ConversionUtils.uuid;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java
index fda492d..8dd10bc 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java
@@ -16,25 +16,20 @@
package org.usergrid.persistence.cassandra;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.UUID;
-
-import javax.annotation.Resource;
-
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import com.yammer.metrics.annotation.Metered;
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import me.prettyprint.cassandra.serializers.LongSerializer;
+import me.prettyprint.cassandra.serializers.StringSerializer;
+import me.prettyprint.cassandra.serializers.UUIDSerializer;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.beans.*;
+import me.prettyprint.hector.api.factory.HFactory;
+import me.prettyprint.hector.api.mutation.Mutator;
+import me.prettyprint.hector.api.query.MultigetSliceCounterQuery;
+import me.prettyprint.hector.api.query.QueryResult;
+import me.prettyprint.hector.api.query.SliceCounterQuery;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
@@ -43,37 +38,13 @@ import org.usergrid.locking.Lock;
import org.usergrid.mq.Message;
import org.usergrid.mq.QueueManager;
import org.usergrid.mq.cassandra.QueueManagerFactoryImpl;
-import org.usergrid.persistence.AggregateCounter;
-import org.usergrid.persistence.AggregateCounterSet;
-import org.usergrid.persistence.CollectionRef;
-import org.usergrid.persistence.ConnectedEntityRef;
-import org.usergrid.persistence.ConnectionRef;
-import org.usergrid.persistence.CounterResolution;
-import org.usergrid.persistence.DynamicEntity;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityFactory;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.IndexBucketLocator;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.IndexBucketLocator.IndexType;
-import org.usergrid.persistence.Query;
import org.usergrid.persistence.Query.CounterFilterPredicate;
-import org.usergrid.persistence.Results;
import org.usergrid.persistence.Results.Level;
-import org.usergrid.persistence.RoleRef;
-import org.usergrid.persistence.Schema;
-import org.usergrid.persistence.SimpleCollectionRef;
-import org.usergrid.persistence.SimpleEntityRef;
-import org.usergrid.persistence.SimpleRoleRef;
-import org.usergrid.persistence.TypedEntity;
import org.usergrid.persistence.cassandra.CounterUtils.AggregateCounterSelection;
import org.usergrid.persistence.cassandra.util.TraceParticipant;
-import org.usergrid.persistence.entities.Application;
-import org.usergrid.persistence.entities.Event;
-import org.usergrid.persistence.entities.Group;
-import org.usergrid.persistence.entities.Role;
-import org.usergrid.persistence.entities.User;
+import org.usergrid.persistence.entities.*;
import org.usergrid.persistence.exceptions.DuplicateUniquePropertyExistsException;
import org.usergrid.persistence.exceptions.EntityNotFoundException;
import org.usergrid.persistence.exceptions.RequiredPropertyNotFoundException;
@@ -83,33 +54,12 @@ import org.usergrid.utils.ClassUtils;
import org.usergrid.utils.CompositeUtils;
import org.usergrid.utils.UUIDUtils;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-import com.yammer.metrics.annotation.Metered;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.cassandra.serializers.LongSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.beans.ColumnSlice;
-import me.prettyprint.hector.api.beans.CounterRow;
-import me.prettyprint.hector.api.beans.CounterRows;
-import me.prettyprint.hector.api.beans.CounterSlice;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.beans.HCounterColumn;
-import me.prettyprint.hector.api.beans.Row;
-import me.prettyprint.hector.api.beans.Rows;
-import me.prettyprint.hector.api.factory.HFactory;
-import me.prettyprint.hector.api.mutation.Mutator;
-import me.prettyprint.hector.api.query.MultigetSliceCounterQuery;
-import me.prettyprint.hector.api.query.QueryResult;
-import me.prettyprint.hector.api.query.SliceCounterQuery;
+import javax.annotation.Resource;
+import java.nio.ByteBuffer;
+import java.util.*;
import static java.lang.String.CASE_INSENSITIVE_ORDER;
import static java.util.Arrays.asList;
-
import static me.prettyprint.hector.api.factory.HFactory.createCounterSliceQuery;
import static me.prettyprint.hector.api.factory.HFactory.createMutator;
import static org.apache.commons.lang.StringUtils.capitalize;
@@ -117,59 +67,18 @@ import static org.apache.commons.lang.StringUtils.isBlank;
import static org.usergrid.locking.LockHelper.getUniqueUpdateLock;
import static org.usergrid.persistence.Results.Level.REFS;
import static org.usergrid.persistence.Results.fromEntities;
-import static org.usergrid.persistence.Schema.COLLECTION_ROLES;
-import static org.usergrid.persistence.Schema.COLLECTION_USERS;
-import static org.usergrid.persistence.Schema.DICTIONARY_COLLECTIONS;
-import static org.usergrid.persistence.Schema.DICTIONARY_PERMISSIONS;
-import static org.usergrid.persistence.Schema.DICTIONARY_PROPERTIES;
-import static org.usergrid.persistence.Schema.DICTIONARY_ROLENAMES;
-import static org.usergrid.persistence.Schema.DICTIONARY_ROLETIMES;
-import static org.usergrid.persistence.Schema.DICTIONARY_SETS;
-import static org.usergrid.persistence.Schema.PROPERTY_ASSOCIATED;
-import static org.usergrid.persistence.Schema.PROPERTY_CREATED;
-import static org.usergrid.persistence.Schema.PROPERTY_INACTIVITY;
-import static org.usergrid.persistence.Schema.PROPERTY_MODIFIED;
-import static org.usergrid.persistence.Schema.PROPERTY_NAME;
-import static org.usergrid.persistence.Schema.PROPERTY_TIMESTAMP;
-import static org.usergrid.persistence.Schema.PROPERTY_TYPE;
-import static org.usergrid.persistence.Schema.PROPERTY_UUID;
-import static org.usergrid.persistence.Schema.TYPE_APPLICATION;
-import static org.usergrid.persistence.Schema.TYPE_CONNECTION;
-import static org.usergrid.persistence.Schema.TYPE_ENTITY;
-import static org.usergrid.persistence.Schema.TYPE_MEMBER;
-import static org.usergrid.persistence.Schema.TYPE_ROLE;
-import static org.usergrid.persistence.Schema.defaultCollectionName;
-import static org.usergrid.persistence.Schema.deserializeEntityProperties;
-import static org.usergrid.persistence.Schema.getDefaultSchema;
+import static org.usergrid.persistence.Schema.*;
import static org.usergrid.persistence.SimpleEntityRef.getUuid;
import static org.usergrid.persistence.SimpleEntityRef.ref;
import static org.usergrid.persistence.SimpleRoleRef.getIdForGroupIdAndRoleName;
import static org.usergrid.persistence.SimpleRoleRef.getIdForRoleName;
-import static org.usergrid.persistence.cassandra.ApplicationCF.APPLICATION_AGGREGATE_COUNTERS;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_COMPOSITE_DICTIONARIES;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_COUNTERS;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_DICTIONARIES;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_ID_SETS;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_PROPERTIES;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_UNIQUE;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.addDeleteToMutator;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.addInsertToMutator;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.addPropertyToMutator;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.batchExecute;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.key;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.toStorableBinaryValue;
+import static org.usergrid.persistence.cassandra.ApplicationCF.*;
+import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.*;
import static org.usergrid.persistence.cassandra.CassandraService.ALL_COUNT;
import static org.usergrid.utils.ClassUtils.cast;
-import static org.usergrid.utils.ConversionUtils.bytebuffer;
-import static org.usergrid.utils.ConversionUtils.getLong;
-import static org.usergrid.utils.ConversionUtils.object;
-import static org.usergrid.utils.ConversionUtils.string;
-import static org.usergrid.utils.ConversionUtils.uuid;
+import static org.usergrid.utils.ConversionUtils.*;
import static org.usergrid.utils.InflectionUtils.singularize;
-import static org.usergrid.utils.UUIDUtils.getTimestampInMicros;
-import static org.usergrid.utils.UUIDUtils.getTimestampInMillis;
-import static org.usergrid.utils.UUIDUtils.isTimeBased;
-import static org.usergrid.utils.UUIDUtils.newTimeUUID;
+import static org.usergrid.utils.UUIDUtils.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityValueSerializer.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityValueSerializer.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityValueSerializer.java
index d4b13e7..4ebaaaf 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityValueSerializer.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityValueSerializer.java
@@ -16,12 +16,12 @@
package org.usergrid.persistence.cassandra;
-import java.nio.ByteBuffer;
-import java.util.List;
-
import me.prettyprint.cassandra.serializers.AbstractSerializer;
import me.prettyprint.hector.api.beans.DynamicComposite;
+import java.nio.ByteBuffer;
+import java.util.List;
+
import static org.usergrid.utils.ConversionUtils.bytebuffer;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/GeoIndexManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/GeoIndexManager.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/GeoIndexManager.java
index 1f83422..b21093c 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/GeoIndexManager.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/GeoIndexManager.java
@@ -16,10 +16,11 @@
package org.usergrid.persistence.cassandra;
-import java.nio.ByteBuffer;
-import java.util.List;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.beans.DynamicComposite;
+import me.prettyprint.hector.api.beans.HColumn;
+import me.prettyprint.hector.api.mutation.Mutator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.EntityRef;
@@ -29,21 +30,16 @@ import org.usergrid.persistence.geo.EntityLocationRef;
import org.usergrid.persistence.geo.GeocellManager;
import org.usergrid.persistence.geo.model.Point;
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.mutation.Mutator;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.UUID;
import static me.prettyprint.hector.api.factory.HFactory.createColumn;
import static me.prettyprint.hector.api.factory.HFactory.createMutator;
import static org.usergrid.persistence.Schema.DICTIONARY_GEOCELL;
import static org.usergrid.persistence.Schema.INDEX_CONNECTIONS;
import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_INDEX;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.addInsertToMutator;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.batchExecute;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.key;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.logBatchOperation;
+import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.*;
import static org.usergrid.utils.ConversionUtils.bytebuffer;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/IndexUpdate.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/IndexUpdate.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/IndexUpdate.java
index 0a3f578..3f5ab2c 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/IndexUpdate.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/IndexUpdate.java
@@ -16,30 +16,21 @@
package org.usergrid.persistence.cassandra;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
+import com.fasterxml.uuid.UUIDComparator;
+import me.prettyprint.hector.api.beans.DynamicComposite;
+import me.prettyprint.hector.api.mutation.Mutator;
import org.codehaus.jackson.JsonNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
-import com.fasterxml.uuid.UUIDComparator;
-
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.mutation.Mutator;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.util.*;
import static java.nio.ByteBuffer.wrap;
import static java.util.Arrays.asList;
-
import static org.usergrid.utils.JsonUtils.toJsonNode;
import static org.usergrid.utils.UUIDUtils.getTimestampInMicros;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/QueryProcessor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/QueryProcessor.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/QueryProcessor.java
index b5d77a3..cd80803 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/QueryProcessor.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/QueryProcessor.java
@@ -16,61 +16,26 @@
package org.usergrid.persistence.cassandra;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Stack;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.UUIDSerializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.Query;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.Query.SortDirection;
import org.usergrid.persistence.Query.SortPredicate;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.Schema;
import org.usergrid.persistence.entities.User;
import org.usergrid.persistence.exceptions.NoFullTextIndexException;
import org.usergrid.persistence.exceptions.NoIndexException;
import org.usergrid.persistence.exceptions.PersistenceException;
-import org.usergrid.persistence.query.ir.AllNode;
-import org.usergrid.persistence.query.ir.AndNode;
-import org.usergrid.persistence.query.ir.EmailIdentifierNode;
-import org.usergrid.persistence.query.ir.NameIdentifierNode;
-import org.usergrid.persistence.query.ir.NotNode;
-import org.usergrid.persistence.query.ir.OrNode;
-import org.usergrid.persistence.query.ir.OrderByNode;
-import org.usergrid.persistence.query.ir.QueryNode;
-import org.usergrid.persistence.query.ir.QuerySlice;
-import org.usergrid.persistence.query.ir.SearchVisitor;
-import org.usergrid.persistence.query.ir.SliceNode;
-import org.usergrid.persistence.query.ir.UuidIdentifierNode;
-import org.usergrid.persistence.query.ir.WithinNode;
+import org.usergrid.persistence.query.ir.*;
import org.usergrid.persistence.query.ir.result.ResultIterator;
import org.usergrid.persistence.query.ir.result.ResultsLoader;
import org.usergrid.persistence.query.ir.result.ResultsLoaderFactory;
import org.usergrid.persistence.query.ir.result.ScanColumn;
-import org.usergrid.persistence.query.tree.AndOperand;
-import org.usergrid.persistence.query.tree.ContainsOperand;
-import org.usergrid.persistence.query.tree.Equal;
-import org.usergrid.persistence.query.tree.EqualityOperand;
-import org.usergrid.persistence.query.tree.GreaterThan;
-import org.usergrid.persistence.query.tree.GreaterThanEqual;
-import org.usergrid.persistence.query.tree.LessThan;
-import org.usergrid.persistence.query.tree.LessThanEqual;
-import org.usergrid.persistence.query.tree.Literal;
-import org.usergrid.persistence.query.tree.NotOperand;
-import org.usergrid.persistence.query.tree.Operand;
-import org.usergrid.persistence.query.tree.OrOperand;
-import org.usergrid.persistence.query.tree.QueryVisitor;
-import org.usergrid.persistence.query.tree.StringLiteral;
-import org.usergrid.persistence.query.tree.WithinOperand;
+import org.usergrid.persistence.query.tree.*;
import org.usergrid.persistence.schema.CollectionInfo;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
+import java.nio.ByteBuffer;
+import java.util.*;
import static org.usergrid.persistence.Schema.getDefaultSchema;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/RelationManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/RelationManagerImpl.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/RelationManagerImpl.java
index d56a1ed..52983b4 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/RelationManagerImpl.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/RelationManagerImpl.java
@@ -16,41 +16,21 @@
package org.usergrid.persistence.cassandra;
-import java.nio.ByteBuffer;
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.UUID;
-
+import com.yammer.metrics.annotation.Metered;
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import me.prettyprint.cassandra.serializers.StringSerializer;
+import me.prettyprint.cassandra.serializers.UUIDSerializer;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.beans.DynamicComposite;
+import me.prettyprint.hector.api.beans.HColumn;
+import me.prettyprint.hector.api.mutation.Mutator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.Assert;
-import org.usergrid.persistence.CollectionRef;
-import org.usergrid.persistence.ConnectedEntityRef;
-import org.usergrid.persistence.ConnectionRef;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.IndexBucketLocator;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.IndexBucketLocator.IndexType;
-import org.usergrid.persistence.PagingResultsIterator;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.RelationManager;
-import org.usergrid.persistence.Results;
import org.usergrid.persistence.Results.Level;
-import org.usergrid.persistence.RoleRef;
-import org.usergrid.persistence.Schema;
-import org.usergrid.persistence.SimpleCollectionRef;
-import org.usergrid.persistence.SimpleEntityRef;
-import org.usergrid.persistence.SimpleRoleRef;
-import org.usergrid.persistence.cassandra.IndexUpdate.IndexEntry;
+import org.usergrid.persistence.cassandra.IndexUpdate.*;
import org.usergrid.persistence.cassandra.index.ConnectedIndexScanner;
import org.usergrid.persistence.cassandra.index.IndexBucketScanner;
import org.usergrid.persistence.cassandra.index.IndexScanner;
@@ -60,77 +40,26 @@ import org.usergrid.persistence.geo.CollectionGeoSearch;
import org.usergrid.persistence.geo.ConnectionGeoSearch;
import org.usergrid.persistence.geo.EntityLocationRef;
import org.usergrid.persistence.geo.model.Point;
-import org.usergrid.persistence.query.ir.AllNode;
-import org.usergrid.persistence.query.ir.NameIdentifierNode;
-import org.usergrid.persistence.query.ir.QueryNode;
-import org.usergrid.persistence.query.ir.QuerySlice;
-import org.usergrid.persistence.query.ir.SearchVisitor;
-import org.usergrid.persistence.query.ir.WithinNode;
-import org.usergrid.persistence.query.ir.result.CollectionResultsLoaderFactory;
-import org.usergrid.persistence.query.ir.result.ConnectionIndexSliceParser;
-import org.usergrid.persistence.query.ir.result.ConnectionResultsLoaderFactory;
-import org.usergrid.persistence.query.ir.result.ConnectionTypesIterator;
-import org.usergrid.persistence.query.ir.result.EmptyIterator;
-import org.usergrid.persistence.query.ir.result.GeoIterator;
-import org.usergrid.persistence.query.ir.result.SliceIterator;
-import org.usergrid.persistence.query.ir.result.StaticIdIterator;
-import org.usergrid.persistence.query.ir.result.UUIDIndexSliceParser;
+import org.usergrid.persistence.query.ir.*;
+import org.usergrid.persistence.query.ir.result.*;
import org.usergrid.persistence.schema.CollectionInfo;
import org.usergrid.utils.IndexUtils;
import org.usergrid.utils.MapUtils;
-import com.yammer.metrics.annotation.Metered;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.mutation.Mutator;
+import java.nio.ByteBuffer;
+import java.util.*;
+import java.util.Map.Entry;
import static java.lang.String.CASE_INSENSITIVE_ORDER;
import static java.util.Arrays.asList;
-
import static me.prettyprint.hector.api.factory.HFactory.createMutator;
-import static org.usergrid.persistence.Schema.COLLECTION_ROLES;
-import static org.usergrid.persistence.Schema.DICTIONARY_COLLECTIONS;
-import static org.usergrid.persistence.Schema.DICTIONARY_CONNECTED_ENTITIES;
-import static org.usergrid.persistence.Schema.DICTIONARY_CONNECTED_TYPES;
-import static org.usergrid.persistence.Schema.DICTIONARY_CONNECTING_ENTITIES;
-import static org.usergrid.persistence.Schema.DICTIONARY_CONNECTING_TYPES;
-import static org.usergrid.persistence.Schema.INDEX_CONNECTIONS;
-import static org.usergrid.persistence.Schema.PROPERTY_COLLECTION_NAME;
-import static org.usergrid.persistence.Schema.PROPERTY_INACTIVITY;
-import static org.usergrid.persistence.Schema.PROPERTY_ITEM;
-import static org.usergrid.persistence.Schema.PROPERTY_ITEM_TYPE;
-import static org.usergrid.persistence.Schema.PROPERTY_NAME;
-import static org.usergrid.persistence.Schema.PROPERTY_TITLE;
-import static org.usergrid.persistence.Schema.PROPERTY_TYPE;
-import static org.usergrid.persistence.Schema.TYPE_APPLICATION;
-import static org.usergrid.persistence.Schema.TYPE_ENTITY;
-import static org.usergrid.persistence.Schema.TYPE_MEMBER;
-import static org.usergrid.persistence.Schema.TYPE_ROLE;
-import static org.usergrid.persistence.Schema.defaultCollectionName;
-import static org.usergrid.persistence.Schema.getDefaultSchema;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_COMPOSITE_DICTIONARIES;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_DICTIONARIES;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_ID_SETS;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_INDEX;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_INDEX_ENTRIES;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.addDeleteToMutator;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.addInsertToMutator;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.batchExecute;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.key;
+import static org.usergrid.persistence.Schema.*;
+import static org.usergrid.persistence.cassandra.ApplicationCF.*;
+import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.*;
import static org.usergrid.persistence.cassandra.CassandraService.INDEX_ENTRY_LIST_COUNT;
import static org.usergrid.persistence.cassandra.ConnectionRefImpl.CONNECTION_ENTITY_CONNECTION_TYPE;
-import static org.usergrid.persistence.cassandra.GeoIndexManager.batchDeleteLocationInConnectionsIndex;
-import static org.usergrid.persistence.cassandra.GeoIndexManager.batchRemoveLocationFromCollectionIndex;
-import static org.usergrid.persistence.cassandra.GeoIndexManager.batchStoreLocationInCollectionIndex;
-import static org.usergrid.persistence.cassandra.GeoIndexManager.batchStoreLocationInConnectionsIndex;
-import static org.usergrid.persistence.cassandra.IndexUpdate.indexValueCode;
-import static org.usergrid.persistence.cassandra.IndexUpdate.toIndexableValue;
-import static org.usergrid.persistence.cassandra.IndexUpdate.validIndexableValue;
+import static org.usergrid.persistence.cassandra.GeoIndexManager.*;
+import static org.usergrid.persistence.cassandra.IndexUpdate.*;
import static org.usergrid.utils.ClassUtils.cast;
import static org.usergrid.utils.CompositeUtils.setGreaterThanEqualityFlag;
import static org.usergrid.utils.ConversionUtils.string;
[09/23] organize imports only
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServer.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServer.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServer.java
index 1fb6c1c..4a5e787 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServer.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServer.java
@@ -16,11 +16,9 @@
package org.usergrid.mongo;
-import java.net.InetSocketAddress;
-import java.nio.ByteOrder;
-import java.util.Properties;
-import java.util.concurrent.Executors;
-
+import org.apache.shiro.mgt.DefaultSecurityManager;
+import org.apache.shiro.mgt.SessionsSecurityManager;
+import org.apache.shiro.realm.Realm;
import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.buffer.HeapChannelBufferFactory;
import org.jboss.netty.channel.Channel;
@@ -38,9 +36,10 @@ import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.persistence.cassandra.EntityManagerFactoryImpl;
import org.usergrid.services.ServiceManagerFactory;
-import org.apache.shiro.mgt.DefaultSecurityManager;
-import org.apache.shiro.mgt.SessionsSecurityManager;
-import org.apache.shiro.realm.Realm;
+import java.net.InetSocketAddress;
+import java.nio.ByteOrder;
+import java.util.Properties;
+import java.util.concurrent.Executors;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServerPipelineFactory.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServerPipelineFactory.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServerPipelineFactory.java
index 8b2f8ef..3a83d7a 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServerPipelineFactory.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServerPipelineFactory.java
@@ -16,6 +16,7 @@
package org.usergrid.mongo;
+import org.apache.shiro.mgt.SessionsSecurityManager;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelPipelineFactory;
import org.jboss.netty.channel.Channels;
@@ -24,8 +25,6 @@ import org.usergrid.management.ManagementService;
import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.services.ServiceManagerFactory;
-import org.apache.shiro.mgt.SessionsSecurityManager;
-
public class MongoServerPipelineFactory implements ChannelPipelineFactory {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/ListDatabases.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/ListDatabases.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/ListDatabases.java
index 30413ac..e67e594 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/ListDatabases.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/ListDatabases.java
@@ -16,11 +16,6 @@
package org.usergrid.mongo.commands;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.MessageEvent;
import org.usergrid.mongo.MongoChannelHandler;
@@ -28,6 +23,11 @@ import org.usergrid.mongo.protocol.OpQuery;
import org.usergrid.mongo.protocol.OpReply;
import org.usergrid.security.shiro.utils.SubjectUtils;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import static org.usergrid.utils.MapUtils.map;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/MongoCommand.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/MongoCommand.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/MongoCommand.java
index 445a589..d87d05b 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/MongoCommand.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/MongoCommand.java
@@ -16,8 +16,6 @@
package org.usergrid.mongo.commands;
-import java.util.concurrent.ConcurrentHashMap;
-
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.MessageEvent;
import org.slf4j.Logger;
@@ -27,6 +25,8 @@ import org.usergrid.mongo.MongoChannelHandler;
import org.usergrid.mongo.protocol.OpQuery;
import org.usergrid.mongo.protocol.OpReply;
+import java.util.concurrent.ConcurrentHashMap;
+
public abstract class MongoCommand {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/Whatsmyuri.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/Whatsmyuri.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/Whatsmyuri.java
index dea8b03..0ef1e24 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/Whatsmyuri.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/Whatsmyuri.java
@@ -16,14 +16,14 @@
package org.usergrid.mongo.commands;
-import java.net.InetSocketAddress;
-
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.MessageEvent;
import org.usergrid.mongo.MongoChannelHandler;
import org.usergrid.mongo.protocol.OpQuery;
import org.usergrid.mongo.protocol.OpReply;
+import java.net.InetSocketAddress;
+
import static org.usergrid.utils.MapUtils.entry;
import static org.usergrid.utils.MapUtils.map;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/Message.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/Message.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/Message.java
index e573abc..fab2c5b 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/Message.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/Message.java
@@ -16,6 +16,12 @@
package org.usergrid.mongo.protocol;
+import org.bson.BSONObject;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.usergrid.mongo.utils.BSONUtils;
+import org.usergrid.utils.StringUtils;
+
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
@@ -23,12 +29,6 @@ import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;
-import org.bson.BSONObject;
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.usergrid.mongo.utils.BSONUtils;
-import org.usergrid.utils.StringUtils;
-
public class Message {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpDelete.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpDelete.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpDelete.java
index 1c20b39..ed29738 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpDelete.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpDelete.java
@@ -16,11 +16,6 @@
package org.usergrid.mongo.protocol;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Map;
-import java.util.UUID;
-
import org.bson.BSONObject;
import org.bson.BasicBSONObject;
import org.jboss.netty.buffer.ChannelBuffer;
@@ -33,14 +28,15 @@ import org.usergrid.management.ApplicationInfo;
import org.usergrid.mongo.MongoChannelHandler;
import org.usergrid.mongo.query.MongoQueryParser;
import org.usergrid.mongo.utils.BSONUtils;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.Results.Level;
-import org.usergrid.persistence.SimpleEntityRef;
import org.usergrid.security.shiro.utils.SubjectUtils;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Map;
+import java.util.UUID;
+
public class OpDelete extends OpCrud {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpGetMore.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpGetMore.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpGetMore.java
index 632b7a3..186fe11 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpGetMore.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpGetMore.java
@@ -16,14 +16,14 @@
package org.usergrid.mongo.protocol;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.MessageEvent;
import org.usergrid.mongo.MongoChannelHandler;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
public class OpGetMore extends OpCrud {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpInsert.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpInsert.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpInsert.java
index e179ecb..df77251 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpInsert.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpInsert.java
@@ -16,12 +16,6 @@
package org.usergrid.mongo.protocol;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
import org.bson.BSONObject;
import org.bson.BasicBSONObject;
import org.bson.types.ObjectId;
@@ -38,6 +32,12 @@ import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.Identifier;
import org.usergrid.security.shiro.utils.SubjectUtils;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
public class OpInsert extends OpCrud {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpKillCursors.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpKillCursors.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpKillCursors.java
index 98ef335..373bced 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpKillCursors.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpKillCursors.java
@@ -16,12 +16,12 @@
package org.usergrid.mongo.protocol;
+import org.jboss.netty.buffer.ChannelBuffer;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.jboss.netty.buffer.ChannelBuffer;
-
public class OpKillCursors extends Message {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpMsg.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpMsg.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpMsg.java
index 3acebd3..af6002f 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpMsg.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpMsg.java
@@ -16,11 +16,11 @@
package org.usergrid.mongo.protocol;
+import org.jboss.netty.buffer.ChannelBuffer;
+
import java.io.IOException;
import java.nio.ByteBuffer;
-import org.jboss.netty.buffer.ChannelBuffer;
-
public class OpMsg extends Message {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpQuery.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpQuery.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpQuery.java
index 3374c2b..3fb2a9e 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpQuery.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpQuery.java
@@ -16,14 +16,8 @@
package org.usergrid.mongo.protocol;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.subject.Subject;
import org.bson.BSONObject;
import org.bson.BasicBSONObject;
import org.bson.types.ObjectId;
@@ -39,18 +33,18 @@ import org.usergrid.mongo.MongoChannelHandler;
import org.usergrid.mongo.commands.MongoCommand;
import org.usergrid.mongo.query.MongoQueryParser;
import org.usergrid.mongo.utils.BSONUtils;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.Schema;
+import org.usergrid.persistence.*;
import org.usergrid.security.shiro.PrincipalCredentialsToken;
import org.usergrid.security.shiro.utils.SubjectUtils;
import org.usergrid.utils.MapUtils;
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.subject.Subject;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
import static org.usergrid.utils.JsonUtils.toJsonMap;
import static org.usergrid.utils.MapUtils.entry;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpReply.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpReply.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpReply.java
index 92a6a6d..eb471b8 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpReply.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpReply.java
@@ -16,18 +16,18 @@
package org.usergrid.mongo.protocol;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
import org.bson.BSONObject;
import org.bson.BasicBSONObject;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBufferInputStream;
import org.usergrid.mongo.utils.BSONUtils;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
public class OpReply extends Message {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpUpdate.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpUpdate.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpUpdate.java
index 3e11d45..545bee5 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpUpdate.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpUpdate.java
@@ -16,10 +16,6 @@
package org.usergrid.mongo.protocol;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Map;
-
import org.bson.BSONObject;
import org.bson.BasicBSONObject;
import org.jboss.netty.buffer.ChannelBuffer;
@@ -32,13 +28,13 @@ import org.usergrid.management.ApplicationInfo;
import org.usergrid.mongo.MongoChannelHandler;
import org.usergrid.mongo.query.MongoQueryParser;
import org.usergrid.mongo.utils.BSONUtils;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
+import org.usergrid.persistence.*;
import org.usergrid.security.shiro.utils.SubjectUtils;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Map;
+
public class OpUpdate extends OpCrud {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/query/MongoQueryParser.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/query/MongoQueryParser.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/query/MongoQueryParser.java
index 89bd8cc..dc9bcdd 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/query/MongoQueryParser.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/query/MongoQueryParser.java
@@ -16,22 +16,15 @@
package org.usergrid.mongo.query;
-import java.util.Stack;
-
import org.antlr.runtime.ClassicToken;
import org.bson.BSONObject;
import org.bson.BasicBSONObject;
import org.bson.types.BasicBSONList;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.Query.SortDirection;
-import org.usergrid.persistence.query.tree.AndOperand;
-import org.usergrid.persistence.query.tree.Equal;
-import org.usergrid.persistence.query.tree.GreaterThan;
-import org.usergrid.persistence.query.tree.GreaterThanEqual;
-import org.usergrid.persistence.query.tree.LessThan;
-import org.usergrid.persistence.query.tree.LessThanEqual;
-import org.usergrid.persistence.query.tree.Operand;
-import org.usergrid.persistence.query.tree.OrOperand;
+import org.usergrid.persistence.query.tree.*;
+
+import java.util.Stack;
import static org.apache.commons.collections.MapUtils.getIntValue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyInboundHandler.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyInboundHandler.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyInboundHandler.java
index 9ee6f11..df2a88b 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyInboundHandler.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyInboundHandler.java
@@ -16,25 +16,18 @@
package org.usergrid.mongo.testproxy;
-import java.net.InetSocketAddress;
-import java.nio.ByteOrder;
-
import org.jboss.netty.bootstrap.ClientBootstrap;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
import org.jboss.netty.buffer.HeapChannelBufferFactory;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import org.jboss.netty.channel.*;
import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
import org.usergrid.mongo.MongoMessageDecoder;
import org.usergrid.mongo.protocol.Message;
+import java.net.InetSocketAddress;
+import java.nio.ByteOrder;
+
public class MongoProxyInboundHandler extends SimpleChannelUpstreamHandler {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyServer.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyServer.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyServer.java
index 24222da..cc97d37 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyServer.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyServer.java
@@ -16,11 +16,6 @@
package org.usergrid.mongo.testproxy;
-import java.net.InetSocketAddress;
-import java.nio.ByteOrder;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-
import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.buffer.HeapChannelBufferFactory;
import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
@@ -29,6 +24,11 @@ import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.net.InetSocketAddress;
+import java.nio.ByteOrder;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
public class MongoProxyServer {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/test/java/org/usergrid/mongo/AbstractMongoTest.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/test/java/org/usergrid/mongo/AbstractMongoTest.java b/stack/mongo-emulator/src/test/java/org/usergrid/mongo/AbstractMongoTest.java
index 7e9393c..60dd3e6 100644
--- a/stack/mongo-emulator/src/test/java/org/usergrid/mongo/AbstractMongoTest.java
+++ b/stack/mongo-emulator/src/test/java/org/usergrid/mongo/AbstractMongoTest.java
@@ -16,18 +16,17 @@
package org.usergrid.mongo;
-import java.net.UnknownHostException;
-import java.util.Properties;
-
+import com.mongodb.DB;
+import com.mongodb.Mongo;
+import com.mongodb.MongoException;
+import com.mongodb.WriteConcern;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.cassandra.EntityManagerFactoryImpl;
import org.usergrid.services.ServiceManagerFactory;
-import com.mongodb.DB;
-import com.mongodb.Mongo;
-import com.mongodb.MongoException;
-import com.mongodb.WriteConcern;
+import java.net.UnknownHostException;
+import java.util.Properties;
public abstract class AbstractMongoTest {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/test/java/org/usergrid/mongo/BasicMongoTest.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/test/java/org/usergrid/mongo/BasicMongoTest.java b/stack/mongo-emulator/src/test/java/org/usergrid/mongo/BasicMongoTest.java
index 55d660c..ce436ff 100644
--- a/stack/mongo-emulator/src/test/java/org/usergrid/mongo/BasicMongoTest.java
+++ b/stack/mongo-emulator/src/test/java/org/usergrid/mongo/BasicMongoTest.java
@@ -1,35 +1,19 @@
package org.usergrid.mongo;
+import com.mongodb.*;
+import org.bson.types.ObjectId;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.usergrid.mongo.protocol.OpDelete;
+import org.usergrid.persistence.*;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.UUID;
-import org.bson.types.ObjectId;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.usergrid.mongo.protocol.OpDelete;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.SimpleEntityRef;
-
-import com.mongodb.BasicDBObject;
-import com.mongodb.DB;
-import com.mongodb.DBCollection;
-import com.mongodb.DBCursor;
-import com.mongodb.DBObject;
-import com.mongodb.MongoException;
-import com.mongodb.WriteConcern;
-import com.mongodb.WriteResult;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
@Ignore
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/test/java/org/usergrid/mongo/DatabaseInitializer.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/test/java/org/usergrid/mongo/DatabaseInitializer.java b/stack/mongo-emulator/src/test/java/org/usergrid/mongo/DatabaseInitializer.java
index f309035..5e07a27 100644
--- a/stack/mongo-emulator/src/test/java/org/usergrid/mongo/DatabaseInitializer.java
+++ b/stack/mongo-emulator/src/test/java/org/usergrid/mongo/DatabaseInitializer.java
@@ -16,9 +16,6 @@
package org.usergrid.mongo;
-import java.util.Map;
-import java.util.Properties;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +24,9 @@ import org.usergrid.mq.QueueManagerFactory;
import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.services.ServiceManagerFactory;
+import java.util.Map;
+import java.util.Properties;
+
public class DatabaseInitializer {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/test/java/org/usergrid/mongo/MongoQueryTest.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/test/java/org/usergrid/mongo/MongoQueryTest.java b/stack/mongo-emulator/src/test/java/org/usergrid/mongo/MongoQueryTest.java
index 3543933..dafbc89 100644
--- a/stack/mongo-emulator/src/test/java/org/usergrid/mongo/MongoQueryTest.java
+++ b/stack/mongo-emulator/src/test/java/org/usergrid/mongo/MongoQueryTest.java
@@ -1,26 +1,18 @@
package org.usergrid.mongo;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
+import com.mongodb.*;
import org.bson.types.BasicBSONList;
import org.junit.Ignore;
import org.junit.Test;
import org.usergrid.persistence.EntityManager;
-import com.mongodb.BasicDBObject;
-import com.mongodb.DB;
-import com.mongodb.DBCollection;
-import com.mongodb.DBCursor;
-import com.mongodb.DBObject;
-import com.mongodb.Mongo;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
@Ignore
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/query-validator/src/main/java/org/usergrid/query/validator/ApiServerRunner.java
----------------------------------------------------------------------
diff --git a/stack/query-validator/src/main/java/org/usergrid/query/validator/ApiServerRunner.java b/stack/query-validator/src/main/java/org/usergrid/query/validator/ApiServerRunner.java
index b7c5739..1624636 100644
--- a/stack/query-validator/src/main/java/org/usergrid/query/validator/ApiServerRunner.java
+++ b/stack/query-validator/src/main/java/org/usergrid/query/validator/ApiServerRunner.java
@@ -19,15 +19,14 @@ import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.JsonNode;
import org.springframework.http.HttpMethod;
import org.springframework.stereotype.Component;
+import org.usergrid.java.client.Client;
import org.usergrid.java.client.response.ApiResponse;
import org.usergrid.persistence.Entity;
+import org.usergrid.persistence.Schema;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import org.usergrid.java.client.Client;
-import org.usergrid.persistence.Schema;
-
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/query-validator/src/main/java/org/usergrid/query/validator/QueryRunner.java
----------------------------------------------------------------------
diff --git a/stack/query-validator/src/main/java/org/usergrid/query/validator/QueryRunner.java b/stack/query-validator/src/main/java/org/usergrid/query/validator/QueryRunner.java
index caabb96..8f89c1d 100644
--- a/stack/query-validator/src/main/java/org/usergrid/query/validator/QueryRunner.java
+++ b/stack/query-validator/src/main/java/org/usergrid/query/validator/QueryRunner.java
@@ -15,9 +15,10 @@
******************************************************************************/
package org.usergrid.query.validator;
-import java.util.List;
import org.usergrid.persistence.Entity;
+import java.util.List;
+
/**
* @author Sung-ju Jin(realbeast)
*/
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/query-validator/src/test/java/org/usergrid/query/validator/QueryValidationTest.java
----------------------------------------------------------------------
diff --git a/stack/query-validator/src/test/java/org/usergrid/query/validator/QueryValidationTest.java b/stack/query-validator/src/test/java/org/usergrid/query/validator/QueryValidationTest.java
index 5fbacb3..8716139 100644
--- a/stack/query-validator/src/test/java/org/usergrid/query/validator/QueryValidationTest.java
+++ b/stack/query-validator/src/test/java/org/usergrid/query/validator/QueryValidationTest.java
@@ -15,10 +15,10 @@
******************************************************************************/
package org.usergrid.query.validator;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.junit.Assert;
/**
* @author Sung-ju Jin(realbeast)
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/AbstractContextResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/AbstractContextResource.java b/stack/rest/src/main/java/org/usergrid/rest/AbstractContextResource.java
index ed56e00..9a82b1a 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/AbstractContextResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/AbstractContextResource.java
@@ -16,15 +16,12 @@
package org.usergrid.rest;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.Request;
-import javax.ws.rs.core.SecurityContext;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.core.HttpContext;
+import com.sun.jersey.api.core.ResourceContext;
+import com.sun.jersey.api.view.Viewable;
+import com.sun.jersey.spi.CloseableService;
+import net.tanesha.recaptcha.ReCaptcha;
+import net.tanesha.recaptcha.ReCaptchaFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.usergrid.management.ManagementService;
import org.usergrid.mq.QueueManagerFactory;
@@ -33,13 +30,9 @@ import org.usergrid.rest.exceptions.RedirectionException;
import org.usergrid.security.tokens.TokenService;
import org.usergrid.services.ServiceManagerFactory;
-import com.sun.jersey.api.core.HttpContext;
-import com.sun.jersey.api.core.ResourceContext;
-import com.sun.jersey.api.view.Viewable;
-import com.sun.jersey.spi.CloseableService;
-
-import net.tanesha.recaptcha.ReCaptcha;
-import net.tanesha.recaptcha.ReCaptchaFactory;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.*;
+import java.util.List;
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.apache.commons.lang.StringUtils.removeEnd;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/ApiResponse.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/ApiResponse.java b/stack/rest/src/main/java/org/usergrid/rest/ApiResponse.java
index 64ea870..c66fdec 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/ApiResponse.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/ApiResponse.java
@@ -16,16 +16,8 @@
package org.usergrid.rest;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
+import org.apache.commons.lang.ClassUtils;
+import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
@@ -41,8 +33,9 @@ import org.usergrid.services.ServiceRequest;
import org.usergrid.services.ServiceResults;
import org.usergrid.utils.InflectionUtils;
-import org.apache.commons.lang.ClassUtils;
-import org.apache.commons.lang.StringUtils;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.*;
import static org.usergrid.utils.InflectionUtils.pluralize;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/JacksonCustomMapperProvider.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/JacksonCustomMapperProvider.java b/stack/rest/src/main/java/org/usergrid/rest/JacksonCustomMapperProvider.java
index e25bf0b..838da83 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/JacksonCustomMapperProvider.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/JacksonCustomMapperProvider.java
@@ -16,11 +16,6 @@
package org.usergrid.rest;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.ext.ContextResolver;
-import javax.ws.rs.ext.Provider;
-
import org.codehaus.jackson.jaxrs.Annotations;
import org.codehaus.jackson.jaxrs.MapperConfigurator;
import org.codehaus.jackson.map.ObjectMapper;
@@ -30,6 +25,11 @@ import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.ContextResolver;
+import javax.ws.rs.ext.Provider;
+
@Provider
@Component
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/RootResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/RootResource.java b/stack/rest/src/main/java/org/usergrid/rest/RootResource.java
index bee1f27..f5e53a7 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/RootResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/RootResource.java
@@ -16,25 +16,15 @@
package org.usergrid.rest;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.UUID;
-
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.UriInfo;
-
+import com.google.common.collect.BiMap;
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.yammer.metrics.Metrics;
+import com.yammer.metrics.annotation.ExceptionMetered;
+import com.yammer.metrics.annotation.Timed;
+import com.yammer.metrics.core.*;
+import com.yammer.metrics.stats.Snapshot;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.authz.UnauthorizedException;
import org.codehaus.jackson.node.JsonNodeFactory;
import org.codehaus.jackson.node.ObjectNode;
import org.slf4j.Logger;
@@ -49,26 +39,18 @@ import org.usergrid.rest.organizations.OrganizationResource;
import org.usergrid.rest.security.annotations.RequireSystemAccess;
import org.usergrid.system.UsergridSystemMonitor;
-import org.apache.commons.lang.StringUtils;
-import org.apache.shiro.authz.UnauthorizedException;
-
-import com.google.common.collect.BiMap;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.yammer.metrics.Metrics;
-import com.yammer.metrics.annotation.ExceptionMetered;
-import com.yammer.metrics.annotation.Timed;
-import com.yammer.metrics.core.Counter;
-import com.yammer.metrics.core.Gauge;
-import com.yammer.metrics.core.Histogram;
-import com.yammer.metrics.core.Metered;
-import com.yammer.metrics.core.Metric;
-import com.yammer.metrics.core.MetricName;
-import com.yammer.metrics.core.MetricProcessor;
-import com.yammer.metrics.core.MetricsRegistry;
-import com.yammer.metrics.core.Sampling;
-import com.yammer.metrics.core.Summarizable;
-import com.yammer.metrics.core.Timer;
-import com.yammer.metrics.stats.Snapshot;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
+import javax.ws.rs.core.UriInfo;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.UUID;
import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/SwaggerServlet.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/SwaggerServlet.java b/stack/rest/src/main/java/org/usergrid/rest/SwaggerServlet.java
index 3c19ab5..f792acd 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/SwaggerServlet.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/SwaggerServlet.java
@@ -16,28 +16,19 @@
package org.usergrid.rest;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import org.apache.commons.lang.text.StrSubstitutor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
-import org.apache.commons.lang.text.StrSubstitutor;
+import javax.servlet.*;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
import static org.apache.commons.lang.StringUtils.isEmpty;
import static org.springframework.web.context.support.WebApplicationContextUtils.getRequiredWebApplicationContext;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/SystemResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/SystemResource.java b/stack/rest/src/main/java/org/usergrid/rest/SystemResource.java
index eb03173..efad0e8 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/SystemResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/SystemResource.java
@@ -16,22 +16,17 @@
package org.usergrid.rest;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.usergrid.rest.security.annotations.RequireSystemAccess;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
@Path("/system")
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/TextToJsonSwapWriter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/TextToJsonSwapWriter.java b/stack/rest/src/main/java/org/usergrid/rest/TextToJsonSwapWriter.java
index d39ea45..41162bc 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/TextToJsonSwapWriter.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/TextToJsonSwapWriter.java
@@ -1,27 +1,20 @@
package org.usergrid.rest;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.spi.MessageBodyWorkers;
+import org.codehaus.jackson.map.JsonSerializableWithType;
import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.GenericEntity;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.*;
import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;
import javax.xml.bind.annotation.XmlRootElement;
-
-import org.codehaus.jackson.map.JsonSerializable;
-import org.codehaus.jackson.map.JsonSerializableWithType;
-
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.spi.MessageBodyWorkers;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/ApplicationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/ApplicationResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/ApplicationResource.java
index 453538a..17095e2 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/ApplicationResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/ApplicationResource.java
@@ -16,27 +16,14 @@
package org.usergrid.rest.applications;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.api.view.Viewable;
+import org.apache.amber.oauth2.common.error.OAuthError;
+import org.apache.amber.oauth2.common.exception.OAuthProblemException;
+import org.apache.amber.oauth2.common.message.OAuthResponse;
+import org.apache.amber.oauth2.common.message.types.GrantType;
+import org.apache.shiro.authz.UnauthorizedException;
+import org.apache.shiro.codec.Base64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -64,21 +51,17 @@ import org.usergrid.rest.security.annotations.RequireApplicationAccess;
import org.usergrid.security.oauth.AccessInfo;
import org.usergrid.security.oauth.ClientCredentialsInfo;
-import org.apache.amber.oauth2.common.error.OAuthError;
-import org.apache.amber.oauth2.common.exception.OAuthProblemException;
-import org.apache.amber.oauth2.common.message.OAuthResponse;
-import org.apache.amber.oauth2.common.message.types.GrantType;
-import org.apache.shiro.authz.UnauthorizedException;
-import org.apache.shiro.codec.Base64;
-
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.api.view.Viewable;
+import javax.ws.rs.*;
+import javax.ws.rs.core.*;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Map;
+import java.util.UUID;
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.usergrid.rest.exceptions.SecurityException.mappableSecurityException;
import static org.usergrid.security.oauth.ClientCredentialsInfo.getUUIDFromClientId;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/AuthResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/AuthResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/AuthResource.java
index 3a5c71d..8d74792 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/AuthResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/AuthResource.java
@@ -16,19 +16,9 @@
package org.usergrid.rest.applications;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
+import org.apache.amber.oauth2.common.error.OAuthError;
+import org.apache.amber.oauth2.common.message.OAuthResponse;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,17 +32,16 @@ import org.usergrid.security.providers.SignInAsProvider;
import org.usergrid.security.providers.SignInProviderFactory;
import org.usergrid.services.ServiceManager;
-import org.apache.amber.oauth2.common.error.OAuthError;
-import org.apache.amber.oauth2.common.message.OAuthResponse;
-import org.apache.commons.lang.StringUtils;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
import static javax.servlet.http.HttpServletResponse.SC_OK;
import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
-
-import static org.usergrid.rest.utils.JSONPUtils.jsonMediaType;
-import static org.usergrid.rest.utils.JSONPUtils.wrapJSONPResponse;
-import static org.usergrid.rest.utils.JSONPUtils.wrapWithCallback;
+import static org.usergrid.rest.utils.JSONPUtils.*;
@Component
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java
index 33ab281..dcd3489 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java
@@ -16,32 +16,13 @@
package org.usergrid.rest.applications;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.core.provider.EntityHolder;
+import com.sun.jersey.multipart.BodyPart;
+import com.sun.jersey.multipart.BodyPartEntity;
+import com.sun.jersey.multipart.FormDataBodyPart;
+import com.sun.jersey.multipart.FormDataMultiPart;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -56,32 +37,20 @@ import org.usergrid.rest.RootResource;
import org.usergrid.rest.applications.assets.AssetsResource;
import org.usergrid.rest.security.annotations.RequireApplicationAccess;
import org.usergrid.security.oauth.AccessInfo;
-import org.usergrid.services.ServiceAction;
-import org.usergrid.services.ServiceManager;
-import org.usergrid.services.ServiceParameter;
-import org.usergrid.services.ServicePayload;
-import org.usergrid.services.ServiceRequest;
-import org.usergrid.services.ServiceResults;
+import org.usergrid.services.*;
import org.usergrid.services.assets.data.AssetUtils;
import org.usergrid.services.assets.data.BinaryStore;
import org.usergrid.utils.InflectionUtils;
-import org.apache.commons.lang.StringUtils;
-
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.core.provider.EntityHolder;
-import com.sun.jersey.multipart.BodyPart;
-import com.sun.jersey.multipart.BodyPartEntity;
-import com.sun.jersey.multipart.FormDataBodyPart;
-import com.sun.jersey.multipart.FormDataMultiPart;
+import javax.ws.rs.*;
+import javax.ws.rs.core.*;
+import java.io.InputStream;
+import java.util.*;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
-
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.usergrid.services.ServiceParameter.addParameter;
-import static org.usergrid.services.ServicePayload.batchPayload;
-import static org.usergrid.services.ServicePayload.idListPayload;
-import static org.usergrid.services.ServicePayload.payload;
+import static org.usergrid.services.ServicePayload.*;
import static org.usergrid.utils.JsonUtils.mapToJsonString;
import static org.usergrid.utils.JsonUtils.normalizeJsonTree;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/assets/AssetsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/assets/AssetsResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/assets/AssetsResource.java
index 2af9925..e7a08b7 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/assets/AssetsResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/assets/AssetsResource.java
@@ -1,27 +1,8 @@
package org.usergrid.rest.applications.assets;
-import java.io.InputStream;
-import java.util.Date;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.multipart.FormDataParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,9 +17,12 @@ import org.usergrid.services.assets.data.AssetUtils;
import org.usergrid.services.assets.data.BinaryStore;
import org.usergrid.utils.StringUtils;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.core.header.FormDataContentDisposition;
-import com.sun.jersey.multipart.FormDataParam;
+import javax.ws.rs.*;
+import javax.ws.rs.core.*;
+import java.io.InputStream;
+import java.util.Date;
+import java.util.Map;
+import java.util.UUID;
/** @deprecated */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/events/EventsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/events/EventsResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/events/EventsResource.java
index 28b68ce..025f244 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/events/EventsResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/events/EventsResource.java
@@ -16,14 +16,7 @@
package org.usergrid.rest.applications.events;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -35,7 +28,13 @@ import org.usergrid.persistence.entities.User;
import org.usergrid.rest.applications.ApplicationResource;
import org.usergrid.rest.applications.ServiceResource;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.GET;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
@Component("org.usergrid.rest.applications.events.EventsResource")
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueResource.java
index edbe028..528143a 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueResource.java
@@ -16,24 +16,9 @@
package org.usergrid.rest.applications.queues;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.core.provider.EntityHolder;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -45,10 +30,13 @@ import org.usergrid.mq.QueueQuery;
import org.usergrid.mq.QueueResults;
import org.usergrid.rest.AbstractContextResource;
-import org.apache.commons.lang.StringUtils;
-
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.core.provider.EntityHolder;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@Component
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriberResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriberResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriberResource.java
index 2c398fb..9a4ff07 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriberResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriberResource.java
@@ -16,23 +16,9 @@
package org.usergrid.rest.applications.queues;
-import java.util.List;
-import java.util.Map;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.core.provider.EntityHolder;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -41,10 +27,12 @@ import org.usergrid.mq.QueueManager;
import org.usergrid.mq.QueueSet;
import org.usergrid.rest.AbstractContextResource;
-import org.apache.commons.lang.StringUtils;
-
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.core.provider.EntityHolder;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.List;
+import java.util.Map;
@Component
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriptionResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriptionResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriptionResource.java
index a163c4c..033d621 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriptionResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriptionResource.java
@@ -16,23 +16,9 @@
package org.usergrid.rest.applications.queues;
-import java.util.List;
-import java.util.Map;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.core.provider.EntityHolder;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -41,10 +27,12 @@ import org.usergrid.mq.QueueManager;
import org.usergrid.mq.QueueSet;
import org.usergrid.rest.AbstractContextResource;
-import org.apache.commons.lang.StringUtils;
-
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.core.provider.EntityHolder;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.List;
+import java.util.Map;
@Component
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueTransactionsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueTransactionsResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueTransactionsResource.java
index 3bae506..b5e0b15 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueTransactionsResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueTransactionsResource.java
@@ -16,19 +16,7 @@
package org.usergrid.rest.applications.queues;
-import java.util.UUID;
-
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -38,7 +26,11 @@ import org.usergrid.mq.QueueQuery;
import org.usergrid.persistence.Results;
import org.usergrid.rest.AbstractContextResource;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.UUID;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/users/UserResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/users/UserResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/users/UserResource.java
index 10e5595..9c0dd96 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/users/UserResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/users/UserResource.java
@@ -16,25 +16,13 @@
package org.usergrid.rest.applications.users;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.api.view.Viewable;
+import net.tanesha.recaptcha.ReCaptchaImpl;
+import net.tanesha.recaptcha.ReCaptchaResponse;
+import org.apache.amber.oauth2.common.exception.OAuthProblemException;
+import org.apache.amber.oauth2.common.message.OAuthResponse;
+import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.JsonNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,23 +40,13 @@ import org.usergrid.rest.security.annotations.RequireApplicationAccess;
import org.usergrid.security.oauth.AccessInfo;
import org.usergrid.security.tokens.exceptions.TokenException;
-import org.apache.amber.oauth2.common.exception.OAuthProblemException;
-import org.apache.amber.oauth2.common.message.OAuthResponse;
-import org.apache.commons.lang.StringUtils;
-
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.api.view.Viewable;
-
-import net.tanesha.recaptcha.ReCaptchaImpl;
-import net.tanesha.recaptcha.ReCaptchaResponse;
-
-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
-import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
-import static javax.servlet.http.HttpServletResponse.SC_OK;
+import javax.ws.rs.*;
+import javax.ws.rs.core.*;
+import java.util.Map;
+import java.util.UUID;
-import static org.usergrid.security.shiro.utils.SubjectUtils.getSubjectUserId;
-import static org.usergrid.security.shiro.utils.SubjectUtils.isApplicationAdmin;
-import static org.usergrid.security.shiro.utils.SubjectUtils.isApplicationUser;
+import static javax.servlet.http.HttpServletResponse.*;
+import static org.usergrid.security.shiro.utils.SubjectUtils.*;
import static org.usergrid.utils.ConversionUtils.string;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/users/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/users/UsersResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/users/UsersResource.java
index 4a36c97..fa9a841 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/users/UsersResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/users/UsersResource.java
@@ -16,25 +16,11 @@
package org.usergrid.rest.applications.users;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.api.view.Viewable;
+import com.sun.jersey.core.provider.EntityHolder;
+import net.tanesha.recaptcha.ReCaptchaImpl;
+import net.tanesha.recaptcha.ReCaptchaResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -50,12 +36,14 @@ import org.usergrid.rest.applications.ServiceResource;
import org.usergrid.rest.exceptions.RedirectionException;
import org.usergrid.rest.security.annotations.RequireApplicationAccess;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.api.view.Viewable;
-import com.sun.jersey.core.provider.EntityHolder;
-
-import net.tanesha.recaptcha.ReCaptchaImpl;
-import net.tanesha.recaptcha.ReCaptchaResponse;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.PathSegment;
+import javax.ws.rs.core.UriInfo;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
import static org.apache.commons.lang.StringUtils.isBlank;
import static org.apache.commons.lang.StringUtils.isNotBlank;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/AbstractExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/AbstractExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/AbstractExceptionMapper.java
index 23e3453..b087c80 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/AbstractExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/AbstractExceptionMapper.java
@@ -16,6 +16,10 @@
package org.usergrid.rest.exceptions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.rest.ApiResponse;
+
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
@@ -23,14 +27,9 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import javax.ws.rs.ext.ExceptionMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.rest.ApiResponse;
-
import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
import static javax.ws.rs.core.Response.Status.OK;
-
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.usergrid.rest.utils.JSONPUtils.isJavascript;
import static org.usergrid.rest.utils.JSONPUtils.wrapJSONPResponse;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/AuthorizationExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/AuthorizationExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/AuthorizationExceptionMapper.java
index 1cc5535..8a97b3b 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/AuthorizationExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/AuthorizationExceptionMapper.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.exceptions;
+import org.apache.shiro.authz.AuthorizationException;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
-import org.apache.shiro.authz.AuthorizationException;
-
import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/DuplicateUniquePropertyExistsExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/DuplicateUniquePropertyExistsExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/DuplicateUniquePropertyExistsExceptionMapper.java
index 1b0e4dc..d6926e9 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/DuplicateUniquePropertyExistsExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/DuplicateUniquePropertyExistsExceptionMapper.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.exceptions;
+import org.usergrid.persistence.exceptions.DuplicateUniquePropertyExistsException;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
-import org.usergrid.persistence.exceptions.DuplicateUniquePropertyExistsException;
-
import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/EntityNotFoundExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/EntityNotFoundExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/EntityNotFoundExceptionMapper.java
index 1ee5a07..18e4a87 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/EntityNotFoundExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/EntityNotFoundExceptionMapper.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.exceptions;
+import org.usergrid.persistence.exceptions.EntityNotFoundException;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
-import org.usergrid.persistence.exceptions.EntityNotFoundException;
-
import static javax.ws.rs.core.Response.Status.NOT_FOUND;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/ForbiddenServiceOperationExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/ForbiddenServiceOperationExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/ForbiddenServiceOperationExceptionMapper.java
index 06f3ca2..1c846ea 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/ForbiddenServiceOperationExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/ForbiddenServiceOperationExceptionMapper.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.exceptions;
+import org.usergrid.services.exceptions.ForbiddenServiceOperationException;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
-import org.usergrid.services.exceptions.ForbiddenServiceOperationException;
-
import static javax.ws.rs.core.Response.Status.FORBIDDEN;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonReadExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonReadExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonReadExceptionMapper.java
index 70508b2..c48fc27 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonReadExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonReadExceptionMapper.java
@@ -17,11 +17,11 @@
package org.usergrid.rest.exceptions;
+import org.usergrid.exception.JsonReadException;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
-import org.usergrid.exception.JsonReadException;
-
import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonWriteExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonWriteExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonWriteExceptionMapper.java
index 5743fdf..ea0a776 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonWriteExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonWriteExceptionMapper.java
@@ -17,11 +17,11 @@
package org.usergrid.rest.exceptions;
+import org.usergrid.exception.JsonWriteException;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
-import org.usergrid.exception.JsonWriteException;
-
import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/ManagementExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/ManagementExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/ManagementExceptionMapper.java
index 8208e0c..84ba7a5 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/ManagementExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/ManagementExceptionMapper.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.exceptions;
+import org.usergrid.management.exceptions.ManagementException;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
-import org.usergrid.management.exceptions.ManagementException;
-
import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/NotImplementedExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/NotImplementedExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/NotImplementedExceptionMapper.java
index 2cf22e2..a1b3435 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/NotImplementedExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/NotImplementedExceptionMapper.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.exceptions;
+import org.usergrid.exception.NotImplementedException;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
-import org.usergrid.exception.NotImplementedException;
-
@Provider
public class NotImplementedExceptionMapper extends AbstractExceptionMapper<NotImplementedException> {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/OAuthProblemExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/OAuthProblemExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/OAuthProblemExceptionMapper.java
index 4e81353..7b0ba71 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/OAuthProblemExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/OAuthProblemExceptionMapper.java
@@ -16,14 +16,14 @@
package org.usergrid.rest.exceptions;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
import org.apache.amber.oauth2.common.exception.OAuthProblemException;
import org.apache.amber.oauth2.common.exception.OAuthSystemException;
import org.apache.amber.oauth2.common.message.OAuthResponse;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/OrganizationApplicationNotFoundException.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/OrganizationApplicationNotFoundException.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/OrganizationApplicationNotFoundException.java
index 1435e69..5e1dafd 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/OrganizationApplicationNotFoundException.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/OrganizationApplicationNotFoundException.java
@@ -1,11 +1,11 @@
package org.usergrid.rest.exceptions;
-import javax.ws.rs.core.UriInfo;
-
import org.usergrid.rest.ApiResponse;
import org.usergrid.rest.ServerEnvironmentProperties;
+import javax.ws.rs.core.UriInfo;
+
import static org.usergrid.utils.JsonUtils.mapToJsonString;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/PersistenceExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/PersistenceExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/PersistenceExceptionMapper.java
index 25d2be0..d652449 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/PersistenceExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/PersistenceExceptionMapper.java
@@ -16,10 +16,10 @@
package org.usergrid.rest.exceptions;
-import javax.ws.rs.ext.Provider;
-
import org.usergrid.persistence.exceptions.PersistenceException;
+import javax.ws.rs.ext.Provider;
+
@Provider
public class PersistenceExceptionMapper extends AbstractExceptionMapper<PersistenceException> {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryParseExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryParseExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryParseExceptionMapper.java
index 7a4b5f9..a62a51f 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryParseExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryParseExceptionMapper.java
@@ -16,12 +16,11 @@
package org.usergrid.rest.exceptions;
+import org.usergrid.persistence.exceptions.QueryParseException;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
-
-import org.usergrid.persistence.exceptions.QueryParseException;
-
import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryTokenExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryTokenExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryTokenExceptionMapper.java
index 510a5d5..74d70ef 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryTokenExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryTokenExceptionMapper.java
@@ -16,13 +16,10 @@
package org.usergrid.rest.exceptions;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.Provider;
-
-import org.usergrid.persistence.exceptions.QueryParseException;
import org.usergrid.persistence.exceptions.QueryTokenException;
-import antlr.NoViableAltException;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/RecentlyUsedPasswordExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/RecentlyUsedPasswordExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/RecentlyUsedPasswordExceptionMapper.java
index 3ebedfe..9de9d1f 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/RecentlyUsedPasswordExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/RecentlyUsedPasswordExceptionMapper.java
@@ -1,11 +1,11 @@
package org.usergrid.rest.exceptions;
+import org.usergrid.management.exceptions.RecentlyUsedPasswordException;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
-import org.usergrid.management.exceptions.RecentlyUsedPasswordException;
-
import static javax.ws.rs.core.Response.Status.CONFLICT;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/RequiredPropertyNotFoundExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/RequiredPropertyNotFoundExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/RequiredPropertyNotFoundExceptionMapper.java
index cb93d2f..d8c8a0c 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/RequiredPropertyNotFoundExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/RequiredPropertyNotFoundExceptionMapper.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.exceptions;
+import org.usergrid.persistence.exceptions.RequiredPropertyNotFoundException;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
-import org.usergrid.persistence.exceptions.RequiredPropertyNotFoundException;
-
import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/SecurityException.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/SecurityException.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/SecurityException.java
index 784f238..e1d2130 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/SecurityException.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/SecurityException.java
@@ -16,9 +16,8 @@
package org.usergrid.rest.exceptions;
-import org.usergrid.rest.ApiResponse;
-
import com.sun.jersey.api.container.MappableContainerException;
+import org.usergrid.rest.ApiResponse;
import static org.usergrid.utils.JsonUtils.mapToJsonString;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceExceptionMapper.java
index 2d8d361..efa349c 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceExceptionMapper.java
@@ -16,10 +16,10 @@
package org.usergrid.rest.exceptions;
-import javax.ws.rs.ext.Provider;
-
import org.usergrid.services.exceptions.ServiceException;
+import javax.ws.rs.ext.Provider;
+
/** Will map to HTTP 500 INTERNAL_SERVER_ERROR because parent does */
@Provider
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceResourceNotFoundExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceResourceNotFoundExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceResourceNotFoundExceptionMapper.java
index 32fb5f3..960a7f5 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceResourceNotFoundExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceResourceNotFoundExceptionMapper.java
@@ -16,12 +16,12 @@
package org.usergrid.rest.exceptions;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.Provider;
-
import org.usergrid.security.shiro.utils.SubjectUtils;
import org.usergrid.services.exceptions.ServiceResourceNotFoundException;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
+
import static javax.ws.rs.core.Response.Status.NOT_FOUND;
import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/TransactionNotFoundExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/TransactionNotFoundExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/TransactionNotFoundExceptionMapper.java
index ef8a99f..f14b4d0 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/TransactionNotFoundExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/TransactionNotFoundExceptionMapper.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.exceptions;
+import org.usergrid.persistence.exceptions.TransactionNotFoundException;
+
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
-import org.usergrid.persistence.exceptions.TransactionNotFoundException;
-
import static javax.ws.rs.core.Response.Status.NOT_FOUND;
[17/23] organize imports only
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/filters/ContentTypeFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/filters/ContentTypeFilter.java b/stack/rest/src/main/java/org/usergrid/rest/filters/ContentTypeFilter.java
index 38704a8..95c1d2e 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/filters/ContentTypeFilter.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/filters/ContentTypeFilter.java
@@ -16,34 +16,18 @@
package org.usergrid.rest.filters;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PushbackInputStream;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.Assert;
+
+import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import javax.ws.rs.HttpMethod;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.util.Assert;
+import java.io.*;
+import java.util.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/filters/JSONPCallbackFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/filters/JSONPCallbackFilter.java b/stack/rest/src/main/java/org/usergrid/rest/filters/JSONPCallbackFilter.java
index 12a94ab..1903bf8 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/filters/JSONPCallbackFilter.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/filters/JSONPCallbackFilter.java
@@ -16,15 +16,14 @@
package org.usergrid.rest.filters;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-
+import com.sun.jersey.spi.container.ContainerRequest;
+import com.sun.jersey.spi.container.ContainerRequestFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerRequestFilter;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Context;
import static org.apache.commons.lang.StringUtils.isNotBlank;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/filters/MeteringFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/filters/MeteringFilter.java b/stack/rest/src/main/java/org/usergrid/rest/filters/MeteringFilter.java
index ca0e264..bff0bad 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/filters/MeteringFilter.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/filters/MeteringFilter.java
@@ -16,20 +16,11 @@
package org.usergrid.rest.filters;
-import java.io.FilterInputStream;
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-
+import com.sun.jersey.spi.container.*;
+import com.yammer.metrics.Metrics;
+import com.yammer.metrics.core.Counter;
+import com.yammer.metrics.core.Timer;
+import com.yammer.metrics.core.TimerContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,15 +31,14 @@ import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.services.ServiceManagerFactory;
import org.usergrid.system.UsergridSystemMonitor;
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerRequestFilter;
-import com.sun.jersey.spi.container.ContainerResponse;
-import com.sun.jersey.spi.container.ContainerResponseFilter;
-import com.sun.jersey.spi.container.ContainerResponseWriter;
-import com.yammer.metrics.Metrics;
-import com.yammer.metrics.core.Counter;
-import com.yammer.metrics.core.Timer;
-import com.yammer.metrics.core.TimerContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Context;
+import java.io.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
@Component
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/filters/TracingFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/filters/TracingFilter.java b/stack/rest/src/main/java/org/usergrid/rest/filters/TracingFilter.java
index b0fe1d0..6f7f9c4 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/filters/TracingFilter.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/filters/TracingFilter.java
@@ -1,9 +1,10 @@
package org.usergrid.rest.filters;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-
+import com.sun.jersey.spi.container.ContainerRequest;
+import com.sun.jersey.spi.container.ContainerRequestFilter;
+import com.sun.jersey.spi.container.ContainerResponse;
+import com.sun.jersey.spi.container.ContainerResponseFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -13,10 +14,8 @@ import org.usergrid.persistence.cassandra.util.TraceTagManager;
import org.usergrid.persistence.cassandra.util.TraceTagReporter;
import org.usergrid.utils.StringUtils;
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerRequestFilter;
-import com.sun.jersey.spi.container.ContainerResponse;
-import com.sun.jersey.spi.container.ContainerResponseFilter;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Context;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/management/ManagementResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/ManagementResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/ManagementResource.java
index 9b1fc65..0a1f986 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/ManagementResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/ManagementResource.java
@@ -16,23 +16,13 @@
package org.usergrid.rest.management;
-import java.net.URLEncoder;
-import java.util.Map;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.view.Viewable;
+import org.apache.amber.oauth2.common.error.OAuthError;
+import org.apache.amber.oauth2.common.exception.OAuthProblemException;
+import org.apache.amber.oauth2.common.message.OAuthResponse;
+import org.apache.amber.oauth2.common.message.types.GrantType;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.codec.Base64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -48,22 +38,16 @@ import org.usergrid.rest.management.users.UsersResource;
import org.usergrid.security.oauth.AccessInfo;
import org.usergrid.security.shiro.utils.SubjectUtils;
-import org.apache.amber.oauth2.common.error.OAuthError;
-import org.apache.amber.oauth2.common.exception.OAuthProblemException;
-import org.apache.amber.oauth2.common.message.OAuthResponse;
-import org.apache.amber.oauth2.common.message.types.GrantType;
-import org.apache.commons.lang.StringUtils;
-import org.apache.shiro.codec.Base64;
-
-import com.sun.jersey.api.view.Viewable;
-
-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
-import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
-import static javax.servlet.http.HttpServletResponse.SC_OK;
-import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+import java.net.URLEncoder;
+import java.util.Map;
+import static javax.servlet.http.HttpServletResponse.*;
+import static javax.ws.rs.core.MediaType.*;
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.usergrid.utils.JsonUtils.mapToJsonString;
import static org.usergrid.utils.StringUtils.stringOrSubstringAfterFirst;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/management/metrics/MetricsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/metrics/MetricsResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/metrics/MetricsResource.java
index 4e47aa1..609dee7 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/metrics/MetricsResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/metrics/MetricsResource.java
@@ -1,6 +1,12 @@
package org.usergrid.rest.management.metrics;
+import com.sun.jersey.api.json.JSONWithPadding;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+import org.usergrid.rest.AbstractContextResource;
+import org.usergrid.rest.ApiResponse;
+
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
@@ -8,13 +14,6 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.UriInfo;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-import org.usergrid.rest.AbstractContextResource;
-import org.usergrid.rest.ApiResponse;
-
-import com.sun.jersey.api.json.JSONWithPadding;
-
/** @author zznate */
@Component("org.usergrid.rest.management.metrics.MetricsResource")
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationResource.java
index 2d92936..f83772d 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationResource.java
@@ -16,20 +16,8 @@
package org.usergrid.rest.management.organizations;
-import java.util.Map;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.api.view.Viewable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -46,8 +34,11 @@ import org.usergrid.security.oauth.ClientCredentialsInfo;
import org.usergrid.security.tokens.exceptions.TokenException;
import org.usergrid.services.ServiceResults;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.api.view.Viewable;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.Map;
@Component("org.usergrid.rest.management.organizations.OrganizationResource")
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationsResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationsResource.java
index 519d150..5f89b8b 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationsResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationsResource.java
@@ -16,21 +16,9 @@
package org.usergrid.rest.management.organizations;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.google.common.base.Preconditions;
+import com.sun.jersey.api.json.JSONWithPadding;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -45,10 +33,12 @@ import org.usergrid.rest.ApiResponse;
import org.usergrid.rest.RootResource;
import org.usergrid.rest.security.annotations.RequireOrganizationAccess;
-import org.apache.commons.lang.StringUtils;
-
-import com.google.common.base.Preconditions;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.Map;
+import java.util.UUID;
@Component( "org.usergrid.rest.management.organizations.OrganizationsResource" )
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationResource.java
index 48b9f60..9921a53 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationResource.java
@@ -16,21 +16,9 @@
package org.usergrid.rest.management.organizations.applications;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.google.common.base.Preconditions;
+import com.sun.jersey.api.json.JSONWithPadding;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
@@ -44,10 +32,12 @@ import org.usergrid.security.providers.SignInAsProvider;
import org.usergrid.security.providers.SignInProviderFactory;
import org.usergrid.services.ServiceManager;
-import org.apache.commons.lang.StringUtils;
-
-import com.google.common.base.Preconditions;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.Map;
+import java.util.UUID;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationsResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationsResource.java
index 40edbb9..c20d4ad 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationsResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationsResource.java
@@ -16,23 +16,9 @@
package org.usergrid.rest.management.organizations.applications;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.google.common.base.Preconditions;
+import com.google.common.collect.BiMap;
+import com.sun.jersey.api.json.JSONWithPadding;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -45,9 +31,13 @@ import org.usergrid.rest.ApiResponse;
import org.usergrid.rest.RootResource;
import org.usergrid.rest.security.annotations.RequireOrganizationAccess;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.BiMap;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
import static org.apache.commons.lang.StringUtils.isEmpty;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/management/organizations/users/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/users/UsersResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/users/UsersResource.java
index f7c09ea..a42b19c 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/users/UsersResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/users/UsersResource.java
@@ -16,26 +16,7 @@
package org.usergrid.rest.management.organizations.users;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -49,7 +30,14 @@ import org.usergrid.rest.RootResource;
import org.usergrid.rest.security.annotations.RequireOrganizationAccess;
import org.usergrid.security.shiro.utils.SubjectUtils;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
import static org.apache.commons.collections.MapUtils.getObject;
import static org.usergrid.rest.exceptions.SecurityException.mappableSecurityException;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/management/users/UserResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/users/UserResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/users/UserResource.java
index eea49aa..40e1488 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/users/UserResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/users/UserResource.java
@@ -16,22 +16,10 @@
package org.usergrid.rest.management.users;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.api.view.Viewable;
+import net.tanesha.recaptcha.ReCaptchaImpl;
+import net.tanesha.recaptcha.ReCaptchaResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -47,11 +35,12 @@ import org.usergrid.security.shiro.utils.SubjectUtils;
import org.usergrid.security.tokens.exceptions.TokenException;
import org.usergrid.services.ServiceResults;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.api.view.Viewable;
-
-import net.tanesha.recaptcha.ReCaptchaImpl;
-import net.tanesha.recaptcha.ReCaptchaResponse;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.Map;
+import java.util.UUID;
import static org.usergrid.security.shiro.utils.SubjectUtils.isServiceAdmin;
import static org.usergrid.utils.ConversionUtils.string;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/management/users/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/users/UsersResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/users/UsersResource.java
index fe04134..d1b4948 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/users/UsersResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/users/UsersResource.java
@@ -16,23 +16,10 @@
package org.usergrid.rest.management.users;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.api.view.Viewable;
+import net.tanesha.recaptcha.ReCaptchaImpl;
+import net.tanesha.recaptcha.ReCaptchaResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
@@ -44,11 +31,13 @@ import org.usergrid.rest.exceptions.AuthErrorInfo;
import org.usergrid.rest.exceptions.RedirectionException;
import org.usergrid.security.shiro.utils.SubjectUtils;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.api.view.Viewable;
-
-import net.tanesha.recaptcha.ReCaptchaImpl;
-import net.tanesha.recaptcha.ReCaptchaResponse;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
import static org.apache.commons.lang.StringUtils.isBlank;
import static org.usergrid.rest.exceptions.SecurityException.mappableSecurityException;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/management/users/organizations/OrganizationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/users/organizations/OrganizationsResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/users/organizations/OrganizationsResource.java
index 2f40f67..8851f04 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/users/organizations/OrganizationsResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/users/organizations/OrganizationsResource.java
@@ -16,24 +16,8 @@
package org.usergrid.rest.management.users.organizations;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.google.common.collect.BiMap;
+import com.sun.jersey.api.json.JSONWithPadding;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.usergrid.management.OrganizationInfo;
@@ -46,8 +30,12 @@ import org.usergrid.rest.security.annotations.RequireAdminUserAccess;
import org.usergrid.rest.security.annotations.RequireOrganizationAccess;
import org.usergrid.security.shiro.utils.SubjectUtils;
-import com.google.common.collect.BiMap;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.Map;
+import java.util.UUID;
@Component( "org.usergrid.rest.management.users.organizations.OrganizationsResource" )
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/organizations/OrganizationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/organizations/OrganizationResource.java b/stack/rest/src/main/java/org/usergrid/rest/organizations/OrganizationResource.java
index deda09a..3082347 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/organizations/OrganizationResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/organizations/OrganizationResource.java
@@ -1,18 +1,9 @@
package org.usergrid.rest.organizations;
-import java.util.UUID;
-
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriInfo;
-
+import com.google.common.collect.BiMap;
+import com.sun.jersey.api.json.JSONWithPadding;
+import org.apache.shiro.authz.UnauthorizedException;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.usergrid.exception.NotImplementedException;
@@ -26,10 +17,11 @@ import org.usergrid.rest.security.annotations.RequireOrganizationAccess;
import org.usergrid.rest.utils.PathingUtils;
import org.usergrid.security.shiro.utils.SubjectUtils;
-import org.apache.shiro.authz.UnauthorizedException;
-
-import com.google.common.collect.BiMap;
-import com.sun.jersey.api.json.JSONWithPadding;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriInfo;
+import java.util.UUID;
import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/security/CrossOriginRequestFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/security/CrossOriginRequestFilter.java b/stack/rest/src/main/java/org/usergrid/rest/security/CrossOriginRequestFilter.java
index ddd4dd1..24b75e3 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/security/CrossOriginRequestFilter.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/security/CrossOriginRequestFilter.java
@@ -16,13 +16,12 @@
package org.usergrid.rest.security;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.rest.utils.CORSUtils;
-
import com.sun.jersey.spi.container.ContainerRequest;
import com.sun.jersey.spi.container.ContainerResponse;
import com.sun.jersey.spi.container.ContainerResponseFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.rest.utils.CORSUtils;
public class CrossOriginRequestFilter implements ContainerResponseFilter {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/security/SecuredResourceFilterFactory.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/security/SecuredResourceFilterFactory.java b/stack/rest/src/main/java/org/usergrid/rest/security/SecuredResourceFilterFactory.java
index 78366c8..d55c5c2 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/security/SecuredResourceFilterFactory.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/security/SecuredResourceFilterFactory.java
@@ -16,15 +16,8 @@
package org.usergrid.rest.security;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.model.AbstractMethod;
+import com.sun.jersey.spi.container.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -43,19 +36,17 @@ import org.usergrid.rest.utils.PathingUtils;
import org.usergrid.security.shiro.utils.SubjectUtils;
import org.usergrid.services.ServiceManagerFactory;
-import com.sun.jersey.api.model.AbstractMethod;
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerRequestFilter;
-import com.sun.jersey.spi.container.ContainerResponseFilter;
-import com.sun.jersey.spi.container.ResourceFilter;
-import com.sun.jersey.spi.container.ResourceFilterFactory;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.UriInfo;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
import static org.apache.commons.lang.StringUtils.isNotEmpty;
import static org.usergrid.rest.exceptions.SecurityException.mappableSecurityException;
-import static org.usergrid.security.shiro.utils.SubjectUtils.isPermittedAccessToApplication;
-import static org.usergrid.security.shiro.utils.SubjectUtils.isPermittedAccessToOrganization;
-import static org.usergrid.security.shiro.utils.SubjectUtils.isUser;
-import static org.usergrid.security.shiro.utils.SubjectUtils.loginApplicationGuest;
+import static org.usergrid.security.shiro.utils.SubjectUtils.*;
@Component
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/security/shiro/RestSecurityManager.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/RestSecurityManager.java b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/RestSecurityManager.java
index 1f1c391..17d2a43 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/RestSecurityManager.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/RestSecurityManager.java
@@ -16,15 +16,14 @@
package org.usergrid.rest.security.shiro;
-import java.util.Collection;
-
+import org.apache.shiro.realm.Realm;
+import org.apache.shiro.session.mgt.SessionManager;
+import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.rest.security.shiro.session.HttpRequestSessionManager;
-import org.apache.shiro.realm.Realm;
-import org.apache.shiro.session.mgt.SessionManager;
-import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
+import java.util.Collection;
public class RestSecurityManager extends DefaultWebSecurityManager {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/security/shiro/ShiroAuthenticationExceptionMapper.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/ShiroAuthenticationExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/ShiroAuthenticationExceptionMapper.java
index 91c4354..7210b2a 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/ShiroAuthenticationExceptionMapper.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/ShiroAuthenticationExceptionMapper.java
@@ -16,16 +16,15 @@
package org.usergrid.rest.security.shiro;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
+import org.apache.shiro.authc.AuthenticationException;
import org.usergrid.rest.ApiResponse;
import org.usergrid.security.tokens.exceptions.BadTokenException;
import org.usergrid.security.tokens.exceptions.ExpiredTokenException;
-import org.apache.shiro.authc.AuthenticationException;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
import static org.usergrid.rest.exceptions.AuthErrorInfo.BAD_ACCESS_TOKEN_ERROR;
import static org.usergrid.rest.exceptions.AuthErrorInfo.EXPIRED_ACCESS_TOKEN_ERROR;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/BasicAuthSecurityFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/BasicAuthSecurityFilter.java b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/BasicAuthSecurityFilter.java
index a135207..222d20e 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/BasicAuthSecurityFilter.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/BasicAuthSecurityFilter.java
@@ -16,18 +16,15 @@
package org.usergrid.rest.security.shiro.filters;
-import java.security.Principal;
-import java.util.Map;
-
-import javax.ws.rs.core.SecurityContext;
-
+import com.sun.jersey.spi.container.ContainerRequest;
+import org.apache.shiro.codec.Base64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
-import org.apache.shiro.codec.Base64;
-
-import com.sun.jersey.spi.container.ContainerRequest;
+import javax.ws.rs.core.SecurityContext;
+import java.security.Principal;
+import java.util.Map;
@Component
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/ClientCredentialsSecurityFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/ClientCredentialsSecurityFilter.java b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/ClientCredentialsSecurityFilter.java
index 5160a7b..7bc7f23 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/ClientCredentialsSecurityFilter.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/ClientCredentialsSecurityFilter.java
@@ -16,18 +16,16 @@
package org.usergrid.rest.security.shiro.filters;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-
+import com.sun.jersey.spi.container.ContainerRequest;
+import org.apache.shiro.subject.Subject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.usergrid.security.shiro.PrincipalCredentialsToken;
import org.usergrid.security.shiro.utils.SubjectUtils;
-import org.apache.shiro.subject.Subject;
-
-import com.sun.jersey.spi.container.ContainerRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Context;
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.usergrid.rest.exceptions.AuthErrorInfo.OAUTH2_INVALID_CLIENT;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/OAuth2AccessTokenSecurityFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/OAuth2AccessTokenSecurityFilter.java b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/OAuth2AccessTokenSecurityFilter.java
index 89b2d1c..1d8a4c1 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/OAuth2AccessTokenSecurityFilter.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/OAuth2AccessTokenSecurityFilter.java
@@ -16,9 +16,14 @@
package org.usergrid.rest.security.shiro.filters;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
-
+import com.sun.jersey.api.container.MappableContainerException;
+import com.sun.jersey.spi.container.ContainerRequest;
+import org.apache.amber.oauth2.common.exception.OAuthProblemException;
+import org.apache.amber.oauth2.common.exception.OAuthSystemException;
+import org.apache.amber.oauth2.common.message.types.ParameterStyle;
+import org.apache.amber.oauth2.common.utils.OAuthUtils;
+import org.apache.amber.oauth2.rs.request.OAuthAccessResourceRequest;
+import org.apache.shiro.subject.Subject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
@@ -35,20 +40,10 @@ import org.usergrid.security.tokens.exceptions.BadTokenException;
import org.usergrid.security.tokens.exceptions.ExpiredTokenException;
import org.usergrid.security.tokens.exceptions.InvalidTokenException;
-import org.apache.amber.oauth2.common.exception.OAuthProblemException;
-import org.apache.amber.oauth2.common.exception.OAuthSystemException;
-import org.apache.amber.oauth2.common.message.types.ParameterStyle;
-import org.apache.amber.oauth2.common.utils.OAuthUtils;
-import org.apache.amber.oauth2.rs.request.OAuthAccessResourceRequest;
-import org.apache.shiro.subject.Subject;
-
-import com.sun.jersey.api.container.MappableContainerException;
-import com.sun.jersey.spi.container.ContainerRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Context;
-import static org.usergrid.rest.exceptions.AuthErrorInfo.BAD_ACCESS_TOKEN_ERROR;
-import static org.usergrid.rest.exceptions.AuthErrorInfo.EXPIRED_ACCESS_TOKEN_ERROR;
-import static org.usergrid.rest.exceptions.AuthErrorInfo.INVALID_AUTH_ERROR;
-import static org.usergrid.rest.exceptions.AuthErrorInfo.UNVERIFIED_OAUTH_ERROR;
+import static org.usergrid.rest.exceptions.AuthErrorInfo.*;
import static org.usergrid.rest.exceptions.SecurityException.mappableSecurityException;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/SecurityFilter.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/SecurityFilter.java b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/SecurityFilter.java
index 4953772..b43235b 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/SecurityFilter.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/filters/SecurityFilter.java
@@ -16,25 +16,22 @@
package org.usergrid.rest.security.shiro.filters;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.UriInfo;
-
+import com.sun.jersey.api.core.HttpContext;
+import com.sun.jersey.spi.container.ContainerRequest;
+import com.sun.jersey.spi.container.ContainerRequestFilter;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.usergrid.management.ManagementService;
import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.security.tokens.TokenService;
import org.usergrid.services.ServiceManagerFactory;
-import org.apache.commons.lang.StringUtils;
-
-import com.sun.jersey.api.core.HttpContext;
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerRequestFilter;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.UriInfo;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Properties;
import static org.usergrid.utils.StringUtils.stringOrSubstringAfterFirst;
import static org.usergrid.utils.StringUtils.stringOrSubstringBeforeFirst;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/security/shiro/session/HttpRequestSessionManager.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/session/HttpRequestSessionManager.java b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/session/HttpRequestSessionManager.java
index 0be3f95..c099334 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/session/HttpRequestSessionManager.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/session/HttpRequestSessionManager.java
@@ -16,9 +16,6 @@
package org.usergrid.rest.security.shiro.session;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.shiro.authz.AuthorizationException;
import org.apache.shiro.session.Session;
import org.apache.shiro.session.SessionException;
@@ -27,6 +24,9 @@ import org.apache.shiro.session.mgt.SessionKey;
import org.apache.shiro.session.mgt.SessionManager;
import org.apache.shiro.web.util.WebUtils;
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+
/**
* Intended to keep session request-scoped and therefore not persist them across multiple requests - a user must login
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/security/shiro/session/HttpServletRequestSession.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/session/HttpServletRequestSession.java b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/session/HttpServletRequestSession.java
index 1152b93..0455a69 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/security/shiro/session/HttpServletRequestSession.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/security/shiro/session/HttpServletRequestSession.java
@@ -16,17 +16,16 @@
package org.usergrid.rest.security.shiro.session;
+import org.apache.commons.collections.EnumerationUtils;
+import org.apache.shiro.session.InvalidSessionException;
+import org.apache.shiro.session.Session;
+
+import javax.servlet.http.HttpServletRequest;
import java.io.Serializable;
import java.util.Collection;
import java.util.Date;
import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.collections.EnumerationUtils;
-import org.apache.shiro.session.InvalidSessionException;
-import org.apache.shiro.session.Session;
-
/**
* Session that is only tied to an HttpServletRequest. This can be used for applications that prefer to remain
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/test/PropertiesResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/test/PropertiesResource.java b/stack/rest/src/main/java/org/usergrid/rest/test/PropertiesResource.java
index d7608ba..c103e82 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/test/PropertiesResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/test/PropertiesResource.java
@@ -16,17 +16,6 @@
package org.usergrid.rest.test;
-import java.io.IOException;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.type.TypeReference;
import org.slf4j.Logger;
@@ -35,6 +24,16 @@ import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.usergrid.rest.AbstractContextResource;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Properties;
+
/** For testing purposes only and only works with usergrid.test=true */
@Component
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/utils/CORSUtils.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/utils/CORSUtils.java b/stack/rest/src/main/java/org/usergrid/rest/utils/CORSUtils.java
index 703d537..9175d7e 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/utils/CORSUtils.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/utils/CORSUtils.java
@@ -16,13 +16,12 @@
package org.usergrid.rest.utils;
-import java.util.Enumeration;
+import com.sun.jersey.spi.container.ContainerRequest;
+import com.sun.jersey.spi.container.ContainerResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerResponse;
+import java.util.Enumeration;
/* Note: At one point there was a special case in this code that would
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/utils/JSONPUtils.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/utils/JSONPUtils.java b/stack/rest/src/main/java/org/usergrid/rest/utils/JSONPUtils.java
index 06a6532..8b404dd 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/utils/JSONPUtils.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/utils/JSONPUtils.java
@@ -16,19 +16,12 @@
package org.usergrid.rest.utils;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import org.usergrid.security.oauth.AccessInfo;
import javax.ws.rs.core.MediaType;
-
-import org.usergrid.security.oauth.AccessInfo;
+import java.util.*;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
-
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.usergrid.utils.JsonUtils.mapToJsonString;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/AbstractRestIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/AbstractRestIT.java b/stack/rest/src/test/java/org/usergrid/rest/AbstractRestIT.java
index f5cde00..e6cfd27 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/AbstractRestIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/AbstractRestIT.java
@@ -16,25 +16,6 @@
package org.usergrid.rest;
-import java.net.URI;
-import java.net.URLClassLoader;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.UriBuilder;
-
-import org.codehaus.jackson.JsonNode;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.cassandra.Concurrent;
-import org.usergrid.java.client.Client;
-
import com.sun.jersey.api.client.WebResource;
import com.sun.jersey.api.client.config.ClientConfig;
import com.sun.jersey.api.client.config.DefaultClientConfig;
@@ -44,6 +25,23 @@ import com.sun.jersey.test.framework.JerseyTest;
import com.sun.jersey.test.framework.WebAppDescriptor;
import com.sun.jersey.test.framework.spi.container.TestContainerException;
import com.sun.jersey.test.framework.spi.container.TestContainerFactory;
+import org.codehaus.jackson.JsonNode;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.cassandra.Concurrent;
+import org.usergrid.java.client.Client;
+
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.UriBuilder;
+import java.net.URI;
+import java.net.URLClassLoader;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/BasicIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/BasicIT.java b/stack/rest/src/test/java/org/usergrid/rest/BasicIT.java
index 9f3c91c..3738f57 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/BasicIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/BasicIT.java
@@ -16,20 +16,18 @@
package org.usergrid.rest;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-
+import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.api.client.WebResource;
+import com.sun.jersey.core.util.MultivaluedMapImpl;
import org.codehaus.jackson.JsonNode;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.core.util.MultivaluedMapImpl;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import java.util.Map;
+import java.util.UUID;
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/ConcurrentRestITSuite.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/ConcurrentRestITSuite.java b/stack/rest/src/test/java/org/usergrid/rest/ConcurrentRestITSuite.java
index 25fbc7b..efb70f6 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/ConcurrentRestITSuite.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/ConcurrentRestITSuite.java
@@ -13,12 +13,7 @@ import org.usergrid.rest.applications.DevicesResourceIT;
import org.usergrid.rest.applications.assets.AssetResourceIT;
import org.usergrid.rest.applications.collection.PagingResourceIT;
import org.usergrid.rest.applications.events.EventsResourceIT;
-import org.usergrid.rest.applications.users.ActivityResourceIT;
-import org.usergrid.rest.applications.users.CollectionsResourceIT;
-import org.usergrid.rest.applications.users.GroupResourceIT;
-import org.usergrid.rest.applications.users.OwnershipResourceIT;
-import org.usergrid.rest.applications.users.PermissionsResourceIT;
-import org.usergrid.rest.applications.users.UserResourceIT;
+import org.usergrid.rest.applications.users.*;
import org.usergrid.rest.filters.ContentTypeResourceIT;
import org.usergrid.rest.management.ManagementResourceIT;
import org.usergrid.rest.management.RegistrationIT;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/DatabaseInitializer.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/DatabaseInitializer.java b/stack/rest/src/test/java/org/usergrid/rest/DatabaseInitializer.java
index 9071d47..c3fe87a 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/DatabaseInitializer.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/DatabaseInitializer.java
@@ -16,9 +16,6 @@
package org.usergrid.rest;
-import java.util.Map;
-import java.util.Properties;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +24,9 @@ import org.usergrid.mq.QueueManagerFactory;
import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.services.ServiceManagerFactory;
+import java.util.Map;
+import java.util.Properties;
+
public class DatabaseInitializer {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/ITSetup.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/ITSetup.java b/stack/rest/src/test/java/org/usergrid/rest/ITSetup.java
index 2701202..ba3039b 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/ITSetup.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/ITSetup.java
@@ -15,11 +15,6 @@
package org.usergrid.rest;
-import java.net.URI;
-import java.util.Properties;
-
-import javax.ws.rs.core.UriBuilder;
-
import org.junit.rules.ExternalResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,6 +26,10 @@ import org.usergrid.security.providers.SignInProviderFactory;
import org.usergrid.security.tokens.TokenService;
import org.usergrid.services.ServiceManagerFactory;
+import javax.ws.rs.core.UriBuilder;
+import java.net.URI;
+import java.util.Properties;
+
/** A {@link org.junit.rules.TestRule} that sets up services. */
public class ITSetup extends ExternalResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/RestITSuite.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/RestITSuite.java b/stack/rest/src/test/java/org/usergrid/rest/RestITSuite.java
index 325f2dd..17ab6d1 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/RestITSuite.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/RestITSuite.java
@@ -25,12 +25,7 @@ import org.usergrid.rest.applications.DevicesResourceIT;
import org.usergrid.rest.applications.assets.AssetResourceIT;
import org.usergrid.rest.applications.collection.PagingResourceIT;
import org.usergrid.rest.applications.events.EventsResourceIT;
-import org.usergrid.rest.applications.users.ActivityResourceIT;
-import org.usergrid.rest.applications.users.CollectionsResourceIT;
-import org.usergrid.rest.applications.users.GroupResourceIT;
-import org.usergrid.rest.applications.users.OwnershipResourceIT;
-import org.usergrid.rest.applications.users.PermissionsResourceIT;
-import org.usergrid.rest.applications.users.UserResourceIT;
+import org.usergrid.rest.applications.users.*;
import org.usergrid.rest.filters.ContentTypeResourceIT;
import org.usergrid.rest.management.organizations.AdminEmailEncodingIT;
import org.usergrid.rest.management.organizations.OrganizationResourceIT;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/TestContextSetup.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/TestContextSetup.java b/stack/rest/src/test/java/org/usergrid/rest/TestContextSetup.java
index 8ac5181..9c25e16 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/TestContextSetup.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/TestContextSetup.java
@@ -1,14 +1,13 @@
package org.usergrid.rest;
+import com.sun.jersey.test.framework.JerseyTest;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
import org.usergrid.rest.test.resource.TestContext;
import org.usergrid.rest.test.security.TestAdminUser;
-import com.sun.jersey.test.framework.JerseyTest;
-
/**
* A self configuring TestContext which sets itself up it implements TestRule. With a @Rule annotation, an instance of
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/TomcatResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/TomcatResource.java b/stack/rest/src/test/java/org/usergrid/rest/TomcatResource.java
index 8ba697f..c455b49 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/TomcatResource.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/TomcatResource.java
@@ -1,15 +1,13 @@
package org.usergrid.rest;
-import java.io.File;
-
-import org.junit.rules.ExternalResource;
-import org.usergrid.cassandra.AvailablePortFinder;
-
+import com.google.common.io.Files;
import org.apache.catalina.startup.Tomcat;
import org.apache.commons.lang.math.RandomUtils;
+import org.junit.rules.ExternalResource;
+import org.usergrid.cassandra.AvailablePortFinder;
-import com.google.common.io.Files;
+import java.io.File;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/ApplicationRequestCounterIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/ApplicationRequestCounterIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/ApplicationRequestCounterIT.java
index bbb9865..66ad394 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/ApplicationRequestCounterIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/ApplicationRequestCounterIT.java
@@ -15,24 +15,19 @@
package org.usergrid.rest.applications;
-import java.util.UUID;
-
-import javax.ws.rs.core.MediaType;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.cassandra.Concurrent;
-import org.usergrid.persistence.CounterResolution;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.EntityManagerFactory;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
+import org.usergrid.persistence.*;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.services.ServiceManager;
import org.usergrid.utils.UUIDUtils;
+import javax.ws.rs.core.MediaType;
+import java.util.UUID;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/ApplicationResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/ApplicationResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/ApplicationResourceIT.java
index e316bef..1e1fe37 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/ApplicationResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/ApplicationResourceIT.java
@@ -15,10 +15,11 @@
package org.usergrid.rest.applications;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.ClientResponse.Status;
+import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.api.representation.Form;
+import org.apache.shiro.codec.Base64;
import org.codehaus.jackson.JsonNode;
import org.junit.Ignore;
import org.junit.Test;
@@ -27,16 +28,10 @@ import org.usergrid.management.ApplicationInfo;
import org.usergrid.management.OrganizationInfo;
import org.usergrid.rest.AbstractRestIT;
-import org.apache.shiro.codec.Base64;
-
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.ClientResponse.Status;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.representation.Form;
+import javax.ws.rs.core.MediaType;
+import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/DevicesResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/DevicesResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/DevicesResourceIT.java
index 6b2c6c9..0d35f0e 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/DevicesResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/DevicesResourceIT.java
@@ -1,20 +1,17 @@
package org.usergrid.rest.applications;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
+import com.sun.jersey.api.client.UniformInterfaceException;
import org.codehaus.jackson.JsonNode;
import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.rest.AbstractRestIT;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/assets/AssetResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/assets/AssetResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/assets/AssetResourceIT.java
index 468719a..2827922 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/assets/AssetResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/assets/AssetResourceIT.java
@@ -1,13 +1,8 @@
package org.usergrid.rest.applications.assets;
-import java.io.InputStream;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.TimeoutException;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.multipart.FormDataMultiPart;
+import org.apache.commons.io.IOUtils;
import org.codehaus.jackson.JsonNode;
import org.junit.Assert;
import org.junit.Ignore;
@@ -19,9 +14,11 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.applications.utils.UserRepo;
import org.usergrid.services.assets.data.AssetUtils;
-import org.apache.commons.io.IOUtils;
-
-import com.sun.jersey.multipart.FormDataMultiPart;
+import javax.ws.rs.core.MediaType;
+import java.io.InputStream;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.TimeoutException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/collection/BadGrammarQueryTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/BadGrammarQueryTest.java b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/BadGrammarQueryTest.java
index 11fa979..152baa3 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/BadGrammarQueryTest.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/BadGrammarQueryTest.java
@@ -1,9 +1,8 @@
package org.usergrid.rest.applications.collection;
-import java.util.HashMap;
-import java.util.Map;
-
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.UniformInterfaceException;
import org.codehaus.jackson.JsonNode;
import org.junit.Rule;
import org.junit.Test;
@@ -11,8 +10,8 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.test.resource.CustomCollection;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import java.util.HashMap;
+import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/collection/BrowserCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/BrowserCompatibilityTest.java b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/BrowserCompatibilityTest.java
index b363193..50706ae 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/BrowserCompatibilityTest.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/BrowserCompatibilityTest.java
@@ -16,9 +16,6 @@
package org.usergrid.rest.applications.collection;
-import java.util.Map;
-import java.util.UUID;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Rule;
import org.junit.Test;
@@ -27,6 +24,9 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.test.resource.CustomCollection;
+import java.util.Map;
+import java.util.UUID;
+
import static junit.framework.Assert.assertNotNull;
import static org.junit.Assert.assertEquals;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/collection/PagingResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/PagingResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/PagingResourceIT.java
index 1b123a1..ba621e2 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/PagingResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/PagingResourceIT.java
@@ -16,12 +16,6 @@
package org.usergrid.rest.applications.collection;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.map.ObjectMapper;
import org.junit.Rule;
@@ -34,10 +28,9 @@ import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.test.resource.CustomCollection;
import org.usergrid.rest.test.resource.EntityResource;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import java.util.*;
+
+import static org.junit.Assert.*;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/AndOrQueryTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/AndOrQueryTest.java b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/AndOrQueryTest.java
index 60dc437..6ea975d 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/AndOrQueryTest.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/AndOrQueryTest.java
@@ -1,9 +1,6 @@
package org.usergrid.rest.applications.collection.activities;
-import java.util.HashMap;
-import java.util.Map;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Ignore;
import org.junit.Rule;
@@ -12,6 +9,9 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.test.resource.CustomCollection;
+import java.util.HashMap;
+import java.util.Map;
+
import static org.junit.Assert.assertEquals;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/OrderByTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/OrderByTest.java b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/OrderByTest.java
index 88ab2c1..eea3e4b 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/OrderByTest.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/OrderByTest.java
@@ -1,11 +1,6 @@
package org.usergrid.rest.applications.collection.activities;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Rule;
import org.junit.Test;
@@ -13,6 +8,11 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.test.resource.CustomCollection;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import static org.junit.Assert.assertEquals;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/PagingEntitiesTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/PagingEntitiesTest.java b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/PagingEntitiesTest.java
index 279505f..4894287 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/PagingEntitiesTest.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/PagingEntitiesTest.java
@@ -1,9 +1,7 @@
package org.usergrid.rest.applications.collection.activities;
-import java.util.HashMap;
-import java.util.Map;
-
+import org.apache.commons.lang.ArrayUtils;
import org.codehaus.jackson.JsonNode;
import org.junit.Rule;
import org.junit.Test;
@@ -11,7 +9,8 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.test.resource.CustomCollection;
-import org.apache.commons.lang.ArrayUtils;
+import java.util.HashMap;
+import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/PutTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/PutTest.java b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/PutTest.java
index 62c1b52..39c1be4 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/PutTest.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/PutTest.java
@@ -1,9 +1,6 @@
package org.usergrid.rest.applications.collection.activities;
-import java.util.HashMap;
-import java.util.Map;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Rule;
import org.junit.Test;
@@ -11,6 +8,9 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.test.resource.CustomCollection;
+import java.util.HashMap;
+import java.util.Map;
+
import static org.junit.Assert.assertEquals;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/collection/groups/GeoPagingTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/groups/GeoPagingTest.java b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/groups/GeoPagingTest.java
index 828f249..a5f46a6 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/groups/GeoPagingTest.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/groups/GeoPagingTest.java
@@ -15,9 +15,6 @@
package org.usergrid.rest.applications.collection.groups;
-import java.util.HashMap;
-import java.util.Map;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Rule;
import org.junit.Test;
@@ -25,6 +22,9 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.test.resource.CustomCollection;
+import java.util.HashMap;
+import java.util.Map;
+
import static org.junit.Assert.assertEquals;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/collection/groups/UpdateGroupIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/groups/UpdateGroupIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/groups/UpdateGroupIT.java
index 18449cf..e9c5dea 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/groups/UpdateGroupIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/groups/UpdateGroupIT.java
@@ -15,12 +15,10 @@
package org.usergrid.rest.applications.collection.groups;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.api.client.WebResource;
+import junit.framework.Assert;
+import org.apache.commons.io.IOUtils;
import org.codehaus.jackson.JsonNode;
import org.junit.Rule;
import org.junit.Test;
@@ -29,12 +27,10 @@ import org.slf4j.LoggerFactory;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
-import org.apache.commons.io.IOUtils;
-
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.client.WebResource;
-
-import junit.framework.Assert;
+import javax.ws.rs.core.MediaType;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/events/EventsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/events/EventsResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/events/EventsResourceIT.java
index e5dd903..76a0056 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/events/EventsResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/events/EventsResourceIT.java
@@ -1,11 +1,6 @@
package org.usergrid.rest.applications.events;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Test;
import org.slf4j.Logger;
@@ -13,6 +8,10 @@ import org.slf4j.LoggerFactory;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.rest.AbstractRestIT;
+import javax.ws.rs.core.MediaType;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/queues/AbstractQueueResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/queues/AbstractQueueResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/queues/AbstractQueueResourceIT.java
index d889f63..bad4c3e 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/queues/AbstractQueueResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/queues/AbstractQueueResourceIT.java
@@ -1,25 +1,17 @@
package org.usergrid.rest.applications.queues;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.concurrent.Callable;
-import java.util.concurrent.atomic.AtomicInteger;
-
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.test.resource.app.queue.Queue;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
+import java.util.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicInteger;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
public class AbstractQueueResourceIT extends AbstractRestIT {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong1IT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong1IT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong1IT.java
index 76a105b..d3222b2 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong1IT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong1IT.java
@@ -1,8 +1,7 @@
package org.usergrid.rest.applications.queues;
-import java.util.List;
-
+import com.google.common.collect.BiMap;
import org.junit.Rule;
import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
@@ -11,11 +10,9 @@ import org.usergrid.rest.test.resource.app.queue.Queue;
import org.usergrid.rest.test.resource.app.queue.Transaction;
import org.usergrid.utils.MapUtils;
-import com.google.common.collect.BiMap;
+import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong2IT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong2IT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong2IT.java
index fb64ee2..ec051c4 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong2IT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong2IT.java
@@ -1,9 +1,7 @@
package org.usergrid.rest.applications.queues;
-import java.util.List;
-import java.util.Map;
-
+import com.google.common.collect.BiMap;
import org.junit.Rule;
import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
@@ -12,7 +10,8 @@ import org.usergrid.rest.test.resource.app.queue.Queue;
import org.usergrid.rest.test.resource.app.queue.Transaction;
import org.usergrid.utils.MapUtils;
-import com.google.common.collect.BiMap;
+import java.util.List;
+import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong3IT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong3IT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong3IT.java
index ace39e4..1d87280 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong3IT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong3IT.java
@@ -1,9 +1,8 @@
package org.usergrid.rest.applications.queues;
-import java.util.List;
-import java.util.Map;
-
+import com.google.common.collect.BiMap;
+import com.sun.jersey.api.client.UniformInterfaceException;
import org.junit.Rule;
import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
@@ -12,13 +11,10 @@ import org.usergrid.rest.test.resource.app.queue.Queue;
import org.usergrid.rest.test.resource.app.queue.Transaction;
import org.usergrid.utils.MapUtils;
-import com.google.common.collect.BiMap;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import java.util.List;
+import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceShortIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceShortIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceShortIT.java
index 9b460b9..26f5447 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceShortIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceShortIT.java
@@ -1,15 +1,7 @@
package org.usergrid.rest.applications.queues;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
+import com.sun.jersey.api.client.UniformInterfaceException;
import org.codehaus.jackson.JsonNode;
import org.junit.Ignore;
import org.junit.Rule;
@@ -20,11 +12,16 @@ import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.test.resource.app.queue.Queue;
import org.usergrid.utils.MapUtils;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/users/CollectionsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/CollectionsResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/CollectionsResourceIT.java
index ca42047..d7a1970 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/CollectionsResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/CollectionsResourceIT.java
@@ -16,12 +16,7 @@
package org.usergrid.rest.applications.users;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.UniformInterfaceException;
import org.codehaus.jackson.JsonNode;
import org.junit.Assert;
import org.junit.Test;
@@ -31,11 +26,12 @@ import org.usergrid.cassandra.Concurrent;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.utils.UUIDUtils;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.*;
import static org.usergrid.utils.MapUtils.hashMap;
[07/23] organize imports only
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/users/ConnectionResourceTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/ConnectionResourceTest.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/ConnectionResourceTest.java
index 6923cff..a1bd3ec 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/ConnectionResourceTest.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/ConnectionResourceTest.java
@@ -1,12 +1,8 @@
package org.usergrid.rest.applications.users;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.UniformInterfaceException;
import org.codehaus.jackson.JsonNode;
import org.junit.Rule;
import org.junit.Test;
@@ -14,8 +10,10 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.test.resource.CustomCollection;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import javax.ws.rs.core.MediaType;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/users/GroupResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/GroupResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/GroupResourceIT.java
index c440d9b..d537701 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/GroupResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/GroupResourceIT.java
@@ -16,10 +16,6 @@
package org.usergrid.rest.applications.users;
-import java.util.UUID;
-
-import javax.ws.rs.core.MediaType;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Before;
import org.junit.Test;
@@ -31,10 +27,10 @@ import org.usergrid.java.client.response.ApiResponse;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.utils.UUIDUtils;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import javax.ws.rs.core.MediaType;
+import java.util.UUID;
+
+import static org.junit.Assert.*;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/users/OwnershipResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/OwnershipResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/OwnershipResourceIT.java
index 114f798..06989bb 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/OwnershipResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/OwnershipResourceIT.java
@@ -29,11 +29,7 @@ import org.usergrid.rest.test.security.TestAppUser;
import org.usergrid.rest.test.security.TestUser;
import org.usergrid.utils.MapUtils;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/users/PermissionsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/PermissionsResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/PermissionsResourceIT.java
index f7173e9..fd2346e 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/PermissionsResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/PermissionsResourceIT.java
@@ -16,12 +16,9 @@
package org.usergrid.rest.applications.users;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.ClientResponse.Status;
+import com.sun.jersey.api.client.UniformInterfaceException;
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.node.ArrayNode;
import org.junit.Ignore;
@@ -33,14 +30,12 @@ import org.usergrid.management.OrganizationOwnerInfo;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.utils.UUIDUtils;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.ClientResponse.Status;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import javax.ws.rs.core.MediaType;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.UUID;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/users/RetrieveUsersTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/RetrieveUsersTest.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/RetrieveUsersTest.java
index 9383cbf..1036be3 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/RetrieveUsersTest.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/RetrieveUsersTest.java
@@ -1,9 +1,6 @@
package org.usergrid.rest.applications.users;
-import java.util.HashMap;
-import java.util.Map;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Assert;
import org.junit.Rule;
@@ -14,6 +11,9 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.test.resource.CustomCollection;
+import java.util.HashMap;
+import java.util.Map;
+
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/users/UserResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/UserResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/UserResourceIT.java
index 8c212a5..4198b1c 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/UserResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/UserResourceIT.java
@@ -16,15 +16,8 @@
package org.usergrid.rest.applications.users;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.ClientResponse.Status;
+import com.sun.jersey.api.client.UniformInterfaceException;
import org.codehaus.jackson.JsonNode;
import org.junit.Test;
import org.slf4j.Logger;
@@ -42,15 +35,10 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.applications.utils.UserRepo;
import org.usergrid.utils.UUIDUtils;
-import com.sun.jersey.api.client.ClientResponse.Status;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import javax.ws.rs.core.MediaType;
+import java.util.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
import static org.usergrid.rest.applications.utils.TestUtils.getIdFromSearchResults;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/users/extensions/TestResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/extensions/TestResource.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/extensions/TestResource.java
index 331996e..0e26692 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/extensions/TestResource.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/extensions/TestResource.java
@@ -16,10 +16,6 @@
package org.usergrid.rest.applications.users.extensions;
-import javax.ws.rs.GET;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
import org.junit.Ignore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,6 +23,10 @@ import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.usergrid.rest.applications.users.AbstractUserExtensionResource;
+import javax.ws.rs.GET;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
@Ignore
@Component("org.usergrid.rest.applications.users.extensions.TestResource")
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/utils/TestUtils.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/utils/TestUtils.java b/stack/rest/src/test/java/org/usergrid/rest/applications/utils/TestUtils.java
index abd93e7..0f6e57d 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/utils/TestUtils.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/utils/TestUtils.java
@@ -16,12 +16,12 @@
package org.usergrid.rest.applications.utils;
-import java.util.UUID;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Ignore;
import org.usergrid.utils.UUIDUtils;
+import java.util.UUID;
+
/** @author tnine */
@Ignore("Not a test")
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/applications/utils/UserRepo.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/utils/UserRepo.java b/stack/rest/src/test/java/org/usergrid/rest/applications/utils/UserRepo.java
index 4a87a32..6b9e9b9 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/utils/UserRepo.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/utils/UserRepo.java
@@ -1,16 +1,14 @@
package org.usergrid.rest.applications.utils;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.WebResource;
import org.codehaus.jackson.JsonNode;
import org.usergrid.utils.UUIDUtils;
-import com.sun.jersey.api.client.WebResource;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/filters/ContentTypeResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/filters/ContentTypeResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/filters/ContentTypeResourceIT.java
index 8b16db2..d2669fe 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/filters/ContentTypeResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/filters/ContentTypeResourceIT.java
@@ -16,14 +16,15 @@
package org.usergrid.rest.filters;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-
+import org.apache.http.*;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.params.BasicHttpParams;
+import org.apache.http.util.EntityUtils;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
@@ -33,20 +34,12 @@ import org.usergrid.rest.TestContextSetup;
import org.usergrid.utils.JsonUtils;
import org.usergrid.utils.UUIDUtils;
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpResponse;
-import org.apache.http.NameValuePair;
-import org.apache.http.ParseException;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.util.EntityUtils;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/management/ManagementResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/management/ManagementResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/management/ManagementResourceIT.java
index 9a7b873..9685edb 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/management/ManagementResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/management/ManagementResourceIT.java
@@ -16,11 +16,10 @@
package org.usergrid.rest.management;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.ClientResponse.Status;
+import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.api.representation.Form;
+import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.JsonNode;
import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
@@ -29,16 +28,11 @@ import org.usergrid.management.OrganizationOwnerInfo;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.management.organizations.OrganizationsResource;
-import org.apache.commons.lang.StringUtils;
-
-import com.sun.jersey.api.client.ClientResponse.Status;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.representation.Form;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/management/RegistrationIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/management/RegistrationIT.java b/stack/rest/src/test/java/org/usergrid/rest/management/RegistrationIT.java
index a5fb6e8..ee31dcd 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/management/RegistrationIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/management/RegistrationIT.java
@@ -14,21 +14,10 @@
package org.usergrid.rest.management;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.UUID;
-
-import javax.mail.Folder;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.Store;
-import javax.mail.internet.MimeMultipart;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.core.util.MultivaluedMapImpl;
+import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.JsonNode;
import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
@@ -38,23 +27,18 @@ import org.usergrid.management.UserInfo;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.rest.AbstractRestIT;
-import org.apache.commons.lang.StringUtils;
-
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.core.util.MultivaluedMapImpl;
+import javax.mail.*;
+import javax.mail.internet.MimeMultipart;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.UUID;
-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.junit.Assert.fail;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_RESETPW_URL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_USERS_REQUIRE_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_APPROVES_ADMIN_USERS;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_APPROVES_ORGANIZATIONS;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_EMAIL;
+import static org.junit.Assert.*;
+import static org.usergrid.management.AccountCreationProps.*;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationResourceIT.java
index 39c9c4a..39e9744 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationResourceIT.java
@@ -1,11 +1,7 @@
package org.usergrid.rest.management.organizations;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
+import junit.framework.Assert;
import org.codehaus.jackson.JsonNode;
import org.junit.Rule;
import org.junit.Test;
@@ -14,7 +10,9 @@ import org.usergrid.management.OrganizationInfo;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
-import junit.framework.Assert;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationsResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationsResourceIT.java
index 1fc7477..34daa6c 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationsResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/management/organizations/OrganizationsResourceIT.java
@@ -1,14 +1,14 @@
package org.usergrid.rest.management.organizations;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.ClientResponse.Status;
+import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.api.representation.Form;
+import junit.framework.Assert;
import org.codehaus.jackson.JsonNode;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.usergrid.management.ApplicationInfo;
import org.usergrid.management.OrganizationInfo;
import org.usergrid.management.UserInfo;
@@ -17,22 +17,14 @@ import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.persistence.entities.User;
import org.usergrid.rest.AbstractRestIT;
-import com.sun.jersey.api.client.ClientResponse.Status;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.representation.Form;
-
-import junit.framework.Assert;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
import static junit.framework.Assert.fail;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_USERS_REQUIRE_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_APPROVES_ADMIN_USERS;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_APPROVES_ORGANIZATIONS;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_EMAIL;
+import static org.junit.Assert.*;
+import static org.usergrid.management.AccountCreationProps.*;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/management/users/MUUserResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/management/users/MUUserResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/management/users/MUUserResourceIT.java
index 31e4517..0a9395b 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/management/users/MUUserResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/management/users/MUUserResourceIT.java
@@ -14,16 +14,9 @@
package org.usergrid.rest.management.users;
-import java.io.IOException;
-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 javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.api.representation.Form;
+import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.JsonNode;
import org.junit.Ignore;
import org.junit.Rule;
@@ -31,12 +24,7 @@ import org.junit.Test;
import org.jvnet.mock_javamail.Mailbox;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.usergrid.management.AccountCreationProps;
-import org.usergrid.management.ActivationState;
-import org.usergrid.management.MockImapClient;
-import org.usergrid.management.OrganizationInfo;
-import org.usergrid.management.OrganizationOwnerInfo;
-import org.usergrid.management.UserInfo;
+import org.usergrid.management.*;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.management.organizations.OrganizationsResource;
@@ -47,22 +35,17 @@ import org.usergrid.security.AuthPrincipalInfo;
import org.usergrid.security.AuthPrincipalType;
import org.usergrid.utils.UUIDUtils;
-import org.apache.commons.lang.StringUtils;
-
-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 javax.ws.rs.core.MediaType;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_USERS_REQUIRE_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_NOTIFY_ADMIN_OF_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_APPROVES_ADMIN_USERS;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_APPROVES_ORGANIZATIONS;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_EMAIL;
+import static org.junit.Assert.*;
+import static org.usergrid.management.AccountCreationProps.*;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/management/users/organizations/UsersOrganizationsResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/management/users/organizations/UsersOrganizationsResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/management/users/organizations/UsersOrganizationsResourceIT.java
index b9c0cd8..021395c 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/management/users/organizations/UsersOrganizationsResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/management/users/organizations/UsersOrganizationsResourceIT.java
@@ -1,15 +1,14 @@
package org.usergrid.rest.management.users.organizations;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
import org.codehaus.jackson.JsonNode;
import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.rest.AbstractRestIT;
+import javax.ws.rs.core.MediaType;
+import java.util.Map;
+
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/PropertiesResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/PropertiesResourceIT.java b/stack/rest/src/test/java/org/usergrid/rest/test/PropertiesResourceIT.java
index d344f88..4e43b8c 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/PropertiesResourceIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/PropertiesResourceIT.java
@@ -17,11 +17,6 @@
package org.usergrid.rest.test;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
@@ -30,6 +25,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.services.ServiceManagerFactory;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.Map;
+
import static org.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_USERS_REQUIRE_CONFIRMATION;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/Connection.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/Connection.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/Connection.java
index 26e0d3c..c1d9f17 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/Connection.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/Connection.java
@@ -16,10 +16,10 @@
package org.usergrid.rest.test.resource;
-import java.util.UUID;
-
import org.usergrid.rest.test.resource.app.queue.DevicesCollection;
+import java.util.UUID;
+
/** @author tnine */
public class Connection extends ValueResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/EntityResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/EntityResource.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/EntityResource.java
index 5102c41..6a94bd2 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/EntityResource.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/EntityResource.java
@@ -16,15 +16,14 @@
package org.usergrid.rest.test.resource;
+import com.sun.jersey.api.client.ClientResponse.Status;
+import com.sun.jersey.api.client.UniformInterfaceException;
+import org.codehaus.jackson.JsonNode;
+
import java.util.Collections;
import java.util.Map;
import java.util.UUID;
-import org.codehaus.jackson.JsonNode;
-
-import com.sun.jersey.api.client.ClientResponse.Status;
-import com.sun.jersey.api.client.UniformInterfaceException;
-
/** @author tnine */
public class EntityResource extends ValueResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/NamedResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/NamedResource.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/NamedResource.java
index c8b0e73..83abdf0 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/NamedResource.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/NamedResource.java
@@ -16,17 +16,15 @@
package org.usergrid.rest.test.resource;
+import com.sun.jersey.api.client.WebResource;
+import com.sun.jersey.api.client.WebResource.Builder;
+import org.codehaus.jackson.JsonNode;
+
+import javax.ws.rs.core.MediaType;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-import javax.ws.rs.core.MediaType;
-
-import org.codehaus.jackson.JsonNode;
-
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.WebResource.Builder;
-
/**
* @author tnine
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/SetResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/SetResource.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/SetResource.java
index 0c6ddc1..fca105b 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/SetResource.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/SetResource.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.test.resource;
+import org.codehaus.jackson.JsonNode;
+
import java.util.Map;
import java.util.UUID;
-import org.codehaus.jackson.JsonNode;
-
/** @author tnine */
public abstract class SetResource extends ValueResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/TestContext.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/TestContext.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/TestContext.java
index 10cb6ed..70bfb26 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/TestContext.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/TestContext.java
@@ -15,15 +15,14 @@
package org.usergrid.rest.test.resource;
-import java.util.UUID;
-
+import com.sun.jersey.test.framework.JerseyTest;
import org.usergrid.rest.test.resource.app.Application;
import org.usergrid.rest.test.resource.app.User;
import org.usergrid.rest.test.resource.app.UsersCollection;
import org.usergrid.rest.test.resource.mgmt.Management;
import org.usergrid.rest.test.security.TestUser;
-import com.sun.jersey.test.framework.JerseyTest;
+import java.util.UUID;
public class TestContext {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/ValueResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/ValueResource.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/ValueResource.java
index f5c8d18..817e30b 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/ValueResource.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/ValueResource.java
@@ -16,15 +16,14 @@
package org.usergrid.rest.test.resource;
+import com.sun.jersey.api.client.WebResource;
+import org.codehaus.jackson.JsonNode;
+
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
-import org.codehaus.jackson.JsonNode;
-
-import com.sun.jersey.api.client.WebResource;
-
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Application.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Application.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Application.java
index e076939..2be7375 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Application.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Application.java
@@ -16,8 +16,6 @@
package org.usergrid.rest.test.resource.app;
-import javax.ws.rs.core.MediaType;
-
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.test.resource.CustomCollection;
import org.usergrid.rest.test.resource.RootResource;
@@ -25,6 +23,8 @@ import org.usergrid.rest.test.resource.ValueResource;
import org.usergrid.rest.test.resource.app.queue.DevicesCollection;
import org.usergrid.rest.test.resource.app.queue.QueuesCollection;
+import javax.ws.rs.core.MediaType;
+
/** @author tnine */
public class Application extends ValueResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Device.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Device.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Device.java
index 91f7f06..5a66551 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Device.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/Device.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.test.resource.app;
-import java.util.UUID;
-
import org.usergrid.rest.test.resource.EntityResource;
import org.usergrid.rest.test.resource.NamedResource;
+import java.util.UUID;
+
/**
* A resource for testing queues
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/User.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/User.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/User.java
index 68e897a..eabb5e2 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/User.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/User.java
@@ -16,12 +16,12 @@
package org.usergrid.rest.test.resource.app;
-import java.util.UUID;
-
import org.usergrid.rest.test.resource.EntityResource;
import org.usergrid.rest.test.resource.NamedResource;
import org.usergrid.rest.test.resource.app.queue.DevicesCollection;
+import java.util.UUID;
+
/**
* A resource for testing queues
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/UsersCollection.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/UsersCollection.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/UsersCollection.java
index df5ac39..8e56d58 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/UsersCollection.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/UsersCollection.java
@@ -16,15 +16,15 @@
package org.usergrid.rest.test.resource.app;
-import java.util.Map;
-import java.util.UUID;
-
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.test.resource.CollectionResource;
import org.usergrid.rest.test.resource.Me;
import org.usergrid.rest.test.resource.NamedResource;
import org.usergrid.utils.MapUtils;
+import java.util.Map;
+import java.util.UUID;
+
/** @author tnine */
public class UsersCollection extends CollectionResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Queue.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Queue.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Queue.java
index 23bb526..32a8c0c 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Queue.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Queue.java
@@ -16,14 +16,13 @@
package org.usergrid.rest.test.resource.app.queue;
-import java.util.List;
-import java.util.Map;
-
+import com.sun.jersey.api.client.WebResource;
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.test.resource.CollectionResource;
import org.usergrid.rest.test.resource.NamedResource;
-import com.sun.jersey.api.client.WebResource;
+import java.util.List;
+import java.util.Map;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Transaction.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Transaction.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Transaction.java
index 47d5dd7..98d03ce 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Transaction.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/app/queue/Transaction.java
@@ -16,12 +16,11 @@
package org.usergrid.rest.test.resource.app.queue;
+import com.sun.jersey.api.client.WebResource;
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.test.resource.CollectionResource;
import org.usergrid.rest.test.resource.NamedResource;
-import com.sun.jersey.api.client.WebResource;
-
/**
* A resource for testing queues
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Application.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Application.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Application.java
index 01ad317..2b2bcb2 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Application.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Application.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.test.resource.mgmt;
-import java.util.UUID;
-
import org.usergrid.rest.test.resource.EntityResource;
import org.usergrid.rest.test.resource.NamedResource;
+import java.util.UUID;
+
/**
* A resource for testing queues
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/ApplicationsCollection.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/ApplicationsCollection.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/ApplicationsCollection.java
index 293c1f0..765b44b 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/ApplicationsCollection.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/ApplicationsCollection.java
@@ -16,13 +16,13 @@
package org.usergrid.rest.test.resource.mgmt;
-import java.util.UUID;
-
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.test.resource.CollectionResource;
import org.usergrid.rest.test.resource.NamedResource;
import org.usergrid.utils.MapUtils;
+import java.util.UUID;
+
/** @author tnine */
public class ApplicationsCollection extends CollectionResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Management.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Management.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Management.java
index 758c701..091e408 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Management.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Management.java
@@ -16,10 +16,6 @@
package org.usergrid.rest.test.resource.mgmt;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.test.resource.Me;
import org.usergrid.rest.test.resource.NamedResource;
@@ -27,6 +23,9 @@ import org.usergrid.rest.test.resource.RootResource;
import org.usergrid.rest.test.resource.app.UsersCollection;
import org.usergrid.utils.MapUtils;
+import javax.ws.rs.core.MediaType;
+import java.util.Map;
+
/** @author tnine */
public class Management extends NamedResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Organization.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Organization.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Organization.java
index 9deedd7..3449484 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Organization.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/Organization.java
@@ -16,12 +16,12 @@
package org.usergrid.rest.test.resource.mgmt;
-import java.util.UUID;
-
import org.usergrid.rest.test.resource.EntityResource;
import org.usergrid.rest.test.resource.NamedResource;
import org.usergrid.rest.test.resource.app.UsersCollection;
+import java.util.UUID;
+
/**
* A resource for testing queues
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/OrganizationsCollection.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/OrganizationsCollection.java b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/OrganizationsCollection.java
index e96ba95..0fc8a9d 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/OrganizationsCollection.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/resource/mgmt/OrganizationsCollection.java
@@ -16,14 +16,14 @@
package org.usergrid.rest.test.resource.mgmt;
-import java.util.UUID;
-
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.test.resource.CollectionResource;
import org.usergrid.rest.test.resource.NamedResource;
import org.usergrid.rest.test.security.TestUser;
import org.usergrid.utils.MapUtils;
+import java.util.UUID;
+
/** @author tnine */
public class OrganizationsCollection extends CollectionResource {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/test/java/org/usergrid/rest/test/security/TestUser.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/test/security/TestUser.java b/stack/rest/src/test/java/org/usergrid/rest/test/security/TestUser.java
index 4f67dd2..4366590 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/test/security/TestUser.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/test/security/TestUser.java
@@ -16,11 +16,11 @@
package org.usergrid.rest.test.security;
-import java.util.UUID;
-
import org.codehaus.jackson.JsonNode;
import org.usergrid.rest.test.resource.TestContext;
+import java.util.UUID;
+
/** @author tnine */
public abstract class TestUser {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/management/ApplicationInfo.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/management/ApplicationInfo.java b/stack/services/src/main/java/org/usergrid/management/ApplicationInfo.java
index 968e0ac..f059024 100644
--- a/stack/services/src/main/java/org/usergrid/management/ApplicationInfo.java
+++ b/stack/services/src/main/java/org/usergrid/management/ApplicationInfo.java
@@ -16,12 +16,8 @@
package org.usergrid.management;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.Map.Entry;
-import java.util.UUID;
import static org.usergrid.persistence.Schema.PROPERTY_NAME;
import static org.usergrid.persistence.Schema.PROPERTY_UUID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/management/ManagementService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/management/ManagementService.java b/stack/services/src/main/java/org/usergrid/management/ManagementService.java
index d3926f5..7af7124 100644
--- a/stack/services/src/main/java/org/usergrid/management/ManagementService.java
+++ b/stack/services/src/main/java/org/usergrid/management/ManagementService.java
@@ -16,12 +16,7 @@
package org.usergrid.management;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.UUID;
-
+import com.google.common.collect.BiMap;
import org.usergrid.persistence.CredentialsInfo;
import org.usergrid.persistence.Entity;
import org.usergrid.persistence.EntityRef;
@@ -33,7 +28,7 @@ import org.usergrid.security.oauth.AccessInfo;
import org.usergrid.security.shiro.PrincipalCredentialsToken;
import org.usergrid.services.ServiceResults;
-import com.google.common.collect.BiMap;
+import java.util.*;
public interface ManagementService {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/management/OrganizationInfo.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/management/OrganizationInfo.java b/stack/services/src/main/java/org/usergrid/management/OrganizationInfo.java
index a38aeca..ff7a2d5 100644
--- a/stack/services/src/main/java/org/usergrid/management/OrganizationInfo.java
+++ b/stack/services/src/main/java/org/usergrid/management/OrganizationInfo.java
@@ -16,12 +16,8 @@
package org.usergrid.management;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.Map.Entry;
-import java.util.UUID;
import static org.usergrid.persistence.Schema.PROPERTY_PATH;
import static org.usergrid.persistence.Schema.PROPERTY_UUID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/management/UserInfo.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/management/UserInfo.java b/stack/services/src/main/java/org/usergrid/management/UserInfo.java
index cbf27ef..7561ede 100644
--- a/stack/services/src/main/java/org/usergrid/management/UserInfo.java
+++ b/stack/services/src/main/java/org/usergrid/management/UserInfo.java
@@ -16,23 +16,14 @@
package org.usergrid.management;
+import javax.xml.bind.annotation.XmlRootElement;
import java.util.Map;
import java.util.UUID;
-import javax.xml.bind.annotation.XmlRootElement;
-
import static org.apache.commons.lang.StringUtils.isNotBlank;
-import static org.usergrid.persistence.Schema.PROPERTY_ACTIVATED;
-import static org.usergrid.persistence.Schema.PROPERTY_CONFIRMED;
-import static org.usergrid.persistence.Schema.PROPERTY_DISABLED;
-import static org.usergrid.persistence.Schema.PROPERTY_EMAIL;
-import static org.usergrid.persistence.Schema.PROPERTY_NAME;
-import static org.usergrid.persistence.Schema.PROPERTY_USERNAME;
-import static org.usergrid.persistence.Schema.PROPERTY_UUID;
+import static org.usergrid.persistence.Schema.*;
import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
-import static org.usergrid.utils.ConversionUtils.getBoolean;
-import static org.usergrid.utils.ConversionUtils.string;
-import static org.usergrid.utils.ConversionUtils.uuid;
+import static org.usergrid.utils.ConversionUtils.*;
@XmlRootElement
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/management/cassandra/AccountCreationPropsImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/management/cassandra/AccountCreationPropsImpl.java b/stack/services/src/main/java/org/usergrid/management/cassandra/AccountCreationPropsImpl.java
index 98e70c7..4a3149d 100644
--- a/stack/services/src/main/java/org/usergrid/management/cassandra/AccountCreationPropsImpl.java
+++ b/stack/services/src/main/java/org/usergrid/management/cassandra/AccountCreationPropsImpl.java
@@ -16,15 +16,14 @@
package org.usergrid.management.cassandra;
-import java.util.Enumeration;
-import java.util.Properties;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.AccountCreationProps;
-import static java.lang.Boolean.parseBoolean;
+import java.util.Enumeration;
+import java.util.Properties;
+import static java.lang.Boolean.parseBoolean;
import static org.apache.commons.lang.StringUtils.isBlank;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/management/cassandra/ApplicationCreatorImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/management/cassandra/ApplicationCreatorImpl.java b/stack/services/src/main/java/org/usergrid/management/cassandra/ApplicationCreatorImpl.java
index f46cfbb..e36d65f 100644
--- a/stack/services/src/main/java/org/usergrid/management/cassandra/ApplicationCreatorImpl.java
+++ b/stack/services/src/main/java/org/usergrid/management/cassandra/ApplicationCreatorImpl.java
@@ -1,9 +1,7 @@
package org.usergrid.management.cassandra;
-import java.util.Arrays;
-import java.util.UUID;
-
+import com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.ApplicationCreator;
@@ -14,7 +12,8 @@ import org.usergrid.management.exceptions.ApplicationCreationException;
import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.EntityManagerFactory;
-import com.google.common.base.Preconditions;
+import java.util.Arrays;
+import java.util.UUID;
/** @author zznate */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java b/stack/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java
index 238ebdd..b917047 100644
--- a/stack/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java
+++ b/stack/services/src/main/java/org/usergrid/management/cassandra/ManagementServiceImpl.java
@@ -17,47 +17,20 @@
package org.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 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.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.usergrid.locking.Lock;
import org.usergrid.locking.LockManager;
-import org.usergrid.management.AccountCreationProps;
-import org.usergrid.management.ActivationState;
-import org.usergrid.management.ApplicationInfo;
-import org.usergrid.management.ManagementService;
-import org.usergrid.management.OrganizationInfo;
-import org.usergrid.management.OrganizationOwnerInfo;
-import org.usergrid.management.UserInfo;
-import org.usergrid.management.exceptions.DisabledAdminUserException;
-import org.usergrid.management.exceptions.DisabledAppUserException;
-import org.usergrid.management.exceptions.IncorrectPasswordException;
-import org.usergrid.management.exceptions.ManagementException;
-import org.usergrid.management.exceptions.RecentlyUsedPasswordException;
-import org.usergrid.management.exceptions.UnableToLeaveOrganizationException;
-import org.usergrid.management.exceptions.UnactivatedAdminUserException;
-import org.usergrid.management.exceptions.UnactivatedAppUserException;
-import org.usergrid.management.exceptions.UnconfirmedAdminUserException;
-import org.usergrid.persistence.CredentialsInfo;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.EntityManagerFactory;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.Results;
+import org.usergrid.management.*;
+import org.usergrid.management.exceptions.*;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.Results.Level;
-import org.usergrid.persistence.SimpleEntityRef;
import org.usergrid.persistence.entities.Application;
import org.usergrid.persistence.entities.Group;
import org.usergrid.persistence.entities.User;
@@ -79,92 +52,26 @@ import org.usergrid.security.tokens.TokenCategory;
import org.usergrid.security.tokens.TokenInfo;
import org.usergrid.security.tokens.TokenService;
import org.usergrid.security.tokens.exceptions.TokenException;
-import org.usergrid.services.ServiceAction;
-import org.usergrid.services.ServiceManager;
-import org.usergrid.services.ServiceManagerFactory;
-import org.usergrid.services.ServiceRequest;
-import org.usergrid.services.ServiceResults;
-import org.usergrid.utils.ConversionUtils;
-import org.usergrid.utils.JsonUtils;
-import org.usergrid.utils.MailUtils;
-import org.usergrid.utils.StringUtils;
-import org.usergrid.utils.UUIDUtils;
+import org.usergrid.services.*;
+import org.usergrid.utils.*;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang.text.StrSubstitutor;
-import org.apache.shiro.UnavailableSecurityManagerException;
-
-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.usergrid.locking.LockHelper.getUniqueUpdateLock;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_ACTIVATION_URL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_CONFIRMATION_URL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_RESETPW_URL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_ACTIVATED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_CONFIRMED_AWAITING_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_INVITED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_PASSWORD_RESET;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_USER_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_FOOTER;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ORGANIZATION_ACTIVATED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ORGANIZATION_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ORGANIZATION_CONFIRMED_AWAITING_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_SYSADMIN_ADMIN_ACTIVATED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_SYSADMIN_ADMIN_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_SYSADMIN_ORGANIZATION_ACTIVATED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_SYSADMIN_ORGANIZATION_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_ACTIVATED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_CONFIRMED_AWAITING_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_PASSWORD_RESET;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_PIN_REQUEST;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_MAILER_EMAIL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ORGANIZATION_ACTIVATION_URL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SETUP_TEST_ACCOUNT;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_EMAIL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_LOGIN_ALLOWED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_LOGIN_EMAIL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_LOGIN_NAME;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_LOGIN_PASSWORD;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_ADMIN_USER_EMAIL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_ADMIN_USER_NAME;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_ADMIN_USER_PASSWORD;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_ADMIN_USER_USERNAME;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_APP;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_TEST_ACCOUNT_ORGANIZATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_USER_ACTIVATION_URL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_USER_CONFIRMATION_URL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_USER_RESETPW_URL;
+import static org.usergrid.management.AccountCreationProps.*;
import static org.usergrid.persistence.CredentialsInfo.getCredentialsSecret;
-import static org.usergrid.persistence.Schema.DICTIONARY_CREDENTIALS;
-import static org.usergrid.persistence.Schema.PROPERTY_NAME;
-import static org.usergrid.persistence.Schema.PROPERTY_PATH;
-import static org.usergrid.persistence.Schema.PROPERTY_SECRET;
+import static org.usergrid.persistence.Schema.*;
import static org.usergrid.persistence.Schema.PROPERTY_UUID;
import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_ACTOR;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_ACTOR_NAME;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_CATEGORY;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_CONTENT;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_DISPLAY_NAME;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_ENTITY_TYPE;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_OBJECT;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_OBJECT_ENTITY_TYPE;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_OBJECT_NAME;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_OBJECT_TYPE;
+import static org.usergrid.persistence.entities.Activity.*;
import static org.usergrid.persistence.entities.Activity.PROPERTY_TITLE;
-import static org.usergrid.persistence.entities.Activity.PROPERTY_VERB;
-import static org.usergrid.security.AuthPrincipalType.ADMIN_USER;
-import static org.usergrid.security.AuthPrincipalType.APPLICATION;
-import static org.usergrid.security.AuthPrincipalType.APPLICATION_USER;
-import static org.usergrid.security.AuthPrincipalType.ORGANIZATION;
+import static org.usergrid.security.AuthPrincipalType.*;
import static org.usergrid.security.oauth.ClientCredentialsInfo.getTypeFromClientId;
import static org.usergrid.security.oauth.ClientCredentialsInfo.getUUIDFromClientId;
import static org.usergrid.security.tokens.TokenCategory.ACCESS;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/AuthPrincipalType.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/AuthPrincipalType.java b/stack/services/src/main/java/org/usergrid/security/AuthPrincipalType.java
index 091092c..582e0d7 100644
--- a/stack/services/src/main/java/org/usergrid/security/AuthPrincipalType.java
+++ b/stack/services/src/main/java/org/usergrid/security/AuthPrincipalType.java
@@ -16,12 +16,12 @@
package org.usergrid.security;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
import org.usergrid.persistence.entities.Group;
import org.usergrid.persistence.entities.User;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
import static org.usergrid.utils.CodecUtils.base64;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionService.java b/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionService.java
index 47fcfee..ab0ce01 100644
--- a/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionService.java
+++ b/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionService.java
@@ -16,11 +16,11 @@
package org.usergrid.security.crypto;
-import java.util.UUID;
-
import org.usergrid.persistence.CredentialsInfo;
import org.usergrid.security.crypto.command.EncryptionCommand;
+import java.util.UUID;
+
/** @author tnine */
public interface EncryptionService {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionServiceImpl.java b/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionServiceImpl.java
index 68cb9f0..28dd59f 100644
--- a/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionServiceImpl.java
+++ b/stack/services/src/main/java/org/usergrid/security/crypto/EncryptionServiceImpl.java
@@ -16,20 +16,19 @@
package org.usergrid.security.crypto;
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.annotation.PostConstruct;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import org.usergrid.persistence.CredentialsInfo;
import org.usergrid.security.crypto.command.EncryptionCommand;
+import javax.annotation.PostConstruct;
+import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
import static org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/crypto/command/BcryptCommand.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/crypto/command/BcryptCommand.java b/stack/services/src/main/java/org/usergrid/security/crypto/command/BcryptCommand.java
index 230c85a..15c68ae 100644
--- a/stack/services/src/main/java/org/usergrid/security/crypto/command/BcryptCommand.java
+++ b/stack/services/src/main/java/org/usergrid/security/crypto/command/BcryptCommand.java
@@ -16,14 +16,14 @@
package org.usergrid.security.crypto.command;
-import java.nio.charset.Charset;
-import java.util.UUID;
-
import org.springframework.stereotype.Component;
import org.springframework.util.Assert;
import org.usergrid.persistence.CredentialsInfo;
import org.usergrid.utils.BCrypt;
+import java.nio.charset.Charset;
+import java.util.UUID;
+
import static org.apache.commons.codec.binary.Base64.decodeBase64;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/crypto/command/EncryptionCommand.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/crypto/command/EncryptionCommand.java b/stack/services/src/main/java/org/usergrid/security/crypto/command/EncryptionCommand.java
index 82e7a32..725d4a8 100644
--- a/stack/services/src/main/java/org/usergrid/security/crypto/command/EncryptionCommand.java
+++ b/stack/services/src/main/java/org/usergrid/security/crypto/command/EncryptionCommand.java
@@ -16,10 +16,10 @@
package org.usergrid.security.crypto.command;
-import java.util.UUID;
-
import org.usergrid.persistence.CredentialsInfo;
+import java.util.UUID;
+
/**
* Simple chain of responsibility algorithm for password cryptography.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/crypto/command/Md5HashCommand.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/crypto/command/Md5HashCommand.java b/stack/services/src/main/java/org/usergrid/security/crypto/command/Md5HashCommand.java
index bdb04e9..9fb47a1 100644
--- a/stack/services/src/main/java/org/usergrid/security/crypto/command/Md5HashCommand.java
+++ b/stack/services/src/main/java/org/usergrid/security/crypto/command/Md5HashCommand.java
@@ -16,12 +16,11 @@
package org.usergrid.security.crypto.command;
-import java.util.UUID;
-
+import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.stereotype.Component;
import org.usergrid.persistence.CredentialsInfo;
-import org.apache.commons.codec.digest.DigestUtils;
+import java.util.UUID;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/crypto/command/PlainTextCommand.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/crypto/command/PlainTextCommand.java b/stack/services/src/main/java/org/usergrid/security/crypto/command/PlainTextCommand.java
index f796a28..c84f3d0 100644
--- a/stack/services/src/main/java/org/usergrid/security/crypto/command/PlainTextCommand.java
+++ b/stack/services/src/main/java/org/usergrid/security/crypto/command/PlainTextCommand.java
@@ -16,11 +16,11 @@
package org.usergrid.security.crypto.command;
-import java.util.UUID;
-
import org.springframework.stereotype.Component;
import org.usergrid.persistence.CredentialsInfo;
+import java.util.UUID;
+
/**
* A no-op provider
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/crypto/command/SaltedHasherCommand.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/crypto/command/SaltedHasherCommand.java b/stack/services/src/main/java/org/usergrid/security/crypto/command/SaltedHasherCommand.java
index 22eebfa..f051dac 100644
--- a/stack/services/src/main/java/org/usergrid/security/crypto/command/SaltedHasherCommand.java
+++ b/stack/services/src/main/java/org/usergrid/security/crypto/command/SaltedHasherCommand.java
@@ -16,13 +16,13 @@
package org.usergrid.security.crypto.command;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.usergrid.security.salt.SaltProvider;
+
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.util.UUID;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.usergrid.security.salt.SaltProvider;
-
/**
* Class that provides salt options
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/crypto/command/Sha1HashCommand.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/crypto/command/Sha1HashCommand.java b/stack/services/src/main/java/org/usergrid/security/crypto/command/Sha1HashCommand.java
index 77402a0..017faaf 100644
--- a/stack/services/src/main/java/org/usergrid/security/crypto/command/Sha1HashCommand.java
+++ b/stack/services/src/main/java/org/usergrid/security/crypto/command/Sha1HashCommand.java
@@ -16,14 +16,14 @@
package org.usergrid.security.crypto.command;
-import java.security.NoSuchAlgorithmException;
-import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.usergrid.persistence.CredentialsInfo;
+import java.security.NoSuchAlgorithmException;
+import java.util.UUID;
+
/** @author tnine */
@Component("org.usergrid.security.crypto.command.Sha1HashCommand")
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/oauth/AccessInfo.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/oauth/AccessInfo.java b/stack/services/src/main/java/org/usergrid/security/oauth/AccessInfo.java
index 28dd8fa..af00d52 100644
--- a/stack/services/src/main/java/org/usergrid/security/oauth/AccessInfo.java
+++ b/stack/services/src/main/java/org/usergrid/security/oauth/AccessInfo.java
@@ -16,17 +16,16 @@
package org.usergrid.security.oauth;
-import java.util.Map;
-import java.util.TreeMap;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonProperty;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Map;
+import java.util.TreeMap;
+
@XmlRootElement
public class AccessInfo {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/oauth/ClientCredentialsInfo.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/oauth/ClientCredentialsInfo.java b/stack/services/src/main/java/org/usergrid/security/oauth/ClientCredentialsInfo.java
index aa035ba..320e341 100644
--- a/stack/services/src/main/java/org/usergrid/security/oauth/ClientCredentialsInfo.java
+++ b/stack/services/src/main/java/org/usergrid/security/oauth/ClientCredentialsInfo.java
@@ -16,13 +16,13 @@
package org.usergrid.security.oauth;
-import java.util.UUID;
-
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonProperty;
import org.usergrid.security.AuthPrincipalType;
import org.usergrid.utils.UUIDUtils;
+import java.util.UUID;
+
public class ClientCredentialsInfo {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/providers/AbstractProvider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/providers/AbstractProvider.java b/stack/services/src/main/java/org/usergrid/security/providers/AbstractProvider.java
index 2015ba7..84752f9 100644
--- a/stack/services/src/main/java/org/usergrid/security/providers/AbstractProvider.java
+++ b/stack/services/src/main/java/org/usergrid/security/providers/AbstractProvider.java
@@ -1,15 +1,14 @@
package org.usergrid.security.providers;
-import java.util.Map;
-
-import org.usergrid.management.ManagementService;
-import org.usergrid.persistence.EntityManager;
-
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.config.ClientConfig;
import com.sun.jersey.api.client.config.DefaultClientConfig;
import com.sun.jersey.api.json.JSONConfiguration;
+import org.usergrid.management.ManagementService;
+import org.usergrid.persistence.EntityManager;
+
+import java.util.Map;
/** @author zznate */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/providers/FacebookProvider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/providers/FacebookProvider.java b/stack/services/src/main/java/org/usergrid/security/providers/FacebookProvider.java
index 0881b24..8ce6086 100644
--- a/stack/services/src/main/java/org/usergrid/security/providers/FacebookProvider.java
+++ b/stack/services/src/main/java/org/usergrid/security/providers/FacebookProvider.java
@@ -1,11 +1,6 @@
package org.usergrid.security.providers;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.ManagementService;
@@ -17,6 +12,10 @@ import org.usergrid.persistence.entities.User;
import org.usergrid.security.tokens.exceptions.BadTokenException;
import org.usergrid.utils.JsonUtils;
+import javax.ws.rs.core.MediaType;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
import static org.usergrid.persistence.Schema.PROPERTY_MODIFIED;
import static org.usergrid.utils.ListUtils.anyNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/providers/FoursquareProvider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/providers/FoursquareProvider.java b/stack/services/src/main/java/org/usergrid/security/providers/FoursquareProvider.java
index 6e3dbe8..adc0432 100644
--- a/stack/services/src/main/java/org/usergrid/security/providers/FoursquareProvider.java
+++ b/stack/services/src/main/java/org/usergrid/security/providers/FoursquareProvider.java
@@ -1,12 +1,11 @@
package org.usergrid.security.providers;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.WebResource;
+import com.sun.jersey.api.client.config.ClientConfig;
+import com.sun.jersey.api.client.config.DefaultClientConfig;
+import com.sun.jersey.api.json.JSONConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.ManagementService;
@@ -17,11 +16,10 @@ import org.usergrid.persistence.entities.User;
import org.usergrid.security.tokens.exceptions.BadTokenException;
import org.usergrid.utils.JsonUtils;
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.config.ClientConfig;
-import com.sun.jersey.api.client.config.DefaultClientConfig;
-import com.sun.jersey.api.json.JSONConfiguration;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.Map;
import static org.usergrid.utils.ListUtils.anyNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/providers/PingIdentityProvider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/providers/PingIdentityProvider.java b/stack/services/src/main/java/org/usergrid/security/providers/PingIdentityProvider.java
index a6de36c..b0a034b 100644
--- a/stack/services/src/main/java/org/usergrid/security/providers/PingIdentityProvider.java
+++ b/stack/services/src/main/java/org/usergrid/security/providers/PingIdentityProvider.java
@@ -1,12 +1,6 @@
package org.usergrid.security.providers;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.MediaType;
-
import org.codehaus.jackson.JsonNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -16,6 +10,11 @@ import org.usergrid.persistence.Identifier;
import org.usergrid.persistence.entities.User;
import org.usergrid.security.tokens.exceptions.BadTokenException;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
/**
* Provider implementation for accessing Ping Identity
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/providers/SignInAsProvider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/providers/SignInAsProvider.java b/stack/services/src/main/java/org/usergrid/security/providers/SignInAsProvider.java
index c8c0233..2ac3dc5 100644
--- a/stack/services/src/main/java/org/usergrid/security/providers/SignInAsProvider.java
+++ b/stack/services/src/main/java/org/usergrid/security/providers/SignInAsProvider.java
@@ -1,11 +1,11 @@
package org.usergrid.security.providers;
-import java.util.Map;
-
import org.usergrid.persistence.entities.User;
import org.usergrid.security.tokens.exceptions.BadTokenException;
+import java.util.Map;
+
/** @author zznate */
public interface SignInAsProvider {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/shiro/CustomPermission.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/CustomPermission.java b/stack/services/src/main/java/org/usergrid/security/shiro/CustomPermission.java
index 7a6375e..1ab26ee 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/CustomPermission.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/CustomPermission.java
@@ -16,16 +16,15 @@
package org.usergrid.security.shiro;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
+import org.apache.shiro.authz.Permission;
+import org.apache.shiro.authz.permission.WildcardPermission;
import org.springframework.util.AntPathMatcher;
import org.usergrid.management.UserInfo;
import org.usergrid.security.shiro.utils.SubjectUtils;
-import org.apache.shiro.authz.Permission;
-import org.apache.shiro.authz.permission.WildcardPermission;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
public class CustomPermission extends WildcardPermission {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/shiro/PrincipalCredentialsToken.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/PrincipalCredentialsToken.java b/stack/services/src/main/java/org/usergrid/security/shiro/PrincipalCredentialsToken.java
index ec44c7c..5063461 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/PrincipalCredentialsToken.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/PrincipalCredentialsToken.java
@@ -19,19 +19,8 @@ package org.usergrid.security.shiro;
import org.usergrid.management.ApplicationInfo;
import org.usergrid.management.OrganizationInfo;
import org.usergrid.management.UserInfo;
-import org.usergrid.security.shiro.credentials.AdminUserAccessToken;
-import org.usergrid.security.shiro.credentials.AdminUserPassword;
-import org.usergrid.security.shiro.credentials.ApplicationAccessToken;
-import org.usergrid.security.shiro.credentials.ApplicationGuest;
-import org.usergrid.security.shiro.credentials.ApplicationUserAccessToken;
-import org.usergrid.security.shiro.credentials.OrganizationAccessToken;
-import org.usergrid.security.shiro.credentials.PrincipalCredentials;
-import org.usergrid.security.shiro.principals.AdminUserPrincipal;
-import org.usergrid.security.shiro.principals.ApplicationGuestPrincipal;
-import org.usergrid.security.shiro.principals.ApplicationPrincipal;
-import org.usergrid.security.shiro.principals.ApplicationUserPrincipal;
-import org.usergrid.security.shiro.principals.OrganizationPrincipal;
-import org.usergrid.security.shiro.principals.PrincipalIdentifier;
+import org.usergrid.security.shiro.credentials.*;
+import org.usergrid.security.shiro.principals.*;
public class PrincipalCredentialsToken implements org.apache.shiro.authc.AuthenticationToken {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/shiro/Realm.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/Realm.java b/stack/services/src/main/java/org/usergrid/security/shiro/Realm.java
index 03f9a5a..cb5f4fe 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/Realm.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/Realm.java
@@ -16,53 +16,10 @@
package org.usergrid.security.shiro;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.usergrid.management.AccountCreationProps;
-import org.usergrid.management.ApplicationInfo;
-import org.usergrid.management.ManagementService;
-import org.usergrid.management.OrganizationInfo;
-import org.usergrid.management.UserInfo;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.EntityManagerFactory;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.Results.Level;
-import org.usergrid.persistence.SimpleEntityRef;
-import org.usergrid.persistence.entities.Group;
-import org.usergrid.persistence.entities.Role;
-import org.usergrid.persistence.entities.User;
-import org.usergrid.security.shiro.credentials.AccessTokenCredentials;
-import org.usergrid.security.shiro.credentials.AdminUserAccessToken;
-import org.usergrid.security.shiro.credentials.AdminUserPassword;
-import org.usergrid.security.shiro.credentials.ApplicationAccessToken;
-import org.usergrid.security.shiro.credentials.ApplicationUserAccessToken;
-import org.usergrid.security.shiro.credentials.ClientCredentials;
-import org.usergrid.security.shiro.credentials.OrganizationAccessToken;
-import org.usergrid.security.shiro.credentials.PrincipalCredentials;
-import org.usergrid.security.shiro.principals.AdminUserPrincipal;
-import org.usergrid.security.shiro.principals.ApplicationGuestPrincipal;
-import org.usergrid.security.shiro.principals.ApplicationPrincipal;
-import org.usergrid.security.shiro.principals.ApplicationUserPrincipal;
-import org.usergrid.security.shiro.principals.OrganizationPrincipal;
-import org.usergrid.security.shiro.principals.PrincipalIdentifier;
-import org.usergrid.security.tokens.TokenInfo;
-import org.usergrid.security.tokens.TokenService;
-
+import com.google.common.collect.HashBiMap;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.authc.AuthenticationInfo;
-import org.apache.shiro.authc.AuthenticationToken;
-import org.apache.shiro.authc.CredentialsException;
-import org.apache.shiro.authc.SimpleAuthenticationInfo;
+import org.apache.shiro.authc.*;
import org.apache.shiro.authc.credential.AllowAllCredentialsMatcher;
import org.apache.shiro.authc.credential.CredentialsMatcher;
import org.apache.shiro.authz.AuthorizationInfo;
@@ -73,8 +30,25 @@ import org.apache.shiro.realm.AuthorizingRealm;
import org.apache.shiro.session.Session;
import org.apache.shiro.subject.PrincipalCollection;
import org.apache.shiro.subject.Subject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.usergrid.management.*;
+import org.usergrid.persistence.*;
+import org.usergrid.persistence.Results.Level;
+import org.usergrid.persistence.entities.Group;
+import org.usergrid.persistence.entities.Role;
+import org.usergrid.persistence.entities.User;
+import org.usergrid.security.shiro.credentials.*;
+import org.usergrid.security.shiro.principals.*;
+import org.usergrid.security.tokens.TokenInfo;
+import org.usergrid.security.tokens.TokenService;
-import com.google.common.collect.HashBiMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
import static org.apache.commons.lang.StringUtils.isBlank;
import static org.apache.commons.lang.StringUtils.isNotBlank;
[02/23] git commit: Miscellaneous changes
Posted by sn...@apache.org.
Miscellaneous changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f8ae7fe7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f8ae7fe7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f8ae7fe7
Branch: refs/pull/30/head
Commit: f8ae7fe7883175729968b260feb24971f1c924a5
Parents: 1150e47
Author: Strong Liu <st...@hibernate.org>
Authored: Sun Jan 19 17:47:15 2014 +0800
Committer: Strong Liu <st...@hibernate.org>
Committed: Sun Jan 19 17:47:15 2014 +0800
----------------------------------------------------------------------
.../src/main/java/org/usergrid/batch/Job.java | 2 +-
.../src/main/java/org/usergrid/mq/Query.java | 7 +-
.../java/org/usergrid/mq/QueryFilterLexer.java | 3 +-
.../java/org/usergrid/mq/QueryFilterParser.java | 27 -----
.../java/org/usergrid/mq/QueryProcessor.java | 1 -
.../usergrid/persistence/CredentialsInfo.java | 2 +-
.../org/usergrid/persistence/Identifier.java | 5 +-
.../java/org/usergrid/persistence/Results.java | 2 -
.../java/org/usergrid/persistence/Schema.java | 116 +++++--------------
.../java/org/usergrid/persistence/Update.java | 2 +-
.../cassandra/CassandraPersistenceUtils.java | 2 +-
.../persistence/cassandra/CassandraService.java | 2 +-
.../cassandra/ConnectionRefImpl.java | 10 +-
.../cassandra/EntityManagerImpl.java | 10 +-
.../cassandra/RelationManagerImpl.java | 4 +-
.../usergrid/persistence/entities/JobStat.java | 7 +-
.../persistence/geo/GeoIndexSearcher.java | 14 +--
.../usergrid/persistence/geo/GeocellUtils.java | 4 +-
.../query/ir/result/AbstractScanColumn.java | 5 +-
.../query/ir/result/GeoIterator.java | 9 +-
.../persistence/query/tree/BooleanOperand.java | 5 -
.../persistence/query/tree/ContainsOperand.java | 16 ---
.../persistence/query/tree/EqualityOperand.java | 4 -
.../persistence/schema/DictionaryInfo.java | 1 -
.../usergrid/persistence/schema/EntityInfo.java | 16 +--
.../batch/ConcurrentSchedulerTestSuite.java | 2 +-
.../org/usergrid/batch/SchedulerTestSuite.java | 2 +-
.../batch/job/AbstractSchedulerRuntimeIT.java | 2 +-
.../count/BatchCountParallelismTest.java | 2 +-
.../org/usergrid/locking/zookeeper/ZooPut.java | 2 +-
.../usergrid/persistence/EntityManagerIT.java | 6 +-
.../launcher/ClasspathStaticHttpHandler.java | 9 +-
.../launcher/CustomJSPTemplateProcessor.java | 2 +-
.../main/java/org/usergrid/launcher/Server.java | 1 +
.../org/usergrid/mongo/protocol/OpQuery.java | 2 +-
.../usergrid/mongo/query/MongoQueryParser.java | 16 +--
stack/pom.xml | 2 +-
.../java/org/usergrid/rest/RootResource.java | 13 ++-
.../rest/applications/ApplicationResource.java | 2 +-
.../rest/applications/ServiceResource.java | 7 +-
.../rest/applications/users/UsersResource.java | 3 +-
.../organizations/OrganizationsResource.java | 3 +-
.../applications/ApplicationsResource.java | 3 +-
.../organizations/users/UsersResource.java | 9 +-
.../rest/management/users/UsersResource.java | 5 +-
.../organizations/OrganizationsResource.java | 5 +-
.../organizations/OrganizationResource.java | 9 +-
.../org/usergrid/rest/utils/JSONPUtils.java | 8 +-
.../org/usergrid/rest/utils/PathingUtils.java | 2 +-
.../collection/activities/AndOrQueryTest.java | 7 +-
.../queues/QueueResourceLong2IT.java | 8 +-
.../users/ConnectionResourceTest.java | 1 -
.../rest/management/RegistrationIT.java | 4 +-
.../organizations/OrganizationsResourceIT.java | 2 +-
.../usergrid/management/ActivationState.java | 2 +-
.../cassandra/ManagementServiceImpl.java | 13 +--
.../security/providers/FoursquareProvider.java | 2 +-
.../providers/PingIdentityProvider.java | 4 +-
.../security/shiro/CustomPermission.java | 5 +-
.../shiro/PrincipalCredentialsToken.java | 4 +-
.../java/org/usergrid/security/shiro/Realm.java | 6 +-
.../security/shiro/utils/SubjectUtils.java | 5 +-
.../tokens/cassandra/TokenServiceImpl.java | 31 +++--
.../org/usergrid/services/ServiceAction.java | 2 +-
.../java/org/usergrid/services/ServiceInfo.java | 2 +-
.../org/usergrid/services/ServiceManager.java | 9 +-
.../org/usergrid/services/ServiceRequest.java | 6 +-
.../applications/ApplicationsService.java | 9 +-
.../org/usergrid/NoExitSecurityManager.java | 2 +-
.../usergrid/cassandra/AvailablePortFinder.java | 2 +-
.../usergrid/cassandra/CassandraResource.java | 22 +---
71 files changed, 186 insertions(+), 355 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/batch/Job.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/batch/Job.java b/stack/core/src/main/java/org/usergrid/batch/Job.java
index 34240c8..454e52b 100644
--- a/stack/core/src/main/java/org/usergrid/batch/Job.java
+++ b/stack/core/src/main/java/org/usergrid/batch/Job.java
@@ -14,7 +14,7 @@ public interface Job {
* @param execution The execution information. This will be the same from the last run. By default you should call
* exeuction.start() once processing starts
*
- * @throws JobExecutionException If the job cannot be executed
+ * @throws Exception If the job cannot be executed
*/
public void execute( JobExecution execution ) throws Exception;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/mq/Query.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/Query.java b/stack/core/src/main/java/org/usergrid/mq/Query.java
index f7e2530..cf1e39c 100644
--- a/stack/core/src/main/java/org/usergrid/mq/Query.java
+++ b/stack/core/src/main/java/org/usergrid/mq/Query.java
@@ -498,12 +498,7 @@ public class Query {
return this;
}
- if ( StringUtils.isNotEmpty( output ) ) {
- mergeSelectResults = true;
- }
- else {
- mergeSelectResults = false;
- }
+ mergeSelectResults = StringUtils.isNotEmpty(output);
if ( output == null ) {
output = "";
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/mq/QueryFilterLexer.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueryFilterLexer.java b/stack/core/src/main/java/org/usergrid/mq/QueryFilterLexer.java
index ebef342..a7eccd7 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueryFilterLexer.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueryFilterLexer.java
@@ -70,7 +70,8 @@ public class QueryFilterLexer extends Lexer {
// delegators
- public QueryFilterLexer() {;}
+ public QueryFilterLexer() {
+ }
public QueryFilterLexer( CharStream input ) {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/mq/QueryFilterParser.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueryFilterParser.java b/stack/core/src/main/java/org/usergrid/mq/QueryFilterParser.java
index 0f0c913..dea193b 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueryFilterParser.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueryFilterParser.java
@@ -98,9 +98,6 @@ public class QueryFilterParser extends Parser {
public static class property_return extends ParserRuleReturnScope {}
- ;
-
-
// $ANTLR start "property"
// org/usergrid/persistence/query/QueryFilter.g:101:1: property : ( ID ) ;
public final QueryFilterParser.property_return property() throws RecognitionException {
@@ -134,9 +131,6 @@ public class QueryFilterParser extends Parser {
public static class operator_return extends ParserRuleReturnScope {}
- ;
-
-
// $ANTLR start "operator"
// org/usergrid/persistence/query/QueryFilter.g:104:1: operator : ( '<' | '<=' | '=' | '>' | '>=' | 'in' | 'eq' |
// 'lt' | 'gt' | 'lte' | 'gte' | 'contains' | 'within' ) ;
@@ -176,9 +170,6 @@ public class QueryFilterParser extends Parser {
public static class value_return extends ParserRuleReturnScope {}
- ;
-
-
// $ANTLR start "value"
// org/usergrid/persistence/query/QueryFilter.g:107:1: value : ( BOOLEAN | STRING | INT | FLOAT | UUID ) ;
public final QueryFilterParser.value_return value() throws RecognitionException {
@@ -216,9 +207,6 @@ public class QueryFilterParser extends Parser {
public static class second_value_return extends ParserRuleReturnScope {}
- ;
-
-
// $ANTLR start "second_value"
// org/usergrid/persistence/query/QueryFilter.g:109:1: second_value : ( BOOLEAN | STRING | INT | FLOAT | UUID ) ;
public final QueryFilterParser.second_value_return second_value() throws RecognitionException {
@@ -256,9 +244,6 @@ public class QueryFilterParser extends Parser {
public static class third_value_return extends ParserRuleReturnScope {}
- ;
-
-
// $ANTLR start "third_value"
// org/usergrid/persistence/query/QueryFilter.g:111:1: third_value : ( BOOLEAN | STRING | INT | FLOAT | UUID ) ;
public final QueryFilterParser.third_value_return third_value() throws RecognitionException {
@@ -411,9 +396,6 @@ public class QueryFilterParser extends Parser {
public static class select_subject_return extends ParserRuleReturnScope {}
- ;
-
-
// $ANTLR start "select_subject"
// org/usergrid/persistence/query/QueryFilter.g:127:1: select_subject : ID ;
public final QueryFilterParser.select_subject_return select_subject() throws RecognitionException {
@@ -446,9 +428,6 @@ public class QueryFilterParser extends Parser {
public static class select_assign_target_return extends ParserRuleReturnScope {}
- ;
-
-
// $ANTLR start "select_assign_target"
// org/usergrid/persistence/query/QueryFilter.g:134:1: select_assign_target : ID ;
public final QueryFilterParser.select_assign_target_return select_assign_target() throws RecognitionException {
@@ -478,9 +457,6 @@ public class QueryFilterParser extends Parser {
public static class select_assign_source_return extends ParserRuleReturnScope {}
- ;
-
-
// $ANTLR start "select_assign_source"
// org/usergrid/persistence/query/QueryFilter.g:137:1: select_assign_source : ID ;
public final QueryFilterParser.select_assign_source_return select_assign_source() throws RecognitionException {
@@ -683,9 +659,6 @@ public class QueryFilterParser extends Parser {
public static class direction_return extends ParserRuleReturnScope {}
- ;
-
-
// $ANTLR start "direction"
// org/usergrid/persistence/query/QueryFilter.g:165:1: direction : ( 'asc' | 'desc' ) ;
public final QueryFilterParser.direction_return direction() throws RecognitionException {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/mq/QueryProcessor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/QueryProcessor.java b/stack/core/src/main/java/org/usergrid/mq/QueryProcessor.java
index 6cc805a..16e3afc 100644
--- a/stack/core/src/main/java/org/usergrid/mq/QueryProcessor.java
+++ b/stack/core/src/main/java/org/usergrid/mq/QueryProcessor.java
@@ -394,7 +394,6 @@ public class QueryProcessor {
}
if ( searchFinishValue == null ) {
searchFinishValue = searchStartValue;
- ;
}
if ( ( searchStartValue != null ) && searchStartValue.toString().endsWith( "*" ) ) {
searchStartValue = removeEnd( searchStartValue.toString(), "*" );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/CredentialsInfo.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/CredentialsInfo.java b/stack/core/src/main/java/org/usergrid/persistence/CredentialsInfo.java
index 146af43..f8a635d 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/CredentialsInfo.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/CredentialsInfo.java
@@ -165,7 +165,7 @@ public class CredentialsInfo implements Comparable<CredentialsInfo> {
@Override
public int compareTo( CredentialsInfo o ) {
- if ( created == o.created ) {
+ if (created.equals(o.created)) {
return 0;
}
if ( o.created == null ) {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/Identifier.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/Identifier.java b/stack/core/src/main/java/org/usergrid/persistence/Identifier.java
index 7139e43..226ded0 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/Identifier.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/Identifier.java
@@ -29,6 +29,9 @@ import org.usergrid.utils.UUIDUtils;
public class Identifier implements Serializable {
+ public static final String UUID_REX = "[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}";
+ public static final String EMAIL_REX = "[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,4}";
+
public enum Type {
UUID, NAME, EMAIL
}
@@ -37,7 +40,7 @@ public class Identifier implements Serializable {
Type type;
Object value;
- static Pattern emailRegEx = Pattern.compile( "[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,4}" );
+ static Pattern emailRegEx = Pattern.compile( EMAIL_REX );
static Pattern nameRegEx = Pattern.compile( "[a-zA-Z0-9_\\-./]*" );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/Results.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/Results.java b/stack/core/src/main/java/org/usergrid/persistence/Results.java
index a6329d6..ea7da45 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/Results.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/Results.java
@@ -706,7 +706,6 @@ public class Results implements Iterable<Entity> {
idSet.addAll( results.idSet );
ids = new ArrayList<UUID>( idSet );
- return;
}
}
@@ -756,7 +755,6 @@ public class Results implements Iterable<Entity> {
idSet = newSet;
ids = new ArrayList<UUID>( idSet );
level = Level.IDS;
- return;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/Schema.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/Schema.java b/stack/core/src/main/java/org/usergrid/persistence/Schema.java
index 587a65f..2d233c1 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/Schema.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/Schema.java
@@ -160,8 +160,8 @@ public class Schema {
public static final String DICTIONARY_COUNTERS = "counters";
public static final String DICTIONARY_GEOCELL = "geocell";
- private static List<String> entitiesPackage = new ArrayList<String>();
- private static List<String> entitiesScanPath = new ArrayList<String>();
+ private static final List<String> entitiesPackage = new ArrayList<String>();
+ private static final List<String> entitiesScanPath = new ArrayList<String>();
@SuppressWarnings("rawtypes")
public static Map<String, Class> DEFAULT_DICTIONARIES =
@@ -216,7 +216,6 @@ public class Schema {
new ConcurrentHashMap<Class<? extends Entity>, EntityInfo>();
Map<String, EntityInfo> entityMap = new TreeMap<String, EntityInfo>( String.CASE_INSENSITIVE_ORDER );
- ;
Map<String, Map<String, Set<CollectionInfo>>> entityContainerCollections =
new TreeMap<String, Map<String, Set<CollectionInfo>>>( String.CASE_INSENSITIVE_ORDER );
@@ -500,7 +499,8 @@ public class Schema {
public String[] getAllPropertyNamesAsArray() {
- return allProperties.keySet().toArray( new String[0] );
+ Set<String> strings = allProperties.keySet();
+ return strings.toArray(new String[strings.size()]);
}
@@ -639,11 +639,8 @@ public class Schema {
public boolean hasProperties( String entityType ) {
EntityInfo entity = getEntityInfo( entityType );
- if ( entity == null ) {
- return false;
- }
+ return entity != null && entity.hasProperties();
- return entity.hasProperties();
}
@@ -667,7 +664,8 @@ public class Schema {
return new String[0];
}
- return entity.getProperties().keySet().toArray( new String[0] );
+ Set<String> strings = entity.getProperties().keySet();
+ return strings.toArray(new String[strings.size()]);
}
@@ -679,11 +677,8 @@ public class Schema {
}
EntityInfo entity = getEntityInfo( entityType );
- if ( entity == null ) {
- return false;
- }
+ return entity != null && entity.hasProperty(propertyName);
- return entity.hasProperty( propertyName );
}
@@ -702,63 +697,40 @@ public class Schema {
public boolean isPropertyMutable( String entityType, String propertyName ) {
EntityInfo entity = getEntityInfo( entityType );
- if ( entity == null ) {
- return false;
- }
+ return entity != null && entity.isPropertyMutable(propertyName);
- return entity.isPropertyMutable( propertyName );
}
public boolean isPropertyUnique( String entityType, String propertyName ) {
EntityInfo entity = getEntityInfo( entityType );
- if ( entity == null ) {
- return false;
- }
+ return entity != null && entity.isPropertyUnique(propertyName);
- return entity.isPropertyUnique( propertyName );
}
public boolean isPropertyIndexed( String entityType, String propertyName ) {
EntityInfo entity = getEntityInfo( entityType );
- if ( entity == null ) {
- return true;
- }
-
- if ( entity.hasProperty( propertyName ) ) {
- return entity.isPropertyIndexed( propertyName );
- }
+ return entity == null || !entity.hasProperty(propertyName) || entity.isPropertyIndexed(propertyName);
- return true;
}
public boolean isPropertyFulltextIndexed( String entityType, String propertyName ) {
EntityInfo entity = getEntityInfo( entityType );
- if ( entity == null ) {
- return true;
- }
-
- if ( entity.hasProperty( propertyName ) ) {
- return entity.isPropertyFulltextIndexed( propertyName );
- }
+ return entity == null || !entity.hasProperty(propertyName) || entity.isPropertyFulltextIndexed(propertyName);
- return true;
}
public boolean isPropertyTimestamp( String entityType, String propertyName ) {
EntityInfo entity = getEntityInfo( entityType );
- if ( entity == null ) {
- return false;
- }
+ return entity != null && entity.isPropertyTimestamp(propertyName);
- return entity.isPropertyTimestamp( propertyName );
}
@@ -782,11 +754,8 @@ public class Schema {
}
EntityInfo entity = getEntityInfo( entityType );
- if ( entity == null ) {
- return false;
- }
+ return entity != null && entity.isPropertyRequired(propertyName);
- return entity.isPropertyRequired( propertyName );
}
@@ -811,11 +780,8 @@ public class Schema {
public boolean isPropertyIndexedInCollection( String containerType, String collectionName, String propertyName ) {
CollectionInfo collection = getCollection( containerType, collectionName );
- if ( collection == null ) {
- return false;
- }
+ return collection != null && collection.isPropertyIndexed(propertyName);
- return collection.isPropertyIndexed( propertyName );
}
@@ -823,11 +789,8 @@ public class Schema {
public boolean hasDictionaries( String entityType ) {
EntityInfo entity = getEntityInfo( entityType );
- if ( entity == null ) {
- return false;
- }
+ return entity != null && entity.hasDictionaries();
- return entity.hasDictionaries();
}
@@ -847,11 +810,8 @@ public class Schema {
public boolean hasDictionary( String entityType, String dictionaryName ) {
EntityInfo entity = getEntityInfo( entityType );
- if ( entity == null ) {
- return false;
- }
+ return entity != null && entity.hasDictionary(dictionaryName);
- return entity.hasDictionary( dictionaryName );
}
@@ -897,11 +857,8 @@ public class Schema {
}
DictionaryInfo dictionary = entity.getDictionary( dictionaryName );
- if ( dictionary == null ) {
- return false;
- }
+ return dictionary != null && dictionary.isKeysIndexedInConnections();
- return dictionary.isKeysIndexedInConnections();
}
@@ -910,11 +867,8 @@ public class Schema {
String dictionaryName ) {
CollectionInfo collection = getCollection( containerType, collectionName );
- if ( collection == null ) {
- return false;
- }
+ return collection != null && collection.isDictionaryIndexed(dictionaryName);
- return collection.isDictionaryIndexed( dictionaryName );
}
@@ -938,22 +892,16 @@ public class Schema {
}
PropertyInfo property = item.getAliasPropertyObject();
- if ( property == null ) {
- return false;
- }
+ return property != null && property.isPathBasedName();
- return property.isPathBasedName();
}
public boolean isCollectionReversed( String containerType, String collectionName ) {
CollectionInfo collection = getCollection( containerType, collectionName );
- if ( collection == null ) {
- return false;
- }
+ return collection != null && collection.isReversed();
- return collection.isReversed();
}
@@ -1260,10 +1208,7 @@ public class Schema {
public static boolean isAssociatedEntityType( String entityType ) {
- if ( entityType == null ) {
- return false;
- }
- return entityType.indexOf( ':' ) != -1;
+ return entityType != null && entityType.contains(":");
}
@@ -1389,7 +1334,7 @@ public class Schema {
continue;
}
Object propertyValue = entry.getValue();
- if ( ( propertyValue instanceof String ) && ( ( ( String ) propertyValue ) == "" ) ) {
+ if ( ( propertyValue instanceof String ) && (propertyValue.equals("")) ) {
propertyValue = null;
}
if ( ( propertyValue == null ) && isRequiredProperty( entityType, entry.getKey() ) ) {
@@ -1406,7 +1351,7 @@ public class Schema {
entityType = normalizeEntityType( entityType );
- if ( ( propertyValue instanceof String ) && ( ( String ) propertyValue ).equals( "" ) ) {
+ if ( ( propertyValue instanceof String ) && propertyValue.equals("") ) {
propertyValue = null;
}
@@ -1439,7 +1384,7 @@ public class Schema {
entityType = normalizeEntityType( entityType );
- if ( ( elementValue instanceof String ) && ( ( String ) elementValue ).equals( "" ) ) {
+ if ( ( elementValue instanceof String ) && elementValue.equals("") ) {
elementValue = null;
}
@@ -1466,8 +1411,7 @@ public class Schema {
if ( entityClass == null ) {
entityClass = DynamicEntity.class;
}
- Entity entity = mapper.convertValue( map, entityClass );
- return entity;
+ return mapper.convertValue( map, entityClass );
}
/*
@@ -1483,8 +1427,7 @@ public class Schema {
public Map<String, Object> toMap( Entity entity ) {
- Map<String, Object> map = mapper.convertValue( entity, new TypeReference<Map<String, Object>>() {} );
- return map;
+ return mapper.convertValue( entity, new TypeReference<Map<String, Object>>() {} );
}
@@ -1724,11 +1667,8 @@ public class Schema {
}
PropertyInfo property = entity.getProperty( propertyName );
- if ( property == null ) {
- return false;
- }
+ return property != null && property.isEncrypted();
- return property.isEncrypted();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/Update.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/Update.java b/stack/core/src/main/java/org/usergrid/persistence/Update.java
index 0f5d018..07a4551 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/Update.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/Update.java
@@ -55,7 +55,7 @@ public class Update {
public static enum UpdateOperator {
- UPDATE, DELETE, ADD_TO_LIST, REMOVE_FROM_LIST;
+ UPDATE, DELETE, ADD_TO_LIST, REMOVE_FROM_LIST
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java
index 00dc4bc..0046397 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java
@@ -442,7 +442,7 @@ public class CassandraPersistenceUtils {
CFEnum[] values = null;
try {
- values = ( CFEnum[] ) invokeStaticMethod( cfEnum, "values", ( Object[] ) null );
+ values = ( CFEnum[] ) invokeStaticMethod( cfEnum, "values", null);
}
catch ( Exception e ) {
logger.error( "Couldn't get CFEnum values", e );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java
index a6b6268..c471294 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java
@@ -884,7 +884,7 @@ public class CassandraService {
* @return a timestamp
*/
public long createTimestamp() {
- return chc.getClockResolution().createClock();
+ return CassandraHostConfigurator.getClockResolution().createClock();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectionRefImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectionRefImpl.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectionRefImpl.java
index e16d780..c37d45d 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectionRefImpl.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectionRefImpl.java
@@ -328,8 +328,9 @@ public class ConnectionRefImpl implements ConnectionRef {
@Override
public UUID getUuid() {
if ( id == null ) {
+ List<ConnectedEntityRef> var = getPairedConnections();
id = getId( getConnectingEntity(), getConnectedEntity(),
- getPairedConnections().toArray( new ConnectedEntityRef[0] ) );
+ var.toArray(new ConnectedEntityRef[var.size()]));
}
return id;
}
@@ -343,13 +344,13 @@ public class ConnectionRefImpl implements ConnectionRef {
public UUID getIndexId() {
return getIndexId( getConnectingEntity(), getConnectionType(), getConnectedEntityType(),
- pairedConnections.toArray( new ConnectedEntityRef[0] ) );
+ pairedConnections.toArray(new ConnectedEntityRef[pairedConnections.size()]));
}
public UUID getConnectingIndexId() {
return getIndexId( getConnectingEntity(), getConnectionType(), null,
- pairedConnections.toArray( new ConnectedEntityRef[0] ) );
+ pairedConnections.toArray(new ConnectedEntityRef[pairedConnections.size()]));
}
@@ -362,8 +363,9 @@ public class ConnectionRefImpl implements ConnectionRef {
/** @return index ids */
public UUID[] getIndexIds() {
+ List<ConnectedEntityRef> var = getPairedConnections();
return getIndexIds( getConnectingEntity(), getConnectedEntity().getConnectionType(),
- getConnectedEntity().getType(), getPairedConnections().toArray( new ConnectedEntityRef[0] ) );
+ getConnectedEntity().getType(), var.toArray(new ConnectedEntityRef[var.size()]));
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java
index f7d4069..fda492d 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java
@@ -912,7 +912,7 @@ public class EntityManagerImpl implements EntityManager {
private void incrementEntityCollection( String collection_name, long cassandraTimestamp ) {
try {
- incrementAggregateCounters( null, null, null, new String( APPLICATION_COLLECTION + collection_name ),
+ incrementAggregateCounters( null, null, null, APPLICATION_COLLECTION + collection_name,
ONE_COUNT, cassandraTimestamp );
}
catch ( Exception e ) {
@@ -1027,9 +1027,7 @@ public class EntityManagerImpl implements EntityManager {
column_names.add( PROPERTY_TYPE );
column_names.add( PROPERTY_UUID );
- for ( String propertyName : propertyNames ) {
- column_names.add( propertyName );
- }
+ Collections.addAll(column_names, propertyNames);
results = cass.getColumns( cass.getApplicationKeyspace( applicationId ), ENTITY_PROPERTIES, key( entityId ),
column_names, se, be );
@@ -2255,14 +2253,14 @@ public class EntityManagerImpl implements EntityManager {
if ( roleNames != null ) {
nameResults = getDictionaryElementValues( getApplicationRef(), DICTIONARY_ROLENAMES,
- roleNames.toArray( new String[0] ) );
+ roleNames.toArray(new String[roleNames.size()]));
}
else {
nameResults = cast( getDictionaryAsMap( getApplicationRef(), DICTIONARY_ROLENAMES ) );
roleNames = nameResults.keySet();
}
Map<String, Object> timeResults = getDictionaryElementValues( getApplicationRef(), DICTIONARY_ROLETIMES,
- roleNames.toArray( new String[0] ) );
+ roleNames.toArray(new String[roleNames.size()]));
for ( String roleName : roleNames ) {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/cassandra/RelationManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/RelationManagerImpl.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/RelationManagerImpl.java
index 4f565c7..d56a1ed 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/RelationManagerImpl.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/RelationManagerImpl.java
@@ -2128,7 +2128,7 @@ public class RelationManagerImpl implements RelationManager {
startId = UUID_PARSER.parse( slice.getCursor() ).getUUID();
}
- boolean skipFirst = node.isForceKeepFirst() ? false : slice.hasCursor();
+ boolean skipFirst = !node.isForceKeepFirst() && slice.hasCursor();
IndexScanner indexScanner = cass.getIdList( cass.getApplicationKeyspace( applicationId ),
key( headEntity.getUuid(), DICTIONARY_COLLECTIONS, collectionName ), startId, null,
@@ -2272,7 +2272,7 @@ public class RelationManagerImpl implements RelationManager {
size++;
}
- boolean skipFirst = node.isForceKeepFirst() ? false : slice.hasCursor();
+ boolean skipFirst = !node.isForceKeepFirst() && slice.hasCursor();
UUID entityIdToUse;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/entities/JobStat.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/entities/JobStat.java b/stack/core/src/main/java/org/usergrid/persistence/entities/JobStat.java
index 8c31a5e..06a324d 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/entities/JobStat.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/entities/JobStat.java
@@ -48,11 +48,6 @@ public class JobStat extends TypedEntity {
@EntityProperty(required = true, basic = true, indexed = true)
private long duration;
-
- /**
- * @param jobName
- * @param startTime
- */
public JobStat() {
}
@@ -117,7 +112,7 @@ public class JobStat extends TypedEntity {
/**
* DON'T CALL THIS, USE THE INRECMENT METHOD!
*
- * @param failCount the failCount to set
+ * @param runCount the runCount to set
*/
public void setRunCount( int runCount ) {
this.runCount = runCount;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/geo/GeoIndexSearcher.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/GeoIndexSearcher.java b/stack/core/src/main/java/org/usergrid/persistence/geo/GeoIndexSearcher.java
index 052e9ac..98629b2 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/GeoIndexSearcher.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/GeoIndexSearcher.java
@@ -238,9 +238,7 @@ public abstract class GeoIndexSearcher {
// final check - top level tiles
curGeocells.clear();
String[] items = "0123456789abcdef".split( "(?!^)" );
- for ( String item : items ) {
- curGeocells.add( item );
- }
+ Collections.addAll(curGeocells, items);
done = true;
}
else {
@@ -260,17 +258,17 @@ public abstract class GeoIndexSearcher {
// Get adjacent in one direction.
// TODO(romannurik): Watch for +/- 90 degree latitude edge case
// geocells.
- for ( int i = 0; i < sortedEdgesDistances.size(); i++ ) {
+ for (Tuple<int[], Double> sortedEdgesDistance : sortedEdgesDistances) {
- int nearestEdge[] = sortedEdgesDistances.get( i ).getFirst();
- String edge = GeocellUtils.adjacent( curGeocells.get( 0 ), nearestEdge );
+ int nearestEdge[] = sortedEdgesDistance.getFirst();
+ String edge = GeocellUtils.adjacent(curGeocells.get(0), nearestEdge);
// we're at the edge of the world, search in a different direction
- if ( edge == null ) {
+ if (edge == null) {
continue;
}
- curGeocells.add( edge );
+ curGeocells.add(edge);
break;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellUtils.java b/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellUtils.java
index 9d9df0f..5b112c9 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellUtils.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/geo/GeocellUtils.java
@@ -443,7 +443,7 @@ public final class GeocellUtils {
// NOTE: This only works for grid size 4.
int charI = GEOCELL_ALPHABET.indexOf( char_ );
return new int[] {
- ( charI & 4 ) >> 1 | ( charI & 1 ) >> 0, ( charI & 8 ) >> 2 | ( charI & 2 ) >> 1
+ ( charI & 4 ) >> 1 | (charI & 1), ( charI & 8 ) >> 2 | ( charI & 2 ) >> 1
};
}
@@ -458,7 +458,7 @@ public final class GeocellUtils {
return GEOCELL_ALPHABET.charAt( ( pos[1] & 2 ) << 2 |
( pos[0] & 2 ) << 1 |
( pos[1] & 1 ) << 1 |
- ( pos[0] & 1 ) << 0 );
+ (pos[0] & 1));
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java
index 94fb2b3..e63529b 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/AbstractScanColumn.java
@@ -46,11 +46,8 @@ public abstract class AbstractScanColumn implements ScanColumn {
AbstractScanColumn that = ( AbstractScanColumn ) o;
- if ( !uuid.equals( that.uuid ) ) {
- return false;
- }
+ return uuid.equals(that.uuid);
- return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/GeoIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/GeoIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/GeoIterator.java
index cf831c9..121f257 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/GeoIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/GeoIterator.java
@@ -141,15 +141,14 @@ public class GeoIterator implements ResultIterator {
lastCellsSearched = results.lastSearchedGeoCells;
- for ( int i = 0; i < locations.size(); i++ ) {
+ for (final EntityLocationRef location : locations) {
- final EntityLocationRef location = locations.get( i );
final UUID id = location.getUuid();
- final LocationScanColumn locationScan = new LocationScanColumn( location );
+ final LocationScanColumn locationScan = new LocationScanColumn(location);
- idOrder.put( id, locationScan );
- lastLoaded.add( locationScan );
+ idOrder.put(id, locationScan);
+ lastLoaded.add(locationScan);
last = location;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/query/tree/BooleanOperand.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/tree/BooleanOperand.java b/stack/core/src/main/java/org/usergrid/persistence/query/tree/BooleanOperand.java
index 9bc4cdd..8c6dc91 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/tree/BooleanOperand.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/tree/BooleanOperand.java
@@ -27,11 +27,6 @@ import org.antlr.runtime.Token;
*/
public abstract class BooleanOperand extends Operand {
-
- /**
- * @param property
- * @param literal
- */
public BooleanOperand( Token t ) {
super( t );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/query/tree/ContainsOperand.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/tree/ContainsOperand.java b/stack/core/src/main/java/org/usergrid/persistence/query/tree/ContainsOperand.java
index 1b9058e..5c03350 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/tree/ContainsOperand.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/tree/ContainsOperand.java
@@ -23,22 +23,10 @@ import org.usergrid.persistence.exceptions.PersistenceException;
/** @author tnine */
public class ContainsOperand extends EqualityOperand {
- /**
- * @param property
- * @param literal
- */
public ContainsOperand( Token t ) {
super( t );
}
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.usergrid.persistence.query.tree.Operand#visit(org.usergrid.persistence
- * .query.tree.QueryVisitor)
- */
@Override
public void visit( QueryVisitor visitor ) throws PersistenceException {
visitor.visit( this );
@@ -49,10 +37,6 @@ public class ContainsOperand extends EqualityOperand {
return ( StringLiteral ) getLiteral();
}
-
- /* (non-Javadoc)
- * @see org.usergrid.persistence.query.tree.EqualityOperand#newProperty(java.lang.String)
- */
@Override
protected Property newProperty( String name ) {
return new ContainsProperty( name );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/query/tree/EqualityOperand.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/tree/EqualityOperand.java b/stack/core/src/main/java/org/usergrid/persistence/query/tree/EqualityOperand.java
index 93e3c37..3f8a8b9 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/tree/EqualityOperand.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/tree/EqualityOperand.java
@@ -27,10 +27,6 @@ import org.antlr.runtime.Token;
*/
public abstract class EqualityOperand extends Operand {
- /**
- * @param property
- * @param literal
- */
public EqualityOperand( Token t ) {
super( t );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/schema/DictionaryInfo.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/schema/DictionaryInfo.java b/stack/core/src/main/java/org/usergrid/persistence/schema/DictionaryInfo.java
index 3d88358..56a3ffd 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/schema/DictionaryInfo.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/schema/DictionaryInfo.java
@@ -27,7 +27,6 @@ public class DictionaryInfo {
private boolean keysIndexedInConnections;
private boolean publicVisible = true;
private boolean includedInExport = true;
- ;
public DictionaryInfo() {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/main/java/org/usergrid/persistence/schema/EntityInfo.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/schema/EntityInfo.java b/stack/core/src/main/java/org/usergrid/persistence/schema/EntityInfo.java
index 843412d..e6480d3 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/schema/EntityInfo.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/schema/EntityInfo.java
@@ -44,7 +44,6 @@ public class EntityInfo {
private boolean publicVisible = true;
private boolean includedInExport = true;
- ;
public EntityInfo() {
@@ -115,29 +114,20 @@ public class EntityInfo {
public boolean isPropertyMutable( String propertyName ) {
PropertyInfo property = properties.get( propertyName );
- if ( property == null ) {
- return false;
- }
- return property.isMutable();
+ return property != null && property.isMutable();
}
/** A property is unique if it has either been declared as unique, or as an alias property */
public boolean isPropertyUnique( String propertyName ) {
PropertyInfo property = properties.get( propertyName );
- if ( property == null ) {
- return false;
- }
- return property.isUnique() || property.isAliasProperty();
+ return property != null && (property.isUnique() || property.isAliasProperty());
}
public boolean isPropertyTimestamp( String propertyName ) {
PropertyInfo property = properties.get( propertyName );
- if ( property == null ) {
- return false;
- }
- return property.isTimestamp();
+ return property != null && property.isTimestamp();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerTestSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerTestSuite.java b/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerTestSuite.java
index 0555830..7562a11 100644
--- a/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerTestSuite.java
+++ b/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerTestSuite.java
@@ -13,7 +13,7 @@ import org.usergrid.cassandra.ConcurrentSuite;
@RunWith(ConcurrentSuite.class)
@Suite.SuiteClasses(
{
- AppArgsTest.class, UsergridJobFactoryTest.class, BulkJobExecutionUnitTest.class,
+ AppArgsTest.class, UsergridJobFactoryTest.class, BulkJobExecutionUnitTest.class
})
@Concurrent()
public class ConcurrentSchedulerTestSuite {}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/test/java/org/usergrid/batch/SchedulerTestSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/SchedulerTestSuite.java b/stack/core/src/test/java/org/usergrid/batch/SchedulerTestSuite.java
index ca73689..7eeef42 100644
--- a/stack/core/src/test/java/org/usergrid/batch/SchedulerTestSuite.java
+++ b/stack/core/src/test/java/org/usergrid/batch/SchedulerTestSuite.java
@@ -12,7 +12,7 @@ import org.usergrid.cassandra.Concurrent;
@RunWith(Suite.class)
@Suite.SuiteClasses(
{
- AppArgsTest.class, UsergridJobFactoryTest.class, BulkJobExecutionUnitTest.class,
+ AppArgsTest.class, UsergridJobFactoryTest.class, BulkJobExecutionUnitTest.class
})
@Concurrent()
public class SchedulerTestSuite {}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/test/java/org/usergrid/batch/job/AbstractSchedulerRuntimeIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/AbstractSchedulerRuntimeIT.java b/stack/core/src/test/java/org/usergrid/batch/job/AbstractSchedulerRuntimeIT.java
index ca81d01..5bc9d51 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/AbstractSchedulerRuntimeIT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/AbstractSchedulerRuntimeIT.java
@@ -45,7 +45,7 @@ public class AbstractSchedulerRuntimeIT {
private int count = DEFAULT_COUNT;
protected SchedulerService scheduler;
protected Properties props;
- protected long waitTime = listener.WAIT_MAX_MILLIS;
+ protected long waitTime = TestJobListener.WAIT_MAX_MILLIS;
@Before
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/test/java/org/usergrid/count/BatchCountParallelismTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/count/BatchCountParallelismTest.java b/stack/core/src/test/java/org/usergrid/count/BatchCountParallelismTest.java
index a728ddb..f273860 100644
--- a/stack/core/src/test/java/org/usergrid/count/BatchCountParallelismTest.java
+++ b/stack/core/src/test/java/org/usergrid/count/BatchCountParallelismTest.java
@@ -65,7 +65,7 @@ public class BatchCountParallelismTest {
}
LOG.info( "Task iteration # {} : ", c );
cdl.countDown();
- return new Boolean( true );
+ return true;
}
} ) );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZooPut.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZooPut.java b/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZooPut.java
index 70d5ac7..49e0e31 100644
--- a/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZooPut.java
+++ b/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZooPut.java
@@ -86,7 +86,7 @@ public class ZooPut implements Watcher {
StringBuilder sbPath = new StringBuilder();
for ( int i = 0; i < paths.length; i++ ) {
String pathPiece = paths[i];
- sbPath.append( "/" + pathPiece );
+ sbPath.append("/").append(pathPiece);
String currentPath = sbPath.toString();
Object exists = keeper.exists( currentPath, null );
if ( exists == null ) {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/core/src/test/java/org/usergrid/persistence/EntityManagerIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/EntityManagerIT.java b/stack/core/src/test/java/org/usergrid/persistence/EntityManagerIT.java
index 21b1a5e..c71c90e 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/EntityManagerIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/EntityManagerIT.java
@@ -244,9 +244,9 @@ public class EntityManagerIT extends AbstractCoreIT {
assertNotNull( "properties should not be null", props );
assertEquals( "wrong number of properties", 8, props.size() );
- assertEquals( "wrong value for property alpha", new Long( 1 ), props.get( "alpha" ) );
- assertEquals( "wrong value for property beta", new Long( 2 ), props.get( "beta" ) );
- assertEquals( "wrong value for property gamma", new Long( 3 ), props.get( "gamma" ) );
+ assertEquals( "wrong value for property alpha", (long) 1, props.get( "alpha" ) );
+ assertEquals( "wrong value for property beta", (long) 2, props.get( "beta" ) );
+ assertEquals( "wrong value for property gamma", (long) 3, props.get( "gamma" ) );
for ( Entry<String, Object> entry : props.entrySet() ) {
LOG.info( entry.getKey() + " : " + entry.getValue() );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/launcher/src/main/java/org/usergrid/launcher/ClasspathStaticHttpHandler.java
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/java/org/usergrid/launcher/ClasspathStaticHttpHandler.java b/stack/launcher/src/main/java/org/usergrid/launcher/ClasspathStaticHttpHandler.java
index 83099f5..8bdfc87 100644
--- a/stack/launcher/src/main/java/org/usergrid/launcher/ClasspathStaticHttpHandler.java
+++ b/stack/launcher/src/main/java/org/usergrid/launcher/ClasspathStaticHttpHandler.java
@@ -62,6 +62,8 @@ package org.usergrid.launcher;
*/
+import org.springframework.core.io.Resource;
+
/**
* Modified version of the StaticHttpHandler to serve resources from the classpath.
* <p/>
@@ -246,13 +248,12 @@ public class ClasspathStaticHttpHandler extends org.glassfish.grizzly.http.serve
org.springframework.core.io.Resource resource = null;
- for ( int i = 0; i < fileFolders.length; i++ ) {
- final org.springframework.core.io.Resource webDir = fileFolders[i];
+ for (final Resource webDir : fileFolders) {
// local file
- resource = webDir.createRelative( uri );
+ resource = webDir.createRelative(uri);
final boolean exists = resource.exists();
- if ( exists ) {
+ if (exists) {
found = true;
break;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/launcher/src/main/java/org/usergrid/launcher/CustomJSPTemplateProcessor.java
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/java/org/usergrid/launcher/CustomJSPTemplateProcessor.java b/stack/launcher/src/main/java/org/usergrid/launcher/CustomJSPTemplateProcessor.java
index 2704efb..a29591b 100644
--- a/stack/launcher/src/main/java/org/usergrid/launcher/CustomJSPTemplateProcessor.java
+++ b/stack/launcher/src/main/java/org/usergrid/launcher/CustomJSPTemplateProcessor.java
@@ -86,7 +86,7 @@ public class CustomJSPTemplateProcessor implements com.sun.jersey.spi.template.V
return null;
}
- if ( basePath != "" ) {
+ if (!basePath.equals("")) {
path = basePath + path;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/launcher/src/main/java/org/usergrid/launcher/Server.java
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/java/org/usergrid/launcher/Server.java b/stack/launcher/src/main/java/org/usergrid/launcher/Server.java
index 14d2de2..f2eadca 100644
--- a/stack/launcher/src/main/java/org/usergrid/launcher/Server.java
+++ b/stack/launcher/src/main/java/org/usergrid/launcher/Server.java
@@ -100,6 +100,7 @@ public class Server implements org.springframework.context.ApplicationContextAwa
}
+ @SuppressWarnings("InfiniteLoopStatement")
public synchronized void startServer() {
if ( startDatabaseWithServer ) {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpQuery.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpQuery.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpQuery.java
index 5449c0e..3374c2b 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpQuery.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpQuery.java
@@ -70,7 +70,7 @@ public class OpQuery extends OpCrud {
static Set<String> operators = new HashSet<String>();
- {
+ static {
operators.add( "all" );
operators.add( "and" );
operators.add( "elemMatch" );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/mongo-emulator/src/main/java/org/usergrid/mongo/query/MongoQueryParser.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/query/MongoQueryParser.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/query/MongoQueryParser.java
index f5feaf0..89bd8cc 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/query/MongoQueryParser.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/query/MongoQueryParser.java
@@ -155,8 +155,8 @@ public class MongoQueryParser {
Stack<Operand> expressions = new Stack<Operand>();
- for ( int i = 0; i < size; i++ ) {
- expressions.push( eval( ( BSONObject ) values.get( i ) ) );
+ for (Object value : values) {
+ expressions.push(eval((BSONObject) value));
}
// we need to build a tree of expressions
@@ -178,8 +178,8 @@ public class MongoQueryParser {
Stack<Operand> expressions = new Stack<Operand>();
- for ( int i = 0; i < size; i++ ) {
- expressions.push( eval( ( BSONObject ) values.get( i ) ) );
+ for (Object value : values) {
+ expressions.push(eval((BSONObject) value));
}
while ( expressions.size() > 1 ) {
@@ -265,12 +265,12 @@ public class MongoQueryParser {
Stack<Operand> expressions = new Stack<Operand>();
- for ( int i = 0; i < size; i++ ) {
+ for (Object value1 : values) {
Equal equal = new Equal();
- equal.setProperty( sourceField );
- equal.setLiteral( values.get( i ) );
+ equal.setProperty(sourceField);
+ equal.setLiteral(value1);
- expressions.push( equal );
+ expressions.push(equal);
}
// we need to build a tree of expressions
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 2ec4757..d9f9f70 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -1760,7 +1760,7 @@
<version>1.6.0</version>
</requireJavaVersion>
<requireMavenVersion>
- <version>[3.0,3.1)</version>
+ <version>[3.0,3.1.1]</version>
</requireMavenVersion>
</rules>
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/main/java/org/usergrid/rest/RootResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/RootResource.java b/stack/rest/src/main/java/org/usergrid/rest/RootResource.java
index 0719190..bee1f27 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/RootResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/RootResource.java
@@ -42,6 +42,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
+import org.usergrid.persistence.Identifier;
import org.usergrid.rest.applications.ApplicationResource;
import org.usergrid.rest.exceptions.NoOpException;
import org.usergrid.rest.organizations.OrganizationResource;
@@ -237,24 +238,28 @@ public class RootResource extends AbstractContextResource implements MetricProce
}
- @Path("applications/{applicationId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}")
+ @Path("applications/"+APPLICATION_ID_PATH)
public ApplicationResource getApplicationById2( @PathParam("applicationId") String applicationId )
throws Exception {
return getApplicationById( applicationId );
}
- @Path("apps/{applicationId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}")
+ @Path("apps/"+APPLICATION_ID_PATH)
public ApplicationResource getApplicationById3( @PathParam("applicationId") String applicationId )
throws Exception {
return getApplicationById( applicationId );
}
+ public static final String APPLICATION_ID_PATH = "{applicationId: " + Identifier.UUID_REX + "}";
+ public static final String ORGANIZATION_ID_PATH = "{organizationId: " + Identifier.UUID_REX + "}";
+ public static final String USER_ID_PATH = "{userId: " + Identifier.UUID_REX + "}";
+ public static final String ENTITY_ID_PATH = "{entityId: " + Identifier.UUID_REX + "}";
+ public static final String EMAIL_PATH = "{email: " + Identifier.EMAIL_REX + "}";
@Timed(name = "getApplicationByUuids_timer", group = "rest_timers")
@ExceptionMetered(group = "rest_exceptions", name = "getApplicationByUuids_exceptions")
- @Path("{organizationId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12"
- + "}}/{applicationId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}")
+ @Path(ORGANIZATION_ID_PATH+"/"+APPLICATION_ID_PATH)
public ApplicationResource getApplicationByUuids( @PathParam("organizationId") String organizationIdStr,
@PathParam("applicationId") String applicationIdStr )
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/main/java/org/usergrid/rest/applications/ApplicationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/ApplicationResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/ApplicationResource.java
index 0278623..453538a 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/ApplicationResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/ApplicationResource.java
@@ -597,7 +597,7 @@ public class ApplicationResource extends ServiceResource {
public JSONWithPadding getAPMConfig( @Context UriInfo ui,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
- EntityManager em = ( EntityManager ) emf.getEntityManager( applicationId );
+ EntityManager em = emf.getEntityManager( applicationId );
Object value = em.getProperty( new SimpleEntityRef( Application.ENTITY_TYPE, applicationId ),
APIGEE_MOBILE_APM_CONFIG_JSON_KEY );
//If there is no apm configuration then try to create apm config on the fly
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java
index eeb5704..33ab281 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java
@@ -52,6 +52,7 @@ import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.Query;
import org.usergrid.rest.AbstractContextResource;
import org.usergrid.rest.ApiResponse;
+import org.usergrid.rest.RootResource;
import org.usergrid.rest.applications.assets.AssetsResource;
import org.usergrid.rest.security.annotations.RequireApplicationAccess;
import org.usergrid.security.oauth.AccessInfo;
@@ -194,7 +195,7 @@ public class ServiceResource extends AbstractContextResource {
}
- @Path("{entityId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}")
+ @Path(RootResource.ENTITY_ID_PATH)
public AbstractContextResource addIdParameter( @Context UriInfo ui, @PathParam("entityId") PathSegment entityId )
throws Exception {
@@ -242,8 +243,8 @@ public class ServiceResource extends AbstractContextResource {
boolean tree = "true".equalsIgnoreCase( ui.getQueryParameters().getFirst( "tree" ) );
boolean collectionGet = false;
if ( action == ServiceAction.GET ) {
- collectionGet = ( getServiceParameters().size() == 1 && InflectionUtils
- .isPlural( getServiceParameters().get( 0 ) ) ) ? true : false;
+ collectionGet = (getServiceParameters().size() == 1 && InflectionUtils
+ .isPlural(getServiceParameters().get(0)));
}
addQueryParams( getServiceParameters(), ui );
ServiceRequest r = services.newRequest( action, tree, getServiceParameters(), payload );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/main/java/org/usergrid/rest/applications/users/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/users/UsersResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/users/UsersResource.java
index 877f7fd..4a36c97 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/applications/users/UsersResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/applications/users/UsersResource.java
@@ -45,6 +45,7 @@ import org.usergrid.persistence.Query;
import org.usergrid.persistence.entities.User;
import org.usergrid.rest.AbstractContextResource;
import org.usergrid.rest.ApiResponse;
+import org.usergrid.rest.RootResource;
import org.usergrid.rest.applications.ServiceResource;
import org.usergrid.rest.exceptions.RedirectionException;
import org.usergrid.rest.security.annotations.RequireApplicationAccess;
@@ -77,7 +78,7 @@ public class UsersResource extends ServiceResource {
@Override
- @Path("{entityId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}")
+ @Path(RootResource.ENTITY_ID_PATH)
public AbstractContextResource addIdParameter( @Context UriInfo ui, @PathParam("entityId") PathSegment entityId )
throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationsResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationsResource.java
index adce2ab..519d150 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationsResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/OrganizationsResource.java
@@ -42,6 +42,7 @@ import org.usergrid.management.OrganizationOwnerInfo;
import org.usergrid.management.exceptions.ManagementException;
import org.usergrid.rest.AbstractContextResource;
import org.usergrid.rest.ApiResponse;
+import org.usergrid.rest.RootResource;
import org.usergrid.rest.security.annotations.RequireOrganizationAccess;
import org.apache.commons.lang.StringUtils;
@@ -70,7 +71,7 @@ public class OrganizationsResource extends AbstractContextResource {
}
- @Path( "{organizationId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}" )
+ @Path(RootResource.ORGANIZATION_ID_PATH)
@RequireOrganizationAccess
public OrganizationResource getOrganizationById( @Context UriInfo ui,
@PathParam( "organizationId" ) String organizationIdStr )
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationsResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationsResource.java
index 9a3b248..40edbb9 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationsResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/applications/ApplicationsResource.java
@@ -42,6 +42,7 @@ import org.usergrid.management.OrganizationInfo;
import org.usergrid.persistence.exceptions.EntityNotFoundException;
import org.usergrid.rest.AbstractContextResource;
import org.usergrid.rest.ApiResponse;
+import org.usergrid.rest.RootResource;
import org.usergrid.rest.security.annotations.RequireOrganizationAccess;
import com.google.common.base.Preconditions;
@@ -127,7 +128,7 @@ public class ApplicationsResource extends AbstractContextResource {
@RequireOrganizationAccess
- @Path( "{applicationId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}" )
+ @Path(RootResource.APPLICATION_ID_PATH)
public ApplicationResource applicationFromOrganizationByApplicationId( @Context UriInfo ui,
@PathParam( "applicationId" )
String applicationIdStr ) throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/main/java/org/usergrid/rest/management/organizations/users/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/users/UsersResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/users/UsersResource.java
index 57ac7ff..f7c09ea 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/organizations/users/UsersResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/organizations/users/UsersResource.java
@@ -45,6 +45,7 @@ import org.usergrid.management.UserInfo;
import org.usergrid.management.exceptions.ManagementException;
import org.usergrid.rest.AbstractContextResource;
import org.usergrid.rest.ApiResponse;
+import org.usergrid.rest.RootResource;
import org.usergrid.rest.security.annotations.RequireOrganizationAccess;
import org.usergrid.security.shiro.utils.SubjectUtils;
@@ -174,7 +175,7 @@ public class UsersResource extends AbstractContextResource {
@RequireOrganizationAccess
@PUT
- @Path("{userId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}")
+ @Path(RootResource.USER_ID_PATH)
public JSONWithPadding addUserToOrganization( @Context UriInfo ui, @PathParam("userId") String userIdStr,
@QueryParam("callback") @DefaultValue("callback") String callback )
throws Exception {
@@ -199,7 +200,7 @@ public class UsersResource extends AbstractContextResource {
@RequireOrganizationAccess
@PUT
- @Path("{email: [A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,4}}")
+ @Path(RootResource.EMAIL_PATH)
public JSONWithPadding addUserToOrganizationByEmail( @Context UriInfo ui, @PathParam("email") String email,
@QueryParam("callback") @DefaultValue("callback")
String callback ) throws Exception {
@@ -257,7 +258,7 @@ public class UsersResource extends AbstractContextResource {
@RequireOrganizationAccess
@DELETE
- @Path("{userId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}")
+ @Path(RootResource.USER_ID_PATH)
public JSONWithPadding removeUserFromOrganizationByUserId( @Context UriInfo ui,
@PathParam("userId") String userIdStr,
@QueryParam("callback") @DefaultValue("callback")
@@ -317,7 +318,7 @@ public class UsersResource extends AbstractContextResource {
@RequireOrganizationAccess
@DELETE
- @Path("{email: [A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,4}}")
+ @Path(RootResource.EMAIL_PATH)
public JSONWithPadding removeUserFromOrganizationByEmail( @Context UriInfo ui, @PathParam("email") String email,
@QueryParam("callback") @DefaultValue("callback")
String callback ) throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/main/java/org/usergrid/rest/management/users/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/users/UsersResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/users/UsersResource.java
index 5e345e6..fe04134 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/users/UsersResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/users/UsersResource.java
@@ -39,6 +39,7 @@ import org.springframework.stereotype.Component;
import org.usergrid.management.UserInfo;
import org.usergrid.rest.AbstractContextResource;
import org.usergrid.rest.ApiResponse;
+import org.usergrid.rest.RootResource;
import org.usergrid.rest.exceptions.AuthErrorInfo;
import org.usergrid.rest.exceptions.RedirectionException;
import org.usergrid.security.shiro.utils.SubjectUtils;
@@ -71,7 +72,7 @@ public class UsersResource extends AbstractContextResource {
}
- @Path( "{userId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}" )
+ @Path(RootResource.USER_ID_PATH)
public UserResource getUserById( @Context UriInfo ui, @PathParam( "userId" ) String userIdStr ) throws Exception {
return getSubResource( UserResource.class )
@@ -95,7 +96,7 @@ public class UsersResource extends AbstractContextResource {
}
- @Path( "{email: [a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,4}}" )
+ @Path(RootResource.EMAIL_PATH)
public UserResource getUserByEmail( @Context UriInfo ui, @PathParam( "email" ) String email ) throws Exception {
return getSubResource( UserResource.class ).init( management.getAdminUserByEmail( email ) );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/main/java/org/usergrid/rest/management/users/organizations/OrganizationsResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/management/users/organizations/OrganizationsResource.java b/stack/rest/src/main/java/org/usergrid/rest/management/users/organizations/OrganizationsResource.java
index b969c2b..2f40f67 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/management/users/organizations/OrganizationsResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/management/users/organizations/OrganizationsResource.java
@@ -41,6 +41,7 @@ import org.usergrid.management.UserInfo;
import org.usergrid.management.exceptions.ManagementException;
import org.usergrid.rest.AbstractContextResource;
import org.usergrid.rest.ApiResponse;
+import org.usergrid.rest.RootResource;
import org.usergrid.rest.security.annotations.RequireAdminUserAccess;
import org.usergrid.rest.security.annotations.RequireOrganizationAccess;
import org.usergrid.security.shiro.utils.SubjectUtils;
@@ -151,7 +152,7 @@ public class OrganizationsResource extends AbstractContextResource {
@RequireOrganizationAccess
@PUT
- @Path( "{organizationId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}" )
+ @Path(RootResource.ORGANIZATION_ID_PATH)
public JSONWithPadding addUserToOrganizationByOrganizationId( @Context UriInfo ui, @PathParam( "organizationId" )
String organizationIdStr, @QueryParam( "callback" ) @DefaultValue( "callback" ) String callback ) throws Exception {
@@ -167,7 +168,7 @@ public class OrganizationsResource extends AbstractContextResource {
@RequireOrganizationAccess
@DELETE
- @Path( "{organizationId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}" )
+ @Path( RootResource.ORGANIZATION_ID_PATH )
public JSONWithPadding removeUserFromOrganizationByOrganizationId( @Context UriInfo ui,
@PathParam( "organizationId" )
String organizationIdStr,
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/main/java/org/usergrid/rest/organizations/OrganizationResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/organizations/OrganizationResource.java b/stack/rest/src/main/java/org/usergrid/rest/organizations/OrganizationResource.java
index d26581d..deda09a 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/organizations/OrganizationResource.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/organizations/OrganizationResource.java
@@ -18,6 +18,7 @@ import org.springframework.stereotype.Component;
import org.usergrid.exception.NotImplementedException;
import org.usergrid.management.OrganizationInfo;
import org.usergrid.rest.AbstractContextResource;
+import org.usergrid.rest.RootResource;
import org.usergrid.rest.applications.ApplicationResource;
import org.usergrid.rest.exceptions.NoOpException;
import org.usergrid.rest.exceptions.OrganizationApplicationNotFoundException;
@@ -64,7 +65,7 @@ public class OrganizationResource extends AbstractContextResource {
}
- @Path("{applicationId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}")
+ @Path(RootResource.APPLICATION_ID_PATH)
public ApplicationResource getApplicationById( @PathParam("applicationId") String applicationIdStr )
throws Exception {
@@ -82,7 +83,7 @@ public class OrganizationResource extends AbstractContextResource {
if ( org_info != null ) {
organizationId = org_info.getUuid();
}
- if ( applicationId == null || organizationId == null ) {
+ if (organizationId == null) {
return null;
}
BiMap<UUID, String> apps = management.getApplicationsForOrganization( organizationId );
@@ -94,14 +95,14 @@ public class OrganizationResource extends AbstractContextResource {
}
- @Path("applications/{applicationId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}")
+ @Path("applications/"+RootResource.APPLICATION_ID_PATH)
public ApplicationResource getApplicationById2( @PathParam("applicationId") String applicationId )
throws Exception {
return getApplicationById( applicationId );
}
- @Path("apps/{applicationId: [A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}}")
+ @Path("apps/"+RootResource.APPLICATION_ID_PATH)
public ApplicationResource getApplicationById3( @PathParam("applicationId") String applicationId )
throws Exception {
return getApplicationById( applicationId );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/main/java/org/usergrid/rest/utils/JSONPUtils.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/utils/JSONPUtils.java b/stack/rest/src/main/java/org/usergrid/rest/utils/JSONPUtils.java
index 2b962bb..06a6532 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/utils/JSONPUtils.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/utils/JSONPUtils.java
@@ -53,11 +53,8 @@ public class JSONPUtils {
}
Set<String> subtypes = javascriptTypes.get( m.getType() );
- if ( subtypes == null ) {
- return false;
- }
+ return subtypes != null && subtypes.contains(m.getSubtype());
- return subtypes.contains( m.getSubtype() );
}
@@ -83,8 +80,7 @@ public class JSONPUtils {
public static String wrapJSONPResponse( MediaType m, String callback, String jsonResponse ) {
if ( isJavascript( m ) && isNotBlank( callback ) ) {
- String jsResponse = callback + "(" + jsonResponse + ")";
- return jsResponse;
+ return callback + "(" + jsonResponse + ")";
}
else {
return jsonResponse;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/main/java/org/usergrid/rest/utils/PathingUtils.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/usergrid/rest/utils/PathingUtils.java b/stack/rest/src/main/java/org/usergrid/rest/utils/PathingUtils.java
index 3ae9004..ee3ea60 100644
--- a/stack/rest/src/main/java/org/usergrid/rest/utils/PathingUtils.java
+++ b/stack/rest/src/main/java/org/usergrid/rest/utils/PathingUtils.java
@@ -24,7 +24,7 @@ public class PathingUtils {
* @return a new string in the format "organizationName/applicationName"
*/
public static String assembleAppName( String organizationName, String applicationName ) {
- return new String( organizationName.toLowerCase() + SLASH + applicationName.toLowerCase() );
+ return organizationName.toLowerCase() + SLASH + applicationName.toLowerCase();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/AndOrQueryTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/AndOrQueryTest.java b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/AndOrQueryTest.java
index 1dece05..60dc437 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/AndOrQueryTest.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/collection/activities/AndOrQueryTest.java
@@ -109,13 +109,12 @@ public class AndOrQueryTest extends AbstractRestIT {
int numValuesTested = 20;
- JsonNode[] correctValues = new JsonNode[numValuesTested];
props.put( "actor", actor );
props.put( "verb", "go" );
props.put( "content", "bragh" );
- correctValues = activities.createEntitiesWithOrdinal( props, numValuesTested );
+ JsonNode[] correctValues = activities.createEntitiesWithOrdinal( props, numValuesTested );
String inCorrectQuery = "select * where verb = 'go' and ordinal >= 10 ";
@@ -129,9 +128,7 @@ public class AndOrQueryTest extends AbstractRestIT {
CustomCollection madeupStuff = context.collection( "imagination" );
Map character = hashMap( "WhoHelpedYou", "Ruff" );
- JsonNode[] correctValues = new JsonNode[1000];
-
-
+ JsonNode[] correctValues;
correctValues = madeupStuff.createEntitiesWithOrdinal( character, 1000 );
String inquisitiveQuery =
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong2IT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong2IT.java b/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong2IT.java
index 154a581..fb64ee2 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong2IT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/queues/QueueResourceLong2IT.java
@@ -58,15 +58,15 @@ public class QueueResourceLong2IT extends AbstractQueueResourceIT {
List<String> originalMessageIds = transHandler.getMessageIds();
BiMap<String, String> transactionInfo = transHandler.getTransactionToMessageId();
- for ( int i = 0; i < originalMessageIds.size(); i++ ) {
+ for (String originalMessageId : originalMessageIds) {
// check the messages come back in the same order, they should
- assertEquals( originalMessageIds.get( i ), originalMessageIds.get( i ) );
+ assertEquals(originalMessageId, originalMessageId);
- assertNotNull( transactionInfo.get( originalMessageIds.get( i ) ) );
+ assertNotNull(transactionInfo.get(originalMessageId));
// ack the transaction we were returned
Transaction transaction =
- queue.transactions().transaction( transactionInfo.get( originalMessageIds.get( i ) ) );
+ queue.transactions().transaction(transactionInfo.get(originalMessageId));
transaction.delete();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/test/java/org/usergrid/rest/applications/users/ConnectionResourceTest.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/applications/users/ConnectionResourceTest.java b/stack/rest/src/test/java/org/usergrid/rest/applications/users/ConnectionResourceTest.java
index ab29ea8..6923cff 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/applications/users/ConnectionResourceTest.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/applications/users/ConnectionResourceTest.java
@@ -85,7 +85,6 @@ public class ConnectionResourceTest extends AbstractRestIT {
}
catch ( UniformInterfaceException uie ) {
assertEquals( 404, uie.getResponse().getClientResponseStatus().getStatusCode() );
- return;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f8ae7fe7/stack/rest/src/test/java/org/usergrid/rest/management/RegistrationIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/usergrid/rest/management/RegistrationIT.java b/stack/rest/src/test/java/org/usergrid/rest/management/RegistrationIT.java
index 66dd62e..a5fb6e8 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/management/RegistrationIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/management/RegistrationIT.java
@@ -342,9 +342,9 @@ public class RegistrationIT extends AbstractRestIT {
for ( Message m : msgs ) {
logger.info( "Subject: " + m.getSubject() );
logger.info(
- "Body content 0 " + ( String ) ( ( MimeMultipart ) m.getContent() ).getBodyPart( 0 ).getContent() );
+ "Body content 0 " + ( ( MimeMultipart ) m.getContent() ).getBodyPart( 0 ).getContent());
logger.info(
- "Body content 1 " + ( String ) ( ( MimeMultipart ) m.getContent() ).getBodyPart( 1 ).getContent() );
+ "Body content 1 " + ( ( MimeMultipart ) m.getContent() ).getBodyPart( 1 ).getContent());
}
return msgs;
}
[10/23] organize imports only
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/CoreITSetup.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/CoreITSetup.java b/stack/core/src/test/java/org/usergrid/CoreITSetup.java
index 57dad2b..72958e0 100644
--- a/stack/core/src/test/java/org/usergrid/CoreITSetup.java
+++ b/stack/core/src/test/java/org/usergrid/CoreITSetup.java
@@ -16,14 +16,14 @@
package org.usergrid;
-import java.util.UUID;
-
import org.junit.rules.TestRule;
import org.usergrid.mq.QueueManagerFactory;
import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.persistence.IndexBucketLocator;
import org.usergrid.persistence.cassandra.CassandraService;
+import java.util.UUID;
+
public interface CoreITSetup extends TestRule {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/CoreITSetupImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/CoreITSetupImpl.java b/stack/core/src/test/java/org/usergrid/CoreITSetupImpl.java
index 038bd85..5b20946 100644
--- a/stack/core/src/test/java/org/usergrid/CoreITSetupImpl.java
+++ b/stack/core/src/test/java/org/usergrid/CoreITSetupImpl.java
@@ -1,8 +1,6 @@
package org.usergrid;
-import java.util.UUID;
-
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
import org.slf4j.Logger;
@@ -14,6 +12,8 @@ import org.usergrid.persistence.IndexBucketLocator;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.utils.JsonUtils;
+import java.util.UUID;
+
public class CoreITSetupImpl implements CoreITSetup {
private static final Logger LOG = LoggerFactory.getLogger( CoreITSetupImpl.class );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/CoreITSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/CoreITSuite.java b/stack/core/src/test/java/org/usergrid/CoreITSuite.java
index 3efeb7e..d769e6e 100644
--- a/stack/core/src/test/java/org/usergrid/CoreITSuite.java
+++ b/stack/core/src/test/java/org/usergrid/CoreITSuite.java
@@ -8,15 +8,7 @@ import org.usergrid.cassandra.CassandraResource;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.locking.cassandra.HectorLockManagerIT;
import org.usergrid.mq.MessagesIT;
-import org.usergrid.persistence.CollectionIT;
-import org.usergrid.persistence.CounterIT;
-import org.usergrid.persistence.EntityConnectionsIT;
-import org.usergrid.persistence.EntityDictionaryIT;
-import org.usergrid.persistence.EntityManagerIT;
-import org.usergrid.persistence.GeoIT;
-import org.usergrid.persistence.IndexIT;
-import org.usergrid.persistence.PathQueryIT;
-import org.usergrid.persistence.PermissionsIT;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.cassandra.EntityManagerFactoryImplIT;
import org.usergrid.system.UsergridSystemMonitorIT;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/CoreTestSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/CoreTestSuite.java b/stack/core/src/test/java/org/usergrid/CoreTestSuite.java
index 71064ea..fed5bff 100644
--- a/stack/core/src/test/java/org/usergrid/CoreTestSuite.java
+++ b/stack/core/src/test/java/org/usergrid/CoreTestSuite.java
@@ -21,11 +21,7 @@ import org.junit.runners.Suite;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.locking.zookeeper.ZookeeperLockManagerTest;
import org.usergrid.mq.QueuePathsTest;
-import org.usergrid.persistence.EntityTest;
-import org.usergrid.persistence.QueryTest;
-import org.usergrid.persistence.QueryUtilsTest;
-import org.usergrid.persistence.SchemaTest;
-import org.usergrid.persistence.UtilsTest;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.cassandra.QueryProcessorTest;
import org.usergrid.persistence.cassandra.SimpleIndexBucketLocatorImplTest;
import org.usergrid.persistence.query.ir.result.IntersectionIteratorTest;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/AppArgsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/AppArgsTest.java b/stack/core/src/test/java/org/usergrid/batch/AppArgsTest.java
index 186ea71..f34094d 100644
--- a/stack/core/src/test/java/org/usergrid/batch/AppArgsTest.java
+++ b/stack/core/src/test/java/org/usergrid/batch/AppArgsTest.java
@@ -1,11 +1,10 @@
package org.usergrid.batch;
+import com.google.common.base.CharMatcher;
import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
-import com.google.common.base.CharMatcher;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/BulkJobExecutionUnitTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/BulkJobExecutionUnitTest.java b/stack/core/src/test/java/org/usergrid/batch/BulkJobExecutionUnitTest.java
index f1eec0f..47ab071 100644
--- a/stack/core/src/test/java/org/usergrid/batch/BulkJobExecutionUnitTest.java
+++ b/stack/core/src/test/java/org/usergrid/batch/BulkJobExecutionUnitTest.java
@@ -1,8 +1,6 @@
package org.usergrid.batch;
-import java.util.UUID;
-
import org.junit.Test;
import org.usergrid.batch.JobExecution.Status;
import org.usergrid.batch.repository.JobDescriptor;
@@ -10,6 +8,8 @@ import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.entities.JobData;
import org.usergrid.persistence.entities.JobStat;
+import java.util.UUID;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/BulkTestUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/BulkTestUtils.java b/stack/core/src/test/java/org/usergrid/batch/BulkTestUtils.java
index a87eb78..62cfda0 100644
--- a/stack/core/src/test/java/org/usergrid/batch/BulkTestUtils.java
+++ b/stack/core/src/test/java/org/usergrid/batch/BulkTestUtils.java
@@ -1,12 +1,12 @@
package org.usergrid.batch;
-import java.util.Arrays;
-import java.util.List;
-
import org.junit.Ignore;
import org.usergrid.batch.repository.JobDescriptor;
+import java.util.Arrays;
+import java.util.List;
+
/** @author zznate */
@Ignore
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerITSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerITSuite.java b/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerITSuite.java
index 6c29c05..42b7765 100644
--- a/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerITSuite.java
+++ b/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerITSuite.java
@@ -4,14 +4,7 @@ package org.usergrid.batch;
import org.junit.ClassRule;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
-import org.usergrid.batch.job.SchedulerRuntime1IT;
-import org.usergrid.batch.job.SchedulerRuntime2IT;
-import org.usergrid.batch.job.SchedulerRuntime3IT;
-import org.usergrid.batch.job.SchedulerRuntime4IT;
-import org.usergrid.batch.job.SchedulerRuntime5IT;
-import org.usergrid.batch.job.SchedulerRuntime6IT;
-import org.usergrid.batch.job.SchedulerRuntime7IT;
-import org.usergrid.batch.job.SchedulerRuntime8IT;
+import org.usergrid.batch.job.*;
import org.usergrid.cassandra.CassandraResource;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.cassandra.ConcurrentSuite;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerTestSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerTestSuite.java b/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerTestSuite.java
index 7562a11..e83a59f 100644
--- a/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerTestSuite.java
+++ b/stack/core/src/test/java/org/usergrid/batch/ConcurrentSchedulerTestSuite.java
@@ -3,9 +3,6 @@ package org.usergrid.batch;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
-import org.usergrid.batch.AppArgsTest;
-import org.usergrid.batch.BulkJobExecutionUnitTest;
-import org.usergrid.batch.UsergridJobFactoryTest;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.cassandra.ConcurrentSuite;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/SchedulerITSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/SchedulerITSuite.java b/stack/core/src/test/java/org/usergrid/batch/SchedulerITSuite.java
index 069e3f1..f7bf908 100644
--- a/stack/core/src/test/java/org/usergrid/batch/SchedulerITSuite.java
+++ b/stack/core/src/test/java/org/usergrid/batch/SchedulerITSuite.java
@@ -5,14 +5,7 @@ import org.junit.ClassRule;
import org.junit.Ignore;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
-import org.usergrid.batch.job.SchedulerRuntime1IT;
-import org.usergrid.batch.job.SchedulerRuntime2IT;
-import org.usergrid.batch.job.SchedulerRuntime3IT;
-import org.usergrid.batch.job.SchedulerRuntime4IT;
-import org.usergrid.batch.job.SchedulerRuntime5IT;
-import org.usergrid.batch.job.SchedulerRuntime6IT;
-import org.usergrid.batch.job.SchedulerRuntime7IT;
-import org.usergrid.batch.job.SchedulerRuntime8IT;
+import org.usergrid.batch.job.*;
import org.usergrid.cassandra.CassandraResource;
import org.usergrid.cassandra.Concurrent;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/SchedulerTestSuite.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/SchedulerTestSuite.java b/stack/core/src/test/java/org/usergrid/batch/SchedulerTestSuite.java
index 7eeef42..38306b7 100644
--- a/stack/core/src/test/java/org/usergrid/batch/SchedulerTestSuite.java
+++ b/stack/core/src/test/java/org/usergrid/batch/SchedulerTestSuite.java
@@ -3,9 +3,6 @@ package org.usergrid.batch;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
-import org.usergrid.batch.AppArgsTest;
-import org.usergrid.batch.BulkJobExecutionUnitTest;
-import org.usergrid.batch.UsergridJobFactoryTest;
import org.usergrid.cassandra.Concurrent;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/UsergridJobFactoryTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/UsergridJobFactoryTest.java b/stack/core/src/test/java/org/usergrid/batch/UsergridJobFactoryTest.java
index 4228ea6..d3f6ef3 100644
--- a/stack/core/src/test/java/org/usergrid/batch/UsergridJobFactoryTest.java
+++ b/stack/core/src/test/java/org/usergrid/batch/UsergridJobFactoryTest.java
@@ -1,13 +1,13 @@
package org.usergrid.batch;
-import java.util.List;
-import java.util.UUID;
-
import org.junit.Test;
import org.usergrid.batch.repository.JobDescriptor;
import org.usergrid.cassandra.Concurrent;
+import java.util.List;
+import java.util.UUID;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/AbstractSchedulerRuntimeIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/AbstractSchedulerRuntimeIT.java b/stack/core/src/test/java/org/usergrid/batch/job/AbstractSchedulerRuntimeIT.java
index 5bc9d51..e85d505 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/AbstractSchedulerRuntimeIT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/AbstractSchedulerRuntimeIT.java
@@ -17,16 +17,14 @@
package org.usergrid.batch.job;
-import java.util.Properties;
-
import com.google.common.util.concurrent.Service.State;
-
+import org.junit.Before;
import org.usergrid.batch.SchedulerITSuite;
import org.usergrid.batch.service.JobSchedulerService;
import org.usergrid.batch.service.SchedulerService;
import org.usergrid.cassandra.CassandraResource;
-import org.junit.Before;
+import java.util.Properties;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/CountdownLatchJob.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/CountdownLatchJob.java b/stack/core/src/test/java/org/usergrid/batch/job/CountdownLatchJob.java
index 8ab0f61..81ba3e0 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/CountdownLatchJob.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/CountdownLatchJob.java
@@ -17,14 +17,14 @@
package org.usergrid.batch.job;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
import org.junit.Ignore;
import org.springframework.stereotype.Component;
import org.usergrid.batch.Job;
import org.usergrid.batch.JobExecution;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
/**
* A simple job that does nothing but increment an atomic counter
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/DelayExecution.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/DelayExecution.java b/stack/core/src/test/java/org/usergrid/batch/job/DelayExecution.java
index a4e93bb..7f871b0 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/DelayExecution.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/DelayExecution.java
@@ -17,9 +17,6 @@
package org.usergrid.batch.job;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
import org.junit.Ignore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,6 +24,9 @@ import org.springframework.stereotype.Component;
import org.usergrid.batch.Job;
import org.usergrid.batch.JobExecution;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
/**
* A simple job that does nothing but increment an atomic counter
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/DelayHeartbeat.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/DelayHeartbeat.java b/stack/core/src/test/java/org/usergrid/batch/job/DelayHeartbeat.java
index d30a97e..b813fed 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/DelayHeartbeat.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/DelayHeartbeat.java
@@ -17,9 +17,6 @@
package org.usergrid.batch.job;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
import org.junit.Ignore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,6 +24,9 @@ import org.springframework.stereotype.Component;
import org.usergrid.batch.Job;
import org.usergrid.batch.JobExecution;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
/**
* A simple job that does nothing but increment an atomic counter and use heartbeat delay
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/FailureJobExceuction.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/FailureJobExceuction.java b/stack/core/src/test/java/org/usergrid/batch/job/FailureJobExceuction.java
index 330b143..08f7670 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/FailureJobExceuction.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/FailureJobExceuction.java
@@ -17,14 +17,14 @@
package org.usergrid.batch.job;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
import org.junit.Ignore;
import org.springframework.stereotype.Component;
import org.usergrid.batch.Job;
import org.usergrid.batch.JobExecution;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
/**
* A simple job that does nothing but increment an atomic counter
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceExceution.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceExceution.java b/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceExceution.java
index 7970c85..e39ba54 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceExceution.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceExceution.java
@@ -17,15 +17,15 @@
package org.usergrid.batch.job;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
import org.junit.Ignore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.usergrid.batch.JobExecution;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
/**
* A job that will sleep for the amount of time specified. Used to check that our counter is only ever run once.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceUnlockOnFailExceution.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceUnlockOnFailExceution.java b/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceUnlockOnFailExceution.java
index 09d2a20..0b694f4 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceUnlockOnFailExceution.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/OnlyOnceUnlockOnFailExceution.java
@@ -17,15 +17,15 @@
package org.usergrid.batch.job;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
import org.junit.Ignore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.usergrid.batch.JobExecution;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
/**
* A job that will sleep for the amount of time specified. Used to check that our counter is only ever run once. Checks
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime1IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime1IT.java b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime1IT.java
index 8b7ec6f..763608c 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime1IT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime1IT.java
@@ -17,17 +17,17 @@
package org.usergrid.batch.job;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.concurrent.TimeUnit;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.entities.JobData;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
/**
* Class to test job runtimes
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime2IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime2IT.java b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime2IT.java
index bc3c3cd..4d28fe0 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime2IT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime2IT.java
@@ -17,17 +17,17 @@
package org.usergrid.batch.job;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.concurrent.TimeUnit;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.entities.JobData;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
/**
* Class to test job runtimes
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime3IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime3IT.java b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime3IT.java
index 304f5af..65d2872 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime3IT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime3IT.java
@@ -17,12 +17,11 @@
package org.usergrid.batch.job;
+import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.entities.JobData;
import org.usergrid.persistence.entities.JobStat;
-import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime4IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime4IT.java b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime4IT.java
index 67dc405..eaa60b6 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime4IT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime4IT.java
@@ -17,12 +17,11 @@
package org.usergrid.batch.job;
+import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.entities.JobData;
import org.usergrid.persistence.entities.JobStat;
-import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime5IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime5IT.java b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime5IT.java
index b88bee5..efd9c62 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime5IT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime5IT.java
@@ -17,12 +17,11 @@
package org.usergrid.batch.job;
+import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.entities.JobData;
import org.usergrid.persistence.entities.JobStat;
-import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime6IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime6IT.java b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime6IT.java
index 2da11cc..ddf50b6 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime6IT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime6IT.java
@@ -17,18 +17,14 @@
package org.usergrid.batch.job;
-import java.util.concurrent.TimeUnit;
-
+import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.entities.JobData;
import org.usergrid.persistence.entities.JobStat;
-import org.junit.Test;
+import java.util.concurrent.TimeUnit;
-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.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime7IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime7IT.java b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime7IT.java
index c017d82..34d33e7 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime7IT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime7IT.java
@@ -17,12 +17,11 @@
package org.usergrid.batch.job;
+import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.entities.JobData;
import org.usergrid.persistence.entities.JobStat;
-import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime8IT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime8IT.java b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime8IT.java
index cdea0cf..5833b85 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime8IT.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/SchedulerRuntime8IT.java
@@ -17,15 +17,14 @@
package org.usergrid.batch.job;
-import java.util.UUID;
-
+import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.Results;
import org.usergrid.persistence.entities.JobData;
import org.usergrid.utils.UUIDUtils;
-import org.junit.Test;
+import java.util.UUID;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/TestJobListener.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/TestJobListener.java b/stack/core/src/test/java/org/usergrid/batch/job/TestJobListener.java
index 8932014..ad1a94d 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/TestJobListener.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/TestJobListener.java
@@ -18,13 +18,13 @@
package org.usergrid.batch.job;
-import java.util.concurrent.atomic.AtomicInteger;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.batch.JobExecution;
import org.usergrid.batch.service.JobListener;
+import java.util.concurrent.atomic.AtomicInteger;
+
/**
* Implementation of the JobListener for tests.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/batch/job/TestJobListenerTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/batch/job/TestJobListenerTest.java b/stack/core/src/test/java/org/usergrid/batch/job/TestJobListenerTest.java
index 0b47b1c..8405a10 100644
--- a/stack/core/src/test/java/org/usergrid/batch/job/TestJobListenerTest.java
+++ b/stack/core/src/test/java/org/usergrid/batch/job/TestJobListenerTest.java
@@ -18,13 +18,12 @@
package org.usergrid.batch.job;
-import org.usergrid.batch.JobExecution;
-import org.usergrid.persistence.entities.JobData;
-import org.usergrid.persistence.entities.JobStat;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.usergrid.batch.JobExecution;
+import org.usergrid.persistence.entities.JobData;
+import org.usergrid.persistence.entities.JobStat;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/clustering/hazelcast/HazelcastTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/clustering/hazelcast/HazelcastTest.java b/stack/core/src/test/java/org/usergrid/clustering/hazelcast/HazelcastTest.java
index 63a065e..f4c6bef 100644
--- a/stack/core/src/test/java/org/usergrid/clustering/hazelcast/HazelcastTest.java
+++ b/stack/core/src/test/java/org/usergrid/clustering/hazelcast/HazelcastTest.java
@@ -16,9 +16,7 @@
package org.usergrid.clustering.hazelcast;
-import java.util.Collection;
-import java.util.Set;
-
+import com.hazelcast.core.*;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
@@ -28,13 +26,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import com.hazelcast.core.Hazelcast;
-import com.hazelcast.core.ITopic;
-import com.hazelcast.core.Instance;
-import com.hazelcast.core.InstanceEvent;
-import com.hazelcast.core.InstanceListener;
-import com.hazelcast.core.Member;
-import com.hazelcast.core.MessageListener;
+import java.util.Collection;
+import java.util.Set;
@Ignore
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/count/BatchCountParallelismTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/count/BatchCountParallelismTest.java b/stack/core/src/test/java/org/usergrid/count/BatchCountParallelismTest.java
index f273860..5f79104 100644
--- a/stack/core/src/test/java/org/usergrid/count/BatchCountParallelismTest.java
+++ b/stack/core/src/test/java/org/usergrid/count/BatchCountParallelismTest.java
@@ -1,24 +1,19 @@
package org.usergrid.count;
-import static org.junit.Assert.assertEquals;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.count.common.Count;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicLong;
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.count.common.Count;
+import static org.junit.Assert.assertEquals;
/** @author zznate */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/count/SimpleBatcherTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/count/SimpleBatcherTest.java b/stack/core/src/test/java/org/usergrid/count/SimpleBatcherTest.java
index f3cc29d..e0aed8c 100644
--- a/stack/core/src/test/java/org/usergrid/count/SimpleBatcherTest.java
+++ b/stack/core/src/test/java/org/usergrid/count/SimpleBatcherTest.java
@@ -18,7 +18,6 @@ package org.usergrid.count;
import org.junit.Before;
import org.junit.Test;
-
import org.usergrid.count.common.Count;
import static junit.framework.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/locking/cassandra/HectorLockManagerIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/locking/cassandra/HectorLockManagerIT.java b/stack/core/src/test/java/org/usergrid/locking/cassandra/HectorLockManagerIT.java
index fc82ede..45d9875 100644
--- a/stack/core/src/test/java/org/usergrid/locking/cassandra/HectorLockManagerIT.java
+++ b/stack/core/src/test/java/org/usergrid/locking/cassandra/HectorLockManagerIT.java
@@ -16,18 +16,9 @@
package org.usergrid.locking.cassandra;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
import me.prettyprint.cassandra.model.ConfigurableConsistencyLevel;
import me.prettyprint.hector.api.ConsistencyLevelPolicy;
import me.prettyprint.hector.api.HConsistencyLevel;
-
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -40,6 +31,9 @@ import org.usergrid.locking.Lock;
import org.usergrid.locking.LockManager;
import org.usergrid.locking.exception.UGLockException;
+import java.util.UUID;
+import java.util.concurrent.*;
+
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/locking/singlenode/SingleNodeLockTestSingleNode.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/locking/singlenode/SingleNodeLockTestSingleNode.java b/stack/core/src/test/java/org/usergrid/locking/singlenode/SingleNodeLockTestSingleNode.java
index c8e3bbd..0b6e3cb 100644
--- a/stack/core/src/test/java/org/usergrid/locking/singlenode/SingleNodeLockTestSingleNode.java
+++ b/stack/core/src/test/java/org/usergrid/locking/singlenode/SingleNodeLockTestSingleNode.java
@@ -16,14 +16,6 @@
package org.usergrid.locking.singlenode;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -34,6 +26,9 @@ import org.usergrid.locking.Lock;
import org.usergrid.locking.LockManager;
import org.usergrid.locking.exception.UGLockException;
+import java.util.UUID;
+import java.util.concurrent.*;
+
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/locking/zookeeper/AbstractZooKeeperTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/locking/zookeeper/AbstractZooKeeperTest.java b/stack/core/src/test/java/org/usergrid/locking/zookeeper/AbstractZooKeeperTest.java
index 93bc508..f4211f2 100644
--- a/stack/core/src/test/java/org/usergrid/locking/zookeeper/AbstractZooKeeperTest.java
+++ b/stack/core/src/test/java/org/usergrid/locking/zookeeper/AbstractZooKeeperTest.java
@@ -16,16 +16,15 @@
package org.usergrid.locking.zookeeper;
-import java.io.File;
-import java.net.InetSocketAddress;
-
+import org.apache.zookeeper.server.ServerConfig;
+import org.apache.zookeeper.server.ZooKeeperServerMain;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.zookeeper.server.ServerConfig;
-import org.apache.zookeeper.server.ZooKeeperServerMain;
+import java.io.File;
+import java.net.InetSocketAddress;
/** Base test class for ZooKeeper tests. */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZooPut.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZooPut.java b/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZooPut.java
index 49e0e31..04143a5 100644
--- a/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZooPut.java
+++ b/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZooPut.java
@@ -16,15 +16,10 @@
package org.usergrid.locking.zookeeper;
-import java.io.IOException;
-
-import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.Watcher;
+import org.apache.zookeeper.*;
import org.apache.zookeeper.Watcher.Event.KeeperState;
-import org.apache.zookeeper.ZooDefs;
-import org.apache.zookeeper.ZooKeeper;
+
+import java.io.IOException;
/** Util for uploading and updating files in ZooKeeper. */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZookeeperLockManagerTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZookeeperLockManagerTest.java b/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZookeeperLockManagerTest.java
index 9cefa00..2837afa 100644
--- a/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZookeeperLockManagerTest.java
+++ b/stack/core/src/test/java/org/usergrid/locking/zookeeper/ZookeeperLockManagerTest.java
@@ -16,25 +16,16 @@
package org.usergrid.locking.zookeeper;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.locking.Lock;
import org.usergrid.locking.LockManager;
import org.usergrid.locking.exception.UGLockException;
+import java.util.UUID;
+import java.util.concurrent.*;
+
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/mq/MessagesIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/mq/MessagesIT.java b/stack/core/src/test/java/org/usergrid/mq/MessagesIT.java
index 58c5b95..6dcf4d0 100644
--- a/stack/core/src/test/java/org/usergrid/mq/MessagesIT.java
+++ b/stack/core/src/test/java/org/usergrid/mq/MessagesIT.java
@@ -16,10 +16,6 @@
package org.usergrid.mq;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,10 +23,11 @@ import org.usergrid.AbstractCoreIT;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.utils.JsonUtils;
-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 java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/CollectionIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/CollectionIT.java b/stack/core/src/test/java/org/usergrid/persistence/CollectionIT.java
index 08c69af..c05247f 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/CollectionIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/CollectionIT.java
@@ -16,13 +16,6 @@
package org.usergrid.persistence;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.Rule;
import org.junit.Test;
import org.slf4j.Logger;
@@ -38,11 +31,9 @@ import org.usergrid.persistence.exceptions.NoIndexException;
import org.usergrid.utils.JsonUtils;
import org.usergrid.utils.UUIDUtils;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import java.util.*;
+
+import static org.junit.Assert.*;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/CoreSchemaManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/CoreSchemaManager.java b/stack/core/src/test/java/org/usergrid/persistence/CoreSchemaManager.java
index 4c9db0a..f3a47c3 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/CoreSchemaManager.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/CoreSchemaManager.java
@@ -1,6 +1,7 @@
package org.usergrid.persistence;
+import me.prettyprint.hector.api.Cluster;
import org.junit.Ignore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -8,8 +9,6 @@ import org.usergrid.cassandra.SchemaManager;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.persistence.cassandra.Setup;
-import me.prettyprint.hector.api.Cluster;
-
/** @author zznate */
@Ignore
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/CounterIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/CounterIT.java b/stack/core/src/test/java/org/usergrid/persistence/CounterIT.java
index 62483ab..ff73bd1 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/CounterIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/CounterIT.java
@@ -16,11 +16,6 @@
package org.usergrid.persistence;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
@@ -28,12 +23,16 @@ import org.slf4j.LoggerFactory;
import org.usergrid.AbstractCoreIT;
import org.usergrid.CoreITSuite;
import org.usergrid.cassandra.Concurrent;
+import org.usergrid.count.SimpleBatcher;
import org.usergrid.persistence.entities.Event;
import org.usergrid.persistence.entities.Group;
import org.usergrid.persistence.entities.User;
import org.usergrid.utils.JsonUtils;
-import org.usergrid.count.SimpleBatcher;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/EntityConnectionsIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/EntityConnectionsIT.java b/stack/core/src/test/java/org/usergrid/persistence/EntityConnectionsIT.java
index e2b6df3..17866cd 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/EntityConnectionsIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/EntityConnectionsIT.java
@@ -16,12 +16,6 @@
package org.usergrid.persistence;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -30,10 +24,9 @@ import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.Results.Level;
import org.usergrid.persistence.entities.User;
-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 java.util.*;
+
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/EntityDictionaryIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/EntityDictionaryIT.java b/stack/core/src/test/java/org/usergrid/persistence/EntityDictionaryIT.java
index 0136f65..2164469 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/EntityDictionaryIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/EntityDictionaryIT.java
@@ -16,10 +16,6 @@
package org.usergrid.persistence;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -28,9 +24,11 @@ import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.entities.Application;
import org.usergrid.utils.JsonUtils;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/EntityManagerIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/EntityManagerIT.java b/stack/core/src/test/java/org/usergrid/persistence/EntityManagerIT.java
index c71c90e..da29648 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/EntityManagerIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/EntityManagerIT.java
@@ -16,15 +16,6 @@
package org.usergrid.persistence;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
@@ -36,10 +27,10 @@ import org.usergrid.persistence.entities.Group;
import org.usergrid.persistence.entities.User;
import org.usergrid.utils.UUIDUtils;
-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 java.util.*;
+import java.util.Map.Entry;
+
+import static org.junit.Assert.*;
import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/EntityTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/EntityTest.java b/stack/core/src/test/java/org/usergrid/persistence/EntityTest.java
index fad93dd..e33e5d7 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/EntityTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/EntityTest.java
@@ -16,10 +16,6 @@
package org.usergrid.persistence;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -28,6 +24,10 @@ import org.usergrid.persistence.entities.Group;
import org.usergrid.persistence.entities.User;
import org.usergrid.utils.JsonUtils;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/GeoIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/GeoIT.java b/stack/core/src/test/java/org/usergrid/persistence/GeoIT.java
index 5ac304e..2e15ceb 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/GeoIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/GeoIT.java
@@ -16,13 +16,6 @@
package org.usergrid.persistence;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,6 +29,8 @@ import org.usergrid.persistence.query.ir.QuerySlice;
import org.usergrid.persistence.query.ir.result.GeoIterator;
import org.usergrid.utils.MapUtils;
+import java.util.*;
+
import static junit.framework.Assert.assertFalse;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/IndexIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/IndexIT.java b/stack/core/src/test/java/org/usergrid/persistence/IndexIT.java
index e66575d..96b3f8a 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/IndexIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/IndexIT.java
@@ -16,11 +16,9 @@
package org.usergrid.persistence;
-import java.nio.ByteBuffer;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.mutation.Mutator;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,14 +32,13 @@ import org.usergrid.persistence.cassandra.RelationManagerImpl;
import org.usergrid.utils.JsonUtils;
import org.usergrid.utils.UUIDUtils;
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.mutation.Mutator;
+import java.nio.ByteBuffer;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
import static me.prettyprint.hector.api.factory.HFactory.createMutator;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/PathQueryIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/PathQueryIT.java b/stack/core/src/test/java/org/usergrid/persistence/PathQueryIT.java
index 4252749..9a489de 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/PathQueryIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/PathQueryIT.java
@@ -1,17 +1,11 @@
package org.usergrid.persistence;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.Test;
import org.usergrid.AbstractCoreIT;
+import java.util.*;
+
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/PermissionsIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/PermissionsIT.java b/stack/core/src/test/java/org/usergrid/persistence/PermissionsIT.java
index d416c13..c5cb9fb 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/PermissionsIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/PermissionsIT.java
@@ -16,12 +16,6 @@
package org.usergrid.persistence;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -29,9 +23,9 @@ import org.usergrid.AbstractCoreIT;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.entities.Role;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import java.util.*;
+
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/QueryTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/QueryTest.java b/stack/core/src/test/java/org/usergrid/persistence/QueryTest.java
index 0bd48fb..0e0526a 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/QueryTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/QueryTest.java
@@ -16,10 +16,6 @@
package org.usergrid.persistence;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,22 +23,13 @@ import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.Query.SortDirection;
import org.usergrid.persistence.Query.SortPredicate;
import org.usergrid.persistence.exceptions.QueryParseException;
-import org.usergrid.persistence.query.tree.AndOperand;
-import org.usergrid.persistence.query.tree.ContainsOperand;
-import org.usergrid.persistence.query.tree.Equal;
-import org.usergrid.persistence.query.tree.FloatLiteral;
-import org.usergrid.persistence.query.tree.GreaterThan;
-import org.usergrid.persistence.query.tree.GreaterThanEqual;
-import org.usergrid.persistence.query.tree.LessThan;
-import org.usergrid.persistence.query.tree.LessThanEqual;
-import org.usergrid.persistence.query.tree.LongLiteral;
-import org.usergrid.persistence.query.tree.NotOperand;
-import org.usergrid.persistence.query.tree.StringLiteral;
-import org.usergrid.persistence.query.tree.WithinOperand;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import org.usergrid.persistence.query.tree.*;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/QueryUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/QueryUtilsTest.java b/stack/core/src/test/java/org/usergrid/persistence/QueryUtilsTest.java
index 78ac217..addc516 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/QueryUtilsTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/QueryUtilsTest.java
@@ -1,14 +1,14 @@
package org.usergrid.persistence;
+import org.junit.Test;
+import org.usergrid.cassandra.Concurrent;
+
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.junit.Test;
-import org.usergrid.cassandra.Concurrent;
-
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/SchemaTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/SchemaTest.java b/stack/core/src/test/java/org/usergrid/persistence/SchemaTest.java
index 6d9cdfb..920dff6 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/SchemaTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/SchemaTest.java
@@ -16,15 +16,14 @@
package org.usergrid.persistence;
-import java.util.List;
-
+import io.baas.Simple;
import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.entities.SampleEntity;
-import io.baas.Simple;
+import java.util.List;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java b/stack/core/src/test/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
index 72b80c0..cb2f9a1 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
@@ -16,17 +16,7 @@
package org.usergrid.persistence.cassandra;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.AbstractCoreIT;
@@ -40,10 +30,9 @@ import org.usergrid.persistence.cassandra.util.TraceTag;
import org.usergrid.persistence.cassandra.util.TraceTagManager;
import org.usergrid.persistence.cassandra.util.TraceTagReporter;
-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 java.util.*;
+
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/cassandra/QueryProcessorTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/cassandra/QueryProcessorTest.java b/stack/core/src/test/java/org/usergrid/persistence/cassandra/QueryProcessorTest.java
index 1d15f66..e418c87 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/cassandra/QueryProcessorTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/cassandra/QueryProcessorTest.java
@@ -16,29 +16,21 @@
package org.usergrid.persistence.cassandra;
-import java.math.BigInteger;
-import java.util.Iterator;
-import java.util.UUID;
-
import org.antlr.runtime.ANTLRStringStream;
import org.antlr.runtime.TokenRewriteStream;
import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.exceptions.PersistenceException;
-import org.usergrid.persistence.query.ir.AndNode;
-import org.usergrid.persistence.query.ir.NotNode;
-import org.usergrid.persistence.query.ir.OrNode;
-import org.usergrid.persistence.query.ir.QuerySlice;
-import org.usergrid.persistence.query.ir.SliceNode;
-import org.usergrid.persistence.query.ir.WithinNode;
+import org.usergrid.persistence.query.ir.*;
import org.usergrid.persistence.query.tree.QueryFilterLexer;
import org.usergrid.persistence.query.tree.QueryFilterParser;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import java.math.BigInteger;
+import java.util.Iterator;
+import java.util.UUID;
+
+import static org.junit.Assert.*;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImplTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImplTest.java b/stack/core/src/test/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImplTest.java
index 71c3ec6..5073ad3 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImplTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/cassandra/SimpleIndexBucketLocatorImplTest.java
@@ -16,21 +16,16 @@
package org.usergrid.persistence.cassandra;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
+import com.yammer.metrics.Metrics;
+import com.yammer.metrics.core.Timer;
+import com.yammer.metrics.core.TimerContext;
import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.IndexBucketLocator.IndexType;
import org.usergrid.utils.UUIDUtils;
-import com.yammer.metrics.Metrics;
-import com.yammer.metrics.core.Timer;
-import com.yammer.metrics.core.TimerContext;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/entities/SampleEntity.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/entities/SampleEntity.java b/stack/core/src/test/java/org/usergrid/persistence/entities/SampleEntity.java
index cb19b46..c58b403 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/entities/SampleEntity.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/entities/SampleEntity.java
@@ -16,16 +16,15 @@
package org.usergrid.persistence.entities;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
import org.usergrid.persistence.TypedEntity;
import org.usergrid.persistence.annotations.EntityDictionary;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Set;
+import java.util.UUID;
+
@XmlRootElement
public class SampleEntity extends TypedEntity {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparatorTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparatorTest.java b/stack/core/src/test/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparatorTest.java
index b783406..82fbcbb 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparatorTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/geo/EntityLocationRefDistanceComparatorTest.java
@@ -16,12 +16,12 @@
package org.usergrid.persistence.geo;
-import java.util.UUID;
-
import org.junit.Test;
import org.usergrid.persistence.geo.model.Point;
import org.usergrid.utils.UUIDUtils;
+import java.util.UUID;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/query/AbstractIteratingQueryIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/query/AbstractIteratingQueryIT.java b/stack/core/src/test/java/org/usergrid/persistence/query/AbstractIteratingQueryIT.java
index d1aed3a..a78056b 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/query/AbstractIteratingQueryIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/query/AbstractIteratingQueryIT.java
@@ -16,15 +16,6 @@
package org.usergrid.persistence.query;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
import org.junit.ClassRule;
import org.junit.Rule;
import org.slf4j.Logger;
@@ -37,6 +28,8 @@ import org.usergrid.persistence.Entity;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.Results;
+import java.util.*;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/query/IntersectionUnionPagingIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/query/IntersectionUnionPagingIT.java b/stack/core/src/test/java/org/usergrid/persistence/query/IntersectionUnionPagingIT.java
index 5f554d3..adc1f4f 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/query/IntersectionUnionPagingIT.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/query/IntersectionUnionPagingIT.java
@@ -16,18 +16,14 @@
package org.usergrid.persistence.query;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.Results;
+import java.util.*;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/InOrderIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/InOrderIterator.java b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/InOrderIterator.java
index 85b124c..5c0f404 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/InOrderIterator.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/InOrderIterator.java
@@ -1,17 +1,12 @@
package org.usergrid.persistence.query.ir.result;
-import java.nio.ByteBuffer;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
+import com.google.common.collect.Iterables;
import org.junit.Ignore;
import org.usergrid.persistence.cassandra.CursorCache;
-import com.google.common.collect.Iterables;
+import java.nio.ByteBuffer;
+import java.util.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/IntersectionIteratorTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/IntersectionIteratorTest.java b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/IntersectionIteratorTest.java
index c165caa..dbe4cae 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/IntersectionIteratorTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/IntersectionIteratorTest.java
@@ -16,18 +16,12 @@
package org.usergrid.persistence.query.ir.result;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
import org.junit.Test;
import org.usergrid.utils.UUIDUtils;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import java.util.*;
+
+import static org.junit.Assert.*;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/SubtractionIteratorTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/SubtractionIteratorTest.java b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/SubtractionIteratorTest.java
index d184edb..9a5ea3a 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/SubtractionIteratorTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/SubtractionIteratorTest.java
@@ -16,15 +16,13 @@
package org.usergrid.persistence.query.ir.result;
-import java.util.Set;
-import java.util.UUID;
-
import org.junit.Test;
import org.usergrid.utils.UUIDUtils;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import java.util.Set;
+import java.util.UUID;
+
+import static org.junit.Assert.*;
import static org.usergrid.persistence.query.ir.result.IteratorHelper.uuidColumn;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/UnionIteratorTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/UnionIteratorTest.java b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/UnionIteratorTest.java
index 683f00d..0678547 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/UnionIteratorTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/query/ir/result/UnionIteratorTest.java
@@ -16,17 +16,14 @@
package org.usergrid.persistence.query.ir.result;
+import org.junit.Test;
+import org.usergrid.utils.UUIDUtils;
+
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
-import org.junit.Test;
-import org.usergrid.utils.UUIDUtils;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
import static org.usergrid.persistence.query.ir.result.IteratorHelper.uuidColumn;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/persistence/query/tree/GrammarTreeTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/persistence/query/tree/GrammarTreeTest.java b/stack/core/src/test/java/org/usergrid/persistence/query/tree/GrammarTreeTest.java
index 30bf820..bf91f07 100644
--- a/stack/core/src/test/java/org/usergrid/persistence/query/tree/GrammarTreeTest.java
+++ b/stack/core/src/test/java/org/usergrid/persistence/query/tree/GrammarTreeTest.java
@@ -16,24 +16,18 @@
package org.usergrid.persistence.query.tree;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
import org.antlr.runtime.ANTLRStringStream;
import org.antlr.runtime.RecognitionException;
import org.antlr.runtime.TokenRewriteStream;
import org.junit.Test;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.exceptions.QueryParseException;
-import org.usergrid.persistence.query.ir.OrNode;
-import antlr.NoViableAltException;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/system/UsergridSystemMonitorIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/system/UsergridSystemMonitorIT.java b/stack/core/src/test/java/org/usergrid/system/UsergridSystemMonitorIT.java
index 3a2ec36..7c289f4 100644
--- a/stack/core/src/test/java/org/usergrid/system/UsergridSystemMonitorIT.java
+++ b/stack/core/src/test/java/org/usergrid/system/UsergridSystemMonitorIT.java
@@ -1,15 +1,14 @@
package org.usergrid.system;
-import java.util.Date;
-
+import org.apache.commons.lang.StringUtils;
import org.junit.Before;
import org.junit.Test;
import org.usergrid.CoreITSuite;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.utils.MapUtils;
-import org.apache.commons.lang.StringUtils;
+import java.util.Date;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/utils/ConversionUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/utils/ConversionUtilsTest.java b/stack/core/src/test/java/org/usergrid/utils/ConversionUtilsTest.java
index efa5316..38af953 100644
--- a/stack/core/src/test/java/org/usergrid/utils/ConversionUtilsTest.java
+++ b/stack/core/src/test/java/org/usergrid/utils/ConversionUtilsTest.java
@@ -17,10 +17,10 @@
package org.usergrid.utils;
-import java.util.UUID;
-
import org.junit.Test;
+import java.util.UUID;
+
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/utils/IndexUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/utils/IndexUtilsTest.java b/stack/core/src/test/java/org/usergrid/utils/IndexUtilsTest.java
index 1e7de0f..0b7c723 100644
--- a/stack/core/src/test/java/org/usergrid/utils/IndexUtilsTest.java
+++ b/stack/core/src/test/java/org/usergrid/utils/IndexUtilsTest.java
@@ -17,15 +17,14 @@
package org.usergrid.utils;
-import java.util.List;
-import java.util.Map.Entry;
-
-import org.usergrid.persistence.entities.Activity;
-import org.usergrid.persistence.entities.User;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.usergrid.persistence.entities.Activity;
+import org.usergrid.persistence.entities.User;
+
+import java.util.List;
+import java.util.Map.Entry;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/utils/JsonUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/utils/JsonUtilsTest.java b/stack/core/src/test/java/org/usergrid/utils/JsonUtilsTest.java
index f250c29..1cee013 100644
--- a/stack/core/src/test/java/org/usergrid/utils/JsonUtilsTest.java
+++ b/stack/core/src/test/java/org/usergrid/utils/JsonUtilsTest.java
@@ -17,17 +17,17 @@
package org.usergrid.utils;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
import org.codehaus.jackson.node.JsonNodeFactory;
import org.codehaus.jackson.node.ObjectNode;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/utils/ListUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/utils/ListUtilsTest.java b/stack/core/src/test/java/org/usergrid/utils/ListUtilsTest.java
index 930916e..c3d32a7 100644
--- a/stack/core/src/test/java/org/usergrid/utils/ListUtilsTest.java
+++ b/stack/core/src/test/java/org/usergrid/utils/ListUtilsTest.java
@@ -17,13 +17,13 @@
package org.usergrid.utils;
-import java.util.Arrays;
-import java.util.List;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Arrays;
+import java.util.List;
+
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/utils/MailUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/utils/MailUtilsTest.java b/stack/core/src/test/java/org/usergrid/utils/MailUtilsTest.java
index fe5b3d6..c392b26 100644
--- a/stack/core/src/test/java/org/usergrid/utils/MailUtilsTest.java
+++ b/stack/core/src/test/java/org/usergrid/utils/MailUtilsTest.java
@@ -17,14 +17,13 @@
package org.usergrid.utils;
-import java.util.List;
-import java.util.Properties;
-
-import javax.mail.Message;
-
import org.junit.Before;
import org.junit.Test;
+import javax.mail.Message;
+import java.util.List;
+import java.util.Properties;
+
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/utils/MapUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/utils/MapUtilsTest.java b/stack/core/src/test/java/org/usergrid/utils/MapUtilsTest.java
index e8c9b58..23dfcad 100644
--- a/stack/core/src/test/java/org/usergrid/utils/MapUtilsTest.java
+++ b/stack/core/src/test/java/org/usergrid/utils/MapUtilsTest.java
@@ -17,12 +17,12 @@
package org.usergrid.utils;
-import java.util.Map;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Map;
+
public class MapUtilsTest {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/test/java/org/usergrid/utils/UUIDUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/usergrid/utils/UUIDUtilsTest.java b/stack/core/src/test/java/org/usergrid/utils/UUIDUtilsTest.java
index 5311b63..6d33111 100644
--- a/stack/core/src/test/java/org/usergrid/utils/UUIDUtilsTest.java
+++ b/stack/core/src/test/java/org/usergrid/utils/UUIDUtilsTest.java
@@ -17,29 +17,17 @@
package org.usergrid.utils;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-
-import static org.usergrid.utils.UUIDUtils.getTimestampInMillis;
-import static org.usergrid.utils.UUIDUtils.newTimeUUID;
-
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import java.util.*;
+import java.util.concurrent.*;
+
+import static org.junit.Assert.*;
+import static org.usergrid.utils.UUIDUtils.getTimestampInMillis;
+import static org.usergrid.utils.UUIDUtils.newTimeUUID;
public class UUIDUtilsTest {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/launcher/src/main/java/org/usergrid/launcher/App.java
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/java/org/usergrid/launcher/App.java b/stack/launcher/src/main/java/org/usergrid/launcher/App.java
index e896969..66d57f4 100644
--- a/stack/launcher/src/main/java/org/usergrid/launcher/App.java
+++ b/stack/launcher/src/main/java/org/usergrid/launcher/App.java
@@ -16,19 +16,6 @@
package org.usergrid.launcher;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.prefs.Preferences;
-
-import javax.swing.UIManager;
-
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.node.ArrayNode;
import org.codehaus.jackson.node.JsonNodeFactory;
@@ -36,6 +23,13 @@ import org.codehaus.jackson.type.TypeReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.swing.*;
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.prefs.Preferences;
+
public class App {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/launcher/src/main/java/org/usergrid/launcher/AppleUtils.java
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/java/org/usergrid/launcher/AppleUtils.java b/stack/launcher/src/main/java/org/usergrid/launcher/AppleUtils.java
index 9463f9e..1f09404 100644
--- a/stack/launcher/src/main/java/org/usergrid/launcher/AppleUtils.java
+++ b/stack/launcher/src/main/java/org/usergrid/launcher/AppleUtils.java
@@ -16,8 +16,7 @@
package org.usergrid.launcher;
-import javax.swing.ImageIcon;
-import javax.swing.JOptionPane;
+import javax.swing.*;
public class AppleUtils {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/launcher/src/main/java/org/usergrid/launcher/LauncherFrame.java
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/java/org/usergrid/launcher/LauncherFrame.java b/stack/launcher/src/main/java/org/usergrid/launcher/LauncherFrame.java
index 760b8e0..b5bf40b 100644
--- a/stack/launcher/src/main/java/org/usergrid/launcher/LauncherFrame.java
+++ b/stack/launcher/src/main/java/org/usergrid/launcher/LauncherFrame.java
@@ -16,18 +16,11 @@
package org.usergrid.launcher;
-import java.awt.Color;
-import java.awt.Container;
-import java.awt.Desktop;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.GradientPaint;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Image;
-import java.awt.Insets;
+import javax.swing.*;
+import javax.swing.border.EmptyBorder;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.IOException;
@@ -40,25 +33,6 @@ import java.util.List;
import java.util.Set;
import java.util.UUID;
-import javax.swing.BorderFactory;
-import javax.swing.ComboBoxEditor;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JComponent;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.JToolBar;
-import javax.swing.Timer;
-import javax.swing.WindowConstants;
-import javax.swing.border.EmptyBorder;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
public class LauncherFrame extends JFrame {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/launcher/src/main/java/org/usergrid/launcher/LogViewerFrame.java
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/java/org/usergrid/launcher/LogViewerFrame.java b/stack/launcher/src/main/java/org/usergrid/launcher/LogViewerFrame.java
index 68b5b19..a10de6e 100644
--- a/stack/launcher/src/main/java/org/usergrid/launcher/LogViewerFrame.java
+++ b/stack/launcher/src/main/java/org/usergrid/launcher/LogViewerFrame.java
@@ -16,20 +16,15 @@
package org.usergrid.launcher;
-import java.awt.BorderLayout;
-import java.io.IOException;
-
-import javax.swing.JFrame;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.SwingUtilities;
-import javax.swing.WindowConstants;
-
import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
import org.apache.log4j.spi.LoggingEvent;
+import javax.swing.*;
+import java.awt.*;
+import java.io.IOException;
+
public class LogViewerFrame extends JFrame {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoChannelHandler.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoChannelHandler.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoChannelHandler.java
index eb1d182..0ba0004 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoChannelHandler.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoChannelHandler.java
@@ -16,6 +16,10 @@
package org.usergrid.mongo;
+import org.apache.shiro.mgt.SessionsSecurityManager;
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.subject.support.SubjectThreadState;
+import org.apache.shiro.util.ThreadState;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ExceptionEvent;
import org.jboss.netty.channel.MessageEvent;
@@ -29,11 +33,6 @@ import org.usergrid.mongo.protocol.OpReply;
import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.services.ServiceManagerFactory;
-import org.apache.shiro.mgt.SessionsSecurityManager;
-import org.apache.shiro.subject.Subject;
-import org.apache.shiro.subject.support.SubjectThreadState;
-import org.apache.shiro.util.ThreadState;
-
public class MongoChannelHandler extends SimpleChannelUpstreamHandler {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoMessageDecoder.java
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoMessageDecoder.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoMessageDecoder.java
index cce7fd2..e27b8cb 100644
--- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoMessageDecoder.java
+++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoMessageDecoder.java
@@ -22,15 +22,7 @@ import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.handler.codec.frame.FrameDecoder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.usergrid.mongo.protocol.Message;
-import org.usergrid.mongo.protocol.OpDelete;
-import org.usergrid.mongo.protocol.OpGetMore;
-import org.usergrid.mongo.protocol.OpInsert;
-import org.usergrid.mongo.protocol.OpKillCursors;
-import org.usergrid.mongo.protocol.OpMsg;
-import org.usergrid.mongo.protocol.OpQuery;
-import org.usergrid.mongo.protocol.OpReply;
-import org.usergrid.mongo.protocol.OpUpdate;
+import org.usergrid.mongo.protocol.*;
public class MongoMessageDecoder extends FrameDecoder {
[23/23] git commit: Merge 2e35e4901b60388235b9f15701e9b2e5659e879f
into 1150e47da5e1094ef26cb051cade57591b925fc6
Posted by sn...@apache.org.
Merge 2e35e4901b60388235b9f15701e9b2e5659e879f into 1150e47da5e1094ef26cb051cade57591b925fc6
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/77046b04
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/77046b04
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/77046b04
Branch: refs/pull/30/merge
Commit: 77046b0408cca383852f94b6fb97396477f26669
Parents: 1150e47 2e35e49
Author: Strong Liu <st...@hibernate.org>
Authored: Sun Jan 19 02:00:25 2014 -0800
Committer: Strong Liu <st...@hibernate.org>
Committed: Sun Jan 19 02:00:25 2014 -0800
----------------------------------------------------------------------
.../src/main/java/org/usergrid/batch/Job.java | 2 +-
.../java/org/usergrid/batch/JobExecution.java | 4 +-
.../org/usergrid/batch/JobExecutionImpl.java | 5 +-
.../java/org/usergrid/batch/JobFactory.java | 4 +-
.../org/usergrid/batch/UsergridJobFactory.java | 6 +-
.../org/usergrid/batch/job/OnlyOnceJob.java | 4 +-
.../usergrid/batch/repository/JobAccessor.java | 4 +-
.../batch/repository/JobDescriptor.java | 5 +-
.../java/org/usergrid/batch/service/App.java | 3 +-
.../batch/service/JobSchedulerService.java | 33 ++--
.../batch/service/SchedulerService.java | 4 +-
.../batch/service/SchedulerServiceImpl.java | 29 ++-
.../hazelcast/HazelcastLifecycleMonitor.java | 8 +-
.../org/usergrid/count/AbstractBatcher.java | 12 +-
.../java/org/usergrid/count/BatchSubmitter.java | 4 +-
.../usergrid/count/CassandraCounterStore.java | 20 +--
.../org/usergrid/count/CassandraSubmitter.java | 17 +-
.../java/org/usergrid/count/CounterStore.java | 4 +-
.../java/org/usergrid/count/SimpleBatcher.java | 1 -
.../org/usergrid/count/Slf4JBatchSubmitter.java | 17 +-
.../java/org/usergrid/count/common/Count.java | 14 +-
.../usergrid/count/common/CountSerDeUtils.java | 4 +-
.../main/java/org/usergrid/locking/Lock.java | 4 +-
.../java/org/usergrid/locking/LockHelper.java | 5 +-
.../java/org/usergrid/locking/LockManager.java | 4 +-
.../locking/cassandra/HectorLockImpl.java | 11 +-
.../cassandra/HectorLockManagerImpl.java | 8 +-
.../org/usergrid/locking/noop/NoOpLockImpl.java | 4 +-
.../locking/noop/NoOpLockManagerImpl.java | 4 +-
.../locking/singlenode/SingleNodeLockImpl.java | 6 +-
.../singlenode/SingleNodeLockManagerImpl.java | 15 +-
.../zookeeper/ZooKeeperLockManagerImpl.java | 16 +-
.../locking/zookeeper/ZookeeperLockImpl.java | 5 +-
.../main/java/org/usergrid/mq/CounterQuery.java | 13 +-
.../src/main/java/org/usergrid/mq/Message.java | 36 +---
.../src/main/java/org/usergrid/mq/Query.java | 35 +---
.../java/org/usergrid/mq/QueryFilterLexer.java | 13 +-
.../java/org/usergrid/mq/QueryFilterParser.java | 37 +---
.../java/org/usergrid/mq/QueryProcessor.java | 19 +-
.../src/main/java/org/usergrid/mq/Queue.java | 19 +-
.../main/java/org/usergrid/mq/QueueManager.java | 8 +-
.../main/java/org/usergrid/mq/QueueQuery.java | 5 +-
.../main/java/org/usergrid/mq/QueueResults.java | 9 +-
.../src/main/java/org/usergrid/mq/QueueSet.java | 11 +-
.../usergrid/mq/cassandra/CassandraMQUtils.java | 36 ++--
.../mq/cassandra/MessageIndexUpdate.java | 20 +--
.../usergrid/mq/cassandra/QueueIndexUpdate.java | 21 +--
.../mq/cassandra/QueueManagerFactoryImpl.java | 10 +-
.../usergrid/mq/cassandra/QueueManagerImpl.java | 103 +++--------
.../org/usergrid/mq/cassandra/QueuesCF.java | 5 +-
.../mq/cassandra/io/AbstractSearch.java | 46 ++---
.../mq/cassandra/io/ConsumerTransaction.java | 29 ++-
.../org/usergrid/mq/cassandra/io/EndSearch.java | 5 +-
.../usergrid/mq/cassandra/io/FilterSearch.java | 20 +--
.../mq/cassandra/io/NoTransactionSearch.java | 7 +-
.../usergrid/mq/cassandra/io/StartSearch.java | 5 +-
.../usergrid/persistence/AbstractEntity.java | 14 +-
.../persistence/AggregateCounterSet.java | 6 +-
.../org/usergrid/persistence/CounterQuery.java | 13 +-
.../usergrid/persistence/CredentialsInfo.java | 11 +-
.../org/usergrid/persistence/DynamicEntity.java | 9 +-
.../java/org/usergrid/persistence/Entity.java | 16 +-
.../org/usergrid/persistence/EntityFactory.java | 4 +-
.../org/usergrid/persistence/EntityManager.java | 8 +-
.../org/usergrid/persistence/Identifier.java | 11 +-
.../java/org/usergrid/persistence/Query.java | 44 +----
.../org/usergrid/persistence/QueryUtils.java | 4 +-
.../usergrid/persistence/RelationManager.java | 4 +-
.../java/org/usergrid/persistence/Results.java | 19 +-
.../java/org/usergrid/persistence/Schema.java | 176 ++++++-------------
.../persistence/SimpleCollectionRef.java | 4 +-
.../org/usergrid/persistence/SimpleRoleRef.java | 4 +-
.../java/org/usergrid/persistence/Update.java | 2 +-
.../persistence/cassandra/ApplicationCF.java | 4 +-
.../usergrid/persistence/cassandra/CFEnum.java | 4 +-
.../cassandra/CassandraPersistenceUtils.java | 46 ++---
.../persistence/cassandra/CassandraService.java | 72 ++------
.../cassandra/ConnectedEntityRefImpl.java | 4 +-
.../cassandra/ConnectionRefImpl.java | 25 ++-
.../persistence/cassandra/CounterUtils.java | 33 ++--
.../persistence/cassandra/CursorCache.java | 1 -
.../cassandra/EntityManagerFactoryImpl.java | 55 ++----
.../cassandra/EntityManagerImpl.java | 149 +++-------------
.../cassandra/EntityValueSerializer.java | 6 +-
.../persistence/cassandra/GeoIndexManager.java | 22 +--
.../persistence/cassandra/IndexUpdate.java | 23 +--
.../persistence/cassandra/QueryProcessor.java | 47 +----
.../cassandra/RelationManagerImpl.java | 115 +++---------
.../usergrid/persistence/cassandra/Setup.java | 19 +-
.../cassandra/SimpleIndexBucketLocatorImpl.java | 4 +-
.../cassandra/index/ConnectedIndexScanner.java | 14 +-
.../cassandra/index/IndexBucketScanner.java | 16 +-
.../index/IndexMultiBucketSetLoader.java | 16 +-
.../cassandra/index/IndexScanner.java | 4 +-
.../cassandra/index/NoOpIndexScanner.java | 4 +-
.../cassandra/util/Slf4jTraceTagReporter.java | 4 +-
.../persistence/cassandra/util/TimedOpTag.java | 5 +-
.../cassandra/util/TraceTagAspect.java | 4 +-
.../cassandra/util/TraceTagManager.java | 5 +-
.../usergrid/persistence/entities/Activity.java | 12 +-
.../persistence/entities/Application.java | 13 +-
.../usergrid/persistence/entities/Asset.java | 9 +-
.../usergrid/persistence/entities/Device.java | 9 +-
.../usergrid/persistence/entities/Event.java | 13 +-
.../usergrid/persistence/entities/Folder.java | 9 +-
.../usergrid/persistence/entities/Group.java | 13 +-
.../usergrid/persistence/entities/JobStat.java | 11 +-
.../usergrid/persistence/entities/Message.java | 9 +-
.../org/usergrid/persistence/entities/Role.java | 11 +-
.../org/usergrid/persistence/entities/User.java | 13 +-
.../persistence/geo/CollectionGeoSearch.java | 11 +-
.../persistence/geo/ConnectionGeoSearch.java | 11 +-
.../persistence/geo/EntityLocationRef.java | 5 +-
.../EntityLocationRefDistanceComparator.java | 4 +-
.../persistence/geo/GeoIndexSearcher.java | 41 ++---
.../persistence/geo/GeocellManager.java | 8 +-
.../usergrid/persistence/geo/GeocellUtils.java | 12 +-
.../geo/comparator/DoubleTupleComparator.java | 4 +-
.../persistence/query/ir/OrderByNode.java | 4 +-
.../persistence/query/ir/QuerySlice.java | 7 +-
.../persistence/query/ir/SearchVisitor.java | 14 +-
.../persistence/query/ir/SliceNode.java | 4 +-
.../query/ir/result/AbstractScanColumn.java | 8 +-
.../ir/result/ConnectionIndexSliceParser.java | 7 +-
.../query/ir/result/ConnectionRefLoader.java | 8 +-
.../ir/result/ConnectionTypesIterator.java | 13 +-
.../query/ir/result/EmptyIterator.java | 4 +-
.../query/ir/result/EntityRefLoader.java | 6 +-
.../query/ir/result/EntityResultsLoader.java | 4 +-
.../query/ir/result/GeoIterator.java | 24 +--
.../persistence/query/ir/result/IDLoader.java | 4 +-
.../query/ir/result/IntersectionIterator.java | 7 +-
.../query/ir/result/OrderByIterator.java | 20 +--
.../query/ir/result/ResultIterator.java | 4 +-
.../query/ir/result/ResultsLoader.java | 4 +-
.../ir/result/SecondaryIndexSliceParser.java | 4 +-
.../query/ir/result/SliceIterator.java | 11 +-
.../query/ir/result/StaticIdIterator.java | 4 +-
.../query/ir/result/SubtractionIterator.java | 7 +-
.../query/ir/result/UUIDIndexSliceParser.java | 4 +-
.../query/ir/result/UnionIterator.java | 14 +-
.../persistence/query/tree/BooleanOperand.java | 5 -
.../persistence/query/tree/ContainsOperand.java | 16 --
.../persistence/query/tree/EqualityOperand.java | 4 -
.../persistence/query/tree/UUIDLiteral.java | 4 +-
.../persistence/schema/CollectionInfo.java | 6 +-
.../persistence/schema/DictionaryInfo.java | 1 -
.../usergrid/persistence/schema/EntityInfo.java | 20 +--
.../usergrid/system/UsergridSystemMonitor.java | 7 +-
.../main/java/org/usergrid/utils/AESUtils.java | 9 +-
.../java/org/usergrid/utils/CodecUtils.java | 4 +-
.../java/org/usergrid/utils/CompositeUtils.java | 6 +-
.../org/usergrid/utils/ConversionUtils.java | 16 +-
.../main/java/org/usergrid/utils/HttpUtils.java | 6 +-
.../java/org/usergrid/utils/IndexUtils.java | 29 ++-
.../main/java/org/usergrid/utils/JsonUtils.java | 22 +--
.../main/java/org/usergrid/utils/ListUtils.java | 9 +-
.../main/java/org/usergrid/utils/MailUtils.java | 18 +-
.../main/java/org/usergrid/utils/MapUtils.java | 12 +-
.../java/org/usergrid/utils/StringUtils.java | 5 +-
.../main/java/org/usergrid/utils/UUIDUtils.java | 18 +-
.../main/java/org/usergrid/utils/Version.java | 4 +-
.../src/test/java/org/usergrid/Application.java | 6 +-
.../org/usergrid/ConcurrentCoreITSuite.java | 10 +-
.../usergrid/ConcurrentCoreIteratorITSuite.java | 30 +---
.../org/usergrid/ConcurrentCoreTestSuite.java | 6 +-
.../test/java/org/usergrid/CoreApplication.java | 8 +-
.../src/test/java/org/usergrid/CoreITSetup.java | 4 +-
.../test/java/org/usergrid/CoreITSetupImpl.java | 4 +-
.../src/test/java/org/usergrid/CoreITSuite.java | 10 +-
.../test/java/org/usergrid/CoreTestSuite.java | 6 +-
.../java/org/usergrid/batch/AppArgsTest.java | 3 +-
.../batch/BulkJobExecutionUnitTest.java | 4 +-
.../java/org/usergrid/batch/BulkTestUtils.java | 6 +-
.../batch/ConcurrentSchedulerITSuite.java | 9 +-
.../batch/ConcurrentSchedulerTestSuite.java | 5 +-
.../org/usergrid/batch/SchedulerITSuite.java | 9 +-
.../org/usergrid/batch/SchedulerTestSuite.java | 5 +-
.../usergrid/batch/UsergridJobFactoryTest.java | 6 +-
.../batch/job/AbstractSchedulerRuntimeIT.java | 8 +-
.../usergrid/batch/job/CountdownLatchJob.java | 6 +-
.../org/usergrid/batch/job/DelayExecution.java | 6 +-
.../org/usergrid/batch/job/DelayHeartbeat.java | 6 +-
.../batch/job/FailureJobExceuction.java | 6 +-
.../usergrid/batch/job/OnlyOnceExceution.java | 6 +-
.../job/OnlyOnceUnlockOnFailExceution.java | 6 +-
.../usergrid/batch/job/SchedulerRuntime1IT.java | 10 +-
.../usergrid/batch/job/SchedulerRuntime2IT.java | 10 +-
.../usergrid/batch/job/SchedulerRuntime3IT.java | 3 +-
.../usergrid/batch/job/SchedulerRuntime4IT.java | 3 +-
.../usergrid/batch/job/SchedulerRuntime5IT.java | 3 +-
.../usergrid/batch/job/SchedulerRuntime6IT.java | 10 +-
.../usergrid/batch/job/SchedulerRuntime7IT.java | 3 +-
.../usergrid/batch/job/SchedulerRuntime8IT.java | 5 +-
.../org/usergrid/batch/job/TestJobListener.java | 4 +-
.../usergrid/batch/job/TestJobListenerTest.java | 7 +-
.../clustering/hazelcast/HazelcastTest.java | 13 +-
.../count/BatchCountParallelismTest.java | 21 +--
.../org/usergrid/count/SimpleBatcherTest.java | 1 -
.../locking/cassandra/HectorLockManagerIT.java | 12 +-
.../SingleNodeLockTestSingleNode.java | 11 +-
.../zookeeper/AbstractZooKeeperTest.java | 9 +-
.../org/usergrid/locking/zookeeper/ZooPut.java | 13 +-
.../zookeeper/ZookeeperLockManagerTest.java | 17 +-
.../test/java/org/usergrid/mq/MessagesIT.java | 13 +-
.../org/usergrid/persistence/CollectionIT.java | 15 +-
.../usergrid/persistence/CoreSchemaManager.java | 3 +-
.../org/usergrid/persistence/CounterIT.java | 11 +-
.../persistence/EntityConnectionsIT.java | 13 +-
.../persistence/EntityDictionaryIT.java | 12 +-
.../usergrid/persistence/EntityManagerIT.java | 23 +--
.../org/usergrid/persistence/EntityTest.java | 8 +-
.../java/org/usergrid/persistence/GeoIT.java | 9 +-
.../java/org/usergrid/persistence/IndexIT.java | 19 +-
.../org/usergrid/persistence/PathQueryIT.java | 10 +-
.../org/usergrid/persistence/PermissionsIT.java | 12 +-
.../org/usergrid/persistence/QueryTest.java | 27 +--
.../usergrid/persistence/QueryUtilsTest.java | 6 +-
.../org/usergrid/persistence/SchemaTest.java | 5 +-
.../cassandra/EntityManagerFactoryImplIT.java | 19 +-
.../cassandra/QueryProcessorTest.java | 20 +--
.../SimpleIndexBucketLocatorImplTest.java | 15 +-
.../persistence/entities/SampleEntity.java | 9 +-
...EntityLocationRefDistanceComparatorTest.java | 4 +-
.../query/AbstractIteratingQueryIT.java | 11 +-
.../query/IntersectionUnionPagingIT.java | 8 +-
.../query/ir/result/InOrderIterator.java | 11 +-
.../ir/result/IntersectionIteratorTest.java | 12 +-
.../ir/result/SubtractionIteratorTest.java | 10 +-
.../query/ir/result/UnionIteratorTest.java | 11 +-
.../persistence/query/tree/GrammarTreeTest.java | 14 +-
.../system/UsergridSystemMonitorIT.java | 5 +-
.../org/usergrid/utils/ConversionUtilsTest.java | 4 +-
.../java/org/usergrid/utils/IndexUtilsTest.java | 11 +-
.../java/org/usergrid/utils/JsonUtilsTest.java | 10 +-
.../java/org/usergrid/utils/ListUtilsTest.java | 6 +-
.../java/org/usergrid/utils/MailUtilsTest.java | 9 +-
.../java/org/usergrid/utils/MapUtilsTest.java | 4 +-
.../java/org/usergrid/utils/UUIDUtilsTest.java | 24 +--
.../main/java/org/usergrid/launcher/App.java | 20 +--
.../java/org/usergrid/launcher/AppleUtils.java | 3 +-
.../launcher/ClasspathStaticHttpHandler.java | 9 +-
.../launcher/CustomJSPTemplateProcessor.java | 2 +-
.../org/usergrid/launcher/LauncherFrame.java | 36 +---
.../org/usergrid/launcher/LogViewerFrame.java | 13 +-
.../main/java/org/usergrid/launcher/Server.java | 1 +
.../org/usergrid/mongo/MongoChannelHandler.java | 9 +-
.../org/usergrid/mongo/MongoMessageDecoder.java | 10 +-
.../java/org/usergrid/mongo/MongoServer.java | 15 +-
.../mongo/MongoServerPipelineFactory.java | 3 +-
.../usergrid/mongo/commands/ListDatabases.java | 10 +-
.../usergrid/mongo/commands/MongoCommand.java | 4 +-
.../org/usergrid/mongo/commands/Whatsmyuri.java | 4 +-
.../org/usergrid/mongo/protocol/Message.java | 12 +-
.../org/usergrid/mongo/protocol/OpDelete.java | 16 +-
.../org/usergrid/mongo/protocol/OpGetMore.java | 6 +-
.../org/usergrid/mongo/protocol/OpInsert.java | 12 +-
.../usergrid/mongo/protocol/OpKillCursors.java | 4 +-
.../java/org/usergrid/mongo/protocol/OpMsg.java | 4 +-
.../org/usergrid/mongo/protocol/OpQuery.java | 28 ++-
.../org/usergrid/mongo/protocol/OpReply.java | 12 +-
.../org/usergrid/mongo/protocol/OpUpdate.java | 14 +-
.../usergrid/mongo/query/MongoQueryParser.java | 29 ++-
.../testproxy/MongoProxyInboundHandler.java | 15 +-
.../mongo/testproxy/MongoProxyServer.java | 10 +-
.../org/usergrid/mongo/AbstractMongoTest.java | 13 +-
.../java/org/usergrid/mongo/BasicMongoTest.java | 32 +---
.../org/usergrid/mongo/DatabaseInitializer.java | 6 +-
.../java/org/usergrid/mongo/MongoQueryTest.java | 20 +--
stack/pom.xml | 2 +-
.../query/validator/ApiServerRunner.java | 5 +-
.../usergrid/query/validator/QueryRunner.java | 3 +-
.../query/validator/QueryValidationTest.java | 2 +-
.../usergrid/rest/AbstractContextResource.java | 25 +--
.../java/org/usergrid/rest/ApiResponse.java | 17 +-
.../rest/JacksonCustomMapperProvider.java | 10 +-
.../java/org/usergrid/rest/RootResource.java | 73 ++++----
.../java/org/usergrid/rest/SwaggerServlet.java | 27 +--
.../java/org/usergrid/rest/SystemResource.java | 15 +-
.../org/usergrid/rest/TextToJsonSwapWriter.java | 23 +--
.../rest/applications/ApplicationResource.java | 47 ++---
.../rest/applications/AuthResource.java | 29 +--
.../rest/applications/ServiceResource.java | 64 ++-----
.../applications/assets/AssetsResource.java | 32 +---
.../applications/events/EventsResource.java | 17 +-
.../rest/applications/queues/QueueResource.java | 32 ++--
.../queues/QueueSubscriberResource.java | 30 +---
.../queues/QueueSubscriptionResource.java | 30 +---
.../queues/QueueTransactionsResource.java | 20 +--
.../rest/applications/users/UserResource.java | 48 ++---
.../rest/applications/users/UsersResource.java | 41 ++---
.../exceptions/AbstractExceptionMapper.java | 9 +-
.../AuthorizationExceptionMapper.java | 4 +-
...cateUniquePropertyExistsExceptionMapper.java | 4 +-
.../EntityNotFoundExceptionMapper.java | 4 +-
...orbiddenServiceOperationExceptionMapper.java | 4 +-
.../exceptions/JsonReadExceptionMapper.java | 4 +-
.../exceptions/JsonWriteExceptionMapper.java | 4 +-
.../exceptions/ManagementExceptionMapper.java | 4 +-
.../NotImplementedExceptionMapper.java | 4 +-
.../exceptions/OAuthProblemExceptionMapper.java | 8 +-
...rganizationApplicationNotFoundException.java | 4 +-
.../exceptions/PersistenceExceptionMapper.java | 4 +-
.../exceptions/QueryParseExceptionMapper.java | 5 +-
.../exceptions/QueryTokenExceptionMapper.java | 7 +-
.../RecentlyUsedPasswordExceptionMapper.java | 4 +-
...RequiredPropertyNotFoundExceptionMapper.java | 4 +-
.../rest/exceptions/SecurityException.java | 3 +-
.../rest/exceptions/ServiceExceptionMapper.java | 4 +-
.../ServiceResourceNotFoundExceptionMapper.java | 6 +-
.../TransactionNotFoundExceptionMapper.java | 4 +-
.../rest/filters/ContentTypeFilter.java | 30 +---
.../rest/filters/JSONPCallbackFilter.java | 9 +-
.../usergrid/rest/filters/MeteringFilter.java | 36 ++--
.../usergrid/rest/filters/TracingFilter.java | 13 +-
.../rest/management/ManagementResource.java | 48 ++---
.../management/metrics/MetricsResource.java | 13 +-
.../organizations/OrganizationResource.java | 23 +--
.../organizations/OrganizationsResource.java | 31 ++--
.../applications/ApplicationResource.java | 28 +--
.../applications/ApplicationsResource.java | 33 ++--
.../organizations/users/UsersResource.java | 39 ++--
.../rest/management/users/UserResource.java | 31 ++--
.../rest/management/users/UsersResource.java | 38 ++--
.../organizations/OrganizationsResource.java | 33 ++--
.../organizations/OrganizationResource.java | 33 ++--
.../rest/security/CrossOriginRequestFilter.java | 7 +-
.../security/SecuredResourceFilterFactory.java | 29 ++-
.../security/shiro/RestSecurityManager.java | 9 +-
.../ShiroAuthenticationExceptionMapper.java | 11 +-
.../shiro/filters/BasicAuthSecurityFilter.java | 13 +-
.../ClientCredentialsSecurityFilter.java | 10 +-
.../OAuth2AccessTokenSecurityFilter.java | 27 ++-
.../security/shiro/filters/SecurityFilter.java | 23 ++-
.../session/HttpRequestSessionManager.java | 6 +-
.../session/HttpServletRequestSession.java | 11 +-
.../usergrid/rest/test/PropertiesResource.java | 21 ++-
.../java/org/usergrid/rest/utils/CORSUtils.java | 7 +-
.../org/usergrid/rest/utils/JSONPUtils.java | 19 +-
.../org/usergrid/rest/utils/PathingUtils.java | 2 +-
.../java/org/usergrid/rest/AbstractRestIT.java | 36 ++--
.../test/java/org/usergrid/rest/BasicIT.java | 16 +-
.../usergrid/rest/ConcurrentRestITSuite.java | 7 +-
.../org/usergrid/rest/DatabaseInitializer.java | 6 +-
.../test/java/org/usergrid/rest/ITSetup.java | 9 +-
.../java/org/usergrid/rest/RestITSuite.java | 7 +-
.../org/usergrid/rest/TestContextSetup.java | 3 +-
.../java/org/usergrid/rest/TomcatResource.java | 10 +-
.../ApplicationRequestCounterIT.java | 13 +-
.../applications/ApplicationResourceIT.java | 21 +--
.../rest/applications/DevicesResourceIT.java | 13 +-
.../applications/assets/AssetResourceIT.java | 17 +-
.../collection/BadGrammarQueryTest.java | 9 +-
.../collection/BrowserCompatibilityTest.java | 6 +-
.../collection/PagingResourceIT.java | 13 +-
.../collection/activities/AndOrQueryTest.java | 13 +-
.../collection/activities/OrderByTest.java | 10 +-
.../activities/PagingEntitiesTest.java | 7 +-
.../collection/activities/PutTest.java | 6 +-
.../collection/groups/GeoPagingTest.java | 6 +-
.../collection/groups/UpdateGroupIT.java | 20 +--
.../applications/events/EventsResourceIT.java | 9 +-
.../queues/AbstractQueueResourceIT.java | 20 +--
.../queues/QueueResourceLong1IT.java | 9 +-
.../queues/QueueResourceLong2IT.java | 15 +-
.../queues/QueueResourceLong3IT.java | 14 +-
.../queues/QueueResourceShortIT.java | 23 ++-
.../users/CollectionsResourceIT.java | 16 +-
.../users/ConnectionResourceTest.java | 15 +-
.../applications/users/GroupResourceIT.java | 12 +-
.../applications/users/OwnershipResourceIT.java | 6 +-
.../users/PermissionsResourceIT.java | 21 +--
.../applications/users/RetrieveUsersTest.java | 6 +-
.../rest/applications/users/UserResourceIT.java | 22 +--
.../users/extensions/TestResource.java | 8 +-
.../rest/applications/utils/TestUtils.java | 4 +-
.../rest/applications/utils/UserRepo.java | 12 +-
.../rest/filters/ContentTypeResourceIT.java | 37 ++--
.../rest/management/ManagementResourceIT.java | 22 +--
.../rest/management/RegistrationIT.java | 50 ++----
.../organizations/OrganizationResourceIT.java | 10 +-
.../organizations/OrganizationsResourceIT.java | 34 ++--
.../rest/management/users/MUUserResourceIT.java | 45 ++---
.../UsersOrganizationsResourceIT.java | 7 +-
.../rest/test/PropertiesResourceIT.java | 9 +-
.../usergrid/rest/test/resource/Connection.java | 4 +-
.../rest/test/resource/EntityResource.java | 9 +-
.../rest/test/resource/NamedResource.java | 12 +-
.../rest/test/resource/SetResource.java | 4 +-
.../rest/test/resource/TestContext.java | 5 +-
.../rest/test/resource/ValueResource.java | 7 +-
.../rest/test/resource/app/Application.java | 4 +-
.../usergrid/rest/test/resource/app/Device.java | 4 +-
.../usergrid/rest/test/resource/app/User.java | 4 +-
.../rest/test/resource/app/UsersCollection.java | 6 +-
.../rest/test/resource/app/queue/Queue.java | 7 +-
.../test/resource/app/queue/Transaction.java | 3 +-
.../rest/test/resource/mgmt/Application.java | 4 +-
.../resource/mgmt/ApplicationsCollection.java | 4 +-
.../rest/test/resource/mgmt/Management.java | 7 +-
.../rest/test/resource/mgmt/Organization.java | 4 +-
.../resource/mgmt/OrganizationsCollection.java | 4 +-
.../usergrid/rest/test/security/TestUser.java | 4 +-
.../usergrid/management/ActivationState.java | 2 +-
.../usergrid/management/ApplicationInfo.java | 6 +-
.../usergrid/management/ManagementService.java | 9 +-
.../usergrid/management/OrganizationInfo.java | 6 +-
.../java/org/usergrid/management/UserInfo.java | 15 +-
.../cassandra/AccountCreationPropsImpl.java | 7 +-
.../cassandra/ApplicationCreatorImpl.java | 7 +-
.../cassandra/ManagementServiceImpl.java | 140 +++------------
.../usergrid/security/AuthPrincipalType.java | 6 +-
.../security/crypto/EncryptionService.java | 4 +-
.../security/crypto/EncryptionServiceImpl.java | 15 +-
.../security/crypto/command/BcryptCommand.java | 6 +-
.../crypto/command/EncryptionCommand.java | 4 +-
.../security/crypto/command/Md5HashCommand.java | 5 +-
.../crypto/command/PlainTextCommand.java | 4 +-
.../crypto/command/SaltedHasherCommand.java | 6 +-
.../crypto/command/Sha1HashCommand.java | 6 +-
.../org/usergrid/security/oauth/AccessInfo.java | 9 +-
.../security/oauth/ClientCredentialsInfo.java | 4 +-
.../security/providers/AbstractProvider.java | 9 +-
.../security/providers/FacebookProvider.java | 9 +-
.../security/providers/FoursquareProvider.java | 22 ++-
.../providers/PingIdentityProvider.java | 15 +-
.../security/providers/SignInAsProvider.java | 4 +-
.../security/shiro/CustomPermission.java | 16 +-
.../shiro/PrincipalCredentialsToken.java | 19 +-
.../java/org/usergrid/security/shiro/Realm.java | 72 +++-----
.../principals/ApplicationGuestPrincipal.java | 4 +-
.../shiro/principals/ApplicationPrincipal.java | 4 +-
.../principals/ApplicationUserPrincipal.java | 4 +-
.../shiro/principals/OrganizationPrincipal.java | 4 +-
.../shiro/principals/UserPrincipal.java | 4 +-
.../security/shiro/utils/SubjectUtils.java | 29 ++-
.../org/usergrid/security/tokens/TokenInfo.java | 4 +-
.../usergrid/security/tokens/TokenService.java | 4 +-
.../tokens/cassandra/TokenServiceImpl.java | 61 +++----
.../services/AbstractCollectionService.java | 14 +-
.../services/AbstractConnectionsService.java | 16 +-
.../AbstractPathBasedColllectionService.java | 10 +-
.../org/usergrid/services/AbstractService.java | 20 +--
.../java/org/usergrid/services/Service.java | 4 +-
.../org/usergrid/services/ServiceAction.java | 2 +-
.../org/usergrid/services/ServiceContext.java | 8 +-
.../java/org/usergrid/services/ServiceInfo.java | 19 +-
.../org/usergrid/services/ServiceManager.java | 25 +--
.../services/ServiceManagerFactory.java | 8 +-
.../org/usergrid/services/ServiceParameter.java | 15 +-
.../org/usergrid/services/ServicePayload.java | 12 +-
.../org/usergrid/services/ServiceRequest.java | 19 +-
.../org/usergrid/services/ServiceResults.java | 12 +-
.../applications/ApplicationsService.java | 20 +--
.../usergrid/services/assets/AssetsService.java | 4 +-
.../services/assets/data/AssetMimeHandler.java | 18 +-
.../services/assets/data/AssetUtils.java | 16 +-
.../services/assets/data/BinaryStore.java | 4 +-
.../assets/data/LocalFileBinaryStore.java | 7 +-
.../services/assets/data/S3BinaryStore.java | 30 ++--
.../services/devices/DevicesService.java | 4 +-
.../usergrid/services/groups/GroupsService.java | 11 +-
.../groups/activities/ActivitiesService.java | 6 +-
.../users/activities/ActivitiesService.java | 6 +-
.../usergrid/services/roles/RolesService.java | 8 +-
.../services/roles/users/UsersService.java | 4 +-
.../usergrid/services/users/UsersService.java | 22 +--
.../users/activities/ActivitiesService.java | 10 +-
.../services/users/roles/RolesService.java | 4 +-
.../org/usergrid/ConcurrentServiceITSuite.java | 11 +-
.../java/org/usergrid/ServiceApplication.java | 10 +-
.../test/java/org/usergrid/ServiceITSetup.java | 4 +-
.../java/org/usergrid/ServiceITSetupImpl.java | 4 +-
.../test/java/org/usergrid/ServiceITSuite.java | 11 +-
.../org/usergrid/management/EmailFlowIT.java | 48 +----
.../management/ManagementTestHelper.java | 4 +-
.../org/usergrid/management/MockImapClient.java | 13 +-
.../org/usergrid/management/OrganizationIT.java | 15 +-
.../java/org/usergrid/management/RoleIT.java | 9 +-
.../cassandra/ApplicationCreatorIT.java | 8 +-
.../cassandra/ManagementServiceIT.java | 17 +-
.../cassandra/ManagementTestHelperImpl.java | 4 +-
.../usergrid/security/CustomResolverTest.java | 19 +-
.../crypto/EncryptionServiceImplTest.java | 8 +-
.../crypto/command/BcryptCommandTest.java | 11 +-
.../crypto/command/Md5HashCommandTest.java | 5 +-
.../crypto/command/Sha1HashCommandTest.java | 6 +-
.../security/providers/FacebookProviderIT.java | 12 +-
.../providers/PingIdentityProviderIT.java | 12 +-
.../security/tokens/TokenServiceIT.java | 11 +-
.../usergrid/services/CollectionServiceIT.java | 4 +-
.../usergrid/services/ConnectionsServiceIT.java | 8 +-
.../org/usergrid/services/RolesServiceIT.java | 14 +-
.../org/usergrid/services/ServiceFactoryIT.java | 5 +-
.../org/usergrid/services/ServiceInfoTest.java | 4 +-
.../usergrid/services/ServiceInvocationIT.java | 8 +-
.../org/usergrid/services/ServiceRequestIT.java | 8 +-
.../services/assets/data/AssetUtilsTest.java | 4 +-
.../org/usergrid/NoExitSecurityManager.java | 6 +-
.../usergrid/cassandra/AvailablePortFinder.java | 8 +-
.../usergrid/cassandra/CassandraResource.java | 43 ++---
.../usergrid/cassandra/ClearShiroSubject.java | 7 +-
.../cassandra/ConcurrentJunitRunner.java | 15 +-
.../org/usergrid/cassandra/ConcurrentSuite.java | 19 +-
.../cassandra/CassandraResourceTest.java | 4 +-
.../main/java/org/usergrid/tools/ApiDoc.java | 30 ++--
.../main/java/org/usergrid/tools/AppAudit.java | 35 ++--
.../java/org/usergrid/tools/AppNameFix.java | 13 +-
.../src/main/java/org/usergrid/tools/Cli.java | 30 ++--
.../main/java/org/usergrid/tools/Command.java | 7 +-
.../java/org/usergrid/tools/CredExport.java | 11 +-
.../java/org/usergrid/tools/DupAdminRepair.java | 29 +--
.../java/org/usergrid/tools/DupOrgRepair.java | 30 ++--
.../java/org/usergrid/tools/EntityCleanup.java | 26 ++-
.../usergrid/tools/EntityInsertBenchMark.java | 32 ++--
.../org/usergrid/tools/EntityReadBenchMark.java | 41 ++---
.../java/org/usergrid/tools/EntityUpdate.java | 24 +--
.../main/java/org/usergrid/tools/Export.java | 24 +--
.../org/usergrid/tools/ExportDataCreator.java | 4 +-
.../org/usergrid/tools/ExportingToolBase.java | 17 +-
.../main/java/org/usergrid/tools/Import.java | 21 +--
.../main/java/org/usergrid/tools/ImportFB.java | 17 +-
.../java/org/usergrid/tools/IndexRebuild.java | 20 +--
.../main/java/org/usergrid/tools/Metrics.java | 29 ++-
.../org/usergrid/tools/OrganizationExport.java | 20 +--
.../java/org/usergrid/tools/PopulateSample.java | 15 +-
.../java/org/usergrid/tools/ResetSuperUser.java | 17 +-
.../main/java/org/usergrid/tools/SetupDB.java | 5 +-
.../src/main/java/org/usergrid/tools/Test.java | 5 +-
.../main/java/org/usergrid/tools/ToolBase.java | 17 +-
.../org/usergrid/tools/UniqueIndexCleanup.java | 40 ++---
.../java/org/usergrid/tools/UserManager.java | 3 +-
.../org/usergrid/tools/WarehouseExport.java | 57 ++----
.../org/usergrid/tools/WarehouseUpsert.java | 11 +-
.../org/usergrid/tools/apidoc/swagger/Api.java | 4 +-
.../tools/apidoc/swagger/ApiListing.java | 13 +-
.../tools/apidoc/swagger/ApiOperation.java | 4 +-
.../apidoc/swagger/ApiParamAllowableValues.java | 4 +-
.../java/org/usergrid/tools/bean/ExportOrg.java | 4 +-
.../org/usergrid/tools/bean/MetricLine.java | 9 +-
.../org/usergrid/tools/bean/MetricQuery.java | 12 +-
.../websocket/WebSocketChannelHandler.java | 44 +----
.../org/usergrid/websocket/WebSocketServer.java | 13 +-
.../WebSocketServerPipelineFactory.java | 5 +-
.../websocket/WebSocketSslContextFactory.java | 5 +-
.../websocket/SimpleMessageProducer.java | 13 +-
546 files changed, 2647 insertions(+), 5082 deletions(-)
----------------------------------------------------------------------
[06/23] organize imports only
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationGuestPrincipal.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationGuestPrincipal.java b/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationGuestPrincipal.java
index af904de..8585459 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationGuestPrincipal.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationGuestPrincipal.java
@@ -16,10 +16,10 @@
package org.usergrid.security.shiro.principals;
-import java.util.UUID;
-
import org.usergrid.management.ApplicationInfo;
+import java.util.UUID;
+
public class ApplicationGuestPrincipal extends PrincipalIdentifier {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationPrincipal.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationPrincipal.java b/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationPrincipal.java
index 77de19f..1b0ea72 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationPrincipal.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationPrincipal.java
@@ -16,10 +16,10 @@
package org.usergrid.security.shiro.principals;
-import java.util.UUID;
-
import org.usergrid.management.ApplicationInfo;
+import java.util.UUID;
+
public class ApplicationPrincipal extends PrincipalIdentifier {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationUserPrincipal.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationUserPrincipal.java b/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationUserPrincipal.java
index a22e8c7..8ad3e0e 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationUserPrincipal.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/principals/ApplicationUserPrincipal.java
@@ -16,10 +16,10 @@
package org.usergrid.security.shiro.principals;
-import java.util.UUID;
-
import org.usergrid.management.UserInfo;
+import java.util.UUID;
+
public class ApplicationUserPrincipal extends UserPrincipal {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/shiro/principals/OrganizationPrincipal.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/principals/OrganizationPrincipal.java b/stack/services/src/main/java/org/usergrid/security/shiro/principals/OrganizationPrincipal.java
index 6d5b5c7..7953185 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/principals/OrganizationPrincipal.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/principals/OrganizationPrincipal.java
@@ -16,10 +16,10 @@
package org.usergrid.security.shiro.principals;
-import java.util.UUID;
-
import org.usergrid.management.OrganizationInfo;
+import java.util.UUID;
+
public class OrganizationPrincipal extends PrincipalIdentifier {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/shiro/principals/UserPrincipal.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/principals/UserPrincipal.java b/stack/services/src/main/java/org/usergrid/security/shiro/principals/UserPrincipal.java
index 22a8dda..f7fcf86 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/principals/UserPrincipal.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/principals/UserPrincipal.java
@@ -16,10 +16,10 @@
package org.usergrid.security.shiro.principals;
-import java.util.UUID;
-
import org.usergrid.management.UserInfo;
+import java.util.UUID;
+
public abstract class UserPrincipal extends PrincipalIdentifier {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/shiro/utils/SubjectUtils.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/shiro/utils/SubjectUtils.java b/stack/services/src/main/java/org/usergrid/security/shiro/utils/SubjectUtils.java
index de66a05..def615d 100644
--- a/stack/services/src/main/java/org/usergrid/security/shiro/utils/SubjectUtils.java
+++ b/stack/services/src/main/java/org/usergrid/security/shiro/utils/SubjectUtils.java
@@ -16,9 +16,12 @@
package org.usergrid.security.shiro.utils;
-import java.util.Set;
-import java.util.UUID;
-
+import com.google.common.collect.BiMap;
+import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.UnavailableSecurityManagerException;
+import org.apache.shiro.session.Session;
+import org.apache.shiro.subject.Subject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.ApplicationInfo;
@@ -28,20 +31,11 @@ import org.usergrid.persistence.Identifier;
import org.usergrid.security.shiro.PrincipalCredentialsToken;
import org.usergrid.security.shiro.principals.UserPrincipal;
-import org.apache.commons.lang.StringUtils;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.UnavailableSecurityManagerException;
-import org.apache.shiro.session.Session;
-import org.apache.shiro.subject.Subject;
-
-import com.google.common.collect.BiMap;
+import java.util.Set;
+import java.util.UUID;
import static org.apache.commons.lang.StringUtils.isNotBlank;
-import static org.usergrid.security.shiro.Realm.ROLE_ADMIN_USER;
-import static org.usergrid.security.shiro.Realm.ROLE_APPLICATION_ADMIN;
-import static org.usergrid.security.shiro.Realm.ROLE_APPLICATION_USER;
-import static org.usergrid.security.shiro.Realm.ROLE_ORGANIZATION_ADMIN;
-import static org.usergrid.security.shiro.Realm.ROLE_SERVICE_ADMIN;
+import static org.usergrid.security.shiro.Realm.*;
public class SubjectUtils {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/tokens/TokenInfo.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/tokens/TokenInfo.java b/stack/services/src/main/java/org/usergrid/security/tokens/TokenInfo.java
index 1fa7069..109ee0d 100644
--- a/stack/services/src/main/java/org/usergrid/security/tokens/TokenInfo.java
+++ b/stack/services/src/main/java/org/usergrid/security/tokens/TokenInfo.java
@@ -1,11 +1,11 @@
package org.usergrid.security.tokens;
+import org.usergrid.security.AuthPrincipalInfo;
+
import java.util.Map;
import java.util.UUID;
-import org.usergrid.security.AuthPrincipalInfo;
-
public class TokenInfo {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/tokens/TokenService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/tokens/TokenService.java b/stack/services/src/main/java/org/usergrid/security/tokens/TokenService.java
index e1d0e09..0b369c7 100644
--- a/stack/services/src/main/java/org/usergrid/security/tokens/TokenService.java
+++ b/stack/services/src/main/java/org/usergrid/security/tokens/TokenService.java
@@ -1,10 +1,10 @@
package org.usergrid.security.tokens;
-import java.util.Map;
-
import org.usergrid.security.AuthPrincipalInfo;
+import java.util.Map;
+
public interface TokenService {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/security/tokens/cassandra/TokenServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/security/tokens/cassandra/TokenServiceImpl.java b/stack/services/src/main/java/org/usergrid/security/tokens/cassandra/TokenServiceImpl.java
index 7d8fe72..4ce146b 100644
--- a/stack/services/src/main/java/org/usergrid/security/tokens/cassandra/TokenServiceImpl.java
+++ b/stack/services/src/main/java/org/usergrid/security/tokens/cassandra/TokenServiceImpl.java
@@ -1,9 +1,13 @@
package org.usergrid.security.tokens.cassandra;
-import java.nio.ByteBuffer;
-import java.util.*;
-
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import me.prettyprint.cassandra.serializers.LongSerializer;
+import me.prettyprint.cassandra.serializers.StringSerializer;
+import me.prettyprint.cassandra.serializers.UUIDSerializer;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.beans.HColumn;
+import me.prettyprint.hector.api.mutation.Mutator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,16 +27,10 @@ import org.usergrid.security.tokens.exceptions.InvalidTokenException;
import org.usergrid.utils.JsonUtils;
import org.usergrid.utils.UUIDUtils;
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.cassandra.serializers.LongSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.mutation.Mutator;
+import java.nio.ByteBuffer;
+import java.util.*;
import static java.lang.System.currentTimeMillis;
-
import static me.prettyprint.hector.api.factory.HFactory.createColumn;
import static me.prettyprint.hector.api.factory.HFactory.createMutator;
import static org.apache.commons.codec.binary.Base64.decodeBase64;
@@ -41,16 +39,8 @@ import static org.apache.commons.codec.digest.DigestUtils.sha;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.getColumnMap;
import static org.usergrid.persistence.cassandra.CassandraService.PRINCIPAL_TOKEN_CF;
import static org.usergrid.persistence.cassandra.CassandraService.TOKENS_CF;
-import static org.usergrid.security.tokens.TokenCategory.ACCESS;
-import static org.usergrid.security.tokens.TokenCategory.EMAIL;
-import static org.usergrid.security.tokens.TokenCategory.OFFLINE;
-import static org.usergrid.security.tokens.TokenCategory.REFRESH;
-import static org.usergrid.utils.ConversionUtils.HOLDER;
-import static org.usergrid.utils.ConversionUtils.bytebuffer;
-import static org.usergrid.utils.ConversionUtils.bytes;
-import static org.usergrid.utils.ConversionUtils.getLong;
-import static org.usergrid.utils.ConversionUtils.string;
-import static org.usergrid.utils.ConversionUtils.uuid;
+import static org.usergrid.security.tokens.TokenCategory.*;
+import static org.usergrid.utils.ConversionUtils.*;
import static org.usergrid.utils.MapUtils.hasKeys;
import static org.usergrid.utils.MapUtils.hashMap;
import static org.usergrid.utils.UUIDUtils.getTimestampInMillis;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/AbstractCollectionService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/AbstractCollectionService.java b/stack/services/src/main/java/org/usergrid/services/AbstractCollectionService.java
index 7a84653..b89de3d 100644
--- a/stack/services/src/main/java/org/usergrid/services/AbstractCollectionService.java
+++ b/stack/services/src/main/java/org/usergrid/services/AbstractCollectionService.java
@@ -16,25 +16,17 @@
package org.usergrid.services;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.Results.Level;
-import org.usergrid.persistence.Schema;
import org.usergrid.persistence.exceptions.UnexpectedEntityTypeException;
import org.usergrid.services.ServiceResults.Type;
import org.usergrid.services.exceptions.ForbiddenServiceOperationException;
import org.usergrid.services.exceptions.ServiceResourceNotFoundException;
+import java.util.*;
+
import static org.usergrid.utils.ClassUtils.cast;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/AbstractConnectionsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/AbstractConnectionsService.java b/stack/services/src/main/java/org/usergrid/services/AbstractConnectionsService.java
index 5190645..7d42b28 100644
--- a/stack/services/src/main/java/org/usergrid/services/AbstractConnectionsService.java
+++ b/stack/services/src/main/java/org/usergrid/services/AbstractConnectionsService.java
@@ -16,26 +16,20 @@
package org.usergrid.services;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.usergrid.persistence.ConnectionRef;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.Results.Level;
-import org.usergrid.persistence.Schema;
import org.usergrid.services.ServiceParameter.IdParameter;
import org.usergrid.services.ServiceParameter.NameParameter;
import org.usergrid.services.ServiceParameter.QueryParameter;
import org.usergrid.services.ServiceResults.Type;
import org.usergrid.services.exceptions.ServiceResourceNotFoundException;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
import static org.usergrid.services.ServiceParameter.filter;
import static org.usergrid.services.ServiceParameter.firstParameterIsName;
import static org.usergrid.utils.ClassUtils.cast;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/AbstractPathBasedColllectionService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/AbstractPathBasedColllectionService.java b/stack/services/src/main/java/org/usergrid/services/AbstractPathBasedColllectionService.java
index fd58736..f8a90d4 100644
--- a/stack/services/src/main/java/org/usergrid/services/AbstractPathBasedColllectionService.java
+++ b/stack/services/src/main/java/org/usergrid/services/AbstractPathBasedColllectionService.java
@@ -16,11 +16,6 @@
package org.usergrid.services;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.EntityRef;
@@ -31,6 +26,11 @@ import org.usergrid.services.ServiceParameter.NameParameter;
import org.usergrid.services.ServiceParameter.QueryParameter;
import org.usergrid.services.exceptions.ServiceInvocationException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
import static org.usergrid.services.ServiceParameter.filter;
import static org.usergrid.services.ServiceParameter.mergeQueries;
import static org.usergrid.utils.InflectionUtils.pluralize;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/AbstractService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/AbstractService.java b/stack/services/src/main/java/org/usergrid/services/AbstractService.java
index 419d988..3801252 100644
--- a/stack/services/src/main/java/org/usergrid/services/AbstractService.java
+++ b/stack/services/src/main/java/org/usergrid/services/AbstractService.java
@@ -16,23 +16,12 @@
package org.usergrid.services;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
+import org.apache.commons.lang.NotImplementedException;
+import org.apache.shiro.subject.Subject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.Schema;
+import org.usergrid.persistence.*;
import org.usergrid.security.shiro.utils.SubjectUtils;
import org.usergrid.services.ServiceParameter.IdParameter;
import org.usergrid.services.ServiceParameter.NameParameter;
@@ -42,8 +31,7 @@ import org.usergrid.services.exceptions.ServiceInvocationException;
import org.usergrid.services.exceptions.ServiceResourceNotFoundException;
import org.usergrid.services.exceptions.UnsupportedServiceOperationException;
-import org.apache.commons.lang.NotImplementedException;
-import org.apache.shiro.subject.Subject;
+import java.util.*;
import static org.usergrid.security.shiro.utils.SubjectUtils.getPermissionFromPath;
import static org.usergrid.services.ServiceParameter.filter;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/Service.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/Service.java b/stack/services/src/main/java/org/usergrid/services/Service.java
index 75888e7..ff4f77c 100644
--- a/stack/services/src/main/java/org/usergrid/services/Service.java
+++ b/stack/services/src/main/java/org/usergrid/services/Service.java
@@ -16,11 +16,11 @@
package org.usergrid.services;
-import java.util.UUID;
-
import org.usergrid.persistence.Entity;
import org.usergrid.persistence.EntityRef;
+import java.util.UUID;
+
public interface Service {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/ServiceContext.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceContext.java b/stack/services/src/main/java/org/usergrid/services/ServiceContext.java
index f1efd9c..5696dd5 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceContext.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceContext.java
@@ -16,15 +16,15 @@
package org.usergrid.services;
+import org.usergrid.persistence.EntityRef;
+import org.usergrid.persistence.Query;
+import org.usergrid.services.exceptions.ServiceResourceNotFoundException;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.Query;
-import org.usergrid.services.exceptions.ServiceResourceNotFoundException;
-
import static org.usergrid.services.ServiceInfo.normalizeServicePattern;
import static org.usergrid.utils.ListUtils.dequeueCopy;
import static org.usergrid.utils.ListUtils.isEmpty;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/ServiceInfo.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceInfo.java b/stack/services/src/main/java/org/usergrid/services/ServiceInfo.java
index 2765253..f3dc82b 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceInfo.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceInfo.java
@@ -16,29 +16,22 @@
package org.usergrid.services;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-
-import org.usergrid.persistence.Schema;
-
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.google.common.hash.Hasher;
import com.google.common.hash.Hashing;
+import org.usergrid.persistence.Schema;
+
+import java.util.*;
+import java.util.concurrent.ExecutionException;
import static org.apache.commons.lang.StringUtils.capitalize;
import static org.apache.commons.lang.StringUtils.removeEnd;
import static org.apache.commons.lang.StringUtils.split;
import static org.usergrid.utils.InflectionUtils.pluralize;
import static org.usergrid.utils.InflectionUtils.singularize;
-import static org.usergrid.utils.StringUtils.stringOrSubstringAfterLast;
-import static org.usergrid.utils.StringUtils.stringOrSubstringBeforeFirst;
-import static org.usergrid.utils.StringUtils.stringOrSubstringBeforeLast;
+import static org.usergrid.utils.StringUtils.*;
public class ServiceInfo {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/ServiceManager.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceManager.java b/stack/services/src/main/java/org/usergrid/services/ServiceManager.java
index a4778e5..c48e3da 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceManager.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceManager.java
@@ -16,11 +16,10 @@
package org.usergrid.services;
-import java.lang.reflect.Modifier;
-import java.util.*;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
@@ -37,11 +36,10 @@ import org.usergrid.services.applications.ApplicationsService;
import org.usergrid.services.exceptions.UndefinedServiceEntityTypeException;
import org.usergrid.utils.ListUtils;
-import org.apache.commons.lang.StringUtils;
-
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
+import java.lang.reflect.Modifier;
+import java.util.*;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
import static org.usergrid.persistence.SimpleEntityRef.ref;
import static org.usergrid.utils.InflectionUtils.pluralize;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/ServiceManagerFactory.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceManagerFactory.java b/stack/services/src/main/java/org/usergrid/services/ServiceManagerFactory.java
index d1ef31d..e62de49 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceManagerFactory.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceManagerFactory.java
@@ -16,10 +16,6 @@
package org.usergrid.services;
-import java.util.List;
-import java.util.Properties;
-import java.util.UUID;
-
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -30,6 +26,10 @@ import org.usergrid.mq.QueueManagerFactory;
import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.EntityManagerFactory;
+import java.util.List;
+import java.util.Properties;
+import java.util.UUID;
+
public class ServiceManagerFactory implements ApplicationContextAware {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/ServiceParameter.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceParameter.java b/stack/services/src/main/java/org/usergrid/services/ServiceParameter.java
index a5586b5..240f0f5 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceParameter.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceParameter.java
@@ -16,22 +16,19 @@
package org.usergrid.services;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.persistence.Identifier;
+import org.usergrid.persistence.Query;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.Query;
-
import static org.apache.commons.lang.StringUtils.isNotBlank;
-import static org.usergrid.utils.ListUtils.dequeue;
-import static org.usergrid.utils.ListUtils.dequeueCopy;
-import static org.usergrid.utils.ListUtils.isEmpty;
-import static org.usergrid.utils.ListUtils.queue;
+import static org.usergrid.utils.ListUtils.*;
public abstract class ServiceParameter {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/ServicePayload.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServicePayload.java b/stack/services/src/main/java/org/usergrid/services/ServicePayload.java
index 672118d..4147ed3 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServicePayload.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServicePayload.java
@@ -16,17 +16,11 @@
package org.usergrid.services;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.usergrid.utils.JsonUtils;
-
import org.apache.commons.collections.iterators.EmptyIterator;
import org.apache.commons.collections.iterators.SingletonListIterator;
+import org.usergrid.utils.JsonUtils;
+
+import java.util.*;
import static org.usergrid.utils.JsonUtils.normalizeJsonTree;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/ServiceRequest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceRequest.java b/stack/services/src/main/java/org/usergrid/services/ServiceRequest.java
index 083ae22..4a4f8e9 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceRequest.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceRequest.java
@@ -16,12 +16,7 @@
package org.usergrid.services;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
+import org.apache.shiro.SecurityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.EntityRef;
@@ -29,7 +24,11 @@ import org.usergrid.persistence.Query;
import org.usergrid.services.ServiceParameter.QueryParameter;
import org.usergrid.services.ServiceResults.Type;
-import org.apache.shiro.SecurityUtils;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.usergrid.utils.ListUtils.isEmpty;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/ServiceResults.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/ServiceResults.java b/stack/services/src/main/java/org/usergrid/services/ServiceResults.java
index 369a819..a801f6b 100644
--- a/stack/services/src/main/java/org/usergrid/services/ServiceResults.java
+++ b/stack/services/src/main/java/org/usergrid/services/ServiceResults.java
@@ -16,18 +16,14 @@
package org.usergrid.services;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.persistence.*;
+
import java.util.List;
import java.util.Map;
import java.util.UUID;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.persistence.AggregateCounterSet;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-
public class ServiceResults extends Results {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/applications/ApplicationsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/applications/ApplicationsService.java b/stack/services/src/main/java/org/usergrid/services/applications/ApplicationsService.java
index 0f1b433..80bb636 100644
--- a/stack/services/src/main/java/org/usergrid/services/applications/ApplicationsService.java
+++ b/stack/services/src/main/java/org/usergrid/services/applications/ApplicationsService.java
@@ -16,11 +16,7 @@
package org.usergrid.services.applications;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
@@ -34,7 +30,10 @@ import org.usergrid.services.ServicePayload;
import org.usergrid.services.ServiceResults;
import org.usergrid.services.ServiceResults.Type;
-import org.apache.commons.lang.StringUtils;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
import static org.usergrid.services.ServiceResults.genericServiceResults;
import static org.usergrid.services.ServiceResults.simpleServiceResults;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/assets/AssetsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/assets/AssetsService.java b/stack/services/src/main/java/org/usergrid/services/assets/AssetsService.java
index 5581423..1a883cc 100644
--- a/stack/services/src/main/java/org/usergrid/services/assets/AssetsService.java
+++ b/stack/services/src/main/java/org/usergrid/services/assets/AssetsService.java
@@ -16,8 +16,6 @@
package org.usergrid.services.assets;
-import java.util.List;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.EntityRef;
@@ -25,6 +23,8 @@ import org.usergrid.services.AbstractPathBasedColllectionService;
import org.usergrid.services.ServiceContext;
import org.usergrid.services.ServiceResults;
+import java.util.List;
+
public class AssetsService extends AbstractPathBasedColllectionService {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/assets/data/AssetMimeHandler.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/assets/data/AssetMimeHandler.java b/stack/services/src/main/java/org/usergrid/services/assets/data/AssetMimeHandler.java
index 1a0f771..215dd95 100644
--- a/stack/services/src/main/java/org/usergrid/services/assets/data/AssetMimeHandler.java
+++ b/stack/services/src/main/java/org/usergrid/services/assets/data/AssetMimeHandler.java
@@ -1,22 +1,16 @@
package org.usergrid.services.assets.data;
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.persistence.Entity;
-
import org.apache.tika.detect.DefaultDetector;
import org.apache.tika.detect.Detector;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.persistence.Entity;
+
+import java.io.*;
+import java.util.Map;
/** Detect the mime type of an Asset */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/assets/data/AssetUtils.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/assets/data/AssetUtils.java b/stack/services/src/main/java/org/usergrid/services/assets/data/AssetUtils.java
index 44d8e88..69c9a4a 100644
--- a/stack/services/src/main/java/org/usergrid/services/assets/data/AssetUtils.java
+++ b/stack/services/src/main/java/org/usergrid/services/assets/data/AssetUtils.java
@@ -1,20 +1,18 @@
package org.usergrid.services.assets.data;
-import java.text.ParseException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
+import com.google.common.base.Preconditions;
+import org.apache.commons.lang.time.DateUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
import org.usergrid.utils.StringUtils;
-import org.apache.commons.lang.time.DateUtils;
-
-import com.google.common.base.Preconditions;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
public class AssetUtils {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/assets/data/BinaryStore.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/assets/data/BinaryStore.java b/stack/services/src/main/java/org/usergrid/services/assets/data/BinaryStore.java
index fcc3fa1..a8c1211 100644
--- a/stack/services/src/main/java/org/usergrid/services/assets/data/BinaryStore.java
+++ b/stack/services/src/main/java/org/usergrid/services/assets/data/BinaryStore.java
@@ -1,12 +1,12 @@
package org.usergrid.services.assets.data;
+import org.usergrid.persistence.Entity;
+
import java.io.IOException;
import java.io.InputStream;
import java.util.UUID;
-import org.usergrid.persistence.Entity;
-
public interface BinaryStore {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/assets/data/LocalFileBinaryStore.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/assets/data/LocalFileBinaryStore.java b/stack/services/src/main/java/org/usergrid/services/assets/data/LocalFileBinaryStore.java
index 2547ace..9609f62 100644
--- a/stack/services/src/main/java/org/usergrid/services/assets/data/LocalFileBinaryStore.java
+++ b/stack/services/src/main/java/org/usergrid/services/assets/data/LocalFileBinaryStore.java
@@ -1,6 +1,9 @@
package org.usergrid.services.assets.data;
+import org.apache.commons.io.FileUtils;
+import org.usergrid.persistence.Entity;
+
import java.io.BufferedInputStream;
import java.io.File;
import java.io.IOException;
@@ -8,10 +11,6 @@ import java.io.InputStream;
import java.util.Map;
import java.util.UUID;
-import org.usergrid.persistence.Entity;
-
-import org.apache.commons.io.FileUtils;
-
/** A binary store implementation using the local file system */
public class LocalFileBinaryStore implements BinaryStore {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/assets/data/S3BinaryStore.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/assets/data/S3BinaryStore.java b/stack/services/src/main/java/org/usergrid/services/assets/data/S3BinaryStore.java
index f766f2c..a17fc3b 100644
--- a/stack/services/src/main/java/org/usergrid/services/assets/data/S3BinaryStore.java
+++ b/stack/services/src/main/java/org/usergrid/services/assets/data/S3BinaryStore.java
@@ -1,18 +1,12 @@
package org.usergrid.services.assets.data;
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
+import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.inject.Module;
+import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
import org.jclouds.ContextBuilder;
import org.jclouds.blobstore.AsyncBlobStore;
import org.jclouds.blobstore.BlobStore;
@@ -31,13 +25,11 @@ import org.usergrid.persistence.Entity;
import org.usergrid.persistence.EntityManager;
import org.usergrid.persistence.EntityManagerFactory;
-import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.inject.Module;
+import java.io.*;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
public class S3BinaryStore implements BinaryStore {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/devices/DevicesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/devices/DevicesService.java b/stack/services/src/main/java/org/usergrid/services/devices/DevicesService.java
index c4abb62..b3dc34c 100644
--- a/stack/services/src/main/java/org/usergrid/services/devices/DevicesService.java
+++ b/stack/services/src/main/java/org/usergrid/services/devices/DevicesService.java
@@ -16,14 +16,14 @@
package org.usergrid.services.devices;
-import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.services.AbstractCollectionService;
import org.usergrid.services.ServiceContext;
import org.usergrid.services.ServiceResults;
+import java.util.UUID;
+
public class DevicesService extends AbstractCollectionService {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/groups/GroupsService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/groups/GroupsService.java b/stack/services/src/main/java/org/usergrid/services/groups/GroupsService.java
index 83ad9a6..b906d2b 100644
--- a/stack/services/src/main/java/org/usergrid/services/groups/GroupsService.java
+++ b/stack/services/src/main/java/org/usergrid/services/groups/GroupsService.java
@@ -16,12 +16,8 @@
package org.usergrid.services.groups;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
+import com.google.common.base.CharMatcher;
+import com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.EntityRef;
@@ -32,8 +28,7 @@ import org.usergrid.services.ServiceContext;
import org.usergrid.services.ServicePayload;
import org.usergrid.services.ServiceResults;
-import com.google.common.base.CharMatcher;
-import com.google.common.base.Preconditions;
+import java.util.*;
import static org.apache.commons.lang.StringUtils.isBlank;
import static org.usergrid.services.ServiceResults.genericServiceResults;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/groups/activities/ActivitiesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/groups/activities/ActivitiesService.java b/stack/services/src/main/java/org/usergrid/services/groups/activities/ActivitiesService.java
index 25d1019..2c70dc7 100644
--- a/stack/services/src/main/java/org/usergrid/services/groups/activities/ActivitiesService.java
+++ b/stack/services/src/main/java/org/usergrid/services/groups/activities/ActivitiesService.java
@@ -16,9 +16,6 @@
package org.usergrid.services.groups.activities;
-import java.util.List;
-import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
@@ -28,6 +25,9 @@ import org.usergrid.services.ServiceContext;
import org.usergrid.services.ServiceResults;
import org.usergrid.services.generic.GenericCollectionService;
+import java.util.List;
+import java.util.UUID;
+
public class ActivitiesService extends GenericCollectionService {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/groups/users/activities/ActivitiesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/groups/users/activities/ActivitiesService.java b/stack/services/src/main/java/org/usergrid/services/groups/users/activities/ActivitiesService.java
index 35fa6c6..405f412 100644
--- a/stack/services/src/main/java/org/usergrid/services/groups/users/activities/ActivitiesService.java
+++ b/stack/services/src/main/java/org/usergrid/services/groups/users/activities/ActivitiesService.java
@@ -16,9 +16,6 @@
package org.usergrid.services.groups.users.activities;
-import java.util.List;
-import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
@@ -29,6 +26,9 @@ import org.usergrid.services.ServiceContext;
import org.usergrid.services.ServiceResults;
import org.usergrid.services.generic.GenericCollectionService;
+import java.util.List;
+import java.util.UUID;
+
public class ActivitiesService extends GenericCollectionService {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/roles/RolesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/roles/RolesService.java b/stack/services/src/main/java/org/usergrid/services/roles/RolesService.java
index 6e1b91e..e57be7d 100644
--- a/stack/services/src/main/java/org/usergrid/services/roles/RolesService.java
+++ b/stack/services/src/main/java/org/usergrid/services/roles/RolesService.java
@@ -16,10 +16,6 @@
package org.usergrid.services.roles;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.EntityRef;
@@ -31,6 +27,10 @@ import org.usergrid.services.ServiceContext;
import org.usergrid.services.ServicePayload;
import org.usergrid.services.ServiceResults;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import static org.apache.commons.lang.StringUtils.isBlank;
import static org.usergrid.services.ServiceResults.genericServiceResults;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/roles/users/UsersService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/roles/users/UsersService.java b/stack/services/src/main/java/org/usergrid/services/roles/users/UsersService.java
index 4da043c..c57a54c 100644
--- a/stack/services/src/main/java/org/usergrid/services/roles/users/UsersService.java
+++ b/stack/services/src/main/java/org/usergrid/services/roles/users/UsersService.java
@@ -16,8 +16,6 @@
package org.usergrid.services.roles.users;
-import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
@@ -27,6 +25,8 @@ import org.usergrid.services.ServiceContext;
import org.usergrid.services.ServiceResults;
import org.usergrid.services.ServiceResults.Type;
+import java.util.UUID;
+
public class UsersService extends org.usergrid.services.users.UsersService {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/users/UsersService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/users/UsersService.java b/stack/services/src/main/java/org/usergrid/services/users/UsersService.java
index 6248e96..38cf6b1 100644
--- a/stack/services/src/main/java/org/usergrid/services/users/UsersService.java
+++ b/stack/services/src/main/java/org/usergrid/services/users/UsersService.java
@@ -16,31 +16,17 @@
package org.usergrid.services.users;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.management.UserInfo;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.Schema;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.entities.Role;
import org.usergrid.security.shiro.utils.SubjectUtils;
-import org.usergrid.services.AbstractCollectionService;
-import org.usergrid.services.ServiceContext;
-import org.usergrid.services.ServicePayload;
-import org.usergrid.services.ServiceRequest;
-import org.usergrid.services.ServiceResults;
+import org.usergrid.services.*;
import org.usergrid.services.exceptions.ServiceResourceNotFoundException;
+import java.util.*;
+
import static org.apache.commons.codec.digest.DigestUtils.md5Hex;
import static org.apache.commons.lang.StringUtils.isBlank;
import static org.apache.commons.lang.StringUtils.isNotBlank;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/users/activities/ActivitiesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/users/activities/ActivitiesService.java b/stack/services/src/main/java/org/usergrid/services/users/activities/ActivitiesService.java
index 49d4b70..f7baef7 100644
--- a/stack/services/src/main/java/org/usergrid/services/users/activities/ActivitiesService.java
+++ b/stack/services/src/main/java/org/usergrid/services/users/activities/ActivitiesService.java
@@ -16,11 +16,6 @@
package org.usergrid.services.users.activities;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
@@ -34,6 +29,11 @@ import org.usergrid.services.ServicePayload;
import org.usergrid.services.ServiceResults;
import org.usergrid.services.generic.GenericCollectionService;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
public class ActivitiesService extends GenericCollectionService {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/main/java/org/usergrid/services/users/roles/RolesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/usergrid/services/users/roles/RolesService.java b/stack/services/src/main/java/org/usergrid/services/users/roles/RolesService.java
index 58e40f8..3174905 100644
--- a/stack/services/src/main/java/org/usergrid/services/users/roles/RolesService.java
+++ b/stack/services/src/main/java/org/usergrid/services/users/roles/RolesService.java
@@ -16,8 +16,6 @@
package org.usergrid.services.users.roles;
-import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
@@ -27,6 +25,8 @@ import org.usergrid.services.ServiceContext;
import org.usergrid.services.ServiceResults;
import org.usergrid.services.ServiceResults.Type;
+import java.util.UUID;
+
public class RolesService extends org.usergrid.services.roles.RolesService {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/ConcurrentServiceITSuite.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/ConcurrentServiceITSuite.java b/stack/services/src/test/java/org/usergrid/ConcurrentServiceITSuite.java
index b7cd486..be644ee 100644
--- a/stack/services/src/test/java/org/usergrid/ConcurrentServiceITSuite.java
+++ b/stack/services/src/test/java/org/usergrid/ConcurrentServiceITSuite.java
@@ -15,16 +15,7 @@ import org.usergrid.management.cassandra.ManagementServiceIT;
import org.usergrid.security.providers.FacebookProviderIT;
import org.usergrid.security.providers.PingIdentityProviderIT;
import org.usergrid.security.tokens.TokenServiceIT;
-import org.usergrid.services.ActivitiesServiceIT;
-import org.usergrid.services.ApplicationsServiceIT;
-import org.usergrid.services.CollectionServiceIT;
-import org.usergrid.services.ConnectionsServiceIT;
-import org.usergrid.services.GroupServiceIT;
-import org.usergrid.services.RolesServiceIT;
-import org.usergrid.services.ServiceFactoryIT;
-import org.usergrid.services.ServiceInvocationIT;
-import org.usergrid.services.ServiceRequestIT;
-import org.usergrid.services.UsersServiceIT;
+import org.usergrid.services.*;
@RunWith(ConcurrentSuite.class)
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/ServiceApplication.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/ServiceApplication.java b/stack/services/src/test/java/org/usergrid/ServiceApplication.java
index bd70b56..33d3fdd 100644
--- a/stack/services/src/test/java/org/usergrid/ServiceApplication.java
+++ b/stack/services/src/test/java/org/usergrid/ServiceApplication.java
@@ -1,11 +1,6 @@
package org.usergrid;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
import org.junit.runner.Description;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -19,6 +14,11 @@ import org.usergrid.services.ServiceRequest;
import org.usergrid.services.ServiceResults;
import org.usergrid.utils.JsonUtils;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.usergrid.services.ServiceParameter.parameters;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/ServiceITSetup.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/ServiceITSetup.java b/stack/services/src/test/java/org/usergrid/ServiceITSetup.java
index fbfb923..2a41406 100644
--- a/stack/services/src/test/java/org/usergrid/ServiceITSetup.java
+++ b/stack/services/src/test/java/org/usergrid/ServiceITSetup.java
@@ -1,14 +1,14 @@
package org.usergrid;
-import java.util.Properties;
-
import org.usergrid.management.ApplicationCreator;
import org.usergrid.management.ManagementService;
import org.usergrid.security.providers.SignInProviderFactory;
import org.usergrid.security.tokens.TokenService;
import org.usergrid.services.ServiceManagerFactory;
+import java.util.Properties;
+
public interface ServiceITSetup extends CoreITSetup {
ManagementService getMgmtSvc();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/ServiceITSetupImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/ServiceITSetupImpl.java b/stack/services/src/test/java/org/usergrid/ServiceITSetupImpl.java
index cf6068f..1de23ac 100644
--- a/stack/services/src/test/java/org/usergrid/ServiceITSetupImpl.java
+++ b/stack/services/src/test/java/org/usergrid/ServiceITSetupImpl.java
@@ -1,8 +1,6 @@
package org.usergrid;
-import java.util.Properties;
-
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
import org.slf4j.Logger;
@@ -16,6 +14,8 @@ import org.usergrid.security.providers.SignInProviderFactory;
import org.usergrid.security.tokens.TokenService;
import org.usergrid.services.ServiceManagerFactory;
+import java.util.Properties;
+
/** A {@link org.junit.rules.TestRule} that sets up services. */
public class ServiceITSetupImpl extends CoreITSetupImpl implements ServiceITSetup {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/ServiceITSuite.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/ServiceITSuite.java b/stack/services/src/test/java/org/usergrid/ServiceITSuite.java
index b02f6c0..443afdd 100644
--- a/stack/services/src/test/java/org/usergrid/ServiceITSuite.java
+++ b/stack/services/src/test/java/org/usergrid/ServiceITSuite.java
@@ -13,16 +13,7 @@ import org.usergrid.management.cassandra.ApplicationCreatorIT;
import org.usergrid.management.cassandra.ManagementServiceIT;
import org.usergrid.security.providers.FacebookProviderIT;
import org.usergrid.security.providers.PingIdentityProviderIT;
-import org.usergrid.services.ActivitiesServiceIT;
-import org.usergrid.services.ApplicationsServiceIT;
-import org.usergrid.services.CollectionServiceIT;
-import org.usergrid.services.ConnectionsServiceIT;
-import org.usergrid.services.GroupServiceIT;
-import org.usergrid.services.RolesServiceIT;
-import org.usergrid.services.ServiceFactoryIT;
-import org.usergrid.services.ServiceInvocationIT;
-import org.usergrid.services.ServiceRequestIT;
-import org.usergrid.services.UsersServiceIT;
+import org.usergrid.services.*;
@RunWith(Suite.class)
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/management/EmailFlowIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/management/EmailFlowIT.java b/stack/services/src/test/java/org/usergrid/management/EmailFlowIT.java
index 0340f27..a29afa1 100644
--- a/stack/services/src/test/java/org/usergrid/management/EmailFlowIT.java
+++ b/stack/services/src/test/java/org/usergrid/management/EmailFlowIT.java
@@ -16,17 +16,8 @@
package org.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.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.text.StrSubstitutor;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
@@ -45,36 +36,15 @@ import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.persistence.entities.Application;
import org.usergrid.persistence.entities.User;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.text.StrSubstitutor;
+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.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.usergrid.management.AccountCreationProps.PROPERTIES_ADMIN_USERS_REQUIRE_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_ACTIVATED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_PASSWORD_RESET;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ADMIN_USER_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ORGANIZATION_ACTIVATED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_ORGANIZATION_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_SYSADMIN_ADMIN_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_SYSADMIN_ORGANIZATION_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_ACTIVATED;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_PASSWORD_RESET;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_EMAIL_USER_PIN_REQUEST;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_NOTIFY_ADMIN_OF_ACTIVATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_ORGANIZATIONS_REQUIRE_CONFIRMATION;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_APPROVES_ADMIN_USERS;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_APPROVES_ORGANIZATIONS;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_SYSADMIN_EMAIL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_USER_ACTIVATION_URL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_USER_CONFIRMATION_URL;
-import static org.usergrid.management.AccountCreationProps.PROPERTIES_USER_RESETPW_URL;
+import static org.junit.Assert.*;
+import static org.usergrid.management.AccountCreationProps.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/management/ManagementTestHelper.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/management/ManagementTestHelper.java b/stack/services/src/test/java/org/usergrid/management/ManagementTestHelper.java
index 959d04a..a2fc557 100644
--- a/stack/services/src/test/java/org/usergrid/management/ManagementTestHelper.java
+++ b/stack/services/src/test/java/org/usergrid/management/ManagementTestHelper.java
@@ -16,11 +16,11 @@
package org.usergrid.management;
-import java.util.Properties;
-
import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.security.tokens.TokenService;
+import java.util.Properties;
+
public interface ManagementTestHelper {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/management/MockImapClient.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/management/MockImapClient.java b/stack/services/src/test/java/org/usergrid/management/MockImapClient.java
index 0f5effc..017eabe 100644
--- a/stack/services/src/test/java/org/usergrid/management/MockImapClient.java
+++ b/stack/services/src/test/java/org/usergrid/management/MockImapClient.java
@@ -1,18 +1,13 @@
package org.usergrid.management;
-import java.io.IOException;
-import java.util.Properties;
-
-import javax.mail.Folder;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.Store;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.mail.*;
+import java.io.IOException;
+import java.util.Properties;
+
public class MockImapClient {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/management/OrganizationIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/management/OrganizationIT.java b/stack/services/src/test/java/org/usergrid/management/OrganizationIT.java
index 0b5aede..16a200f 100644
--- a/stack/services/src/test/java/org/usergrid/management/OrganizationIT.java
+++ b/stack/services/src/test/java/org/usergrid/management/OrganizationIT.java
@@ -16,11 +16,6 @@
package org.usergrid.management;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
@@ -33,10 +28,12 @@ import org.usergrid.management.cassandra.ManagementServiceImpl;
import org.usergrid.management.exceptions.RecentlyUsedPasswordException;
import org.usergrid.security.AuthPrincipalInfo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/management/RoleIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/management/RoleIT.java b/stack/services/src/test/java/org/usergrid/management/RoleIT.java
index 6bdb93e..d191fe0 100644
--- a/stack/services/src/test/java/org/usergrid/management/RoleIT.java
+++ b/stack/services/src/test/java/org/usergrid/management/RoleIT.java
@@ -16,10 +16,7 @@
package org.usergrid.management;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.UUID;
-
+import org.apache.shiro.subject.Subject;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
@@ -35,7 +32,9 @@ import org.usergrid.persistence.entities.User;
import org.usergrid.security.shiro.PrincipalCredentialsToken;
import org.usergrid.security.shiro.utils.SubjectUtils;
-import org.apache.shiro.subject.Subject;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
import static org.junit.Assert.assertFalse;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/management/cassandra/ApplicationCreatorIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/management/cassandra/ApplicationCreatorIT.java b/stack/services/src/test/java/org/usergrid/management/cassandra/ApplicationCreatorIT.java
index 917e182..0bf0121 100644
--- a/stack/services/src/test/java/org/usergrid/management/cassandra/ApplicationCreatorIT.java
+++ b/stack/services/src/test/java/org/usergrid/management/cassandra/ApplicationCreatorIT.java
@@ -1,8 +1,6 @@
package org.usergrid.management.cassandra;
-import java.util.Set;
-
import org.junit.Rule;
import org.junit.Test;
import org.slf4j.Logger;
@@ -16,9 +14,9 @@ import org.usergrid.cassandra.Concurrent;
import org.usergrid.management.ApplicationInfo;
import org.usergrid.management.OrganizationOwnerInfo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import java.util.Set;
+
+import static org.junit.Assert.*;
/** @author zznate */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementServiceIT.java b/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementServiceIT.java
index a27ebb2..560e920 100644
--- a/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementServiceIT.java
+++ b/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementServiceIT.java
@@ -1,11 +1,6 @@
package org.usergrid.management.cassandra;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -18,6 +13,7 @@ import org.usergrid.ServiceITSuite;
import org.usergrid.cassandra.CassandraResource;
import org.usergrid.cassandra.ClearShiroSubject;
import org.usergrid.cassandra.Concurrent;
+import org.usergrid.count.SimpleBatcher;
import org.usergrid.management.OrganizationInfo;
import org.usergrid.management.UserInfo;
import org.usergrid.persistence.CredentialsInfo;
@@ -32,14 +28,13 @@ import org.usergrid.security.tokens.exceptions.InvalidTokenException;
import org.usergrid.utils.JsonUtils;
import org.usergrid.utils.UUIDUtils;
-import org.usergrid.count.SimpleBatcher;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
import static org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
import static org.usergrid.persistence.Schema.DICTIONARY_CREDENTIALS;
import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementTestHelperImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementTestHelperImpl.java b/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementTestHelperImpl.java
index baa9fc8..961386a 100644
--- a/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementTestHelperImpl.java
+++ b/stack/services/src/test/java/org/usergrid/management/cassandra/ManagementTestHelperImpl.java
@@ -19,8 +19,6 @@ package org.usergrid.management.cassandra;
* Copyright 2010,2011 Ed Anuff and Usergrid, all rights reserved.
******************************************************************************/
-import java.util.Properties;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +28,8 @@ import org.usergrid.management.ManagementTestHelper;
import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.security.tokens.TokenService;
+import java.util.Properties;
+
@Component
public class ManagementTestHelperImpl implements ManagementTestHelper {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/security/CustomResolverTest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/security/CustomResolverTest.java b/stack/services/src/test/java/org/usergrid/security/CustomResolverTest.java
index 4ca7fa5..e9fbac2 100644
--- a/stack/services/src/test/java/org/usergrid/security/CustomResolverTest.java
+++ b/stack/services/src/test/java/org/usergrid/security/CustomResolverTest.java
@@ -16,8 +16,14 @@
package org.usergrid.security;
-import java.util.UUID;
-
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.UnavailableSecurityManagerException;
+import org.apache.shiro.mgt.DefaultSecurityManager;
+import org.apache.shiro.subject.SimplePrincipalCollection;
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.subject.support.SubjectThreadState;
+import org.apache.shiro.util.LifecycleUtils;
+import org.apache.shiro.util.ThreadState;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -29,14 +35,7 @@ import org.usergrid.security.shiro.CustomPermission;
import org.usergrid.security.shiro.principals.ApplicationUserPrincipal;
import org.usergrid.utils.UUIDUtils;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.UnavailableSecurityManagerException;
-import org.apache.shiro.mgt.DefaultSecurityManager;
-import org.apache.shiro.subject.SimplePrincipalCollection;
-import org.apache.shiro.subject.Subject;
-import org.apache.shiro.subject.support.SubjectThreadState;
-import org.apache.shiro.util.LifecycleUtils;
-import org.apache.shiro.util.ThreadState;
+import java.util.UUID;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/security/crypto/EncryptionServiceImplTest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/security/crypto/EncryptionServiceImplTest.java b/stack/services/src/test/java/org/usergrid/security/crypto/EncryptionServiceImplTest.java
index 3707c9d..40fb829 100644
--- a/stack/services/src/test/java/org/usergrid/security/crypto/EncryptionServiceImplTest.java
+++ b/stack/services/src/test/java/org/usergrid/security/crypto/EncryptionServiceImplTest.java
@@ -16,16 +16,16 @@
package org.usergrid.security.crypto;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
import org.junit.Test;
import org.usergrid.persistence.CredentialsInfo;
import org.usergrid.security.crypto.command.EncryptionCommand;
import org.usergrid.security.crypto.command.Md5HashCommand;
import org.usergrid.security.crypto.command.Sha1HashCommand;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/security/crypto/command/BcryptCommandTest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/security/crypto/command/BcryptCommandTest.java b/stack/services/src/test/java/org/usergrid/security/crypto/command/BcryptCommandTest.java
index a7b4dc1..5387f71 100644
--- a/stack/services/src/test/java/org/usergrid/security/crypto/command/BcryptCommandTest.java
+++ b/stack/services/src/test/java/org/usergrid/security/crypto/command/BcryptCommandTest.java
@@ -16,17 +16,16 @@
package org.usergrid.security.crypto.command;
-import java.io.UnsupportedEncodingException;
-import java.util.UUID;
-
-import org.junit.Test;
-import org.usergrid.persistence.CredentialsInfo;
-
import com.yammer.metrics.Metrics;
import com.yammer.metrics.core.MetricPredicate;
import com.yammer.metrics.core.Timer;
import com.yammer.metrics.core.TimerContext;
import com.yammer.metrics.reporting.ConsoleReporter;
+import org.junit.Test;
+import org.usergrid.persistence.CredentialsInfo;
+
+import java.io.UnsupportedEncodingException;
+import java.util.UUID;
import static org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString;
import static org.junit.Assert.assertArrayEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/security/crypto/command/Md5HashCommandTest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/security/crypto/command/Md5HashCommandTest.java b/stack/services/src/test/java/org/usergrid/security/crypto/command/Md5HashCommandTest.java
index ed5966e..2a6b094 100644
--- a/stack/services/src/test/java/org/usergrid/security/crypto/command/Md5HashCommandTest.java
+++ b/stack/services/src/test/java/org/usergrid/security/crypto/command/Md5HashCommandTest.java
@@ -16,12 +16,11 @@
package org.usergrid.security.crypto.command;
-import java.io.UnsupportedEncodingException;
-
+import org.apache.commons.codec.digest.DigestUtils;
import org.junit.Test;
import org.usergrid.persistence.CredentialsInfo;
-import org.apache.commons.codec.digest.DigestUtils;
+import java.io.UnsupportedEncodingException;
import static org.junit.Assert.assertArrayEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/security/crypto/command/Sha1HashCommandTest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/security/crypto/command/Sha1HashCommandTest.java b/stack/services/src/test/java/org/usergrid/security/crypto/command/Sha1HashCommandTest.java
index 2c0b468..28e68be 100644
--- a/stack/services/src/test/java/org/usergrid/security/crypto/command/Sha1HashCommandTest.java
+++ b/stack/services/src/test/java/org/usergrid/security/crypto/command/Sha1HashCommandTest.java
@@ -16,13 +16,13 @@
package org.usergrid.security.crypto.command;
+import org.junit.Test;
+import org.usergrid.persistence.CredentialsInfo;
+
import java.io.UnsupportedEncodingException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import org.junit.Test;
-import org.usergrid.persistence.CredentialsInfo;
-
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/security/providers/FacebookProviderIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/security/providers/FacebookProviderIT.java b/stack/services/src/test/java/org/usergrid/security/providers/FacebookProviderIT.java
index 45e9631..3d3ed34 100644
--- a/stack/services/src/test/java/org/usergrid/security/providers/FacebookProviderIT.java
+++ b/stack/services/src/test/java/org/usergrid/security/providers/FacebookProviderIT.java
@@ -1,14 +1,7 @@
package org.usergrid.security.providers;
-import java.util.Map;
-import java.util.UUID;
-
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.*;
import org.usergrid.ServiceITSetup;
import org.usergrid.ServiceITSetupImpl;
import org.usergrid.ServiceITSuite;
@@ -20,6 +13,9 @@ import org.usergrid.persistence.entities.Application;
import org.usergrid.persistence.entities.User;
import org.usergrid.utils.MapUtils;
+import java.util.Map;
+import java.util.UUID;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/security/providers/PingIdentityProviderIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/security/providers/PingIdentityProviderIT.java b/stack/services/src/test/java/org/usergrid/security/providers/PingIdentityProviderIT.java
index 6aaf993..7eb2327 100644
--- a/stack/services/src/test/java/org/usergrid/security/providers/PingIdentityProviderIT.java
+++ b/stack/services/src/test/java/org/usergrid/security/providers/PingIdentityProviderIT.java
@@ -1,14 +1,7 @@
package org.usergrid.security.providers;
-import java.util.Map;
-import java.util.UUID;
-
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.*;
import org.usergrid.ServiceITSetup;
import org.usergrid.ServiceITSetupImpl;
import org.usergrid.ServiceITSuite;
@@ -20,6 +13,9 @@ import org.usergrid.persistence.entities.Application;
import org.usergrid.persistence.entities.User;
import org.usergrid.utils.MapUtils;
+import java.util.Map;
+import java.util.UUID;
+
import static junit.framework.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/security/tokens/TokenServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/security/tokens/TokenServiceIT.java b/stack/services/src/test/java/org/usergrid/security/tokens/TokenServiceIT.java
index 499f9e2..0d0316b 100644
--- a/stack/services/src/test/java/org/usergrid/security/tokens/TokenServiceIT.java
+++ b/stack/services/src/test/java/org/usergrid/security/tokens/TokenServiceIT.java
@@ -1,9 +1,6 @@
package org.usergrid.security.tokens;
-import java.util.HashMap;
-import java.util.Map;
-
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -28,10 +25,10 @@ import org.usergrid.security.tokens.exceptions.ExpiredTokenException;
import org.usergrid.security.tokens.exceptions.InvalidTokenException;
import org.usergrid.utils.UUIDUtils;
-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 java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/services/CollectionServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/services/CollectionServiceIT.java b/stack/services/src/test/java/org/usergrid/services/CollectionServiceIT.java
index 80e758d..d78a609 100644
--- a/stack/services/src/test/java/org/usergrid/services/CollectionServiceIT.java
+++ b/stack/services/src/test/java/org/usergrid/services/CollectionServiceIT.java
@@ -26,9 +26,7 @@ import org.usergrid.persistence.exceptions.UnexpectedEntityTypeException;
import org.usergrid.persistence.schema.CollectionInfo;
import org.usergrid.services.exceptions.ServiceResourceNotFoundException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.*;
import static org.usergrid.persistence.Schema.TYPE_APPLICATION;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/services/ConnectionsServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/services/ConnectionsServiceIT.java b/stack/services/src/test/java/org/usergrid/services/ConnectionsServiceIT.java
index 5b70c02..720b74b 100644
--- a/stack/services/src/test/java/org/usergrid/services/ConnectionsServiceIT.java
+++ b/stack/services/src/test/java/org/usergrid/services/ConnectionsServiceIT.java
@@ -16,15 +16,13 @@
package org.usergrid.services;
-import java.util.Map;
-
import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.Entity;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import java.util.Map;
+
+import static org.junit.Assert.*;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/services/RolesServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/services/RolesServiceIT.java b/stack/services/src/test/java/org/usergrid/services/RolesServiceIT.java
index 98751e0..2892e19 100644
--- a/stack/services/src/test/java/org/usergrid/services/RolesServiceIT.java
+++ b/stack/services/src/test/java/org/usergrid/services/RolesServiceIT.java
@@ -16,21 +16,17 @@
package org.usergrid.services;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-
import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.persistence.Entity;
import org.usergrid.persistence.Query;
import org.usergrid.persistence.entities.Role;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+import static org.junit.Assert.*;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/services/ServiceFactoryIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/services/ServiceFactoryIT.java b/stack/services/src/test/java/org/usergrid/services/ServiceFactoryIT.java
index 97351bb..c50eaa3 100644
--- a/stack/services/src/test/java/org/usergrid/services/ServiceFactoryIT.java
+++ b/stack/services/src/test/java/org/usergrid/services/ServiceFactoryIT.java
@@ -16,15 +16,14 @@
package org.usergrid.services;
-import java.util.UUID;
-
+import baas.io.simple.SimpleService;
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.cassandra.Concurrent;
-import baas.io.simple.SimpleService;
+import java.util.UUID;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/services/ServiceInfoTest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/services/ServiceInfoTest.java b/stack/services/src/test/java/org/usergrid/services/ServiceInfoTest.java
index 700e499..5255b38 100644
--- a/stack/services/src/test/java/org/usergrid/services/ServiceInfoTest.java
+++ b/stack/services/src/test/java/org/usergrid/services/ServiceInfoTest.java
@@ -16,13 +16,13 @@
package org.usergrid.services;
-import java.util.List;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.utils.JsonUtils;
+import java.util.List;
+
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/services/ServiceInvocationIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/services/ServiceInvocationIT.java b/stack/services/src/test/java/org/usergrid/services/ServiceInvocationIT.java
index e622fbd..95e19c7 100644
--- a/stack/services/src/test/java/org/usergrid/services/ServiceInvocationIT.java
+++ b/stack/services/src/test/java/org/usergrid/services/ServiceInvocationIT.java
@@ -16,18 +16,14 @@
package org.usergrid.services;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
import org.usergrid.persistence.Query;
+import java.util.*;
+
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/services/ServiceRequestIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/services/ServiceRequestIT.java b/stack/services/src/test/java/org/usergrid/services/ServiceRequestIT.java
index 4c51cec..3950766 100644
--- a/stack/services/src/test/java/org/usergrid/services/ServiceRequestIT.java
+++ b/stack/services/src/test/java/org/usergrid/services/ServiceRequestIT.java
@@ -16,12 +16,6 @@
package org.usergrid.services;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
import org.junit.Rule;
import org.junit.Test;
import org.slf4j.Logger;
@@ -32,6 +26,8 @@ import org.usergrid.ServiceITSuite;
import org.usergrid.cassandra.ClearShiroSubject;
import org.usergrid.cassandra.Concurrent;
+import java.util.*;
+
import static org.usergrid.persistence.cassandra.CassandraService.DEFAULT_APPLICATION_ID;
import static org.usergrid.services.ServiceParameter.filter;
import static org.usergrid.services.ServiceParameter.parameters;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/services/src/test/java/org/usergrid/services/assets/data/AssetUtilsTest.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/usergrid/services/assets/data/AssetUtilsTest.java b/stack/services/src/test/java/org/usergrid/services/assets/data/AssetUtilsTest.java
index df0811a..e2e7f48 100644
--- a/stack/services/src/test/java/org/usergrid/services/assets/data/AssetUtilsTest.java
+++ b/stack/services/src/test/java/org/usergrid/services/assets/data/AssetUtilsTest.java
@@ -1,11 +1,11 @@
package org.usergrid.services.assets.data;
-import java.util.UUID;
-
import org.junit.Test;
import org.usergrid.persistence.entities.Asset;
+import java.util.UUID;
+
import static junit.framework.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/test-utils/src/main/java/org/usergrid/NoExitSecurityManager.java
----------------------------------------------------------------------
diff --git a/stack/test-utils/src/main/java/org/usergrid/NoExitSecurityManager.java b/stack/test-utils/src/main/java/org/usergrid/NoExitSecurityManager.java
index 1730bd6..213faaf 100644
--- a/stack/test-utils/src/main/java/org/usergrid/NoExitSecurityManager.java
+++ b/stack/test-utils/src/main/java/org/usergrid/NoExitSecurityManager.java
@@ -1,11 +1,11 @@
package org.usergrid;
-import java.security.Permission;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.security.Permission;
+
/**
* Used to prevent System.exit() calls when testing funky Cassandra exit code and race conditions in the ForkedBooter
[21/23] organize imports only
Posted by sn...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerFactoryImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerFactoryImpl.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerFactoryImpl.java
index 4783452..8f225cc 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerFactoryImpl.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerFactoryImpl.java
@@ -16,8 +16,7 @@
package org.usergrid.mq.cassandra;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.locking.LockManager;
@@ -26,12 +25,7 @@ import org.usergrid.mq.QueueManagerFactory;
import org.usergrid.persistence.cassandra.CassandraService;
import org.usergrid.persistence.cassandra.CounterUtils;
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.cassandra.serializers.BytesArraySerializer;
-import me.prettyprint.cassandra.serializers.DynamicCompositeSerializer;
-import me.prettyprint.cassandra.serializers.LongSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
+import java.util.UUID;
public class QueueManagerFactoryImpl implements QueueManagerFactory {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerImpl.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerImpl.java
index fd18e55..1ef29f4 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerImpl.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/QueueManagerImpl.java
@@ -16,41 +16,27 @@
package org.usergrid.mq.cassandra;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.UUID;
-
+import com.fasterxml.uuid.UUIDComparator;
+import me.prettyprint.cassandra.serializers.*;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
+import me.prettyprint.hector.api.beans.*;
+import me.prettyprint.hector.api.factory.HFactory;
+import me.prettyprint.hector.api.mutation.Mutator;
+import me.prettyprint.hector.api.query.MultigetSliceCounterQuery;
+import me.prettyprint.hector.api.query.QueryResult;
+import me.prettyprint.hector.api.query.SliceCounterQuery;
+import me.prettyprint.hector.api.query.SliceQuery;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.locking.LockManager;
-import org.usergrid.mq.CounterQuery;
-import org.usergrid.mq.Message;
-import org.usergrid.mq.Query;
+import org.usergrid.mq.*;
import org.usergrid.mq.Query.CounterFilterPredicate;
-import org.usergrid.mq.QueryProcessor;
import org.usergrid.mq.QueryProcessor.QuerySlice;
import org.usergrid.mq.Queue;
-import org.usergrid.mq.QueueManager;
-import org.usergrid.mq.QueueQuery;
-import org.usergrid.mq.QueueResults;
-import org.usergrid.mq.QueueSet;
import org.usergrid.mq.QueueSet.QueueInfo;
-import org.usergrid.mq.cassandra.QueueIndexUpdate.QueueIndexEntry;
-import org.usergrid.mq.cassandra.io.ConsumerTransaction;
-import org.usergrid.mq.cassandra.io.EndSearch;
-import org.usergrid.mq.cassandra.io.FilterSearch;
-import org.usergrid.mq.cassandra.io.NoTransactionSearch;
-import org.usergrid.mq.cassandra.io.QueueBounds;
-import org.usergrid.mq.cassandra.io.QueueSearch;
-import org.usergrid.mq.cassandra.io.StartSearch;
+import org.usergrid.mq.cassandra.QueueIndexUpdate.*;
+import org.usergrid.mq.cassandra.io.*;
import org.usergrid.persistence.AggregateCounter;
import org.usergrid.persistence.AggregateCounterSet;
import org.usergrid.persistence.CounterResolution;
@@ -62,62 +48,17 @@ import org.usergrid.persistence.cassandra.CounterUtils.AggregateCounterSelection
import org.usergrid.persistence.exceptions.TransactionNotFoundException;
import org.usergrid.utils.UUIDUtils;
-import com.fasterxml.uuid.UUIDComparator;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.cassandra.serializers.BytesArraySerializer;
-import me.prettyprint.cassandra.serializers.DynamicCompositeSerializer;
-import me.prettyprint.cassandra.serializers.LongSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
-import me.prettyprint.hector.api.beans.ColumnSlice;
-import me.prettyprint.hector.api.beans.CounterRow;
-import me.prettyprint.hector.api.beans.CounterRows;
-import me.prettyprint.hector.api.beans.CounterSlice;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.beans.HCounterColumn;
-import me.prettyprint.hector.api.factory.HFactory;
-import me.prettyprint.hector.api.mutation.Mutator;
-import me.prettyprint.hector.api.query.MultigetSliceCounterQuery;
-import me.prettyprint.hector.api.query.QueryResult;
-import me.prettyprint.hector.api.query.SliceCounterQuery;
-import me.prettyprint.hector.api.query.SliceQuery;
+import java.nio.ByteBuffer;
+import java.util.*;
-import static me.prettyprint.hector.api.factory.HFactory.createColumn;
-import static me.prettyprint.hector.api.factory.HFactory.createCounterSliceQuery;
-import static me.prettyprint.hector.api.factory.HFactory.createMutator;
-import static me.prettyprint.hector.api.factory.HFactory.createSliceQuery;
-import static org.usergrid.mq.Queue.QUEUE_CREATED;
-import static org.usergrid.mq.Queue.QUEUE_MODIFIED;
-import static org.usergrid.mq.Queue.QUEUE_NEWEST;
-import static org.usergrid.mq.Queue.QUEUE_OLDEST;
+import static me.prettyprint.hector.api.factory.HFactory.*;
+import static org.usergrid.mq.Queue.*;
import static org.usergrid.mq.Queue.getQueueId;
-import static org.usergrid.mq.Queue.normalizeQueuePath;
-import static org.usergrid.mq.QueuePosition.CONSUMER;
-import static org.usergrid.mq.QueuePosition.END;
-import static org.usergrid.mq.QueuePosition.LAST;
-import static org.usergrid.mq.QueuePosition.START;
-import static org.usergrid.mq.cassandra.CassandraMQUtils.addMessageToMutator;
-import static org.usergrid.mq.cassandra.CassandraMQUtils.addQueueToMutator;
-import static org.usergrid.mq.cassandra.CassandraMQUtils.deserializeMessage;
-import static org.usergrid.mq.cassandra.CassandraMQUtils.deserializeQueue;
-import static org.usergrid.mq.cassandra.CassandraMQUtils.getQueueShardRowKey;
-import static org.usergrid.mq.cassandra.QueueIndexUpdate.indexValueCode;
-import static org.usergrid.mq.cassandra.QueueIndexUpdate.toIndexableValue;
-import static org.usergrid.mq.cassandra.QueueIndexUpdate.validIndexableValue;
-import static org.usergrid.mq.cassandra.QueueIndexUpdate.validIndexableValueOrJson;
-import static org.usergrid.mq.cassandra.QueuesCF.COUNTERS;
-import static org.usergrid.mq.cassandra.QueuesCF.MESSAGE_PROPERTIES;
-import static org.usergrid.mq.cassandra.QueuesCF.PROPERTY_INDEX;
-import static org.usergrid.mq.cassandra.QueuesCF.PROPERTY_INDEX_ENTRIES;
-import static org.usergrid.mq.cassandra.QueuesCF.QUEUE_DICTIONARIES;
-import static org.usergrid.mq.cassandra.QueuesCF.QUEUE_INBOX;
+import static org.usergrid.mq.QueuePosition.*;
+import static org.usergrid.mq.cassandra.CassandraMQUtils.*;
+import static org.usergrid.mq.cassandra.QueueIndexUpdate.*;
+import static org.usergrid.mq.cassandra.QueuesCF.*;
import static org.usergrid.mq.cassandra.QueuesCF.QUEUE_PROPERTIES;
-import static org.usergrid.mq.cassandra.QueuesCF.QUEUE_SUBSCRIBERS;
-import static org.usergrid.mq.cassandra.QueuesCF.QUEUE_SUBSCRIPTIONS;
import static org.usergrid.persistence.Schema.DICTIONARY_COUNTERS;
import static org.usergrid.persistence.cassandra.ApplicationCF.APPLICATION_AGGREGATE_COUNTERS;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.batchExecute;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/QueuesCF.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/QueuesCF.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/QueuesCF.java
index 96e25e3..b8c8c43 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/QueuesCF.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/QueuesCF.java
@@ -16,11 +16,10 @@
package org.usergrid.mq.cassandra;
-import java.util.List;
-
+import me.prettyprint.hector.api.ddl.ColumnDefinition;
import org.usergrid.persistence.cassandra.CFEnum;
-import me.prettyprint.hector.api.ddl.ColumnDefinition;
+import java.util.List;
import static me.prettyprint.hector.api.ddl.ComparatorType.COUNTERTYPE;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.getIndexMetadata;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/io/AbstractSearch.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/AbstractSearch.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/AbstractSearch.java
index 089d025..efb376d 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/AbstractSearch.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/AbstractSearch.java
@@ -16,24 +16,6 @@
package org.usergrid.mq.cassandra.io;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.mq.Message;
-import org.usergrid.mq.QueueResults;
-import org.usergrid.mq.cassandra.io.NoTransactionSearch.SearchParam;
-import org.usergrid.persistence.exceptions.QueueException;
-import org.usergrid.utils.UUIDUtils;
-
import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
import me.prettyprint.cassandra.serializers.UUIDSerializer;
import me.prettyprint.hector.api.Keyspace;
@@ -44,26 +26,26 @@ import me.prettyprint.hector.api.beans.Rows;
import me.prettyprint.hector.api.factory.HFactory;
import me.prettyprint.hector.api.mutation.Mutator;
import me.prettyprint.hector.api.query.SliceQuery;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.mq.Message;
+import org.usergrid.mq.QueueResults;
+import org.usergrid.mq.cassandra.io.NoTransactionSearch.SearchParam;
+import org.usergrid.persistence.exceptions.QueueException;
+import org.usergrid.utils.UUIDUtils;
+
+import java.nio.ByteBuffer;
+import java.util.*;
-import static me.prettyprint.hector.api.factory.HFactory.createColumn;
-import static me.prettyprint.hector.api.factory.HFactory.createMultigetSliceQuery;
-import static me.prettyprint.hector.api.factory.HFactory.createMutator;
-import static me.prettyprint.hector.api.factory.HFactory.createSliceQuery;
+import static me.prettyprint.hector.api.factory.HFactory.*;
import static org.usergrid.mq.Queue.QUEUE_NEWEST;
import static org.usergrid.mq.Queue.QUEUE_OLDEST;
import static org.usergrid.mq.cassandra.CassandraMQUtils.deserializeMessage;
import static org.usergrid.mq.cassandra.CassandraMQUtils.getQueueShardRowKey;
-import static org.usergrid.mq.cassandra.QueueManagerImpl.ALL_COUNT;
-import static org.usergrid.mq.cassandra.QueueManagerImpl.QUEUE_SHARD_INTERVAL;
-import static org.usergrid.mq.cassandra.QueueManagerImpl.se;
-import static org.usergrid.mq.cassandra.QueuesCF.CONSUMERS;
-import static org.usergrid.mq.cassandra.QueuesCF.MESSAGE_PROPERTIES;
-import static org.usergrid.mq.cassandra.QueuesCF.QUEUE_INBOX;
-import static org.usergrid.mq.cassandra.QueuesCF.QUEUE_PROPERTIES;
+import static org.usergrid.mq.cassandra.QueueManagerImpl.*;
+import static org.usergrid.mq.cassandra.QueuesCF.*;
import static org.usergrid.utils.NumberUtils.roundLong;
-import static org.usergrid.utils.UUIDUtils.MAX_TIME_UUID;
-import static org.usergrid.utils.UUIDUtils.MIN_TIME_UUID;
-import static org.usergrid.utils.UUIDUtils.getTimestampInMillis;
+import static org.usergrid.utils.UUIDUtils.*;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/io/ConsumerTransaction.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/ConsumerTransaction.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/ConsumerTransaction.java
index 6466c47..cd8b0d3 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/ConsumerTransaction.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/ConsumerTransaction.java
@@ -16,13 +16,10 @@
package org.usergrid.mq.cassandra.io;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.beans.HColumn;
+import me.prettyprint.hector.api.mutation.Mutator;
+import me.prettyprint.hector.api.query.SliceQuery;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.locking.Lock;
@@ -36,17 +33,15 @@ import org.usergrid.persistence.exceptions.QueueException;
import org.usergrid.persistence.exceptions.TransactionNotFoundException;
import org.usergrid.utils.UUIDUtils;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.mutation.Mutator;
-import me.prettyprint.hector.api.query.SliceQuery;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
-import static me.prettyprint.hector.api.factory.HFactory.createColumn;
-import static me.prettyprint.hector.api.factory.HFactory.createMutator;
-import static me.prettyprint.hector.api.factory.HFactory.createSliceQuery;
-import static org.usergrid.mq.cassandra.CassandraMQUtils.getConsumerId;
-import static org.usergrid.mq.cassandra.CassandraMQUtils.getQueueClientTransactionKey;
-import static org.usergrid.mq.cassandra.CassandraMQUtils.getQueueId;
+import static me.prettyprint.hector.api.factory.HFactory.*;
+import static org.usergrid.mq.cassandra.CassandraMQUtils.*;
import static org.usergrid.mq.cassandra.QueuesCF.CONSUMER_QUEUE_TIMEOUTS;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/io/EndSearch.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/EndSearch.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/EndSearch.java
index 4ca09aa..caf62f6 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/EndSearch.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/EndSearch.java
@@ -16,11 +16,10 @@
package org.usergrid.mq.cassandra.io;
-import java.util.UUID;
-
+import me.prettyprint.hector.api.Keyspace;
import org.usergrid.mq.QueueQuery;
-import me.prettyprint.hector.api.Keyspace;
+import java.util.UUID;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/io/FilterSearch.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/FilterSearch.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/FilterSearch.java
index 0f629a3..8d43d4f 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/FilterSearch.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/FilterSearch.java
@@ -16,13 +16,11 @@
package org.usergrid.mq.cassandra.io;
-import java.nio.ByteBuffer;
-import java.util.Iterator;
-import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.UUID;
-
+import com.fasterxml.uuid.UUIDComparator;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
+import me.prettyprint.hector.api.beans.DynamicComposite;
+import me.prettyprint.hector.api.beans.HColumn;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.mq.Message;
@@ -31,12 +29,8 @@ import org.usergrid.mq.QueryProcessor.QuerySlice;
import org.usergrid.mq.QueueQuery;
import org.usergrid.mq.QueueResults;
-import com.fasterxml.uuid.UUIDComparator;
-
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.beans.HColumn;
+import java.nio.ByteBuffer;
+import java.util.*;
import static me.prettyprint.hector.api.factory.HFactory.createSliceQuery;
import static org.usergrid.mq.Queue.getQueueId;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/io/NoTransactionSearch.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/NoTransactionSearch.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/NoTransactionSearch.java
index 3ac4f6f..ad06355 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/NoTransactionSearch.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/NoTransactionSearch.java
@@ -16,16 +16,15 @@
package org.usergrid.mq.cassandra.io;
-import java.util.List;
-import java.util.UUID;
-
+import me.prettyprint.hector.api.Keyspace;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.mq.Message;
import org.usergrid.mq.QueueQuery;
import org.usergrid.mq.QueueResults;
-import me.prettyprint.hector.api.Keyspace;
+import java.util.List;
+import java.util.UUID;
import static org.usergrid.mq.cassandra.CassandraMQUtils.getConsumerId;
import static org.usergrid.mq.cassandra.CassandraMQUtils.getQueueId;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/mq/cassandra/io/StartSearch.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/StartSearch.java b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/StartSearch.java
index fbef8dd..e0522ef 100644
--- a/stack/core/src/main/java/org/usergrid/mq/cassandra/io/StartSearch.java
+++ b/stack/core/src/main/java/org/usergrid/mq/cassandra/io/StartSearch.java
@@ -16,11 +16,10 @@
package org.usergrid.mq.cassandra.io;
-import java.util.UUID;
-
+import me.prettyprint.hector.api.Keyspace;
import org.usergrid.mq.QueueQuery;
-import me.prettyprint.hector.api.Keyspace;
+import java.util.UUID;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/AbstractEntity.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/AbstractEntity.java b/stack/core/src/main/java/org/usergrid/persistence/AbstractEntity.java
index 4c7e9c3..f7d3bac 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/AbstractEntity.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/AbstractEntity.java
@@ -16,16 +16,6 @@
package org.usergrid.persistence;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonIgnore;
@@ -33,6 +23,10 @@ import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
import org.usergrid.persistence.annotations.EntityProperty;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.*;
+import java.util.Map.Entry;
+
import static org.usergrid.persistence.Schema.PROPERTY_NAME;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/AggregateCounterSet.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/AggregateCounterSet.java b/stack/core/src/main/java/org/usergrid/persistence/AggregateCounterSet.java
index 44c1d34..1356cfe 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/AggregateCounterSet.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/AggregateCounterSet.java
@@ -16,12 +16,12 @@
package org.usergrid.persistence;
-import java.util.List;
-import java.util.UUID;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import java.util.List;
+import java.util.UUID;
+
public class AggregateCounterSet {
private String name;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/CounterQuery.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/CounterQuery.java b/stack/core/src/main/java/org/usergrid/persistence/CounterQuery.java
index 9c645ce..93711d0 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/CounterQuery.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/CounterQuery.java
@@ -16,20 +16,17 @@
package org.usergrid.persistence;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Query.CounterFilterPredicate;
import org.usergrid.utils.JsonUtils;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
import static org.usergrid.utils.ClassUtils.cast;
-import static org.usergrid.utils.ListUtils.firstBoolean;
-import static org.usergrid.utils.ListUtils.firstInteger;
-import static org.usergrid.utils.ListUtils.firstLong;
-import static org.usergrid.utils.ListUtils.isEmpty;
+import static org.usergrid.utils.ListUtils.*;
import static org.usergrid.utils.MapUtils.toMapList;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/CredentialsInfo.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/CredentialsInfo.java b/stack/core/src/main/java/org/usergrid/persistence/CredentialsInfo.java
index f8a635d..35c14ff 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/CredentialsInfo.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/CredentialsInfo.java
@@ -16,16 +16,15 @@
package org.usergrid.persistence;
-import java.util.Map;
-import java.util.TreeMap;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Map;
+import java.util.TreeMap;
+
@XmlRootElement
public class CredentialsInfo implements Comparable<CredentialsInfo> {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/DynamicEntity.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/DynamicEntity.java b/stack/core/src/main/java/org/usergrid/persistence/DynamicEntity.java
index 455cfbc..66bf07b 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/DynamicEntity.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/DynamicEntity.java
@@ -16,14 +16,13 @@
package org.usergrid.persistence;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.usergrid.persistence.annotations.EntityProperty;
import org.usergrid.utils.UUIDUtils;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.Map;
+import java.util.UUID;
+
/**
* Dynamic entities can represent any entity type whether specified in the Schema or not.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/Entity.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/Entity.java b/stack/core/src/main/java/org/usergrid/persistence/Entity.java
index 2b47060..4dded5d 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/Entity.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/Entity.java
@@ -16,22 +16,18 @@
package org.usergrid.persistence;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonPropertyOrder;
import org.usergrid.persistence.annotations.EntityProperty;
-import static org.usergrid.persistence.Schema.PROPERTY_NAME;
-import static org.usergrid.persistence.Schema.PROPERTY_TYPE;
-import static org.usergrid.persistence.Schema.PROPERTY_URI;
-import static org.usergrid.persistence.Schema.PROPERTY_UUID;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.usergrid.persistence.Schema.*;
/** Entities are the base object type in the service. */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/EntityFactory.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/EntityFactory.java b/stack/core/src/main/java/org/usergrid/persistence/EntityFactory.java
index e4c4ae9..5f9f928 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/EntityFactory.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/EntityFactory.java
@@ -16,11 +16,11 @@
package org.usergrid.persistence;
-import java.util.UUID;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.UUID;
+
/** A factory for creating Entity objects. */
public class EntityFactory {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/EntityManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/EntityManager.java b/stack/core/src/main/java/org/usergrid/persistence/EntityManager.java
index 29f9019..6575159 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/EntityManager.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/EntityManager.java
@@ -16,17 +16,13 @@
package org.usergrid.persistence;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
import org.usergrid.persistence.Results.Level;
import org.usergrid.persistence.cassandra.GeoIndexManager;
import org.usergrid.persistence.entities.Application;
import org.usergrid.persistence.entities.Role;
+import java.util.*;
+
/**
* The interface class for the data access object for Applications. Each application contains a set of users as well as
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/Identifier.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/Identifier.java b/stack/core/src/main/java/org/usergrid/persistence/Identifier.java
index 226ded0..59d9697 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/Identifier.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/Identifier.java
@@ -16,6 +16,9 @@
package org.usergrid.persistence;
+import org.codehaus.jackson.annotate.JsonIgnore;
+import org.usergrid.utils.UUIDUtils;
+
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -23,9 +26,6 @@ import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.usergrid.utils.UUIDUtils;
-
public class Identifier implements Serializable {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/Query.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/Query.java b/stack/core/src/main/java/org/usergrid/persistence/Query.java
index b6ef324..c743dbe 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/Query.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/Query.java
@@ -16,42 +16,21 @@
package org.usergrid.persistence;
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-
-import org.antlr.runtime.ANTLRStringStream;
-import org.antlr.runtime.ClassicToken;
-import org.antlr.runtime.CommonTokenStream;
-import org.antlr.runtime.RecognitionException;
-import org.antlr.runtime.Token;
-import org.antlr.runtime.TokenRewriteStream;
+import org.antlr.runtime.*;
+import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.annotate.JsonIgnore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Results.Level;
import org.usergrid.persistence.exceptions.QueryParseException;
-import org.usergrid.persistence.query.tree.AndOperand;
-import org.usergrid.persistence.query.tree.ContainsOperand;
-import org.usergrid.persistence.query.tree.Equal;
-import org.usergrid.persistence.query.tree.EqualityOperand;
-import org.usergrid.persistence.query.tree.GreaterThan;
-import org.usergrid.persistence.query.tree.GreaterThanEqual;
-import org.usergrid.persistence.query.tree.LessThan;
-import org.usergrid.persistence.query.tree.LessThanEqual;
-import org.usergrid.persistence.query.tree.Operand;
-import org.usergrid.persistence.query.tree.QueryFilterLexer;
-import org.usergrid.persistence.query.tree.QueryFilterParser;
+import org.usergrid.persistence.query.tree.*;
import org.usergrid.utils.JsonUtils;
-import org.apache.commons.lang.StringUtils;
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.*;
+import java.util.Map.Entry;
import static org.apache.commons.codec.binary.Base64.decodeBase64;
import static org.apache.commons.lang.StringUtils.isBlank;
@@ -59,12 +38,7 @@ import static org.apache.commons.lang.StringUtils.split;
import static org.usergrid.persistence.Schema.PROPERTY_UUID;
import static org.usergrid.utils.ClassUtils.cast;
import static org.usergrid.utils.ConversionUtils.uuid;
-import static org.usergrid.utils.ListUtils.first;
-import static org.usergrid.utils.ListUtils.firstBoolean;
-import static org.usergrid.utils.ListUtils.firstInteger;
-import static org.usergrid.utils.ListUtils.firstLong;
-import static org.usergrid.utils.ListUtils.firstUuid;
-import static org.usergrid.utils.ListUtils.isEmpty;
+import static org.usergrid.utils.ListUtils.*;
import static org.usergrid.utils.MapUtils.toMapList;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/QueryUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/QueryUtils.java b/stack/core/src/main/java/org/usergrid/persistence/QueryUtils.java
index 892aeff..a4183f6 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/QueryUtils.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/QueryUtils.java
@@ -1,11 +1,11 @@
package org.usergrid.persistence;
+import org.usergrid.utils.ListUtils;
+
import java.util.List;
import java.util.Map;
-import org.usergrid.utils.ListUtils;
-
/**
* Utilities to deal with query extraction and generation
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/RelationManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/RelationManager.java b/stack/core/src/main/java/org/usergrid/persistence/RelationManager.java
index dab436d..afd0082 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/RelationManager.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/RelationManager.java
@@ -16,13 +16,13 @@
package org.usergrid.persistence;
+import org.usergrid.persistence.Results.Level;
+
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
-import org.usergrid.persistence.Results.Level;
-
public interface RelationManager {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/Results.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/Results.java b/stack/core/src/main/java/org/usergrid/persistence/Results.java
index ea7da45..52294ec 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/Results.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/Results.java
@@ -16,19 +16,6 @@
package org.usergrid.persistence;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
import org.codehaus.jackson.map.annotate.JsonSerialize;
import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
import org.usergrid.persistence.cassandra.QueryProcessor;
@@ -36,6 +23,10 @@ import org.usergrid.persistence.query.ir.SearchVisitor;
import org.usergrid.utils.MapUtils;
import org.usergrid.utils.StringUtils;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.*;
+import java.util.Map.Entry;
+
import static org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString;
import static org.usergrid.persistence.SimpleEntityRef.ref;
import static org.usergrid.utils.ClassUtils.cast;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/Schema.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/Schema.java b/stack/core/src/main/java/org/usergrid/persistence/Schema.java
index 2d233c1..f89ce56 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/Schema.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/Schema.java
@@ -16,30 +16,14 @@
package org.usergrid.persistence;
-import java.beans.PropertyDescriptor;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.nio.ByteBuffer;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
-import javax.crypto.Cipher;
-import javax.crypto.KeyGenerator;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.SecretKeySpec;
-
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import me.prettyprint.hector.api.beans.ColumnSlice;
+import me.prettyprint.hector.api.beans.HColumn;
+import me.prettyprint.hector.api.beans.Row;
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.lang.reflect.FieldUtils;
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.SerializationConfig;
@@ -65,21 +49,23 @@ import org.usergrid.utils.InflectionUtils;
import org.usergrid.utils.JsonUtils;
import org.usergrid.utils.MapUtils;
-import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.commons.lang.reflect.FieldUtils;
-
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-
-import me.prettyprint.hector.api.beans.ColumnSlice;
-import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.beans.Row;
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+import java.beans.PropertyDescriptor;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.nio.ByteBuffer;
+import java.security.SecureRandom;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
import static org.apache.commons.lang.StringUtils.isNotBlank;
-import static org.usergrid.utils.ConversionUtils.bytebuffer;
-import static org.usergrid.utils.ConversionUtils.string;
-import static org.usergrid.utils.ConversionUtils.uuid;
+import static org.usergrid.utils.ConversionUtils.*;
import static org.usergrid.utils.InflectionUtils.pluralize;
import static org.usergrid.utils.InflectionUtils.singularize;
import static org.usergrid.utils.JsonUtils.toJsonNode;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/SimpleCollectionRef.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/SimpleCollectionRef.java b/stack/core/src/main/java/org/usergrid/persistence/SimpleCollectionRef.java
index dab819b..8e7114c 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/SimpleCollectionRef.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/SimpleCollectionRef.java
@@ -16,10 +16,10 @@
package org.usergrid.persistence;
-import java.util.UUID;
-
import org.usergrid.persistence.cassandra.CassandraPersistenceUtils;
+import java.util.UUID;
+
public class SimpleCollectionRef implements CollectionRef {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/SimpleRoleRef.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/SimpleRoleRef.java b/stack/core/src/main/java/org/usergrid/persistence/SimpleRoleRef.java
index d77b23c..a34414d 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/SimpleRoleRef.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/SimpleRoleRef.java
@@ -16,14 +16,14 @@
package org.usergrid.persistence;
-import java.util.UUID;
-
import org.springframework.util.Assert;
import org.usergrid.persistence.cassandra.CassandraPersistenceUtils;
import org.usergrid.persistence.entities.Group;
import org.usergrid.utils.StringUtils;
import org.usergrid.utils.UUIDUtils;
+import java.util.UUID;
+
public class SimpleRoleRef implements RoleRef {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/ApplicationCF.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/ApplicationCF.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/ApplicationCF.java
index 0cca4c5..b33e80b 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/ApplicationCF.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/ApplicationCF.java
@@ -16,10 +16,10 @@
package org.usergrid.persistence.cassandra;
-import java.util.List;
-
import me.prettyprint.hector.api.ddl.ColumnDefinition;
+import java.util.List;
+
import static me.prettyprint.hector.api.ddl.ComparatorType.COUNTERTYPE;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.getIndexMetadata;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/CFEnum.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CFEnum.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CFEnum.java
index 859dd1a..ad34b4c 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CFEnum.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CFEnum.java
@@ -16,10 +16,10 @@
package org.usergrid.persistence.cassandra;
-import java.util.List;
-
import me.prettyprint.hector.api.ddl.ColumnDefinition;
+import java.util.List;
+
public interface CFEnum {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java
index 0046397..9363e8b 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraPersistenceUtils.java
@@ -16,27 +16,6 @@
package org.usergrid.persistence.cassandra;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.TreeMap;
-import java.util.UUID;
-
-import org.codehaus.jackson.JsonNode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.utils.JsonUtils;
-
-import org.apache.cassandra.thrift.ColumnDef;
-import org.apache.cassandra.thrift.IndexType;
-import org.apache.commons.lang.StringUtils;
-
import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
import me.prettyprint.cassandra.serializers.StringSerializer;
import me.prettyprint.cassandra.serializers.UUIDSerializer;
@@ -51,19 +30,26 @@ import me.prettyprint.hector.api.ddl.KeyspaceDefinition;
import me.prettyprint.hector.api.factory.HFactory;
import me.prettyprint.hector.api.mutation.MutationResult;
import me.prettyprint.hector.api.mutation.Mutator;
+import org.apache.cassandra.thrift.ColumnDef;
+import org.apache.cassandra.thrift.IndexType;
+import org.apache.commons.lang.StringUtils;
+import org.codehaus.jackson.JsonNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.utils.JsonUtils;
-import static java.nio.ByteBuffer.wrap;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.util.*;
+import java.util.Map.Entry;
+import static java.nio.ByteBuffer.wrap;
import static me.prettyprint.hector.api.factory.HFactory.createClockResolution;
import static me.prettyprint.hector.api.factory.HFactory.createColumn;
import static org.apache.commons.beanutils.MethodUtils.invokeStaticMethod;
-import static org.apache.commons.lang.StringUtils.removeEnd;
-import static org.apache.commons.lang.StringUtils.removeStart;
-import static org.apache.commons.lang.StringUtils.split;
-import static org.apache.commons.lang.StringUtils.substringAfterLast;
-import static org.usergrid.persistence.Schema.PROPERTY_TYPE;
-import static org.usergrid.persistence.Schema.PROPERTY_UUID;
-import static org.usergrid.persistence.Schema.serializeEntityProperty;
+import static org.apache.commons.lang.StringUtils.*;
+import static org.usergrid.persistence.Schema.*;
import static org.usergrid.utils.ClassUtils.isBasicType;
import static org.usergrid.utils.ConversionUtils.bytebuffer;
import static org.usergrid.utils.JsonUtils.toJsonNode;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java
index c471294..256e61e 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CassandraService.java
@@ -16,68 +16,34 @@
package org.usergrid.persistence.cassandra;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.usergrid.locking.LockManager;
-import org.usergrid.persistence.IndexBucketLocator;
-import org.usergrid.persistence.IndexBucketLocator.IndexType;
-import org.usergrid.persistence.cassandra.index.IndexBucketScanner;
-import org.usergrid.persistence.cassandra.index.IndexScanner;
-
import me.prettyprint.cassandra.connection.HConnectionManager;
import me.prettyprint.cassandra.model.ConfigurableConsistencyLevel;
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.cassandra.serializers.BytesArraySerializer;
-import me.prettyprint.cassandra.serializers.DynamicCompositeSerializer;
-import me.prettyprint.cassandra.serializers.LongSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
+import me.prettyprint.cassandra.serializers.*;
import me.prettyprint.cassandra.service.CassandraHostConfigurator;
import me.prettyprint.cassandra.service.ThriftKsDef;
-import me.prettyprint.hector.api.Cluster;
-import me.prettyprint.hector.api.ConsistencyLevelPolicy;
-import me.prettyprint.hector.api.HConsistencyLevel;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.Serializer;
-import me.prettyprint.hector.api.beans.ColumnSlice;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.beans.OrderedRows;
-import me.prettyprint.hector.api.beans.Row;
-import me.prettyprint.hector.api.beans.Rows;
+import me.prettyprint.hector.api.*;
+import me.prettyprint.hector.api.beans.*;
import me.prettyprint.hector.api.ddl.ColumnFamilyDefinition;
import me.prettyprint.hector.api.ddl.KeyspaceDefinition;
import me.prettyprint.hector.api.factory.HFactory;
import me.prettyprint.hector.api.mutation.Mutator;
-import me.prettyprint.hector.api.query.ColumnQuery;
-import me.prettyprint.hector.api.query.CountQuery;
-import me.prettyprint.hector.api.query.MultigetSliceQuery;
-import me.prettyprint.hector.api.query.QueryResult;
-import me.prettyprint.hector.api.query.RangeSlicesQuery;
-import me.prettyprint.hector.api.query.SliceQuery;
+import me.prettyprint.hector.api.query.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.usergrid.locking.LockManager;
+import org.usergrid.persistence.IndexBucketLocator;
+import org.usergrid.persistence.IndexBucketLocator.IndexType;
+import org.usergrid.persistence.cassandra.index.IndexBucketScanner;
+import org.usergrid.persistence.cassandra.index.IndexScanner;
+
+import java.nio.ByteBuffer;
+import java.util.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
import static me.prettyprint.cassandra.service.FailoverPolicy.ON_FAIL_TRY_ALL_AVAILABLE;
-import static me.prettyprint.hector.api.factory.HFactory.createColumn;
-import static me.prettyprint.hector.api.factory.HFactory.createMultigetSliceQuery;
-import static me.prettyprint.hector.api.factory.HFactory.createMutator;
-import static me.prettyprint.hector.api.factory.HFactory.createRangeSlicesQuery;
-import static me.prettyprint.hector.api.factory.HFactory.createSliceQuery;
-import static me.prettyprint.hector.api.factory.HFactory.createVirtualKeyspace;
+import static me.prettyprint.hector.api.factory.HFactory.*;
import static org.apache.commons.collections.MapUtils.getIntValue;
import static org.apache.commons.collections.MapUtils.getString;
import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_ID_SETS;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectedEntityRefImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectedEntityRefImpl.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectedEntityRefImpl.java
index c093329..9c92eaf 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectedEntityRefImpl.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectedEntityRefImpl.java
@@ -16,12 +16,12 @@
package org.usergrid.persistence.cassandra;
-import java.util.UUID;
-
import org.usergrid.persistence.ConnectedEntityRef;
import org.usergrid.persistence.EntityRef;
import org.usergrid.persistence.SimpleEntityRef;
+import java.util.UUID;
+
public class ConnectedEntityRefImpl extends SimpleEntityRef implements ConnectedEntityRef {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectionRefImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectionRefImpl.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectionRefImpl.java
index c37d45d..36562ff 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectionRefImpl.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/ConnectionRefImpl.java
@@ -16,14 +16,8 @@
package org.usergrid.persistence.cassandra;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.UUID;
-
+import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.ConnectedEntityRef;
@@ -31,8 +25,9 @@ import org.usergrid.persistence.ConnectionRef;
import org.usergrid.persistence.EntityRef;
import org.usergrid.persistence.SimpleEntityRef;
-import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.lang.StringUtils;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.*;
import static org.usergrid.persistence.SimpleEntityRef.ref;
import static org.usergrid.utils.ConversionUtils.ascii;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/CounterUtils.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CounterUtils.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CounterUtils.java
index 4962fb6..d76bede 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CounterUtils.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CounterUtils.java
@@ -16,40 +16,27 @@
package org.usergrid.persistence.cassandra;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.*;
+import me.prettyprint.hector.api.beans.HCounterColumn;
+import me.prettyprint.hector.api.mutation.Mutator;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.usergrid.count.Batcher;
+import org.usergrid.count.common.Count;
import org.usergrid.mq.Message;
import org.usergrid.mq.cassandra.QueuesCF;
import org.usergrid.persistence.CounterResolution;
import org.usergrid.persistence.entities.Event;
-import org.apache.commons.lang.StringUtils;
-
-import org.usergrid.count.Batcher;
-import org.usergrid.count.common.Count;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.cassandra.serializers.LongSerializer;
-import me.prettyprint.cassandra.serializers.PrefixedSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-import me.prettyprint.hector.api.beans.HCounterColumn;
-import me.prettyprint.hector.api.mutation.Mutator;
+import java.nio.ByteBuffer;
+import java.util.*;
+import java.util.Map.Entry;
import static me.prettyprint.hector.api.factory.HFactory.createColumn;
import static me.prettyprint.hector.api.factory.HFactory.createCounterColumn;
import static org.usergrid.persistence.Schema.DICTIONARY_COUNTERS;
-import static org.usergrid.persistence.cassandra.ApplicationCF.APPLICATION_AGGREGATE_COUNTERS;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_COUNTERS;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_DICTIONARIES;
+import static org.usergrid.persistence.cassandra.ApplicationCF.*;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.addInsertToMutator;
import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.key;
import static org.usergrid.utils.ConversionUtils.bytebuffer;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/CursorCache.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CursorCache.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CursorCache.java
index 7b29a2b..2614e39 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/CursorCache.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/CursorCache.java
@@ -7,7 +7,6 @@ import java.util.Map;
import java.util.Map.Entry;
import static java.lang.Integer.parseInt;
-
import static org.apache.commons.codec.binary.Base64.decodeBase64;
import static org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString;
import static org.apache.commons.lang.StringUtils.split;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
index 1868f9a..5b5b26d 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
@@ -16,11 +16,17 @@
package org.usergrid.persistence.cassandra;
-import java.nio.ByteBuffer;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.UUID;
-
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.yammer.metrics.annotation.Metered;
+import me.prettyprint.cassandra.serializers.*;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.beans.*;
+import me.prettyprint.hector.api.mutation.Mutator;
+import me.prettyprint.hector.api.query.QueryResult;
+import me.prettyprint.hector.api.query.RangeSlicesQuery;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
@@ -33,42 +39,17 @@ import org.usergrid.persistence.entities.Application;
import org.usergrid.persistence.exceptions.ApplicationAlreadyExistsException;
import org.usergrid.utils.UUIDUtils;
-import org.apache.commons.lang.StringUtils;
-
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.yammer.metrics.annotation.Metered;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.cassandra.serializers.BytesArraySerializer;
-import me.prettyprint.cassandra.serializers.DynamicCompositeSerializer;
-import me.prettyprint.cassandra.serializers.LongSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.beans.ColumnSlice;
-import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.beans.OrderedRows;
-import me.prettyprint.hector.api.beans.Row;
-import me.prettyprint.hector.api.beans.Rows;
-import me.prettyprint.hector.api.mutation.Mutator;
-import me.prettyprint.hector.api.query.QueryResult;
-import me.prettyprint.hector.api.query.RangeSlicesQuery;
+import java.nio.ByteBuffer;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.UUID;
import static java.lang.String.CASE_INSENSITIVE_ORDER;
-
import static me.prettyprint.hector.api.factory.HFactory.createMutator;
import static me.prettyprint.hector.api.factory.HFactory.createRangeSlicesQuery;
-import static org.usergrid.persistence.Schema.PROPERTY_NAME;
-import static org.usergrid.persistence.Schema.PROPERTY_UUID;
-import static org.usergrid.persistence.Schema.TYPE_APPLICATION;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.addInsertToMutator;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.asMap;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.batchExecute;
-import static org.usergrid.persistence.cassandra.CassandraService.APPLICATIONS_CF;
-import static org.usergrid.persistence.cassandra.CassandraService.PROPERTIES_CF;
-import static org.usergrid.persistence.cassandra.CassandraService.RETRY_COUNT;
+import static org.usergrid.persistence.Schema.*;
+import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.*;
+import static org.usergrid.persistence.cassandra.CassandraService.*;
import static org.usergrid.utils.ConversionUtils.uuid;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java
index fda492d..8dd10bc 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityManagerImpl.java
@@ -16,25 +16,20 @@
package org.usergrid.persistence.cassandra;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.UUID;
-
-import javax.annotation.Resource;
-
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import com.yammer.metrics.annotation.Metered;
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import me.prettyprint.cassandra.serializers.LongSerializer;
+import me.prettyprint.cassandra.serializers.StringSerializer;
+import me.prettyprint.cassandra.serializers.UUIDSerializer;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.beans.*;
+import me.prettyprint.hector.api.factory.HFactory;
+import me.prettyprint.hector.api.mutation.Mutator;
+import me.prettyprint.hector.api.query.MultigetSliceCounterQuery;
+import me.prettyprint.hector.api.query.QueryResult;
+import me.prettyprint.hector.api.query.SliceCounterQuery;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
@@ -43,37 +38,13 @@ import org.usergrid.locking.Lock;
import org.usergrid.mq.Message;
import org.usergrid.mq.QueueManager;
import org.usergrid.mq.cassandra.QueueManagerFactoryImpl;
-import org.usergrid.persistence.AggregateCounter;
-import org.usergrid.persistence.AggregateCounterSet;
-import org.usergrid.persistence.CollectionRef;
-import org.usergrid.persistence.ConnectedEntityRef;
-import org.usergrid.persistence.ConnectionRef;
-import org.usergrid.persistence.CounterResolution;
-import org.usergrid.persistence.DynamicEntity;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityFactory;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.IndexBucketLocator;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.IndexBucketLocator.IndexType;
-import org.usergrid.persistence.Query;
import org.usergrid.persistence.Query.CounterFilterPredicate;
-import org.usergrid.persistence.Results;
import org.usergrid.persistence.Results.Level;
-import org.usergrid.persistence.RoleRef;
-import org.usergrid.persistence.Schema;
-import org.usergrid.persistence.SimpleCollectionRef;
-import org.usergrid.persistence.SimpleEntityRef;
-import org.usergrid.persistence.SimpleRoleRef;
-import org.usergrid.persistence.TypedEntity;
import org.usergrid.persistence.cassandra.CounterUtils.AggregateCounterSelection;
import org.usergrid.persistence.cassandra.util.TraceParticipant;
-import org.usergrid.persistence.entities.Application;
-import org.usergrid.persistence.entities.Event;
-import org.usergrid.persistence.entities.Group;
-import org.usergrid.persistence.entities.Role;
-import org.usergrid.persistence.entities.User;
+import org.usergrid.persistence.entities.*;
import org.usergrid.persistence.exceptions.DuplicateUniquePropertyExistsException;
import org.usergrid.persistence.exceptions.EntityNotFoundException;
import org.usergrid.persistence.exceptions.RequiredPropertyNotFoundException;
@@ -83,33 +54,12 @@ import org.usergrid.utils.ClassUtils;
import org.usergrid.utils.CompositeUtils;
import org.usergrid.utils.UUIDUtils;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-import com.yammer.metrics.annotation.Metered;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.cassandra.serializers.LongSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.beans.ColumnSlice;
-import me.prettyprint.hector.api.beans.CounterRow;
-import me.prettyprint.hector.api.beans.CounterRows;
-import me.prettyprint.hector.api.beans.CounterSlice;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.beans.HCounterColumn;
-import me.prettyprint.hector.api.beans.Row;
-import me.prettyprint.hector.api.beans.Rows;
-import me.prettyprint.hector.api.factory.HFactory;
-import me.prettyprint.hector.api.mutation.Mutator;
-import me.prettyprint.hector.api.query.MultigetSliceCounterQuery;
-import me.prettyprint.hector.api.query.QueryResult;
-import me.prettyprint.hector.api.query.SliceCounterQuery;
+import javax.annotation.Resource;
+import java.nio.ByteBuffer;
+import java.util.*;
import static java.lang.String.CASE_INSENSITIVE_ORDER;
import static java.util.Arrays.asList;
-
import static me.prettyprint.hector.api.factory.HFactory.createCounterSliceQuery;
import static me.prettyprint.hector.api.factory.HFactory.createMutator;
import static org.apache.commons.lang.StringUtils.capitalize;
@@ -117,59 +67,18 @@ import static org.apache.commons.lang.StringUtils.isBlank;
import static org.usergrid.locking.LockHelper.getUniqueUpdateLock;
import static org.usergrid.persistence.Results.Level.REFS;
import static org.usergrid.persistence.Results.fromEntities;
-import static org.usergrid.persistence.Schema.COLLECTION_ROLES;
-import static org.usergrid.persistence.Schema.COLLECTION_USERS;
-import static org.usergrid.persistence.Schema.DICTIONARY_COLLECTIONS;
-import static org.usergrid.persistence.Schema.DICTIONARY_PERMISSIONS;
-import static org.usergrid.persistence.Schema.DICTIONARY_PROPERTIES;
-import static org.usergrid.persistence.Schema.DICTIONARY_ROLENAMES;
-import static org.usergrid.persistence.Schema.DICTIONARY_ROLETIMES;
-import static org.usergrid.persistence.Schema.DICTIONARY_SETS;
-import static org.usergrid.persistence.Schema.PROPERTY_ASSOCIATED;
-import static org.usergrid.persistence.Schema.PROPERTY_CREATED;
-import static org.usergrid.persistence.Schema.PROPERTY_INACTIVITY;
-import static org.usergrid.persistence.Schema.PROPERTY_MODIFIED;
-import static org.usergrid.persistence.Schema.PROPERTY_NAME;
-import static org.usergrid.persistence.Schema.PROPERTY_TIMESTAMP;
-import static org.usergrid.persistence.Schema.PROPERTY_TYPE;
-import static org.usergrid.persistence.Schema.PROPERTY_UUID;
-import static org.usergrid.persistence.Schema.TYPE_APPLICATION;
-import static org.usergrid.persistence.Schema.TYPE_CONNECTION;
-import static org.usergrid.persistence.Schema.TYPE_ENTITY;
-import static org.usergrid.persistence.Schema.TYPE_MEMBER;
-import static org.usergrid.persistence.Schema.TYPE_ROLE;
-import static org.usergrid.persistence.Schema.defaultCollectionName;
-import static org.usergrid.persistence.Schema.deserializeEntityProperties;
-import static org.usergrid.persistence.Schema.getDefaultSchema;
+import static org.usergrid.persistence.Schema.*;
import static org.usergrid.persistence.SimpleEntityRef.getUuid;
import static org.usergrid.persistence.SimpleEntityRef.ref;
import static org.usergrid.persistence.SimpleRoleRef.getIdForGroupIdAndRoleName;
import static org.usergrid.persistence.SimpleRoleRef.getIdForRoleName;
-import static org.usergrid.persistence.cassandra.ApplicationCF.APPLICATION_AGGREGATE_COUNTERS;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_COMPOSITE_DICTIONARIES;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_COUNTERS;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_DICTIONARIES;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_ID_SETS;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_PROPERTIES;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_UNIQUE;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.addDeleteToMutator;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.addInsertToMutator;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.addPropertyToMutator;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.batchExecute;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.key;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.toStorableBinaryValue;
+import static org.usergrid.persistence.cassandra.ApplicationCF.*;
+import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.*;
import static org.usergrid.persistence.cassandra.CassandraService.ALL_COUNT;
import static org.usergrid.utils.ClassUtils.cast;
-import static org.usergrid.utils.ConversionUtils.bytebuffer;
-import static org.usergrid.utils.ConversionUtils.getLong;
-import static org.usergrid.utils.ConversionUtils.object;
-import static org.usergrid.utils.ConversionUtils.string;
-import static org.usergrid.utils.ConversionUtils.uuid;
+import static org.usergrid.utils.ConversionUtils.*;
import static org.usergrid.utils.InflectionUtils.singularize;
-import static org.usergrid.utils.UUIDUtils.getTimestampInMicros;
-import static org.usergrid.utils.UUIDUtils.getTimestampInMillis;
-import static org.usergrid.utils.UUIDUtils.isTimeBased;
-import static org.usergrid.utils.UUIDUtils.newTimeUUID;
+import static org.usergrid.utils.UUIDUtils.*;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityValueSerializer.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityValueSerializer.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityValueSerializer.java
index d4b13e7..4ebaaaf 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityValueSerializer.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/EntityValueSerializer.java
@@ -16,12 +16,12 @@
package org.usergrid.persistence.cassandra;
-import java.nio.ByteBuffer;
-import java.util.List;
-
import me.prettyprint.cassandra.serializers.AbstractSerializer;
import me.prettyprint.hector.api.beans.DynamicComposite;
+import java.nio.ByteBuffer;
+import java.util.List;
+
import static org.usergrid.utils.ConversionUtils.bytebuffer;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/GeoIndexManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/GeoIndexManager.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/GeoIndexManager.java
index 1f83422..b21093c 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/GeoIndexManager.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/GeoIndexManager.java
@@ -16,10 +16,11 @@
package org.usergrid.persistence.cassandra;
-import java.nio.ByteBuffer;
-import java.util.List;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.beans.DynamicComposite;
+import me.prettyprint.hector.api.beans.HColumn;
+import me.prettyprint.hector.api.mutation.Mutator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.EntityRef;
@@ -29,21 +30,16 @@ import org.usergrid.persistence.geo.EntityLocationRef;
import org.usergrid.persistence.geo.GeocellManager;
import org.usergrid.persistence.geo.model.Point;
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.mutation.Mutator;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.UUID;
import static me.prettyprint.hector.api.factory.HFactory.createColumn;
import static me.prettyprint.hector.api.factory.HFactory.createMutator;
import static org.usergrid.persistence.Schema.DICTIONARY_GEOCELL;
import static org.usergrid.persistence.Schema.INDEX_CONNECTIONS;
import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_INDEX;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.addInsertToMutator;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.batchExecute;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.key;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.logBatchOperation;
+import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.*;
import static org.usergrid.utils.ConversionUtils.bytebuffer;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/IndexUpdate.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/IndexUpdate.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/IndexUpdate.java
index 0a3f578..3f5ab2c 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/IndexUpdate.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/IndexUpdate.java
@@ -16,30 +16,21 @@
package org.usergrid.persistence.cassandra;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
+import com.fasterxml.uuid.UUIDComparator;
+import me.prettyprint.hector.api.beans.DynamicComposite;
+import me.prettyprint.hector.api.mutation.Mutator;
import org.codehaus.jackson.JsonNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.persistence.Entity;
-import com.fasterxml.uuid.UUIDComparator;
-
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.mutation.Mutator;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.util.*;
import static java.nio.ByteBuffer.wrap;
import static java.util.Arrays.asList;
-
import static org.usergrid.utils.JsonUtils.toJsonNode;
import static org.usergrid.utils.UUIDUtils.getTimestampInMicros;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/QueryProcessor.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/QueryProcessor.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/QueryProcessor.java
index b5d77a3..cd80803 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/QueryProcessor.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/QueryProcessor.java
@@ -16,61 +16,26 @@
package org.usergrid.persistence.cassandra;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Stack;
-import java.util.UUID;
-
+import me.prettyprint.cassandra.serializers.UUIDSerializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.usergrid.persistence.EntityManager;
-import org.usergrid.persistence.Identifier;
-import org.usergrid.persistence.Query;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.Query.SortDirection;
import org.usergrid.persistence.Query.SortPredicate;
-import org.usergrid.persistence.Results;
-import org.usergrid.persistence.Schema;
import org.usergrid.persistence.entities.User;
import org.usergrid.persistence.exceptions.NoFullTextIndexException;
import org.usergrid.persistence.exceptions.NoIndexException;
import org.usergrid.persistence.exceptions.PersistenceException;
-import org.usergrid.persistence.query.ir.AllNode;
-import org.usergrid.persistence.query.ir.AndNode;
-import org.usergrid.persistence.query.ir.EmailIdentifierNode;
-import org.usergrid.persistence.query.ir.NameIdentifierNode;
-import org.usergrid.persistence.query.ir.NotNode;
-import org.usergrid.persistence.query.ir.OrNode;
-import org.usergrid.persistence.query.ir.OrderByNode;
-import org.usergrid.persistence.query.ir.QueryNode;
-import org.usergrid.persistence.query.ir.QuerySlice;
-import org.usergrid.persistence.query.ir.SearchVisitor;
-import org.usergrid.persistence.query.ir.SliceNode;
-import org.usergrid.persistence.query.ir.UuidIdentifierNode;
-import org.usergrid.persistence.query.ir.WithinNode;
+import org.usergrid.persistence.query.ir.*;
import org.usergrid.persistence.query.ir.result.ResultIterator;
import org.usergrid.persistence.query.ir.result.ResultsLoader;
import org.usergrid.persistence.query.ir.result.ResultsLoaderFactory;
import org.usergrid.persistence.query.ir.result.ScanColumn;
-import org.usergrid.persistence.query.tree.AndOperand;
-import org.usergrid.persistence.query.tree.ContainsOperand;
-import org.usergrid.persistence.query.tree.Equal;
-import org.usergrid.persistence.query.tree.EqualityOperand;
-import org.usergrid.persistence.query.tree.GreaterThan;
-import org.usergrid.persistence.query.tree.GreaterThanEqual;
-import org.usergrid.persistence.query.tree.LessThan;
-import org.usergrid.persistence.query.tree.LessThanEqual;
-import org.usergrid.persistence.query.tree.Literal;
-import org.usergrid.persistence.query.tree.NotOperand;
-import org.usergrid.persistence.query.tree.Operand;
-import org.usergrid.persistence.query.tree.OrOperand;
-import org.usergrid.persistence.query.tree.QueryVisitor;
-import org.usergrid.persistence.query.tree.StringLiteral;
-import org.usergrid.persistence.query.tree.WithinOperand;
+import org.usergrid.persistence.query.tree.*;
import org.usergrid.persistence.schema.CollectionInfo;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
+import java.nio.ByteBuffer;
+import java.util.*;
import static org.usergrid.persistence.Schema.getDefaultSchema;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/core/src/main/java/org/usergrid/persistence/cassandra/RelationManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/cassandra/RelationManagerImpl.java b/stack/core/src/main/java/org/usergrid/persistence/cassandra/RelationManagerImpl.java
index d56a1ed..52983b4 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/cassandra/RelationManagerImpl.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/cassandra/RelationManagerImpl.java
@@ -16,41 +16,21 @@
package org.usergrid.persistence.cassandra;
-import java.nio.ByteBuffer;
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.UUID;
-
+import com.yammer.metrics.annotation.Metered;
+import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
+import me.prettyprint.cassandra.serializers.StringSerializer;
+import me.prettyprint.cassandra.serializers.UUIDSerializer;
+import me.prettyprint.hector.api.Keyspace;
+import me.prettyprint.hector.api.beans.DynamicComposite;
+import me.prettyprint.hector.api.beans.HColumn;
+import me.prettyprint.hector.api.mutation.Mutator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.Assert;
-import org.usergrid.persistence.CollectionRef;
-import org.usergrid.persistence.ConnectedEntityRef;
-import org.usergrid.persistence.ConnectionRef;
-import org.usergrid.persistence.Entity;
-import org.usergrid.persistence.EntityRef;
-import org.usergrid.persistence.IndexBucketLocator;
+import org.usergrid.persistence.*;
import org.usergrid.persistence.IndexBucketLocator.IndexType;
-import org.usergrid.persistence.PagingResultsIterator;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.RelationManager;
-import org.usergrid.persistence.Results;
import org.usergrid.persistence.Results.Level;
-import org.usergrid.persistence.RoleRef;
-import org.usergrid.persistence.Schema;
-import org.usergrid.persistence.SimpleCollectionRef;
-import org.usergrid.persistence.SimpleEntityRef;
-import org.usergrid.persistence.SimpleRoleRef;
-import org.usergrid.persistence.cassandra.IndexUpdate.IndexEntry;
+import org.usergrid.persistence.cassandra.IndexUpdate.*;
import org.usergrid.persistence.cassandra.index.ConnectedIndexScanner;
import org.usergrid.persistence.cassandra.index.IndexBucketScanner;
import org.usergrid.persistence.cassandra.index.IndexScanner;
@@ -60,77 +40,26 @@ import org.usergrid.persistence.geo.CollectionGeoSearch;
import org.usergrid.persistence.geo.ConnectionGeoSearch;
import org.usergrid.persistence.geo.EntityLocationRef;
import org.usergrid.persistence.geo.model.Point;
-import org.usergrid.persistence.query.ir.AllNode;
-import org.usergrid.persistence.query.ir.NameIdentifierNode;
-import org.usergrid.persistence.query.ir.QueryNode;
-import org.usergrid.persistence.query.ir.QuerySlice;
-import org.usergrid.persistence.query.ir.SearchVisitor;
-import org.usergrid.persistence.query.ir.WithinNode;
-import org.usergrid.persistence.query.ir.result.CollectionResultsLoaderFactory;
-import org.usergrid.persistence.query.ir.result.ConnectionIndexSliceParser;
-import org.usergrid.persistence.query.ir.result.ConnectionResultsLoaderFactory;
-import org.usergrid.persistence.query.ir.result.ConnectionTypesIterator;
-import org.usergrid.persistence.query.ir.result.EmptyIterator;
-import org.usergrid.persistence.query.ir.result.GeoIterator;
-import org.usergrid.persistence.query.ir.result.SliceIterator;
-import org.usergrid.persistence.query.ir.result.StaticIdIterator;
-import org.usergrid.persistence.query.ir.result.UUIDIndexSliceParser;
+import org.usergrid.persistence.query.ir.*;
+import org.usergrid.persistence.query.ir.result.*;
import org.usergrid.persistence.schema.CollectionInfo;
import org.usergrid.utils.IndexUtils;
import org.usergrid.utils.MapUtils;
-import com.yammer.metrics.annotation.Metered;
-
-import me.prettyprint.cassandra.serializers.ByteBufferSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.serializers.UUIDSerializer;
-import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.beans.DynamicComposite;
-import me.prettyprint.hector.api.beans.HColumn;
-import me.prettyprint.hector.api.mutation.Mutator;
+import java.nio.ByteBuffer;
+import java.util.*;
+import java.util.Map.Entry;
import static java.lang.String.CASE_INSENSITIVE_ORDER;
import static java.util.Arrays.asList;
-
import static me.prettyprint.hector.api.factory.HFactory.createMutator;
-import static org.usergrid.persistence.Schema.COLLECTION_ROLES;
-import static org.usergrid.persistence.Schema.DICTIONARY_COLLECTIONS;
-import static org.usergrid.persistence.Schema.DICTIONARY_CONNECTED_ENTITIES;
-import static org.usergrid.persistence.Schema.DICTIONARY_CONNECTED_TYPES;
-import static org.usergrid.persistence.Schema.DICTIONARY_CONNECTING_ENTITIES;
-import static org.usergrid.persistence.Schema.DICTIONARY_CONNECTING_TYPES;
-import static org.usergrid.persistence.Schema.INDEX_CONNECTIONS;
-import static org.usergrid.persistence.Schema.PROPERTY_COLLECTION_NAME;
-import static org.usergrid.persistence.Schema.PROPERTY_INACTIVITY;
-import static org.usergrid.persistence.Schema.PROPERTY_ITEM;
-import static org.usergrid.persistence.Schema.PROPERTY_ITEM_TYPE;
-import static org.usergrid.persistence.Schema.PROPERTY_NAME;
-import static org.usergrid.persistence.Schema.PROPERTY_TITLE;
-import static org.usergrid.persistence.Schema.PROPERTY_TYPE;
-import static org.usergrid.persistence.Schema.TYPE_APPLICATION;
-import static org.usergrid.persistence.Schema.TYPE_ENTITY;
-import static org.usergrid.persistence.Schema.TYPE_MEMBER;
-import static org.usergrid.persistence.Schema.TYPE_ROLE;
-import static org.usergrid.persistence.Schema.defaultCollectionName;
-import static org.usergrid.persistence.Schema.getDefaultSchema;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_COMPOSITE_DICTIONARIES;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_DICTIONARIES;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_ID_SETS;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_INDEX;
-import static org.usergrid.persistence.cassandra.ApplicationCF.ENTITY_INDEX_ENTRIES;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.addDeleteToMutator;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.addInsertToMutator;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.batchExecute;
-import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.key;
+import static org.usergrid.persistence.Schema.*;
+import static org.usergrid.persistence.cassandra.ApplicationCF.*;
+import static org.usergrid.persistence.cassandra.CassandraPersistenceUtils.*;
import static org.usergrid.persistence.cassandra.CassandraService.INDEX_ENTRY_LIST_COUNT;
import static org.usergrid.persistence.cassandra.ConnectionRefImpl.CONNECTION_ENTITY_CONNECTION_TYPE;
-import static org.usergrid.persistence.cassandra.GeoIndexManager.batchDeleteLocationInConnectionsIndex;
-import static org.usergrid.persistence.cassandra.GeoIndexManager.batchRemoveLocationFromCollectionIndex;
-import static org.usergrid.persistence.cassandra.GeoIndexManager.batchStoreLocationInCollectionIndex;
-import static org.usergrid.persistence.cassandra.GeoIndexManager.batchStoreLocationInConnectionsIndex;
-import static org.usergrid.persistence.cassandra.IndexUpdate.indexValueCode;
-import static org.usergrid.persistence.cassandra.IndexUpdate.toIndexableValue;
-import static org.usergrid.persistence.cassandra.IndexUpdate.validIndexableValue;
+import static org.usergrid.persistence.cassandra.GeoIndexManager.*;
+import static org.usergrid.persistence.cassandra.IndexUpdate.*;
import static org.usergrid.utils.ClassUtils.cast;
import static org.usergrid.utils.CompositeUtils.setGreaterThanEqualityFlag;
import static org.usergrid.utils.ConversionUtils.string;