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:21:04 UTC
[17/23] organize imports only
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;