diff --git a/components/org.wso2.carbon.identity.organization.management.organization.user.sharing/pom.xml b/components/org.wso2.carbon.identity.organization.management.organization.user.sharing/pom.xml index 977764597..ff1aef303 100644 --- a/components/org.wso2.carbon.identity.organization.management.organization.user.sharing/pom.xml +++ b/components/org.wso2.carbon.identity.organization.management.organization.user.sharing/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.organization.management identity-organization-management - 1.3.91-SNAPSHOT + 1.3.92-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.organization.management.organization.user.sharing/src/main/java/org/wso2/carbon/identity/organization/management/organization/user/sharing/OrganizationUserSharingService.java b/components/org.wso2.carbon.identity.organization.management.organization.user.sharing/src/main/java/org/wso2/carbon/identity/organization/management/organization/user/sharing/OrganizationUserSharingService.java index 66558fe80..3da005c45 100644 --- a/components/org.wso2.carbon.identity.organization.management.organization.user.sharing/src/main/java/org/wso2/carbon/identity/organization/management/organization/user/sharing/OrganizationUserSharingService.java +++ b/components/org.wso2.carbon.identity.organization.management.organization.user.sharing/src/main/java/org/wso2/carbon/identity/organization/management/organization/user/sharing/OrganizationUserSharingService.java @@ -45,7 +45,7 @@ void shareOrganizationUser(String orgId, String associatedUserId, String associa * @return True if the user associations are deleted successfully. * @throws OrganizationManagementException If an error occurs while deleting the user associations. */ - boolean unShareOrganizationUsers(String associatedUserId, String associatedOrgId) + boolean unshareOrganizationUsers(String associatedUserId, String associatedOrgId) throws OrganizationManagementException; /** diff --git a/components/org.wso2.carbon.identity.organization.management.organization.user.sharing/src/main/java/org/wso2/carbon/identity/organization/management/organization/user/sharing/OrganizationUserSharingServiceImpl.java b/components/org.wso2.carbon.identity.organization.management.organization.user.sharing/src/main/java/org/wso2/carbon/identity/organization/management/organization/user/sharing/OrganizationUserSharingServiceImpl.java index 7a2dfb71c..a84c307d3 100644 --- a/components/org.wso2.carbon.identity.organization.management.organization.user.sharing/src/main/java/org/wso2/carbon/identity/organization/management/organization/user/sharing/OrganizationUserSharingServiceImpl.java +++ b/components/org.wso2.carbon.identity.organization.management.organization.user.sharing/src/main/java/org/wso2/carbon/identity/organization/management/organization/user/sharing/OrganizationUserSharingServiceImpl.java @@ -76,7 +76,7 @@ public void shareOrganizationUser(String orgId, String associatedUserId, String } @Override - public boolean unShareOrganizationUsers(String associatedUserId, String associatedOrgId) + public boolean unshareOrganizationUsers(String associatedUserId, String associatedOrgId) throws OrganizationManagementException { List userAssociationList = diff --git a/components/org.wso2.carbon.identity.organization.management.organization.user.sharing/src/main/java/org/wso2/carbon/identity/organization/management/organization/user/sharing/internal/OrganizationUserSharingDataHolder.java b/components/org.wso2.carbon.identity.organization.management.organization.user.sharing/src/main/java/org/wso2/carbon/identity/organization/management/organization/user/sharing/internal/OrganizationUserSharingDataHolder.java index 73502d022..8a17076e8 100644 --- a/components/org.wso2.carbon.identity.organization.management.organization.user.sharing/src/main/java/org/wso2/carbon/identity/organization/management/organization/user/sharing/internal/OrganizationUserSharingDataHolder.java +++ b/components/org.wso2.carbon.identity.organization.management.organization.user.sharing/src/main/java/org/wso2/carbon/identity/organization/management/organization/user/sharing/internal/OrganizationUserSharingDataHolder.java @@ -37,21 +37,41 @@ public static OrganizationUserSharingDataHolder getInstance() { return instance; } + /** + * Get the organization manager service. + * + * @return Organization manager service. + */ public OrganizationManager getOrganizationManager() { return organizationManager; } + /** + * Set the organization manager service. + * + * @param organizationManager Organization manager service. + */ public void setOrganizationManager(OrganizationManager organizationManager) { this.organizationManager = organizationManager; } + /** + * Get the realm service. + * + * @return Realm service. + */ public RealmService getRealmService() { return realmService; } + /** + * Set the realm service. + * + * @param realmService RealmService service. + */ public void setRealmService(RealmService realmService) { this.realmService = realmService; diff --git a/components/org.wso2.carbon.identity.organization.management.organization.user.sharing/src/main/java/org/wso2/carbon/identity/organization/management/organization/user/sharing/listener/SharedUserOperationEventListener.java b/components/org.wso2.carbon.identity.organization.management.organization.user.sharing/src/main/java/org/wso2/carbon/identity/organization/management/organization/user/sharing/listener/SharedUserOperationEventListener.java index 35882d83e..ea361340c 100644 --- a/components/org.wso2.carbon.identity.organization.management.organization.user.sharing/src/main/java/org/wso2/carbon/identity/organization/management/organization/user/sharing/listener/SharedUserOperationEventListener.java +++ b/components/org.wso2.carbon.identity.organization.management.organization.user.sharing/src/main/java/org/wso2/carbon/identity/organization/management/organization/user/sharing/listener/SharedUserOperationEventListener.java @@ -71,7 +71,7 @@ public boolean doPreDeleteUserWithID(String userID, UserStoreManager userStoreMa .resolveOrganizationId(getTenantDomain()); } // Delete all the user associations of the user. - return organizationUserSharingService.unShareOrganizationUsers(userID, orgId); + return organizationUserSharingService.unshareOrganizationUsers(userID, orgId); } catch (OrganizationManagementException e) { throw new UserStoreException(e.getMessage(), e.getErrorCode(), e); }