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/02/06 11:21:53 UTC
[35/50] [abbrv] Revert "organize imports only"
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 5e1dafd..1435e69 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/8112cecc/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 d652449..25d2be0 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 org.usergrid.persistence.exceptions.PersistenceException;
-
import javax.ws.rs.ext.Provider;
+import org.usergrid.persistence.exceptions.PersistenceException;
+
@Provider
public class PersistenceExceptionMapper extends AbstractExceptionMapper<PersistenceException> {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 a62a51f..7a4b5f9 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,11 +16,12 @@
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/8112cecc/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 74d70ef..510a5d5 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,11 +16,14 @@
package org.usergrid.rest.exceptions;
-import org.usergrid.persistence.exceptions.QueryTokenException;
-
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 static javax.ws.rs.core.Response.Status.BAD_REQUEST;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 9de9d1f..3ebedfe 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/8112cecc/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 d8c8a0c..cb93d2f 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/8112cecc/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 e1d2130..784f238 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,10 @@
package org.usergrid.rest.exceptions;
-import com.sun.jersey.api.container.MappableContainerException;
import org.usergrid.rest.ApiResponse;
+import com.sun.jersey.api.container.MappableContainerException;
+
import static org.usergrid.utils.JsonUtils.mapToJsonString;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 efa349c..2d8d361 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 org.usergrid.services.exceptions.ServiceException;
-
import javax.ws.rs.ext.Provider;
+import org.usergrid.services.exceptions.ServiceException;
+
/** Will map to HTTP 500 INTERNAL_SERVER_ERROR because parent does */
@Provider
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 960a7f5..32fb5f3 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 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 org.usergrid.security.shiro.utils.SubjectUtils;
+import org.usergrid.services.exceptions.ServiceResourceNotFoundException;
+
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/8112cecc/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 f14b4d0..ef8a99f 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;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 95c1d2e..38704a8 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,18 +16,34 @@
package org.usergrid.rest.filters;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.util.Assert;
-
-import javax.servlet.*;
+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 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 java.io.*;
-import java.util.*;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.Assert;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 1903bf8..12a94ab 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,14 +16,15 @@
package org.usergrid.rest.filters;
-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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
-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 static org.apache.commons.lang.StringUtils.isNotBlank;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 bff0bad..ca0e264 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,11 +16,20 @@
package org.usergrid.rest.filters;
-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 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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,14 +40,15 @@ import org.usergrid.persistence.EntityManagerFactory;
import org.usergrid.services.ServiceManagerFactory;
import org.usergrid.system.UsergridSystemMonitor;
-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;
+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;
@Component
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 6f7f9c4..b0fe1d0 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,10 +1,9 @@
package org.usergrid.rest.filters;
-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;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,8 +13,10 @@ import org.usergrid.persistence.cassandra.util.TraceTagManager;
import org.usergrid.persistence.cassandra.util.TraceTagReporter;
import org.usergrid.utils.StringUtils;
-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;
/**
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 0a1f986..9b1fc65 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,13 +16,23 @@
package org.usergrid.rest.management;
-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 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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -38,16 +48,22 @@ import org.usergrid.rest.management.users.UsersResource;
import org.usergrid.security.oauth.AccessInfo;
import org.usergrid.security.shiro.utils.SubjectUtils;
-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 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 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/8112cecc/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 609dee7..4e47aa1 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,12 +1,6 @@
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;
@@ -14,6 +8,13 @@ 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/8112cecc/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 f83772d..2d92936 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,8 +16,20 @@
package org.usergrid.rest.management.organizations;
-import com.sun.jersey.api.json.JSONWithPadding;
-import com.sun.jersey.api.view.Viewable;
+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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -34,11 +46,8 @@ import org.usergrid.security.oauth.ClientCredentialsInfo;
import org.usergrid.security.tokens.exceptions.TokenException;
import org.usergrid.services.ServiceResults;
-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 com.sun.jersey.api.json.JSONWithPadding;
+import com.sun.jersey.api.view.Viewable;
@Component("org.usergrid.rest.management.organizations.OrganizationResource")
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 5f89b8b..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
@@ -16,9 +16,21 @@
package org.usergrid.rest.management.organizations;
-import com.google.common.base.Preconditions;
-import com.sun.jersey.api.json.JSONWithPadding;
-import org.apache.commons.lang.StringUtils;
+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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,12 +45,10 @@ import org.usergrid.rest.ApiResponse;
import org.usergrid.rest.RootResource;
import org.usergrid.rest.security.annotations.RequireOrganizationAccess;
-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 org.apache.commons.lang.StringUtils;
+
+import com.google.common.base.Preconditions;
+import com.sun.jersey.api.json.JSONWithPadding;
@Component( "org.usergrid.rest.management.organizations.OrganizationsResource" )
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 9921a53..48b9f60 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,9 +16,21 @@
package org.usergrid.rest.management.organizations.applications;
-import com.google.common.base.Preconditions;
-import com.sun.jersey.api.json.JSONWithPadding;
-import org.apache.commons.lang.StringUtils;
+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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
@@ -32,12 +44,10 @@ import org.usergrid.security.providers.SignInAsProvider;
import org.usergrid.security.providers.SignInProviderFactory;
import org.usergrid.services.ServiceManager;
-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 org.apache.commons.lang.StringUtils;
+
+import com.google.common.base.Preconditions;
+import com.sun.jersey.api.json.JSONWithPadding;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 c20d4ad..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
@@ -16,9 +16,23 @@
package org.usergrid.rest.management.organizations.applications;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.BiMap;
-import com.sun.jersey.api.json.JSONWithPadding;
+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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -31,13 +45,9 @@ import org.usergrid.rest.ApiResponse;
import org.usergrid.rest.RootResource;
import org.usergrid.rest.security.annotations.RequireOrganizationAccess;
-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 com.google.common.base.Preconditions;
+import com.google.common.collect.BiMap;
+import com.sun.jersey.api.json.JSONWithPadding;
import static org.apache.commons.lang.StringUtils.isEmpty;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 a42b19c..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
@@ -16,7 +16,26 @@
package org.usergrid.rest.management.organizations.users;
-import com.sun.jersey.api.json.JSONWithPadding;
+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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -30,14 +49,7 @@ import org.usergrid.rest.RootResource;
import org.usergrid.rest.security.annotations.RequireOrganizationAccess;
import org.usergrid.security.shiro.utils.SubjectUtils;
-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 com.sun.jersey.api.json.JSONWithPadding;
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/8112cecc/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 40e1488..eea49aa 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,10 +16,22 @@
package org.usergrid.rest.management.users;
-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 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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -35,12 +47,11 @@ import org.usergrid.security.shiro.utils.SubjectUtils;
import org.usergrid.security.tokens.exceptions.TokenException;
import org.usergrid.services.ServiceResults;
-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 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 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/8112cecc/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 d1b4948..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
@@ -16,10 +16,23 @@
package org.usergrid.rest.management.users;
-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 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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
@@ -31,13 +44,11 @@ import org.usergrid.rest.exceptions.AuthErrorInfo;
import org.usergrid.rest.exceptions.RedirectionException;
import org.usergrid.security.shiro.utils.SubjectUtils;
-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 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 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/8112cecc/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 8851f04..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
@@ -16,8 +16,24 @@
package org.usergrid.rest.management.users.organizations;
-import com.google.common.collect.BiMap;
-import com.sun.jersey.api.json.JSONWithPadding;
+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 org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.usergrid.management.OrganizationInfo;
@@ -30,12 +46,8 @@ import org.usergrid.rest.security.annotations.RequireAdminUserAccess;
import org.usergrid.rest.security.annotations.RequireOrganizationAccess;
import org.usergrid.security.shiro.utils.SubjectUtils;
-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 com.google.common.collect.BiMap;
+import com.sun.jersey.api.json.JSONWithPadding;
@Component( "org.usergrid.rest.management.users.organizations.OrganizationsResource" )
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 3082347..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
@@ -1,9 +1,18 @@
package org.usergrid.rest.organizations;
-import com.google.common.collect.BiMap;
-import com.sun.jersey.api.json.JSONWithPadding;
-import org.apache.shiro.authz.UnauthorizedException;
+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 org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.usergrid.exception.NotImplementedException;
@@ -17,11 +26,10 @@ import org.usergrid.rest.security.annotations.RequireOrganizationAccess;
import org.usergrid.rest.utils.PathingUtils;
import org.usergrid.security.shiro.utils.SubjectUtils;
-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 org.apache.shiro.authz.UnauthorizedException;
+
+import com.google.common.collect.BiMap;
+import com.sun.jersey.api.json.JSONWithPadding;
import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 24b75e3..ddd4dd1 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,14 @@
package org.usergrid.rest.security;
-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;
+import com.sun.jersey.spi.container.ContainerRequest;
+import com.sun.jersey.spi.container.ContainerResponse;
+import com.sun.jersey.spi.container.ContainerResponseFilter;
+
public class CrossOriginRequestFilter implements ContainerResponseFilter {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 d55c5c2..78366c8 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,8 +16,15 @@
package org.usergrid.rest.security;
-import com.sun.jersey.api.model.AbstractMethod;
-import com.sun.jersey.spi.container.*;
+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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,17 +43,19 @@ import org.usergrid.rest.utils.PathingUtils;
import org.usergrid.security.shiro.utils.SubjectUtils;
import org.usergrid.services.ServiceManagerFactory;
-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 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 static org.apache.commons.lang.StringUtils.isNotEmpty;
import static org.usergrid.rest.exceptions.SecurityException.mappableSecurityException;
-import static org.usergrid.security.shiro.utils.SubjectUtils.*;
+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;
@Component
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 17d2a43..1f1c391 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,14 +16,15 @@
package org.usergrid.rest.security.shiro;
-import org.apache.shiro.realm.Realm;
-import org.apache.shiro.session.mgt.SessionManager;
-import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
+import java.util.Collection;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usergrid.rest.security.shiro.session.HttpRequestSessionManager;
-import java.util.Collection;
+import org.apache.shiro.realm.Realm;
+import org.apache.shiro.session.mgt.SessionManager;
+import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
public class RestSecurityManager extends DefaultWebSecurityManager {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 7210b2a..91c4354 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,17 @@
package org.usergrid.rest.security.shiro;
-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 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.usergrid.rest.ApiResponse;
+import org.usergrid.security.tokens.exceptions.BadTokenException;
+import org.usergrid.security.tokens.exceptions.ExpiredTokenException;
+
+import org.apache.shiro.authc.AuthenticationException;
+
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/8112cecc/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 222d20e..a135207 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,15 +16,18 @@
package org.usergrid.rest.security.shiro.filters;
-import com.sun.jersey.spi.container.ContainerRequest;
-import org.apache.shiro.codec.Base64;
+import java.security.Principal;
+import java.util.Map;
+
+import javax.ws.rs.core.SecurityContext;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
-import javax.ws.rs.core.SecurityContext;
-import java.security.Principal;
-import java.util.Map;
+import org.apache.shiro.codec.Base64;
+
+import com.sun.jersey.spi.container.ContainerRequest;
@Component
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 7bc7f23..5160a7b 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,16 +16,18 @@
package org.usergrid.rest.security.shiro.filters;
-import com.sun.jersey.spi.container.ContainerRequest;
-import org.apache.shiro.subject.Subject;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Context;
+
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 javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
+import org.apache.shiro.subject.Subject;
+
+import com.sun.jersey.spi.container.ContainerRequest;
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/8112cecc/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 1d8a4c1..89b2d1c 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,14 +16,9 @@
package org.usergrid.rest.security.shiro.filters;
-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 javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.core.Context;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
@@ -40,10 +35,20 @@ import org.usergrid.security.tokens.exceptions.BadTokenException;
import org.usergrid.security.tokens.exceptions.ExpiredTokenException;
import org.usergrid.security.tokens.exceptions.InvalidTokenException;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.Context;
+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 static org.usergrid.rest.exceptions.AuthErrorInfo.*;
+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.SecurityException.mappableSecurityException;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 b43235b..4953772 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,22 +16,25 @@
package org.usergrid.rest.security.shiro.filters;
-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 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 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 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 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 static org.usergrid.utils.StringUtils.stringOrSubstringAfterFirst;
import static org.usergrid.utils.StringUtils.stringOrSubstringBeforeFirst;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 c099334..0be3f95 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,6 +16,9 @@
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;
@@ -24,9 +27,6 @@ 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/8112cecc/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 0455a69..1152b93 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,16 +16,17 @@
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/8112cecc/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 c103e82..d7608ba 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,13 +16,9 @@
package org.usergrid.rest.test;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Component;
-import org.usergrid.rest.AbstractContextResource;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Properties;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
@@ -30,9 +26,14 @@ 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;
+
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.type.TypeReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+import org.usergrid.rest.AbstractContextResource;
/** For testing purposes only and only works with usergrid.test=true */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 9175d7e..703d537 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,12 +16,13 @@
package org.usergrid.rest.utils;
-import com.sun.jersey.spi.container.ContainerRequest;
-import com.sun.jersey.spi.container.ContainerResponse;
+import java.util.Enumeration;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.Enumeration;
+
+import com.sun.jersey.spi.container.ContainerRequest;
+import com.sun.jersey.spi.container.ContainerResponse;
/* 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/8112cecc/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 8b404dd..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
@@ -16,12 +16,19 @@
package org.usergrid.rest.utils;
-import org.usergrid.security.oauth.AccessInfo;
+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 javax.ws.rs.core.MediaType;
-import java.util.*;
+
+import org.usergrid.security.oauth.AccessInfo;
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/8112cecc/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 e6cfd27..f5cde00 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/AbstractRestIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/AbstractRestIT.java
@@ -16,15 +16,16 @@
package org.usergrid.rest;
-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 com.sun.jersey.test.framework.AppDescriptor;
-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 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;
@@ -34,14 +35,15 @@ 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 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 com.sun.jersey.test.framework.AppDescriptor;
+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 static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 3738f57..9f3c91c 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/BasicIT.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/BasicIT.java
@@ -16,18 +16,20 @@
package org.usergrid.rest;
-import com.sun.jersey.api.client.UniformInterfaceException;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.core.util.MultivaluedMapImpl;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+
import org.codehaus.jackson.JsonNode;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import java.util.Map;
-import java.util.UUID;
+import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.api.client.WebResource;
+import com.sun.jersey.core.util.MultivaluedMapImpl;
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/8112cecc/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 efb70f6..25fbc7b 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/ConcurrentRestITSuite.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/ConcurrentRestITSuite.java
@@ -13,7 +13,12 @@ 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.*;
+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.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/8112cecc/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 c3fe87a..9071d47 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/DatabaseInitializer.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/DatabaseInitializer.java
@@ -16,6 +16,9 @@
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;
@@ -24,9 +27,6 @@ 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/8112cecc/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 ba3039b..2701202 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/ITSetup.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/ITSetup.java
@@ -15,6 +15,11 @@
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;
@@ -26,10 +31,6 @@ 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/8112cecc/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 17ab6d1..325f2dd 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/RestITSuite.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/RestITSuite.java
@@ -25,7 +25,12 @@ 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.*;
+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.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/8112cecc/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 9c25e16..8ac5181 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/TestContextSetup.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/TestContextSetup.java
@@ -1,13 +1,14 @@
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/8112cecc/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 c455b49..8ba697f 100644
--- a/stack/rest/src/test/java/org/usergrid/rest/TomcatResource.java
+++ b/stack/rest/src/test/java/org/usergrid/rest/TomcatResource.java
@@ -1,13 +1,15 @@
package org.usergrid.rest;
-import com.google.common.io.Files;
-import org.apache.catalina.startup.Tomcat;
-import org.apache.commons.lang.math.RandomUtils;
+import java.io.File;
+
import org.junit.rules.ExternalResource;
import org.usergrid.cassandra.AvailablePortFinder;
-import java.io.File;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.commons.lang.math.RandomUtils;
+
+import com.google.common.io.Files;
/** @author tnine */
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 66ad394..bbb9865 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,19 +15,24 @@
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.*;
+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.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/8112cecc/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 1e1fe37..e316bef 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,11 +15,10 @@
package org.usergrid.rest.applications;
-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 java.util.Map;
+
+import javax.ws.rs.core.MediaType;
+
import org.codehaus.jackson.JsonNode;
import org.junit.Ignore;
import org.junit.Test;
@@ -28,10 +27,16 @@ import org.usergrid.management.ApplicationInfo;
import org.usergrid.management.OrganizationInfo;
import org.usergrid.rest.AbstractRestIT;
-import javax.ws.rs.core.MediaType;
-import java.util.Map;
+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 static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 0d35f0e..6b2c6c9 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,17 +1,20 @@
package org.usergrid.rest.applications;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
import org.codehaus.jackson.JsonNode;
import org.junit.Test;
import org.usergrid.cassandra.Concurrent;
import org.usergrid.rest.AbstractRestIT;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
+import com.sun.jersey.api.client.UniformInterfaceException;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
@Concurrent()
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 2827922..468719a 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,8 +1,13 @@
package org.usergrid.rest.applications.assets;
-import com.sun.jersey.multipart.FormDataMultiPart;
-import org.apache.commons.io.IOUtils;
+import java.io.InputStream;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.TimeoutException;
+
+import javax.ws.rs.core.MediaType;
+
import org.codehaus.jackson.JsonNode;
import org.junit.Assert;
import org.junit.Ignore;
@@ -14,11 +19,9 @@ import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.applications.utils.UserRepo;
import org.usergrid.services.assets.data.AssetUtils;
-import javax.ws.rs.core.MediaType;
-import java.io.InputStream;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.TimeoutException;
+import org.apache.commons.io.IOUtils;
+
+import com.sun.jersey.multipart.FormDataMultiPart;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 152baa3..11fa979 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,8 +1,9 @@
package org.usergrid.rest.applications.collection;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.UniformInterfaceException;
+import java.util.HashMap;
+import java.util.Map;
+
import org.codehaus.jackson.JsonNode;
import org.junit.Rule;
import org.junit.Test;
@@ -10,8 +11,8 @@ 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 com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.UniformInterfaceException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 50706ae..b363193 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,6 +16,9 @@
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;
@@ -24,9 +27,6 @@ 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/8112cecc/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 ba621e2..1b123a1 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,6 +16,12 @@
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;
@@ -28,9 +34,10 @@ import org.usergrid.rest.TestContextSetup;
import org.usergrid.rest.test.resource.CustomCollection;
import org.usergrid.rest.test.resource.EntityResource;
-import java.util.*;
-
-import static org.junit.Assert.*;
+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.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 6ea975d..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
@@ -1,6 +1,9 @@
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;
@@ -9,9 +12,6 @@ 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/8112cecc/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 eea3e4b..88ab2c1 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,6 +1,11 @@
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;
@@ -8,11 +13,6 @@ 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/8112cecc/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 4894287..279505f 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,7 +1,9 @@
package org.usergrid.rest.applications.collection.activities;
-import org.apache.commons.lang.ArrayUtils;
+import java.util.HashMap;
+import java.util.Map;
+
import org.codehaus.jackson.JsonNode;
import org.junit.Rule;
import org.junit.Test;
@@ -9,8 +11,7 @@ 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 org.apache.commons.lang.ArrayUtils;
import static org.junit.Assert.assertEquals;
import static org.usergrid.utils.MapUtils.hashMap;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8112cecc/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 39c1be4..62c1b52 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,6 +1,9 @@
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;
@@ -8,9 +11,6 @@ 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/8112cecc/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 a5f46a6..828f249 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,6 +15,9 @@
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;
@@ -22,9 +25,6 @@ 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/8112cecc/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 e9c5dea..18449cf 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,10 +15,12 @@
package org.usergrid.rest.applications.collection.groups;
-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 java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.ws.rs.core.MediaType;
+
import org.codehaus.jackson.JsonNode;
import org.junit.Rule;
import org.junit.Test;
@@ -27,10 +29,12 @@ import org.slf4j.LoggerFactory;
import org.usergrid.rest.AbstractRestIT;
import org.usergrid.rest.TestContextSetup;
-import javax.ws.rs.core.MediaType;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
+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 static org.junit.Assert.fail;