Browse Source
Fix invalid `callSuper = false` usages for EqualsAndHashCode
pull/15910/head
Viacheslav Klimov
4 weeks ago
Failed to extract signature
35 changed files with
35 additions and
35 deletions
-
application/src/main/java/org/thingsboard/server/service/cf/ctx/state/ScriptCalculatedFieldState.java
-
application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SimpleCalculatedFieldState.java
-
common/data/src/main/java/org/thingsboard/server/common/data/EventInfo.java
-
common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboard.java
-
common/data/src/main/java/org/thingsboard/server/common/data/TenantInfo.java
-
common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java
-
common/data/src/main/java/org/thingsboard/server/common/data/device/data/CoapDeviceTransportConfiguration.java
-
common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java
-
common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java
-
common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeInfo.java
-
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetFields.java
-
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetProfileFields.java
-
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/CustomerFields.java
-
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DashboardFields.java
-
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceFields.java
-
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceProfileFields.java
-
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EdgeFields.java
-
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EntityViewFields.java
-
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/QueueStatsFields.java
-
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/RuleChainFields.java
-
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantFields.java
-
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantProfileFields.java
-
common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/UserFields.java
-
common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java
-
common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmCountQuery.java
-
common/data/src/main/java/org/thingsboard/server/common/data/queue/Queue.java
-
common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNodeState.java
-
common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeInfo.java
-
common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/limits/GatewaySessionLimits.java
-
dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestEntity.java
-
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeConfiguration.java
-
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeConfiguration.java
-
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java
-
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/AzureIotHubSasCredentials.java
-
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/TbAzureIotHubNodeConfiguration.java
|
|
|
@ -36,7 +36,7 @@ import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
@Data |
|
|
|
@EqualsAndHashCode(callSuper = false) |
|
|
|
@EqualsAndHashCode(callSuper = true) |
|
|
|
@Slf4j |
|
|
|
@NoArgsConstructor |
|
|
|
public class ScriptCalculatedFieldState extends BaseCalculatedFieldState { |
|
|
|
|
|
|
|
@ -34,7 +34,7 @@ import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
@Data |
|
|
|
@EqualsAndHashCode(callSuper = false) |
|
|
|
@EqualsAndHashCode(callSuper = true) |
|
|
|
@NoArgsConstructor |
|
|
|
public class SimpleCalculatedFieldState extends BaseCalculatedFieldState { |
|
|
|
|
|
|
|
|
|
|
|
@ -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> { |
|
|
|
|
|
|
|
|
|
|
|
@ -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."; |
|
|
|
|
|
|
|
@ -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; |
|
|
|
|
|
|
|
@ -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 { |
|
|
|
|
|
|
|
@ -26,7 +26,7 @@ import java.util.HashMap; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
@Data |
|
|
|
@EqualsAndHashCode(callSuper = false) |
|
|
|
@EqualsAndHashCode(callSuper = true) |
|
|
|
public class CoapDeviceTransportConfiguration extends PowerSavingConfiguration implements DeviceTransportConfiguration { |
|
|
|
|
|
|
|
private static final long serialVersionUID = 6061442236008925609L; |
|
|
|
|
|
|
|
@ -26,7 +26,7 @@ import java.util.HashMap; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
@Data |
|
|
|
@EqualsAndHashCode(callSuper = false) |
|
|
|
@EqualsAndHashCode(callSuper = true) |
|
|
|
public class Lwm2mDeviceTransportConfiguration extends PowerSavingConfiguration implements DeviceTransportConfiguration { |
|
|
|
|
|
|
|
@JsonIgnore |
|
|
|
|
|
|
|
@ -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; |
|
|
|
|
|
|
|
@ -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; |
|
|
|
|
|
|
|
@ -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 { |
|
|
|
|
|
|
|
@ -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 { |
|
|
|
|
|
|
|
@ -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 { |
|
|
|
|
|
|
|
@ -29,7 +29,7 @@ import java.util.UUID; |
|
|
|
|
|
|
|
|
|
|
|
@Data |
|
|
|
@EqualsAndHashCode(callSuper = false) |
|
|
|
@EqualsAndHashCode(callSuper = true) |
|
|
|
@NoArgsConstructor |
|
|
|
@SuperBuilder |
|
|
|
public class DashboardFields extends AbstractEntityFields { |
|
|
|
|
|
|
|
@ -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 { |
|
|
|
|
|
|
|
@ -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 { |
|
|
|
|
|
|
|
@ -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 { |
|
|
|
|
|
|
|
@ -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 { |
|
|
|
|
|
|
|
@ -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 { |
|
|
|
|
|
|
|
@ -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 { |
|
|
|
|
|
|
|
@ -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 { |
|
|
|
|
|
|
|
@ -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 { |
|
|
|
|
|
|
|
@ -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 { |
|
|
|
|
|
|
|
@ -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; |
|
|
|
|
|
|
|
@ -31,7 +31,7 @@ import java.util.List; |
|
|
|
@NoArgsConstructor |
|
|
|
@AllArgsConstructor |
|
|
|
@Data |
|
|
|
@EqualsAndHashCode(callSuper = false) |
|
|
|
@EqualsAndHashCode(callSuper = true) |
|
|
|
@ToString |
|
|
|
public class AlarmCountQuery extends EntityCountQuery { |
|
|
|
private long startTs; |
|
|
|
|
|
|
|
@ -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 |
|
|
|
|
|
|
|
@ -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; |
|
|
|
|
|
|
|
@ -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 |
|
|
|
|
|
|
|
@ -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; |
|
|
|
|
|
|
|
@ -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) |
|
|
|
|
|
|
|
@ -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 |
|
|
|
|
|
|
|
@ -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 |
|
|
|
|
|
|
|
@ -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; |
|
|
|
|
|
|
|
@ -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 { |
|
|
|
|
|
|
|
@ -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 |
|
|
|
|