fixed few issues after testing analytics

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

@@ -425,26 +425,39 @@ public class WebsocketEventAdapter implements OutputEventAdapter {
             // fetch the different attribute values received as part of the current event.
             Set<String> queryParams = queryParamValuePairs.keySet();
             for (String aQueryParam : queryParams) {
-                if (!aQueryParam.equalsIgnoreCase(WebsocketConstants.TOKEN_PARAM)) {
                 try {
+
                     String queryValue = queryParamValuePairs.get(aQueryParam);
                     if (queryValue != null && !queryValue.trim().isEmpty()) {
                         JSONObject jsonObject = new JSONObject(jsonMessage);
-                            String eventValue = jsonObject.getString(aQueryParam);
+                        JSONObject event = jsonObject.getJSONObject(WebsocketConstants.EVENT);
+                        JSONObject data;
+                        if (!event.isNull(WebsocketConstants.META_DATA)) {
+                            data = event.getJSONObject(WebsocketConstants.META_DATA);
+                            if (!data.isNull(aQueryParam)) {
+                                String eventValue = data.get(aQueryParam).toString();
                                 if (eventValue == null || !eventValue.equalsIgnoreCase(queryValue)) {
                                     return false;
                                 }
                             }
-                    } catch (JSONException e) {
+
-                        if (log.isDebugEnabled()) {
-                            log.debug("Unable validate the stream filter properties for event : " + jsonMessage
-                                    + " ", e);
                         }
+
+                        if (!event.isNull(WebsocketConstants.PAYLOAD_DATA)) {
+                            data = event.getJSONObject(WebsocketConstants.PAYLOAD_DATA);
+                            if (!data.isNull(aQueryParam)) {
+                                String eventValue = data.get(aQueryParam).toString();
+                                if (eventValue == null || !eventValue.equalsIgnoreCase(queryValue)) {
                                     return false;
                                 }
                             }
                         }
                     }
+                } catch (JSONException e) {
+                    //do nothing - This exception is thrown when the event does not have query parameter.
+                }
+            }
+        }
         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

@@ -34,4 +34,7 @@ public class WebsocketConstants {
     public static final String USERNAME = "username";
     public static final String PASSWORD = "password";
     public static final String TOKEN_PARAM = "token";
+    public static final String META_DATA = "metaData";
+    public static final String PAYLOAD_DATA = "payloadData";
+    public static final String EVENT = "event";
 }