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

Fix formatting

Browse Source
revert-dabc3590
Madawa Soysa 6 years ago
parent ec9451d444
commit 6470efcb31
1 changed files with 232 additions and 251 deletions
Show Stats Download Patch File Download Diff File

45
components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.osgiconnector/src/main/java/org/wso2/carbon/appmgt/mdm/osgiconnector/ApplicationOperationsImpl.java
Unescape View File

@ -57,15 +57,14 @@ import java.util.List;
import java.util.Properties; import java.util.Properties;
public class ApplicationOperationsImpl implements ApplicationOperations { public class ApplicationOperationsImpl implements ApplicationOperations {
private static final Log log = LogFactory.getLog(ApplicationOperationsImpl.class); private static final Log log = LogFactory.getLog(ApplicationOperationsImpl.class);
public static final String MEDIA_TYPE_XML = "application/xml"; private static final String MEDIA_TYPE_XML = "application/xml";
public static final String INSTALL = "install"; private static final String INSTALL = "install";
public static final String UNINSTALL = "uninstall"; private static final String UNINSTALL = "uninstall";
/** /**
* @param applicationOperationAction holds the information needs to perform an action on mdm. * @param applicationOperationAction holds the information needs to perform an action on mdm.
* @throws MobileApplicationException * @throws MobileApplicationException If error occurred while performing the action.
*/ */
public String performAction(ApplicationOperationAction applicationOperationAction) public String performAction(ApplicationOperationAction applicationOperationAction)
throws MobileApplicationException { throws MobileApplicationException {
@ -73,7 +72,6 @@ public class ApplicationOperationsImpl implements ApplicationOperations {
log.debug(applicationOperationAction.getAction() + " action is triggered for " + log.debug(applicationOperationAction.getAction() + " action is triggered for " +
applicationOperationAction.getType() + "."); applicationOperationAction.getType() + ".");
} }
Operation operation = null; Operation operation = null;
List<DeviceIdentifier> deviceIdentifiers = new ArrayList<>(); List<DeviceIdentifier> deviceIdentifiers = new ArrayList<>();
List<org.wso2.carbon.device.mgt.common.Device> deviceList; List<org.wso2.carbon.device.mgt.common.Device> deviceList;
@ -82,11 +80,9 @@ public class ApplicationOperationsImpl implements ApplicationOperations {
try { try {
for (String param : applicationOperationAction.getParams()) { for (String param : applicationOperationAction.getParams()) {
userName = param; userName = param;
deviceList = MDMServiceAPIUtils deviceList = MDMServiceAPIUtils
.getDeviceManagementService(applicationOperationAction.getTenantId()). .getDeviceManagementService(applicationOperationAction.getTenantId()).
getDevicesOfUser(userName); getDevicesOfUser(userName);
for (org.wso2.carbon.device.mgt.common.Device device : deviceList) { for (org.wso2.carbon.device.mgt.common.Device device : deviceList) {
if (MDMAppConstants.WEBAPP.equals(applicationOperationAction.getApp().getPlatform()) || if (MDMAppConstants.WEBAPP.equals(applicationOperationAction.getApp().getPlatform()) ||
applicationOperationAction.getApp().getPlatform().equalsIgnoreCase(device.getType())) { applicationOperationAction.getApp().getPlatform().equalsIgnoreCase(device.getType())) {
@ -98,8 +94,7 @@ public class ApplicationOperationsImpl implements ApplicationOperations {
} }
} }
} catch (DeviceManagementException devEx) { } catch (DeviceManagementException devEx) {
String errorMsg = "Error occurred fetch device for user " + userName + String errorMsg = "Error occurred fetch device for user " + userName + " at app installation";
" at app installation";
logError(errorMsg, devEx); logError(errorMsg, devEx);
throw new MobileApplicationException(errorMsg, devEx); throw new MobileApplicationException(errorMsg, devEx);
} }
@ -108,11 +103,9 @@ public class ApplicationOperationsImpl implements ApplicationOperations {
try { try {
for (String param : applicationOperationAction.getParams()) { for (String param : applicationOperationAction.getParams()) {
userRole = param; userRole = param;
deviceList = MDMServiceAPIUtils deviceList = MDMServiceAPIUtils
.getDeviceManagementService(applicationOperationAction.getTenantId()). .getDeviceManagementService(applicationOperationAction.getTenantId()).
getAllDevicesOfRole(userRole); getAllDevicesOfRole(userRole);
for (org.wso2.carbon.device.mgt.common.Device device : deviceList) { for (org.wso2.carbon.device.mgt.common.Device device : deviceList) {
if (MDMAppConstants.ACTIVE.equalsIgnoreCase(device.getEnrolmentInfo().getStatus().toString())) { if (MDMAppConstants.ACTIVE.equalsIgnoreCase(device.getEnrolmentInfo().getStatus().toString())) {
deviceIdentifiers.add(getDeviceIdentifierByDevice(device)); deviceIdentifiers.add(getDeviceIdentifierByDevice(device));
@ -120,12 +113,10 @@ public class ApplicationOperationsImpl implements ApplicationOperations {
} }
} }
} catch (DeviceManagementException devMgtEx) { } catch (DeviceManagementException devMgtEx) {
String errorMsg = "Error occurred fetch device for user role " + userRole + String errorMsg = "Error occurred fetch device for user role " + userRole + " at app installation";
" at app installation";
logError(errorMsg, devMgtEx); logError(errorMsg, devMgtEx);
throw new MobileApplicationException(errorMsg, devMgtEx); throw new MobileApplicationException(errorMsg, devMgtEx);
} }
} else if (MDMAppConstants.DEVICE.equals(applicationOperationAction.getType())) { } else if (MDMAppConstants.DEVICE.equals(applicationOperationAction.getType())) {
DeviceIdentifier deviceIdentifier; DeviceIdentifier deviceIdentifier;
for (String param : applicationOperationAction.getParams()) { for (String param : applicationOperationAction.getParams()) {
@ -141,7 +132,6 @@ public class ApplicationOperationsImpl implements ApplicationOperations {
logError("Device Identifier is not valid json object.", e); logError("Device Identifier is not valid json object.", e);
throw new MobileApplicationException(e); throw new MobileApplicationException(e);
} }
} }
} }
} else { } else {
@ -206,16 +196,11 @@ public class ApplicationOperationsImpl implements ApplicationOperations {
} }
activity = MDMServiceAPIUtils.getAppManagementService(applicationOperationAction.getTenantId()) activity = MDMServiceAPIUtils.getAppManagementService(applicationOperationAction.getTenantId())
.installApplicationForDevices(operation, deviceIdentifiers); .installApplicationForDevices(operation, deviceIdentifiers);
} }
if (activity != null) { if (activity != null) {
return activity.getActivityId(); return activity.getActivityId();
} }
return null; return null;
} catch (DeviceApplicationException mdmExce) { } catch (DeviceApplicationException mdmExce) {
logError("Error in creating operation object using app.", mdmExce); logError("Error in creating operation object using app.", mdmExce);
throw new MobileApplicationException(mdmExce.getMessage()); throw new MobileApplicationException(mdmExce.getMessage());
@ -223,31 +208,28 @@ public class ApplicationOperationsImpl implements ApplicationOperations {
logError("Error in app installation.", appMgtExce); logError("Error in app installation.", appMgtExce);
throw new MobileApplicationException(appMgtExce.getErrorMessage()); throw new MobileApplicationException(appMgtExce.getErrorMessage());
} }
} }
/** /**
* Create a new device identifier from Device object. * Create a new device identifier from Device object.
*
* @param device device which is to be retrieved type and id * @param device device which is to be retrieved type and id
* @return created device identifier * @return created device identifier
*/ */
private static DeviceIdentifier getDeviceIdentifierByDevice( private static DeviceIdentifier getDeviceIdentifierByDevice(org.wso2.carbon.device.mgt.common.Device device) {
org.wso2.carbon.device.mgt.common.Device device) {
DeviceIdentifier deviceIdentifier = new DeviceIdentifier(); DeviceIdentifier deviceIdentifier = new DeviceIdentifier();
deviceIdentifier.setId(device.getDeviceIdentifier()); deviceIdentifier.setId(device.getDeviceIdentifier());
deviceIdentifier.setType(device.getType()); deviceIdentifier.setType(device.getType());
return deviceIdentifier; return deviceIdentifier;
} }
/** /**
* @param applicationOperationDevice holds the information needs to retrieve device list. * @param applicationOperationDevice holds the information needs to retrieve device list.
* @return List of devices * @return List of devices
* @throws MobileApplicationException If unexpected error occur in getting devices or if app platform is not supported. * @throws MobileApplicationException If an error occurred in getting devices or if app platform is not supported.
*/ */
public List<Device> getDevices(ApplicationOperationDevice applicationOperationDevice) public List<Device> getDevices(ApplicationOperationDevice applicationOperationDevice)
throws MobileApplicationException { throws MobileApplicationException {
List<Device> devices; List<Device> devices;
List<org.wso2.carbon.device.mgt.common.Device> deviceList; List<org.wso2.carbon.device.mgt.common.Device> deviceList;
try { try {
@ -266,7 +248,9 @@ public class ApplicationOperationsImpl implements ApplicationOperations {
deviceList = deviceManagementService.getDevicesOfUser(username, MDMAppConstants.IOS); deviceList = deviceManagementService.getDevicesOfUser(username, MDMAppConstants.IOS);
break; break;
default: default:
throw new MobileApplicationException("App platform:" + platform + "is not supported."); String msg = "App platform:" + platform + "is not supported.";
log.error(msg);
throw new MobileApplicationException(msg);
} }
devices = new ArrayList<>(deviceList.size()); devices = new ArrayList<>(deviceList.size());
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
@ -330,7 +314,7 @@ public class ApplicationOperationsImpl implements ApplicationOperations {
} }
} }
public static UserStoreManager getUserStoreManager() throws UserStoreException { private static UserStoreManager getUserStoreManager() throws UserStoreException {
RealmService realmService; RealmService realmService;
UserStoreManager userStoreManager; UserStoreManager userStoreManager;
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
@ -368,7 +352,6 @@ public class ApplicationOperationsImpl implements ApplicationOperations {
@Override @Override
public void run() { public void run() {
try { try {
PrivilegedCarbonContext.startTenantFlow(); PrivilegedCarbonContext.startTenantFlow();
PrivilegedCarbonContext privilegedCarbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext(); PrivilegedCarbonContext privilegedCarbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
@ -462,6 +445,4 @@ public class ApplicationOperationsImpl implements ApplicationOperations {
} }
} }
} }
} }

Write Preview
Loading…
Cancel
Save