fixed all allowableValues
This commit is contained in:
		
							parent
							
								
									87ed660fc9
								
							
						
					
					
						commit
						e10ba543a0
					
				@ -164,7 +164,7 @@ public class CustomerController extends BaseController {
 | 
				
			|||||||
            @RequestParam int page,
 | 
					            @RequestParam int page,
 | 
				
			||||||
            @Parameter(description = CUSTOMER_TEXT_SEARCH_DESCRIPTION)
 | 
					            @Parameter(description = CUSTOMER_TEXT_SEARCH_DESCRIPTION)
 | 
				
			||||||
            @RequestParam(required = false) String textSearch,
 | 
					            @RequestParam(required = false) String textSearch,
 | 
				
			||||||
            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "title", "email", "country, city"}))
 | 
					            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "title", "email", "country", "city"}))
 | 
				
			||||||
            @RequestParam(required = false) String sortProperty,
 | 
					            @RequestParam(required = false) String sortProperty,
 | 
				
			||||||
            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
 | 
					            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
 | 
				
			||||||
            @RequestParam(required = false) String sortOrder) throws ThingsboardException {
 | 
					            @RequestParam(required = false) String sortOrder) throws ThingsboardException {
 | 
				
			||||||
 | 
				
			|||||||
@ -229,7 +229,7 @@ public class EntityViewController extends BaseController {
 | 
				
			|||||||
            @RequestParam(required = false) String type,
 | 
					            @RequestParam(required = false) String type,
 | 
				
			||||||
            @Parameter(description = ENTITY_VIEW_TEXT_SEARCH_DESCRIPTION)
 | 
					            @Parameter(description = ENTITY_VIEW_TEXT_SEARCH_DESCRIPTION)
 | 
				
			||||||
            @RequestParam(required = false) String textSearch,
 | 
					            @RequestParam(required = false) String textSearch,
 | 
				
			||||||
            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name, type"}))
 | 
					            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type"}))
 | 
				
			||||||
            @RequestParam(required = false) String sortProperty,
 | 
					            @RequestParam(required = false) String sortProperty,
 | 
				
			||||||
            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
 | 
					            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
 | 
				
			||||||
            @RequestParam(required = false) String sortOrder) throws ThingsboardException {
 | 
					            @RequestParam(required = false) String sortOrder) throws ThingsboardException {
 | 
				
			||||||
@ -293,7 +293,7 @@ public class EntityViewController extends BaseController {
 | 
				
			|||||||
            @RequestParam(required = false) String type,
 | 
					            @RequestParam(required = false) String type,
 | 
				
			||||||
            @Parameter(description = ENTITY_VIEW_TEXT_SEARCH_DESCRIPTION)
 | 
					            @Parameter(description = ENTITY_VIEW_TEXT_SEARCH_DESCRIPTION)
 | 
				
			||||||
            @RequestParam(required = false) String textSearch,
 | 
					            @RequestParam(required = false) String textSearch,
 | 
				
			||||||
            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name, type"}))
 | 
					            @Parameter(description = SORT_PROPERTY_DESCRIPTION, schema = @Schema(allowableValues = {"createdTime", "name", "type"}))
 | 
				
			||||||
            @RequestParam(required = false) String sortProperty,
 | 
					            @RequestParam(required = false) String sortProperty,
 | 
				
			||||||
            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
 | 
					            @Parameter(description = SORT_ORDER_DESCRIPTION, schema = @Schema(allowableValues = {"ASC", "DESC"}))
 | 
				
			||||||
            @RequestParam(required = false) String sortOrder) throws ThingsboardException {
 | 
					            @RequestParam(required = false) String sortOrder) throws ThingsboardException {
 | 
				
			||||||
 | 
				
			|||||||
@ -106,8 +106,6 @@ public class NotificationController extends BaseController {
 | 
				
			|||||||
    private final NotificationCenter notificationCenter;
 | 
					    private final NotificationCenter notificationCenter;
 | 
				
			||||||
    private final NotificationSettingsService notificationSettingsService;
 | 
					    private final NotificationSettingsService notificationSettingsService;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    private static final String DELIVERY_METHOD_ALLOWABLE_VALUES = "WEB,MOBILE_APP";
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    @ApiOperation(value = "Get notifications (getNotifications)",
 | 
					    @ApiOperation(value = "Get notifications (getNotifications)",
 | 
				
			||||||
            notes = "Returns the page of notifications for current user." + NEW_LINE +
 | 
					            notes = "Returns the page of notifications for current user." + NEW_LINE +
 | 
				
			||||||
                    PAGE_DATA_PARAMETERS +
 | 
					                    PAGE_DATA_PARAMETERS +
 | 
				
			||||||
@ -175,7 +173,7 @@ public class NotificationController extends BaseController {
 | 
				
			|||||||
                                                   @RequestParam(required = false) String sortOrder,
 | 
					                                                   @RequestParam(required = false) String sortOrder,
 | 
				
			||||||
                                                   @Parameter(description = "To search for unread notifications only")
 | 
					                                                   @Parameter(description = "To search for unread notifications only")
 | 
				
			||||||
                                                   @RequestParam(defaultValue = "false") boolean unreadOnly,
 | 
					                                                   @RequestParam(defaultValue = "false") boolean unreadOnly,
 | 
				
			||||||
                                                   @Parameter(description = "Delivery method", schema = @Schema(allowableValues = {DELIVERY_METHOD_ALLOWABLE_VALUES}))
 | 
					                                                   @Parameter(description = "Delivery method", schema = @Schema(allowableValues = {"WEB", "MOBILE_APP"}))
 | 
				
			||||||
                                                   @RequestParam(defaultValue = "WEB") NotificationDeliveryMethod deliveryMethod,
 | 
					                                                   @RequestParam(defaultValue = "WEB") NotificationDeliveryMethod deliveryMethod,
 | 
				
			||||||
                                                   @AuthenticationPrincipal SecurityUser user) throws ThingsboardException {
 | 
					                                                   @AuthenticationPrincipal SecurityUser user) throws ThingsboardException {
 | 
				
			||||||
        // no permissions
 | 
					        // no permissions
 | 
				
			||||||
@ -188,7 +186,7 @@ public class NotificationController extends BaseController {
 | 
				
			|||||||
                    AVAILABLE_FOR_ANY_AUTHORIZED_USER)
 | 
					                    AVAILABLE_FOR_ANY_AUTHORIZED_USER)
 | 
				
			||||||
    @GetMapping("/notifications/unread/count")
 | 
					    @GetMapping("/notifications/unread/count")
 | 
				
			||||||
    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
 | 
					    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
 | 
				
			||||||
    public Integer getUnreadNotificationsCount(@Parameter(description = "Delivery method", schema = @Schema(allowableValues = {DELIVERY_METHOD_ALLOWABLE_VALUES}))
 | 
					    public Integer getUnreadNotificationsCount(@Parameter(description = "Delivery method", schema = @Schema(allowableValues = {"WEB", "MOBILE_APP"}))
 | 
				
			||||||
                                               @RequestParam(defaultValue = "MOBILE_APP") NotificationDeliveryMethod deliveryMethod,
 | 
					                                               @RequestParam(defaultValue = "MOBILE_APP") NotificationDeliveryMethod deliveryMethod,
 | 
				
			||||||
                                               @AuthenticationPrincipal SecurityUser user) {
 | 
					                                               @AuthenticationPrincipal SecurityUser user) {
 | 
				
			||||||
        return notificationService.countUnreadNotificationsByRecipientId(user.getTenantId(), deliveryMethod, user.getId());
 | 
					        return notificationService.countUnreadNotificationsByRecipientId(user.getTenantId(), deliveryMethod, user.getId());
 | 
				
			||||||
@ -211,7 +209,7 @@ public class NotificationController extends BaseController {
 | 
				
			|||||||
                    AVAILABLE_FOR_ANY_AUTHORIZED_USER)
 | 
					                    AVAILABLE_FOR_ANY_AUTHORIZED_USER)
 | 
				
			||||||
    @PutMapping("/notifications/read")
 | 
					    @PutMapping("/notifications/read")
 | 
				
			||||||
    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
 | 
					    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
 | 
				
			||||||
    public void markAllNotificationsAsRead(@Parameter(description = "Delivery method", schema = @Schema(allowableValues = {DELIVERY_METHOD_ALLOWABLE_VALUES}))
 | 
					    public void markAllNotificationsAsRead(@Parameter(description = "Delivery method", schema = @Schema(allowableValues = {"WEB", "MOBILE_APP"}))
 | 
				
			||||||
                                           @RequestParam(defaultValue = "WEB") NotificationDeliveryMethod deliveryMethod,
 | 
					                                           @RequestParam(defaultValue = "WEB") NotificationDeliveryMethod deliveryMethod,
 | 
				
			||||||
                                           @AuthenticationPrincipal SecurityUser user) {
 | 
					                                           @AuthenticationPrincipal SecurityUser user) {
 | 
				
			||||||
        // no permissions
 | 
					        // no permissions
 | 
				
			||||||
 | 
				
			|||||||
@ -49,7 +49,7 @@ public class AuditLog extends BaseData<AuditLogId> {
 | 
				
			|||||||
    private ActionType actionType;
 | 
					    private ActionType actionType;
 | 
				
			||||||
    @Schema(description = "JsonNode represented action data", accessMode = Schema.AccessMode.READ_ONLY)
 | 
					    @Schema(description = "JsonNode represented action data", accessMode = Schema.AccessMode.READ_ONLY)
 | 
				
			||||||
    private JsonNode actionData;
 | 
					    private JsonNode actionData;
 | 
				
			||||||
    @Schema(description = "String represented Action status", example = "SUCCESS", allowableValues = "SUCCESS,FAILURE", accessMode = Schema.AccessMode.READ_ONLY)
 | 
					    @Schema(description = "String represented Action status", example = "SUCCESS", allowableValues = {"SUCCESS", "FAILURE"}, accessMode = Schema.AccessMode.READ_ONLY)
 | 
				
			||||||
    private ActionStatus actionStatus;
 | 
					    private ActionStatus actionStatus;
 | 
				
			||||||
    @Schema(description = "Failure action details info. An empty string in case of action status type 'SUCCESS', otherwise includes stack trace of the caused exception.", accessMode = Schema.AccessMode.READ_ONLY)
 | 
					    @Schema(description = "Failure action details info. An empty string in case of action status type 'SUCCESS', otherwise includes stack trace of the caused exception.", accessMode = Schema.AccessMode.READ_ONLY)
 | 
				
			||||||
    private String actionFailureDetails;
 | 
					    private String actionFailureDetails;
 | 
				
			||||||
 | 
				
			|||||||
@ -25,7 +25,7 @@ public abstract class DebugEventFilter implements EventFilter {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    @Schema(description = "String value representing the server name, identifier or ip address where the platform is running", example = "ip-172-31-24-152")
 | 
					    @Schema(description = "String value representing the server name, identifier or ip address where the platform is running", example = "ip-172-31-24-152")
 | 
				
			||||||
    protected String server;
 | 
					    protected String server;
 | 
				
			||||||
    @Schema(description = "Boolean value to filter the errors", allowableValues = "false, true")
 | 
					    @Schema(description = "Boolean value to filter the errors", allowableValues = {"false", "true"})
 | 
				
			||||||
    protected boolean isError;
 | 
					    protected boolean isError;
 | 
				
			||||||
    @Schema(description = "The case insensitive 'contains' filter based on error message", example = "not present in the DB")
 | 
					    @Schema(description = "The case insensitive 'contains' filter based on error message", example = "not present in the DB")
 | 
				
			||||||
    protected String errorStr;
 | 
					    protected String errorStr;
 | 
				
			||||||
 | 
				
			|||||||
@ -27,7 +27,7 @@ public class LifeCycleEventFilter implements EventFilter {
 | 
				
			|||||||
    protected String server;
 | 
					    protected String server;
 | 
				
			||||||
    @Schema(description = "String value representing the lifecycle event type", example = "STARTED")
 | 
					    @Schema(description = "String value representing the lifecycle event type", example = "STARTED")
 | 
				
			||||||
    protected String event;
 | 
					    protected String event;
 | 
				
			||||||
    @Schema(description = "String value representing status of the lifecycle event", allowableValues = "Success, Failure")
 | 
					    @Schema(description = "String value representing status of the lifecycle event", allowableValues = {"Success", "Failure"})
 | 
				
			||||||
    protected String status;
 | 
					    protected String status;
 | 
				
			||||||
    @Schema(description = "The case insensitive 'contains' filter based on error message", example = "not present in the DB")
 | 
					    @Schema(description = "The case insensitive 'contains' filter based on error message", example = "not present in the DB")
 | 
				
			||||||
    protected String errorStr;
 | 
					    protected String errorStr;
 | 
				
			||||||
 | 
				
			|||||||
@ -25,7 +25,7 @@ import org.thingsboard.server.common.data.StringUtils;
 | 
				
			|||||||
@Schema
 | 
					@Schema
 | 
				
			||||||
public class RuleNodeDebugEventFilter extends DebugEventFilter {
 | 
					public class RuleNodeDebugEventFilter extends DebugEventFilter {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Schema(description = "String value representing msg direction type (incoming to entity or outcoming from entity)", allowableValues = "IN, OUT")
 | 
					    @Schema(description = "String value representing msg direction type (incoming to entity or outcoming from entity)", allowableValues = {"IN", "OUT"})
 | 
				
			||||||
    protected String msgDirectionType;
 | 
					    protected String msgDirectionType;
 | 
				
			||||||
    @Schema(description = "String value representing the entity id in the event body (originator of the message)", example = "de9d54a0-2b7a-11ec-a3cc-23386423d98f")
 | 
					    @Schema(description = "String value representing the entity id in the event body (originator of the message)", example = "de9d54a0-2b7a-11ec-a3cc-23386423d98f")
 | 
				
			||||||
    protected String entityId;
 | 
					    protected String entityId;
 | 
				
			||||||
 | 
				
			|||||||
@ -39,7 +39,7 @@ public class ComponentDescriptor extends BaseData<ComponentDescriptorId> {
 | 
				
			|||||||
    @Getter @Setter private ComponentType type;
 | 
					    @Getter @Setter private ComponentType type;
 | 
				
			||||||
    @Schema(description = "Scope of the Rule Node. Always set to 'TENANT', since no rule chains on the 'SYSTEM' level yet.", accessMode = Schema.AccessMode.READ_ONLY, allowableValues = "TENANT", example = "TENANT")
 | 
					    @Schema(description = "Scope of the Rule Node. Always set to 'TENANT', since no rule chains on the 'SYSTEM' level yet.", accessMode = Schema.AccessMode.READ_ONLY, allowableValues = "TENANT", example = "TENANT")
 | 
				
			||||||
    @Getter @Setter private ComponentScope scope;
 | 
					    @Getter @Setter private ComponentScope scope;
 | 
				
			||||||
    @Schema(description = "Clustering mode of the RuleNode. This mode represents the ability to start Rule Node in multiple microservices.", accessMode = Schema.AccessMode.READ_ONLY, allowableValues = "USER_PREFERENCE, ENABLED, SINGLETON", example = "ENABLED")
 | 
					    @Schema(description = "Clustering mode of the RuleNode. This mode represents the ability to start Rule Node in multiple microservices.", accessMode = Schema.AccessMode.READ_ONLY, allowableValues = {"USER_PREFERENCE", "ENABLED", "SINGLETON"}, example = "ENABLED")
 | 
				
			||||||
    @Getter @Setter private ComponentClusteringMode clusteringMode;
 | 
					    @Getter @Setter private ComponentClusteringMode clusteringMode;
 | 
				
			||||||
    @Length(fieldName = "name")
 | 
					    @Length(fieldName = "name")
 | 
				
			||||||
    @Schema(description = "Name of the Rule Node. Taken from the @RuleNode annotation.", accessMode = Schema.AccessMode.READ_ONLY, example = "Custom Rule Node")
 | 
					    @Schema(description = "Name of the Rule Node. Taken from the @RuleNode annotation.", accessMode = Schema.AccessMode.READ_ONLY, example = "Custom Rule Node")
 | 
				
			||||||
 | 
				
			|||||||
@ -70,7 +70,7 @@ public class DeviceCredentials extends BaseData<DeviceCredentialsId> implements
 | 
				
			|||||||
        this.deviceId = deviceId;
 | 
					        this.deviceId = deviceId;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Schema(description = "Type of the credentials", allowableValues ="ACCESS_TOKEN, X509_CERTIFICATE, MQTT_BASIC, LWM2M_CREDENTIALS")
 | 
					    @Schema(description = "Type of the credentials", allowableValues = {"ACCESS_TOKEN", "X509_CERTIFICATE", "MQTT_BASIC", "LWM2M_CREDENTIALS"})
 | 
				
			||||||
    @Override
 | 
					    @Override
 | 
				
			||||||
    public DeviceCredentialsType getCredentialsType() {
 | 
					    public DeviceCredentialsType getCredentialsType() {
 | 
				
			||||||
        return credentialsType;
 | 
					        return credentialsType;
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user