From baed4318b59092516d49649ac25f429228755480 Mon Sep 17 00:00:00 2001
From: Chatura Dilan <dilan@dilan.me>
Date: Mon, 15 May 2017 17:00:46 +0530
Subject: [PATCH] Added properties to platform and subscription

---
 .../device/application/mgt/core/dto/Platform.java     | 11 ++++++-----
 .../device/application/mgt/core/dto/Subscription.java | 11 +++++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dto/Platform.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dto/Platform.java
index da17697675..9a943d9620 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dto/Platform.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dto/Platform.java
@@ -18,6 +18,7 @@
  */
 package org.wso2.carbon.device.application.mgt.core.dto;
 
+import org.json.JSONObject;
 import org.wso2.carbon.device.application.mgt.core.jaxrs.Exclude;
 
 import java.util.List;
@@ -37,7 +38,7 @@ public class Platform {
 
     private List<String> tags;
 
-    private String properties;
+    private JSONObject descriptor;
 
     private List<Application> applications;
 
@@ -81,12 +82,12 @@ public class Platform {
         this.iconName = iconName;
     }
 
-    public String getProperties() {
-        return properties;
+    public JSONObject getDescriptor() {
+        return descriptor;
     }
 
-    public void setProperties(String properties) {
-        this.properties = properties;
+    public void setDescriptor(JSONObject descriptor) {
+        this.descriptor = descriptor;
     }
 
     public List<String> getTags() {
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dto/Subscription.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dto/Subscription.java
index 2874f9f8f5..7e49b8bb55 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dto/Subscription.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dto/Subscription.java
@@ -19,6 +19,7 @@
 package org.wso2.carbon.device.application.mgt.core.dto;
 
 import java.util.Date;
+import java.util.Map;
 
 public class Subscription {
 
@@ -32,6 +33,8 @@ public class Subscription {
 
     private ApplicationRelease applicationRelease;
 
+    private Map<String, String> properties;
+
     public String getValue() {
         return value;
     }
@@ -71,4 +74,12 @@ public class Subscription {
     public void setApplicationRelease(ApplicationRelease applicationRelease) {
         this.applicationRelease = applicationRelease;
     }
+
+    public Map<String, String> getProperties() {
+        return properties;
+    }
+
+    public void setProperties(Map<String, String> properties) {
+        this.properties = properties;
+    }
 }