Merge branch 'work-efficiency-analyzer' into 'master'

Add new variable to store an apllication's events

Closes product-iots#522

See merge request entgra/carbon-device-mgt!551

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

@@ -16,12 +16,33 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
+/*
+ *
+ *  Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved.
+ *
+ *  Entgra (pvt) Ltd. licenses this file to you under the Apache License,
+ *  Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied. See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ *
+ */
+
 package org.wso2.carbon.device.mgt.common.app.mgt;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
+import java.util.List;
 import java.util.Properties;
 
 @ApiModel(value = "Application", description = "This class carries all information related application")
@@ -57,7 +78,8 @@ public class Application implements Serializable {
     private long hourlyUsage;
     @ApiModelProperty(name = "dailyUsage", value = "App daily usage")
     private long dailyUsage;
-
+    @ApiModelProperty(name = "applicationEvents", value = "Application's event list")
+    private List<ApplicationEvent> applicationEvents;
 
     public String getType() {
         return type;
@@ -199,4 +221,13 @@ public class Application implements Serializable {
     public void setDailyUsage(long dailyUsage) {
         this.dailyUsage = dailyUsage;
     }
+
+    public List<ApplicationEvent> getApplicationEvents() {
+        return applicationEvents;
+    }
+
+    public void setApplicationEvents(
+            List<ApplicationEvent> applicationEvents) {
+        this.applicationEvents = applicationEvents;
+    }
 }

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

@@ -0,0 +1,42 @@
+/*
+ *
+ *  Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved.
+ *
+ *  Entgra (pvt) Ltd. licenses this file to you under the Apache License,
+ *  Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied. See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ *
+ */
+
+package org.wso2.carbon.device.mgt.common.app.mgt;
+
+public class ApplicationEvent {
+    private String eventData;
+    private long timestamp;
+
+    public String getEventData() {
+        return eventData;
+    }
+
+    public void setEventData(String eventData) {
+        this.eventData = eventData;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+}