|
|
@ -603,6 +603,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public License getLicense(String deviceType, String languageCode) throws DeviceManagementException {
|
|
|
|
public License getLicense(String deviceType, String languageCode) throws DeviceManagementException {
|
|
|
|
DeviceManager deviceManager = this.getDeviceManager(deviceType);
|
|
|
|
DeviceManager deviceManager = this.getDeviceManager(deviceType);
|
|
|
|
|
|
|
|
License license;
|
|
|
|
if (deviceManager == null) {
|
|
|
|
if (deviceManager == null) {
|
|
|
|
if (log.isDebugEnabled()) {
|
|
|
|
if (log.isDebugEnabled()) {
|
|
|
|
log.debug("Device Manager associated with the device type '" + deviceType + "' is null. " +
|
|
|
|
log.debug("Device Manager associated with the device type '" + deviceType + "' is null. " +
|
|
|
@ -611,7 +612,13 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
|
|
|
|
return null;
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
return deviceManager.getLicense(languageCode);
|
|
|
|
license = deviceManager.getLicense(languageCode);
|
|
|
|
|
|
|
|
if (license == null) {
|
|
|
|
|
|
|
|
if (log.isDebugEnabled()) {
|
|
|
|
|
|
|
|
log.debug("Cannot find a license for '" + deviceType + "' device type");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return license;
|
|
|
|
} catch (LicenseManagementException e) {
|
|
|
|
} catch (LicenseManagementException e) {
|
|
|
|
throw new DeviceManagementException("Error occurred while retrieving license configured for " +
|
|
|
|
throw new DeviceManagementException("Error occurred while retrieving license configured for " +
|
|
|
|
"device type '" + deviceType + "' and language code '" + languageCode + "'", e);
|
|
|
|
"device type '" + deviceType + "' and language code '" + languageCode + "'", e);
|
|
|
@ -851,7 +858,6 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public List<Device> getDevicesByStatus(EnrolmentInfo.Status status) throws DeviceManagementException {
|
|
|
|
public List<Device> getDevicesByStatus(EnrolmentInfo.Status status) throws DeviceManagementException {
|
|
|
|
List<Device> devices = new ArrayList<>();
|
|
|
|
List<Device> devices = new ArrayList<>();
|
|
|
|
List<Device> allDevices;
|
|
|
|
List<Device> allDevices;
|
|
|
|