thasleem
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8 from manojgunayadev/master

Browse Source 
Licence Management Refactor
revert-70aa11f8
Prabath Abeysekara 10 years ago
parent d439691a01 505b87a655
commit 22f1f5d9b4
4 changed files with 86 additions and 46 deletions
Show Stats Download Patch File Download Diff File

37
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManagementConstants.java
Unescape View File

@ -18,35 +18,68 @@ package org.wso2.carbon.device.mgt.common;
public final class DeviceManagementConstants {
public static final class DataSourceProperties {
private DataSourceProperties() {
throw new AssertionError();
}
public static final String DB_CHECK_QUERY = "SELECT * FROM DM_DEVICE";
public static final String SECURE_VAULT_NS = "http://org.wso2.securevault/configuration";
public static final String DEVICE_CONFIG_XML_NAME = "cdm-config.xml";
}
public static final class SecureValueProperties {
private SecureValueProperties() {
throw new AssertionError();
}
public static final String SECRET_ALIAS_ATTRIBUTE_NAME_WITH_NAMESPACE = "secretAlias";
public static final String SECURE_VAULT_NS = "http://org.wso2.securevault/configuration";
}
public static final class MobileDeviceTypes {
private MobileDeviceTypes() {
throw new AssertionError();
}
public final static String MOBILE_DEVICE_TYPE_ANDROID = "android";
public final static String MOBILE_DEVICE_TYPE_IOS = "ios";
public final static String MOBILE_DEVICE_TYPE_WINDOWS = "windows";
}
public static final class LanguageCodes{
private LanguageCodes() { throw new AssertionError();}
public static final class LanguageCodes {
private LanguageCodes() {
throw new AssertionError();
}
public final static String LANGUAGE_CODE_ENGLISH_US = "en-us";
public final static String LANGUAGE_CODE_ENGLISH_UK = "en-uk";
}
public static final class DefaultLicences {
private DefaultLicences() {
throw new AssertionError();
}
public static final String DEFAULT_LICENSE_CONFIG_XML_NAME = "DefaultLicense.xml";
}
public static final class LicenseProperties {
private LicenseProperties() {
throw new AssertionError();
}
public static final String OVERVIEW_PROVIDER = "overview_provider";
public static final String OVERVIEW_NAME = "overview_name";
public static final String OVERVIEW_LANGUAGE = "overview_language";
public static final String OVERVIEW_VERSION = "overview_version";
public static final String VALID_FROM = "overview_validityFrom";
public static final String VALID_TO = "overview_validityTo";
public static final String LICENSE = "overview_license";
}
}

3
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagerImpl.java
Unescape View File

@ -55,14 +55,12 @@ public class DeviceManagerImpl implements DeviceManager {
public boolean enrollDevice(Device device) throws DeviceManagementException {
DeviceManagerService dms = this.getPluginRepository().getDeviceManagementProvider(device.getType());
boolean status = dms.enrollDevice(device);
try {
org.wso2.carbon.device.mgt.core.dto.Device deviceDto = DeviceManagementDAOUtil.convertDevice(device);
Integer deviceTypeId = this.getDeviceTypeDAO().getDeviceTypeIdByDeviceTypeName(device.getType());
deviceDto.setStatus(Status.ACTIVE);
deviceDto.setDeviceTypeId(deviceTypeId);
this.getDeviceDAO().addDevice(deviceDto);
} catch (DeviceManagementDAOException e) {
throw new DeviceManagementException("Error occurred while enrolling the device '" + device.getId() + "'",
e);
@ -185,5 +183,4 @@ public class DeviceManagerImpl implements DeviceManager {
public DeviceManagementRepository getPluginRepository() {
return pluginRepository;
}
}

61
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/LicenseManagerImpl.java
Unescape View File

@ -24,6 +24,7 @@ import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.base.MultitenantConstants;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.context.RegistryType;
import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
import org.wso2.carbon.device.mgt.common.License;
import org.wso2.carbon.device.mgt.common.LicenseManagementException;
import org.wso2.carbon.governance.api.exception.GovernanceException;
@ -34,32 +35,33 @@ import org.wso2.carbon.governance.api.util.GovernanceUtils;
import org.wso2.carbon.registry.core.Registry;
import org.wso2.carbon.registry.core.exceptions.RegistryException;
import org.wso2.carbon.registry.core.session.UserRegistry;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
public class LicenseManagerImpl implements LicenseManager {
private static Log log = LogFactory.getLog(DeviceManagerImpl.class);
private static final DateFormat format = new SimpleDateFormat("dd-mm-yyyy", Locale.ENGLISH);
@Override
public License getLicense(final String deviceType,
final String languageCodes) throws LicenseManagementException {
public License getLicense(final String deviceType, final String languageCodes) throws LicenseManagementException {
if (log.isDebugEnabled()){
if (log.isDebugEnabled()) {
log.debug("entered get License in license manager impl");
}
// TODO: After completes JAX-RX user login, this need to be change to CarbonContext
PrivilegedCarbonContext.getThreadLocalCarbonContext().startTenantFlow();
PrivilegedCarbonContext.startTenantFlow();
PrivilegedCarbonContext.getThreadLocalCarbonContext().setUsername("admin");
PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(MultitenantConstants.SUPER_TENANT_ID);
PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(
MultitenantConstants.SUPER_TENANT_DOMAIN_NAME);
Registry registry = (UserRegistry) PrivilegedCarbonContext.getThreadLocalCarbonContext().getRegistry(
RegistryType.USER_GOVERNANCE);
Registry registry = (UserRegistry) PrivilegedCarbonContext.getThreadLocalCarbonContext()
.getRegistry(RegistryType.USER_GOVERNANCE);
GenericArtifact[] filteredArtifacts;
License license = new License();
@ -79,41 +81,44 @@ public class LicenseManagerImpl implements LicenseManager {
});
String validFrom;
String validTo;
DateFormat format;
Date fromDate;
Date toDate;
for (GenericArtifact artifact : filteredArtifacts) {
if (log.isDebugEnabled()){
log.debug("Overview name:"+artifact.getAttribute("overview_name"));
log.debug("Overview provider:"+artifact.getAttribute("overview_provider"));
log.debug("Overview Language:"+artifact.getAttribute("overview_language"));
log.debug("overview_validityFrom:"+artifact.getAttribute("overview_validityFrom"));
log.debug("overview_validityTo:"+artifact.getAttribute("overview_validityTo"));
if (log.isDebugEnabled()) {
log.debug("Overview name: " +
artifact.getAttribute(DeviceManagementConstants.LicenseProperties.OVERVIEW_NAME));
log.debug("Overview provider: " +
artifact.getAttribute(DeviceManagementConstants.LicenseProperties.OVERVIEW_PROVIDER));
log.debug("Overview language: " +
artifact.getAttribute(DeviceManagementConstants.LicenseProperties.OVERVIEW_LANGUAGE));
log.debug("Overview validity from: " +
artifact.getAttribute(DeviceManagementConstants.LicenseProperties.VALID_FROM));
log.debug("Overview validity to: " +
artifact.getAttribute(DeviceManagementConstants.LicenseProperties.VALID_TO));
}
validFrom = artifact.getAttribute("overview_validityFrom");
validTo = artifact.getAttribute("overview_validityTo");
format = new SimpleDateFormat("dd-mm-yyyy", Locale.ENGLISH);
validFrom = artifact.getAttribute(DeviceManagementConstants.LicenseProperties.VALID_FROM);
validTo = artifact.getAttribute(DeviceManagementConstants.LicenseProperties.VALID_TO);
try {
fromDate = format.parse(validFrom);
toDate = format.parse(validTo);
if (fromDate.getTime()<= new Date().getTime() && new Date().getTime() <= toDate.getTime()){
license.setLicenseText(artifact.getAttribute("overview_license"));
if (fromDate.getTime() <= new Date().getTime() && new Date().getTime() <= toDate.getTime()) {
license.setLicenseText(
artifact.getAttribute(DeviceManagementConstants.LicenseProperties.LICENSE));
}
} catch (ParseException e) {
log.error("validFrom:"+ validFrom);
log.error("validTo:"+validTo);
log.error("Valid date parse error:",e);
log.error("Valid from: " + validFrom);
log.error("Valid to: " + validTo);
log.error("Valid date parse error: ", e);
}
}
} catch (RegistryException regEx) {
log.error("registry exception:",regEx);
throw new LicenseManagementException();
}finally {
String errorMsg = "Registry error occurred: ";
log.error(errorMsg, regEx);
throw new LicenseManagementException(errorMsg, regEx);
} finally {
PrivilegedCarbonContext.endTenantFlow();
}
return license;
}
}

31
components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/dao/DeviceManagementDAOTests.java
Unescape View File

@ -51,15 +51,15 @@ public class DeviceManagementDAOTests {
TestDBConfiguration dbConfig = getTestDBConfiguration(dbType);
switch (dbType) {
case H2:
createH2DB(dbConfig);
BasicDataSource testDataSource = new BasicDataSource();
testDataSource.setDriverClassName(dbConfig.getDriverClass());
testDataSource.setUrl(dbConfig.getConnectionUrl());
testDataSource.setUsername(dbConfig.getUserName());
testDataSource.setPassword(dbConfig.getPwd());
DeviceManagementDAOFactory.init(testDataSource);
default:
case H2:
createH2DB(dbConfig);
BasicDataSource testDataSource = new BasicDataSource();
testDataSource.setDriverClassName(dbConfig.getDriverClass());
testDataSource.setUrl(dbConfig.getConnectionUrl());
testDataSource.setUsername(dbConfig.getUserName());
testDataSource.setPassword(dbConfig.getPwd());
DeviceManagementDAOFactory.init(testDataSource);
default:
}
}
@ -133,7 +133,7 @@ public class DeviceManagementDAOTests {
}
@Test(dependsOnMethods = {"addDeviceTypeTest"})
@Test(dependsOnMethods = { "addDeviceTypeTest" })
public void addDeviceTest() throws DeviceManagementDAOException, DeviceManagementException {
DeviceDAO deviceMgtDAO = DeviceManagementDAOFactory.getDeviceDAO();
@ -157,21 +157,26 @@ public class DeviceManagementDAOTests {
Connection conn = null;
PreparedStatement stmt = null;
ResultSet rs = null;
String deviceStatus = null;
try {
conn = DeviceManagementDAOFactory.getDataSource().getConnection();
stmt = conn.prepareStatement("SELECT ID from DM_DEVICE DEVICE where DEVICE.DEVICE_IDENTIFICATION='111'");
stmt = conn.prepareStatement(
"SELECT ID,STATUS from DM_DEVICE DEVICE where DEVICE.DEVICE_IDENTIFICATION=?");
stmt.setString(1,"111");
rs = stmt.executeQuery();
while (rs.next()) {
deviceId = rs.getLong(1);
deviceStatus = rs.getString(2);
}
} catch (SQLException e) {
throw new DeviceManagementDAOException("error in fetch device by device identification id", e);
throw new DeviceManagementDAOException("Error in fetch device by device identification id", e);
} finally {
TestUtils.cleanupResources(conn, stmt, rs);
}
Assert.assertNotNull(deviceId, "Device Id is null");
Assert.assertNotNull(deviceStatus, "Device status is null");
Assert.assertEquals(deviceStatus, "ACTIVE", "Enroll device status should active");
}
}

Write Preview
Loading…
Cancel
Save