From 61f6fdeca944399bf8282efc6b5d9882c9b64628 Mon Sep 17 00:00:00 2001 From: warunalakshitha Date: Wed, 12 Jul 2017 12:33:16 +0530 Subject: [PATCH] Revert "Add multiple push notification support and transport config for features" This reverts commit ad9ec1f994828135e19b2cc4e816ced2938e12f7. --- .../impl/DeviceTypeManagementServiceImpl.java | 16 ++-- .../carbon/device/mgt/common/Feature.java | 13 ---- .../operation/mgt/OperationManager.java | 16 +--- .../notification/PushNotificationConfig.java | 10 +-- .../common/spi/DeviceManagementService.java | 4 +- .../type/mgt/DeviceTypeMetaDefinition.java | 13 ++-- .../DeviceManagementPluginRepository.java | 68 +++++------------ .../operation/mgt/OperationManagerImpl.java | 54 +++----------- ...PushNotificationBasedOperationManager.java | 18 +---- .../task/PushNotificationSchedulerTask.java | 22 +----- .../DeviceManagementProviderService.java | 7 +- .../DeviceManagementProviderServiceImpl.java | 27 ++----- .../mgt/core/TestDeviceManagementService.java | 5 +- .../template/DeviceTypeManagerService.java | 74 +++++++++---------- .../HTTPDeviceTypeManagerService.java | 50 +++++-------- .../config/DeviceTypeConfiguration.java | 17 ++--- .../device/type/template/config/Feature.java | 27 ------- .../config/PushNotificationProvider.java | 30 -------- .../config/PushNotificationProviders.java | 74 ------------------- .../ConfigurationBasedFeatureManager.java | 1 - 20 files changed, 126 insertions(+), 420 deletions(-) delete mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/PushNotificationProviders.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceTypeManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceTypeManagementServiceImpl.java index eb350d57a0a..5fdc06a5015 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceTypeManagementServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceTypeManagementServiceImpl.java @@ -30,6 +30,7 @@ import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService; import org.wso2.carbon.device.mgt.jaxrs.beans.DeviceTypeList; import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse; import org.wso2.carbon.device.mgt.jaxrs.service.api.DeviceTypeManagementService; +import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.RequestValidationUtil; import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils; import javax.validation.constraints.Size; @@ -37,9 +38,9 @@ import javax.ws.rs.GET; import javax.ws.rs.HeaderParam; import javax.ws.rs.Path; import javax.ws.rs.PathParam; +import javax.ws.rs.QueryParam; import javax.ws.rs.core.Response; import java.util.ArrayList; -import java.util.LinkedList; import java.util.List; @Path("/device-types") @@ -78,7 +79,7 @@ public class DeviceTypeManagementServiceImpl implements DeviceTypeManagementServ if (fm == null) { return Response.status(Response.Status.NOT_FOUND).entity( new ErrorResponse.ErrorResponseBuilder().setMessage("No feature manager is " + - "registered with the given type '" + type + "'").build()).build(); + "registered with the given type '" + type + "'").build()).build(); } features = fm.getFeatures(); } catch (DeviceManagementException e) { @@ -132,7 +133,6 @@ public class DeviceTypeManagementServiceImpl implements DeviceTypeManagementServ /** * This cleans up the configs that should not be exposed to iot users. - * * @param deviceType * @return */ @@ -140,13 +140,9 @@ public class DeviceTypeManagementServiceImpl implements DeviceTypeManagementServ DeviceTypeMetaDefinition metaDefinition = deviceType.getDeviceTypeMetaDefinition(); if (metaDefinition != null) { metaDefinition.setInitialOperationConfig(null); - if (metaDefinition.getPushNotificationConfigs() != null) { - List pushNotificationConfigs = new LinkedList<>(); - for (PushNotificationConfig pushNotificationConfig : metaDefinition.getPushNotificationConfigs()) { - pushNotificationConfigs.add(new PushNotificationConfig(pushNotificationConfig.getType(), false, - false, null)); - } - metaDefinition.setPushNotificationConfigs(pushNotificationConfigs); + if (metaDefinition.getPushNotificationConfig() != null) { + metaDefinition.setPushNotificationConfig(new PushNotificationConfig(metaDefinition. + getPushNotificationConfig().getType(), false, null)); } deviceType.setDeviceTypeMetaDefinition(metaDefinition); } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Feature.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Feature.java index c92a70c6a95..cea193877eb 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Feature.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Feature.java @@ -39,10 +39,6 @@ public class Feature implements Serializable { "Features allow you to perform operations on any device type, " + "such as android, iOS or windows..", required = true ) private String deviceType; - - @ApiModelProperty(name = "pushNotificationProviderType", value = "Provides push notification provider for the " + - "feature. If not set default push notification strategy will be used.") - private String pushNotificationType; @ApiModelProperty(name = "metadataEntries", value = "Properties related to features.", required = true ) private List metadataEntries; @@ -91,15 +87,6 @@ public class Feature implements Serializable { this.deviceType = deviceType; } - @XmlElement - public String getPushNotificationType() { - return pushNotificationType; - } - - public void setPushNotificationType(String pushNotificationType) { - this.pushNotificationType = pushNotificationType; - } - @XmlElement public String getDescription() { return description; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/operation/mgt/OperationManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/operation/mgt/OperationManager.java index 401a402e13b..8de9f3199e3 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/operation/mgt/OperationManager.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/operation/mgt/OperationManager.java @@ -25,7 +25,6 @@ import org.wso2.carbon.device.mgt.common.PaginationResult; import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy; import java.util.List; -import java.util.Map; /** * This represents the Device Operation management functionality which should be implemented by @@ -108,23 +107,12 @@ public interface OperationManager { * Operation manger implementation can have a push notification stratergy * @param notificationStrategy eg: mqtt/xmpp */ - void setDefaultNotificationStrategy(NotificationStrategy notificationStrategy); + void setNotificationStrategy(NotificationStrategy notificationStrategy); /** * retrive the push notification strategy. * @return NotificationStrategy */ - NotificationStrategy getDefaultNotificationStrategy(); - - /** - * Set notification strategy map which contains feature code to notification strategy map - * @param notificationStrategyMap - */ - public void setNotificationStrategyMap(Map notificationStrategyMap); - /** - * Provides notification strategy Map - * @return Map which contains mapping for feature code to notification strategy - */ - public Map getNotificationStrategyMap(); + NotificationStrategy getNotificationStrategy(); } \ No newline at end of file diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/push/notification/PushNotificationConfig.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/push/notification/PushNotificationConfig.java index 33942fa0fd3..6b9e9f9f3e4 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/push/notification/PushNotificationConfig.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/push/notification/PushNotificationConfig.java @@ -27,15 +27,12 @@ public class PushNotificationConfig { private String type; private boolean isScheduled; - private boolean isDefault; Map properties; - public PushNotificationConfig(String type, boolean isScheduled, boolean isDefault, Map - properties) { + public PushNotificationConfig(String type, boolean isScheduled, Map properties) { this.type = type; this.properties = properties; this.isScheduled = isScheduled; - this.isDefault = isDefault; } @XmlElement(name = "Type", required = true) @@ -48,11 +45,6 @@ public class PushNotificationConfig { return isScheduled; } - @XmlElement(name = "Default") - public boolean isDefault() { - return isDefault; - } - public Map getProperties() { return properties; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/spi/DeviceManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/spi/DeviceManagementService.java index f3372f7b228..8cbe0492458 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/spi/DeviceManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/spi/DeviceManagementService.java @@ -24,8 +24,6 @@ import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager; import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationSubscriber; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig; -import java.util.List; - /** * Composite interface that acts as the SPI exposing all device management as well as application management * functionalities. @@ -44,7 +42,7 @@ public interface DeviceManagementService { ProvisioningConfig getProvisioningConfig(); - List getPushNotificationConfigs(); + PushNotificationConfig getPushNotificationConfig(); PolicyMonitoringManager getPolicyMonitoringManager(); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/type/mgt/DeviceTypeMetaDefinition.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/type/mgt/DeviceTypeMetaDefinition.java index 29388085c24..98b6c36e328 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/type/mgt/DeviceTypeMetaDefinition.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/type/mgt/DeviceTypeMetaDefinition.java @@ -2,6 +2,7 @@ package org.wso2.carbon.device.mgt.common.type.mgt; import org.wso2.carbon.device.mgt.common.Feature; import org.wso2.carbon.device.mgt.common.InitialOperationConfig; +import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig; import org.wso2.carbon.device.mgt.common.license.mgt.License; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig; @@ -12,7 +13,7 @@ public class DeviceTypeMetaDefinition { private List properties; private List features; private boolean claimable; - private List pushNotificationConfigs; + private PushNotificationConfig pushNotificationConfig; private boolean policyMonitoringEnabled; private InitialOperationConfig initialOperationConfig; private License license; @@ -50,13 +51,13 @@ public class DeviceTypeMetaDefinition { this.claimable = isClaimable; } - public List getPushNotificationConfigs() { - return pushNotificationConfigs; + public PushNotificationConfig getPushNotificationConfig() { + return pushNotificationConfig; } - public void setPushNotificationConfigs( - List pushNotificationConfigs) { - this.pushNotificationConfigs = pushNotificationConfigs; + public void setPushNotificationConfig( + PushNotificationConfig pushNotificationConfig) { + this.pushNotificationConfig = pushNotificationConfig; } public boolean isPolicyMonitoringEnabled() { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementPluginRepository.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementPluginRepository.java index ffb1c5d276a..7a3b4871216 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementPluginRepository.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementPluginRepository.java @@ -22,11 +22,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.device.mgt.common.DeviceManagementException; -import org.wso2.carbon.device.mgt.common.DeviceStatusTaskPluginConfig; +import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationSubscriber; +import org.wso2.carbon.device.mgt.core.dto.DeviceManagementServiceHolder; +import org.wso2.carbon.device.mgt.core.dto.DeviceTypeServiceIdentifier; import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig; import org.wso2.carbon.device.mgt.common.ProvisioningConfig; +import org.wso2.carbon.device.mgt.common.DeviceStatusTaskPluginConfig; import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManager; -import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationSubscriber; import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationProvider; @@ -35,9 +37,7 @@ import org.wso2.carbon.device.mgt.common.type.mgt.DeviceTypeDefinitionProvider; import org.wso2.carbon.device.mgt.common.type.mgt.DeviceTypeMetaDefinition; import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager; import org.wso2.carbon.device.mgt.core.config.DeviceManagementConfig; -import org.wso2.carbon.device.mgt.core.dto.DeviceManagementServiceHolder; import org.wso2.carbon.device.mgt.core.dto.DeviceType; -import org.wso2.carbon.device.mgt.core.dto.DeviceTypeServiceIdentifier; import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder; import org.wso2.carbon.device.mgt.core.internal.DeviceManagementServiceComponent; import org.wso2.carbon.device.mgt.core.internal.DeviceManagerStartupListener; @@ -51,12 +51,9 @@ import org.wso2.carbon.device.mgt.core.task.DeviceMgtTaskException; import org.wso2.carbon.device.mgt.core.task.DeviceTaskManagerService; import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; -import java.util.List; import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; public class DeviceManagementPluginRepository implements DeviceManagerStartupListener { @@ -158,9 +155,8 @@ public class DeviceManagementPluginRepository implements DeviceManagerStartupLis OperationManager operationManager = operationManagerRepository.getOperationManager( deviceTypeIdentifier); if (operationManager != null) { - Collection notificationStrategies = operationManager.getNotificationStrategyMap() - .values(); - for (NotificationStrategy notificationStrategy : notificationStrategies) { + NotificationStrategy notificationStrategy = operationManager.getNotificationStrategy(); + if (notificationStrategy != null) { notificationStrategy.undeploy(); } operationManagerRepository.removeOperationManager(deviceTypeIdentifier); @@ -208,7 +204,7 @@ public class DeviceManagementPluginRepository implements DeviceManagerStartupLis long updatedTimestamp = provider.getTimestamp(); if (System.currentTimeMillis() - updatedTimestamp > DEFAULT_UPDATE_TIMESTAMP) { try { - DeviceType deviceType = DeviceManagerUtil.getDeviceType(type, tenantId); + DeviceType deviceType = DeviceManagerUtil.getDeviceType(type,tenantId); DeviceTypeMetaDefinition deviceTypeMetaDefinition = deviceType.getDeviceTypeMetaDefinition(); if (deviceTypeMetaDefinition != null) { Gson gson = new Gson(); @@ -217,9 +213,8 @@ public class DeviceManagementPluginRepository implements DeviceManagerStartupLis provider.getDeviceManagementService()).getDeviceTypeMetaDefinition(); String cachedDefinition = gson.toJson(deviceTypeMetaDefinition); if (!cachedDefinition.equals(dbStoredDefinition)) { - DeviceManagementService deviceTypeManagerService = DeviceManagementDataHolder - .getInstance().getDeviceTypeGeneratorService() - .populateDeviceManagementService(type, deviceTypeMetaDefinition); + DeviceManagementService deviceTypeManagerService = DeviceManagementDataHolder.getInstance() + .getDeviceTypeGeneratorService().populateDeviceManagementService(type, deviceTypeMetaDefinition); if (deviceTypeManagerService == null) { log.error("Failing to retrieve the device type service for " + type); return null; @@ -253,7 +248,7 @@ public class DeviceManagementPluginRepository implements DeviceManagerStartupLis private void registerPushNotificationStrategy(DeviceManagementService deviceManagementService) throws DeviceManagementException { - List pushNoteConfigs = deviceManagementService.getPushNotificationConfigs(); + PushNotificationConfig pushNoteConfig = deviceManagementService.getPushNotificationConfig(); PrivilegedCarbonContext.startTenantFlow(); PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain( deviceManagementService.getProvisioningConfig().getProviderTenantDomain(), true); @@ -267,40 +262,17 @@ public class DeviceManagementPluginRepository implements DeviceManagerStartupLis deviceTypeIdentifier = new DeviceTypeServiceIdentifier(deviceManagementService.getType(), tenantId); } - if (pushNoteConfigs != null) { - Map notificationStrategyMap = new ConcurrentHashMap<>(); - NotificationStrategy defaultNotificationStrategy = null; - for (PushNotificationConfig pushNoteConfig : pushNoteConfigs) { - PushNotificationProvider provider = DeviceManagementDataHolder.getInstance() - .getPushNotificationProviderRepository().getProvider(pushNoteConfig.getType()); - if (provider == null) { - throw new DeviceManagementException( - "No registered push notification provider found for the type: '" + - pushNoteConfig.getType() + "'."); - } - NotificationStrategy notificationStrategy = provider.getNotificationStrategy(pushNoteConfig); - if (pushNoteConfig.isDefault()) { - if (defaultNotificationStrategy == null) { - defaultNotificationStrategy = notificationStrategy; - } else { - throw new DeviceManagementException( - "Multiple push notification strategies are set as default. Only one strategy can " + - "be set as default for the device type: '" + deviceTypeIdentifier - .getDeviceType() + "'."); - } - } - notificationStrategyMap.put(pushNoteConfig.getType(), notificationStrategy); - } - - if (defaultNotificationStrategy != null) { - operationManagerRepository.addOperationManager(deviceTypeIdentifier, - new OperationManagerImpl(deviceTypeIdentifier.getDeviceType(), - defaultNotificationStrategy, notificationStrategyMap)); - } else { + if (pushNoteConfig != null) { + PushNotificationProvider provider = DeviceManagementDataHolder.getInstance() + .getPushNotificationProviderRepository().getProvider(pushNoteConfig.getType()); + if (provider == null) { throw new DeviceManagementException( - "No registered default push notification provider found for the device type: '" + deviceTypeIdentifier - .getDeviceType() + "'."); + "No registered push notification provider found for the type: '" + + pushNoteConfig.getType() + "'."); } + NotificationStrategy notificationStrategy = provider.getNotificationStrategy(pushNoteConfig); + operationManagerRepository.addOperationManager(deviceTypeIdentifier, + new OperationManagerImpl(deviceTypeIdentifier.getDeviceType(), notificationStrategy)); } else { operationManagerRepository.addOperationManager(deviceTypeIdentifier, new OperationManagerImpl(deviceTypeIdentifier.getDeviceType())); @@ -405,7 +377,7 @@ public class DeviceManagementPluginRepository implements DeviceManagerStartupLis String deviceTypeName; synchronized (providers) { for (DeviceManagementServiceHolder deviceManagementServiceHolder : providers.values()) { - DeviceManagementService provider = deviceManagementServiceHolder.getDeviceManagementService(); + DeviceManagementService provider= deviceManagementServiceHolder.getDeviceManagementService(); try { provider.init(); deviceTypeName = provider.getType(); 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 326807af84d..c22f3de9503 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 @@ -25,8 +25,6 @@ import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.common.DeviceManagementException; import org.wso2.carbon.device.mgt.common.EnrolmentInfo; -import org.wso2.carbon.device.mgt.common.Feature; -import org.wso2.carbon.device.mgt.common.FeatureManager; import org.wso2.carbon.device.mgt.common.InvalidDeviceException; import org.wso2.carbon.device.mgt.common.MonitoringOperation; import org.wso2.carbon.device.mgt.common.PaginationRequest; @@ -66,7 +64,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.List; -import java.util.Map; /** * This class implements all the functionality exposed as part of the OperationManager. Any transaction initiated @@ -85,10 +82,8 @@ public class OperationManagerImpl implements OperationManager { private OperationDAO operationDAO; private DeviceDAO deviceDAO; private EnrollmentDAO enrollmentDAO; - private Map notificationStrategyMap; - private NotificationStrategy defaultNotificationStrategy; + private NotificationStrategy notificationStrategy; private String deviceType; - private FeatureManager featureManager; public OperationManagerImpl() { commandOperationDAO = OperationManagementDAOFactory.getCommandOperationDAO(); @@ -101,35 +96,22 @@ public class OperationManagerImpl implements OperationManager { enrollmentDAO = DeviceManagementDAOFactory.getEnrollmentDAO(); } - public OperationManagerImpl(String deviceType) throws DeviceManagementException { + public OperationManagerImpl(String deviceType) { this(); this.deviceType = deviceType; - featureManager = DeviceManagementDataHolder.getInstance().getDeviceManagementProvider() - .getFeatureManager(deviceType); } - public NotificationStrategy getDefaultNotificationStrategy() { - return defaultNotificationStrategy; + public NotificationStrategy getNotificationStrategy() { + return notificationStrategy; } - public void setDefaultNotificationStrategy(NotificationStrategy defaultNotificationStrategy) { - this.defaultNotificationStrategy = defaultNotificationStrategy; + public void setNotificationStrategy(NotificationStrategy notificationStrategy) { + this.notificationStrategy = notificationStrategy; } - public Map getNotificationStrategyMap() { - return notificationStrategyMap; - } - - public void setNotificationStrategyMap(Map notificationStrategyMap) { - this.notificationStrategyMap = notificationStrategyMap; - } - - public OperationManagerImpl(String deviceType, NotificationStrategy defaultNotificationStrategy, Map notificationStrategyMap) throws - DeviceManagementException { + public OperationManagerImpl(String deviceType, NotificationStrategy notificationStrategy) { this(deviceType); - this.defaultNotificationStrategy = defaultNotificationStrategy; - this.notificationStrategyMap = notificationStrategyMap; + this.notificationStrategy = notificationStrategy; } @Override @@ -167,17 +149,8 @@ public class OperationManagerImpl implements OperationManager { boolean isNotRepeated = false; boolean isScheduled = false; - // check whether device list is greater than batch size notification strategy has enable to send push // notification using scheduler task - NotificationStrategy notificationStrategy = null; - Feature feature = featureManager.getFeature(operation.getCode()); - if (feature != null && feature.getPushNotificationType() != null) { - notificationStrategy = notificationStrategyMap.get(feature.getPushNotificationType()); - } - if (notificationStrategy == null) { - notificationStrategy = defaultNotificationStrategy; - } if (DeviceConfigurationManager.getInstance().getDeviceManagementConfig(). getPushNotificationConfiguration().getSchedulerBatchSize() <= authorizedDeviceList.size() && notificationStrategy != null) { @@ -224,15 +197,13 @@ public class OperationManagerImpl implements OperationManager { operation.setId(operationId); operation.setActivityId(DeviceManagementConstants.OperationAttributes.ACTIVITY + operationId); notificationStrategy.execute(new NotificationContext(deviceId, operation)); - 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) { log.error("Error occurred while sending push notifications to " + deviceId.getType() + " device carrying id '" + deviceId + "'", e); // 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); } } } @@ -259,9 +230,6 @@ public class OperationManagerImpl implements OperationManager { throw new OperationManagementException("Error occurred while adding operation", e); } catch (TransactionManagementException e) { throw new OperationManagementException("Error occurred while initiating the transaction", e); - } catch (DeviceManagementException e) { - throw new OperationManagementException("Error occurred while getting feature for given operation code :" - + operation.getCode(), e); } finally { OperationManagementDAOFactory.closeConnection(); } @@ -274,7 +242,7 @@ public class OperationManagerImpl implements OperationManager { //Add the invalid DeviceIds for (String id : deviceIdValidationResult.getErrorDeviceIdList()) { activityStatus = new ActivityStatus(); - activityStatus.setDeviceIdentifier(new DeviceIdentifier(id, deviceType)); + activityStatus.setDeviceIdentifier(new DeviceIdentifier(id,deviceType)); activityStatus.setStatus(ActivityStatus.Status.INVALID); activityStatuses.add(activityStatus); } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/push/notification/mgt/PushNotificationBasedOperationManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/push/notification/mgt/PushNotificationBasedOperationManager.java index f5d95c184b2..79ffacb370e 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/push/notification/mgt/PushNotificationBasedOperationManager.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/push/notification/mgt/PushNotificationBasedOperationManager.java @@ -28,7 +28,6 @@ import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy; import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationExecutionFailedException; import java.util.List; -import java.util.Map; public class PushNotificationBasedOperationManager implements OperationManager { @@ -143,24 +142,13 @@ public class PushNotificationBasedOperationManager implements OperationManager { } @Override - public void setDefaultNotificationStrategy(NotificationStrategy notificationStrategy) { + public void setNotificationStrategy(NotificationStrategy notificationStrategy) { } @Override - public NotificationStrategy getDefaultNotificationStrategy() { - return null; + public NotificationStrategy getNotificationStrategy() { + return notificationProvider; } - @Override - public void setNotificationStrategyMap(Map notificationStrategyMap) { - - } - - @Override - public Map getNotificationStrategyMap() { - return null; - } - - } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/push/notification/mgt/task/PushNotificationSchedulerTask.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/push/notification/mgt/task/PushNotificationSchedulerTask.java index 30059f11c37..133ba08cb0a 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/push/notification/mgt/task/PushNotificationSchedulerTask.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/push/notification/mgt/task/PushNotificationSchedulerTask.java @@ -21,8 +21,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.device.mgt.common.DeviceManagementException; -import org.wso2.carbon.device.mgt.common.Feature; -import org.wso2.carbon.device.mgt.common.FeatureManager; import org.wso2.carbon.device.mgt.common.TransactionManagementException; import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException; import org.wso2.carbon.device.mgt.common.push.notification.NotificationContext; @@ -85,24 +83,12 @@ public class PushNotificationSchedulerTask implements Runnable { PrivilegedCarbonContext.startTenantFlow(); PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(operationMapping.getTenantId(), true); // Get notification strategy for given device type - NotificationStrategy notificationStrategy = null; - org.wso2.carbon.device.mgt.common.operation.mgt.Operation operation = provider.getOperation(operationMapping.getDeviceIdentifier().getType(), operationMapping - .getOperationId()); - FeatureManager featureManager = provider.getFeatureManager(operationMapping.getDeviceIdentifier().getType()); - Feature feature = featureManager.getFeature(operation.getCode()); - if (feature != null) { - Map notificationStrategyListByDeviceType = provider.getNotificationStrategyListByDeviceType(operationMapping.getDeviceIdentifier().getType()); - if (notificationStrategyListByDeviceType != null && feature.getPushNotificationType() != null) { - notificationStrategy = notificationStrategyListByDeviceType.get(feature.getPushNotificationType()); - } - } - if (notificationStrategy == null) { - notificationStrategy = provider.getDefaultNotificationStrategyByDeviceType(operationMapping.getDeviceIdentifier() - .getType()); - } + NotificationStrategy notificationStrategy = provider.getNotificationStrategyByDeviceType + (operationMapping.getDeviceIdentifier().getType()); // Send the push notification on given strategy notificationStrategy.execute(new NotificationContext(operationMapping.getDeviceIdentifier(), - operation)); + provider.getOperation(operationMapping.getDeviceIdentifier().getType(), operationMapping + .getOperationId()))); operationMapping.setPushNotificationStatus(Operation.PushNotificationStatus.COMPLETED); operationsCompletedList.add(operationMapping); } catch (DeviceManagementException e) { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java index f5f3e5c332b..e52d7f38c31 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java @@ -39,9 +39,7 @@ import org.wso2.carbon.device.mgt.core.dto.DeviceType; import java.util.Date; import java.util.HashMap; -import java.util.LinkedList; import java.util.List; -import java.util.Map; /** * Proxy class for all Device Management related operations that take the corresponding plugin type in @@ -473,10 +471,7 @@ public interface DeviceManagementProviderService { * @return Notification Strategy for device type * @throws DeviceManagementException */ - NotificationStrategy getDefaultNotificationStrategyByDeviceType(String deviceType) throws DeviceManagementException; - - Map getNotificationStrategyListByDeviceType(String deviceType) throws - DeviceManagementException; + NotificationStrategy getNotificationStrategyByDeviceType(String deviceType) throws DeviceManagementException; License getLicense(String deviceType, String languageCode) throws DeviceManagementException; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java index a47366d3341..1e099602831 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java @@ -28,6 +28,9 @@ import org.wso2.carbon.device.mgt.common.DeviceIdentifier; import org.wso2.carbon.device.mgt.common.DeviceManagementException; import org.wso2.carbon.device.mgt.common.DeviceManager; import org.wso2.carbon.device.mgt.common.DeviceNotFoundException; +import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationExecutionFailedException; +import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationSubscriber; +import org.wso2.carbon.device.mgt.core.dto.DeviceTypeServiceIdentifier; import org.wso2.carbon.device.mgt.common.EnrolmentInfo; import org.wso2.carbon.device.mgt.common.FeatureManager; import org.wso2.carbon.device.mgt.common.InitialOperationConfig; @@ -52,8 +55,6 @@ 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.common.operation.mgt.OperationManager; import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager; -import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationExecutionFailedException; -import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationSubscriber; import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy; import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService; import org.wso2.carbon.device.mgt.core.DeviceManagementConstants; @@ -68,7 +69,6 @@ import org.wso2.carbon.device.mgt.core.dao.EnrollmentDAO; import org.wso2.carbon.device.mgt.core.device.details.mgt.dao.DeviceDetailsDAO; import org.wso2.carbon.device.mgt.core.device.details.mgt.dao.DeviceDetailsMgtDAOException; import org.wso2.carbon.device.mgt.core.dto.DeviceType; -import org.wso2.carbon.device.mgt.core.dto.DeviceTypeServiceIdentifier; import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder; import org.wso2.carbon.device.mgt.core.internal.DeviceManagementServiceComponent; import org.wso2.carbon.device.mgt.core.internal.PluginInitializationListener; @@ -1449,24 +1449,11 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv } @Override - public NotificationStrategy getDefaultNotificationStrategyByDeviceType(String deviceType) throws - DeviceManagementException { - int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(); - OperationManager operationManager = pluginRepository.getOperationManager(deviceType, tenantId); - if (operationManager != null) { - return operationManager.getDefaultNotificationStrategy(); - } else { - throw new DeviceManagementException("Cannot find operation manager for given device type :" + deviceType); - } - } - - @Override - public Map getNotificationStrategyListByDeviceType(String deviceType) throws - DeviceManagementException { + public NotificationStrategy getNotificationStrategyByDeviceType(String deviceType) throws DeviceManagementException { int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(); OperationManager operationManager = pluginRepository.getOperationManager(deviceType, tenantId); if (operationManager != null) { - return operationManager.getNotificationStrategyMap(); + return operationManager.getNotificationStrategy(); } else { throw new DeviceManagementException("Cannot find operation manager for given device type :" + deviceType); } @@ -1696,8 +1683,8 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv DeviceManagementService dms = pluginRepository.getDeviceManagementService(deviceIdentifier.getType(), this.getTenantId()); if (dms == null) { - String message = "Device type '" + deviceIdentifier.getType() + "' does not have an associated device " + - "management " + "plugin registered within the framework"; + String message = "Device type '" + deviceIdentifier.getType() + "' does not have an associated device management " + + "plugin registered within the framework"; if (log.isDebugEnabled()) { log.debug(message); } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManagementService.java index 13542c4301e..d555de0b417 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManagementService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManagementService.java @@ -24,8 +24,6 @@ import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationSubsc import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig; import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService; -import java.util.List; - public class TestDeviceManagementService implements DeviceManagementService { private String providerType; @@ -65,7 +63,8 @@ public class TestDeviceManagementService implements DeviceManagementService { return new ProvisioningConfig(tenantDomain, false); } - public List getPushNotificationConfigs() { + @Override + public PushNotificationConfig getPushNotificationConfig() { return null; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/DeviceTypeManagerService.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/DeviceTypeManagerService.java index c73c20cb7c1..9ff760b4c9e 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/DeviceTypeManagerService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/DeviceTypeManagerService.java @@ -22,10 +22,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.mgt.common.DeviceManagementException; import org.wso2.carbon.device.mgt.common.DeviceManager; -import org.wso2.carbon.device.mgt.common.DeviceStatusTaskPluginConfig; import org.wso2.carbon.device.mgt.common.InitialOperationConfig; import org.wso2.carbon.device.mgt.common.MonitoringOperation; import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig; +import org.wso2.carbon.device.mgt.common.DeviceStatusTaskPluginConfig; import org.wso2.carbon.device.mgt.common.ProvisioningConfig; import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManager; import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry; @@ -42,14 +42,12 @@ import org.wso2.carbon.device.mgt.extensions.device.type.template.config.PolicyM import org.wso2.carbon.device.mgt.extensions.device.type.template.config.Property; import org.wso2.carbon.device.mgt.extensions.device.type.template.config.PullNotificationSubscriberConfig; import org.wso2.carbon.device.mgt.extensions.device.type.template.config.PushNotificationProvider; -import org.wso2.carbon.device.mgt.extensions.device.type.template.config.PushNotificationProviders; import org.wso2.carbon.device.mgt.extensions.device.type.template.config.TaskConfiguration; import org.wso2.carbon.device.mgt.extensions.device.type.template.policy.mgt.DefaultPolicyMonitoringManager; import org.wso2.carbon.device.mgt.extensions.device.type.template.pull.notification.PullNotificationSubscriberLoader; import java.util.ArrayList; import java.util.HashMap; -import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -62,7 +60,7 @@ public class DeviceTypeManagerService implements DeviceManagementService { private static final Log log = LogFactory.getLog(DeviceTypeManagerService.class); private DeviceManager deviceManager; - private List pushNotificationConfigs; + private PushNotificationConfig pushNotificationConfig; private ProvisioningConfig provisioningConfig; private String type; private OperationMonitoringTaskConfig operationMonitoringConfigs; @@ -77,7 +75,7 @@ public class DeviceTypeManagerService implements DeviceManagementService { this.setProvisioningConfig(deviceTypeConfigIdentifier.getTenantDomain(), deviceTypeConfiguration); this.deviceManager = new DeviceTypeManager(deviceTypeConfigIdentifier, deviceTypeConfiguration); this.setType(deviceTypeConfiguration.getName()); - this.populatePushNotificationConfig(deviceTypeConfiguration.getPushNotificationProviders()); + this.populatePushNotificationConfig(deviceTypeConfiguration.getPushNotificationProvider()); this.operationMonitoringConfigs = new OperationMonitoringTaskConfig(); this.setOperationMonitoringConfig(deviceTypeConfiguration); this.initialOperationConfig = new InitialOperationConfig(); @@ -94,7 +92,7 @@ public class DeviceTypeManagerService implements DeviceManagementService { } @Override - public OperationMonitoringTaskConfig getOperationMonitoringConfig() { + public OperationMonitoringTaskConfig getOperationMonitoringConfig(){ return operationMonitoringConfigs; } @@ -122,42 +120,35 @@ public class DeviceTypeManagerService implements DeviceManagementService { public void init() throws DeviceManagementException { } - private void populatePushNotificationConfig(PushNotificationProviders pushNotificationProviders) { - if (pushNotificationProviders != null) { - pushNotificationConfigs = new LinkedList<>(); - List notificationProviders = pushNotificationProviders.getPushNotificationProviders(); - for (PushNotificationProvider pushNotificationProvider : notificationProviders) { - if (pushNotificationProvider != null) { - if (pushNotificationProvider.isFileBasedProperties()) { - Map staticProps = new HashMap<>(); - ConfigProperties configProperties = pushNotificationProvider.getConfigProperties(); - if (configProperties != null) { - List properties = configProperties.getProperty(); - if (properties != null && properties.size() > 0) { - for (Property property : properties) { - staticProps.put(property.getName(), property.getValue()); - } - } + private void populatePushNotificationConfig(PushNotificationProvider pushNotificationProvider) { + if (pushNotificationProvider != null) { + if (pushNotificationProvider.isFileBasedProperties()) { + Map staticProps = new HashMap<>(); + ConfigProperties configProperties = pushNotificationProvider.getConfigProperties(); + if (configProperties != null) { + List properties = configProperties.getProperty(); + if (properties != null && properties.size() > 0) { + for (Property property : properties) { + staticProps.put(property.getName(), property.getValue()); } - pushNotificationConfigs.add(new PushNotificationConfig(pushNotificationProvider.getType(), - pushNotificationProvider.isScheduled(), pushNotificationProvider.isDefault(), staticProps)); - } else { - try { - PlatformConfiguration deviceTypeConfig = deviceManager.getConfiguration(); - if (deviceTypeConfig != null) { - List configuration = deviceTypeConfig.getConfiguration(); - if (configuration.size() > 0) { - Map properties = this.getConfigProperty(configuration); - pushNotificationConfigs.add(new PushNotificationConfig( - pushNotificationProvider.getType(), pushNotificationProvider.isScheduled(), - pushNotificationProvider.isDefault(), - properties)); - } - } - } catch (DeviceManagementException e) { - log.error("Unable to get the " + type + " platform configuration from registry."); + } + } + pushNotificationConfig = new PushNotificationConfig(pushNotificationProvider.getType(), + pushNotificationProvider.isScheduled(), staticProps); + } else { + try { + PlatformConfiguration deviceTypeConfig = deviceManager.getConfiguration(); + if (deviceTypeConfig != null) { + List configuration = deviceTypeConfig.getConfiguration(); + if (configuration.size() > 0) { + Map properties = this.getConfigProperty(configuration); + pushNotificationConfig = new PushNotificationConfig( + pushNotificationProvider.getType(), pushNotificationProvider.isScheduled(), + properties); } } + } catch (DeviceManagementException e) { + log.error("Unable to get the " + type + " platform configuration from registry."); } } } @@ -178,8 +169,9 @@ public class DeviceTypeManagerService implements DeviceManagementService { return provisioningConfig; } - public List getPushNotificationConfigs() { - return pushNotificationConfigs; + @Override + public PushNotificationConfig getPushNotificationConfig() { + return pushNotificationConfig; } @Override diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/HTTPDeviceTypeManagerService.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/HTTPDeviceTypeManagerService.java index c5ff08ec76f..8f9f1f4e244 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/HTTPDeviceTypeManagerService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/HTTPDeviceTypeManagerService.java @@ -29,16 +29,15 @@ import org.wso2.carbon.device.mgt.extensions.device.type.template.config.ConfigP import org.wso2.carbon.device.mgt.extensions.device.type.template.config.DeviceDetails; import org.wso2.carbon.device.mgt.extensions.device.type.template.config.DeviceTypeConfiguration; import org.wso2.carbon.device.mgt.extensions.device.type.template.config.Features; +import org.wso2.carbon.device.mgt.extensions.device.type.template.config.License; import org.wso2.carbon.device.mgt.extensions.device.type.template.config.PolicyMonitoring; import org.wso2.carbon.device.mgt.extensions.device.type.template.config.Properties; import org.wso2.carbon.device.mgt.extensions.device.type.template.config.Property; import org.wso2.carbon.device.mgt.extensions.device.type.template.config.ProvisioningConfig; import org.wso2.carbon.device.mgt.extensions.device.type.template.config.PullNotificationSubscriberConfig; import org.wso2.carbon.device.mgt.extensions.device.type.template.config.PushNotificationProvider; -import org.wso2.carbon.device.mgt.extensions.device.type.template.config.PushNotificationProviders; import java.util.ArrayList; -import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -85,7 +84,6 @@ public class HTTPDeviceTypeManagerService extends DeviceTypeManagerService imple configFeature.setCode(feature.getCode()); configFeature.setDescription(feature.getDescription()); configFeature.setName(feature.getName()); - configFeature.setPushNotificationType(feature.getPushNotificationType()); if (feature.getMetadataEntries() != null && feature.getMetadataEntries().size() > 0) { List metaValues = new ArrayList<>(); for (Feature.MetadataEntry metadataEntry : feature.getMetadataEntries()) { @@ -117,37 +115,29 @@ public class HTTPDeviceTypeManagerService extends DeviceTypeManagerService imple provisioningConfig.setSharedWithAllTenants(false); deviceTypeConfiguration.setProvisioningConfig(provisioningConfig); - List pushNotificationConfigs = deviceTypeMetaDefinition - .getPushNotificationConfigs(); - if (pushNotificationConfigs != null) { - List pushNotificationProviderList = new LinkedList<>(); - PushNotificationProviders pushNotificationProviders = new PushNotificationProviders(); - for (PushNotificationConfig pushNotificationConfig : pushNotificationConfigs) { - PushNotificationProvider pushNotificationProvider = new PushNotificationProvider(); - pushNotificationProvider.setType(pushNotificationConfig.getType()); - //default schedule value will be true. - pushNotificationProvider.setScheduled(true); - if (pushNotificationConfig.getProperties() != null && - pushNotificationConfig.getProperties().size() > 0) { - ConfigProperties configProperties = new ConfigProperties(); - List properties = new ArrayList<>(); - for (Map.Entry entry : pushNotificationConfig.getProperties().entrySet()) { - Property property = new Property(); - property.setName(entry.getKey()); - property.setValue(entry.getValue()); - properties.add(property); - } - configProperties.addProperties(properties); - pushNotificationProvider.setConfigProperties(configProperties); + PushNotificationConfig pushNotificationConfig = deviceTypeMetaDefinition.getPushNotificationConfig(); + if (pushNotificationConfig != null) { + PushNotificationProvider pushNotificationProvider = new PushNotificationProvider(); + pushNotificationProvider.setType(pushNotificationConfig.getType()); + //default schedule value will be true. + pushNotificationProvider.setScheduled(true); + if (pushNotificationConfig.getProperties() != null && + pushNotificationConfig.getProperties().size() > 0) { + ConfigProperties configProperties = new ConfigProperties(); + List properties = new ArrayList<>(); + for (Map.Entry entry : pushNotificationConfig.getProperties().entrySet()) { + Property property = new Property(); + property.setName(entry.getKey()); + property.setValue(entry.getValue()); + properties.add(property); } - pushNotificationProvider.setFileBasedProperties(true); - pushNotificationProviderList.add(pushNotificationProvider); + configProperties.addProperties(properties); + pushNotificationProvider.setConfigProperties(configProperties); } - pushNotificationProviders.addPushNotificationProviders(pushNotificationProviderList); - deviceTypeConfiguration.setPushNotificationProviders(pushNotificationProviders); + pushNotificationProvider.setFileBasedProperties(true); + deviceTypeConfiguration.setPushNotificationProvider(pushNotificationProvider); } - // This is commented until the task registration handling issue is solved // OperationMonitoringTaskConfig operationMonitoringTaskConfig = deviceTypeMetaDefinition.getTaskConfig(); // if (operationMonitoringTaskConfig != null) { diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/DeviceTypeConfiguration.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/DeviceTypeConfiguration.java index 46fd93d1cf7..46f442e89d8 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/DeviceTypeConfiguration.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/DeviceTypeConfiguration.java @@ -41,7 +41,6 @@ import java.util.List; * <element name="Features" type="{}Features"/> * <element name="ProvisioningConfig" type="{}ProvisioningConfig"/> * <element name="PushNotificationProviderConfig" type="{}PushNotificationProviderConfig"/> - * <element name="PullNotificationSubscriberConfig" type="{}PullNotificationSubscriberConfig"/> * <element name="License" type="{}License"/> * <element name="DataSource" type="{}DataSource"/> * <element name="PolicyMonitoring" type="{}PolicyMonitoring"/> @@ -66,8 +65,8 @@ public class DeviceTypeConfiguration { protected Features features; @XmlElement(name = "ProvisioningConfig", required = true) protected ProvisioningConfig provisioningConfig; - @XmlElement(name = "PushNotificationProviderConfigs", required = true) - protected PushNotificationProviders pushNotificationProviders; + @XmlElement(name = "PushNotificationProviderConfig", required = true) + protected PushNotificationProvider pushNotificationProvider; @XmlElement(name = "PullNotificationSubscriberConfig", required = true) protected PullNotificationSubscriberConfig pullNotificationSubscriberConfig; @XmlElement(name = "License", required = true) @@ -246,23 +245,23 @@ public class DeviceTypeConfiguration { } /** - * Gets the value of the pushNotificationProviders property. + * Gets the value of the pushNotificationProvider property. * * @return possible object is * {@link PushNotificationProvider } */ - public PushNotificationProviders getPushNotificationProviders() { - return pushNotificationProviders; + public PushNotificationProvider getPushNotificationProvider() { + return pushNotificationProvider; } /** - * Sets the value of the pushNotificationProviders property. + * Sets the value of the pushNotificationProvider property. * * @param value allowed object is * {@link PushNotificationProvider } */ - public void setPushNotificationProviders(PushNotificationProviders value) { - this.pushNotificationProviders = value; + public void setPushNotificationProvider(PushNotificationProvider value) { + this.pushNotificationProvider = value; } /** diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/Feature.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/Feature.java index 4d5f6b47e02..800c4ff71f7 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/Feature.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/Feature.java @@ -42,7 +42,6 @@ import java.util.List; * <element name="Operation" type="{}Operation"/> * </sequence> * <attribute name="code" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="pushNotificationType" type="{http://www.w3.org/2001/XMLSchema}string" /> * </restriction> * </complexContent> * </complexType> @@ -69,8 +68,6 @@ public class Feature { @XmlElementWrapper(name = "MetaData") @XmlElement(name = "Property", required = true) protected List metaData; - @XmlAttribute(name = "pushNotificationType") - protected String pushNotificationType; /** * Gets the value of the name property. @@ -175,28 +172,4 @@ public class Feature { public void setMetaData(List metaData) { this.metaData = metaData; } - - /** - * Gets the value of the pushNotificationType property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getPushNotificationType() { - return pushNotificationType; - } - - /** - * Sets the value of the pushNotificationType property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setPushNotificationType(String value) { - this.pushNotificationType = value; - } } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/PushNotificationProvider.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/PushNotificationProvider.java index 1f2e14dbd09..2c6e4ca2572 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/PushNotificationProvider.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/PushNotificationProvider.java @@ -39,8 +39,6 @@ import javax.xml.bind.annotation.XmlType; * <element name="ConfigProperties" type="{}ConfigProperties"/> * </sequence> * <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="isScheduled" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="default" type="{http://www.w3.org/2001/XMLSchema}string" /> * </restriction> * </complexContent> * </complexType> @@ -63,8 +61,6 @@ public class PushNotificationProvider { protected String type; @XmlAttribute(name = "isScheduled") protected boolean isScheduled; - @XmlAttribute(name = "default") - protected boolean isDefault; /** * Gets the value of the fileBasedProperties property. @@ -156,30 +152,4 @@ public class PushNotificationProvider { public void setScheduled(boolean scheduled) { isScheduled = scheduled; } - - /** - * Gets the value of the isDefault property. - * This property will be used to determine whether the given push notification will be used as Default for - * features which do not have push notification provider config - * - * @return - * possible object is - * {@link Boolean } - * - */ - public boolean isDefault() { - return isDefault; - } - - /** - * Sets the value of the isDefault property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public void setDefault(boolean isDefault) { - isScheduled = isDefault; - } } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/PushNotificationProviders.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/PushNotificationProviders.java deleted file mode 100644 index 21bfab5b2cd..00000000000 --- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/config/PushNotificationProviders.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * 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. - */ -package org.wso2.carbon.device.mgt.extensions.device.type.template.config; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import java.util.ArrayList; -import java.util.List; - -/** - *

Java class for PushNotificationProviders complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - * 

- * <complexType name="PushNotificationProviders">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="PushNotificationProvider" type="{}PushNotificationProvider"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "PushNotificationProviders", propOrder = { - "pushNotificationProviders" -}) -public class PushNotificationProviders { - - @XmlElement(name = "PushNotificationProviderConfig") - protected List pushNotificationProviders; - - /** - * Gets the value of the pushNotificationProviders property. - * - * @return - * possible object is - * {@link PushNotificationProvider } - * - */ - public List getPushNotificationProviders() { - if (pushNotificationProviders == null) { - pushNotificationProviders = new ArrayList(); - } - return this.pushNotificationProviders; - } - - public void addPushNotificationProviders(List pushNotificationProviders) { - this.pushNotificationProviders = pushNotificationProviders; - } - -} \ No newline at end of file diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/feature/ConfigurationBasedFeatureManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/feature/ConfigurationBasedFeatureManager.java index 10889c39644..091123ab7da 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/feature/ConfigurationBasedFeatureManager.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/feature/ConfigurationBasedFeatureManager.java @@ -50,7 +50,6 @@ public class ConfigurationBasedFeatureManager implements FeatureManager { deviceFeature.setCode(feature.getCode()); deviceFeature.setName(feature.getName()); deviceFeature.setDescription(feature.getDescription()); - deviceFeature.setPushNotificationType(feature.getPushNotificationType()); Operation operation = feature.getOperation(); List metadataEntries = null; if (feature.getMetaData() != null) {