Updated call for new read api in 2.0
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/7fc7c55b Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/7fc7c55b Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/7fc7c55b Branch: refs/heads/USERGRID-909 Commit: 7fc7c55b7839ff9ba5a71b1c3d74a095c27f49ff Parents: 08e9781 Author: Todd Nine <tn...@apigee.com> Authored: Thu Oct 29 13:56:14 2015 -0600 Committer: Todd Nine <tn...@apigee.com> Committed: Thu Oct 29 13:56:14 2015 -0600 ---------------------------------------------------------------------- .../apache/usergrid/rest/applications/users/UserResource.java | 4 ++-- .../java/org/apache/usergrid/management/ManagementService.java | 2 +- .../usergrid/management/cassandra/ManagementServiceImpl.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/7fc7c55b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java index fb10245..716f367 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/applications/users/UserResource.java @@ -169,7 +169,7 @@ public class UserResource extends ServiceResource { @GET @RequireSystemAccess - @Path("password") + @Path("credentials") public JSONWithPadding getUserPassword(@QueryParam("callback") @DefaultValue("callback") String callback ) throws Exception { @@ -192,7 +192,7 @@ public class UserResource extends ServiceResource { return new JSONWithPadding( response, callback ); } - final CredentialsInfo credentialsInfo = management.getAppUserPasswordRaw( applicationId, targetUserId ); + final CredentialsInfo credentialsInfo = management.getAppUserCredentialsInfo( applicationId, targetUserId ); response.setProperty( "credentials", credentialsInfo ); http://git-wip-us.apache.org/repos/asf/usergrid/blob/7fc7c55b/stack/services/src/main/java/org/apache/usergrid/management/ManagementService.java ---------------------------------------------------------------------- diff --git a/stack/services/src/main/java/org/apache/usergrid/management/ManagementService.java b/stack/services/src/main/java/org/apache/usergrid/management/ManagementService.java index 3f02e5a..cf2924b 100644 --- a/stack/services/src/main/java/org/apache/usergrid/management/ManagementService.java +++ b/stack/services/src/main/java/org/apache/usergrid/management/ManagementService.java @@ -288,7 +288,7 @@ public interface ManagementService { public void setAppUserPassword( UUID applicationId, UUID userId, String oldPassword, String newPassword ) throws Exception; - CredentialsInfo getAppUserPasswordRaw( final UUID applicationId, final UUID userId ) throws Exception; + CredentialsInfo getAppUserCredentialsInfo( final UUID applicationId, final UUID userId ) throws Exception; /** * Set the credentials info into the http://git-wip-us.apache.org/repos/asf/usergrid/blob/7fc7c55b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java ---------------------------------------------------------------------- diff --git a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java index b633727..dfd0cb1 100644 --- a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java +++ b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java @@ -2825,7 +2825,7 @@ public class ManagementServiceImpl implements ManagementService { @Override - public CredentialsInfo getAppUserPasswordRaw( final UUID applicationId, final UUID userId ) throws Exception { + public CredentialsInfo getAppUserCredentialsInfo( final UUID applicationId, final UUID userId ) throws Exception { final User user = emf.getEntityManager( applicationId ).get( userId, User.class ); @@ -2833,7 +2833,7 @@ public class ManagementServiceImpl implements ManagementService { throw new EntityNotFoundException("Could not find user with id " + userId + " in application" + applicationId ); } - final CredentialsInfo ci = readUserPasswordCredentials( applicationId, userId ); + final CredentialsInfo ci = readUserPasswordCredentials( applicationId, userId, User.ENTITY_TYPE ); if ( ci == null ) { throw new EntityNotFoundException("Could not find credentials for user with id " + userId + " in application" + applicationId );