|
|
@ -32,6 +32,7 @@ import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration
|
|
|
|
import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager;
|
|
|
|
import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager;
|
|
|
|
import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
|
|
|
|
import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
|
|
|
|
import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
|
|
|
|
import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
|
|
|
|
|
|
|
|
import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.ConfigProperties;
|
|
|
|
import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.DeviceTypeConfiguration;
|
|
|
|
import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.DeviceTypeConfiguration;
|
|
|
|
import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.Property;
|
|
|
|
import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.Property;
|
|
|
|
import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.PushNotificationProvider;
|
|
|
|
import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.PushNotificationProvider;
|
|
|
@ -113,11 +114,13 @@ public class DeviceTypeManagerService implements DeviceManagementService {
|
|
|
|
if (pushNotificationProvider != null) {
|
|
|
|
if (pushNotificationProvider != null) {
|
|
|
|
if (pushNotificationProvider.isFileBasedProperties()) {
|
|
|
|
if (pushNotificationProvider.isFileBasedProperties()) {
|
|
|
|
Map<String, String> staticProps = new HashMap<>();
|
|
|
|
Map<String, String> staticProps = new HashMap<>();
|
|
|
|
if (pushNotificationProvider.getConfigProperties() != null &&
|
|
|
|
ConfigProperties configProperties = pushNotificationProvider.getConfigProperties();
|
|
|
|
pushNotificationProvider.getConfigProperties().getProperty() != null &&
|
|
|
|
if (configProperties != null) {
|
|
|
|
pushNotificationProvider.getConfigProperties().getProperty().size() > 0) {
|
|
|
|
List<Property> properties = configProperties.getProperty();
|
|
|
|
for (Property property : pushNotificationProvider.getConfigProperties().getProperty()) {
|
|
|
|
if (properties != null && properties.size() > 0) {
|
|
|
|
staticProps.put(property.getName(), property.getValue());
|
|
|
|
for (Property property : properties) {
|
|
|
|
|
|
|
|
staticProps.put(property.getName(), property.getValue());
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
pushNotificationConfig = new PushNotificationConfig(pushNotificationProvider.getType(),
|
|
|
|
pushNotificationConfig = new PushNotificationConfig(pushNotificationProvider.getType(),
|
|
|
|