Revert "Make application users service use same logic for get by name."
This reverts commit a9c7190a4b853a564c02f07ba285678b88a24df2. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/fe6bea2b Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/fe6bea2b Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/fe6bea2b Branch: refs/heads/master Commit: fe6bea2bce6fe57814d1d90eba25296a04469920 Parents: 911da7f Author: Michael Russo <[email protected]> Authored: Wed Aug 24 11:07:18 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Wed Aug 24 11:07:18 2016 -0700 ---------------------------------------------------------------------- .../usergrid/services/users/UsersService.java | 29 +++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/fe6bea2b/stack/services/src/main/java/org/apache/usergrid/services/users/UsersService.java ---------------------------------------------------------------------- diff --git a/stack/services/src/main/java/org/apache/usergrid/services/users/UsersService.java b/stack/services/src/main/java/org/apache/usergrid/services/users/UsersService.java index 90d4fff..0539695 100644 --- a/stack/services/src/main/java/org/apache/usergrid/services/users/UsersService.java +++ b/stack/services/src/main/java/org/apache/usergrid/services/users/UsersService.java @@ -79,7 +79,34 @@ public class UsersService extends AbstractCollectionService { @Override public ServiceResults getItemByName( ServiceContext context, String name ) throws Exception { - super.getItemByName(context, name); + String nameProperty = Schema.getDefaultSchema().aliasProperty( getEntityType() ); + + if ( nameProperty == null ) { + nameProperty = "name"; + } + + EntityRef entity = null; + Identifier id = Identifier.from( name ); + + if ( id != null ) { + entity = em.getUserByIdentifier( id ); + } + + if ( entity == null ) { + throw new ServiceResourceNotFoundException( context ); + } + + if ( !context.moreParameters() ) { + entity = em.get( entity ); + entity = importEntity( context, ( Entity ) entity ); + } + + checkPermissionsForEntity( context, entity ); + + List<ServiceRequest> nextRequests = context.getNextServiceRequests( entity ); + + return new ServiceResults( this, context, ServiceResults.Type.COLLECTION, Results.fromRef( entity ), null, + nextRequests ); }
