Browse Source

Validate more entities' fields

pull/4414/head
Viacheslav Klimov 6 years ago
committed by Andrew Shvayka
parent
commit
fdd126303a
  1. 4
      common/data/src/main/java/org/thingsboard/server/common/data/DashboardInfo.java
  2. 2
      common/data/src/main/java/org/thingsboard/server/common/data/ShortCustomerInfo.java
  3. 2
      common/data/src/main/java/org/thingsboard/server/common/data/TbResource.java
  4. 2
      common/data/src/main/java/org/thingsboard/server/common/data/TbResourceInfo.java
  5. 1
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileData.java
  6. 3
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/MqttDeviceProfileTransportConfiguration.java
  7. 4
      common/data/src/main/java/org/thingsboard/server/common/data/widget/BaseWidgetType.java
  8. 3
      common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeDetails.java
  9. 3
      common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeInfo.java
  10. 4
      common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetsBundle.java

4
common/data/src/main/java/org/thingsboard/server/common/data/DashboardInfo.java

@ -19,14 +19,18 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.CustomerId;
import org.thingsboard.server.common.data.id.DashboardId; import org.thingsboard.server.common.data.id.DashboardId;
import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.validation.NoXss;
import javax.validation.Valid;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
public class DashboardInfo extends SearchTextBased<DashboardId> implements HasName, HasTenantId { public class DashboardInfo extends SearchTextBased<DashboardId> implements HasName, HasTenantId {
private TenantId tenantId; private TenantId tenantId;
@NoXss
private String title; private String title;
@Valid
private Set<ShortCustomerInfo> assignedCustomers; private Set<ShortCustomerInfo> assignedCustomers;
public DashboardInfo() { public DashboardInfo() {

2
common/data/src/main/java/org/thingsboard/server/common/data/ShortCustomerInfo.java

@ -19,6 +19,7 @@ import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.CustomerId;
import org.thingsboard.server.common.data.validation.NoXss;
/** /**
* Created by igor on 2/27/18. * Created by igor on 2/27/18.
@ -31,6 +32,7 @@ public class ShortCustomerInfo {
private CustomerId customerId; private CustomerId customerId;
@Getter @Setter @Getter @Setter
@NoXss
private String title; private String title;
@Getter @Setter @Getter @Setter

2
common/data/src/main/java/org/thingsboard/server/common/data/TbResource.java

@ -19,6 +19,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.thingsboard.server.common.data.id.TbResourceId; import org.thingsboard.server.common.data.id.TbResourceId;
import org.thingsboard.server.common.data.validation.NoXss;
@Slf4j @Slf4j
@Data @Data
@ -27,6 +28,7 @@ public class TbResource extends TbResourceInfo {
private static final long serialVersionUID = 7379609705527272306L; private static final long serialVersionUID = 7379609705527272306L;
@NoXss
private String fileName; private String fileName;
private String data; private String data;

2
common/data/src/main/java/org/thingsboard/server/common/data/TbResourceInfo.java

@ -20,6 +20,7 @@ import lombok.EqualsAndHashCode;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.thingsboard.server.common.data.id.TbResourceId; import org.thingsboard.server.common.data.id.TbResourceId;
import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.validation.NoXss;
@Slf4j @Slf4j
@Data @Data
@ -27,6 +28,7 @@ import org.thingsboard.server.common.data.id.TenantId;
public class TbResourceInfo extends SearchTextBased<TbResourceId> implements HasTenantId { public class TbResourceInfo extends SearchTextBased<TbResourceId> implements HasTenantId {
private TenantId tenantId; private TenantId tenantId;
@NoXss
private String title; private String title;
private ResourceType resourceType; private ResourceType resourceType;
private String resourceKey; private String resourceKey;

1
common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileData.java

@ -25,6 +25,7 @@ import java.util.List;
public class DeviceProfileData implements Serializable { public class DeviceProfileData implements Serializable {
private DeviceProfileConfiguration configuration; private DeviceProfileConfiguration configuration;
@Valid
private DeviceProfileTransportConfiguration transportConfiguration; private DeviceProfileTransportConfiguration transportConfiguration;
private DeviceProfileProvisionConfiguration provisionConfiguration; private DeviceProfileProvisionConfiguration provisionConfiguration;
@Valid @Valid

3
common/data/src/main/java/org/thingsboard/server/common/data/device/profile/MqttDeviceProfileTransportConfiguration.java

@ -17,11 +17,14 @@ package org.thingsboard.server.common.data.device.profile;
import lombok.Data; import lombok.Data;
import org.thingsboard.server.common.data.DeviceTransportType; import org.thingsboard.server.common.data.DeviceTransportType;
import org.thingsboard.server.common.data.validation.NoXss;
@Data @Data
public class MqttDeviceProfileTransportConfiguration implements DeviceProfileTransportConfiguration { public class MqttDeviceProfileTransportConfiguration implements DeviceProfileTransportConfiguration {
@NoXss
private String deviceTelemetryTopic = MqttTopics.DEVICE_TELEMETRY_TOPIC; private String deviceTelemetryTopic = MqttTopics.DEVICE_TELEMETRY_TOPIC;
@NoXss
private String deviceAttributesTopic = MqttTopics.DEVICE_ATTRIBUTES_TOPIC; private String deviceAttributesTopic = MqttTopics.DEVICE_ATTRIBUTES_TOPIC;
private TransportPayloadTypeConfiguration transportPayloadTypeConfiguration; private TransportPayloadTypeConfiguration transportPayloadTypeConfiguration;

4
common/data/src/main/java/org/thingsboard/server/common/data/widget/BaseWidgetType.java

@ -20,6 +20,7 @@ import org.thingsboard.server.common.data.BaseData;
import org.thingsboard.server.common.data.HasTenantId; import org.thingsboard.server.common.data.HasTenantId;
import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.id.WidgetTypeId; import org.thingsboard.server.common.data.id.WidgetTypeId;
import org.thingsboard.server.common.data.validation.NoXss;
@Data @Data
public class BaseWidgetType extends BaseData<WidgetTypeId> implements HasTenantId { public class BaseWidgetType extends BaseData<WidgetTypeId> implements HasTenantId {
@ -27,8 +28,11 @@ public class BaseWidgetType extends BaseData<WidgetTypeId> implements HasTenantI
private static final long serialVersionUID = 8388684344603660756L; private static final long serialVersionUID = 8388684344603660756L;
private TenantId tenantId; private TenantId tenantId;
@NoXss
private String bundleAlias; private String bundleAlias;
@NoXss
private String alias; private String alias;
@NoXss
private String name; private String name;
public BaseWidgetType() { public BaseWidgetType() {

3
common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeDetails.java

@ -15,14 +15,15 @@
*/ */
package org.thingsboard.server.common.data.widget; package org.thingsboard.server.common.data.widget;
import com.fasterxml.jackson.databind.JsonNode;
import lombok.Data; import lombok.Data;
import org.thingsboard.server.common.data.id.WidgetTypeId; import org.thingsboard.server.common.data.id.WidgetTypeId;
import org.thingsboard.server.common.data.validation.NoXss;
@Data @Data
public class WidgetTypeDetails extends WidgetType { public class WidgetTypeDetails extends WidgetType {
private String image; private String image;
@NoXss
private String description; private String description;
public WidgetTypeDetails() { public WidgetTypeDetails() {

3
common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeInfo.java

@ -17,12 +17,15 @@ package org.thingsboard.server.common.data.widget;
import lombok.Data; import lombok.Data;
import org.thingsboard.server.common.data.id.WidgetTypeId; import org.thingsboard.server.common.data.id.WidgetTypeId;
import org.thingsboard.server.common.data.validation.NoXss;
@Data @Data
public class WidgetTypeInfo extends BaseWidgetType { public class WidgetTypeInfo extends BaseWidgetType {
private String image; private String image;
@NoXss
private String description; private String description;
@NoXss
private String widgetType; private String widgetType;
public WidgetTypeInfo() { public WidgetTypeInfo() {

4
common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetsBundle.java

@ -19,6 +19,7 @@ import org.thingsboard.server.common.data.HasTenantId;
import org.thingsboard.server.common.data.SearchTextBased; import org.thingsboard.server.common.data.SearchTextBased;
import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.id.WidgetsBundleId; import org.thingsboard.server.common.data.id.WidgetsBundleId;
import org.thingsboard.server.common.data.validation.NoXss;
import java.util.Arrays; import java.util.Arrays;
@ -27,9 +28,12 @@ public class WidgetsBundle extends SearchTextBased<WidgetsBundleId> implements H
private static final long serialVersionUID = -7627368878362410489L; private static final long serialVersionUID = -7627368878362410489L;
private TenantId tenantId; private TenantId tenantId;
@NoXss
private String alias; private String alias;
@NoXss
private String title; private String title;
private String image; private String image;
@NoXss
private String description; private String description;
public WidgetsBundle() { public WidgetsBundle() {

Loading…
Cancel
Save