Modified Application Mapping DAO classes

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/ApplicationMappingDAO.java

@@ -26,7 +26,7 @@ public interface ApplicationMappingDAO {
 
     int addApplicationMapping(int deviceId, int applicationId, int tenantId) throws DeviceManagementDAOException;
 
-    List<Integer> addApplicationMappings(int deviceId, List<Integer> applicationIds, int tenantId)
+    void addApplicationMappings(int deviceId, List<Integer> applicationIds, int tenantId)
             throws DeviceManagementDAOException;
 
     void removeApplicationMapping(int deviceId, List<Integer> appIdList, int tenantId)

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/ApplicationMappingDAOImpl.java

@@ -49,7 +49,7 @@ public class ApplicationMappingDAOImpl implements ApplicationMappingDAO {
             conn = this.getConnection();
             String sql = "INSERT INTO DM_DEVICE_APPLICATION_MAPPING (DEVICE_ID, APPLICATION_ID, " +
                     "TENANT_ID) VALUES (?, ?, ?)";
-            stmt = conn.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
+            stmt = conn.prepareStatement(sql, new String[] {"id"});
             stmt.setInt(1, deviceId);
             stmt.setInt(2, applicationId);
             stmt.setInt(3, tenantId);
@@ -68,7 +68,7 @@ public class ApplicationMappingDAOImpl implements ApplicationMappingDAO {
     }
 
     @Override
-    public List<Integer> addApplicationMappings(int deviceId, List<Integer> applicationIds,
+    public void addApplicationMappings(int deviceId, List<Integer> applicationIds,
                                                 int tenantId) throws DeviceManagementDAOException {
         Connection conn;
         PreparedStatement stmt = null;
@@ -78,7 +78,7 @@ public class ApplicationMappingDAOImpl implements ApplicationMappingDAO {
             conn = this.getConnection();
             String sql = "INSERT INTO DM_DEVICE_APPLICATION_MAPPING (DEVICE_ID, APPLICATION_ID, " +
                     "TENANT_ID) VALUES (?, ?, ?)";
-            stmt = conn.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
+            stmt = conn.prepareStatement(sql);
 
             for (int applicationId : applicationIds) {
                 stmt.setInt(1, deviceId);
@@ -88,11 +88,11 @@ public class ApplicationMappingDAOImpl implements ApplicationMappingDAO {
             }
             stmt.executeBatch();
 
-            rs = stmt.getGeneratedKeys();
+//            rs = stmt.getGeneratedKeys();
-            while (rs.next()) {
+//            while (rs.next()) {
-                mappingIds.add(rs.getInt(1));
+//                mappingIds.add(rs.getInt(1));
-            }
+//            }
-            return mappingIds;
+//            return mappingIds;
         } catch (SQLException e) {
             throw new DeviceManagementDAOException("Error occurred while adding device application mappings", e);
         } finally {
@@ -109,7 +109,7 @@ public class ApplicationMappingDAOImpl implements ApplicationMappingDAO {
             conn = this.getConnection();
             String sql = "DELETE DM_DEVICE_APPLICATION_MAPPING WHERE DEVICE_ID = ? AND " +
                     "APPLICATION_ID = ? AND TENANT_ID = ?";
-            stmt = conn.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
+            stmt = conn.prepareStatement(sql);
 
             for (Integer appId : appIdList) {
                 stmt.setInt(1, deviceId);

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/oracle.sql

@@ -162,7 +162,7 @@ CREATE TABLE DM_DEVICE_OPERATION_RESPONSE (
   OPERATION_RESPONSE BLOB DEFAULT NULL,
   CONSTRAINT PK_DM_DEVICE_OP_RESPONSE PRIMARY KEY (ID),
   CONSTRAINT FK_DM_DEVICE_OP_RES_DEVICE FOREIGN KEY (ENROLMENT_ID) REFERENCES
-    DM_DEVICE (ID),
+    DM_ENROLMENT (ID),
   CONSTRAINT FK_DM_DEVICE_OP_RES_OPERATION FOREIGN KEY (OPERATION_ID) REFERENCES
     DM_OPERATION (ID)
 )