From 0a8848121cf3056c3ccd880d1dcaed21fa7fe35b Mon Sep 17 00:00:00 2001 From: lasanthaDLPDS Date: Fri, 24 May 2019 20:35:17 +0530 Subject: [PATCH] Improve APPM subscribing method --- .../common/ApplicationInstallResponse.java | 12 + .../mgt/common/SubscribingDeviceIdHolder.java | 56 +++ .../mgt/core/impl/ApplicationManagerImpl.java | 27 +- .../impl/ApplicationStorageManagerImpl.java | 26 +- .../mgt/core/impl/AppmDataHandlerImpl.java | 2 +- .../mgt/core/impl/ReviewManagerImpl.java | 16 +- .../core/impl/SubscriptionManagerImpl.java | 357 +++++++++--------- .../operation/mgt/OperationManagerImpl.java | 21 -- .../operation/mgt/OperationMgtConstants.java | 7 - .../mgt/core/util/DeviceManagerUtil.java | 20 +- 10 files changed, 295 insertions(+), 249 deletions(-) create mode 100644 components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/SubscribingDeviceIdHolder.java diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationInstallResponse.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationInstallResponse.java index 5d3bc260bf..6bc83c9a57 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationInstallResponse.java +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationInstallResponse.java @@ -32,6 +32,14 @@ public class ApplicationInstallResponse { ) private List alreadyInstalledDevices; + @ApiModelProperty( + name = "errorDevices", + value = "List of devices that either device identity is not exist or device type doesn't compatible with the supported device type of the .", + dataType = "List[org.wso2.carbon.device.mgt.common.DeviceIdentifier]" + ) + private List errorDevices; + + @ApiModelProperty( name = "activity", value = "Activity corresponding to the operation" @@ -53,4 +61,8 @@ public class ApplicationInstallResponse { public void setAlreadyInstalledDevices(List alreadyInstalledDevices) { this.alreadyInstalledDevices = alreadyInstalledDevices; } + + public List getErrorDevices() { return errorDevices; } + + public void setErrorDevices(List errorDevices) { this.errorDevices = errorDevices; } } diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/SubscribingDeviceIdHolder.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/SubscribingDeviceIdHolder.java new file mode 100644 index 0000000000..6c7a3cb04b --- /dev/null +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/SubscribingDeviceIdHolder.java @@ -0,0 +1,56 @@ +/* Copyright (c) 2019, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved. + * + * Entgra (Pvt) Ltd. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.device.application.mgt.common; + +import org.wso2.carbon.device.application.mgt.common.dto.DeviceSubscriptionDTO; +import org.wso2.carbon.device.mgt.common.DeviceIdentifier; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class SubscribingDeviceIdHolder { + private List installedDevices = new ArrayList<>(); + private Map compatibleDevices = new HashMap<>(); + private Map deviceSubscriptions = new HashMap<>(); + + public List getInstalledDevices() { + return installedDevices; + } + + public void setInstalledDevices(List installedDevices) { + this.installedDevices = installedDevices; + } + + public Map getCompatibleDevices() { + return compatibleDevices; + } + + public void setCompatibleDevices(Map compatibleDevices) { + this.compatibleDevices = compatibleDevices; + } + + public Map getDeviceSubscriptions() { + return deviceSubscriptions; + } + + public void setDeviceSubscriptions(Map deviceSubscriptions) { + this.deviceSubscriptions = deviceSubscriptions; + } +} diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationManagerImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationManagerImpl.java index e5bf96578b..21f4331363 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationManagerImpl.java +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationManagerImpl.java @@ -1,21 +1,20 @@ -/* - * Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. +/* Copyright (c) 2019, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved. * - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at + * Entgra (Pvt) Ltd. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * http://www.apache.org/licenses/LICENSE-2.0 * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ + package org.wso2.carbon.device.application.mgt.core.impl; import org.apache.commons.io.IOUtils; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationStorageManagerImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationStorageManagerImpl.java index 053aa3bf73..6264c80343 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationStorageManagerImpl.java +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationStorageManagerImpl.java @@ -1,20 +1,18 @@ -/* - * Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. +/* Copyright (c) 2019, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved. * - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at + * Entgra (Pvt) Ltd. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * http://www.apache.org/licenses/LICENSE-2.0 * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ package org.wso2.carbon.device.application.mgt.core.impl; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/AppmDataHandlerImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/AppmDataHandlerImpl.java index 9f0ac6c8d2..d480dde109 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/AppmDataHandlerImpl.java +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/AppmDataHandlerImpl.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2018, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved. +/* Copyright (c) 2019, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved. * * Entgra (Pvt) Ltd. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ReviewManagerImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ReviewManagerImpl.java index 440502102c..5d6106a113 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ReviewManagerImpl.java +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ReviewManagerImpl.java @@ -1,20 +1,20 @@ -/* - * Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * You may obtain a copy of the License at +/* Copyright (c) 2019, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved. + * + * Entgra (Pvt) Ltd. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * */ + package org.wso2.carbon.device.application.mgt.core.impl; import org.apache.commons.logging.Log; diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/SubscriptionManagerImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/SubscriptionManagerImpl.java index c7c6c46a3d..265d9023a9 100644 --- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/SubscriptionManagerImpl.java +++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/SubscriptionManagerImpl.java @@ -1,22 +1,23 @@ -/* -* Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. -* WSO2 Inc. licenses this file to you under the Apache License, -* Version 2.0 (the "License"); you may not use this file except -* in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, -* software distributed under the License is distributed on an -* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -* KIND, either express or implied. See the License for the -* specific language governing permissions and limitations -* under the License. -* -*/ +/* Copyright (c) 2019, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved. + * + * Entgra (Pvt) Ltd. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package org.wso2.carbon.device.application.mgt.core.impl; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.context.PrivilegedCarbonContext; @@ -24,6 +25,7 @@ import org.wso2.carbon.device.application.mgt.common.AppOperation; import org.wso2.carbon.device.application.mgt.common.ApplicationInstallResponse; import org.wso2.carbon.device.application.mgt.common.ApplicationType; import org.wso2.carbon.device.application.mgt.common.SubsciptionType; +import org.wso2.carbon.device.application.mgt.common.SubscribingDeviceIdHolder; import org.wso2.carbon.device.application.mgt.common.dto.ApplicationDTO; import org.wso2.carbon.device.application.mgt.common.ApplicationInstallResponseTmp; import org.wso2.carbon.device.application.mgt.common.dto.DeviceSubscriptionDTO; @@ -55,9 +57,9 @@ import org.wso2.carbon.device.mgt.common.operation.mgt.Activity; import org.wso2.carbon.device.mgt.common.operation.mgt.ActivityStatus; import org.wso2.carbon.device.mgt.common.operation.mgt.Operation; import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException; -import org.wso2.carbon.device.mgt.core.DeviceManagementConstants; import org.wso2.carbon.device.mgt.core.dto.DeviceType; import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation; +import org.wso2.carbon.device.mgt.core.operation.mgt.util.DeviceIDHolder; import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderService; import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil; @@ -92,52 +94,136 @@ public class SubscriptionManagerImpl implements SubscriptionManager { log.debug("Install application which has UUID: " + applicationUUID + " to " + deviceIdentifiers.size() + "devices."); } + DeviceManagementProviderService deviceManagementProviderService = HelperUtil + .getDeviceManagementProviderService(); ApplicationDTO applicationDTO = getApplicationDTO(applicationUUID); - List operationTriggeredDeviceIds = new ArrayList<>(); - List filteredDevices = validateAppInstallingForDevicesRequest(applicationDTO, deviceIdentifiers); - List filteredDeviceIds = new ArrayList<>(); - List installedDeviceIdentifiers = new ArrayList<>(); - Map compatibleDevices = new HashMap<>(); - Map deviceSubscriptions; + DeviceIDHolder filteredDeviceHolder = filterDeviceIdentifiers(applicationDTO, deviceIdentifiers); + List errorDeviceIdentifierList = filteredDeviceHolder.getErrorDeviceIdList(); + List filteredDeviceObjs = new ArrayList<>(); - for (Device device : filteredDevices){ - filteredDeviceIds.add(device.getId()); + for (DeviceIdentifier deviceIdentifier : filteredDeviceHolder.getValidDeviceIDList()) { + try { + Device device = deviceManagementProviderService.getDevice(deviceIdentifier, false); + if (device == null) { + String msg = "Couldn't found an device for device identifier " + deviceIdentifier.getId() + + " and device type: " + deviceIdentifier.getType(); + log.warn(msg); + errorDeviceIdentifierList.add(deviceIdentifier); + } else { + filteredDeviceObjs.add(device); + } + } catch (DeviceManagementException e) { + String msg = "Error occurred when getting device data for device identifier " + deviceIdentifier.getId() + + " and device type " + deviceIdentifier.getType(); + log.warn(msg); + errorDeviceIdentifierList.add(deviceIdentifier); + throw new ApplicationManagementException(msg, e); + } } + SubscribingDeviceIdHolder subscribingDeviceIdHolder = getSubscribingDeviceIdHolder(filteredDeviceObjs); + if (subscribingDeviceIdHolder.getCompatibleDevices().isEmpty()){ + ApplicationInstallResponse applicationInstallResponse = new ApplicationInstallResponse(); + applicationInstallResponse.setAlreadyInstalledDevices(subscribingDeviceIdHolder.getInstalledDevices()); + applicationInstallResponse.setErrorDevices(errorDeviceIdentifierList); + return applicationInstallResponse; + } + Activity activity = installToDevices(applicationDTO, + new ArrayList<>(subscribingDeviceIdHolder.getCompatibleDevices().keySet()), + deviceIdentifiers.get(0).getType()); - deviceSubscriptions = getDeviceSubscriptions(filteredDeviceIds); - for (Device device : filteredDevices) { - DeviceIdentifier deviceIdentifier = new DeviceIdentifier(device.getDeviceIdentifier(), - device.getType()); - DeviceSubscriptionDTO deviceSubscriptionDTO = deviceSubscriptions.get(device.getId()); - if (deviceSubscriptionDTO != null && !deviceSubscriptionDTO.isUnsubscribed() - && Operation.Status.COMPLETED.toString().equals(deviceSubscriptionDTO.getStatus())) { - installedDeviceIdentifiers.add(deviceIdentifier); - } else { - compatibleDevices.put(deviceIdentifier, device.getId()); - } + ApplicationInstallResponse applicationInstallResponse = new ApplicationInstallResponse(); + applicationInstallResponse.setActivity(activity); + applicationInstallResponse.setAlreadyInstalledDevices(subscribingDeviceIdHolder.getInstalledDevices()); + applicationInstallResponse.setErrorDevices(errorDeviceIdentifierList); + + addSubscriptions(applicationDTO.getApplicationReleaseDTOs().get(0).getId(), activity, + subscribingDeviceIdHolder.getCompatibleDevices(), + new ArrayList<>(subscribingDeviceIdHolder.getDeviceSubscriptions().keySet()), null, + SubsciptionType.DEVICE.toString()); + return applicationInstallResponse; + } + + @Override + public ApplicationInstallResponse installApplicationForUsers(String applicationUUID, + List userList) throws ApplicationManagementException { + if (log.isDebugEnabled()) { + log.debug("Install application release which has UUID " + applicationUUID + " to " + userList.size() + + " users."); } - Activity activity = installToDevices(applicationDTO, deviceIdentifiers, deviceIdentifiers.get(0).getType()); - List activityStatuses = activity.getActivityStatus(); - for (ActivityStatus status : activityStatuses) { - if (status.getStatus().equals(ActivityStatus.Status.PENDING)){ - operationTriggeredDeviceIds.add(compatibleDevices.get(status.getDeviceIdentifier())); + //todo check valid user list - throw BadRequest exception + ApplicationDTO applicationDTO = getApplicationDTO(applicationUUID); + DeviceType appDeviceType = APIUtil.getDeviceTypeData(applicationDTO.getDeviceTypeId()); + Map compatibleDevices = new HashMap<>(); + List installedDeviceIdentifiers = new ArrayList<>(); + Map deviceSubscriptions = new HashMap<>(); + + for (String user : userList) { + try { + List userDevices = HelperUtil.getDeviceManagementProviderService().getDevicesOfUser(user); + List filteredDevices = new ArrayList<>(); + + //todo improve for web clips + for (Device device : userDevices) { + if (appDeviceType.getName().equals(device.getType())) { + filteredDevices.add(device); + } + } + + SubscribingDeviceIdHolder subscribingDeviceIdHolder = getSubscribingDeviceIdHolder(filteredDevices); + compatibleDevices.putAll(subscribingDeviceIdHolder.getCompatibleDevices()); + deviceSubscriptions.putAll(subscribingDeviceIdHolder.getDeviceSubscriptions()); + installedDeviceIdentifiers.addAll(subscribingDeviceIdHolder.getInstalledDevices()); + } catch (DeviceManagementException e) { + String msg = "Error occurred when extracting the device list of user[" + user + "]."; + log.error(msg); + throw new ApplicationManagementException(msg, e); } } + + if (compatibleDevices.keySet().isEmpty()){ + ApplicationInstallResponse applicationInstallResponse = new ApplicationInstallResponse(); + applicationInstallResponse.setAlreadyInstalledDevices(installedDeviceIdentifiers); + return applicationInstallResponse; + } + Activity activity = installToDevices(applicationDTO, new ArrayList<>(compatibleDevices.keySet()), + appDeviceType.getName()); + ApplicationInstallResponse applicationInstallResponse = new ApplicationInstallResponse(); applicationInstallResponse.setActivity(activity); applicationInstallResponse.setAlreadyInstalledDevices(installedDeviceIdentifiers); -// int operationId = Integer -// .parseInt(activity.getActivityId().split(DeviceManagementConstants.OperationAttributes.ACTIVITY)[1]); - int operationId = Integer.parseInt(activity.getActivityId().split("ACTIVITY_")[1]); - addDeviceSubscriptions(applicationDTO.getApplicationReleaseDTOs().get(0).getId(), - operationTriggeredDeviceIds, new ArrayList<>(deviceSubscriptions.keySet()), null, operationId, - SubsciptionType.DEVICE.toString()); + addSubscriptions(applicationDTO.getApplicationReleaseDTOs().get(0).getId(), activity, compatibleDevices, + new ArrayList<>(deviceSubscriptions.keySet()), userList, SubsciptionType.USER.toString()); return applicationInstallResponse; } + private SubscribingDeviceIdHolder getSubscribingDeviceIdHolder(List devices) + throws ApplicationManagementException { + List installedDevices = new ArrayList<>(); + Map compatibleDevices = new HashMap<>(); + + List filteredDeviceIds = devices.stream().map(Device::getId).collect(Collectors.toList()); + Map deviceSubscriptions = getDeviceSubscriptions(filteredDeviceIds); + for (Device device : devices) { + DeviceIdentifier deviceIdentifier = new DeviceIdentifier(device.getDeviceIdentifier(), device.getType()); + DeviceSubscriptionDTO deviceSubscriptionDTO = deviceSubscriptions.get(device.getId()); + if (deviceSubscriptionDTO != null && !deviceSubscriptionDTO.isUnsubscribed() && Operation.Status.COMPLETED + .toString().equals(deviceSubscriptionDTO.getStatus())) { + installedDevices.add(deviceIdentifier); + } else { + compatibleDevices.put(deviceIdentifier, device.getId()); + } + } + + SubscribingDeviceIdHolder subscribingDeviceIdHolder = new SubscribingDeviceIdHolder(); + subscribingDeviceIdHolder.setCompatibleDevices(compatibleDevices); + subscribingDeviceIdHolder.setInstalledDevices(installedDevices); + subscribingDeviceIdHolder.setDeviceSubscriptions(deviceSubscriptions); + return subscribingDeviceIdHolder; + } + private ApplicationDTO getApplicationDTO(String uuid) throws ApplicationManagementException { ApplicationDTO applicationDTO; int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true); @@ -173,117 +259,48 @@ public class SubscriptionManagerImpl implements SubscriptionManager { } } - private List validateAppInstallingForDevicesRequest(ApplicationDTO applicationDTO, + private DeviceIDHolder filterDeviceIdentifiers(ApplicationDTO applicationDTO, List deviceIdentifiers) throws ApplicationManagementException { DeviceType deviceType = null; - List existingDevices = new ArrayList<>(); - DeviceManagementProviderService deviceManagementProviderService = HelperUtil - .getDeviceManagementProviderService(); + List errorDeviceIdList = new ArrayList<>(); + List validDeviceIDList = new ArrayList<>(); if (!ApplicationType.WEB_CLIP.toString().equals(applicationDTO.getType())) { deviceType = APIUtil.getDeviceTypeData(applicationDTO.getDeviceTypeId()); } for (DeviceIdentifier deviceIdentifier : deviceIdentifiers) { + if (StringUtils.isEmpty(deviceIdentifier.getId()) || StringUtils.isEmpty(deviceIdentifier.getType())) { + log.warn("Found a device identifier which has either empty identity of the device or empty device " + + "type. Hence ignoring the device identifier. "); + continue; + } if (!ApplicationType.WEB_CLIP.toString().equals(applicationDTO.getType()) && deviceType != null && !deviceType.getName().equals(deviceIdentifier.getType())) { String msg = "Found a device identifier which is not matched with the application device Type. Application " - + "device type is " + deviceType.getName() - + " and identifier which has different device" + " type is " + deviceIdentifier.getId(); - log.error(msg); - throw new BadRequestException(msg); - } - try { - Device device = deviceManagementProviderService.getDevice(deviceIdentifier, false); - if (device == null) { - String msg = "Couldn't found an device for device identifier " + deviceIdentifier.getId() - + " and device type: " + deviceIdentifier.getType(); - log.error(msg); - } else { - existingDevices.add(device); - } - } catch (DeviceManagementException e) { - String msg = "Error occuered when getting device data for divice identifier " + deviceIdentifier.getId() - + " and device type " + deviceIdentifier.getType(); - log.error(msg); - throw new ApplicationManagementException(msg, e); - } - } - return existingDevices; - } - - @Override - public ApplicationInstallResponse installApplicationForUsers(String applicationUUID, - List userList) throws ApplicationManagementException { - if (log.isDebugEnabled()) { - log.debug("Install application release which has UUID " + applicationUUID + " to " + userList.size() - + " users."); - } - - //todo check valid user list - throw BadRequest exception - ApplicationDTO applicationDTO = getApplicationDTO(applicationUUID); - DeviceType appDeviceType = APIUtil.getDeviceTypeData(applicationDTO.getDeviceTypeId()); - Map compatibleDevices = new HashMap<>(); - List operationTriggeredDeviceIds = new ArrayList<>(); - List installedDeviceIdentifiers = new ArrayList<>(); - Map deviceSubscriptions = new HashMap<>(); - - for (String user : userList) { - try { - List userDevices = HelperUtil.getDeviceManagementProviderService().getDevicesOfUser(user); - List filteredDeviceIds = new ArrayList<>(); - List filteredDevices = new ArrayList<>(); - - //todo improve for web clips - for (Device device : userDevices) { - if (appDeviceType.getName().equals(device.getType())) { - filteredDevices.add(device); - filteredDeviceIds.add(device.getId()); - } - } - deviceSubscriptions = getDeviceSubscriptions(filteredDeviceIds); - for (Device device : filteredDevices) { - DeviceIdentifier deviceIdentifier = new DeviceIdentifier(device.getDeviceIdentifier(), - device.getType()); - DeviceSubscriptionDTO deviceSubscriptionDTO = deviceSubscriptions.get(device.getId()); - if (deviceSubscriptionDTO != null && !deviceSubscriptionDTO.isUnsubscribed() - && Operation.Status.COMPLETED.toString().equals(deviceSubscriptionDTO.getStatus())) { - installedDeviceIdentifiers.add(deviceIdentifier); - } else { - compatibleDevices.put(deviceIdentifier, device.getId()); - } - } - } catch (DeviceManagementException e) { - String msg = "Error occurred when extracting the device list of user[" + user + "]."; - log.error(msg); - throw new ApplicationManagementException(msg, e); + + "device type is " + deviceType.getName() + " and the identifier of which has a " + + "different device type is " + deviceIdentifier.getId(); + log.warn(msg); + errorDeviceIdList.add(deviceIdentifier); + } else { + validDeviceIDList.add(deviceIdentifier); } } - Activity activity = installToDevices(applicationDTO, new ArrayList<>(compatibleDevices.keySet()), - appDeviceType.getName()); - List activityStatuses = activity.getActivityStatus(); - for (ActivityStatus status : activityStatuses) { - if (status.getStatus().equals(ActivityStatus.Status.PENDING)){ - operationTriggeredDeviceIds.add(compatibleDevices.get(status.getDeviceIdentifier())); - } + if (validDeviceIDList.isEmpty()) { + String msg = "Couldn't found at least one valid device identifier to install the application."; + log.error(msg); + throw new BadRequestException(msg); } - ApplicationInstallResponse applicationInstallResponse = new ApplicationInstallResponse(); - applicationInstallResponse.setActivity(activity); - applicationInstallResponse.setAlreadyInstalledDevices(installedDeviceIdentifiers); - -// int operationId = Integer -// .parseInt(activity.getActivityId().split(DeviceManagementConstants.OperationAttributes.ACTIVITY)[1]); - int operationId = Integer.parseInt(activity.getActivityId().split("ACTIVITY_")[1]); - - addDeviceSubscriptions(applicationDTO.getApplicationReleaseDTOs().get(0).getId(), - operationTriggeredDeviceIds, new ArrayList<>(deviceSubscriptions.keySet()), userList, operationId, SubsciptionType.USER.toString()); - return applicationInstallResponse; + DeviceIDHolder deviceIDHolder = new DeviceIDHolder(); + deviceIDHolder.setValidDeviceIDList(validDeviceIDList); + deviceIDHolder.setErrorDeviceIdList(errorDeviceIdList); + return deviceIDHolder; } - private void addDeviceSubscriptions(int applicationReleaseId, List deviceIds, - List subDeviceIds, List subscribers, int operationId, String subType) - throws ApplicationManagementException { + private void addSubscriptions(int applicationReleaseId, Activity activity, + Map compatibleDevices, List subDeviceIds, List subscribers, + String subType) throws ApplicationManagementException { int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true); String subscriber = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername(); try { @@ -291,7 +308,7 @@ public class SubscriptionManagerImpl implements SubscriptionManager { List deviceResubscribingIds = new ArrayList<>(); List deviceSubscriptingIds; - if (SubsciptionType.USER.toString().equals(subType)){ + if (SubsciptionType.USER.toString().equals(subType)) { List subscribedUsers = subscriptionDAO.getSubscribedUsernames(subscribers, tenantId); if (!subscribedUsers.isEmpty()) { subscriptionDAO @@ -301,10 +318,18 @@ public class SubscriptionManagerImpl implements SubscriptionManager { subscriptionDAO.subscribeUserToApplication(tenantId, subscriber, subscribers, applicationReleaseId); } + List deviceIds = new ArrayList<>(); + List activityStatuses = activity.getActivityStatus(); + for (ActivityStatus status : activityStatuses) { + if (status.getStatus().equals(ActivityStatus.Status.PENDING)) { + deviceIds.add(compatibleDevices.get(status.getDeviceIdentifier())); + } + } + + int operationId = Integer.parseInt(activity.getActivityId().split("ACTIVITY_")[1]); if (!subDeviceIds.isEmpty()) { - deviceResubscribingIds = subscriptionDAO - .updateDeviceSubscription(subscriber, subDeviceIds, subType, Operation.Status.PENDING.toString(), - applicationReleaseId, tenantId); + deviceResubscribingIds = subscriptionDAO.updateDeviceSubscription(subscriber, subDeviceIds, subType, + Operation.Status.PENDING.toString(), applicationReleaseId, tenantId); deviceIds.removeAll(subDeviceIds); } deviceSubscriptingIds = subscriptionDAO @@ -315,8 +340,8 @@ public class SubscriptionManagerImpl implements SubscriptionManager { ConnectionManagerUtil.commitDBTransaction(); } catch (ApplicationManagementDAOException e) { ConnectionManagerUtil.rollbackDBTransaction(); - String msg = - "Error occurred when adding subscription data for application release UUID: " + applicationReleaseId; + String msg = "Error occurred when adding subscription data for application release UUID: " + + applicationReleaseId; log.error(msg); throw new ApplicationManagementException(msg, e); } catch (DBConnectionException e) { @@ -334,14 +359,13 @@ public class SubscriptionManagerImpl implements SubscriptionManager { } } - private Map getDeviceSubscriptions (List filteredDeviceIds) + private Map getDeviceSubscriptions(List filteredDeviceIds) throws ApplicationManagementException { int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true); try { ConnectionManagerUtil.openDBConnection(); - return this.subscriptionDAO - .getDeviceSubscriptions(filteredDeviceIds, tenantId); + return this.subscriptionDAO.getDeviceSubscriptions(filteredDeviceIds, tenantId); } catch (ApplicationManagementDAOException e) { String msg = "Error occured when getting device subscriptions for given device IDs"; log.error(msg); @@ -356,9 +380,10 @@ public class SubscriptionManagerImpl implements SubscriptionManager { } - @Override - public ApplicationInstallResponseTmp installApplicationForRoles(String applicationUUID, List roleList) - throws ApplicationManagementException { + //todo not implemented below code properly + + @Override public ApplicationInstallResponseTmp installApplicationForRoles(String applicationUUID, + List roleList) throws ApplicationManagementException { if (log.isDebugEnabled()) { log.debug("Install application: " + applicationUUID + " to " + roleList.size() + " roles."); } @@ -400,9 +425,8 @@ public class SubscriptionManagerImpl implements SubscriptionManager { return response; } - @Override - public ApplicationInstallResponseTmp installApplicationForGroups(String applicationUUID, List deviceGroupList) - throws ApplicationManagementException { + @Override public ApplicationInstallResponseTmp installApplicationForGroups(String applicationUUID, + List deviceGroupList) throws ApplicationManagementException { if (log.isDebugEnabled()) { log.debug("Install application: " + applicationUUID + " to " + deviceGroupList.size() + " groups."); } @@ -452,25 +476,23 @@ public class SubscriptionManagerImpl implements SubscriptionManager { return null; } - private Activity installToDevices(ApplicationDTO application, - List deviceIdentifierList, String deviceType) throws ApplicationManagementException { + private Activity installToDevices(ApplicationDTO application, List deviceIdentifierList, + String deviceType) throws ApplicationManagementException { DeviceManagementProviderService deviceManagementProviderService = HelperUtil .getDeviceManagementProviderService(); try { Operation operation = generateOperationPayloadByDeviceType(deviceType, application); //todo refactor add operation code to get successful operations - return deviceManagementProviderService - .addOperation(deviceType, operation, deviceIdentifierList); + return deviceManagementProviderService.addOperation(deviceType, operation, deviceIdentifierList); } catch (OperationManagementException e) { - throw new ApplicationManagementException("Error occurred while adding the application install " - + "operation to devices", e); + throw new ApplicationManagementException( + "Error occurred while adding the application install " + "operation to devices", e); } catch (InvalidDeviceException e) { //This exception should not occur because the validation has already been done. throw new ApplicationManagementException("The list of device identifiers are invalid"); } } - private ApplicationInstallResponseTmp installToDevicesTmp(ApplicationDTO application, List deviceIdentifierList) throws ApplicationManagementException { DeviceManagementProviderService deviceManagementProviderService = HelperUtil @@ -493,8 +515,8 @@ public class SubscriptionManagerImpl implements SubscriptionManager { } catch (OperationManagementException e) { response.setSuccessfulDevices(null); response.setFailedDevices(deviceIdentifierList); - throw new ApplicationManagementException("Error occurred while adding the application install " - + "operation to devices", e); + throw new ApplicationManagementException( + "Error occurred while adding the application install " + "operation to devices", e); } catch (InvalidDeviceException e) { //This exception should not occur because the validation has already been done. throw new ApplicationManagementException("The list of device identifiers are invalid"); @@ -541,7 +563,7 @@ public class SubscriptionManagerImpl implements SubscriptionManager { /** * Validates the preconditions which is required to satisfy from the device which is required to install the * application. - * + *

* This method check two preconditions whether the application type is compatible to install in the device and * whether the device is enrolled in the system. * @@ -572,5 +594,4 @@ public class SubscriptionManagerImpl implements SubscriptionManager { return applicationInstallResponseTmp; } - } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java index 353a37bf6b..eba0477fc3 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java @@ -171,8 +171,6 @@ public class OperationManagerImpl implements OperationManager { + PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain() + ", device count:" + deviceIds.size() + " operation type:" + operation.getCode()); } -// Map> ignoredDeviceIdentifierMap = new HashMap<>(); -// Map> authorizedDeviceIdentifierMap = new HashMap<>(); DeviceIDHolder deviceAuthorizationResult = this.authorizeDevices(operation, validDeviceIds); List authorizedDeviceIds = deviceAuthorizationResult.getValidDeviceIDList(); if (authorizedDeviceIds.isEmpty()) { @@ -221,17 +219,6 @@ public class OperationManagerImpl implements OperationManager { ignoredDevices.add(device); operation.setId(existingOperationID); this.sendNotification(operation, device); -// List deviceIdentifiers; -// if (ignoredDeviceIdentifierMap.containsKey(existingOperationID)) { -// deviceIdentifiers = ignoredDeviceIdentifierMap.get(existingOperationID); -// } else { -// deviceIdentifiers = new ArrayList<>(); -// } -// DeviceIdentifier deviceIdentifier = new DeviceIdentifier(); -// deviceIdentifier.setType(device.getType()); -// deviceIdentifier.setId(device.getDeviceIdentifier()); -// deviceIdentifiers.add(deviceIdentifier); -// ignoredDeviceIdentifierMap.put(existingOperationID, deviceIdentifiers); } } } @@ -266,20 +253,12 @@ public class OperationManagerImpl implements OperationManager { } //TODO have to create a sql to load device details from deviceDAO using single query. - List authorizedDeviceIdentifiers = new ArrayList<>(); for (Device device : authorizedDevices) { enrolmentId = device.getEnrolmentInfo().getId(); //Do not repeat the task operations operationMappingDAO.addOperationMapping(operationId, enrolmentId, isScheduled); -// DeviceIdentifier deviceIdentifier = new DeviceIdentifier(); -// deviceIdentifier.setId(device.getDeviceIdentifier()); -// deviceIdentifier.setType(device.getType()); -// authorizedDeviceIdentifiers.add(deviceIdentifier); } - -// authorizedDeviceIdentifierMap.put(operationId, authorizedDeviceIdentifiers); OperationManagementDAOFactory.commitTransaction(); - if (!isScheduled) { for (Device device : authorizedDevices) { this.sendNotification(operation, device); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationMgtConstants.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationMgtConstants.java index 8da340170a..955fd50682 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationMgtConstants.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationMgtConstants.java @@ -20,13 +20,6 @@ package org.wso2.carbon.device.mgt.core.operation.mgt; public class OperationMgtConstants { - public final class DeviceConstants { - private DeviceConstants() { - } - - public static final String DEVICE_ID_NOT_FOUND = "Device not found for device id: %s"; - } - public final class OperationCodes { private OperationCodes() { } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java index 096c18a53d..44701e6f47 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java @@ -463,25 +463,16 @@ public final class DeviceManagerUtil { } public static DeviceIDHolder validateDeviceIdentifiers(List deviceIDs) { - List errorDeviceIdList = new ArrayList<>(); List validDeviceIDList = new ArrayList<>(); - - int deviceIDCounter = 0; for (DeviceIdentifier deviceIdentifier : deviceIDs) { - - deviceIDCounter++; String deviceID = deviceIdentifier.getId(); - if (deviceID == null || deviceID.isEmpty()) { - log.warn(String.format(OperationMgtConstants.DeviceConstants.DEVICE_ID_NOT_FOUND, - deviceIDCounter)); - errorDeviceIdList.add(deviceIdentifier); + log.warn("When adding operation for devices, found a device identifiers which doesn't have defined " + + "the identity of the device, with the request. Hence ignoring the device identifier."); continue; } - try { - if (isValidDeviceIdentifier(deviceIdentifier)) { validDeviceIDList.add(deviceIdentifier); } else { @@ -491,7 +482,6 @@ public final class DeviceManagerUtil { errorDeviceIdList.add(deviceIdentifier); } } - DeviceIDHolder deviceIDHolder = new DeviceIDHolder(); deviceIDHolder.setValidDeviceIDList(validDeviceIDList); deviceIDHolder.setErrorDeviceIdList(errorDeviceIdList); @@ -505,10 +495,8 @@ public final class DeviceManagerUtil { if (device == null || device.getDeviceIdentifier() == null || device.getDeviceIdentifier().isEmpty() || device.getEnrolmentInfo() == null) { return false; - } else if (EnrolmentInfo.Status.REMOVED.equals(device.getEnrolmentInfo().getStatus())) { - return false; - } - return true; + } else + return !EnrolmentInfo.Status.REMOVED.equals(device.getEnrolmentInfo().getStatus()); } public static boolean isDeviceExists(DeviceIdentifier deviceIdentifier) throws DeviceManagementException {