From 766ad4b98a14b99c3fadbb16610cb20bcc2a2acd Mon Sep 17 00:00:00 2001 From: caoshd Date: Sun, 31 Mar 2024 18:05:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../caoshd/otone/builder/TableBuilder.java | 7 ++----- .../space/caoshd/otone/entity/TableInfo.java | 19 +++++-------------- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/main/java/space/caoshd/otone/builder/TableBuilder.java b/src/main/java/space/caoshd/otone/builder/TableBuilder.java index 06b07b3..a455972 100644 --- a/src/main/java/space/caoshd/otone/builder/TableBuilder.java +++ b/src/main/java/space/caoshd/otone/builder/TableBuilder.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.stream.Collectors; public class TableBuilder { @@ -104,15 +103,13 @@ public class TableBuilder { result.setDecimalExists(columnInfo.stream() .anyMatch(column -> TypeUtils.JAVA_TYPE_DECIMAL.equals(column.getJavaType()))); - result.setInvalidColumns( + result.setInvalidColumn( columnInfo.stream() .map(ColumnInfo::getColumnName) .filter(columnName -> CfgUtils.getTableInvalidColumns().contains(columnName)) - .collect(Collectors.toList()) + .findFirst().orElse(null) ); - result.setInvalidColumnExists(!result.getInvalidColumns().isEmpty()); - List indexInfoList = IndexBuilder.loadIndexInfo( result.getTableSchema(), result.getTableName() diff --git a/src/main/java/space/caoshd/otone/entity/TableInfo.java b/src/main/java/space/caoshd/otone/entity/TableInfo.java index 320b4e0..9447977 100644 --- a/src/main/java/space/caoshd/otone/entity/TableInfo.java +++ b/src/main/java/space/caoshd/otone/entity/TableInfo.java @@ -12,8 +12,7 @@ public class TableInfo { private String tableName; private Boolean dateExists; private Boolean decimalExists; - private Boolean invalidColumnExists; - private List invalidColumns = new ArrayList<>(); + private String invalidColumn; private List columns = new ArrayList<>(); private Map> indexes = new LinkedHashMap<>(); @@ -57,20 +56,12 @@ public class TableInfo { this.decimalExists = decimalExists; } - public Boolean getInvalidColumnExists() { - return invalidColumnExists; + public String getInvalidColumn() { + return invalidColumn; } - public void setInvalidColumnExists(Boolean invalidColumnExists) { - this.invalidColumnExists = invalidColumnExists; - } - - public List getInvalidColumns() { - return invalidColumns; - } - - public void setInvalidColumns(List invalidColumns) { - this.invalidColumns = invalidColumns; + public void setInvalidColumn(String invalidColumn) { + this.invalidColumn = invalidColumn; } public List getColumns() {