[Improve] lombok @DaTa annotation improvements

apache · Oct 1, 2024 · 72cc096 · 72cc096
1 parent d94cb2f
commit 72cc096
Show file tree

Hide file tree

Showing 81 changed files with 363 additions and 179 deletions.
diff --git a/...istry-api/src/main/java/org/apache/streampark/registry/api/ConnectStrategyProperties.java b/...istry-api/src/main/java/org/apache/streampark/registry/api/ConnectStrategyProperties.java
@@ -17,11 +17,13 @@
 
 package org.apache.streampark.registry.api;
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.time.Duration;
 
-@Data
+@Getter
+@Setter
 public class ConnectStrategyProperties {
 
     private StrategyType strategy = StrategyType.STOP;

diff --git a/...rk-registry-api/src/main/java/org/apache/streampark/registry/api/model/BaseHeartBeat.java b/...rk-registry-api/src/main/java/org/apache/streampark/registry/api/model/BaseHeartBeat.java
@@ -20,11 +20,13 @@
 import org.apache.streampark.registry.api.enums.ServerStatusEnum;
 
 import lombok.AllArgsConstructor;
-import lombok.Data;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 import lombok.experimental.SuperBuilder;
 
-@Data
+@Getter
+@Setter
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor

diff --git a/...treampark-registry-api/src/main/java/org/apache/streampark/registry/api/model/Server.java b/...treampark-registry-api/src/main/java/org/apache/streampark/registry/api/model/Server.java
@@ -17,11 +17,13 @@
 
 package org.apache.streampark.registry.api.model;
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Date;
 
-@Data
+@Getter
+@Setter
 public class Server {
 
     private int id;

diff --git a/...gistry-core/src/main/java/org/apache/streampark/registry/core/JdbcRegistryProperties.java b/...gistry-core/src/main/java/org/apache/streampark/registry/core/JdbcRegistryProperties.java
@@ -22,7 +22,8 @@
 import org.apache.commons.lang3.StringUtils;
 
 import com.zaxxer.hikari.HikariConfig;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -35,7 +36,8 @@
 
 import java.time.Duration;
 
-@Data
+@Getter
+@Setter
 @Slf4j
 @Validated
 @Configuration

diff --git a/...c/main/java/org/apache/streampark/registry/core/model/DO/JdbcRegistryClientHeartbeat.java b/...c/main/java/org/apache/streampark/registry/core/model/DO/JdbcRegistryClientHeartbeat.java
@@ -22,13 +22,15 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Data;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 import java.util.Date;
 
 @TableName(value = "t_jdbc_registry_client_heartbeat")
-@Data
+@Getter
+@Setter
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor

diff --git a/...try-core/src/main/java/org/apache/streampark/registry/core/model/DO/JdbcRegistryData.java b/...try-core/src/main/java/org/apache/streampark/registry/core/model/DO/JdbcRegistryData.java
@@ -22,13 +22,15 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Data;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 import java.util.Date;
 
 @TableName(value = "t_jdbc_registry_data")
-@Data
+@Getter
+@Setter
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor

diff --git a/...c/main/java/org/apache/streampark/registry/core/model/DO/JdbcRegistryDataChanceEvent.java b/...c/main/java/org/apache/streampark/registry/core/model/DO/JdbcRegistryDataChanceEvent.java
@@ -22,13 +22,15 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Data;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 import java.util.Date;
 
 @TableName(value = "t_jdbc_registry_data_change_event")
-@Data
+@Getter
+@Setter
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor

diff --git a/...try-core/src/main/java/org/apache/streampark/registry/core/model/DO/JdbcRegistryLock.java b/...try-core/src/main/java/org/apache/streampark/registry/core/model/DO/JdbcRegistryLock.java
@@ -22,13 +22,15 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Data;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 import java.util.Date;
 
 @TableName(value = "t_jdbc_registry_lock")
-@Data
+@Getter
+@Setter
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor

diff --git a/...in/java/org/apache/streampark/registry/core/model/DTO/JdbcRegistryClientHeartbeatDTO.java b/...in/java/org/apache/streampark/registry/core/model/DTO/JdbcRegistryClientHeartbeatDTO.java
@@ -22,13 +22,15 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Data;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 import lombok.SneakyThrows;
 
 import java.util.Date;
 
-@Data
+@Getter
+@Setter
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
@@ -83,7 +85,8 @@ public JdbcRegistryClientHeartbeatDTO clone() {
             .build();
     }
 
-    @Data
+    @Getter
+    @Setter
     @Builder
     @NoArgsConstructor
     @AllArgsConstructor

diff --git a/...in/java/org/apache/streampark/registry/core/model/DTO/JdbcRegistryDataChanceEventDTO.java b/...in/java/org/apache/streampark/registry/core/model/DTO/JdbcRegistryDataChanceEventDTO.java
@@ -23,12 +23,14 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Data;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 import java.util.Date;
 
-@Data
+@Getter
+@Setter
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor

diff --git a/...core/src/main/java/org/apache/streampark/registry/core/model/DTO/JdbcRegistryDataDTO.java b/...core/src/main/java/org/apache/streampark/registry/core/model/DTO/JdbcRegistryDataDTO.java
@@ -21,12 +21,14 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Data;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 import java.util.Date;
 
-@Data
+@Getter
+@Setter
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor

diff --git a/...core/src/main/java/org/apache/streampark/registry/core/model/DTO/JdbcRegistryLockDTO.java b/...core/src/main/java/org/apache/streampark/registry/core/model/DTO/JdbcRegistryLockDTO.java
@@ -21,12 +21,14 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Data;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 import java.util.Date;
 
-@Data
+@Getter
+@Setter
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor

diff --git a/...ore/src/main/java/org/apache/streampark/registry/core/server/JdbcRegistryLockManager.java b/...ore/src/main/java/org/apache/streampark/registry/core/server/JdbcRegistryLockManager.java
@@ -25,8 +25,9 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Data;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.dao.DuplicateKeyException;
 
@@ -135,7 +136,8 @@ public void releaseJdbcRegistryLock(Long clientId, String lockKey) {
         jdbcRegistryLockHolderMap.remove(lockKey);
     }
 
-    @Data
+    @Getter
+    @Setter
     @Builder
     @NoArgsConstructor
     @AllArgsConstructor

diff --git a/...-console-service/src/main/java/org/apache/streampark/console/base/domain/RestRequest.java b/...-console-service/src/main/java/org/apache/streampark/console/base/domain/RestRequest.java
@@ -17,11 +17,13 @@
 
 package org.apache.streampark.console.base.domain;
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.io.Serializable;
 
-@Data
+@Getter
+@Setter
 public class RestRequest implements Serializable {
 
     private static final long serialVersionUID = 1L;

diff --git a/...le-service/src/main/java/org/apache/streampark/console/base/domain/router/RouterMeta.java b/...le-service/src/main/java/org/apache/streampark/console/base/domain/router/RouterMeta.java
@@ -19,12 +19,14 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.io.Serializable;
 
 /** Vue Router Meta */
-@Data
+@Getter
+@Setter
 @AllArgsConstructor
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class RouterMeta implements Serializable {

diff --git a/...le-service/src/main/java/org/apache/streampark/console/base/domain/router/RouterTree.java b/...le-service/src/main/java/org/apache/streampark/console/base/domain/router/RouterTree.java
@@ -20,13 +20,15 @@
 import org.apache.streampark.console.system.entity.Menu;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-@Data
+@Getter
+@Setter
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class RouterTree<T> {
 

diff --git a/...ole-service/src/main/java/org/apache/streampark/console/base/domain/router/VueRouter.java b/...ole-service/src/main/java/org/apache/streampark/console/base/domain/router/VueRouter.java
@@ -19,14 +19,15 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import lombok.Data;
+import lombok.Getter;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
 /** Build Vue Router */
-@Data
+@Getter
+@Setter
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class VueRouter<T> implements Serializable {
 

diff --git a/...e-service/src/main/java/org/apache/streampark/console/base/mybatis/entity/BaseEntity.java b/...e-service/src/main/java/org/apache/streampark/console/base/mybatis/entity/BaseEntity.java
@@ -19,13 +19,15 @@
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.io.Serializable;
 import java.util.Date;
 
 /** Base entity. */
-@Data
+@Getter
+@Setter
 public abstract class BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;

diff --git a/...sole-service/src/main/java/org/apache/streampark/console/core/bean/AlertConfigParams.java b/...sole-service/src/main/java/org/apache/streampark/console/core/bean/AlertConfigParams.java
@@ -23,13 +23,15 @@
 import org.apache.commons.lang3.StringUtils;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 
 import java.io.Serializable;
 
-@Data
+@Getter
+@Setter
 @Slf4j
 public class AlertConfigParams implements Serializable {
 

diff --git a/...le-service/src/main/java/org/apache/streampark/console/core/bean/AlertDingTalkParams.java b/...le-service/src/main/java/org/apache/streampark/console/core/bean/AlertDingTalkParams.java
@@ -18,13 +18,15 @@
 package org.apache.streampark.console.core.bean;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
 
 import java.io.Serializable;
 
-@Data
+@Getter
+@Setter
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class AlertDingTalkParams implements Serializable {
 

diff --git a/...nsole-service/src/main/java/org/apache/streampark/console/core/bean/AlertEmailParams.java b/...nsole-service/src/main/java/org/apache/streampark/console/core/bean/AlertEmailParams.java
@@ -18,13 +18,15 @@
 package org.apache.streampark.console.core.bean;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
 
 import java.io.Serializable;
 
-@Data
+@Getter
+@Setter
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class AlertEmailParams implements Serializable {
 

diff --git a/...ervice/src/main/java/org/apache/streampark/console/core/bean/AlertHttpCallbackParams.java b/...ervice/src/main/java/org/apache/streampark/console/core/bean/AlertHttpCallbackParams.java
@@ -18,13 +18,15 @@
 package org.apache.streampark.console.core.bean;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
 
 import java.io.Serializable;
 
-@Data
+@Getter
+@Setter
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class AlertHttpCallbackParams implements Serializable {