Skip to content

Commit

Permalink
Address review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
sadilchamishka committed Oct 24, 2023
1 parent f4f7b27 commit 3da2b8e
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.wso2.carbon.identity.organization.management</groupId>
<artifactId>identity-organization-management</artifactId>
<version>1.3.91-SNAPSHOT</version>
<version>1.3.92-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<UserAssociation> userAssociationList =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 3da2b8e

Please sign in to comment.