From 679e926c63291073c3d790afdcaf2aaee7ae2488 Mon Sep 17 00:00:00 2001 From: Maciej Swiderski Date: Mon, 8 Oct 2012 15:11:23 +0200 Subject: [PATCH] - removed unused code in task service session and updated callback impl that used it --- .../org/jbpm/task/identity/DBUserGroupCallbackImpl.java | 1 - .../org/jbpm/task/identity/JAASUserGroupCallbackImpl.java | 1 - .../org/jbpm/task/identity/LDAPUserGroupCallbackImpl.java | 2 -- .../org/jbpm/task/identity/UserGroupCallbackManager.java | 2 +- .../java/org/jbpm/task/service/TaskServiceSession.java | 7 +------ 5 files changed, 2 insertions(+), 11 deletions(-) diff --git a/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/identity/DBUserGroupCallbackImpl.java b/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/identity/DBUserGroupCallbackImpl.java index fe3437ce7e..d050b757af 100644 --- a/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/identity/DBUserGroupCallbackImpl.java +++ b/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/identity/DBUserGroupCallbackImpl.java @@ -164,7 +164,6 @@ private void init() { throw new IllegalArgumentException("All properties must be given ("+ DS_JNDI_NAME + "," + USER_ROLES_QUERY +"," + ROLES_QUERY +"," +USER_ROLES_QUERY +")"); } - UserGroupCallbackManager.getInstance().setProperty("disable.all.groups", "true"); String jndiName = this.config.getProperty(DS_JNDI_NAME, "java:/DefaultDS"); try { InitialContext ctx = new InitialContext(); diff --git a/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/identity/JAASUserGroupCallbackImpl.java b/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/identity/JAASUserGroupCallbackImpl.java index 4d35c0045d..c70857f07a 100644 --- a/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/identity/JAASUserGroupCallbackImpl.java +++ b/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/identity/JAASUserGroupCallbackImpl.java @@ -82,7 +82,6 @@ public JAASUserGroupCallbackImpl() { public JAASUserGroupCallbackImpl(String rolesPrincipleName) { this.rolePrincipleName = rolesPrincipleName; - UserGroupCallbackManager.getInstance().setProperty("disable.all.groups", "true"); } public String getRolePrincipleName() { diff --git a/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/identity/LDAPUserGroupCallbackImpl.java b/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/identity/LDAPUserGroupCallbackImpl.java index e48ddd4639..783f4aa666 100644 --- a/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/identity/LDAPUserGroupCallbackImpl.java +++ b/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/identity/LDAPUserGroupCallbackImpl.java @@ -98,13 +98,11 @@ public LDAPUserGroupCallbackImpl() { config = null; } } - UserGroupCallbackManager.getInstance().setProperty("disable.all.groups", "true"); validate(); } public LDAPUserGroupCallbackImpl(Properties config) { this.config = config; - UserGroupCallbackManager.getInstance().setProperty("disable.all.groups", "true"); validate(); } diff --git a/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/identity/UserGroupCallbackManager.java b/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/identity/UserGroupCallbackManager.java index 07a80ad5c4..322d972077 100644 --- a/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/identity/UserGroupCallbackManager.java +++ b/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/identity/UserGroupCallbackManager.java @@ -94,7 +94,7 @@ public UserGroupCallback getCallback() { public String getProperty(String name) { if (this.callbackproperties != null) { - this.callbackproperties.getProperty(name); + return this.callbackproperties.getProperty(name); } return null; diff --git a/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/service/TaskServiceSession.java b/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/service/TaskServiceSession.java index b1a9744fd5..e8c058eba5 100644 --- a/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/service/TaskServiceSession.java +++ b/jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/task/service/TaskServiceSession.java @@ -1188,12 +1188,7 @@ private List doUserGroupCallbackOperation(String userId, List gr doCallbackUserOperation(userId); doCallbackGroupsOperation(userId, groupIds); List allGroupIds = null; - if (UserGroupCallbackManager.getInstance().getProperty("disable.all.groups") == null) { - // get all groups - // (The fact that this isn't done in a query will probably become a problem at some point.. ) - Query query = tpm.createNewQuery("select g.id from Group g"); - allGroupIds = ((List) query.getResultList()); - } + return UserGroupCallbackManager.getInstance().getCallback().getGroupsForUser(userId, groupIds, allGroupIds); } else { logger.debug("UserGroupCallback has not been registered.");