community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolved comments

Browse Source
This commit is contained in:
Ruwin Dissanayake 2024-11-17 02:04:04 +05:30
parent a149f64d13
commit 7c40390ee0
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/subscription/mgt/impl/RoleBasedSubscriptionManagementHelperServiceImpl.java
View File

@ -225,7 +225,7 @@ public class RoleBasedSubscriptionManagementHelperServiceImpl implements Subscri
} }
private int getDeviceIdsOwnByRoleWithType(String roleName, int tenantId, ApplicationReleaseDTO applicationReleaseDTO) private int getDeviceIdsOwnByRoleWithType(String roleName, int tenantId, ApplicationReleaseDTO applicationReleaseDTO)
throws UserStoreException, DeviceManagementException { throws UserStoreException, DeviceManagementException, ApplicationManagementException {
UserStoreManager userStoreManager = DataHolder.getInstance().getRealmService() UserStoreManager userStoreManager = DataHolder.getInstance().getRealmService()
.getTenantUserRealm(tenantId).getUserStoreManager(); .getTenantUserRealm(tenantId).getUserStoreManager();
String[] usersWithRole = userStoreManager.getUserListOfRole(roleName); String[] usersWithRole = userStoreManager.getUserListOfRole(roleName);
@ -236,7 +236,7 @@ public class RoleBasedSubscriptionManagementHelperServiceImpl implements Subscri
} catch (ApplicationManagementDAOException e) { } catch (ApplicationManagementDAOException e) {
String msg = "Error encountered while accessing application management data."; String msg = "Error encountered while accessing application management data.";
log.error(msg, e); log.error(msg, e);
throw new DeviceManagementException(msg, e); throw new ApplicationManagementException(msg, e);
} }
for (String user : usersWithRole) { for (String user : usersWithRole) {
try { try {
@ -248,9 +248,6 @@ public class RoleBasedSubscriptionManagementHelperServiceImpl implements Subscri
} catch (DeviceManagementDAOException e) { } catch (DeviceManagementDAOException e) {
String msg = String.format("Error encountered while accessing device management data for user: %s", user); String msg = String.format("Error encountered while accessing device management data for user: %s", user);
log.error(msg, e); log.error(msg, e);
} catch (Exception e) {
String msg = String.format("Unexpected error occurred for user: %s", user);
log.error(msg, e);
} }
} }
return idCountOwnByRole; return idCountOwnByRole;

4
components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/subscription/mgt/impl/UserBasedSubscriptionManagementHelperServiceImpl.java
View File

@ -187,12 +187,10 @@ public class UserBasedSubscriptionManagementHelperServiceImpl implements Subscri
applicationDAO.getApplication(applicationReleaseDTO.getUuid(), tenantId).getDeviceTypeId(), subscriptionInfo.getIdentifier(), null); applicationDAO.getApplication(applicationReleaseDTO.getUuid(), tenantId).getDeviceTypeId(), subscriptionInfo.getIdentifier(), null);
int allDeviceCount = devices.size(); int allDeviceCount = devices.size();
return SubscriptionManagementHelperUtil.getSubscriptionStatistics(subscriptionStatisticDTO, allDeviceCount); return SubscriptionManagementHelperUtil.getSubscriptionStatistics(subscriptionStatisticDTO, allDeviceCount);
} catch (DeviceManagementException | ApplicationManagementDAOException e) { } catch (DeviceManagementException | ApplicationManagementDAOException | DeviceManagementDAOException e) {
String msg = "Error encountered while getting subscription statistics for user: " + subscriptionInfo.getIdentifier(); String msg = "Error encountered while getting subscription statistics for user: " + subscriptionInfo.getIdentifier();
log.error(msg, e); log.error(msg, e);
throw new ApplicationManagementException(msg, e); throw new ApplicationManagementException(msg, e);
} catch (DeviceManagementDAOException e) {
throw new RuntimeException(e);
} finally { } finally {
ConnectionManagerUtil.closeDBConnection(); ConnectionManagerUtil.closeDBConnection();
} }

2
components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/AbstractGroupDAOImpl.java
View File

@ -1621,5 +1621,3 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
} }
} }
} }