@ -105,10 +105,6 @@ public class OperationManagerImpl implements OperationManager {
return notificationStrategy ;
return notificationStrategy ;
}
}
public void setNotificationStrategy ( NotificationStrategy notificationStrategy ) {
this . notificationStrategy = notificationStrategy ;
}
public OperationManagerImpl ( String deviceType , NotificationStrategy notificationStrategy ) {
public OperationManagerImpl ( String deviceType , NotificationStrategy notificationStrategy ) {
this ( deviceType ) ;
this ( deviceType ) ;
this . notificationStrategy = notificationStrategy ;
this . notificationStrategy = notificationStrategy ;
@ -122,7 +118,7 @@ public class OperationManagerImpl implements OperationManager {
log . debug ( "operation:[" + operation . toString ( ) + "]" ) ;
log . debug ( "operation:[" + operation . toString ( ) + "]" ) ;
for ( DeviceIdentifier deviceIdentifier : deviceIds ) {
for ( DeviceIdentifier deviceIdentifier : deviceIds ) {
log . debug ( "device identifier id:[" + deviceIdentifier . getId ( ) + "] type:[" +
log . debug ( "device identifier id:[" + deviceIdentifier . getId ( ) + "] type:[" +
deviceIdentifier . getType ( ) + "]" ) ;
deviceIdentifier . getType ( ) + "]" ) ;
}
}
}
}
try {
try {
@ -137,7 +133,7 @@ public class OperationManagerImpl implements OperationManager {
//Send the operation statuses only for admin triggered operations
//Send the operation statuses only for admin triggered operations
String deviceType = validDeviceIds . get ( 0 ) . getType ( ) ;
String deviceType = validDeviceIds . get ( 0 ) . getType ( ) ;
activity . setActivityStatus ( this . getActivityStatus ( deviceValidationResult , deviceAuthorizationResult ,
activity . setActivityStatus ( this . getActivityStatus ( deviceValidationResult , deviceAuthorizationResult ,
deviceType ) ) ; deviceType ) ) ;
return activity ;
return activity ;
}
}
@ -160,7 +156,7 @@ public class OperationManagerImpl implements OperationManager {
boolean hasExistingTaskOperation ;
boolean hasExistingTaskOperation ;
int enrolmentId ;
int enrolmentId ;
if ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Control . NO_REPEAT = = operationDto .
if ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Control . NO_REPEAT = = operationDto .
getControl ( ) ) { getControl ( ) ) {
isNotRepeated = true ;
isNotRepeated = true ;
}
}
@ -177,10 +173,10 @@ public class OperationManagerImpl implements OperationManager {
}
}
} else if ( isNotRepeated ) {
} else if ( isNotRepeated ) {
operationDAO . updateEnrollmentOperationsStatus ( enrolmentId , operationCode ,
operationDAO . updateEnrollmentOperationsStatus ( enrolmentId , operationCode ,
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . org . wso2 . carbon . device . mgt . core . dto . operation . mgt .
Operation . Status . PENDING ,
Operation . Status . PENDING ,
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . org . wso2 . carbon . device . mgt . core . dto . operation . mgt .
Operation . Status . REPEATED ) ;
Operation . Status . REPEATED ) ;
operationMappingDAO . addOperationMapping ( operationId , enrolmentId , isScheduled ) ;
operationMappingDAO . addOperationMapping ( operationId , enrolmentId , isScheduled ) ;
} else {
} else {
operationMappingDAO . addOperationMapping ( operationId , enrolmentId , isScheduled ) ;
operationMappingDAO . addOperationMapping ( operationId , enrolmentId , isScheduled ) ;
@ -200,8 +196,8 @@ public class OperationManagerImpl implements OperationManager {
operationMappingDAO . updateOperationMapping ( operationId , enrolmentId , org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . PushNotificationStatus . COMPLETED ) ;
operationMappingDAO . updateOperationMapping ( operationId , enrolmentId , org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . PushNotificationStatus . COMPLETED ) ;
} catch ( PushNotificationExecutionFailedException e ) {
} catch ( PushNotificationExecutionFailedException e ) {
log . error ( "Error occurred while sending push notifications to " +
log . error ( "Error occurred while sending push notifications to " +
deviceId . getType ( ) + " device carrying id '" +
deviceId . getType ( ) + " device carrying id '" +
deviceId + "'" , e ) ;
deviceId + "'" , e ) ;
// Reschedule if push notification failed.
// Reschedule if push notification failed.
operationMappingDAO . updateOperationMapping ( operationId , enrolmentId , org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . PushNotificationStatus . SCHEDULED ) ;
operationMappingDAO . updateOperationMapping ( operationId , enrolmentId , org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . PushNotificationStatus . SCHEDULED ) ;
}
}
@ -219,7 +215,7 @@ public class OperationManagerImpl implements OperationManager {
//Get the device-type from 1st valid DeviceIdentifier. We know the 1st element is definitely there.
//Get the device-type from 1st valid DeviceIdentifier. We know the 1st element is definitely there.
String deviceType = validDeviceIds . get ( 0 ) . getType ( ) ;
String deviceType = validDeviceIds . get ( 0 ) . getType ( ) ;
activity . setActivityStatus ( this . getActivityStatus ( deviceValidationResult , deviceAuthorizationResult ,
activity . setActivityStatus ( this . getActivityStatus ( deviceValidationResult , deviceAuthorizationResult ,
deviceType ) ) ; deviceType ) ) ;
}
}
return activity ;
return activity ;
} else {
} else {
@ -242,7 +238,7 @@ public class OperationManagerImpl implements OperationManager {
//Add the invalid DeviceIds
//Add the invalid DeviceIds
for ( String id : deviceIdValidationResult . getErrorDeviceIdList ( ) ) {
for ( String id : deviceIdValidationResult . getErrorDeviceIdList ( ) ) {
activityStatus = new ActivityStatus ( ) ;
activityStatus = new ActivityStatus ( ) ;
activityStatus . setDeviceIdentifier ( new DeviceIdentifier ( id , deviceType ) ) ;
activityStatus . setDeviceIdentifier ( new DeviceIdentifier ( id , deviceType ) ) ;
activityStatus . setStatus ( ActivityStatus . Status . INVALID ) ;
activityStatus . setStatus ( ActivityStatus . Status . INVALID ) ;
activityStatuses . add ( activityStatus ) ;
activityStatuses . add ( activityStatus ) ;
}
}
@ -288,7 +284,7 @@ public class OperationManagerImpl implements OperationManager {
}
}
} catch ( DeviceAccessAuthorizationException e ) {
} catch ( DeviceAccessAuthorizationException e ) {
throw new OperationManagementException ( "Error occurred while authorizing access to the devices for user :" +
throw new OperationManagementException ( "Error occurred while authorizing access to the devices for user :" +
this . getUser ( ) , e ) ; this . getUser ( ) , e ) ;
}
}
deviceIDHolder . setValidDeviceIDList ( authorizedDeviceList ) ;
deviceIDHolder . setValidDeviceIDList ( authorizedDeviceList ) ;
deviceIDHolder . setErrorDeviceIdList ( unAuthorizedDeviceList ) ;
deviceIDHolder . setErrorDeviceIdList ( unAuthorizedDeviceList ) ;
@ -310,8 +306,8 @@ public class OperationManagerImpl implements OperationManager {
if ( ! isActionAuthorized ( deviceId ) ) {
if ( ! isActionAuthorized ( deviceId ) ) {
throw new OperationManagementException ( "User '" + getUser ( ) + "' is not authorized to access the '" +
throw new OperationManagementException ( "User '" + getUser ( ) + "' is not authorized to access the '" +
deviceId . getType ( ) + "' device, which carries the identifier '" + deviceId . getType ( ) + "' device, which carries the identifier '" +
deviceId . getId ( ) + "'" ) ; deviceId . getId ( ) + "'" ) ;
}
}
EnrolmentInfo enrolmentInfo = this . getActiveEnrolmentInfo ( deviceId ) ;
EnrolmentInfo enrolmentInfo = this . getActiveEnrolmentInfo ( deviceId ) ;
@ -331,8 +327,8 @@ public class OperationManagerImpl implements OperationManager {
}
}
} catch ( OperationManagementDAOException e ) {
} catch ( OperationManagementDAOException e ) {
throw new OperationManagementException ( "Error occurred while retrieving the list of " +
throw new OperationManagementException ( "Error occurred while retrieving the list of " +
"operations assigned for '" + deviceId . getType ( ) + "operations assigned for '" + deviceId . getType ( ) +
"' device '" + deviceId . getId ( ) + "'" , e ) ; "' device '" + deviceId . getId ( ) + "'" , e ) ;
} catch ( SQLException e ) {
} catch ( SQLException e ) {
throw new OperationManagementException (
throw new OperationManagementException (
"Error occurred while opening a connection to the data source" , e ) ;
"Error occurred while opening a connection to the data source" , e ) ;
@ -350,15 +346,15 @@ public class OperationManagerImpl implements OperationManager {
String owner = request . getOwner ( ) ;
String owner = request . getOwner ( ) ;
if ( ! isActionAuthorized ( deviceId ) ) {
if ( ! isActionAuthorized ( deviceId ) ) {
throw new OperationManagementException ( "User '" + getUser ( ) + "' is not authorized to access the '" +
throw new OperationManagementException ( "User '" + getUser ( ) + "' is not authorized to access the '" +
deviceId . getType ( ) + "' device, which carries the identifier '" + deviceId . getType ( ) + "' device, which carries the identifier '" +
deviceId . getId ( ) + "' of owner '" + owner + "'" ) ; deviceId . getId ( ) + "' of owner '" + owner + "'" ) ;
}
}
EnrolmentInfo enrolmentInfo = this . getEnrolmentInfo ( deviceId , owner ) ;
EnrolmentInfo enrolmentInfo = this . getEnrolmentInfo ( deviceId , owner ) ;
if ( enrolmentInfo = = null ) {
if ( enrolmentInfo = = null ) {
throw new OperationManagementException ( "Device not found for given device " +
throw new OperationManagementException ( "Device not found for given device " +
"Identifier:" + deviceId . getId ( ) + " and given type" + "Identifier:" + deviceId . getId ( ) + " and given type" +
deviceId . getType ( ) ) ; deviceId . getType ( ) ) ;
}
}
int enrolmentId = enrolmentInfo . getId ( ) ;
int enrolmentId = enrolmentInfo . getId ( ) ;
try {
try {
@ -376,8 +372,8 @@ public class OperationManagerImpl implements OperationManager {
paginationResult . setRecordsFiltered ( count ) ;
paginationResult . setRecordsFiltered ( count ) ;
} catch ( OperationManagementDAOException e ) {
} catch ( OperationManagementDAOException e ) {
throw new OperationManagementException ( "Error occurred while retrieving the list of " +
throw new OperationManagementException ( "Error occurred while retrieving the list of " +
"operations assigned for '" + deviceId . getType ( ) + "operations assigned for '" + deviceId . getType ( ) +
"' device '" + deviceId . getId ( ) + "'" , e ) ; "' device '" + deviceId . getId ( ) + "'" , e ) ;
} catch ( SQLException e ) {
} catch ( SQLException e ) {
throw new OperationManagementException (
throw new OperationManagementException (
"Error occurred while opening a connection to the data source" , e ) ;
"Error occurred while opening a connection to the data source" , e ) ;
@ -390,7 +386,7 @@ public class OperationManagerImpl implements OperationManager {
@Override
@Override
public List < ? extends Operation > getPendingOperations ( DeviceIdentifier deviceId ) throws
public List < ? extends Operation > getPendingOperations ( DeviceIdentifier deviceId ) throws
OperationManagementException { OperationManagementException {
if ( log . isDebugEnabled ( ) ) {
if ( log . isDebugEnabled ( ) ) {
log . debug ( "Device identifier id:[" + deviceId . getId ( ) + "] type:[" + deviceId . getType ( ) + "]" ) ;
log . debug ( "Device identifier id:[" + deviceId . getId ( ) + "] type:[" + deviceId . getType ( ) + "]" ) ;
}
}
@ -399,16 +395,16 @@ public class OperationManagerImpl implements OperationManager {
if ( ! isActionAuthorized ( deviceId ) ) {
if ( ! isActionAuthorized ( deviceId ) ) {
throw new OperationManagementException ( "User '" + getUser ( ) + "' is not authorized to access the '" +
throw new OperationManagementException ( "User '" + getUser ( ) + "' is not authorized to access the '" +
deviceId . getType ( ) + "' device, which carries the identifier '" + deviceId . getType ( ) + "' device, which carries the identifier '" +
deviceId . getId ( ) + "'" ) ; deviceId . getId ( ) + "'" ) ;
}
}
//
//
EnrolmentInfo enrolmentInfo = this . getActiveEnrolmentInfo ( deviceId ) ;
EnrolmentInfo enrolmentInfo = this . getActiveEnrolmentInfo ( deviceId ) ;
if ( enrolmentInfo = = null ) {
if ( enrolmentInfo = = null ) {
throw new OperationManagementException ( "Device not found for the given device Identifier:" +
throw new OperationManagementException ( "Device not found for the given device Identifier:" +
deviceId . getId ( ) + " and given type:" + deviceId . getId ( ) + " and given type:" +
deviceId . getType ( ) ) ; deviceId . getType ( ) ) ;
}
}
int enrolmentId = enrolmentInfo . getId ( ) ;
int enrolmentId = enrolmentInfo . getId ( ) ;
//Changing the enrollment status & attempt count if the device is marked as inactive or unreachable
//Changing the enrollment status & attempt count if the device is marked as inactive or unreachable
@ -437,8 +433,8 @@ public class OperationManagerImpl implements OperationManager {
Collections . sort ( operations , new OperationCreateTimeComparator ( ) ) ;
Collections . sort ( operations , new OperationCreateTimeComparator ( ) ) ;
} catch ( OperationManagementDAOException e ) {
} catch ( OperationManagementDAOException e ) {
throw new OperationManagementException ( "Error occurred while retrieving the list of " +
throw new OperationManagementException ( "Error occurred while retrieving the list of " +
"pending operations assigned for '" + deviceId . getType ( ) + "pending operations assigned for '" + deviceId . getType ( ) +
"' device '" + deviceId . getId ( ) + "'" , e ) ; "' device '" + deviceId . getId ( ) + "'" , e ) ;
} catch ( SQLException e ) {
} catch ( SQLException e ) {
throw new OperationManagementException (
throw new OperationManagementException (
"Error occurred while opening a connection to the data source" , e ) ;
"Error occurred while opening a connection to the data source" , e ) ;
@ -457,15 +453,15 @@ public class OperationManagerImpl implements OperationManager {
if ( ! isActionAuthorized ( deviceId ) ) {
if ( ! isActionAuthorized ( deviceId ) ) {
throw new OperationManagementException ( "User '" + getUser ( ) + "' is not authorized to access the '" +
throw new OperationManagementException ( "User '" + getUser ( ) + "' is not authorized to access the '" +
deviceId . getType ( ) + "' device, which carries the identifier '" + deviceId . getType ( ) + "' device, which carries the identifier '" +
deviceId . getId ( ) + "'" ) ; deviceId . getId ( ) + "'" ) ;
}
}
EnrolmentInfo enrolmentInfo = this . getActiveEnrolmentInfo ( deviceId ) ;
EnrolmentInfo enrolmentInfo = this . getActiveEnrolmentInfo ( deviceId ) ;
if ( enrolmentInfo = = null ) {
if ( enrolmentInfo = = null ) {
throw new OperationManagementException ( "Device not found for given device " +
throw new OperationManagementException ( "Device not found for given device " +
"Identifier:" + deviceId . getId ( ) + " and given type" + "Identifier:" + deviceId . getId ( ) + " and given type" +
deviceId . getType ( ) ) ; deviceId . getType ( ) ) ;
}
}
int enrolmentId = enrolmentInfo . getId ( ) ;
int enrolmentId = enrolmentInfo . getId ( ) ;
//Changing the enrollment status & attempt count if the device is marked as inactive or unreachable
//Changing the enrollment status & attempt count if the device is marked as inactive or unreachable
@ -479,23 +475,23 @@ public class OperationManagerImpl implements OperationManager {
try {
try {
OperationManagementDAOFactory . openConnection ( ) ;
OperationManagementDAOFactory . openConnection ( ) ;
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation dtoOperation = operationDAO . getNextOperation (
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation dtoOperation = operationDAO . getNextOperation (
enrolmentInfo . getId ( ) ) ; enrolmentInfo . getId ( ) ) ;
if ( dtoOperation ! = null ) {
if ( dtoOperation ! = null ) {
if ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type . COMMAND . equals ( dtoOperation . getType ( )
if ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type . COMMAND . equals ( dtoOperation . getType ( )
) ) {
) ) {
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . CommandOperation commandOperation ;
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . CommandOperation commandOperation ;
commandOperation =
commandOperation =
( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . CommandOperation ) commandOperationDAO .
( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . CommandOperation ) commandOperationDAO .
getOperation ( dtoOperation . getId ( ) ) ; getOperation ( dtoOperation . getId ( ) ) ;
dtoOperation . setEnabled ( commandOperation . isEnabled ( ) ) ;
dtoOperation . setEnabled ( commandOperation . isEnabled ( ) ) ;
} else if ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type . CONFIG . equals ( dtoOperation .
} else if ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type . CONFIG . equals ( dtoOperation .
getType ( ) ) ) { getType ( ) ) ) {
dtoOperation = configOperationDAO . getOperation ( dtoOperation . getId ( ) ) ;
dtoOperation = configOperationDAO . getOperation ( dtoOperation . getId ( ) ) ;
} else if ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type . PROFILE . equals ( dtoOperation .
} else if ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type . PROFILE . equals ( dtoOperation .
getType ( ) ) ) { getType ( ) ) ) {
dtoOperation = profileOperationDAO . getOperation ( dtoOperation . getId ( ) ) ;
dtoOperation = profileOperationDAO . getOperation ( dtoOperation . getId ( ) ) ;
} else if ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type . POLICY . equals ( dtoOperation .
} else if ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type . POLICY . equals ( dtoOperation .
getType ( ) ) ) { getType ( ) ) ) {
dtoOperation = policyOperationDAO . getOperation ( dtoOperation . getId ( ) ) ;
dtoOperation = policyOperationDAO . getOperation ( dtoOperation . getId ( ) ) ;
}
}
operation = OperationDAOUtil . convertOperation ( dtoOperation ) ;
operation = OperationDAOUtil . convertOperation ( dtoOperation ) ;
@ -520,15 +516,15 @@ public class OperationManagerImpl implements OperationManager {
if ( ! isActionAuthorized ( deviceId ) ) {
if ( ! isActionAuthorized ( deviceId ) ) {
throw new OperationManagementException ( "User '" + getUser ( ) + "' is not authorized to access the '" +
throw new OperationManagementException ( "User '" + getUser ( ) + "' is not authorized to access the '" +
deviceId . getType ( ) + "' device, which carries the identifier '" + deviceId . getType ( ) + "' device, which carries the identifier '" +
deviceId . getId ( ) + "'" ) ; deviceId . getId ( ) + "'" ) ;
}
}
EnrolmentInfo enrolmentInfo = this . getActiveEnrolmentInfo ( deviceId ) ;
EnrolmentInfo enrolmentInfo = this . getActiveEnrolmentInfo ( deviceId ) ;
if ( enrolmentInfo = = null ) {
if ( enrolmentInfo = = null ) {
throw new OperationManagementException (
throw new OperationManagementException (
"Device not found for device id:" + deviceId . getId ( ) + " " + "type:" +
"Device not found for device id:" + deviceId . getId ( ) + " " + "type:" +
deviceId . getType ( ) ) ;
deviceId . getType ( ) ) ;
}
}
try {
try {
@ -537,9 +533,9 @@ public class OperationManagerImpl implements OperationManager {
boolean isUpdated = false ;
boolean isUpdated = false ;
if ( operation . getStatus ( ) ! = null ) {
if ( operation . getStatus ( ) ! = null ) {
isUpdated = operationDAO . updateOperationStatus ( enrolmentId , operationId ,
isUpdated = operationDAO . updateOperationStatus ( enrolmentId , operationId ,
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . org . wso2 . carbon . device . mgt . core . dto . operation . mgt .
Operation . Status . valueOf ( operation . getStatus ( ) . Operation . Status . valueOf ( operation . getStatus ( ) .
toString ( ) ) ) ; toString ( ) ) ) ;
}
}
if ( operation . getOperationResponse ( ) ! = null ) {
if ( operation . getOperationResponse ( ) ! = null ) {
operationDAO . addOperationResponse ( enrolmentId , operationId , operation . getOperationResponse ( ) ) ;
operationDAO . addOperationResponse ( enrolmentId , operationId , operation . getOperationResponse ( ) ) ;
@ -549,28 +545,7 @@ public class OperationManagerImpl implements OperationManager {
OperationManagementDAOFactory . rollbackTransaction ( ) ;
OperationManagementDAOFactory . rollbackTransaction ( ) ;
throw new OperationManagementException (
throw new OperationManagementException (
"Error occurred while updating the operation: " + operationId + " status:" +
"Error occurred while updating the operation: " + operationId + " status:" +
operation . getStatus ( ) , e ) ;
operation . getStatus ( ) , e ) ;
} catch ( TransactionManagementException e ) {
throw new OperationManagementException ( "Error occurred while initiating a transaction" , e ) ;
} finally {
OperationManagementDAOFactory . closeConnection ( ) ;
}
}
@Override
public void deleteOperation ( int operationId ) throws OperationManagementException {
try {
OperationManagementDAOFactory . beginTransaction ( ) ;
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation operation =
operationDAO . getOperation ( operationId ) ;
if ( operation = = null ) {
throw new OperationManagementException ( "Operation not found for operation id : " + operationId ) ;
}
lookupOperationDAO ( operation ) . deleteOperation ( operationId ) ;
OperationManagementDAOFactory . commitTransaction ( ) ;
} catch ( OperationManagementDAOException e ) {
OperationManagementDAOFactory . rollbackTransaction ( ) ;
throw new OperationManagementException ( "Error occurred while deleting the operation: " + operationId , e ) ;
} catch ( TransactionManagementException e ) {
} catch ( TransactionManagementException e ) {
throw new OperationManagementException ( "Error occurred while initiating a transaction" , e ) ;
throw new OperationManagementException ( "Error occurred while initiating a transaction" , e ) ;
} finally {
} finally {
@ -584,56 +559,57 @@ public class OperationManagerImpl implements OperationManager {
Operation operation = null ;
Operation operation = null ;
if ( log . isDebugEnabled ( ) ) {
if ( log . isDebugEnabled ( ) ) {
log . debug ( "Operation Id: " + operationId + " Device Type: " + deviceId . getType ( ) + " Device Identifier: " +
log . debug ( "Operation Id: " + operationId + " Device Type: " + deviceId . getType ( ) + " Device Identifier: " +
deviceId . getId ( ) ) ;
deviceId . getId ( ) ) ;
}
}
if ( ! isActionAuthorized ( deviceId ) ) {
if ( ! isActionAuthorized ( deviceId ) ) {
throw new OperationManagementException ( "User '" + getUser ( ) + "' is not authorized to access the '" +
throw new OperationManagementException ( "User '" + getUser ( ) + "' is not authorized to access the '" +
deviceId . getType ( ) + "' device, which carries the identifier '" + deviceId . getType ( ) + "' device, which carries the identifier '" +
deviceId . getId ( ) + "'" ) ; deviceId . getId ( ) + "'" ) ;
}
}
EnrolmentInfo enrolmentInfo = this . getActiveEnrolmentInfo ( deviceId ) ;
EnrolmentInfo enrolmentInfo = this . getActiveEnrolmentInfo ( deviceId ) ;
if ( enrolmentInfo = = null ) {
if ( enrolmentInfo = = null ) {
throw new OperationManagementException ( "Device not found for given device identifier: " +
throw new OperationManagementException ( "Device not found for given device identifier: " +
deviceId . getId ( ) + " type: " + deviceId . getType ( ) ) ; deviceId . getId ( ) + " type: " + deviceId . getType ( ) ) ;
}
}
try {
try {
OperationManagementDAOFactory . openConnection ( ) ;
OperationManagementDAOFactory . openConnection ( ) ;
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation dtoOperation = operationDAO .
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation deviceSpecificOperation = operationDAO .
getOperationByDeviceAndId ( enrolmentInfo . getId ( ) ,
getOperationByDeviceAndId ( enrolmentInfo . getId ( ) ,
operationId ) ;
operationId ) ;
if ( dtoOperation . getType ( ) .
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation dtoOperation = deviceSpecificOperation ;
if ( deviceSpecificOperation . getType ( ) .
equals ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type . COMMAND ) ) {
equals ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type . COMMAND ) ) {
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . CommandOperation commandOperation ;
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . CommandOperation commandOperation ;
commandOperation =
commandOperation =
( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . CommandOperation ) commandOperationDAO .
( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . CommandOperation ) commandOperationDAO .
getOperation ( d to Operation. getId ( ) ) ; getOperation ( d eviceSpecific Operation. getId ( ) ) ;
dtoOperation . setEnabled ( commandOperation . isEnabled ( ) ) ;
dtoOperation . setEnabled ( commandOperation . isEnabled ( ) ) ;
} else if ( d to Operation. getType ( ) .
} else if ( d eviceSpecific Operation. getType ( ) .
equals ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type . CONFIG ) ) {
equals ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type . CONFIG ) ) {
dtoOperation = configOperationDAO . getOperation ( d to Operation. getId ( ) ) ;
dtoOperation = configOperationDAO . getOperation ( d eviceSpecific Operation. getId ( ) ) ;
} else if ( d to Operation. getType ( ) . equals (
} else if ( d eviceSpecific Operation. getType ( ) . equals (
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type . PROFILE ) ) {
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type . PROFILE ) ) {
dtoOperation = profileOperationDAO . getOperation ( d to Operation. getId ( ) ) ;
dtoOperation = profileOperationDAO . getOperation ( d eviceSpecific Operation. getId ( ) ) ;
} else if ( d to Operation. getType ( ) . equals (
} else if ( d eviceSpecific Operation. getType ( ) . equals (
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type . POLICY ) ) {
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type . POLICY ) ) {
dtoOperation = policyOperationDAO . getOperation ( d to Operation. getId ( ) ) ;
dtoOperation = policyOperationDAO . getOperation ( d eviceSpecific Operation. getId ( ) ) ;
}
}
if ( dtoOperation = = null ) {
if ( dtoOperation = = null ) {
throw new OperationManagementException ( "Operation not found for operation Id:" + operationId +
throw new OperationManagementException ( "Operation not found for operation Id:" + operationId +
" device id:" + deviceId . getId ( ) ) ; " device id:" + deviceId . getId ( ) ) ;
}
}
operation = OperationDAOUtil . convertOperation ( dtoOperation ) ;
dtoOperation . setStatus ( deviceSpecificOperation . getStatus ( ) ) ;
operation = OperationDAOUtil . convertOperation ( deviceSpecificOperation ) ;
} catch ( OperationManagementDAOException e ) {
} catch ( OperationManagementDAOException e ) {
throw new OperationManagementException ( "Error occurred while retrieving the list of " +
throw new OperationManagementException ( "Error occurred while retrieving the list of " +
"operations assigned for '" + deviceId . getType ( ) + "operations assigned for '" + deviceId . getType ( ) +
"' device '" + deviceId . getId ( ) + "'" , e ) ; "' device '" + deviceId . getId ( ) + "'" , e ) ;
} catch ( SQLException e ) {
} catch ( SQLException e ) {
throw new OperationManagementException ( "Error occurred while opening connection to the data source" ,
throw new OperationManagementException ( "Error occurred while opening connection to the data source" ,
e ) ; e ) ;
} finally {
} finally {
OperationManagementDAOFactory . closeConnection ( ) ;
OperationManagementDAOFactory . closeConnection ( ) ;
}
}
@ -649,15 +625,15 @@ public class OperationManagerImpl implements OperationManager {
if ( ! isActionAuthorized ( deviceId ) ) {
if ( ! isActionAuthorized ( deviceId ) ) {
throw new OperationManagementException ( "User '" + getUser ( ) + "' is not authorized to access the '" +
throw new OperationManagementException ( "User '" + getUser ( ) + "' is not authorized to access the '" +
deviceId . getType ( ) + "' device, which carries the identifier '" + deviceId . getType ( ) + "' device, which carries the identifier '" +
deviceId . getId ( ) + "'" ) ; deviceId . getId ( ) + "'" ) ;
}
}
EnrolmentInfo enrolmentInfo = this . getActiveEnrolmentInfo ( deviceId ) ;
EnrolmentInfo enrolmentInfo = this . getActiveEnrolmentInfo ( deviceId ) ;
if ( enrolmentInfo = = null ) {
if ( enrolmentInfo = = null ) {
throw new OperationManagementException (
throw new OperationManagementException (
"Device not found for device id:" + deviceId . getId ( ) + " " + "type:" +
"Device not found for device id:" + deviceId . getId ( ) + " " + "type:" +
deviceId . getType ( ) ) ;
deviceId . getType ( ) ) ;
}
}
try {
try {
@ -667,14 +643,14 @@ public class OperationManagerImpl implements OperationManager {
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Status . valueOf ( status . toString ( ) ) ;
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Status . valueOf ( status . toString ( ) ) ;
dtoOperationList . addAll ( commandOperationDAO . getOperationsByDeviceAndStatus ( enrolmentId , dtoOpStatus ) ) ;
dtoOperationList . addAll ( commandOperationDAO . getOperationsByDeviceAndStatus ( enrolmentId , dtoOpStatus ) ) ;
dtoOperationList . addAll ( configOperationDAO . getOperationsByDeviceAndStatus ( enrolmentId ,
dtoOperationList . addAll ( configOperationDAO . getOperationsByDeviceAndStatus ( enrolmentId ,
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation .
Status . PENDING ) ) ; Status . PENDING ) ) ;
dtoOperationList . addAll ( profileOperationDAO . getOperationsByDeviceAndStatus ( enrolmentId ,
dtoOperationList . addAll ( profileOperationDAO . getOperationsByDeviceAndStatus ( enrolmentId ,
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation .
Status . PENDING ) ) ; Status . PENDING ) ) ;
dtoOperationList . addAll ( policyOperationDAO . getOperationsByDeviceAndStatus ( enrolmentId ,
dtoOperationList . addAll ( policyOperationDAO . getOperationsByDeviceAndStatus ( enrolmentId ,
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation .
Status . PENDING ) ) ; Status . PENDING ) ) ;
Operation operation ;
Operation operation ;
@ -685,9 +661,9 @@ public class OperationManagerImpl implements OperationManager {
} catch ( OperationManagementDAOException e ) {
} catch ( OperationManagementDAOException e ) {
throw new OperationManagementException ( "Error occurred while retrieving the list of " +
throw new OperationManagementException ( "Error occurred while retrieving the list of " +
"operations assigned for '" + deviceId . getType ( ) + "operations assigned for '" + deviceId . getType ( ) +
"' device '" + "' device '" +
deviceId . getId ( ) + "' and status:" + status . toString ( ) , e ) ; deviceId . getId ( ) + "' and status:" + status . toString ( ) , e ) ;
} catch ( SQLException e ) {
} catch ( SQLException e ) {
throw new OperationManagementException (
throw new OperationManagementException (
"Error occurred while opening a connection to the data source" , e ) ;
"Error occurred while opening a connection to the data source" , e ) ;
@ -703,32 +679,32 @@ public class OperationManagerImpl implements OperationManager {
try {
try {
OperationManagementDAOFactory . openConnection ( ) ;
OperationManagementDAOFactory . openConnection ( ) ;
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation dtoOperation = operationDAO . getOperation (
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation dtoOperation = operationDAO . getOperation (
operationId ) ; operationId ) ;
if ( dtoOperation = = null ) {
if ( dtoOperation = = null ) {
throw new OperationManagementException ( "Operation not found for given Id:" + operationId ) ;
throw new OperationManagementException ( "Operation not found for given Id:" + operationId ) ;
}
}
if ( dtoOperation . getType ( )
if ( dtoOperation . getType ( )
. equals ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type . COMMAND ) ) {
. equals ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type . COMMAND ) ) {
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . CommandOperation commandOperation ;
org . wso2 . carbon . device . mgt . core . dto . operation . mgt . CommandOperation commandOperation ;
commandOperation =
commandOperation =
( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . CommandOperation ) commandOperationDAO .
( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . CommandOperation ) commandOperationDAO .
getOperation ( dtoOperation . getId ( ) ) ; getOperation ( dtoOperation . getId ( ) ) ;
dtoOperation . setEnabled ( commandOperation . isEnabled ( ) ) ;
dtoOperation . setEnabled ( commandOperation . isEnabled ( ) ) ;
} else if ( dtoOperation . getType ( ) .
} else if ( dtoOperation . getType ( ) .
equals ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type . CONFIG ) ) {
equals ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type . CONFIG ) ) {
dtoOperation = configOperationDAO . getOperation ( dtoOperation . getId ( ) ) ;
dtoOperation = configOperationDAO . getOperation ( dtoOperation . getId ( ) ) ;
} else if ( dtoOperation . getType ( ) . equals ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type .
} else if ( dtoOperation . getType ( ) . equals ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type .
PROFILE ) ) { PROFILE ) ) {
dtoOperation = profileOperationDAO . getOperation ( dtoOperation . getId ( ) ) ;
dtoOperation = profileOperationDAO . getOperation ( dtoOperation . getId ( ) ) ;
} else if ( dtoOperation . getType ( ) . equals ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type .
} else if ( dtoOperation . getType ( ) . equals ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type .
POLICY ) ) { POLICY ) ) {
dtoOperation = policyOperationDAO . getOperation ( dtoOperation . getId ( ) ) ;
dtoOperation = policyOperationDAO . getOperation ( dtoOperation . getId ( ) ) ;
}
}
operation = OperationDAOUtil . convertOperation ( dtoOperation ) ;
operation = OperationDAOUtil . convertOperation ( dtoOperation ) ;
} catch ( OperationManagementDAOException e ) {
} catch ( OperationManagementDAOException e ) {
throw new OperationManagementException ( "Error occurred while retrieving the operation with operation Id '" +
throw new OperationManagementException ( "Error occurred while retrieving the operation with operation Id '" +
operationId , e ) ; operationId , e ) ;
} catch ( SQLException e ) {
} catch ( SQLException e ) {
throw new OperationManagementException ( "Error occurred while opening a connection to the data source" , e ) ;
throw new OperationManagementException ( "Error occurred while opening a connection to the data source" , e ) ;
} finally {
} finally {
@ -737,62 +713,6 @@ public class OperationManagerImpl implements OperationManager {
return operation ;
return operation ;
}
}
// @Override
// public Operation getOperationByActivityId(String activity) throws OperationManagementException {
// // This parses the operation id from activity id (ex : ACTIVITY_23) and converts to the integer.
// Operation operation;
// int enrollmentOpMappingId = Integer.parseInt(
// activity.replace(DeviceManagementConstants.OperationAttributes.ACTIVITY, ""));
// if (enrollmentOpMappingId == 0) {
// throw new IllegalArgumentException("Operation ID cannot be null or zero (0).");
// }
// try {
// OperationManagementDAOFactory.openConnection();
// org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation dtoOperation =
// operationDAO.getOperationFromEnrollment(enrollmentOpMappingId);
//
// if (dtoOperation == null) {
// throw new OperationManagementException("Operation not found for given activity Id:" + activity);
// }
// org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation.Status status = dtoOperation.getStatus();
// if (dtoOperation.getType().equals(org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation.Type.COMMAND)) {
// org.wso2.carbon.device.mgt.core.dto.operation.mgt.CommandOperation commandOperation;
// commandOperation =
// (org.wso2.carbon.device.mgt.core.dto.operation.mgt.CommandOperation) commandOperationDAO.
// getOperation(dtoOperation.getId());
// dtoOperation.setEnabled(commandOperation.isEnabled());
// } else if (dtoOperation.getType().
// equals(org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation.Type.CONFIG)) {
// dtoOperation = configOperationDAO.getOperation(dtoOperation.getId());
// } else if (dtoOperation.getType().equals(org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation.Type.
// PROFILE)) {
// dtoOperation = profileOperationDAO.getOperation(dtoOperation.getId());
// } else if (dtoOperation.getType().equals(org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation.Type.
// POLICY)) {
// dtoOperation = policyOperationDAO.getOperation(dtoOperation.getId());
// }
// operation = OperationDAOUtil.convertOperation(dtoOperation);
// int enrolmentId = operationDAO.getEnrolmentIdFromMappingId(enrollmentOpMappingId);
// if (enrolmentId != 0) {
// operation.setResponses(operationDAO.getOperationResponses(enrolmentId, operation.getId()));
// }
//
// operation.setStatus(Operation.Status.valueOf(status.toString()));
// operation.setActivityId(activity);
//
// } catch (SQLException e) {
// throw new OperationManagementException("Error occurred while opening a connection to the data source", e);
// } catch (OperationManagementDAOException e) {
// throw new OperationManagementException("Error occurred while retrieving the operation with activity Id '" +
// activity, e);
// } finally {
// OperationManagementDAOFactory.closeConnection();
// }
//
// // return this.getOperation(operationId);
// return operation;
// }
@Override
@Override
public Activity getOperationByActivityId ( String activity ) throws OperationManagementException {
public Activity getOperationByActivityId ( String activity ) throws OperationManagementException {
// This parses the operation id from activity id (ex : ACTIVITY_23) and converts to the integer.
// This parses the operation id from activity id (ex : ACTIVITY_23) and converts to the integer.
@ -808,7 +728,7 @@ public class OperationManagerImpl implements OperationManager {
throw new OperationManagementException ( "Error occurred while opening a connection to the data source." , e ) ;
throw new OperationManagementException ( "Error occurred while opening a connection to the data source." , e ) ;
} catch ( OperationManagementDAOException e ) {
} catch ( OperationManagementDAOException e ) {
throw new OperationManagementException ( "Error occurred while retrieving the operation with activity Id '" +
throw new OperationManagementException ( "Error occurred while retrieving the operation with activity Id '" +
activity , e ) ; activity , e ) ;
} finally {
} finally {
OperationManagementDAOFactory . closeConnection ( ) ;
OperationManagementDAOFactory . closeConnection ( ) ;
}
}
@ -836,11 +756,6 @@ public class OperationManagerImpl implements OperationManager {
}
}
}
}
@Override
public List < Operation > getOperationUpdatedAfter ( long timestamp ) throws OperationManagementException {
return null ;
}
@Override
@Override
public List < Activity > getActivitiesUpdatedAfter ( long timestamp ) throws OperationManagementException {
public List < Activity > getActivitiesUpdatedAfter ( long timestamp ) throws OperationManagementException {
try {
try {
@ -850,7 +765,7 @@ public class OperationManagerImpl implements OperationManager {
throw new OperationManagementException ( "Error occurred while opening a connection to the data source." , e ) ;
throw new OperationManagementException ( "Error occurred while opening a connection to the data source." , e ) ;
} catch ( OperationManagementDAOException e ) {
} catch ( OperationManagementDAOException e ) {
throw new OperationManagementException ( "Error occurred while getting the activity list changed after a " +
throw new OperationManagementException ( "Error occurred while getting the activity list changed after a " +
"given time." , e ) ; "given time." , e ) ;
} finally {
} finally {
OperationManagementDAOFactory . closeConnection ( ) ;
OperationManagementDAOFactory . closeConnection ( ) ;
}
}
@ -866,7 +781,7 @@ public class OperationManagerImpl implements OperationManager {
throw new OperationManagementException ( "Error occurred while opening a connection to the data source." , e ) ;
throw new OperationManagementException ( "Error occurred while opening a connection to the data source." , e ) ;
} catch ( OperationManagementDAOException e ) {
} catch ( OperationManagementDAOException e ) {
throw new OperationManagementException ( "Error occurred while getting the activity list changed after a " +
throw new OperationManagementException ( "Error occurred while getting the activity list changed after a " +
"given time." , e ) ; "given time." , e ) ;
} finally {
} finally {
OperationManagementDAOFactory . closeConnection ( ) ;
OperationManagementDAOFactory . closeConnection ( ) ;
}
}
@ -881,7 +796,7 @@ public class OperationManagerImpl implements OperationManager {
throw new OperationManagementException ( "Error occurred while opening a connection to the data source." , e ) ;
throw new OperationManagementException ( "Error occurred while opening a connection to the data source." , e ) ;
} catch ( OperationManagementDAOException e ) {
} catch ( OperationManagementDAOException e ) {
throw new OperationManagementException ( "Error occurred while getting the activity count changed after a " +
throw new OperationManagementException ( "Error occurred while getting the activity count changed after a " +
"given time." , e ) ; "given time." , e ) ;
} finally {
} finally {
OperationManagementDAOFactory . closeConnection ( ) ;
OperationManagementDAOFactory . closeConnection ( ) ;
}
}
@ -904,12 +819,18 @@ public class OperationManagerImpl implements OperationManager {
private OperationDAO lookupOperationDAO ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation operation ) {
private OperationDAO lookupOperationDAO ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation operation ) {
if ( operation instanceof org . wso2 . carbon . device . mgt . core . dto . operation . mgt . CommandOperation ) {
if ( operation instanceof org . wso2 . carbon . device . mgt . core . dto . operation . mgt . CommandOperation | |
operation . getType ( ) . equals ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type . COMMAND ) ) {
return commandOperationDAO ;
return commandOperationDAO ;
} else if ( operation instanceof org . wso2 . carbon . device . mgt . core . dto . operation . mgt . ProfileOperation ) {
} else if ( operation instanceof org . wso2 . carbon . device . mgt . core . dto . operation . mgt . ProfileOperation | |
operation . getType ( ) . equals ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type . PROFILE ) ) {
return profileOperationDAO ;
return profileOperationDAO ;
} else if ( operation instanceof org . wso2 . carbon . device . mgt . core . dto . operation . mgt . ConfigOperation ) {
} else if ( operation instanceof org . wso2 . carbon . device . mgt . core . dto . operation . mgt . ConfigOperation | |
operation . getType ( ) . equals ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type . CONFIG ) ) {
return configOperationDAO ;
return configOperationDAO ;
} else if ( operation instanceof org . wso2 . carbon . device . mgt . core . dto . operation . mgt . PolicyOperation | |
operation . getType ( ) . equals ( org . wso2 . carbon . device . mgt . core . dto . operation . mgt . Operation . Type . POLICY ) ) {
return policyOperationDAO ;
} else {
} else {
return operationDAO ;
return operationDAO ;
}
}
@ -966,8 +887,8 @@ public class OperationManagerImpl implements OperationManager {
enrolmentId = deviceDAO . getEnrolmentByStatus ( deviceId , status , tenantId ) ;
enrolmentId = deviceDAO . getEnrolmentByStatus ( deviceId , status , tenantId ) ;
} catch ( DeviceManagementDAOException e ) {
} catch ( DeviceManagementDAOException e ) {
throw new OperationManagementException ( "Error occurred while retrieving metadata of '" +
throw new OperationManagementException ( "Error occurred while retrieving metadata of '" +
deviceId . getType ( ) + "' device carrying the identifier '" + deviceId . getType ( ) + "' device carrying the identifier '" +
deviceId . getId ( ) + "'" , e ) ; deviceId . getId ( ) + "'" , e ) ;
} catch ( SQLException e ) {
} catch ( SQLException e ) {
throw new OperationManagementException (
throw new OperationManagementException (
"Error occurred while opening a connection to the data source" , e ) ;
"Error occurred while opening a connection to the data source" , e ) ;
@ -995,15 +916,15 @@ public class OperationManagerImpl implements OperationManager {
}
}
} catch ( DeviceManagementDAOException e ) {
} catch ( DeviceManagementDAOException e ) {
throw new OperationManagementException ( "Error occurred while retrieving enrollment data of '" +
throw new OperationManagementException ( "Error occurred while retrieving enrollment data of '" +
deviceId . getType ( ) + "' device carrying the identifier '" + deviceId . getType ( ) + "' device carrying the identifier '" +
deviceId . getId ( ) + "' of owner '" + owner + "'" , e ) ; deviceId . getId ( ) + "' of owner '" + owner + "'" , e ) ;
} catch ( SQLException e ) {
} catch ( SQLException e ) {
throw new OperationManagementException (
throw new OperationManagementException (
"Error occurred while opening a connection to the data source" , e ) ;
"Error occurred while opening a connection to the data source" , e ) ;
} catch ( DeviceAccessAuthorizationException e ) {
} catch ( DeviceAccessAuthorizationException e ) {
throw new OperationManagementException ( "Error occurred while checking the device access permissions for '" +
throw new OperationManagementException ( "Error occurred while checking the device access permissions for '" +
deviceId . getType ( ) + "' device carrying the identifier '" + deviceId . getType ( ) + "' device carrying the identifier '" +
deviceId . getId ( ) + "' of owner '" + owner + "'" , e ) ; deviceId . getId ( ) + "' of owner '" + owner + "'" , e ) ;
} finally {
} finally {
DeviceManagementDAOFactory . closeConnection ( ) ;
DeviceManagementDAOFactory . closeConnection ( ) ;
}
}
@ -1018,8 +939,8 @@ public class OperationManagerImpl implements OperationManager {
enrolmentInfo = deviceDAO . getActiveEnrolment ( deviceId , tenantId ) ;
enrolmentInfo = deviceDAO . getActiveEnrolment ( deviceId , tenantId ) ;
} catch ( DeviceManagementDAOException e ) {
} catch ( DeviceManagementDAOException e ) {
throw new OperationManagementException ( "Error occurred while retrieving enrollment data of '" +
throw new OperationManagementException ( "Error occurred while retrieving enrollment data of '" +
deviceId . getType ( ) + "' device carrying the identifier '" + deviceId . getType ( ) + "' device carrying the identifier '" +
deviceId . getId ( ) + "'" , e ) ; deviceId . getId ( ) + "'" , e ) ;
} catch ( SQLException e ) {
} catch ( SQLException e ) {
throw new OperationManagementException (
throw new OperationManagementException (
"Error occurred while opening a connection to the data source" , e ) ;
"Error occurred while opening a connection to the data source" , e ) ;
@ -1040,7 +961,7 @@ public class OperationManagerImpl implements OperationManager {
} catch ( DeviceManagementDAOException e ) {
} catch ( DeviceManagementDAOException e ) {
DeviceManagementDAOFactory . rollbackTransaction ( ) ;
DeviceManagementDAOFactory . rollbackTransaction ( ) ;
throw new OperationManagementException ( "Error occurred while updating enrollment status of device of " +
throw new OperationManagementException ( "Error occurred while updating enrollment status of device of " +
"enrolment-id '" + enrolmentId + "'" , e ) ; "enrolment-id '" + enrolmentId + "'" , e ) ;
} catch ( TransactionManagementException e ) {
} catch ( TransactionManagementException e ) {
throw new OperationManagementException ( "Error occurred while initiating a transaction" , e ) ;
throw new OperationManagementException ( "Error occurred while initiating a transaction" , e ) ;
} finally {
} finally {
@ -1055,7 +976,7 @@ public class OperationManagerImpl implements OperationManager {
List < MonitoringOperation > monitoringOperations = deviceManagementProviderService . getMonitoringOperationList ( deviceType ) ; //Get task list from each device type
List < MonitoringOperation > monitoringOperations = deviceManagementProviderService . getMonitoringOperationList ( deviceType ) ; //Get task list from each device type
for ( MonitoringOperation op : monitoringOperations ) {
for ( MonitoringOperation op : monitoringOperations ) {
if ( operation . getCode ( ) . equals ( op . getTaskName ( ) ) ) {
if ( operation . getCode ( ) . equals ( op . getTaskName ( ) ) ) {
return true ;
return true ;
}
}
megala21
7 years ago