You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/09/21 00:12:49 UTC

[15/21] usergrid git commit: item is missing from get role by name

item is missing from get role by name


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

Branch: refs/heads/two-dot-o-dev
Commit: 847c39fbe0a3a310dffb554b881c37a8698f9759
Parents: 08f316f
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Sep 16 14:44:11 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Sep 16 14:44:11 2015 -0600

----------------------------------------------------------------------
 .../org/apache/usergrid/persistence/PermissionsIT.java  |  7 ++++---
 .../apache/usergrid/services/roles/RolesService.java    | 12 ------------
 2 files changed, 4 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/847c39fb/stack/core/src/test/java/org/apache/usergrid/persistence/PermissionsIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/PermissionsIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/PermissionsIT.java
index a01692a..11f0692 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/PermissionsIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/PermissionsIT.java
@@ -23,6 +23,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
+import com.google.common.base.Optional;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -110,14 +111,14 @@ public class PermissionsIT extends AbstractCoreIT {
         assertNotNull( em );
 
         // em.createRole("admin", null);
-        em.createRole( "manager", null, 0 );
-        em.createRole( "member", null, 100000 );
+        em.createRole("manager", null, 0);
+        Entity memberRole = em.createRole( "member", null, 100000 );
 
         Map<String, String> roles = em.getRoles();
         assertEquals( "proper number of roles not set", 5, roles.size() );
         dump( "roles", roles );
 
-        em.deleteRole( "member" );
+        em.deleteRole("member", Optional.fromNullable(memberRole));
 
         roles = em.getRoles();
         assertEquals( "proper number of roles not set", 4, roles.size() );

http://git-wip-us.apache.org/repos/asf/usergrid/blob/847c39fb/stack/services/src/main/java/org/apache/usergrid/services/roles/RolesService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/roles/RolesService.java b/stack/services/src/main/java/org/apache/usergrid/services/roles/RolesService.java
index 475d38d..344ea1f 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/roles/RolesService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/roles/RolesService.java
@@ -196,18 +196,6 @@ public class RolesService extends AbstractCollectionService {
     }
 
 
-    public ServiceResults newApplicationRole( String roleName, String roleTitle, long inactivity ) throws Exception {
-        em.createRole( roleName, roleTitle, inactivity );
-        return getApplicationRoles();
-    }
-
-
-    public ServiceResults deleteApplicationRole( String roleName ) throws Exception {
-        em.deleteRole( roleName );
-        return getApplicationRolePermissions( roleName );
-    }
-
-
     public ServiceResults getApplicationRolePermissions( String roleName ) throws Exception {
         Set<String> permissions = em.getRolePermissions( roleName );
         ServiceResults results = genericServiceResults().withData( permissions );