[3/3] incubator-usergrid git commit: Merge branch 'master' into USERGRID-576-ssometrics

[grey]

Merge branch 'master' into USERGRID-576-ssometrics

Conflicts:
        
stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e7a543b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e7a543b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e7a543b4

Branch: refs/heads/master
Commit: e7a543b4bbd22bc2a8b440359270adf1e83efb1f
Parents: 77819b3 0d1965d
Author: Dave Johnson <dmjohn...@apigee.com>
Authored: Wed Apr 22 15:19:05 2015 -0400
Committer: Dave Johnson <dmjohn...@apigee.com>
Committed: Wed Apr 22 15:19:05 2015 -0400

----------------------------------------------------------------------
 stack/pom.xml                                   | 24 --------
 .../rest/management/ManagementResource.java     | 60 +++++++++-----------
 2 files changed, 27 insertions(+), 57 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e7a543b4/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
----------------------------------------------------------------------
diff --cc 
stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
index 0e1469c,d2ba606..7c8cf43
--- 
a/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
+++ 
b/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java
@@@ -17,17 -17,6 +17,8 @@@
  package org.apache.usergrid.rest.management;
  
  
- import java.net.URLEncoder;
- import java.util.*;
- 
- 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 com.codahale.metrics.Counter;
 +import com.codahale.metrics.Timer;
  import com.sun.jersey.api.client.Client;
  import com.sun.jersey.api.client.config.ClientConfig;
  import com.sun.jersey.api.client.config.DefaultClientConfig;
@@@ -58,6 -37,7 +39,8 @@@ import org.apache.usergrid.management.U
  import org.apache.usergrid.management.exceptions.DisabledAdminUserException;
  import 
org.apache.usergrid.management.exceptions.UnactivatedAdminUserException;
  import 
org.apache.usergrid.management.exceptions.UnconfirmedAdminUserException;
++import org.apache.usergrid.metrics.MetricsFactory;
+ import org.apache.usergrid.persistence.exceptions.EntityNotFoundException;
  import org.apache.usergrid.rest.AbstractContextResource;
  import org.apache.usergrid.rest.exceptions.RedirectionException;
  import 
org.apache.usergrid.rest.management.organizations.OrganizationsResource;
@@@ -590,7 -565,7 +583,8 @@@ public class ManagementResource extend
  
                  JsonNode orgsNode = userNode.get( "organizations" );
                  Iterator<String> fieldNames = orgsNode.getFieldNames();
 -                if (!fieldNames.hasNext()) {
++
 +                if ( !fieldNames.hasNext() ) {
                      // no organizations for user exist in response from 
central Usergrid SSO
                      // so create user's personal organization and use 
username as organization name
                      fieldNames = Collections.singletonList( username 
).iterator();