Address review comments

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/services/SubscriptionManager.java

@@ -291,14 +291,14 @@ public interface SubscriptionManager {
     /**
      * This method is responsible for retrieving device subscription details related to the given UUID.
      *
-     * @param uuid the UUID of the application release.
      * @param deviceId the deviceId of the device that need to get operation details.
+     * @param uuid the UUID of the application release.
      * @param offset the offset for the data set
      * @param limit the limit for the data set
      * @return {@link DeviceOperationDTO} which contains the details of device subscriptions.
      * @throws SubscriptionManagementException if there is an error while fetching the details.
      */
-    List<DeviceOperationDTO> getSubscriptionOperationsByUUIDAndDeviceID(String uuid, int deviceId, int offset, int limit)
+    List<DeviceOperationDTO> getSubscriptionOperationsByUUIDAndDeviceID(int deviceId, String uuid, int offset, int limit)
             throws ApplicationManagementException;
 
     /**

components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/SubscriptionManagerImpl.java

@@ -2582,7 +2582,7 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
     }
 
     @Override
-    public List<DeviceOperationDTO> getSubscriptionOperationsByUUIDAndDeviceID(String uuid, int deviceId, int offset, int limit)
+    public List<DeviceOperationDTO> getSubscriptionOperationsByUUIDAndDeviceID(int deviceId, String uuid, int offset, int limit)
             throws ApplicationManagementException {
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
         if (uuid == null || uuid.isEmpty()) {

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/operation/mgt/dao/impl/GenericOperationDAOImpl.java

@@ -2796,8 +2796,9 @@ public class GenericOperationDAOImpl implements OperationDAO {
                 "WHERE o.ID = ? " +
                 "AND o.TENANT_ID = ?";
 
-        try (Connection conn = OperationManagementDAOFactory.getConnection();
+        try {
-             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            Connection conn = OperationManagementDAOFactory.getConnection();
+            try (PreparedStatement stmt = conn.prepareStatement(sql)) {
                 stmt.setInt(1, operationId);
                 stmt.setInt(2, tenantId);
 
@@ -2830,9 +2831,11 @@ public class GenericOperationDAOImpl implements OperationDAO {
                     }
                     operationDetails.setOperationResponses(responses);
                 }
+            }
         } catch (SQLException e) {
-            throw new OperationManagementDAOException("Error occurred while retrieving operation details for operation ID: "
+            String msg = "Error occurred while retrieving operation details for operation ID: " + operationId;
-                    + operationId, e);
+            log.error(msg, e);
+            throw new OperationManagementDAOException(msg, e);
         }
 
         return operationDetails;