Browse Source

Merge pull request #15897 from zzzeebra/merge/lts-4.2-into-lts-4.3

Merged lts-4.2 deprecation-warning cleanups into lts-4.3
pull/15912/head
Viacheslav Klimov 3 months ago
committed by GitHub
parent
commit
7d8035b452
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 48
      application/src/test/java/org/thingsboard/server/controller/AlarmCommentControllerTest.java
  2. 10
      application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java
  3. 3
      application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java
  4. 10
      application/src/test/java/org/thingsboard/server/service/transport/DefaultTransportApiServiceTest.java
  5. 2
      common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
  6. 2
      common/data/src/main/java/org/thingsboard/server/common/data/EventInfo.java
  7. 2
      common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboard.java
  8. 2
      common/data/src/main/java/org/thingsboard/server/common/data/StringUtils.java
  9. 2
      common/data/src/main/java/org/thingsboard/server/common/data/TenantInfo.java
  10. 2
      common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java
  11. 2
      common/data/src/main/java/org/thingsboard/server/common/data/device/data/CoapDeviceTransportConfiguration.java
  12. 2
      common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java
  13. 2
      common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java
  14. 4
      common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeInfo.java
  15. 2
      common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetFields.java
  16. 2
      common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetProfileFields.java
  17. 2
      common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/CustomerFields.java
  18. 2
      common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DashboardFields.java
  19. 2
      common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceFields.java
  20. 2
      common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceProfileFields.java
  21. 2
      common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EdgeFields.java
  22. 2
      common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EntityViewFields.java
  23. 2
      common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/QueueStatsFields.java
  24. 2
      common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/RuleChainFields.java
  25. 2
      common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantFields.java
  26. 2
      common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantProfileFields.java
  27. 2
      common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/UserFields.java
  28. 2
      common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java
  29. 2
      common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmCountQuery.java
  30. 2
      common/data/src/main/java/org/thingsboard/server/common/data/queue/Queue.java
  31. 2
      common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNodeState.java
  32. 2
      common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeInfo.java
  33. 2
      common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/limits/GatewaySessionLimits.java
  34. 2
      dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestEntity.java
  35. 2
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeConfiguration.java
  36. 2
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeConfiguration.java
  37. 2
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java
  38. 2
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/AzureIotHubSasCredentials.java
  39. 2
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/TbAzureIotHubNodeConfiguration.java

48
application/src/test/java/org/thingsboard/server/controller/AlarmCommentControllerTest.java

@ -226,15 +226,13 @@ public class AlarmCommentControllerTest extends AbstractControllerTest {
doDelete("/api/alarm/" + alarm.getId() + "/comment/" + alarmComment.getId()) doDelete("/api/alarm/" + alarm.getId() + "/comment/" + alarmComment.getId())
.andExpect(status().isOk()); .andExpect(status().isOk());
AlarmComment expectedAlarmComment = AlarmComment.builder() alarmComment.setType(AlarmCommentType.SYSTEM);
.alarmId(alarm.getId()) alarmComment.setUserId(null);
.type(AlarmCommentType.SYSTEM) alarmComment.setComment(JacksonUtil.newObjectNode()
.comment(JacksonUtil.newObjectNode() .put("text", String.format(COMMENT_DELETED.getText(), CUSTOMER_USER_EMAIL))
.put("text", String.format(COMMENT_DELETED.getText(), CUSTOMER_USER_EMAIL)) .put("subtype", COMMENT_DELETED.name())
.put("subtype", COMMENT_DELETED.name()) .put("userName", CUSTOMER_USER_EMAIL));
.put("userName", CUSTOMER_USER_EMAIL)) testLogEntityActionEntityEqClass(alarm, alarm.getId(), tenantId, customerId, customerUserId, CUSTOMER_USER_EMAIL, ActionType.DELETED_COMMENT, 1, alarmComment);
.build();
testLogEntityActionEntityEqClass(alarm, alarm.getId(), tenantId, customerId, customerUserId, CUSTOMER_USER_EMAIL, ActionType.DELETED_COMMENT, 1, expectedAlarmComment);
} }
@Test @Test
@ -252,15 +250,13 @@ public class AlarmCommentControllerTest extends AbstractControllerTest {
loginTenantAdmin(); loginTenantAdmin();
doDelete("/api/alarm/" + alarm.getId() + "/comment/" + alarmComment.getId()) doDelete("/api/alarm/" + alarm.getId() + "/comment/" + alarmComment.getId())
.andExpect(status().isOk()); .andExpect(status().isOk());
AlarmComment expectedAlarmComment = AlarmComment.builder() alarmComment.setType(AlarmCommentType.SYSTEM);
.alarmId(alarm.getId()) alarmComment.setUserId(null);
.type(AlarmCommentType.SYSTEM) alarmComment.setComment(JacksonUtil.newObjectNode()
.comment(JacksonUtil.newObjectNode() .put("text", String.format(COMMENT_DELETED.getText(), TENANT_ADMIN_EMAIL))
.put("text", String.format(COMMENT_DELETED.getText(), TENANT_ADMIN_EMAIL)) .put("subtype", COMMENT_DELETED.name())
.put("subtype", COMMENT_DELETED.name()) .put("userName", TENANT_ADMIN_EMAIL));
.put("userName", TENANT_ADMIN_EMAIL)) testLogEntityActionEntityEqClass(alarm, alarm.getId(), tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.DELETED_COMMENT, 1, alarmComment);
.build();
testLogEntityActionEntityEqClass(alarm, alarm.getId(), tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.DELETED_COMMENT, 1, expectedAlarmComment);
} }
@Test @Test
@ -285,15 +281,13 @@ public class AlarmCommentControllerTest extends AbstractControllerTest {
assertThat(systemComment.getComment().get("text").asText()).isEqualTo(String.format("Comment was deleted by user %s", assertThat(systemComment.getComment().get("text").asText()).isEqualTo(String.format("Comment was deleted by user %s",
TENANT_ADMIN_EMAIL)); TENANT_ADMIN_EMAIL));
AlarmComment expectedAlarmComment = AlarmComment.builder() alarmComment.setType(AlarmCommentType.SYSTEM);
.alarmId(alarm.getId()) alarmComment.setUserId(null);
.type(AlarmCommentType.SYSTEM) alarmComment.setComment(JacksonUtil.newObjectNode()
.comment(JacksonUtil.newObjectNode() .put("text", String.format(COMMENT_DELETED.getText(), TENANT_ADMIN_EMAIL))
.put("text", String.format(COMMENT_DELETED.getText(), TENANT_ADMIN_EMAIL)) .put("subtype", COMMENT_DELETED.name())
.put("subtype", COMMENT_DELETED.name()) .put("userName", TENANT_ADMIN_EMAIL));
.put("userName", TENANT_ADMIN_EMAIL)) testLogEntityActionEntityEqClass(alarm, alarm.getId(), tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.DELETED_COMMENT, 1, alarmComment);
.build();
testLogEntityActionEntityEqClass(alarm, alarm.getId(), tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.DELETED_COMMENT, 1, expectedAlarmComment);
} }
@Test @Test

10
application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java

@ -21,6 +21,8 @@ import org.assertj.core.api.Assertions;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean; import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
@ -73,12 +75,12 @@ import static org.mockito.Mockito.when;
@Slf4j @Slf4j
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@ContextConfiguration(classes = DeviceProvisionServiceTest.ContextConfiguration.class) @ContextConfiguration(classes = DeviceProvisionServiceTest.TestConfig.class)
public class DeviceProvisionServiceTest { public class DeviceProvisionServiceTest {
@org.springframework.context.annotation.Configuration @Configuration
static class ContextConfiguration { static class TestConfig {
@org.springframework.context.annotation.Bean @Bean
public DeviceProvisionServiceImpl deviceProvisionService(TbQueueProducerProvider producerProvider, public DeviceProvisionServiceImpl deviceProvisionService(TbQueueProducerProvider producerProvider,
DeviceProfileService deviceProfileService, DeviceProfileService deviceProfileService,
DeviceService deviceService, DeviceService deviceService,

3
application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java

@ -17,6 +17,7 @@ package org.thingsboard.server.service.queue;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
@ -115,7 +116,7 @@ public class DefaultTbClusterServiceTest {
@MockitoSpyBean @MockitoSpyBean
protected TbClusterService clusterService; protected TbClusterService clusterService;
@org.junit.Before @Before
public void setUp() { public void setUp() {
lenient().when(topicService.getNotificationsTopic(any(), any())).thenAnswer(invocation -> { lenient().when(topicService.getNotificationsTopic(any(), any())).thenAnswer(invocation -> {
ServiceType serviceType = invocation.getArgument(0); ServiceType serviceType = invocation.getArgument(0);

10
application/src/test/java/org/thingsboard/server/service/transport/DefaultTransportApiServiceTest.java

@ -20,6 +20,8 @@ import lombok.extern.slf4j.Slf4j;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.test.context.bean.override.mockito.MockitoSpyBean; import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
@ -69,12 +71,12 @@ import static org.mockito.Mockito.when;
@Slf4j @Slf4j
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@ContextConfiguration(classes = DefaultTransportApiServiceTest.ContextConfiguration.class) @ContextConfiguration(classes = DefaultTransportApiServiceTest.TestConfig.class)
public class DefaultTransportApiServiceTest { public class DefaultTransportApiServiceTest {
@org.springframework.context.annotation.Configuration @Configuration
static class ContextConfiguration { static class TestConfig {
@org.springframework.context.annotation.Bean @Bean
public DefaultTransportApiService defaultTransportApiService(TbDeviceProfileCache deviceProfileCache, public DefaultTransportApiService defaultTransportApiService(TbDeviceProfileCache deviceProfileCache,
TbTenantProfileCache tenantProfileCache, TbTenantProfileCache tenantProfileCache,
TbApiUsageStateService apiUsageStateService, TbApiUsageStateService apiUsageStateService,

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

@ -81,7 +81,7 @@ public enum EntityType {
@Getter @Getter
private final String tableName; private final String tableName;
@Getter @Getter
private final String normalName = StringUtils.capitalize(Strings.CS.removeStart(name(), "TB_") private final String normalName = StringUtils.capitalize(removeStart(name(), "TB_")
.toLowerCase().replaceAll("_", " ")); .toLowerCase().replaceAll("_", " "));
public static final List<String> NORMAL_NAMES = EnumSet.allOf(EntityType.class).stream() public static final List<String> NORMAL_NAMES = EnumSet.allOf(EntityType.class).stream()

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

@ -27,7 +27,7 @@ import org.thingsboard.server.common.data.id.TenantId;
* @author Andrew Shvayka * @author Andrew Shvayka
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
@Schema @Schema
public class EventInfo extends BaseData<EventId> { public class EventInfo extends BaseData<EventId> {

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

@ -21,7 +21,7 @@ import lombok.EqualsAndHashCode;
@Schema @Schema
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
public class HomeDashboard extends Dashboard { public class HomeDashboard extends Dashboard {
public static final String HIDE_DASHBOARD_TOOLBAR_DESCRIPTION = "Hide dashboard toolbar flag. Useful for rendering dashboards on mobile."; public static final String HIDE_DASHBOARD_TOOLBAR_DESCRIPTION = "Hide dashboard toolbar flag. Useful for rendering dashboards on mobile.";

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

@ -164,7 +164,7 @@ public class StringUtils {
} }
public static boolean equals(String str1, String str2) { public static boolean equals(String str1, String str2) {
return Strings.CS.equals(str1, str2); return Objects.equals(str1, str2);
} }
public static boolean equalsAny(String string, String... otherStrings) { public static boolean equalsAny(String string, String... otherStrings) {

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

@ -22,7 +22,7 @@ import org.thingsboard.server.common.data.id.TenantId;
@Schema @Schema
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
public class TenantInfo extends Tenant { public class TenantInfo extends Tenant {
@Schema(description = "Tenant Profile name", example = "Default") @Schema(description = "Tenant Profile name", example = "Default")
private String tenantProfileName; private String tenantProfileName;

2
common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java

@ -34,7 +34,7 @@ import java.io.Serial;
@Schema @Schema
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
@Builder @Builder
@AllArgsConstructor @AllArgsConstructor
public class AlarmComment extends BaseData<AlarmCommentId> implements HasName { public class AlarmComment extends BaseData<AlarmCommentId> implements HasName {

2
common/data/src/main/java/org/thingsboard/server/common/data/device/data/CoapDeviceTransportConfiguration.java

@ -28,7 +28,7 @@ import java.util.Map;
@Data @Data
@Schema @Schema
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
public class CoapDeviceTransportConfiguration extends PowerSavingConfiguration implements DeviceTransportConfiguration { public class CoapDeviceTransportConfiguration extends PowerSavingConfiguration implements DeviceTransportConfiguration {
private static final long serialVersionUID = 6061442236008925609L; private static final long serialVersionUID = 6061442236008925609L;

2
common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java

@ -28,7 +28,7 @@ import java.util.Map;
@Schema @Schema
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
public class Lwm2mDeviceTransportConfiguration extends PowerSavingConfiguration implements DeviceTransportConfiguration { public class Lwm2mDeviceTransportConfiguration extends PowerSavingConfiguration implements DeviceTransportConfiguration {
@JsonIgnore @JsonIgnore

2
common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java

@ -21,7 +21,7 @@ import lombok.EqualsAndHashCode;
@Schema @Schema
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
public class LwM2MServerSecurityConfigDefault extends LwM2MServerSecurityConfig { public class LwM2MServerSecurityConfigDefault extends LwM2MServerSecurityConfig {
@Schema(description = "Host for 'Security' mode (DTLS)", example = "0.0.0.0", accessMode = Schema.AccessMode.READ_ONLY) @Schema(description = "Host for 'Security' mode (DTLS)", example = "0.0.0.0", accessMode = Schema.AccessMode.READ_ONLY)
protected String securityHost; protected String securityHost;

4
common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeInfo.java

@ -20,7 +20,7 @@ import lombok.EqualsAndHashCode;
import org.thingsboard.server.common.data.id.EdgeId; import org.thingsboard.server.common.data.id.EdgeId;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
public class EdgeInfo extends Edge { public class EdgeInfo extends Edge {
private String customerTitle; private String customerTitle;
@ -39,4 +39,4 @@ public class EdgeInfo extends Edge {
this.customerTitle = customerTitle; this.customerTitle = customerTitle;
this.customerIsPublic = customerIsPublic; this.customerIsPublic = customerIsPublic;
} }
} }

2
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetFields.java

@ -27,7 +27,7 @@ import java.util.UUID;
import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText; import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class AssetFields extends AbstractEntityFields implements ProfileAwareFields { public class AssetFields extends AbstractEntityFields implements ProfileAwareFields {

2
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetProfileFields.java

@ -23,7 +23,7 @@ import lombok.experimental.SuperBuilder;
import java.util.UUID; import java.util.UUID;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class AssetProfileFields extends AbstractEntityFields { public class AssetProfileFields extends AbstractEntityFields {

2
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/CustomerFields.java

@ -26,7 +26,7 @@ import java.util.UUID;
import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText; import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class CustomerFields extends AbstractEntityFields { public class CustomerFields extends AbstractEntityFields {

2
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DashboardFields.java

@ -29,7 +29,7 @@ import java.util.UUID;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class DashboardFields extends AbstractEntityFields { public class DashboardFields extends AbstractEntityFields {

2
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceFields.java

@ -27,7 +27,7 @@ import java.util.UUID;
import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText; import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class DeviceFields extends AbstractEntityFields implements ProfileAwareFields { public class DeviceFields extends AbstractEntityFields implements ProfileAwareFields {

2
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceProfileFields.java

@ -24,7 +24,7 @@ import org.thingsboard.server.common.data.DeviceProfileType;
import java.util.UUID; import java.util.UUID;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class DeviceProfileFields extends AbstractEntityFields { public class DeviceProfileFields extends AbstractEntityFields {

2
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EdgeFields.java

@ -26,7 +26,7 @@ import java.util.UUID;
import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText; import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class EdgeFields extends AbstractEntityFields { public class EdgeFields extends AbstractEntityFields {

2
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EntityViewFields.java

@ -26,7 +26,7 @@ import java.util.UUID;
import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText; import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class EntityViewFields extends AbstractEntityFields { public class EntityViewFields extends AbstractEntityFields {

2
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/QueueStatsFields.java

@ -23,7 +23,7 @@ import lombok.experimental.SuperBuilder;
import java.util.UUID; import java.util.UUID;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class QueueStatsFields extends AbstractEntityFields { public class QueueStatsFields extends AbstractEntityFields {

2
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/RuleChainFields.java

@ -26,7 +26,7 @@ import java.util.UUID;
import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText; import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class RuleChainFields extends AbstractEntityFields { public class RuleChainFields extends AbstractEntityFields {

2
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantFields.java

@ -26,7 +26,7 @@ import java.util.UUID;
import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText; import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class TenantFields extends AbstractEntityFields { public class TenantFields extends AbstractEntityFields {

2
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantProfileFields.java

@ -24,7 +24,7 @@ import org.thingsboard.server.common.data.id.TenantId;
import java.util.UUID; import java.util.UUID;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class TenantProfileFields extends AbstractEntityFields { public class TenantProfileFields extends AbstractEntityFields {

2
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/UserFields.java

@ -26,7 +26,7 @@ import java.util.UUID;
import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText; import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
public class UserFields extends AbstractEntityFields { public class UserFields extends AbstractEntityFields {

2
common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java

@ -19,7 +19,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
public class BaseDeleteTsKvQuery extends BaseTsKvQuery implements DeleteTsKvQuery { public class BaseDeleteTsKvQuery extends BaseTsKvQuery implements DeleteTsKvQuery {
private final Boolean rewriteLatestIfDeleted; private final Boolean rewriteLatestIfDeleted;

2
common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmCountQuery.java

@ -32,7 +32,7 @@ import java.util.List;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
@ToString @ToString
@Schema @Schema
public class AlarmCountQuery extends EntityCountQuery { public class AlarmCountQuery extends EntityCountQuery {

2
common/data/src/main/java/org/thingsboard/server/common/data/queue/Queue.java

@ -31,7 +31,7 @@ import org.thingsboard.server.common.data.validation.NoXss;
import java.util.Optional; import java.util.Optional;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
public class Queue extends BaseDataWithAdditionalInfo<QueueId> implements HasName, HasTenantId, QueueConfig { public class Queue extends BaseDataWithAdditionalInfo<QueueId> implements HasName, HasTenantId, QueueConfig {
private TenantId tenantId; private TenantId tenantId;
@NoXss @NoXss

2
common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNodeState.java

@ -23,7 +23,7 @@ import org.thingsboard.server.common.data.id.RuleNodeId;
import org.thingsboard.server.common.data.id.RuleNodeStateId; import org.thingsboard.server.common.data.id.RuleNodeStateId;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
public class RuleNodeState extends BaseData<RuleNodeStateId> { public class RuleNodeState extends BaseData<RuleNodeStateId> {
private RuleNodeId ruleNodeId; private RuleNodeId ruleNodeId;

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

@ -27,7 +27,7 @@ import java.util.Collections;
import java.util.List; import java.util.List;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
public class WidgetTypeInfo extends BaseWidgetType { public class WidgetTypeInfo extends BaseWidgetType {
@Serial @Serial

2
common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/limits/GatewaySessionLimits.java

@ -19,7 +19,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
public class GatewaySessionLimits extends SessionLimits { public class GatewaySessionLimits extends SessionLimits {
private SessionRateLimits gatewayRateLimits; private SessionRateLimits gatewayRateLimits;

2
dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestEntity.java

@ -36,7 +36,7 @@ import java.util.UUID;
import static org.thingsboard.server.dao.model.ModelConstants.VERSION_COLUMN; import static org.thingsboard.server.dao.model.ModelConstants.VERSION_COLUMN;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
@Entity @Entity
@Table(name = "ts_kv_latest") @Table(name = "ts_kv_latest")
@IdClass(TsKvLatestCompositeKey.class) @IdClass(TsKvLatestCompositeKey.class)

2
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeConfiguration.java

@ -21,7 +21,7 @@ import org.thingsboard.rule.engine.api.NodeConfiguration;
import org.thingsboard.server.common.data.script.ScriptLanguage; import org.thingsboard.server.common.data.script.ScriptLanguage;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
public class TbClearAlarmNodeConfiguration extends TbAbstractAlarmNodeConfiguration implements NodeConfiguration<TbClearAlarmNodeConfiguration> { public class TbClearAlarmNodeConfiguration extends TbAbstractAlarmNodeConfiguration implements NodeConfiguration<TbClearAlarmNodeConfiguration> {
@Override @Override

2
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeConfiguration.java

@ -26,7 +26,7 @@ import java.util.Collections;
import java.util.List; import java.util.List;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
public class TbCreateAlarmNodeConfiguration extends TbAbstractAlarmNodeConfiguration implements NodeConfiguration<TbCreateAlarmNodeConfiguration> { public class TbCreateAlarmNodeConfiguration extends TbAbstractAlarmNodeConfiguration implements NodeConfiguration<TbCreateAlarmNodeConfiguration> {
@NoXss @NoXss

2
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java

@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit;
* Created by ashvayka on 19.01.18. * Created by ashvayka on 19.01.18.
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
public class TbGpsGeofencingActionNodeConfiguration extends TbGpsGeofencingFilterNodeConfiguration { public class TbGpsGeofencingActionNodeConfiguration extends TbGpsGeofencingFilterNodeConfiguration {
private int minInsideDuration; private int minInsideDuration;

2
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/AzureIotHubSasCredentials.java

@ -30,7 +30,7 @@ import org.thingsboard.rule.engine.credentials.CredentialsType;
import java.security.Security; import java.security.Security;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
@Slf4j @Slf4j
@JsonIgnoreProperties(ignoreUnknown = true) @JsonIgnoreProperties(ignoreUnknown = true)
public class AzureIotHubSasCredentials extends CertPemCredentials { public class AzureIotHubSasCredentials extends CertPemCredentials {

2
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/TbAzureIotHubNodeConfiguration.java

@ -21,7 +21,7 @@ import lombok.EqualsAndHashCode;
import org.thingsboard.rule.engine.mqtt.TbMqttNodeConfiguration; import org.thingsboard.rule.engine.mqtt.TbMqttNodeConfiguration;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = true)
public class TbAzureIotHubNodeConfiguration extends TbMqttNodeConfiguration { public class TbAzureIotHubNodeConfiguration extends TbMqttNodeConfiguration {
@Override @Override

Loading…
Cancel
Save