rajitha
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

code clean up

Browse Source
revert-dabc3590
prabathabey 9 years ago
parent b5548f5744
commit 363dca0b61
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File

14
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/impl/MobileDeviceOperationMappingDAOImpl.java
Unescape View File

@ -77,7 +77,7 @@ public class MobileDeviceOperationMappingDAOImpl implements MobileDeviceOperatio
String msg = "Error occurred while adding device id - '" + String msg = "Error occurred while adding device id - '" +
mblDeviceOperationMapping.getDeviceId() + " and operation id - " + mblDeviceOperationMapping.getDeviceId() + " and operation id - " +
mblDeviceOperationMapping.getOperationId() + mblDeviceOperationMapping.getOperationId() +
" to mapping table AD_DEVICE_OPERATION"; " to mapping table AD_DEVICE_OPERATION_MAPPING";
log.error(msg, e); log.error(msg, e);
throw new MobileDeviceManagementDAOException(msg, e); throw new MobileDeviceManagementDAOException(msg, e);
} finally { } finally {
@ -114,7 +114,7 @@ public class MobileDeviceOperationMappingDAOImpl implements MobileDeviceOperatio
} catch (SQLException e) { } catch (SQLException e) {
String msg = "Error occurred while updating device id - '" + String msg = "Error occurred while updating device id - '" +
mblDeviceOperation.getDeviceId() + " and operation id - " + mblDeviceOperation.getDeviceId() + " and operation id - " +
mblDeviceOperation.getOperationId() + " in table MBL_DEVICE_OPERATION"; mblDeviceOperation.getOperationId() + " in table AD_DEVICE_OPERATION_MAPPING";
log.error(msg, e); log.error(msg, e);
throw new MobileDeviceManagementDAOException(msg, e); throw new MobileDeviceManagementDAOException(msg, e);
} finally { } finally {
@ -151,7 +151,7 @@ public class MobileDeviceOperationMappingDAOImpl implements MobileDeviceOperatio
String msg = String msg =
"Error occurred while updating the Status of operation to in-progress of device id - '" + "Error occurred while updating the Status of operation to in-progress of device id - '" +
mblDeviceId + " and operation id - " + mblDeviceId + " and operation id - " +
operationId + " in table MBL_DEVICE_OPERATION"; operationId + " in table AD_DEVICE_OPERATION_MAPPING";
log.error(msg, e); log.error(msg, e);
throw new MobileDeviceManagementDAOException(msg, e); throw new MobileDeviceManagementDAOException(msg, e);
} finally { } finally {
@ -189,7 +189,7 @@ public class MobileDeviceOperationMappingDAOImpl implements MobileDeviceOperatio
String msg = String msg =
"Error occurred while updating the Status of operation to completed of device id - '" + "Error occurred while updating the Status of operation to completed of device id - '" +
mblDeviceId + " and operation id - " + mblDeviceId + " and operation id - " +
operationId + " in table MBL_DEVICE_OPERATION"; operationId + " in table AD_DEVICE_OPERATION_MAPPING";
log.error(msg, e); log.error(msg, e);
throw new MobileDeviceManagementDAOException(msg, e); throw new MobileDeviceManagementDAOException(msg, e);
} finally { } finally {
@ -280,7 +280,7 @@ public class MobileDeviceOperationMappingDAOImpl implements MobileDeviceOperatio
PreparedStatement stmt = null; PreparedStatement stmt = null;
MobileDeviceOperationMapping mblDeviceOperation; MobileDeviceOperationMapping mblDeviceOperation;
List<MobileDeviceOperationMapping> mblDeviceOperations = List<MobileDeviceOperationMapping> mblDeviceOperations =
new ArrayList<MobileDeviceOperationMapping>(); new ArrayList<>();
try { try {
conn = this.getConnection(); conn = this.getConnection();
String selectDBQuery = String selectDBQuery =
@ -303,7 +303,7 @@ public class MobileDeviceOperationMappingDAOImpl implements MobileDeviceOperatio
} }
} catch (SQLException e) { } catch (SQLException e) {
String msg = String msg =
"Error occurred while fetching mapping table MBL_DEVICE_OPERATION entries of " + "Error occurred while fetching mapping table AD_DEVICE_OPERATION_MAPPING entries of " +
"device id - '" + mblDeviceId; "device id - '" + mblDeviceId;
log.error(msg, e); log.error(msg, e);
throw new MobileDeviceManagementDAOException(msg, e); throw new MobileDeviceManagementDAOException(msg, e);
@ -321,7 +321,7 @@ public class MobileDeviceOperationMappingDAOImpl implements MobileDeviceOperatio
PreparedStatement stmt = null; PreparedStatement stmt = null;
MobileDeviceOperationMapping mblDeviceOperation = null; MobileDeviceOperationMapping mblDeviceOperation = null;
List<MobileDeviceOperationMapping> mblDeviceOperations = List<MobileDeviceOperationMapping> mblDeviceOperations =
new ArrayList<MobileDeviceOperationMapping>(); new ArrayList<>();
try { try {
conn = this.getConnection(); conn = this.getConnection();

9
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/impl/MobileOperationDAOImpl.java
Unescape View File

@ -36,7 +36,6 @@ import java.sql.SQLException;
*/ */
public class MobileOperationDAOImpl implements MobileOperationDAO { public class MobileOperationDAOImpl implements MobileOperationDAO {
public static final String COLUMN_OPERATION_ID = "OPERATION_ID";
private DataSource dataSource; private DataSource dataSource;
private static final Log log = LogFactory.getLog(MobileOperationDAOImpl.class); private static final Log log = LogFactory.getLog(MobileOperationDAOImpl.class);
@ -54,7 +53,7 @@ public class MobileOperationDAOImpl implements MobileOperationDAO {
conn = this.getConnection(); conn = this.getConnection();
String createDBQuery = String createDBQuery =
"INSERT INTO AD_OPERATION(FEATURE_CODE, CREATED_DATE) VALUES ( ?, ?)"; "INSERT INTO AD_OPERATION(FEATURE_CODE, CREATED_DATE) VALUES ( ?, ?)";
stmt = conn.prepareStatement(createDBQuery, new String[] { COLUMN_OPERATION_ID }); stmt = conn.prepareStatement(createDBQuery, new String[] { "OPERATION_ID" });
stmt.setString(1, mblOperation.getFeatureCode()); stmt.setString(1, mblOperation.getFeatureCode());
stmt.setLong(2, mblOperation.getCreatedDate()); stmt.setLong(2, mblOperation.getCreatedDate());
int rows = stmt.executeUpdate(); int rows = stmt.executeUpdate();
@ -70,7 +69,7 @@ public class MobileOperationDAOImpl implements MobileOperationDAO {
} }
} catch (SQLException e) { } catch (SQLException e) {
String msg = "Error occurred while adding the operation - '" + String msg = "Error occurred while adding the operation - '" +
mblOperation.getFeatureCode() + "' to MBL_OPERATION table"; mblOperation.getFeatureCode() + "' to AD_OPERATION table";
log.error(msg, e); log.error(msg, e);
throw new MobileDeviceManagementDAOException(msg, e); throw new MobileDeviceManagementDAOException(msg, e);
} finally { } finally {
@ -104,7 +103,7 @@ public class MobileOperationDAOImpl implements MobileOperationDAO {
} }
} catch (SQLException e) { } catch (SQLException e) {
String msg = String msg =
"Error occurred while updating the MBL_OPERATION table entry with operation id - '" + "Error occurred while updating the AD_OPERATION table entry with operation id - '" +
mblOperation.getOperationId() + "'"; mblOperation.getOperationId() + "'";
log.error(msg, e); log.error(msg, e);
throw new MobileDeviceManagementDAOException(msg, e); throw new MobileDeviceManagementDAOException(msg, e);
@ -135,7 +134,7 @@ public class MobileOperationDAOImpl implements MobileOperationDAO {
} }
} }
} catch (SQLException e) { } catch (SQLException e) {
String msg = "Error occurred while deleting MBL_OPERATION entry with operation Id - "; String msg = "Error occurred while deleting AD_OPERATION entry with operation Id - ";
log.error(msg, e); log.error(msg, e);
throw new MobileDeviceManagementDAOException(msg, e); throw new MobileDeviceManagementDAOException(msg, e);
} finally { } finally {

8
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/impl/MobileOperationPropertyDAOImpl.java
Unescape View File

@ -70,7 +70,7 @@ public class MobileOperationPropertyDAOImpl implements MobileOperationPropertyDA
} }
} catch (SQLException e) { } catch (SQLException e) {
String msg = String msg =
"Error occurred while adding mobile operation property to MBL_OPERATION_PROPERTY " + "Error occurred while adding mobile operation property to AD_OPERATION_PROPERTY " +
"table"; "table";
log.error(msg, e); log.error(msg, e);
throw new MobileDeviceManagementDAOException(msg, e); throw new MobileDeviceManagementDAOException(msg, e);
@ -107,7 +107,7 @@ public class MobileOperationPropertyDAOImpl implements MobileOperationPropertyDA
} catch (SQLException e) { } catch (SQLException e) {
String msg = String msg =
"Error occurred while updating the mobile operation property in" + "Error occurred while updating the mobile operation property in" +
" MBL_OPERATION_PROPERTY table."; " AD_OPERATION_PROPERTY table.";
log.error(msg, e); log.error(msg, e);
throw new MobileDeviceManagementDAOException(msg, e); throw new MobileDeviceManagementDAOException(msg, e);
} finally { } finally {
@ -139,7 +139,7 @@ public class MobileOperationPropertyDAOImpl implements MobileOperationPropertyDA
} }
} catch (SQLException e) { } catch (SQLException e) {
String msg = String msg =
"Error occurred while deleting MBL_OPERATION_PROPERTY entry with operation Id - "; "Error occurred while deleting AD_OPERATION_PROPERTY entry with operation Id - ";
log.error(msg, e); log.error(msg, e);
throw new MobileDeviceManagementDAOException(msg, e); throw new MobileDeviceManagementDAOException(msg, e);
} finally { } finally {
@ -193,7 +193,7 @@ public class MobileOperationPropertyDAOImpl implements MobileOperationPropertyDA
Connection conn = null; Connection conn = null;
PreparedStatement stmt = null; PreparedStatement stmt = null;
MobileOperationProperty mobileOperationProperty; MobileOperationProperty mobileOperationProperty;
List<MobileOperationProperty> properties = new ArrayList<MobileOperationProperty>(); List<MobileOperationProperty> properties = new ArrayList<>();
try { try {
conn = this.getConnection(); conn = this.getConnection();
String selectDBQuery = String selectDBQuery =

Write Preview
Loading…
Cancel
Save