Fix merge conflicts

components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/WebsocketEventAdapter.java

@@ -23,7 +23,6 @@ import org.apache.commons.logging.LogFactory;
 import org.json.JSONObject;
 import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.databridge.commons.Attribute;
 import org.wso2.carbon.databridge.commons.StreamDefinition;
 import org.wso2.carbon.device.mgt.output.adapter.websocket.constants.WebsocketConstants;
 import org.wso2.carbon.device.mgt.output.adapter.websocket.internal.WebsocketEventAdaptorServiceDataHolder;
@@ -39,7 +38,6 @@ import org.wso2.carbon.event.stream.core.EventStreamService;
 import org.wso2.carbon.event.stream.core.exception.EventStreamConfigurationException;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -50,7 +48,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 /**
- * Contains the life cycle of executions regarding the UI Adapter
+ * Contains the life cycle of executions regarding the UI Adapter.
  */
 
 public class WebsocketEventAdapter implements OutputEventAdapter {
@@ -137,8 +135,8 @@ public class WebsocketEventAdapter implements OutputEventAdapter {
         String adapterName = streamSpecifAdapterMap.get(streamId);
 
         if (adapterName != null) {
-            throw new OutputEventAdapterException(("An Output websocket event adapter \"" + adapterName + "\" is already" +
-                    " exist for stream id \"" + streamId + "\""));
+            throw new OutputEventAdapterException(("An Output websocket event adapter \"" + adapterName + "\" is " +
+                    "already exist for stream id \"" + streamId + "\""));
         } else {
             streamSpecifAdapterMap.put(streamId, eventAdapterConfiguration.getName());
 
@@ -287,17 +285,46 @@ public class WebsocketEventAdapter implements OutputEventAdapter {
         return validSessions;
     }
 
-    private boolean validateJsonMessageAgainstEventFilters(String eventString, WebSocketSessionRequest webSocketSessionRequest) {
+    private boolean validateJsonMessageAgainstEventFilters(String eventString,
+                                                           WebSocketSessionRequest webSocketSessionRequest) {
         Map<String, String> queryParamValuePairs = webSocketSessionRequest.getQueryParamValuePairs();
         String deviceId = queryParamValuePairs.get(WebsocketConstants.DEVICE_ID);
         String deviceType = queryParamValuePairs.get(WebsocketConstants.DEVICE_TYPE);
-        JSONObject eventObj = new JSONObject(eventString);
-        if (deviceId != null && !deviceId.equals(eventObj.getString(WebsocketConstants.DEVICE_ID))) {
-            return false;
+        JSONObject rootObj = new JSONObject(eventString);
+        if (deviceId == null && deviceType == null) {
+            return true;
         }
-        if (deviceType != null && !deviceType.equals(eventObj.getString(WebsocketConstants.DEVICE_TYPE))) {
-            return false;
+
+        if (deviceType != null) {
+            if (rootObj.has(WebsocketConstants.DEVICE_TYPE)) {
+                if (!deviceType.equals(rootObj.getString(WebsocketConstants.DEVICE_TYPE))) {
+                    return false;
+                }
+            } else if (rootObj.has(WebsocketConstants.EVENT)) {
+                JSONObject eventObj = (JSONObject) rootObj.get(WebsocketConstants.EVENT);
+                if (eventObj.has(WebsocketConstants.META_DATA)) {
+                    JSONObject metaDataObj = (JSONObject) eventObj.get(WebsocketConstants.META_DATA);
+                    if (metaDataObj.has(WebsocketConstants.DEVICE_TYPE)
+                            && !deviceType.equals(metaDataObj.getString(WebsocketConstants.DEVICE_TYPE))) {
+                        return false;
+                    }
+                }
+            }
         }
+
+        if (deviceId != null) {
+            if (rootObj.has(WebsocketConstants.DEVICE_ID)) {
+                return deviceId.equals(rootObj.getString(WebsocketConstants.DEVICE_ID));
+            } else if (rootObj.has(WebsocketConstants.EVENT)) {
+                JSONObject eventObj = (JSONObject) rootObj.get(WebsocketConstants.EVENT);
+                if (eventObj.has(WebsocketConstants.META_DATA)) {
+                    JSONObject metaDataObj = (JSONObject) eventObj.get(WebsocketConstants.META_DATA);
+                    return !metaDataObj.has(WebsocketConstants.DEVICE_ID)
+                            || deviceId.equals(metaDataObj.getString(WebsocketConstants.DEVICE_ID));
+                }
+            }
+        }
+
         return true;
     }
 

components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/constants/WebsocketConstants.java

@@ -35,4 +35,6 @@ public class WebsocketConstants {
     public static final String PASSWORD = "password";
     public static final String DEVICE_ID = "deviceId";
     public static final String DEVICE_TYPE = "deviceType";
+    public static final String EVENT = "event";
+    public static final String META_DATA = "metaData";
 }

components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/config/AuthorizationConfiguration.java

@@ -31,7 +31,6 @@ import org.apache.commons.logging.LogFactory;
 import org.jaxen.JaxenException;
 import org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.exception.AuthorizationException;
 import org.wso2.carbon.utils.CarbonUtils;
-import org.wso2.carbon.utils.ServerConstants;
 import org.wso2.securevault.SecretResolver;
 import org.wso2.securevault.SecretResolverFactory;
 

components/extensions/siddhi-extensions/org.wso2.extension.siddhi.device/src/test/resources/sql/h2.sql

@@ -12,7 +12,7 @@ CREATE TABLE IF NOT EXISTS DM_GROUP (
   ID                  INTEGER AUTO_INCREMENT NOT NULL,
   GROUP_NAME          VARCHAR(100) DEFAULT NULL,
   DESCRIPTION         TEXT         DEFAULT NULL,
-  OWNER               VARCHAR(45)  DEFAULT NULL,
+  OWNER               VARCHAR(255)  DEFAULT NULL,
   TENANT_ID           INTEGER      DEFAULT 0,
   PRIMARY KEY (ID)
 );
@@ -50,6 +50,14 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_PROPERTIES (
      PRIMARY KEY (DEVICE_TYPE_NAME, DEVICE_IDENTIFICATION, PROPERTY_NAME, TENANT_ID)
 );
 
+CREATE TABLE IF NOT EXISTS GROUP_PROPERTIES (
+                                                GROUP_ID INTEGER NOT NULL,
+                                                PROPERTY_NAME VARCHAR(100) DEFAULT 0,
+                                                PROPERTY_VALUE VARCHAR(100) DEFAULT NULL,
+                                                TENANT_ID VARCHAR(100),
+                                                PRIMARY KEY (GROUP_ID, PROPERTY_NAME, TENANT_ID)
+);
+
 CREATE TABLE IF NOT EXISTS DM_DEVICE_GROUP_MAP (
   ID        INTEGER AUTO_INCREMENT NOT NULL,
   DEVICE_ID INTEGER DEFAULT NULL,
@@ -109,7 +117,7 @@ CREATE TABLE IF NOT EXISTS DM_PROFILE_OPERATION (
 CREATE TABLE IF NOT EXISTS DM_ENROLMENT (
     ID INTEGER AUTO_INCREMENT NOT NULL,
     DEVICE_ID INTEGER NOT NULL,
-    OWNER VARCHAR(50) NOT NULL,
+    OWNER VARCHAR(255) NOT NULL,
     OWNERSHIP VARCHAR(45) DEFAULT NULL,
     STATUS VARCHAR(50) NULL,
     DATE_OF_ENROLMENT TIMESTAMP DEFAULT NULL,
@@ -301,7 +309,7 @@ CREATE TABLE IF NOT EXISTS DM_POLICY_CRITERIA_PROPERTIES (
   POLICY_CRITERION_ID INT NOT NULL,
   PROP_KEY VARCHAR(45) NULL,
   PROP_VALUE VARCHAR(100) NULL,
-  CONTENT BLOB NULL COMMENT 'This is used to ',
+  CONTENT BLOB NULL,
   PRIMARY KEY (ID),
   CONSTRAINT FK_POLICY_CRITERIA_PROPERTIES
     FOREIGN KEY (POLICY_CRITERION_ID)
@@ -366,13 +374,28 @@ CREATE TABLE IF NOT EXISTS DM_APPLICATION (
 CREATE TABLE IF NOT EXISTS DM_DEVICE_APPLICATION_MAPPING (
     ID INTEGER AUTO_INCREMENT NOT NULL,
     DEVICE_ID INTEGER NOT NULL,
+    ENROLMENT_ID INTEGER NOT NULL,
     APPLICATION_ID INTEGER NOT NULL,
+    APP_PROPERTIES BLOB NULL,
+    MEMORY_USAGE INTEGER(10) NULL,
+    IS_ACTIVE BOOLEAN NOT NULL DEFAULT FALSE,
     TENANT_ID INTEGER NOT NULL,
     PRIMARY KEY (ID),
-    CONSTRAINT fk_dm_device FOREIGN KEY (DEVICE_ID) REFERENCES
-    DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION,
-    CONSTRAINT fk_dm_application FOREIGN KEY (APPLICATION_ID) REFERENCES
-    DM_APPLICATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
+    CONSTRAINT fk_dm_device
+        FOREIGN KEY (DEVICE_ID)
+            REFERENCES DM_DEVICE (ID)
+                ON DELETE NO ACTION
+                ON UPDATE NO ACTION,
+    CONSTRAINT fk_dm_application
+        FOREIGN KEY (APPLICATION_ID)
+            REFERENCES DM_APPLICATION (ID)
+                ON DELETE NO ACTION
+                ON UPDATE NO ACTION,
+    CONSTRAINT FK_DM_APP_MAP_DM_ENROL
+        FOREIGN KEY (ENROLMENT_ID)
+            REFERENCES DM_ENROLMENT (ID)
+                ON DELETE NO ACTION
+                ON UPDATE NO ACTION
 );
 
 -- POLICY RELATED TABLES  FINISHED --
@@ -381,34 +404,40 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_APPLICATION_MAPPING (
 CREATE TABLE IF NOT EXISTS DM_NOTIFICATION (
     NOTIFICATION_ID INTEGER AUTO_INCREMENT NOT NULL,
     DEVICE_ID INTEGER NOT NULL,
-    OPERATION_ID INTEGER NOT NULL,
+    OPERATION_ID INTEGER NULL,
     TENANT_ID INTEGER NOT NULL,
     STATUS VARCHAR(10) NULL,
     DESCRIPTION VARCHAR(1000) NULL,
+    LAST_UPDATED_TIMESTAMP TIMESTAMP NOT NULL,
     PRIMARY KEY (NOTIFICATION_ID),
     CONSTRAINT fk_dm_device_notification FOREIGN KEY (DEVICE_ID) REFERENCES
-    DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION,
-    CONSTRAINT fk_dm_operation_notification FOREIGN KEY (OPERATION_ID) REFERENCES
-    DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
+        DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 );
 -- NOTIFICATION TABLE END --
 
 CREATE TABLE IF NOT EXISTS DM_DEVICE_INFO (
   ID INTEGER AUTO_INCREMENT NOT NULL,
   DEVICE_ID INT NULL,
+  ENROLMENT_ID INT NOT NULL,
   KEY_FIELD VARCHAR(45) NULL,
-  VALUE_FIELD VARCHAR(100) NULL,
+  VALUE_FIELD VARCHAR(1000) NULL,
   PRIMARY KEY (ID),
   CONSTRAINT DM_DEVICE_INFO_DEVICE
     FOREIGN KEY (DEVICE_ID)
     REFERENCES DM_DEVICE (ID)
     ON DELETE NO ACTION
+    ON UPDATE NO ACTION,
+  CONSTRAINT DM_DEVICE_INFO_DEVICE_ENROLLMENT
+    FOREIGN KEY (ENROLMENT_ID)
+    REFERENCES DM_ENROLMENT (ID)
+    ON DELETE NO ACTION
     ON UPDATE NO ACTION
 );
 
 CREATE TABLE IF NOT EXISTS DM_DEVICE_LOCATION (
   ID INTEGER AUTO_INCREMENT NOT NULL,
   DEVICE_ID INT NULL,
+  ENROLMENT_ID INT NOT NULL,
   LATITUDE DOUBLE NULL,
   LONGITUDE DOUBLE NULL,
   STREET1 VARCHAR(255) NULL,
@@ -417,18 +446,26 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_LOCATION (
   ZIP VARCHAR(10) NULL,
   STATE VARCHAR(45) NULL,
   COUNTRY VARCHAR(45) NULL,
+  GEO_HASH VARCHAR(45) NULL,
   UPDATE_TIMESTAMP BIGINT(15) NOT NULL,
   PRIMARY KEY (ID),
   CONSTRAINT DM_DEVICE_LOCATION_DEVICE
     FOREIGN KEY (DEVICE_ID)
     REFERENCES DM_DEVICE (ID)
+          ON DELETE NO ACTION
+          ON UPDATE NO ACTION,
+  CONSTRAINT DM_DEVICE_LOCATION_DM_ENROLLMENT
+    FOREIGN KEY (ENROLMENT_ID)
+    REFERENCES DM_ENROLMENT (ID)
     ON DELETE NO ACTION
     ON UPDATE NO ACTION
 );
+CREATE INDEX DM_DEVICE_LOCATION_GEO_hashx ON DM_DEVICE_LOCATION(GEO_HASH ASC);
 
 CREATE TABLE IF NOT EXISTS DM_DEVICE_DETAIL (
   ID INT NOT NULL AUTO_INCREMENT,
   DEVICE_ID INT NOT NULL,
+  ENROLMENT_ID INT NOT NULL,
   DEVICE_MODEL VARCHAR(45) NULL,
   VENDOR VARCHAR(45) NULL,
   OS_VERSION VARCHAR(45) NULL,
@@ -450,6 +487,11 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_DETAIL (
     FOREIGN KEY (DEVICE_ID)
     REFERENCES DM_DEVICE (ID)
     ON DELETE NO ACTION
+    ON UPDATE NO ACTION,
+  CONSTRAINT FK_DM_ENROLMENT_DEVICE_DETAILS
+    FOREIGN KEY (ENROLMENT_ID)
+    REFERENCES DM_ENROLMENT (ID)
+    ON DELETE NO ACTION
     ON UPDATE NO ACTION
 );
 

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java

@@ -27,11 +27,15 @@ import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig;
 import org.wso2.carbon.device.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.mgt.common.PaginationResult;
 import org.wso2.carbon.device.mgt.common.StartupOperationConfig;
+import org.wso2.carbon.device.mgt.common.configuration.mgt.AmbiguousConfigurationException;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationManagementException;
+import org.wso2.carbon.device.mgt.common.configuration.mgt.DeviceConfiguration;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
 import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceNotFoundException;
 import org.wso2.carbon.device.mgt.common.exceptions.DeviceTypeNotFoundException;
 import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
+import org.wso2.carbon.device.mgt.common.exceptions.UnauthorizedDeviceAccessException;
 import org.wso2.carbon.device.mgt.common.license.mgt.License;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
@@ -650,4 +654,11 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
     @Override public DeviceTypeVersion getDeviceTypeVersion(String s, String s1) throws DeviceManagementException {
         return null;
     }
+
+    @Override
+    public DeviceConfiguration getDeviceConfiguration(Map<String, String> propertyMap)
+            throws DeviceManagementException, DeviceNotFoundException, UnauthorizedDeviceAccessException,
+            AmbiguousConfigurationException {
+        return null;
+    }
 }