community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt

Browse Source
This commit is contained in:
Ace 2019-08-30 12:44:42 +05:30
commit 91746c4d04
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/configuration/mgt/DeviceConfiguration.java
View File

@ -32,7 +32,7 @@ import java.util.List;
"the server") "the server")
public class DeviceConfiguration { public class DeviceConfiguration {
@ApiModelProperty(name = "deviceId", value = "ID of the device", required = true) @ApiModelProperty(name = "deviceId", value = "ID of the device", required = true)
private int deviceId; private String deviceId;
@ApiModelProperty(name = "deviceType", value = "Type of the device", required = true) @ApiModelProperty(name = "deviceType", value = "Type of the device", required = true)
private String deviceType; private String deviceType;
@ -52,11 +52,11 @@ public class DeviceConfiguration {
@ApiModelProperty(name = "deviceOwner", value = "Owner of the selected device", required = true) @ApiModelProperty(name = "deviceOwner", value = "Owner of the selected device", required = true)
private String deviceOwner; private String deviceOwner;
public int getDeviceId() { public String getDeviceId() {
return deviceId; return deviceId;
} }
public void setDeviceId(int deviceId) { public void setDeviceId(String deviceId) {
this.deviceId = deviceId; this.deviceId = deviceId;
} }

1
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
View File

@ -237,6 +237,7 @@ public class OperationManagerImpl implements OperationManager {
} }
int operationId = this.lookupOperationDAO(operation).addOperation(operationDto); int operationId = this.lookupOperationDAO(operation).addOperation(operationDto);
operation.setId(operationId);
boolean isScheduled = false; boolean isScheduled = false;
NotificationStrategy notificationStrategy = getNotificationStrategy(); NotificationStrategy notificationStrategy = getNotificationStrategy();

4
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/util/OperationDAOUtil.java
View File

@ -79,6 +79,10 @@ public class OperationDAOUtil {
dtoOperation.setControl(Operation.Control.valueOf(operation.getControl().toString())); dtoOperation.setControl(Operation.Control.valueOf(operation.getControl().toString()));
} }
if (operation.getInitiatedBy() != null) {
dtoOperation.setInitiatedBy(operation.getInitiatedBy());
}
return dtoOperation; return dtoOperation;
} }

2
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
View File

@ -3352,7 +3352,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
List<ConfigurationEntry> configurationEntries, List<ConfigurationEntry> configurationEntries,
String deviceOwner) { String deviceOwner) {
DeviceConfiguration deviceConfiguration = new DeviceConfiguration(); DeviceConfiguration deviceConfiguration = new DeviceConfiguration();
deviceConfiguration.setDeviceId(device.getId()); deviceConfiguration.setDeviceId(device.getDeviceIdentifier());
deviceConfiguration.setDeviceType(device.getType()); deviceConfiguration.setDeviceType(device.getType());
deviceConfiguration.setTenantDomain(tenantDomain); deviceConfiguration.setTenantDomain(tenantDomain);
deviceConfiguration.setConfigurationEntries(configurationEntries); deviceConfiguration.setConfigurationEntries(configurationEntries);