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

Merge branch 'master' into 'master'

Browse Source 
Remove duplicates in getApplications API

Closes product-iots#342

See merge request entgra/carbon-device-mgt!467
This commit is contained in:
Dharmakeerthi Lasantha 2020-03-17 09:33:40 +00:00
commit d8d0530943
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/ApplicationDAOImpl.java
View File

@ -277,9 +277,9 @@ public class ApplicationDAOImpl implements ApplicationDAO {
throws DeviceManagementDAOException {
List<Application> applications = new ArrayList<>();
Application application;
String sql = "Select " +
"ID," +
" NAME, " +
String sql = "SELECT " +
"ID, " +
"NAME, " +
"APP_IDENTIFIER, " +
"PLATFORM, " +
"CATEGORY, " +
@ -291,8 +291,14 @@ public class ApplicationDAOImpl implements ApplicationDAO {
"MEMORY_USAGE, " +
"IS_ACTIVE, " +
"TENANT_ID " +
"From DM_APPLICATION " +
"WHERE PLATFORM = ? " +
"FROM DM_APPLICATION " +
"WHERE NOT EXISTS " +
"(SELECT " +
"ID " +
"FROM DM_APPLICATION A " +
"WHERE A.NAME = DM_APPLICATION.NAME " +
"AND A.ID < DM_APPLICATION.ID) " +
"AND PLATFORM = ? " +
"AND TENANT_ID = ? LIMIT ? OFFSET ?";
try {
Connection conn = this.getConnection();