Merge lts-4.2 into lts-4.3

Forward-merge of lts-4.2 into lts-4.3, bringing the deprecation-warning
cleanups (#15487, #15491, #15499, #15503, #15504, #15505, #15509, #15511,
#15512, #15515, #15517, #15522) in as real ancestry rather than the earlier
copy-paste (#15661).

Conflicts resolved toward the reviewed lts-4.2 form for shared code
(explicit @EqualsAndHashCode(callSuper=true), typed StringUtils/removeStart,
imported test annotations). lts-4.3-only implementations kept as-is
(calculated-field state classes, native CF repository); tests removed on
lts-4.3 (CalculatedFieldLinkDataValidatorTest, DefaultDataUpdateServiceTest)
stay removed.

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.Test;
 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.MockitoSpyBean;
 import org.springframework.test.context.ContextConfiguration;
@@ -73,12 +75,12 @@ import static org.mockito.Mockito.when;
 
 @Slf4j
 @RunWith(SpringRunner.class)
-@ContextConfiguration(classes = DeviceProvisionServiceTest.ContextConfiguration.class)
+@ContextConfiguration(classes = DeviceProvisionServiceTest.TestConfig.class)
 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,
                                                                  DeviceProfileService deviceProfileService,
                                                                  DeviceService deviceService,

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 lombok.extern.slf4j.Slf4j;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
@@ -115,7 +116,7 @@ public class DefaultTbClusterServiceTest {
     @MockitoSpyBean
     protected TbClusterService clusterService;
 
-    @org.junit.Before
+    @Before
     public void setUp() {
         lenient().when(topicService.getNotificationsTopic(any(), any())).thenAnswer(invocation -> {
             ServiceType serviceType = invocation.getArgument(0);

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.Test;
 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.MockitoSpyBean;
 import org.springframework.test.context.ContextConfiguration;
@@ -69,12 +71,12 @@ import static org.mockito.Mockito.when;
 
 @Slf4j
 @RunWith(SpringRunner.class)
-@ContextConfiguration(classes = DefaultTransportApiServiceTest.ContextConfiguration.class)
+@ContextConfiguration(classes = DefaultTransportApiServiceTest.TestConfig.class)
 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,
                                                                      TbTenantProfileCache tenantProfileCache,
                                                                      TbApiUsageStateService apiUsageStateService,

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

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

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
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @Schema
 public class EventInfo extends BaseData<EventId> {
 

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

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

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) {
-        return Strings.CS.equals(str1, str2);
+        return Objects.equals(str1, str2);
     }
 
     public static boolean equalsAny(String string, String... otherStrings) {

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
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class TenantInfo extends Tenant {
     @Schema(description = "Tenant Profile name", example = "Default")
     private String tenantProfileName;

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

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

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

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

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

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

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

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

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;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class EdgeInfo extends Edge {
 
     private String customerTitle;
@@ -39,4 +39,4 @@ public class EdgeInfo extends Edge {
         this.customerTitle = customerTitle;
         this.customerIsPublic = customerIsPublic;
     }
-}
+}

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;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder
 public class AssetFields extends AbstractEntityFields implements ProfileAwareFields {

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;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder
 public class AssetProfileFields extends AbstractEntityFields {

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;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder
 public class CustomerFields extends AbstractEntityFields {

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

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

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;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder
 public class DeviceFields extends AbstractEntityFields implements ProfileAwareFields {

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;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder
 public class DeviceProfileFields extends AbstractEntityFields {

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;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder
 public class EdgeFields extends AbstractEntityFields {

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;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder
 public class EntityViewFields extends AbstractEntityFields {

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;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder
 public class QueueStatsFields extends AbstractEntityFields {

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;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder
 public class RuleChainFields extends AbstractEntityFields {

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;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder
 public class TenantFields extends AbstractEntityFields {

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;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder
 public class TenantProfileFields extends AbstractEntityFields {

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;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder
 public class UserFields extends AbstractEntityFields {

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

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

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

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

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;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class Queue extends BaseDataWithAdditionalInfo<QueueId> implements HasName, HasTenantId, QueueConfig {
     private TenantId tenantId;
     @NoXss

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;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class RuleNodeState extends BaseData<RuleNodeStateId> {
 
     private RuleNodeId ruleNodeId;

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;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class WidgetTypeInfo extends BaseWidgetType {
 
     @Serial

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

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

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;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @Entity
 @Table(name = "ts_kv_latest")
 @IdClass(TsKvLatestCompositeKey.class)

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;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class TbClearAlarmNodeConfiguration extends TbAbstractAlarmNodeConfiguration implements NodeConfiguration<TbClearAlarmNodeConfiguration> {
 
     @Override

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;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class TbCreateAlarmNodeConfiguration extends TbAbstractAlarmNodeConfiguration implements NodeConfiguration<TbCreateAlarmNodeConfiguration> {
 
     @NoXss

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.
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class TbGpsGeofencingActionNodeConfiguration extends TbGpsGeofencingFilterNodeConfiguration {
 
     private int minInsideDuration;

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;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @Slf4j
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class AzureIotHubSasCredentials extends CertPemCredentials {

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;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class TbAzureIotHubNodeConfiguration extends TbMqttNodeConfiguration {
 
     @Override