Fixed indentation

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/Device.java

@@ -19,7 +19,8 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import java.util.List;
 
-@XmlRootElement public class Device {
+@XmlRootElement
+public class Device {
 
 	private int id;
 	private String type;
@@ -35,7 +36,8 @@ import java.util.List;
 	private List<Feature> features;
 	private List<Device.Property> properties;
 
-	@XmlElement public int getId() {
+	@XmlElement
+	public int getId() {
 		return id;
 	}
 
@@ -43,7 +45,8 @@ import java.util.List;
 		this.id = id;
 	}
 
-	@XmlElement public String getDescription() {
+	@XmlElement
+	public String getDescription() {
 		return description;
 	}
 
@@ -51,7 +54,8 @@ import java.util.List;
 		this.description = description;
 	}
 
-	@XmlElement public String getName() {
+	@XmlElement
+	public String getName() {
 		return name;
 	}
 
@@ -59,7 +63,8 @@ import java.util.List;
 		this.name = name;
 	}
 
-	@XmlElement public Long getDateOfEnrolment() {
+	@XmlElement
+	public Long getDateOfEnrolment() {
 		return dateOfEnrolment;
 	}
 
@@ -67,7 +72,8 @@ import java.util.List;
 		this.dateOfEnrolment = dateOfEnrolment;
 	}
 
-	@XmlElement public Long getDateOfLastUpdate() {
+	@XmlElement
+	public Long getDateOfLastUpdate() {
 		return dateOfLastUpdate;
 	}
 
@@ -75,7 +81,8 @@ import java.util.List;
 		this.dateOfLastUpdate = dateOfLastUpdate;
 	}
 
-	@XmlElement public String getOwnership() {
+	@XmlElement
+	public String getOwnership() {
 		return ownership;
 	}
 
@@ -83,7 +90,8 @@ import java.util.List;
 		this.ownership = ownership;
 	}
 
-	@XmlElement public boolean isStatus() {
+	@XmlElement
+	public boolean isStatus() {
 		return status;
 	}
 
@@ -91,7 +99,8 @@ import java.util.List;
 		this.status = status;
 	}
 
-	@XmlElement public int getDeviceTypeId() {
+	@XmlElement
+	public int getDeviceTypeId() {
 		return deviceTypeId;
 	}
 
@@ -99,7 +108,8 @@ import java.util.List;
 		this.deviceTypeId = deviceTypeId;
 	}
 
-	@XmlElement public String getDeviceIdentifier() {
+	@XmlElement
+	public String getDeviceIdentifier() {
 		return deviceIdentifier;
 	}
 
@@ -107,7 +117,8 @@ import java.util.List;
 		this.deviceIdentifier = deviceIdentifier;
 	}
 
-	@XmlElement public String getOwner() {
+	@XmlElement
+	public String getOwner() {
 		return owner;
 	}
 
@@ -115,7 +126,8 @@ import java.util.List;
 		this.owner = owner;
 	}
 
-	@XmlElement public List<Feature> getFeatures() {
+	@XmlElement
+	public List<Feature> getFeatures() {
 		return features;
 	}
 
@@ -123,7 +135,8 @@ import java.util.List;
 		this.features = features;
 	}
 
-	@XmlElement public String getType() {
+	@XmlElement
+	public String getType() {
 		return type;
 	}
 
@@ -131,7 +144,8 @@ import java.util.List;
 		this.type = type;
 	}
 
-	@XmlElement public List<Device.Property> getProperties() {
+	@XmlElement
+	public List<Device.Property> getProperties() {
 		return properties;
 	}
 

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java

@@ -18,6 +18,7 @@ package org.wso2.carbon.device.mgt.core.util;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Document;
+import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.core.config.datasource.DataSourceConfig;
 import org.wso2.carbon.device.mgt.core.config.datasource.JNDILookupDefinition;
@@ -31,8 +32,10 @@ import javax.sql.DataSource;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import java.io.File;
+import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
+import java.util.Map;
 
 public final class DeviceManagerUtil {
 
@@ -59,24 +62,22 @@ public final class DeviceManagerUtil {
 	public static DataSource resolveDataSource(DataSourceConfig config) {
 		DataSource dataSource = null;
 		if (config == null) {
-            throw new RuntimeException("Device Management Repository data source configuration " +
+			throw new RuntimeException(
-                    "is null and thus, is not initialized");
+					"Device Management Repository data source configuration " + "is null and thus, is not initialized");
 		}
 		JNDILookupDefinition jndiConfig = config.getJndiLookupDefintion();
 		if (jndiConfig != null) {
 			if (log.isDebugEnabled()) {
-                log.debug("Initializing Device Management Repository data source using the JNDI " +
+				log.debug(
-                        "Lookup Definition");
+						"Initializing Device Management Repository data source using the JNDI " + "Lookup Definition");
 			}
-            List<JNDILookupDefinition.JNDIProperty> jndiPropertyList =
+			List<JNDILookupDefinition.JNDIProperty> jndiPropertyList = jndiConfig.getJndiProperties();
-                    jndiConfig.getJndiProperties();
 			if (jndiPropertyList != null) {
 				Hashtable<Object, Object> jndiProperties = new Hashtable<Object, Object>();
 				for (JNDILookupDefinition.JNDIProperty prop : jndiPropertyList) {
 					jndiProperties.put(prop.getName(), prop.getValue());
 				}
-                dataSource =
+				dataSource = DeviceManagementDAOUtil.lookupDataSource(jndiConfig.getJndiName(), jndiProperties);
-                        DeviceManagementDAOUtil.lookupDataSource(jndiConfig.getJndiName(), jndiProperties);
 			} else {
 				dataSource = DeviceManagementDAOUtil.lookupDataSource(jndiConfig.getJndiName(), null);
 			}
@@ -130,4 +131,12 @@ public final class DeviceManagerUtil {
 		}
 	}
 
+	public static Map<String, String> convertPropertiesToMap(List<Device.Property> properties) {
+		Map<String, String> propertiesMap = new HashMap<String, String>();
+		for (Device.Property prop : properties) {
+			propertiesMap.put(prop.getName(), prop.getValue());
+		}
+		return propertiesMap;
+	}
+
 }