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

Code cleanup

Browse Source
revert-dabc3590
prabathabey 10 years ago
parent 29bfc6f09f
commit b7984c18b6
8 changed files with 209 additions and 224 deletions
Show Stats Download Patch File Download Diff File

1
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java
Unescape View File

@ -50,6 +50,7 @@ import org.wso2.carbon.user.core.service.RealmService;
* bind="setDeviceManagerService"
* unbind="unsetDeviceManagerService"
*/
@SuppressWarnings("unused")
public class DeviceManagementServiceComponent {
private static Log log = LogFactory.getLog(DeviceManagementServiceComponent.class);

10
components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/DeviceManagementConfigTests.java
Unescape View File

@ -60,22 +60,22 @@ public class DeviceManagementConfigTests {
public void testMandateManagementRepositoryElement() {
File malformedConfig =
new File(DeviceManagementConfigTests.MALFORMED_TEST_CONFIG_LOCATION_NO_MGT_REPOSITORY);
this.validateConfig(malformedConfig);
this.validateMalformedConfig(malformedConfig);
}
@Test
public void testMandateDataSourceConfigurationElement() {
File malformedConfig = new File(DeviceManagementConfigTests.MALFORMED_TEST_CONFIG_LOCATION_NO_DS_CONFIG);
this.validateConfig(malformedConfig);
this.validateMalformedConfig(malformedConfig);
}
@Test
public void testMandateJndiLookupDefinitionElement() {
File malformedConfig = new File(DeviceManagementConfigTests.MALFORMED_TEST_CONFIG_LOCATION_NO_JNDI_CONFIG);
this.validateConfig(malformedConfig);
this.validateMalformedConfig(malformedConfig);
}
private void validateConfig(File malformedConfig) {
private void validateMalformedConfig(File malformedConfig) {
try {
JAXBContext ctx = JAXBContext.newInstance(DeviceManagementConfig.class);
Unmarshaller um = ctx.createUnmarshaller();
@ -83,7 +83,7 @@ public class DeviceManagementConfigTests {
um.unmarshal(malformedConfig);
Assert.assertTrue(false);
} catch (JAXBException e) {
log.error("Error while unmarsharlling the device management config", e);
log.error("Error occurred while unmarsharlling device management config", e);
Assert.assertTrue(true);
}
}

8
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/AbstractMobileOperationManager.java
Unescape View File

@ -22,14 +22,14 @@ import java.util.List;
public abstract class AbstractMobileOperationManager implements OperationManager {
@Override
public List<Operation> getOperations(DeviceIdentifier deviceIdentifier)
throws OperationManagementException {
public List<Operation> getOperations(DeviceIdentifier deviceIdentifier) throws OperationManagementException {
return null;
}
@Override
public boolean addOperation(Operation operation, List<DeviceIdentifier> devices) throws
OperationManagementException {
public boolean addOperation(Operation operation,
List<DeviceIdentifier> devices) throws OperationManagementException {
return true;
}
}

21
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileDeviceManagementDAOFactory.java
Unescape View File

@ -18,6 +18,7 @@ package org.wso2.carbon.device.mgt.mobile.dao;
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.mobile.DataSourceListener;
import org.wso2.carbon.device.mgt.mobile.config.datasource.MobileDataSourceConfig;
import org.wso2.carbon.device.mgt.mobile.dao.impl.*;
@ -39,11 +40,11 @@ public class MobileDeviceManagementDAOFactory implements DataSourceListener {
}
public void init(){
public void init() throws DeviceManagementException {
dataSource = MobileDeviceManagementDAOUtil.resolveDataSource(mobileDataSourceConfig);
if(dataSource!=null){
if (dataSource != null) {
MobileDeviceManagementDAOUtil.createDataSource(dataSource);
}else{
} else {
MobileDeviceManagementBundleActivator.registerDataSourceListener(this);
}
}
@ -52,23 +53,23 @@ public class MobileDeviceManagementDAOFactory implements DataSourceListener {
return new MobileDeviceDAOImpl(dataSource);
}
public static OperationDAO getOperationDAO(){
public static OperationDAO getOperationDAO() {
return new OperationDAOImpl(dataSource);
}
public static OperationPropertyDAO geOperationPropertyDAO(){
public static OperationPropertyDAO geOperationPropertyDAO() {
return new OperationPropertyDAOImpl(dataSource);
}
public static DeviceOperationDAO getDeviceOperationDAO(){
public static DeviceOperationDAO getDeviceOperationDAO() {
return new DeviceOperationDAOImpl(dataSource);
}
public static FeatureDAO getFeatureDAO(){
public static FeatureDAO getFeatureDAO() {
return new FeatureDAOImpl(dataSource);
}
public static FeaturePropertyDAO getFeaturePropertyDAO(){
public static FeaturePropertyDAO getFeaturePropertyDAO() {
return new FeaturePropertyDAOImpl(dataSource);
}
@ -88,9 +89,11 @@ public class MobileDeviceManagementDAOFactory implements DataSourceListener {
@Override
public void notifyObserver() {
try {
dataSource = MobileDeviceManagementDAOUtil.resolveDataSource(mobileDataSourceConfig);
if(dataSource!=null){
MobileDeviceManagementDAOUtil.createDataSource(dataSource);
} catch (DeviceManagementException e) {
log.error("Error occurred while resolving mobile device management metadata repository data source", e);
}
}
}

37
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/util/MobileDeviceManagementDAOUtil.java
Unescape View File

@ -45,7 +45,7 @@ public class MobileDeviceManagementDAOUtil {
* @param config Mobile data source configuration
* @return data source resolved from the data source definition
*/
public static DataSource resolveDataSource(MobileDataSourceConfig config) {
public static DataSource resolveDataSource(MobileDataSourceConfig config) throws DeviceManagementException {
DataSource dataSource = null;
if (config == null) {
throw new RuntimeException("Device Management Repository data source configuration " +
@ -64,25 +64,10 @@ public class MobileDeviceManagementDAOUtil {
for (JNDILookupDefinition.JNDIProperty prop : jndiPropertyList) {
jndiProperties.put(prop.getName(), prop.getValue());
}
try {
dataSource = MobileDeviceManagementDAOUtil.lookupDataSource(
jndiConfig.getJndiName(), jndiProperties);
} catch (DeviceManagementException e) {
if (log.isDebugEnabled()) {
log.debug("Error in looking up data source: " + e.getMessage());
}
log.error(e);
}
dataSource =
MobileDeviceManagementDAOUtil.lookupDataSource(jndiConfig.getJndiName(), jndiProperties);
} else {
try {
dataSource = MobileDeviceManagementDAOUtil.lookupDataSource(
jndiConfig.getJndiName(), null);
} catch (DeviceManagementException e) {
if (log.isDebugEnabled()) {
log.debug("Error in looking up data source: " + e.getMessage());
}
log.error(e);
}
dataSource = MobileDeviceManagementDAOUtil.lookupDataSource(jndiConfig.getJndiName(), null);
}
}
return dataSource;
@ -96,10 +81,11 @@ public class MobileDeviceManagementDAOUtil {
return (DataSource) InitialContext.doLookup(dataSourceName);
}
final InitialContext context = new InitialContext(jndiProperties);
return (DataSource) context.doLookup(dataSourceName);
return (DataSource) context.lookup(dataSourceName);
} catch (Exception e) {
throw new DeviceManagementException(
"Error in looking up data source: " + e.getMessage(), e);
String msg = "Error in looking up data source: " + e.getMessage();
log.error(msg, e);
throw new DeviceManagementException(msg, e);
}
}
@ -143,9 +129,7 @@ public class MobileDeviceManagementDAOUtil {
try {
MobileDeviceManagementDAOUtil.setupMobileDeviceManagementSchema(dataSource);
} catch (DeviceManagementException e) {
log.error(
"Exception occurred while initializing mobile device management database schema",
e);
log.error("Exception occurred while initializing mobile device management database schema", e);
}
}
}
@ -163,8 +147,7 @@ public class MobileDeviceManagementDAOUtil {
try {
initializer.createRegistryDatabase();
} catch (Exception e) {
throw new DeviceManagementException(
"Error occurred while initializing Mobile Device Management " +
throw new DeviceManagementException("Error occurred while initializing Mobile Device Management " +
"database schema", e);
}
}

17
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManagerService.java
Unescape View File

@ -47,7 +47,7 @@ public class AndroidDeviceManagerService implements DeviceManagerService {
@Override
public boolean enrollDevice(Device device) throws DeviceManagementException {
boolean status = false;
boolean status;
MobileDevice mobileDevice = MobileDeviceManagementUtil.convertToMobileDevice(device);
try {
status = MobileDeviceManagementDAOFactory.getMobileDeviceDAO().addDevice(mobileDevice);
@ -62,7 +62,7 @@ public class AndroidDeviceManagerService implements DeviceManagerService {
@Override
public boolean modifyEnrollment(Device device) throws DeviceManagementException {
boolean status = false;
boolean status;
MobileDevice mobileDevice = MobileDeviceManagementUtil.convertToMobileDevice(device);
try {
status = MobileDeviceManagementDAOFactory.getMobileDeviceDAO()
@ -78,7 +78,7 @@ public class AndroidDeviceManagerService implements DeviceManagerService {
@Override
public boolean disenrollDevice(DeviceIdentifier deviceId) throws DeviceManagementException {
boolean status = false;
boolean status;
try {
status = MobileDeviceManagementDAOFactory.getMobileDeviceDAO()
.deleteDevice(deviceId.getId());
@ -122,7 +122,7 @@ public class AndroidDeviceManagerService implements DeviceManagerService {
@Override
public Device getDevice(DeviceIdentifier deviceId) throws DeviceManagementException {
Device device = null;
Device device;
try {
MobileDevice mobileDevice = MobileDeviceManagementDAOFactory.getMobileDeviceDAO().
getDevice(deviceId.getId());
@ -143,14 +143,13 @@ public class AndroidDeviceManagerService implements DeviceManagerService {
@Override
public boolean updateDeviceInfo(Device device) throws DeviceManagementException {
boolean status = false;
boolean status;
MobileDevice mobileDevice = MobileDeviceManagementUtil.convertToMobileDevice(device);
try {
status = MobileDeviceManagementDAOFactory.getMobileDeviceDAO()
.updateDevice(mobileDevice);
} catch (MobileDeviceManagementDAOException e) {
String msg =
"Error while updating the Android device : " + device.getDeviceIdentifier();
String msg = "Error while updating the Android device : " + device.getDeviceIdentifier();
log.error(msg, e);
throw new DeviceManagementException(msg, e);
}
@ -166,8 +165,8 @@ public class AndroidDeviceManagerService implements DeviceManagerService {
getAllDevices();
if (mobileDevices != null) {
devices = new ArrayList<Device>();
for (int x = 0; x < mobileDevices.size(); x++) {
devices.add(MobileDeviceManagementUtil.convertToDevice(mobileDevices.get(x)));
for (MobileDevice mobileDevice : mobileDevices) {
devices.add(MobileDeviceManagementUtil.convertToDevice(mobileDevice));
}
}
} catch (MobileDeviceManagementDAOException e) {

1
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/ios/IOSDeviceManagerService.java
Unescape View File

@ -88,5 +88,4 @@ public class IOSDeviceManagerService implements DeviceManagerService {
return true;
}
}

Write Preview
Loading…
Cancel
Save