Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

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

@@ -118,4 +118,10 @@ public class EnrolmentInfo implements Serializable {
         }
         return false;
     }
+
+    @Override
+    public int hashCode() {
+        return owner.hashCode() ^ ownership.hashCode();
+    }
+
 }

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

@@ -28,29 +28,29 @@ import java.util.List;
 /**
  * Represents the tenant configuration for a device platform.
  */
-@XmlRootElement(name="tenantConfiguration")
+@XmlRootElement(name = "tenantConfiguration")
 @XmlAccessorType(XmlAccessType.NONE)
-public class TenantConfiguration implements Serializable{
+public class TenantConfiguration implements Serializable {
 
-	@XmlElement(name="type")
-	private String type;
-	@XmlElement(name="configuration")
-	private List<ConfigurationEntry> configuration;
+    @XmlElement(name = "type")
+    private String type;
+    @XmlElement(name = "configuration")
+    private List<ConfigurationEntry> configuration;
 
-	public String getType() {
-		return type;
-	}
+    public String getType() {
+        return type;
+    }
 
-	public void setType(String type) {
-		this.type = type;
-	}
+    public void setType(String type) {
+        this.type = type;
+    }
 
-	public List<ConfigurationEntry> getConfiguration() {
-		return configuration;
-	}
+    public List<ConfigurationEntry> getConfiguration() {
+        return configuration;
+    }
 
-	public void setConfiguration(List<ConfigurationEntry> configuration) {
-		this.configuration = configuration;
-	}
+    public void setConfiguration(List<ConfigurationEntry> configuration) {
+        this.configuration = configuration;
+    }
 
 }

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

@@ -30,7 +30,7 @@ import java.util.List;
  * Composite interface that acts as the SPI exposing all device management as well as application management
  * functionalities.
  */
-public interface DeviceManagementService extends ApplicationManager {
+public interface DeviceManagementService {
 
     /**
      * Method to retrieve the provider type that implements DeviceManager interface.
@@ -58,6 +58,7 @@ public interface DeviceManagementService extends ApplicationManager {
 
     ApplicationManager getApplicationManager();
 
-    void notifyOperationToDevices(Operation operation, List<DeviceIdentifier> deviceIds) throws DeviceManagementException;
+    void notifyOperationToDevices(Operation operation,
+                                  List<DeviceIdentifier> deviceIds) throws DeviceManagementException;
 
 }

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

@@ -17,17 +17,12 @@
  */
 package org.wso2.carbon.device.mgt.core;
 
-import org.wso2.carbon.device.mgt.common.*;
-import org.wso2.carbon.device.mgt.common.app.mgt.Application;
-import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManagementException;
+import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.DeviceManager;
 import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManager;
-import org.wso2.carbon.device.mgt.common.license.mgt.License;
-import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
-import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
 import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
-import org.wso2.carbon.device.mgt.core.common.TestDataHolder;
-import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 
 import java.util.List;
 
@@ -74,39 +69,4 @@ public class TestDeviceManagementService implements DeviceManagementService {
 
     }
 
-    @Override
-    public Application[] getApplications(String domain, int pageNumber, int size)
-            throws ApplicationManagementException {
-        return new Application[0];
-    }
-
-    @Override
-    public void updateApplicationStatus(DeviceIdentifier deviceId, Application application, String status)
-            throws ApplicationManagementException {
-
-    }
-
-    @Override
-    public String getApplicationStatus(DeviceIdentifier deviceId, Application application)
-            throws ApplicationManagementException {
-        return null;
-    }
-
-    @Override
-    public void installApplicationForDevices(Operation operation, List<DeviceIdentifier> deviceIdentifiers)
-            throws ApplicationManagementException {
-
-    }
-
-    @Override
-    public void installApplicationForUsers(Operation operation, List<String> userNameList)
-            throws ApplicationManagementException {
-
-    }
-
-    @Override
-    public void installApplicationForUserRoles(Operation operation, List<String> userRoleList)
-            throws ApplicationManagementException {
-
-    }
 }