From commits-return-219-apmail-usergrid-commits-archive=usergrid.apache.org@usergrid.incubator.apache.org Sun Jan 19 10:20:59 2014 Return-Path: X-Original-To: apmail-usergrid-commits-archive@minotaur.apache.org Delivered-To: apmail-usergrid-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 412CD10CD5 for ; Sun, 19 Jan 2014 10:20:59 +0000 (UTC) Received: (qmail 28341 invoked by uid 500); 19 Jan 2014 10:20:59 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 28319 invoked by uid 500); 19 Jan 2014 10:20:58 -0000 Mailing-List: contact commits-help@usergrid.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.incubator.apache.org Delivered-To: mailing list commits@usergrid.incubator.apache.org Received: (qmail 28029 invoked by uid 99); 19 Jan 2014 10:20:51 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 19 Jan 2014 10:20:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 202091051A; Sun, 19 Jan 2014 10:20:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: snoopdave@apache.org To: commits@usergrid.apache.org Date: Sun, 19 Jan 2014 10:20:56 -0000 Message-Id: In-Reply-To: <103ac4d979584bb8b0da757b51f5fefd@git.apache.org> References: <103ac4d979584bb8b0da757b51f5fefd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/23] organize imports only http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServer.java ---------------------------------------------------------------------- diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServer.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServer.java index 1fb6c1c..4a5e787 100644 --- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServer.java +++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServer.java @@ -16,11 +16,9 @@ package org.usergrid.mongo; -import java.net.InetSocketAddress; -import java.nio.ByteOrder; -import java.util.Properties; -import java.util.concurrent.Executors; - +import org.apache.shiro.mgt.DefaultSecurityManager; +import org.apache.shiro.mgt.SessionsSecurityManager; +import org.apache.shiro.realm.Realm; import org.jboss.netty.bootstrap.ServerBootstrap; import org.jboss.netty.buffer.HeapChannelBufferFactory; import org.jboss.netty.channel.Channel; @@ -38,9 +36,10 @@ import org.usergrid.persistence.EntityManagerFactory; import org.usergrid.persistence.cassandra.EntityManagerFactoryImpl; import org.usergrid.services.ServiceManagerFactory; -import org.apache.shiro.mgt.DefaultSecurityManager; -import org.apache.shiro.mgt.SessionsSecurityManager; -import org.apache.shiro.realm.Realm; +import java.net.InetSocketAddress; +import java.nio.ByteOrder; +import java.util.Properties; +import java.util.concurrent.Executors; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServerPipelineFactory.java ---------------------------------------------------------------------- diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServerPipelineFactory.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServerPipelineFactory.java index 8b2f8ef..3a83d7a 100644 --- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServerPipelineFactory.java +++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/MongoServerPipelineFactory.java @@ -16,6 +16,7 @@ package org.usergrid.mongo; +import org.apache.shiro.mgt.SessionsSecurityManager; import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.channel.ChannelPipelineFactory; import org.jboss.netty.channel.Channels; @@ -24,8 +25,6 @@ import org.usergrid.management.ManagementService; import org.usergrid.persistence.EntityManagerFactory; import org.usergrid.services.ServiceManagerFactory; -import org.apache.shiro.mgt.SessionsSecurityManager; - public class MongoServerPipelineFactory implements ChannelPipelineFactory { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/ListDatabases.java ---------------------------------------------------------------------- diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/ListDatabases.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/ListDatabases.java index 30413ac..e67e594 100644 --- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/ListDatabases.java +++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/ListDatabases.java @@ -16,11 +16,6 @@ package org.usergrid.mongo.commands; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.channel.MessageEvent; import org.usergrid.mongo.MongoChannelHandler; @@ -28,6 +23,11 @@ import org.usergrid.mongo.protocol.OpQuery; import org.usergrid.mongo.protocol.OpReply; import org.usergrid.security.shiro.utils.SubjectUtils; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + import static org.usergrid.utils.MapUtils.map; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/MongoCommand.java ---------------------------------------------------------------------- diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/MongoCommand.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/MongoCommand.java index 445a589..d87d05b 100644 --- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/MongoCommand.java +++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/MongoCommand.java @@ -16,8 +16,6 @@ package org.usergrid.mongo.commands; -import java.util.concurrent.ConcurrentHashMap; - import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.channel.MessageEvent; import org.slf4j.Logger; @@ -27,6 +25,8 @@ import org.usergrid.mongo.MongoChannelHandler; import org.usergrid.mongo.protocol.OpQuery; import org.usergrid.mongo.protocol.OpReply; +import java.util.concurrent.ConcurrentHashMap; + public abstract class MongoCommand { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/Whatsmyuri.java ---------------------------------------------------------------------- diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/Whatsmyuri.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/Whatsmyuri.java index dea8b03..0ef1e24 100644 --- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/Whatsmyuri.java +++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/commands/Whatsmyuri.java @@ -16,14 +16,14 @@ package org.usergrid.mongo.commands; -import java.net.InetSocketAddress; - import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.channel.MessageEvent; import org.usergrid.mongo.MongoChannelHandler; import org.usergrid.mongo.protocol.OpQuery; import org.usergrid.mongo.protocol.OpReply; +import java.net.InetSocketAddress; + import static org.usergrid.utils.MapUtils.entry; import static org.usergrid.utils.MapUtils.map; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/Message.java ---------------------------------------------------------------------- diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/Message.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/Message.java index e573abc..fab2c5b 100644 --- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/Message.java +++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/Message.java @@ -16,6 +16,12 @@ package org.usergrid.mongo.protocol; +import org.bson.BSONObject; +import org.jboss.netty.buffer.ChannelBuffer; +import org.jboss.netty.buffer.ChannelBuffers; +import org.usergrid.mongo.utils.BSONUtils; +import org.usergrid.utils.StringUtils; + import java.io.IOException; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -23,12 +29,6 @@ import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; -import org.bson.BSONObject; -import org.jboss.netty.buffer.ChannelBuffer; -import org.jboss.netty.buffer.ChannelBuffers; -import org.usergrid.mongo.utils.BSONUtils; -import org.usergrid.utils.StringUtils; - public class Message { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpDelete.java ---------------------------------------------------------------------- diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpDelete.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpDelete.java index 1c20b39..ed29738 100644 --- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpDelete.java +++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpDelete.java @@ -16,11 +16,6 @@ package org.usergrid.mongo.protocol; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.util.Map; -import java.util.UUID; - import org.bson.BSONObject; import org.bson.BasicBSONObject; import org.jboss.netty.buffer.ChannelBuffer; @@ -33,14 +28,15 @@ import org.usergrid.management.ApplicationInfo; import org.usergrid.mongo.MongoChannelHandler; import org.usergrid.mongo.query.MongoQueryParser; import org.usergrid.mongo.utils.BSONUtils; -import org.usergrid.persistence.EntityManager; -import org.usergrid.persistence.Identifier; -import org.usergrid.persistence.Query; -import org.usergrid.persistence.Results; +import org.usergrid.persistence.*; import org.usergrid.persistence.Results.Level; -import org.usergrid.persistence.SimpleEntityRef; import org.usergrid.security.shiro.utils.SubjectUtils; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.Map; +import java.util.UUID; + public class OpDelete extends OpCrud { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpGetMore.java ---------------------------------------------------------------------- diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpGetMore.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpGetMore.java index 632b7a3..186fe11 100644 --- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpGetMore.java +++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpGetMore.java @@ -16,14 +16,14 @@ package org.usergrid.mongo.protocol; -import java.io.IOException; -import java.nio.ByteBuffer; - import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.channel.MessageEvent; import org.usergrid.mongo.MongoChannelHandler; +import java.io.IOException; +import java.nio.ByteBuffer; + public class OpGetMore extends OpCrud { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpInsert.java ---------------------------------------------------------------------- diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpInsert.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpInsert.java index e179ecb..df77251 100644 --- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpInsert.java +++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpInsert.java @@ -16,12 +16,6 @@ package org.usergrid.mongo.protocol; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - import org.bson.BSONObject; import org.bson.BasicBSONObject; import org.bson.types.ObjectId; @@ -38,6 +32,12 @@ import org.usergrid.persistence.EntityManager; import org.usergrid.persistence.Identifier; import org.usergrid.security.shiro.utils.SubjectUtils; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + public class OpInsert extends OpCrud { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpKillCursors.java ---------------------------------------------------------------------- diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpKillCursors.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpKillCursors.java index 98ef335..373bced 100644 --- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpKillCursors.java +++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpKillCursors.java @@ -16,12 +16,12 @@ package org.usergrid.mongo.protocol; +import org.jboss.netty.buffer.ChannelBuffer; + import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.jboss.netty.buffer.ChannelBuffer; - public class OpKillCursors extends Message { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpMsg.java ---------------------------------------------------------------------- diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpMsg.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpMsg.java index 3acebd3..af6002f 100644 --- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpMsg.java +++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpMsg.java @@ -16,11 +16,11 @@ package org.usergrid.mongo.protocol; +import org.jboss.netty.buffer.ChannelBuffer; + import java.io.IOException; import java.nio.ByteBuffer; -import org.jboss.netty.buffer.ChannelBuffer; - public class OpMsg extends Message { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpQuery.java ---------------------------------------------------------------------- diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpQuery.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpQuery.java index 3374c2b..3fb2a9e 100644 --- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpQuery.java +++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpQuery.java @@ -16,14 +16,8 @@ package org.usergrid.mongo.protocol; -import java.io.IOException; -import java.net.InetSocketAddress; -import java.nio.ByteBuffer; -import java.util.HashSet; -import java.util.Map; -import java.util.Random; -import java.util.Set; - +import org.apache.shiro.authc.AuthenticationException; +import org.apache.shiro.subject.Subject; import org.bson.BSONObject; import org.bson.BasicBSONObject; import org.bson.types.ObjectId; @@ -39,18 +33,18 @@ import org.usergrid.mongo.MongoChannelHandler; import org.usergrid.mongo.commands.MongoCommand; import org.usergrid.mongo.query.MongoQueryParser; import org.usergrid.mongo.utils.BSONUtils; -import org.usergrid.persistence.Entity; -import org.usergrid.persistence.EntityManager; -import org.usergrid.persistence.Identifier; -import org.usergrid.persistence.Query; -import org.usergrid.persistence.Results; -import org.usergrid.persistence.Schema; +import org.usergrid.persistence.*; import org.usergrid.security.shiro.PrincipalCredentialsToken; import org.usergrid.security.shiro.utils.SubjectUtils; import org.usergrid.utils.MapUtils; -import org.apache.shiro.authc.AuthenticationException; -import org.apache.shiro.subject.Subject; +import java.io.IOException; +import java.net.InetSocketAddress; +import java.nio.ByteBuffer; +import java.util.HashSet; +import java.util.Map; +import java.util.Random; +import java.util.Set; import static org.usergrid.utils.JsonUtils.toJsonMap; import static org.usergrid.utils.MapUtils.entry; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpReply.java ---------------------------------------------------------------------- diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpReply.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpReply.java index 92a6a6d..eb471b8 100644 --- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpReply.java +++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpReply.java @@ -16,18 +16,18 @@ package org.usergrid.mongo.protocol; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - import org.bson.BSONObject; import org.bson.BasicBSONObject; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBufferInputStream; import org.usergrid.mongo.utils.BSONUtils; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + public class OpReply extends Message { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpUpdate.java ---------------------------------------------------------------------- diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpUpdate.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpUpdate.java index 3e11d45..545bee5 100644 --- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpUpdate.java +++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/protocol/OpUpdate.java @@ -16,10 +16,6 @@ package org.usergrid.mongo.protocol; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.util.Map; - import org.bson.BSONObject; import org.bson.BasicBSONObject; import org.jboss.netty.buffer.ChannelBuffer; @@ -32,13 +28,13 @@ import org.usergrid.management.ApplicationInfo; import org.usergrid.mongo.MongoChannelHandler; import org.usergrid.mongo.query.MongoQueryParser; import org.usergrid.mongo.utils.BSONUtils; -import org.usergrid.persistence.Entity; -import org.usergrid.persistence.EntityManager; -import org.usergrid.persistence.Identifier; -import org.usergrid.persistence.Query; -import org.usergrid.persistence.Results; +import org.usergrid.persistence.*; import org.usergrid.security.shiro.utils.SubjectUtils; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.Map; + public class OpUpdate extends OpCrud { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/query/MongoQueryParser.java ---------------------------------------------------------------------- diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/query/MongoQueryParser.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/query/MongoQueryParser.java index 89bd8cc..dc9bcdd 100644 --- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/query/MongoQueryParser.java +++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/query/MongoQueryParser.java @@ -16,22 +16,15 @@ package org.usergrid.mongo.query; -import java.util.Stack; - import org.antlr.runtime.ClassicToken; import org.bson.BSONObject; import org.bson.BasicBSONObject; import org.bson.types.BasicBSONList; import org.usergrid.persistence.Query; import org.usergrid.persistence.Query.SortDirection; -import org.usergrid.persistence.query.tree.AndOperand; -import org.usergrid.persistence.query.tree.Equal; -import org.usergrid.persistence.query.tree.GreaterThan; -import org.usergrid.persistence.query.tree.GreaterThanEqual; -import org.usergrid.persistence.query.tree.LessThan; -import org.usergrid.persistence.query.tree.LessThanEqual; -import org.usergrid.persistence.query.tree.Operand; -import org.usergrid.persistence.query.tree.OrOperand; +import org.usergrid.persistence.query.tree.*; + +import java.util.Stack; import static org.apache.commons.collections.MapUtils.getIntValue; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyInboundHandler.java ---------------------------------------------------------------------- diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyInboundHandler.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyInboundHandler.java index 9ee6f11..df2a88b 100644 --- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyInboundHandler.java +++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyInboundHandler.java @@ -16,25 +16,18 @@ package org.usergrid.mongo.testproxy; -import java.net.InetSocketAddress; -import java.nio.ByteOrder; - import org.jboss.netty.bootstrap.ClientBootstrap; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffers; import org.jboss.netty.buffer.HeapChannelBufferFactory; -import org.jboss.netty.channel.Channel; -import org.jboss.netty.channel.ChannelFuture; -import org.jboss.netty.channel.ChannelFutureListener; -import org.jboss.netty.channel.ChannelHandlerContext; -import org.jboss.netty.channel.ChannelStateEvent; -import org.jboss.netty.channel.ExceptionEvent; -import org.jboss.netty.channel.MessageEvent; -import org.jboss.netty.channel.SimpleChannelUpstreamHandler; +import org.jboss.netty.channel.*; import org.jboss.netty.channel.socket.ClientSocketChannelFactory; import org.usergrid.mongo.MongoMessageDecoder; import org.usergrid.mongo.protocol.Message; +import java.net.InetSocketAddress; +import java.nio.ByteOrder; + public class MongoProxyInboundHandler extends SimpleChannelUpstreamHandler { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyServer.java ---------------------------------------------------------------------- diff --git a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyServer.java b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyServer.java index 24222da..cc97d37 100644 --- a/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyServer.java +++ b/stack/mongo-emulator/src/main/java/org/usergrid/mongo/testproxy/MongoProxyServer.java @@ -16,11 +16,6 @@ package org.usergrid.mongo.testproxy; -import java.net.InetSocketAddress; -import java.nio.ByteOrder; -import java.util.concurrent.Executor; -import java.util.concurrent.Executors; - import org.jboss.netty.bootstrap.ServerBootstrap; import org.jboss.netty.buffer.HeapChannelBufferFactory; import org.jboss.netty.channel.socket.ClientSocketChannelFactory; @@ -29,6 +24,11 @@ import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.net.InetSocketAddress; +import java.nio.ByteOrder; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; + public class MongoProxyServer { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/test/java/org/usergrid/mongo/AbstractMongoTest.java ---------------------------------------------------------------------- diff --git a/stack/mongo-emulator/src/test/java/org/usergrid/mongo/AbstractMongoTest.java b/stack/mongo-emulator/src/test/java/org/usergrid/mongo/AbstractMongoTest.java index 7e9393c..60dd3e6 100644 --- a/stack/mongo-emulator/src/test/java/org/usergrid/mongo/AbstractMongoTest.java +++ b/stack/mongo-emulator/src/test/java/org/usergrid/mongo/AbstractMongoTest.java @@ -16,18 +16,17 @@ package org.usergrid.mongo; -import java.net.UnknownHostException; -import java.util.Properties; - +import com.mongodb.DB; +import com.mongodb.Mongo; +import com.mongodb.MongoException; +import com.mongodb.WriteConcern; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.usergrid.persistence.cassandra.EntityManagerFactoryImpl; import org.usergrid.services.ServiceManagerFactory; -import com.mongodb.DB; -import com.mongodb.Mongo; -import com.mongodb.MongoException; -import com.mongodb.WriteConcern; +import java.net.UnknownHostException; +import java.util.Properties; public abstract class AbstractMongoTest { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/test/java/org/usergrid/mongo/BasicMongoTest.java ---------------------------------------------------------------------- diff --git a/stack/mongo-emulator/src/test/java/org/usergrid/mongo/BasicMongoTest.java b/stack/mongo-emulator/src/test/java/org/usergrid/mongo/BasicMongoTest.java index 55d660c..ce436ff 100644 --- a/stack/mongo-emulator/src/test/java/org/usergrid/mongo/BasicMongoTest.java +++ b/stack/mongo-emulator/src/test/java/org/usergrid/mongo/BasicMongoTest.java @@ -1,35 +1,19 @@ package org.usergrid.mongo; +import com.mongodb.*; +import org.bson.types.ObjectId; +import org.junit.Ignore; +import org.junit.Test; +import org.usergrid.mongo.protocol.OpDelete; +import org.usergrid.persistence.*; + import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.UUID; -import org.bson.types.ObjectId; -import org.junit.Ignore; -import org.junit.Test; -import org.usergrid.mongo.protocol.OpDelete; -import org.usergrid.persistence.Entity; -import org.usergrid.persistence.EntityManager; -import org.usergrid.persistence.Query; -import org.usergrid.persistence.Results; -import org.usergrid.persistence.SimpleEntityRef; - -import com.mongodb.BasicDBObject; -import com.mongodb.DB; -import com.mongodb.DBCollection; -import com.mongodb.DBCursor; -import com.mongodb.DBObject; -import com.mongodb.MongoException; -import com.mongodb.WriteConcern; -import com.mongodb.WriteResult; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; @Ignore http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/test/java/org/usergrid/mongo/DatabaseInitializer.java ---------------------------------------------------------------------- diff --git a/stack/mongo-emulator/src/test/java/org/usergrid/mongo/DatabaseInitializer.java b/stack/mongo-emulator/src/test/java/org/usergrid/mongo/DatabaseInitializer.java index f309035..5e07a27 100644 --- a/stack/mongo-emulator/src/test/java/org/usergrid/mongo/DatabaseInitializer.java +++ b/stack/mongo-emulator/src/test/java/org/usergrid/mongo/DatabaseInitializer.java @@ -16,9 +16,6 @@ package org.usergrid.mongo; -import java.util.Map; -import java.util.Properties; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -27,6 +24,9 @@ import org.usergrid.mq.QueueManagerFactory; import org.usergrid.persistence.EntityManagerFactory; import org.usergrid.services.ServiceManagerFactory; +import java.util.Map; +import java.util.Properties; + public class DatabaseInitializer { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/mongo-emulator/src/test/java/org/usergrid/mongo/MongoQueryTest.java ---------------------------------------------------------------------- diff --git a/stack/mongo-emulator/src/test/java/org/usergrid/mongo/MongoQueryTest.java b/stack/mongo-emulator/src/test/java/org/usergrid/mongo/MongoQueryTest.java index 3543933..dafbc89 100644 --- a/stack/mongo-emulator/src/test/java/org/usergrid/mongo/MongoQueryTest.java +++ b/stack/mongo-emulator/src/test/java/org/usergrid/mongo/MongoQueryTest.java @@ -1,26 +1,18 @@ package org.usergrid.mongo; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; -import java.util.UUID; - +import com.mongodb.*; import org.bson.types.BasicBSONList; import org.junit.Ignore; import org.junit.Test; import org.usergrid.persistence.EntityManager; -import com.mongodb.BasicDBObject; -import com.mongodb.DB; -import com.mongodb.DBCollection; -import com.mongodb.DBCursor; -import com.mongodb.DBObject; -import com.mongodb.Mongo; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; +import java.util.UUID; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; @Ignore http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/query-validator/src/main/java/org/usergrid/query/validator/ApiServerRunner.java ---------------------------------------------------------------------- diff --git a/stack/query-validator/src/main/java/org/usergrid/query/validator/ApiServerRunner.java b/stack/query-validator/src/main/java/org/usergrid/query/validator/ApiServerRunner.java index b7c5739..1624636 100644 --- a/stack/query-validator/src/main/java/org/usergrid/query/validator/ApiServerRunner.java +++ b/stack/query-validator/src/main/java/org/usergrid/query/validator/ApiServerRunner.java @@ -19,15 +19,14 @@ import org.apache.commons.lang.StringUtils; import org.codehaus.jackson.JsonNode; import org.springframework.http.HttpMethod; import org.springframework.stereotype.Component; +import org.usergrid.java.client.Client; import org.usergrid.java.client.response.ApiResponse; import org.usergrid.persistence.Entity; +import org.usergrid.persistence.Schema; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import org.usergrid.java.client.Client; -import org.usergrid.persistence.Schema; - import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/query-validator/src/main/java/org/usergrid/query/validator/QueryRunner.java ---------------------------------------------------------------------- diff --git a/stack/query-validator/src/main/java/org/usergrid/query/validator/QueryRunner.java b/stack/query-validator/src/main/java/org/usergrid/query/validator/QueryRunner.java index caabb96..8f89c1d 100644 --- a/stack/query-validator/src/main/java/org/usergrid/query/validator/QueryRunner.java +++ b/stack/query-validator/src/main/java/org/usergrid/query/validator/QueryRunner.java @@ -15,9 +15,10 @@ ******************************************************************************/ package org.usergrid.query.validator; -import java.util.List; import org.usergrid.persistence.Entity; +import java.util.List; + /** * @author Sung-ju Jin(realbeast) */ http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/query-validator/src/test/java/org/usergrid/query/validator/QueryValidationTest.java ---------------------------------------------------------------------- diff --git a/stack/query-validator/src/test/java/org/usergrid/query/validator/QueryValidationTest.java b/stack/query-validator/src/test/java/org/usergrid/query/validator/QueryValidationTest.java index 5fbacb3..8716139 100644 --- a/stack/query-validator/src/test/java/org/usergrid/query/validator/QueryValidationTest.java +++ b/stack/query-validator/src/test/java/org/usergrid/query/validator/QueryValidationTest.java @@ -15,10 +15,10 @@ ******************************************************************************/ package org.usergrid.query.validator; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.junit.Assert; /** * @author Sung-ju Jin(realbeast) http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/AbstractContextResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/AbstractContextResource.java b/stack/rest/src/main/java/org/usergrid/rest/AbstractContextResource.java index ed56e00..9a82b1a 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/AbstractContextResource.java +++ b/stack/rest/src/main/java/org/usergrid/rest/AbstractContextResource.java @@ -16,15 +16,12 @@ package org.usergrid.rest; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.PathSegment; -import javax.ws.rs.core.Request; -import javax.ws.rs.core.SecurityContext; -import javax.ws.rs.core.UriInfo; - +import com.sun.jersey.api.core.HttpContext; +import com.sun.jersey.api.core.ResourceContext; +import com.sun.jersey.api.view.Viewable; +import com.sun.jersey.spi.CloseableService; +import net.tanesha.recaptcha.ReCaptcha; +import net.tanesha.recaptcha.ReCaptchaFactory; import org.springframework.beans.factory.annotation.Autowired; import org.usergrid.management.ManagementService; import org.usergrid.mq.QueueManagerFactory; @@ -33,13 +30,9 @@ import org.usergrid.rest.exceptions.RedirectionException; import org.usergrid.security.tokens.TokenService; import org.usergrid.services.ServiceManagerFactory; -import com.sun.jersey.api.core.HttpContext; -import com.sun.jersey.api.core.ResourceContext; -import com.sun.jersey.api.view.Viewable; -import com.sun.jersey.spi.CloseableService; - -import net.tanesha.recaptcha.ReCaptcha; -import net.tanesha.recaptcha.ReCaptchaFactory; +import javax.servlet.http.HttpServletRequest; +import javax.ws.rs.core.*; +import java.util.List; import static org.apache.commons.lang.StringUtils.isNotBlank; import static org.apache.commons.lang.StringUtils.removeEnd; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/ApiResponse.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/ApiResponse.java b/stack/rest/src/main/java/org/usergrid/rest/ApiResponse.java index 64ea870..c66fdec 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/ApiResponse.java +++ b/stack/rest/src/main/java/org/usergrid/rest/ApiResponse.java @@ -16,16 +16,8 @@ package org.usergrid.rest; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; -import java.util.UUID; - -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlRootElement; - +import org.apache.commons.lang.ClassUtils; +import org.apache.commons.lang.StringUtils; import org.codehaus.jackson.annotate.JsonAnyGetter; import org.codehaus.jackson.annotate.JsonAnySetter; import org.codehaus.jackson.annotate.JsonProperty; @@ -41,8 +33,9 @@ import org.usergrid.services.ServiceRequest; import org.usergrid.services.ServiceResults; import org.usergrid.utils.InflectionUtils; -import org.apache.commons.lang.ClassUtils; -import org.apache.commons.lang.StringUtils; +import javax.xml.bind.annotation.XmlAnyElement; +import javax.xml.bind.annotation.XmlRootElement; +import java.util.*; import static org.usergrid.utils.InflectionUtils.pluralize; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/JacksonCustomMapperProvider.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/JacksonCustomMapperProvider.java b/stack/rest/src/main/java/org/usergrid/rest/JacksonCustomMapperProvider.java index e25bf0b..838da83 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/JacksonCustomMapperProvider.java +++ b/stack/rest/src/main/java/org/usergrid/rest/JacksonCustomMapperProvider.java @@ -16,11 +16,6 @@ package org.usergrid.rest; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.ContextResolver; -import javax.ws.rs.ext.Provider; - import org.codehaus.jackson.jaxrs.Annotations; import org.codehaus.jackson.jaxrs.MapperConfigurator; import org.codehaus.jackson.map.ObjectMapper; @@ -30,6 +25,11 @@ import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.ext.ContextResolver; +import javax.ws.rs.ext.Provider; + @Provider @Component http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/RootResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/RootResource.java b/stack/rest/src/main/java/org/usergrid/rest/RootResource.java index bee1f27..f5e53a7 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/RootResource.java +++ b/stack/rest/src/main/java/org/usergrid/rest/RootResource.java @@ -16,25 +16,15 @@ package org.usergrid.rest; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Map; -import java.util.SortedMap; -import java.util.UUID; - -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.ResponseBuilder; -import javax.ws.rs.core.UriInfo; - +import com.google.common.collect.BiMap; +import com.sun.jersey.api.json.JSONWithPadding; +import com.yammer.metrics.Metrics; +import com.yammer.metrics.annotation.ExceptionMetered; +import com.yammer.metrics.annotation.Timed; +import com.yammer.metrics.core.*; +import com.yammer.metrics.stats.Snapshot; +import org.apache.commons.lang.StringUtils; +import org.apache.shiro.authz.UnauthorizedException; import org.codehaus.jackson.node.JsonNodeFactory; import org.codehaus.jackson.node.ObjectNode; import org.slf4j.Logger; @@ -49,26 +39,18 @@ import org.usergrid.rest.organizations.OrganizationResource; import org.usergrid.rest.security.annotations.RequireSystemAccess; import org.usergrid.system.UsergridSystemMonitor; -import org.apache.commons.lang.StringUtils; -import org.apache.shiro.authz.UnauthorizedException; - -import com.google.common.collect.BiMap; -import com.sun.jersey.api.json.JSONWithPadding; -import com.yammer.metrics.Metrics; -import com.yammer.metrics.annotation.ExceptionMetered; -import com.yammer.metrics.annotation.Timed; -import com.yammer.metrics.core.Counter; -import com.yammer.metrics.core.Gauge; -import com.yammer.metrics.core.Histogram; -import com.yammer.metrics.core.Metered; -import com.yammer.metrics.core.Metric; -import com.yammer.metrics.core.MetricName; -import com.yammer.metrics.core.MetricProcessor; -import com.yammer.metrics.core.MetricsRegistry; -import com.yammer.metrics.core.Sampling; -import com.yammer.metrics.core.Summarizable; -import com.yammer.metrics.core.Timer; -import com.yammer.metrics.stats.Snapshot; +import javax.ws.rs.*; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.ResponseBuilder; +import javax.ws.rs.core.UriInfo; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Map; +import java.util.SortedMap; +import java.util.UUID; import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/SwaggerServlet.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/SwaggerServlet.java b/stack/rest/src/main/java/org/usergrid/rest/SwaggerServlet.java index 3c19ab5..f792acd 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/SwaggerServlet.java +++ b/stack/rest/src/main/java/org/usergrid/rest/SwaggerServlet.java @@ -16,28 +16,19 @@ package org.usergrid.rest; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import org.apache.commons.lang.text.StrSubstitutor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; -import org.apache.commons.lang.text.StrSubstitutor; +import javax.servlet.*; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; import static org.apache.commons.lang.StringUtils.isEmpty; import static org.springframework.web.context.support.WebApplicationContextUtils.getRequiredWebApplicationContext; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/SystemResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/SystemResource.java b/stack/rest/src/main/java/org/usergrid/rest/SystemResource.java index eb03173..efad0e8 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/SystemResource.java +++ b/stack/rest/src/main/java/org/usergrid/rest/SystemResource.java @@ -16,22 +16,17 @@ package org.usergrid.rest; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.UriInfo; - +import com.sun.jersey.api.json.JSONWithPadding; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import org.usergrid.rest.security.annotations.RequireSystemAccess; -import com.sun.jersey.api.json.JSONWithPadding; +import javax.ws.rs.*; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.UriInfo; @Path("/system") http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/TextToJsonSwapWriter.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/TextToJsonSwapWriter.java b/stack/rest/src/main/java/org/usergrid/rest/TextToJsonSwapWriter.java index d39ea45..41162bc 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/TextToJsonSwapWriter.java +++ b/stack/rest/src/main/java/org/usergrid/rest/TextToJsonSwapWriter.java @@ -1,27 +1,20 @@ package org.usergrid.rest; -import java.io.IOException; -import java.io.OutputStream; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; +import com.sun.jersey.api.json.JSONWithPadding; +import com.sun.jersey.spi.MessageBodyWorkers; +import org.codehaus.jackson.map.JsonSerializableWithType; import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.GenericEntity; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import javax.ws.rs.core.*; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; import javax.xml.bind.annotation.XmlRootElement; - -import org.codehaus.jackson.map.JsonSerializable; -import org.codehaus.jackson.map.JsonSerializableWithType; - -import com.sun.jersey.api.json.JSONWithPadding; -import com.sun.jersey.spi.MessageBodyWorkers; +import java.io.IOException; +import java.io.OutputStream; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; /** http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/ApplicationResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/ApplicationResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/ApplicationResource.java index 453538a..17095e2 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/applications/ApplicationResource.java +++ b/stack/rest/src/main/java/org/usergrid/rest/applications/ApplicationResource.java @@ -16,27 +16,14 @@ package org.usergrid.rest.applications; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.Map; -import java.util.UUID; - -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.PathSegment; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; - +import com.sun.jersey.api.json.JSONWithPadding; +import com.sun.jersey.api.view.Viewable; +import org.apache.amber.oauth2.common.error.OAuthError; +import org.apache.amber.oauth2.common.exception.OAuthProblemException; +import org.apache.amber.oauth2.common.message.OAuthResponse; +import org.apache.amber.oauth2.common.message.types.GrantType; +import org.apache.shiro.authz.UnauthorizedException; +import org.apache.shiro.codec.Base64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Scope; @@ -64,21 +51,17 @@ import org.usergrid.rest.security.annotations.RequireApplicationAccess; import org.usergrid.security.oauth.AccessInfo; import org.usergrid.security.oauth.ClientCredentialsInfo; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.message.OAuthResponse; -import org.apache.amber.oauth2.common.message.types.GrantType; -import org.apache.shiro.authz.UnauthorizedException; -import org.apache.shiro.codec.Base64; - -import com.sun.jersey.api.json.JSONWithPadding; -import com.sun.jersey.api.view.Viewable; +import javax.ws.rs.*; +import javax.ws.rs.core.*; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.Map; +import java.util.UUID; import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import static javax.servlet.http.HttpServletResponse.SC_OK; import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; - import static org.apache.commons.lang.StringUtils.isNotBlank; import static org.usergrid.rest.exceptions.SecurityException.mappableSecurityException; import static org.usergrid.security.oauth.ClientCredentialsInfo.getUUIDFromClientId; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/AuthResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/AuthResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/AuthResource.java index 3a5c71d..8d74792 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/applications/AuthResource.java +++ b/stack/rest/src/main/java/org/usergrid/rest/applications/AuthResource.java @@ -16,19 +16,9 @@ package org.usergrid.rest.applications; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; - +import org.apache.amber.oauth2.common.error.OAuthError; +import org.apache.amber.oauth2.common.message.OAuthResponse; +import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -42,17 +32,16 @@ import org.usergrid.security.providers.SignInAsProvider; import org.usergrid.security.providers.SignInProviderFactory; import org.usergrid.services.ServiceManager; -import org.apache.amber.oauth2.common.error.OAuthError; -import org.apache.amber.oauth2.common.message.OAuthResponse; -import org.apache.commons.lang.StringUtils; +import javax.ws.rs.*; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.UriInfo; import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import static javax.servlet.http.HttpServletResponse.SC_OK; import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED; - -import static org.usergrid.rest.utils.JSONPUtils.jsonMediaType; -import static org.usergrid.rest.utils.JSONPUtils.wrapJSONPResponse; -import static org.usergrid.rest.utils.JSONPUtils.wrapWithCallback; +import static org.usergrid.rest.utils.JSONPUtils.*; @Component http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java index 33ab281..dcd3489 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java +++ b/stack/rest/src/main/java/org/usergrid/rest/applications/ServiceResource.java @@ -16,32 +16,13 @@ package org.usergrid.rest.applications; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; - -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.PathSegment; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; - +import com.sun.jersey.api.json.JSONWithPadding; +import com.sun.jersey.core.provider.EntityHolder; +import com.sun.jersey.multipart.BodyPart; +import com.sun.jersey.multipart.BodyPartEntity; +import com.sun.jersey.multipart.FormDataBodyPart; +import com.sun.jersey.multipart.FormDataMultiPart; +import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -56,32 +37,20 @@ import org.usergrid.rest.RootResource; import org.usergrid.rest.applications.assets.AssetsResource; import org.usergrid.rest.security.annotations.RequireApplicationAccess; import org.usergrid.security.oauth.AccessInfo; -import org.usergrid.services.ServiceAction; -import org.usergrid.services.ServiceManager; -import org.usergrid.services.ServiceParameter; -import org.usergrid.services.ServicePayload; -import org.usergrid.services.ServiceRequest; -import org.usergrid.services.ServiceResults; +import org.usergrid.services.*; import org.usergrid.services.assets.data.AssetUtils; import org.usergrid.services.assets.data.BinaryStore; import org.usergrid.utils.InflectionUtils; -import org.apache.commons.lang.StringUtils; - -import com.sun.jersey.api.json.JSONWithPadding; -import com.sun.jersey.core.provider.EntityHolder; -import com.sun.jersey.multipart.BodyPart; -import com.sun.jersey.multipart.BodyPartEntity; -import com.sun.jersey.multipart.FormDataBodyPart; -import com.sun.jersey.multipart.FormDataMultiPart; +import javax.ws.rs.*; +import javax.ws.rs.core.*; +import java.io.InputStream; +import java.util.*; import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; - import static org.apache.commons.lang.StringUtils.isNotBlank; import static org.usergrid.services.ServiceParameter.addParameter; -import static org.usergrid.services.ServicePayload.batchPayload; -import static org.usergrid.services.ServicePayload.idListPayload; -import static org.usergrid.services.ServicePayload.payload; +import static org.usergrid.services.ServicePayload.*; import static org.usergrid.utils.JsonUtils.mapToJsonString; import static org.usergrid.utils.JsonUtils.normalizeJsonTree; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/assets/AssetsResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/assets/AssetsResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/assets/AssetsResource.java index 2af9925..e7a08b7 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/applications/assets/AssetsResource.java +++ b/stack/rest/src/main/java/org/usergrid/rest/applications/assets/AssetsResource.java @@ -1,27 +1,8 @@ package org.usergrid.rest.applications.assets; -import java.io.InputStream; -import java.util.Date; -import java.util.Map; -import java.util.UUID; - -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.PathSegment; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; - +import com.sun.jersey.api.json.JSONWithPadding; +import com.sun.jersey.multipart.FormDataParam; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -36,9 +17,12 @@ import org.usergrid.services.assets.data.AssetUtils; import org.usergrid.services.assets.data.BinaryStore; import org.usergrid.utils.StringUtils; -import com.sun.jersey.api.json.JSONWithPadding; -import com.sun.jersey.core.header.FormDataContentDisposition; -import com.sun.jersey.multipart.FormDataParam; +import javax.ws.rs.*; +import javax.ws.rs.core.*; +import java.io.InputStream; +import java.util.Date; +import java.util.Map; +import java.util.UUID; /** @deprecated */ http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/events/EventsResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/events/EventsResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/events/EventsResource.java index 28b68ce..025f244 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/applications/events/EventsResource.java +++ b/stack/rest/src/main/java/org/usergrid/rest/applications/events/EventsResource.java @@ -16,14 +16,7 @@ package org.usergrid.rest.applications.events; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.UriInfo; - +import com.sun.jersey.api.json.JSONWithPadding; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Scope; @@ -35,7 +28,13 @@ import org.usergrid.persistence.entities.User; import org.usergrid.rest.applications.ApplicationResource; import org.usergrid.rest.applications.ServiceResource; -import com.sun.jersey.api.json.JSONWithPadding; +import javax.ws.rs.DefaultValue; +import javax.ws.rs.GET; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.UriInfo; @Component("org.usergrid.rest.applications.events.EventsResource") http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueResource.java index edbe028..528143a 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueResource.java +++ b/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueResource.java @@ -16,24 +16,9 @@ package org.usergrid.rest.applications.queues; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.UriInfo; - +import com.sun.jersey.api.json.JSONWithPadding; +import com.sun.jersey.core.provider.EntityHolder; +import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Scope; @@ -45,10 +30,13 @@ import org.usergrid.mq.QueueQuery; import org.usergrid.mq.QueueResults; import org.usergrid.rest.AbstractContextResource; -import org.apache.commons.lang.StringUtils; - -import com.sun.jersey.api.json.JSONWithPadding; -import com.sun.jersey.core.provider.EntityHolder; +import javax.ws.rs.*; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.UriInfo; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Component http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriberResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriberResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriberResource.java index 2c398fb..9a4ff07 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriberResource.java +++ b/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriberResource.java @@ -16,23 +16,9 @@ package org.usergrid.rest.applications.queues; -import java.util.List; -import java.util.Map; - -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.UriInfo; - +import com.sun.jersey.api.json.JSONWithPadding; +import com.sun.jersey.core.provider.EntityHolder; +import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Scope; @@ -41,10 +27,12 @@ import org.usergrid.mq.QueueManager; import org.usergrid.mq.QueueSet; import org.usergrid.rest.AbstractContextResource; -import org.apache.commons.lang.StringUtils; - -import com.sun.jersey.api.json.JSONWithPadding; -import com.sun.jersey.core.provider.EntityHolder; +import javax.ws.rs.*; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.UriInfo; +import java.util.List; +import java.util.Map; @Component http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriptionResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriptionResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriptionResource.java index a163c4c..033d621 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriptionResource.java +++ b/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueSubscriptionResource.java @@ -16,23 +16,9 @@ package org.usergrid.rest.applications.queues; -import java.util.List; -import java.util.Map; - -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.UriInfo; - +import com.sun.jersey.api.json.JSONWithPadding; +import com.sun.jersey.core.provider.EntityHolder; +import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Scope; @@ -41,10 +27,12 @@ import org.usergrid.mq.QueueManager; import org.usergrid.mq.QueueSet; import org.usergrid.rest.AbstractContextResource; -import org.apache.commons.lang.StringUtils; - -import com.sun.jersey.api.json.JSONWithPadding; -import com.sun.jersey.core.provider.EntityHolder; +import javax.ws.rs.*; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.UriInfo; +import java.util.List; +import java.util.Map; @Component http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueTransactionsResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueTransactionsResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueTransactionsResource.java index 3bae506..b5e0b15 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueTransactionsResource.java +++ b/stack/rest/src/main/java/org/usergrid/rest/applications/queues/QueueTransactionsResource.java @@ -16,19 +16,7 @@ package org.usergrid.rest.applications.queues; -import java.util.UUID; - -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.UriInfo; - +import com.sun.jersey.api.json.JSONWithPadding; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Scope; @@ -38,7 +26,11 @@ import org.usergrid.mq.QueueQuery; import org.usergrid.persistence.Results; import org.usergrid.rest.AbstractContextResource; -import com.sun.jersey.api.json.JSONWithPadding; +import javax.ws.rs.*; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.UriInfo; +import java.util.UUID; import static org.usergrid.utils.MapUtils.hashMap; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/users/UserResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/users/UserResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/users/UserResource.java index 10e5595..9c0dd96 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/applications/users/UserResource.java +++ b/stack/rest/src/main/java/org/usergrid/rest/applications/users/UserResource.java @@ -16,25 +16,13 @@ package org.usergrid.rest.applications.users; -import java.util.Map; -import java.util.UUID; - -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.PathSegment; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; - +import com.sun.jersey.api.json.JSONWithPadding; +import com.sun.jersey.api.view.Viewable; +import net.tanesha.recaptcha.ReCaptchaImpl; +import net.tanesha.recaptcha.ReCaptchaResponse; +import org.apache.amber.oauth2.common.exception.OAuthProblemException; +import org.apache.amber.oauth2.common.message.OAuthResponse; +import org.apache.commons.lang.StringUtils; import org.codehaus.jackson.JsonNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,23 +40,13 @@ import org.usergrid.rest.security.annotations.RequireApplicationAccess; import org.usergrid.security.oauth.AccessInfo; import org.usergrid.security.tokens.exceptions.TokenException; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.message.OAuthResponse; -import org.apache.commons.lang.StringUtils; - -import com.sun.jersey.api.json.JSONWithPadding; -import com.sun.jersey.api.view.Viewable; - -import net.tanesha.recaptcha.ReCaptchaImpl; -import net.tanesha.recaptcha.ReCaptchaResponse; - -import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; -import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import javax.ws.rs.*; +import javax.ws.rs.core.*; +import java.util.Map; +import java.util.UUID; -import static org.usergrid.security.shiro.utils.SubjectUtils.getSubjectUserId; -import static org.usergrid.security.shiro.utils.SubjectUtils.isApplicationAdmin; -import static org.usergrid.security.shiro.utils.SubjectUtils.isApplicationUser; +import static javax.servlet.http.HttpServletResponse.*; +import static org.usergrid.security.shiro.utils.SubjectUtils.*; import static org.usergrid.utils.ConversionUtils.string; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/applications/users/UsersResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/applications/users/UsersResource.java b/stack/rest/src/main/java/org/usergrid/rest/applications/users/UsersResource.java index 4a36c97..fa9a841 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/applications/users/UsersResource.java +++ b/stack/rest/src/main/java/org/usergrid/rest/applications/users/UsersResource.java @@ -16,25 +16,11 @@ package org.usergrid.rest.applications.users; -import java.util.List; -import java.util.Map; -import java.util.UUID; - -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.PathSegment; -import javax.ws.rs.core.UriInfo; - +import com.sun.jersey.api.json.JSONWithPadding; +import com.sun.jersey.api.view.Viewable; +import com.sun.jersey.core.provider.EntityHolder; +import net.tanesha.recaptcha.ReCaptchaImpl; +import net.tanesha.recaptcha.ReCaptchaResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Scope; @@ -50,12 +36,14 @@ import org.usergrid.rest.applications.ServiceResource; import org.usergrid.rest.exceptions.RedirectionException; import org.usergrid.rest.security.annotations.RequireApplicationAccess; -import com.sun.jersey.api.json.JSONWithPadding; -import com.sun.jersey.api.view.Viewable; -import com.sun.jersey.core.provider.EntityHolder; - -import net.tanesha.recaptcha.ReCaptchaImpl; -import net.tanesha.recaptcha.ReCaptchaResponse; +import javax.ws.rs.*; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.PathSegment; +import javax.ws.rs.core.UriInfo; +import java.util.List; +import java.util.Map; +import java.util.UUID; import static org.apache.commons.lang.StringUtils.isBlank; import static org.apache.commons.lang.StringUtils.isNotBlank; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/AbstractExceptionMapper.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/AbstractExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/AbstractExceptionMapper.java index 23e3453..b087c80 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/AbstractExceptionMapper.java +++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/AbstractExceptionMapper.java @@ -16,6 +16,10 @@ package org.usergrid.rest.exceptions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.usergrid.rest.ApiResponse; + import javax.servlet.http.HttpServletRequest; import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; @@ -23,14 +27,9 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; import javax.ws.rs.ext.ExceptionMapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.usergrid.rest.ApiResponse; - import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; import static javax.ws.rs.core.Response.Status.OK; - import static org.apache.commons.lang.StringUtils.isNotBlank; import static org.usergrid.rest.utils.JSONPUtils.isJavascript; import static org.usergrid.rest.utils.JSONPUtils.wrapJSONPResponse; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/AuthorizationExceptionMapper.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/AuthorizationExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/AuthorizationExceptionMapper.java index 1cc5535..8a97b3b 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/AuthorizationExceptionMapper.java +++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/AuthorizationExceptionMapper.java @@ -16,11 +16,11 @@ package org.usergrid.rest.exceptions; +import org.apache.shiro.authz.AuthorizationException; + import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; -import org.apache.shiro.authz.AuthorizationException; - import static javax.ws.rs.core.Response.Status.UNAUTHORIZED; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/DuplicateUniquePropertyExistsExceptionMapper.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/DuplicateUniquePropertyExistsExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/DuplicateUniquePropertyExistsExceptionMapper.java index 1b0e4dc..d6926e9 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/DuplicateUniquePropertyExistsExceptionMapper.java +++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/DuplicateUniquePropertyExistsExceptionMapper.java @@ -16,11 +16,11 @@ package org.usergrid.rest.exceptions; +import org.usergrid.persistence.exceptions.DuplicateUniquePropertyExistsException; + import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; -import org.usergrid.persistence.exceptions.DuplicateUniquePropertyExistsException; - import static javax.ws.rs.core.Response.Status.BAD_REQUEST; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/EntityNotFoundExceptionMapper.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/EntityNotFoundExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/EntityNotFoundExceptionMapper.java index 1ee5a07..18e4a87 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/EntityNotFoundExceptionMapper.java +++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/EntityNotFoundExceptionMapper.java @@ -16,11 +16,11 @@ package org.usergrid.rest.exceptions; +import org.usergrid.persistence.exceptions.EntityNotFoundException; + import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; -import org.usergrid.persistence.exceptions.EntityNotFoundException; - import static javax.ws.rs.core.Response.Status.NOT_FOUND; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/ForbiddenServiceOperationExceptionMapper.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/ForbiddenServiceOperationExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/ForbiddenServiceOperationExceptionMapper.java index 06f3ca2..1c846ea 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/ForbiddenServiceOperationExceptionMapper.java +++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/ForbiddenServiceOperationExceptionMapper.java @@ -16,11 +16,11 @@ package org.usergrid.rest.exceptions; +import org.usergrid.services.exceptions.ForbiddenServiceOperationException; + import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; -import org.usergrid.services.exceptions.ForbiddenServiceOperationException; - import static javax.ws.rs.core.Response.Status.FORBIDDEN; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonReadExceptionMapper.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonReadExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonReadExceptionMapper.java index 70508b2..c48fc27 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonReadExceptionMapper.java +++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonReadExceptionMapper.java @@ -17,11 +17,11 @@ package org.usergrid.rest.exceptions; +import org.usergrid.exception.JsonReadException; + import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; -import org.usergrid.exception.JsonReadException; - import static javax.ws.rs.core.Response.Status.BAD_REQUEST; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonWriteExceptionMapper.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonWriteExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonWriteExceptionMapper.java index 5743fdf..ea0a776 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonWriteExceptionMapper.java +++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/JsonWriteExceptionMapper.java @@ -17,11 +17,11 @@ package org.usergrid.rest.exceptions; +import org.usergrid.exception.JsonWriteException; + import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; -import org.usergrid.exception.JsonWriteException; - import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/ManagementExceptionMapper.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/ManagementExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/ManagementExceptionMapper.java index 8208e0c..84ba7a5 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/ManagementExceptionMapper.java +++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/ManagementExceptionMapper.java @@ -16,11 +16,11 @@ package org.usergrid.rest.exceptions; +import org.usergrid.management.exceptions.ManagementException; + import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; -import org.usergrid.management.exceptions.ManagementException; - import static javax.ws.rs.core.Response.Status.BAD_REQUEST; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/NotImplementedExceptionMapper.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/NotImplementedExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/NotImplementedExceptionMapper.java index 2cf22e2..a1b3435 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/NotImplementedExceptionMapper.java +++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/NotImplementedExceptionMapper.java @@ -16,11 +16,11 @@ package org.usergrid.rest.exceptions; +import org.usergrid.exception.NotImplementedException; + import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; -import org.usergrid.exception.NotImplementedException; - @Provider public class NotImplementedExceptionMapper extends AbstractExceptionMapper { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/OAuthProblemExceptionMapper.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/OAuthProblemExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/OAuthProblemExceptionMapper.java index 4e81353..7b0ba71 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/OAuthProblemExceptionMapper.java +++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/OAuthProblemExceptionMapper.java @@ -16,14 +16,14 @@ package org.usergrid.rest.exceptions; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; - import org.apache.amber.oauth2.common.exception.OAuthProblemException; import org.apache.amber.oauth2.common.exception.OAuthSystemException; import org.apache.amber.oauth2.common.message.OAuthResponse; +import javax.ws.rs.core.Response; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/OrganizationApplicationNotFoundException.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/OrganizationApplicationNotFoundException.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/OrganizationApplicationNotFoundException.java index 1435e69..5e1dafd 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/OrganizationApplicationNotFoundException.java +++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/OrganizationApplicationNotFoundException.java @@ -1,11 +1,11 @@ package org.usergrid.rest.exceptions; -import javax.ws.rs.core.UriInfo; - import org.usergrid.rest.ApiResponse; import org.usergrid.rest.ServerEnvironmentProperties; +import javax.ws.rs.core.UriInfo; + import static org.usergrid.utils.JsonUtils.mapToJsonString; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/PersistenceExceptionMapper.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/PersistenceExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/PersistenceExceptionMapper.java index 25d2be0..d652449 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/PersistenceExceptionMapper.java +++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/PersistenceExceptionMapper.java @@ -16,10 +16,10 @@ package org.usergrid.rest.exceptions; -import javax.ws.rs.ext.Provider; - import org.usergrid.persistence.exceptions.PersistenceException; +import javax.ws.rs.ext.Provider; + @Provider public class PersistenceExceptionMapper extends AbstractExceptionMapper { http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryParseExceptionMapper.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryParseExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryParseExceptionMapper.java index 7a4b5f9..a62a51f 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryParseExceptionMapper.java +++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryParseExceptionMapper.java @@ -16,12 +16,11 @@ package org.usergrid.rest.exceptions; +import org.usergrid.persistence.exceptions.QueryParseException; + import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; - -import org.usergrid.persistence.exceptions.QueryParseException; - import static javax.ws.rs.core.Response.Status.BAD_REQUEST; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryTokenExceptionMapper.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryTokenExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryTokenExceptionMapper.java index 510a5d5..74d70ef 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryTokenExceptionMapper.java +++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/QueryTokenExceptionMapper.java @@ -16,13 +16,10 @@ package org.usergrid.rest.exceptions; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; - -import org.usergrid.persistence.exceptions.QueryParseException; import org.usergrid.persistence.exceptions.QueryTokenException; -import antlr.NoViableAltException; +import javax.ws.rs.core.Response; +import javax.ws.rs.ext.Provider; import static javax.ws.rs.core.Response.Status.BAD_REQUEST; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/RecentlyUsedPasswordExceptionMapper.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/RecentlyUsedPasswordExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/RecentlyUsedPasswordExceptionMapper.java index 3ebedfe..9de9d1f 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/RecentlyUsedPasswordExceptionMapper.java +++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/RecentlyUsedPasswordExceptionMapper.java @@ -1,11 +1,11 @@ package org.usergrid.rest.exceptions; +import org.usergrid.management.exceptions.RecentlyUsedPasswordException; + import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; -import org.usergrid.management.exceptions.RecentlyUsedPasswordException; - import static javax.ws.rs.core.Response.Status.CONFLICT; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/RequiredPropertyNotFoundExceptionMapper.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/RequiredPropertyNotFoundExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/RequiredPropertyNotFoundExceptionMapper.java index cb93d2f..d8c8a0c 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/RequiredPropertyNotFoundExceptionMapper.java +++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/RequiredPropertyNotFoundExceptionMapper.java @@ -16,11 +16,11 @@ package org.usergrid.rest.exceptions; +import org.usergrid.persistence.exceptions.RequiredPropertyNotFoundException; + import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; -import org.usergrid.persistence.exceptions.RequiredPropertyNotFoundException; - import static javax.ws.rs.core.Response.Status.BAD_REQUEST; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/SecurityException.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/SecurityException.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/SecurityException.java index 784f238..e1d2130 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/SecurityException.java +++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/SecurityException.java @@ -16,9 +16,8 @@ package org.usergrid.rest.exceptions; -import org.usergrid.rest.ApiResponse; - import com.sun.jersey.api.container.MappableContainerException; +import org.usergrid.rest.ApiResponse; import static org.usergrid.utils.JsonUtils.mapToJsonString; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceExceptionMapper.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceExceptionMapper.java index 2d8d361..efa349c 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceExceptionMapper.java +++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceExceptionMapper.java @@ -16,10 +16,10 @@ package org.usergrid.rest.exceptions; -import javax.ws.rs.ext.Provider; - import org.usergrid.services.exceptions.ServiceException; +import javax.ws.rs.ext.Provider; + /** Will map to HTTP 500 INTERNAL_SERVER_ERROR because parent does */ @Provider http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceResourceNotFoundExceptionMapper.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceResourceNotFoundExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceResourceNotFoundExceptionMapper.java index 32fb5f3..960a7f5 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceResourceNotFoundExceptionMapper.java +++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/ServiceResourceNotFoundExceptionMapper.java @@ -16,12 +16,12 @@ package org.usergrid.rest.exceptions; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; - import org.usergrid.security.shiro.utils.SubjectUtils; import org.usergrid.services.exceptions.ServiceResourceNotFoundException; +import javax.ws.rs.core.Response; +import javax.ws.rs.ext.Provider; + import static javax.ws.rs.core.Response.Status.NOT_FOUND; import static javax.ws.rs.core.Response.Status.UNAUTHORIZED; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2e35e490/stack/rest/src/main/java/org/usergrid/rest/exceptions/TransactionNotFoundExceptionMapper.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/usergrid/rest/exceptions/TransactionNotFoundExceptionMapper.java b/stack/rest/src/main/java/org/usergrid/rest/exceptions/TransactionNotFoundExceptionMapper.java index ef8a99f..f14b4d0 100644 --- a/stack/rest/src/main/java/org/usergrid/rest/exceptions/TransactionNotFoundExceptionMapper.java +++ b/stack/rest/src/main/java/org/usergrid/rest/exceptions/TransactionNotFoundExceptionMapper.java @@ -16,11 +16,11 @@ package org.usergrid.rest.exceptions; +import org.usergrid.persistence.exceptions.TransactionNotFoundException; + import javax.ws.rs.core.Response; import javax.ws.rs.ext.Provider; -import org.usergrid.persistence.exceptions.TransactionNotFoundException; - import static javax.ws.rs.core.Response.Status.NOT_FOUND;