Merge remote-tracking branch 'upstream/feature/swagger' into feature/swagger

application/src/main/java/org/thingsboard/server/controller/AdminController.java

@@ -16,6 +16,8 @@
 package org.thingsboard.server.controller;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -44,6 +46,7 @@ import org.thingsboard.server.service.update.UpdateService;
 @RequestMapping("/api/admin")
 public class AdminController extends BaseController {
 
+    public static final String SYS_ADMIN_AUTHORITY_ONLY = " Available for users with System Administrator ('SYS_ADMIN') authority only.";
     @Autowired
     private MailService mailService;
 
@@ -59,10 +62,14 @@ public class AdminController extends BaseController {
     @Autowired
     private UpdateService updateService;
 
+    @ApiOperation(value = "Get the Administration Settings object using key (getAdminSettings)",
+            notes = "Get the Administration Settings object using specified string key. Referencing non-existing key will cause an error." + SYS_ADMIN_AUTHORITY_ONLY)
     @PreAuthorize("hasAuthority('SYS_ADMIN')")
     @RequestMapping(value = "/settings/{key}", method = RequestMethod.GET)
     @ResponseBody
-    public AdminSettings getAdminSettings(@PathVariable("key") String key) throws ThingsboardException {
+    public AdminSettings getAdminSettings(
+            @ApiParam(value = "A string value of the key (e.g. 'general' or 'mail').")
+            @PathVariable("key") String key) throws ThingsboardException {
         try {
             accessControlService.checkPermission(getCurrentUser(), Resource.ADMIN_SETTINGS, Operation.READ);
             AdminSettings adminSettings = checkNotNull(adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, key));
@@ -75,10 +82,17 @@ public class AdminController extends BaseController {
         }
     }
 
+
+    @ApiOperation(value = "Get the Administration Settings object using key (getAdminSettings)",
+            notes = "Creates or Updates the Administration Settings. Platform generates random Administration Settings Id during settings creation. " +
+                    "The Administration Settings Id will be present in the response. Specify the Administration Settings Id when you would like to update the Administration Settings. " +
+                    "Referencing non-existing Administration Settings Id will cause an error." + SYS_ADMIN_AUTHORITY_ONLY)
     @PreAuthorize("hasAuthority('SYS_ADMIN')")
     @RequestMapping(value = "/settings", method = RequestMethod.POST)
     @ResponseBody
-    public AdminSettings saveAdminSettings(@RequestBody AdminSettings adminSettings) throws ThingsboardException {
+    public AdminSettings saveAdminSettings(
+            @ApiParam(value = "A JSON value representing the Administration Settings.")
+            @RequestBody AdminSettings adminSettings) throws ThingsboardException {
         try {
             accessControlService.checkPermission(getCurrentUser(), Resource.ADMIN_SETTINGS, Operation.WRITE);
             adminSettings = checkNotNull(adminSettingsService.saveAdminSettings(TenantId.SYS_TENANT_ID, adminSettings));
@@ -94,6 +108,8 @@ public class AdminController extends BaseController {
         }
     }
 
+    @ApiOperation(value = "Get the Security Settings object",
+            notes = "Get the Security Settings object that contains password policy, etc." + SYS_ADMIN_AUTHORITY_ONLY)
     @PreAuthorize("hasAuthority('SYS_ADMIN')")
     @RequestMapping(value = "/securitySettings", method = RequestMethod.GET)
     @ResponseBody
@@ -106,10 +122,14 @@ public class AdminController extends BaseController {
         }
     }
 
+    @ApiOperation(value = "Update Security Settings (saveSecuritySettings)",
+            notes = "Updates the Security Settings object that contains password policy, etc." + SYS_ADMIN_AUTHORITY_ONLY)
     @PreAuthorize("hasAuthority('SYS_ADMIN')")
     @RequestMapping(value = "/securitySettings", method = RequestMethod.POST)
     @ResponseBody
-    public SecuritySettings saveSecuritySettings(@RequestBody SecuritySettings securitySettings) throws ThingsboardException {
+    public SecuritySettings saveSecuritySettings(
+            @ApiParam(value = "A JSON value representing the Security Settings.")
+            @RequestBody SecuritySettings securitySettings) throws ThingsboardException {
         try {
             accessControlService.checkPermission(getCurrentUser(), Resource.ADMIN_SETTINGS, Operation.WRITE);
             securitySettings = checkNotNull(systemSecurityService.saveSecuritySettings(TenantId.SYS_TENANT_ID, securitySettings));
@@ -119,14 +139,19 @@ public class AdminController extends BaseController {
         }
     }
 
+    @ApiOperation(value = "Send test email (sendTestMail)",
+            notes = "Attempts to send test email to the System Administrator User using Mail Settings provided as a parameter. " +
+                    "You may change the 'To' email in the user profile of the System Administrator. " + SYS_ADMIN_AUTHORITY_ONLY)
     @PreAuthorize("hasAuthority('SYS_ADMIN')")
     @RequestMapping(value = "/settings/testMail", method = RequestMethod.POST)
-    public void sendTestMail(@RequestBody AdminSettings adminSettings) throws ThingsboardException {
+    public void sendTestMail(
+            @ApiParam(value = "A JSON value representing the Mail Settings.")
+            @RequestBody AdminSettings adminSettings) throws ThingsboardException {
         try {
             accessControlService.checkPermission(getCurrentUser(), Resource.ADMIN_SETTINGS, Operation.READ);
             adminSettings = checkNotNull(adminSettings);
             if (adminSettings.getKey().equals("mail")) {
-                if(!adminSettings.getJsonValue().has("password")) {
+                if (!adminSettings.getJsonValue().has("password")) {
                     AdminSettings mailSettings = checkNotNull(adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, "mail"));
                     ((ObjectNode) adminSettings.getJsonValue()).put("password", mailSettings.getJsonValue().get("password").asText());
                 }
@@ -138,9 +163,14 @@ public class AdminController extends BaseController {
         }
     }
 
+    @ApiOperation(value = "Send test sms (sendTestMail)",
+            notes = "Attempts to send test sms to the System Administrator User using SMS Settings and phone number provided as a parameters of the request. "
+                    + SYS_ADMIN_AUTHORITY_ONLY)
     @PreAuthorize("hasAuthority('SYS_ADMIN')")
     @RequestMapping(value = "/settings/testSms", method = RequestMethod.POST)
-    public void sendTestSms(@RequestBody TestSmsRequest testSmsRequest) throws ThingsboardException {
+    public void sendTestSms(
+            @ApiParam(value = "A JSON value representing the Test SMS request.")
+            @RequestBody TestSmsRequest testSmsRequest) throws ThingsboardException {
         try {
             accessControlService.checkPermission(getCurrentUser(), Resource.ADMIN_SETTINGS, Operation.READ);
             smsService.sendTestSms(testSmsRequest);
@@ -149,6 +179,9 @@ public class AdminController extends BaseController {
         }
     }
 
+    @ApiOperation(value = "Check for new Platform Releases (checkUpdates)",
+            notes = "Check notifications about new platform releases. "
+                    + SYS_ADMIN_AUTHORITY_ONLY)
     @PreAuthorize("hasAuthority('SYS_ADMIN')")
     @RequestMapping(value = "/updates", method = RequestMethod.GET)
     @ResponseBody

application/src/main/java/org/thingsboard/server/controller/BaseController.java

@@ -166,13 +166,13 @@ public abstract class BaseController {
     protected final String PAGE_SIZE_DESCRIPTION = "Maximum amount of entities in a one page";
     protected final String PAGE_NUMBER_DESCRIPTION = "Sequence number of page starting from 0";
     protected final String DEVICE_TYPE_DESCRIPTION = "Device type as the name of the device profile";
-    protected final String DEVICE_TEXT_SEARCH_DESCRIPTION = "The search is performed by device special field 'textSearch' represented by device name";
+    protected final String DEVICE_TEXT_SEARCH_DESCRIPTION = "The case insensitive 'startsWith' filter based on the device name.";
+    protected final String CUSTOMER_TEXT_SEARCH_DESCRIPTION = "The case insensitive 'startsWith' filter based on the customer name.";
     protected final String SORT_PROPERTY_DESCRIPTION = "Property of device to sort by";
     protected final String SORT_PROPERTY_ALLOWABLE_VALUES = "createdTime, name, label, type";
     protected final String SORT_ORDER_DESCRIPTION = "Sort order. ASC (ASCENDING) or DESCENDING (DESC)";
     protected final String SORT_ORDER_ALLOWABLE_VALUES = "ASC, DESC";
-    protected final String DEVICE_INFO_DESCRIPTION = "Device Info is an object which are an extension of default Device object. " +
-            "Apart from Device object, Device Info provides additional information such as customer name and device profile name. ";
+    protected final String DEVICE_INFO_DESCRIPTION = "Device Info is an extension of the default Device object that contains information about the assigned customer name and device profile name. ";
 
 
 

application/src/main/java/org/thingsboard/server/controller/CustomerController.java

@@ -18,6 +18,8 @@ package org.thingsboard.server.controller;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -52,16 +54,22 @@ public class CustomerController extends BaseController {
 
     public static final String CUSTOMER_ID = "customerId";
     public static final String IS_PUBLIC = "isPublic";
+    public static final String CUSTOMER_SECURITY_CHECK = "If the user has the authority of 'Tenant Administrator', the server checks that the customer is owned by the same tenant. " +
+            "If the user has the authority of 'Customer User', the server checks that the user belongs to the customer.";
 
+    @ApiOperation(value = "Get Customer (getCustomerById)",
+            notes = "Get the Customer object based on the provided Customer Id. " + CUSTOMER_SECURITY_CHECK)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/customer/{customerId}", method = RequestMethod.GET)
     @ResponseBody
-    public Customer getCustomerById(@PathVariable(CUSTOMER_ID) String strCustomerId) throws ThingsboardException {
+    public Customer getCustomerById(
+            @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+            @PathVariable(CUSTOMER_ID) String strCustomerId) throws ThingsboardException {
         checkParameter(CUSTOMER_ID, strCustomerId);
         try {
             CustomerId customerId = new CustomerId(toUUID(strCustomerId));
             Customer customer = checkCustomerId(customerId, Operation.READ);
-            if(!customer.getAdditionalInfo().isNull()) {
+            if (!customer.getAdditionalInfo().isNull()) {
                 processDashboardIdFromAdditionalInfo((ObjectNode) customer.getAdditionalInfo(), HOME_DASHBOARD);
             }
             return customer;
@@ -70,10 +78,15 @@ public class CustomerController extends BaseController {
         }
     }
 
+
+    @ApiOperation(value = "Get short Customer info (getShortCustomerInfoById)",
+            notes = "Get the short customer object that contains only the title and 'isPublic' flag. " + CUSTOMER_SECURITY_CHECK)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/customer/{customerId}/shortInfo", method = RequestMethod.GET)
     @ResponseBody
-    public JsonNode getShortCustomerInfoById(@PathVariable(CUSTOMER_ID) String strCustomerId) throws ThingsboardException {
+    public JsonNode getShortCustomerInfoById(
+            @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+            @PathVariable(CUSTOMER_ID) String strCustomerId) throws ThingsboardException {
         checkParameter(CUSTOMER_ID, strCustomerId);
         try {
             CustomerId customerId = new CustomerId(toUUID(strCustomerId));
@@ -88,10 +101,14 @@ public class CustomerController extends BaseController {
         }
     }
 
+    @ApiOperation(value = "Get Customer Title (getCustomerTitleById)",
+            notes = "Get the title of the customer. " + CUSTOMER_SECURITY_CHECK)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/customer/{customerId}/title", method = RequestMethod.GET, produces = "application/text")
     @ResponseBody
-    public String getCustomerTitleById(@PathVariable(CUSTOMER_ID) String strCustomerId) throws ThingsboardException {
+    public String getCustomerTitleById(
+            @ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+            @PathVariable(CUSTOMER_ID) String strCustomerId) throws ThingsboardException {
         checkParameter(CUSTOMER_ID, strCustomerId);
         try {
             CustomerId customerId = new CustomerId(toUUID(strCustomerId));
@@ -102,10 +119,14 @@ public class CustomerController extends BaseController {
         }
     }
 
+    @ApiOperation(value = "Create or update Customer (saveCustomer)",
+            notes = "Creates or Updates the Customer. Platform generates random Customer Id during device creation. " +
+                    "The Customer Id will be present in the response. Specify the Customer Id when you would like to update the Customer. " +
+                    "Referencing non-existing Customer Id will cause an error.")
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/customer", method = RequestMethod.POST)
     @ResponseBody
-    public Customer saveCustomer(@RequestBody Customer customer) throws ThingsboardException {
+    public Customer saveCustomer(@ApiParam(value = "A JSON value representing the customer.") @RequestBody Customer customer) throws ThingsboardException {
         try {
             customer.setTenantId(getCurrentUser().getTenantId());
 
@@ -131,10 +152,13 @@ public class CustomerController extends BaseController {
         }
     }
 
+    @ApiOperation(value = "Delete Customer (deleteCustomer)",
+            notes = "Deletes the Customer and all customer Users. All assigned Dashboards, Assets, Devices, etc. will be unassigned but not deleted. Referencing non-existing Customer Id will cause an error.")
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/customer/{customerId}", method = RequestMethod.DELETE)
     @ResponseStatus(value = HttpStatus.OK)
-    public void deleteCustomer(@PathVariable(CUSTOMER_ID) String strCustomerId) throws ThingsboardException {
+    public void deleteCustomer(@ApiParam(value = CUSTOMER_ID_PARAM_DESCRIPTION)
+                               @PathVariable(CUSTOMER_ID) String strCustomerId) throws ThingsboardException {
         checkParameter(CUSTOMER_ID, strCustomerId);
         try {
             CustomerId customerId = new CustomerId(toUUID(strCustomerId));
@@ -161,14 +185,23 @@ public class CustomerController extends BaseController {
         }
     }
 
+    @ApiOperation(value = "Get Tenant Customers (getCustomers)",
+            notes = "Returns a page of customers owned by tenant. " +
+                    PAGE_DATA_PARAMETERS)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/customers", params = {"pageSize", "page"}, method = RequestMethod.GET)
     @ResponseBody
-    public PageData<Customer> getCustomers(@RequestParam int pageSize,
-                                           @RequestParam int page,
-                                           @RequestParam(required = false) String textSearch,
-                                           @RequestParam(required = false) String sortProperty,
-                                           @RequestParam(required = false) String sortOrder) throws ThingsboardException {
+    public PageData<Customer> getCustomers(
+            @ApiParam(value = PAGE_SIZE_DESCRIPTION)
+            @RequestParam int pageSize,
+            @ApiParam(value = PAGE_NUMBER_DESCRIPTION)
+            @RequestParam int page,
+            @ApiParam(value = CUSTOMER_TEXT_SEARCH_DESCRIPTION)
+            @RequestParam(required = false) String textSearch,
+            @ApiParam(value = SORT_PROPERTY_DESCRIPTION, allowableValues = SORT_PROPERTY_ALLOWABLE_VALUES)
+            @RequestParam(required = false) String sortProperty,
+            @ApiParam(value = SORT_ORDER_DESCRIPTION, allowableValues = SORT_ORDER_ALLOWABLE_VALUES)
+            @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         try {
             PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
             TenantId tenantId = getCurrentUser().getTenantId();
@@ -178,10 +211,13 @@ public class CustomerController extends BaseController {
         }
     }
 
+    @ApiOperation(value = "Get Tenant Customer by Customer title (getTenantCustomer)",
+            notes = "Get the Customer using Customer Title. Available for users with 'Tenant Administrator' authority only.")
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/tenant/customers", params = {"customerTitle"}, method = RequestMethod.GET)
     @ResponseBody
     public Customer getTenantCustomer(
+            @ApiParam(value = "A string value representing the Customer title.")
             @RequestParam String customerTitle) throws ThingsboardException {
         try {
             TenantId tenantId = getCurrentUser().getTenantId();

application/src/main/java/org/thingsboard/server/controller/DeviceController.java

@@ -101,7 +101,9 @@ public class DeviceController extends BaseController {
     private final DeviceBulkImportService deviceBulkImportService;
 
     @ApiOperation(value = "Get Device (getDeviceById)",
-            notes = "If device with given Id exists in the system it will be present in the response, otherwise an empty object will be provided")
+            notes = "Fetch the Device object based on the provided Device Id. " +
+                    "If the user has the authority of 'Tenant Administrator', the server checks that the device is owned by the same tenant. " +
+                    "If the user has the authority of 'Customer User', the server checks that the device is assigned to the same customer.")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/device/{deviceId}", method = RequestMethod.GET)
     @ResponseBody
@@ -116,7 +118,10 @@ public class DeviceController extends BaseController {
         }
     }
 
-    @ApiOperation(value = "Get Device Info (getDeviceInfoById)", notes = DEVICE_INFO_DESCRIPTION)
+    @ApiOperation(value = "Get Device Info (getDeviceInfoById)",
+            notes = "Fetch the Device Info object based on the provided Device Id. " +
+            "If the user has the authority of 'Tenant Administrator', the server checks that the device is owned by the same tenant. " +
+            "If the user has the authority of 'Customer User', the server checks that the device is assigned to the same customer. " + DEVICE_INFO_DESCRIPTION)
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/device/info/{deviceId}", method = RequestMethod.GET)
     @ResponseBody
@@ -131,7 +136,8 @@ public class DeviceController extends BaseController {
         }
     }
 
-    @ApiOperation(value = "Create Or Update Device (saveDevice)", notes = "Platform generates random device Id and credentials (access token) during device creation. " +
+    @ApiOperation(value = "Create Or Update Device (saveDevice)",
+            notes = "Creates or Updates the Device. Platform generates random device Id and credentials (access token) during device creation. " +
             "The device id will be present in the response. " +
             "Specify the device id when you would like to update the device. Referencing non-existing device Id will cause an error.")
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
@@ -177,7 +183,7 @@ public class DeviceController extends BaseController {
     }
 
     @ApiOperation(value = "Delete device (deleteDevice)",
-            notes = "Referencing non-existing device Id will cause an error.")
+            notes = "Deletes the device and it's credentials. Referencing non-existing device Id will cause an error.")
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")
     @RequestMapping(value = "/device/{deviceId}", method = RequestMethod.DELETE)
     @ResponseStatus(value = HttpStatus.OK)
@@ -361,7 +367,7 @@ public class DeviceController extends BaseController {
         }
     }
 
-    @ApiOperation(value = "Get Tenant Devices (getEdgeDevices)",
+    @ApiOperation(value = "Get Tenant Devices (getTenantDevices)",
             notes = "Returns a page of devices owned by tenant. " +
                     PAGE_DATA_PARAMETERS)
     @PreAuthorize("hasAuthority('TENANT_ADMIN')")

common/data/src/main/java/org/thingsboard/server/common/data/AdminSettings.java

@@ -15,11 +15,15 @@
  */
 package org.thingsboard.server.common.data;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import org.thingsboard.server.common.data.id.AdminSettingsId;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.validation.NoXss;
 
+@ApiModel
 public class AdminSettings extends BaseData<AdminSettingsId> {
 
     private static final long serialVersionUID = -7670322981725511892L;
@@ -42,6 +46,19 @@ public class AdminSettings extends BaseData<AdminSettingsId> {
         this.jsonValue = adminSettings.getJsonValue();
     }
 
+    @ApiModelProperty(position = 1, value = "The Id of the Administration Settings, auto-generated, UUID")
+    @Override
+    public AdminSettingsId getId() {
+        return super.getId();
+    }
+
+    @ApiModelProperty(position = 2, value = "Timestamp of the settings creation, in milliseconds", example = "1609459200000", readOnly = true)
+    @Override
+    public long getCreatedTime() {
+        return super.getCreatedTime();
+    }
+
+    @ApiModelProperty(position = 3, value = "The Administration Settings key, (e.g. 'general' or 'mail')")
     public String getKey() {
         return key;
     }
@@ -50,6 +67,7 @@ public class AdminSettings extends BaseData<AdminSettingsId> {
         this.key = key;
     }
 
+    @ApiModelProperty(position = 4, value = "JSON representation of the Administration Settings value")
     public JsonNode getJsonValue() {
         return jsonValue;
     }

common/data/src/main/java/org/thingsboard/server/common/data/UpdateMessage.java

@@ -15,12 +15,17 @@
  */
 package org.thingsboard.server.common.data;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+@ApiModel
 @Data
 public class UpdateMessage {
 
+    @ApiModelProperty(position = 1, value = "The message about new platform update available.")
     private final String message;
+    @ApiModelProperty(position = 1, value = "'True' if new platform update is available.")
     private final boolean isUpdateAvailable;
 
 }

common/data/src/main/java/org/thingsboard/server/common/data/security/model/SecuritySettings.java

@@ -15,15 +15,20 @@
  */
 package org.thingsboard.server.common.data.security.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 
+@ApiModel
 @Data
 public class SecuritySettings implements Serializable {
 
+    @ApiModelProperty(position = 1, value = "The user password policy object." )
     private UserPasswordPolicy passwordPolicy;
-
+    @ApiModelProperty(position = 2, value = "Maximum number of failed login attempts allowed before user account is locked." )
     private Integer maxFailedLoginAttempts;
+    @ApiModelProperty(position = 3, value = "Email to use for notifications about locked users." )
     private String userLockoutNotificationEmail;
 }

common/data/src/main/java/org/thingsboard/server/common/data/security/model/UserPasswordPolicy.java

@@ -15,20 +15,30 @@
  */
 package org.thingsboard.server.common.data.security.model;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 
+@ApiModel
 @Data
 public class UserPasswordPolicy implements Serializable {
 
+    @ApiModelProperty(position = 1, value = "Minimum number of symbols in the password." )
     private Integer minimumLength;
+    @ApiModelProperty(position = 1, value = "Minimum number of uppercase letters in the password." )
     private Integer minimumUppercaseLetters;
+    @ApiModelProperty(position = 1, value = "Minimum number of lowercase letters in the password." )
     private Integer minimumLowercaseLetters;
+    @ApiModelProperty(position = 1, value = "Minimum number of digits in the password." )
     private Integer minimumDigits;
+    @ApiModelProperty(position = 1, value = "Minimum number of special in the password." )
     private Integer minimumSpecialCharacters;
 
+    @ApiModelProperty(position = 1, value = "Password expiration period (days). Force expiration of the password." )
     private Integer passwordExpirationPeriodDays;
+    @ApiModelProperty(position = 1, value = "Password reuse frequency (days). Disallow to use the same password for the defined number of days" )
     private Integer passwordReuseFrequencyDays;
 
 }

common/data/src/main/java/org/thingsboard/server/common/data/sms/config/AwsSnsSmsProviderConfiguration.java

@@ -15,13 +15,19 @@
  */
 package org.thingsboard.server.common.data.sms.config;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+@ApiModel
 @Data
 public class AwsSnsSmsProviderConfiguration implements SmsProviderConfiguration {
 
+    @ApiModelProperty(position = 1, value = "The AWS SNS Access Key ID.")
     private String accessKeyId;
+    @ApiModelProperty(position = 2, value = "The AWS SNS Access Key.")
     private String secretAccessKey;
+    @ApiModelProperty(position = 3, value = "The AWS region.")
     private String region;
 
     @Override

common/data/src/main/java/org/thingsboard/server/common/data/sms/config/TestSmsRequest.java

@@ -15,13 +15,19 @@
  */
 package org.thingsboard.server.common.data.sms.config;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+@ApiModel
 @Data
 public class TestSmsRequest {
 
+    @ApiModelProperty(position = 1, value = "The SMS provider configuration")
     private SmsProviderConfiguration providerConfiguration;
+    @ApiModelProperty(position = 2, value = "The phone number or other identifier to specify as a recipient of the SMS.")
     private String numberTo;
+    @ApiModelProperty(position = 3, value = "The test message")
     private String message;
 
 }

common/data/src/main/java/org/thingsboard/server/common/data/sms/config/TwilioSmsProviderConfiguration.java

@@ -15,13 +15,19 @@
  */
 package org.thingsboard.server.common.data.sms.config;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+@ApiModel
 @Data
 public class TwilioSmsProviderConfiguration implements SmsProviderConfiguration {
 
+    @ApiModelProperty(position = 1, value = "Twilio account Sid.")
     private String accountSid;
+    @ApiModelProperty(position = 2, value = "Twilio account Token.")
     private String accountToken;
+    @ApiModelProperty(position = 3, value = "The number/id of a sender.")
     private String numberFrom;
 
     @Override