From e633d28013156affc3558f5be321fb2d66fdf68b Mon Sep 17 00:00:00 2001
From: hasuniea <hasunie@wso2.com>
Date: Thu, 12 May 2016 22:00:09 +0530
Subject: [PATCH 1/2] added annotation for ConfigurationEntry

---
 .../org.wso2.carbon.device.mgt.common/pom.xml |  2 +-
 .../configuration/mgt/ConfigurationEntry.java | 52 +++++++++++--------
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
index 6351e19203..3d0e05776f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
@@ -61,5 +61,5 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    
+
 </project>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/configuration/mgt/ConfigurationEntry.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/configuration/mgt/ConfigurationEntry.java
index cafc157452..5c8a7b6e86 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/configuration/mgt/ConfigurationEntry.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/configuration/mgt/ConfigurationEntry.java
@@ -18,36 +18,46 @@
 
 package org.wso2.carbon.device.mgt.common.configuration.mgt;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
 /**
  * Represents an individual configuration entry.
  */
+@ApiModel(value = "ConfigurationEntry", description = "This class carries all information related to Tenant Configuration" +
+        "Settings")
 public class ConfigurationEntry {
 
-	private String name;
-	private String contentType;
-	private Object value;
+    @ApiModelProperty(name = "name", value = "Name of the configuration", required = true)
+    private String name;
+
+    @ApiModelProperty(name = "contentType", value = "Type of the configuration", required = true)
+    private String contentType;
+
+    @ApiModelProperty(name = "value", value = "Value of the configuration", required = true)
+    private Object value;
 
-	public String getName() {
-		return name;
-	}
+    public String getName() {
+        return name;
+    }
 
-	public void setName(String name) {
-		this.name = name;
-	}
+    public void setName(String name) {
+        this.name = name;
+    }
 
-	public String getContentType() {
-		return contentType;
-	}
+    public String getContentType() {
+        return contentType;
+    }
 
-	public void setContentType(String contentType) {
-		this.contentType = contentType;
-	}
+    public void setContentType(String contentType) {
+        this.contentType = contentType;
+    }
 
-	public Object getValue() {
-		return value;
-	}
+    public Object getValue() {
+        return value;
+    }
 
-	public void setValue(Object value) {
-		this.value = value;
-	}
+    public void setValue(Object value) {
+        this.value = value;
+    }
 }

From c945d630383bafbb8f5a3766e7eae5cfb321d70b Mon Sep 17 00:00:00 2001
From: inosh-perera <inoshperera@gmail.com>
Date: Thu, 12 May 2016 23:01:21 +0530
Subject: [PATCH 2/2] fixing issues in swagger dependancy

---
 .../device-mgt/org.wso2.carbon.device.mgt.common/pom.xml       | 3 +++
 components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml  | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
index 3d0e05776f..8822346796 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
@@ -48,6 +48,9 @@
                         <Export-Package>
                             org.wso2.carbon.device.mgt.common.*
                         </Export-Package>
+                        <Import-Package>
+                            *;resolution:=optional,
+                        </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
index bb73550ff6..199a08a6df 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
@@ -83,6 +83,8 @@
                             org.apache.catalina.core,
                             org.apache.commons.collections,
                             org.wso2.carbon.email.sender.*,
+                            io.swagger.annotations.*,
+                            *;resolution:=optional,
                             org.wso2.carbon,
                             org.wso2.carbon.base
                         </Import-Package>