Code cleanup

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java

@@ -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);

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/DeviceManagementConfigTests.java

@@ -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);
         }
     }

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/AbstractMobileOperationManager.java

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

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

@@ -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.*;
@@ -31,66 +32,68 @@ import javax.sql.DataSource;
  */
 public class MobileDeviceManagementDAOFactory implements DataSourceListener {
 
-	private static DataSource dataSource;
+    private static DataSource dataSource;
-	private static MobileDataSourceConfig mobileDataSourceConfig;
+    private static MobileDataSourceConfig mobileDataSourceConfig;
-	private static final Log log = LogFactory.getLog(MobileDeviceManagementDAOFactory.class);
+    private static final Log log = LogFactory.getLog(MobileDeviceManagementDAOFactory.class);
 
-	public MobileDeviceManagementDAOFactory() {
+    public MobileDeviceManagementDAOFactory() {
 
-	}
+    }
 
-	public void init(){
+    public void init() throws DeviceManagementException {
-		dataSource = MobileDeviceManagementDAOUtil.resolveDataSource(mobileDataSourceConfig);
+        dataSource = MobileDeviceManagementDAOUtil.resolveDataSource(mobileDataSourceConfig);
-		if(dataSource!=null){
+        if (dataSource != null) {
-			MobileDeviceManagementDAOUtil.createDataSource(dataSource);
+            MobileDeviceManagementDAOUtil.createDataSource(dataSource);
-		}else{
+        } else {
-			MobileDeviceManagementBundleActivator.registerDataSourceListener(this);
+            MobileDeviceManagementBundleActivator.registerDataSourceListener(this);
-		}
+        }
-	}
+    }
 
-	public static MobileDeviceDAO getMobileDeviceDAO() {
+    public static MobileDeviceDAO getMobileDeviceDAO() {
-		return new MobileDeviceDAOImpl(dataSource);
+        return new MobileDeviceDAOImpl(dataSource);
-	}
+    }
 
-	public static OperationDAO getOperationDAO(){
+    public static OperationDAO getOperationDAO() {
-		return new OperationDAOImpl(dataSource);
+        return new OperationDAOImpl(dataSource);
-	}
+    }
 
-	public static OperationPropertyDAO geOperationPropertyDAO(){
+    public static OperationPropertyDAO geOperationPropertyDAO() {
-		return new OperationPropertyDAOImpl(dataSource);
+        return new OperationPropertyDAOImpl(dataSource);
-	}
+    }
 
-	public static DeviceOperationDAO getDeviceOperationDAO(){
+    public static DeviceOperationDAO getDeviceOperationDAO() {
-		return new DeviceOperationDAOImpl(dataSource);
+        return new DeviceOperationDAOImpl(dataSource);
-	}
+    }
 
-	public static FeatureDAO getFeatureDAO(){
+    public static FeatureDAO getFeatureDAO() {
-		return new FeatureDAOImpl(dataSource);
+        return new FeatureDAOImpl(dataSource);
-	}
+    }
 
-	public static FeaturePropertyDAO getFeaturePropertyDAO(){
+    public static FeaturePropertyDAO getFeaturePropertyDAO() {
-		return new FeaturePropertyDAOImpl(dataSource);
+        return new FeaturePropertyDAOImpl(dataSource);
-	}
+    }
 
-	public static MobileDataSourceConfig getMobileDeviceManagementConfig() {
+    public static MobileDataSourceConfig getMobileDeviceManagementConfig() {
-		return mobileDataSourceConfig;
+        return mobileDataSourceConfig;
-	}
+    }
 
-	public static void setMobileDataSourceConfig(
+    public static void setMobileDataSourceConfig(
-			MobileDataSourceConfig mobileDataSourceConfig) {
+            MobileDataSourceConfig mobileDataSourceConfig) {
-		MobileDeviceManagementDAOFactory.mobileDataSourceConfig =
+        MobileDeviceManagementDAOFactory.mobileDataSourceConfig =
-				mobileDataSourceConfig;
+                mobileDataSourceConfig;
-	}
+    }
 
-	public static DataSource getDataSource() {
+    public static DataSource getDataSource() {
-		return dataSource;
+        return dataSource;
-	}
+    }
 
-	@Override
+    @Override
-	public void notifyObserver() {
+    public void notifyObserver() {
-		dataSource = MobileDeviceManagementDAOUtil.resolveDataSource(mobileDataSourceConfig);
+        try {
-		if(dataSource!=null){
+            dataSource = MobileDeviceManagementDAOUtil.resolveDataSource(mobileDataSourceConfig);
-			MobileDeviceManagementDAOUtil.createDataSource(dataSource);
+            MobileDeviceManagementDAOUtil.createDataSource(dataSource);
-		}
+        } catch (DeviceManagementException e) {
-	}
+            log.error("Error occurred while resolving mobile device management metadata repository data source", e);
+        }
+    }
 }

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

@@ -37,136 +37,119 @@ import java.util.List;
  */
 public class MobileDeviceManagementDAOUtil {
 
-	private static final Log log = LogFactory.getLog(MobileDeviceManagementDAOUtil.class);
+    private static final Log log = LogFactory.getLog(MobileDeviceManagementDAOUtil.class);
 
-	/**
+    /**
-	 * Resolve data source from the data source definition.
+     * Resolve data source from the data source definition.
-	 *
+     *
-	 * @param config Mobile data source configuration
+     * @param config Mobile data source configuration
-	 * @return data source resolved from the data source definition
+     * @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;
+        DataSource dataSource = null;
-		if (config == null) {
+        if (config == null) {
-			throw new RuntimeException("Device Management Repository data source configuration " +
+            throw new RuntimeException("Device Management Repository data source configuration " +
-			                           "is null and thus, is not initialized");
+                    "is null and thus, is not initialized");
-		}
+        }
-		JNDILookupDefinition jndiConfig = config.getJndiLookupDefintion();
+        JNDILookupDefinition jndiConfig = config.getJndiLookupDefintion();
-		if (jndiConfig != null) {
+        if (jndiConfig != null) {
-			if (log.isDebugEnabled()) {
+            if (log.isDebugEnabled()) {
-				log.debug("Initializing Device Management Repository data source using the JNDI " +
+                log.debug("Initializing Device Management Repository data source using the JNDI " +
-				          "Lookup Definition");
+                        "Lookup Definition");
-			}
+            }
-			List<JNDILookupDefinition.JNDIProperty> jndiPropertyList =
+            List<JNDILookupDefinition.JNDIProperty> jndiPropertyList =
-					jndiConfig.getJndiProperties();
+                    jndiConfig.getJndiProperties();
-			if (jndiPropertyList != null) {
+            if (jndiPropertyList != null) {
-				Hashtable<Object, Object> jndiProperties = new Hashtable<Object, Object>();
+                Hashtable<Object, Object> jndiProperties = new Hashtable<Object, Object>();
-				for (JNDILookupDefinition.JNDIProperty prop : jndiPropertyList) {
+                for (JNDILookupDefinition.JNDIProperty prop : jndiPropertyList) {
-					jndiProperties.put(prop.getName(), prop.getValue());
+                    jndiProperties.put(prop.getName(), prop.getValue());
-				}
+                }
-				try {
+                dataSource =
-					dataSource = MobileDeviceManagementDAOUtil.lookupDataSource(
+                        MobileDeviceManagementDAOUtil.lookupDataSource(jndiConfig.getJndiName(), jndiProperties);
-							jndiConfig.getJndiName(), jndiProperties);
+            } else {
-				} catch (DeviceManagementException e) {
+                dataSource = MobileDeviceManagementDAOUtil.lookupDataSource(jndiConfig.getJndiName(), null);
-					if (log.isDebugEnabled()) {
+            }
-						log.debug("Error in looking up data source: " + e.getMessage());
+        }
-					}
+        return dataSource;
-					log.error(e);
+    }
-				}
-			} 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);
-				}
-			}
-		}
-		return dataSource;
-	}
 
-	public static DataSource lookupDataSource(String dataSourceName,
+    public static DataSource lookupDataSource(String dataSourceName,
-	                                          final Hashtable<Object, Object> jndiProperties)
+                                              final Hashtable<Object, Object> jndiProperties)
-			throws DeviceManagementException {
+            throws DeviceManagementException {
-		try {
+        try {
-			if (jndiProperties == null || jndiProperties.isEmpty()) {
+            if (jndiProperties == null || jndiProperties.isEmpty()) {
-				return (DataSource) InitialContext.doLookup(dataSourceName);
+                return (DataSource) InitialContext.doLookup(dataSourceName);
-			}
+            }
-			final InitialContext context = new InitialContext(jndiProperties);
+            final InitialContext context = new InitialContext(jndiProperties);
-			return (DataSource) context.doLookup(dataSourceName);
+            return (DataSource) context.lookup(dataSourceName);
-		} catch (Exception e) {
+        } catch (Exception e) {
-			throw new DeviceManagementException(
+            String msg = "Error in looking up data source: " + e.getMessage();
-					"Error in looking up data source: " + e.getMessage(), e);
+            log.error(msg, e);
-		}
+            throw new DeviceManagementException(msg, e);
-	}
+        }
+    }
 
-	public static void cleanupResources(Connection conn, PreparedStatement stmt, ResultSet rs) {
+    public static void cleanupResources(Connection conn, PreparedStatement stmt, ResultSet rs) {
-		if (rs != null) {
+        if (rs != null) {
-			try {
+            try {
-				rs.close();
+                rs.close();
-			} catch (SQLException e) {
+            } catch (SQLException e) {
-				log.warn("Error occurred while closing result set", e);
+                log.warn("Error occurred while closing result set", e);
-			}
+            }
-		}
+        }
-		if (stmt != null) {
+        if (stmt != null) {
-			try {
+            try {
-				stmt.close();
+                stmt.close();
-			} catch (SQLException e) {
+            } catch (SQLException e) {
-				log.warn("Error occurred while closing prepared statement", e);
+                log.warn("Error occurred while closing prepared statement", e);
-			}
+            }
-		}
+        }
-		if (conn != null) {
+        if (conn != null) {
-			try {
+            try {
-				conn.close();
+                conn.close();
-			} catch (SQLException e) {
+            } catch (SQLException e) {
-				log.warn("Error occurred while closing database connection", e);
+                log.warn("Error occurred while closing database connection", e);
-			}
+            }
-		}
+        }
-	}
+    }
 
-	/**
+    /**
-	 * Initializes the creation of mobile device management schema if -Dsetup has provided.
+     * Initializes the creation of mobile device management schema if -Dsetup has provided.
-	 *
+     *
-	 * @param dataSource Mobile data source
+     * @param dataSource Mobile data source
-	 */
+     */
-	public static void createDataSource(DataSource dataSource) {
+    public static void createDataSource(DataSource dataSource) {
-		String setupOption = System.getProperty("setup");
+        String setupOption = System.getProperty("setup");
-		if (setupOption != null) {
+        if (setupOption != null) {
-			if (log.isDebugEnabled()) {
+            if (log.isDebugEnabled()) {
-				log.debug(
+                log.debug(
-						"-Dsetup is enabled. Mobile Device management repository schema initialization is about " +
+                        "-Dsetup is enabled. Mobile Device management repository schema initialization is about " +
-						"to begin");
+                                "to begin");
-			}
+            }
-			try {
+            try {
-				MobileDeviceManagementDAOUtil.setupMobileDeviceManagementSchema(dataSource);
+                MobileDeviceManagementDAOUtil.setupMobileDeviceManagementSchema(dataSource);
-			} catch (DeviceManagementException e) {
+            } catch (DeviceManagementException e) {
-				log.error(
+                log.error("Exception occurred while initializing mobile device management database schema", e);
-						"Exception occurred while initializing mobile device management database schema",
+            }
-						e);
+        }
-			}
+    }
-		}
-	}
 
-	/**
+    /**
-	 * Creates the mobile device management schema.
+     * Creates the mobile device management schema.
-	 *
+     *
-	 * @param dataSource Mobile data source
+     * @param dataSource Mobile data source
-	 */
+     */
-	public static void setupMobileDeviceManagementSchema(DataSource dataSource) throws
+    public static void setupMobileDeviceManagementSchema(DataSource dataSource) throws
-	                                                                            DeviceManagementException {
+            DeviceManagementException {
-		MobileDeviceManagementSchemaInitializer initializer =
+        MobileDeviceManagementSchemaInitializer initializer =
-				new MobileDeviceManagementSchemaInitializer(dataSource);
+                new MobileDeviceManagementSchemaInitializer(dataSource);
-		log.info("Initializing mobile device management repository database schema");
+        log.info("Initializing mobile device management repository database schema");
-		try {
+        try {
-			initializer.createRegistryDatabase();
+            initializer.createRegistryDatabase();
-		} catch (Exception e) {
+        } catch (Exception e) {
-			throw new DeviceManagementException(
+            throw new DeviceManagementException("Error occurred while initializing Mobile Device Management " +
-					"Error occurred while initializing Mobile Device Management " +
+                    "database schema", e);
-					"database schema", e);
+        }
-		}
+    }
-	}
 
 }

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

@@ -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 =
+			String msg = "Error while updating the Android device : " + device.getDeviceIdentifier();
-					"Error while updating the Android device : " + device.getDeviceIdentifier();
 			log.error(msg, e);
 			throw new DeviceManagementException(msg, e);
 		}
@@ -166,9 +165,9 @@ public class AndroidDeviceManagerService implements DeviceManagerService {
 							getAllDevices();
 			if (mobileDevices != null) {
 				devices = new ArrayList<Device>();
-				for (int x = 0; x < mobileDevices.size(); x++) {
+                for (MobileDevice mobileDevice : mobileDevices) {
-					devices.add(MobileDeviceManagementUtil.convertToDevice(mobileDevices.get(x)));
+                    devices.add(MobileDeviceManagementUtil.convertToDevice(mobileDevice));
-				}
+                }
 			}
 		} catch (MobileDeviceManagementDAOException e) {
 			String msg = "Error while fetching all Android devices.";

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidMobileOperationManager.java

@@ -24,16 +24,16 @@ import java.util.List;
 
 public class AndroidMobileOperationManager extends AbstractMobileOperationManager {
 
-	@Override
+    @Override
-	public boolean addOperation(Operation operation, List<DeviceIdentifier> devices) throws
+    public boolean addOperation(Operation operation, List<DeviceIdentifier> devices) throws
-	                                                                                 OperationManagementException {
+            OperationManagementException {
-		return false;
+        return false;
-	}
+    }
 
-	@Override
+    @Override
-	public List<Operation> getOperations(DeviceIdentifier deviceIdentifier)
+    public List<Operation> getOperations(DeviceIdentifier deviceIdentifier)
-			throws OperationManagementException {
+            throws OperationManagementException {
-		return null;
+        return null;
-	}
+    }
 
 }

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

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