Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

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>
@@ -61,5 +64,5 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    
+
 </project>

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;
+    @ApiModelProperty(name = "name", value = "Name of the configuration", required = true)
-	private String contentType;
+    private String name;
-	private Object value;
 
-	public String getName() {
+    @ApiModelProperty(name = "contentType", value = "Type of the configuration", required = true)
-		return name;
+    private String contentType;
-	}
 
-	public void setName(String name) {
+    @ApiModelProperty(name = "value", value = "Value of the configuration", required = true)
-		this.name = name;
+    private Object value;
-	}
 
-	public String getContentType() {
+    public String getName() {
-		return contentType;
+        return name;
-	}
+    }
 
-	public void setContentType(String contentType) {
+    public void setName(String name) {
-		this.contentType = contentType;
+        this.name = name;
-	}
+    }
 
-	public Object getValue() {
+    public String getContentType() {
-		return value;
+        return contentType;
-	}
+    }
 
-	public void setValue(Object value) {
+    public void setContentType(String contentType) {
-		this.value = value;
+        this.contentType = contentType;
-	}
+    }
+
+    public Object getValue() {
+        return value;
+    }
+
+    public void setValue(Object value) {
+        this.value = value;
+    }
 }

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>