Repository: usergrid Updated Branches: refs/heads/master d8787a453 -> 2e89eda2f
USERGRID-1189: fix confusing error messages in REST layer Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/abf27db7 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/abf27db7 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/abf27db7 Branch: refs/heads/master Commit: abf27db752d9e00770df88defa4489b9b642d819 Parents: 2867d26 Author: Mike Dunker <[email protected]> Authored: Wed Dec 30 16:54:11 2015 -0800 Committer: Mike Dunker <[email protected]> Committed: Wed Dec 30 16:54:11 2015 -0800 ---------------------------------------------------------------------- .../rest/management/organizations/users/UsersResource.java | 2 +- .../org/apache/usergrid/rest/management/users/UsersResource.java | 2 +- .../management/users/organizations/OrganizationsResource.java | 4 ++-- .../org/apache/usergrid/rest/system/ApplicationsResource.java | 4 ++-- .../main/java/org/apache/usergrid/rest/system/IndexResource.java | 2 +- .../java/org/apache/usergrid/rest/system/MigrateResource.java | 2 +- .../java/org/apache/usergrid/rest/test/RefreshIndexResource.java | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/abf27db7/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java index d0dfbdb..501c43d 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java @@ -213,7 +213,7 @@ public class UsersResource extends AbstractContextResource { UserInfo user = management.getAdminUserByEmail( email ); if ( user == null ) { - throw new ManagementException( "Username not found: " + email ); + throw new ManagementException( "User with specified email not found: " + email ); } management.addAdminUserToOrganization( user, organization, true ); http://git-wip-us.apache.org/repos/asf/usergrid/blob/abf27db7/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java index 6136139..f584e41 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java @@ -89,7 +89,7 @@ public class UsersResource extends AbstractContextResource { private UserResource getUserResource(UserInfo user, String type, String value) throws ManagementException { if (user == null) { - throw new ManagementException("Could not find organization for " + type + " : " + value); + throw new ManagementException("Could not find user for " + type + ": " + value); } return getSubResource(UserResource.class).init( user ); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/abf27db7/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/organizations/OrganizationsResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/organizations/OrganizationsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/organizations/OrganizationsResource.java index e55969c..dfbe7af 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/organizations/OrganizationsResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/organizations/OrganizationsResource.java @@ -113,8 +113,8 @@ public class OrganizationsResource extends AbstractContextResource { ApiResponse response = createApiResponse(); response.setAction( "new organization for user" ); - if ( organizationName == null ) { - throw new ManagementException( "Could not find organization for name: " + organizationName ); + if ( organizationName == null || organizationName.isEmpty() ) { + throw new ManagementException( "Organization not specified." ); } OrganizationInfo organization = management.createOrganization( organizationName, user, false ); http://git-wip-us.apache.org/repos/asf/usergrid/blob/abf27db7/stack/rest/src/main/java/org/apache/usergrid/rest/system/ApplicationsResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/system/ApplicationsResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/system/ApplicationsResource.java index 55887c7..c023733 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/system/ApplicationsResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/system/ApplicationsResource.java @@ -73,7 +73,7 @@ public class ApplicationsResource extends AbstractContextResource { throws Exception { if(confirmApplicationName == null){ - throw new IllegalArgumentException("please make add a QueryString for confirmApplicationName"); + throw new IllegalArgumentException("confirmApplicationName query parameter is required"); } final UUID jobId = UUIDGenerator.newTimeUUID(); @@ -82,7 +82,7 @@ public class ApplicationsResource extends AbstractContextResource { final String name = em.getApplication().getApplicationName(); if(!name.toLowerCase().equals(confirmApplicationName.toLowerCase())){ throw new IllegalArgumentException( - "confirmApplicationName: " + confirmApplicationName + " does not equal " + name); + "confirmApplicationName mismatch: " + confirmApplicationName + " does not equal " + name); } final StatusService statusService = injector.getInstance(StatusService.class); http://git-wip-us.apache.org/repos/asf/usergrid/blob/abf27db7/stack/rest/src/main/java/org/apache/usergrid/rest/system/IndexResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/system/IndexResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/system/IndexResource.java index bbbe8b3..3f36bfe 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/system/IndexResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/system/IndexResource.java @@ -285,7 +285,7 @@ public class IndexResource extends AbstractContextResource { final UUID appId = UUIDUtils.tryExtractUUID( applicationIdStr ); if(appId == null){ - throw new IllegalArgumentException("app id was not parsed"); + throw new IllegalArgumentException("Application ID in URL not a valid UUID"); } EntityManager em = emf.getEntityManager(appId); http://git-wip-us.apache.org/repos/asf/usergrid/blob/abf27db7/stack/rest/src/main/java/org/apache/usergrid/rest/system/MigrateResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/system/MigrateResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/system/MigrateResource.java index 7a6100b..c17289c 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/system/MigrateResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/system/MigrateResource.java @@ -122,7 +122,7 @@ public class MigrateResource extends AbstractContextResource { throws Exception { if(!getDataMigrationManager().pluginExists(pluginName)){ - throw new IllegalArgumentException("Plugin doesn't exits name:"+pluginName); + throw new IllegalArgumentException("Plugin doesn't exist: "+pluginName); } ApiResponse response = createApiResponse(); http://git-wip-us.apache.org/repos/asf/usergrid/blob/abf27db7/stack/rest/src/main/java/org/apache/usergrid/rest/test/RefreshIndexResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/test/RefreshIndexResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/test/RefreshIndexResource.java index 1fdcee0..666b6cc 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/test/RefreshIndexResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/test/RefreshIndexResource.java @@ -68,7 +68,7 @@ public class RefreshIndexResource extends AbstractContextResource { UUID appid = UUIDUtils.tryExtractUUID(appIdString); if(appid == null){ - throw new IllegalArgumentException("app id is null"); + throw new IllegalArgumentException("app_id query parameter not a valid UUID"); } // refresh the system apps or app lookup below may fail EntityManager em = this.getEmf().getEntityManager(appid);
