mirror of
https://github.com/CarmJos/EasySQL.git
synced 2026-06-04 23:41:15 +08:00
添加部分 Objects.requireNonNull()
This commit is contained in:
@@ -29,7 +29,7 @@ public interface SQLUpdateAction extends SQLAction<Integer> {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 设定该操作是否返回自增键序列。
|
* 设定该操作是否返回自增键序列。
|
||||||
*
|
|
||||||
* @param returnGeneratedKey 是否返回自增键序列
|
* @param returnGeneratedKey 是否返回自增键序列
|
||||||
* @return {@link SQLUpdateAction}
|
* @return {@link SQLUpdateAction}
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ import cc.carm.lib.easysql.api.enums.NumberType;
|
|||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
import static cc.carm.lib.easysql.api.SQLBuilder.withBackQuote;
|
import static cc.carm.lib.easysql.api.SQLBuilder.withBackQuote;
|
||||||
import static cc.carm.lib.easysql.api.SQLBuilder.withQuote;
|
import static cc.carm.lib.easysql.api.SQLBuilder.withQuote;
|
||||||
|
|
||||||
@@ -67,6 +69,7 @@ public interface TableCreateBuilder extends SQLBuilder {
|
|||||||
* @return {@link TableCreateBuilder}
|
* @return {@link TableCreateBuilder}
|
||||||
*/
|
*/
|
||||||
default TableCreateBuilder addColumn(@NotNull String columnName, @NotNull String settings) {
|
default TableCreateBuilder addColumn(@NotNull String columnName, @NotNull String settings) {
|
||||||
|
Objects.requireNonNull(columnName, "columnName could not be null");
|
||||||
return addColumn(withBackQuote(columnName) + " " + settings);
|
return addColumn(withBackQuote(columnName) + " " + settings);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import java.sql.Statement;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Objects;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
public class SQLUpdateBatchActionImpl
|
public class SQLUpdateBatchActionImpl
|
||||||
@@ -30,6 +31,7 @@ public class SQLUpdateBatchActionImpl
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public SQLUpdateBatchAction addBatch(@NotNull String sql) {
|
public SQLUpdateBatchAction addBatch(@NotNull String sql) {
|
||||||
|
Objects.requireNonNull(sql, "sql could not be null");
|
||||||
this.sqlContents.add(sql);
|
this.sqlContents.add(sql);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-4
@@ -9,10 +9,7 @@ import org.jetbrains.annotations.Nullable;
|
|||||||
|
|
||||||
import java.sql.Time;
|
import java.sql.Time;
|
||||||
import java.sql.Timestamp;
|
import java.sql.Timestamp;
|
||||||
import java.util.ArrayList;
|
import java.util.*;
|
||||||
import java.util.Date;
|
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
|
|
||||||
import static cc.carm.lib.easysql.api.SQLBuilder.withBackQuote;
|
import static cc.carm.lib.easysql.api.SQLBuilder.withBackQuote;
|
||||||
|
|
||||||
@@ -55,6 +52,7 @@ public abstract class AbstractConditionalBuilder<B extends ConditionalBuilder<B,
|
|||||||
public B addCondition(
|
public B addCondition(
|
||||||
@NotNull String columnName, @NotNull String operator, @Nullable Object queryValue
|
@NotNull String columnName, @NotNull String operator, @Nullable Object queryValue
|
||||||
) {
|
) {
|
||||||
|
Objects.requireNonNull(columnName, "columnName could not be null");
|
||||||
addCondition(withBackQuote(columnName) + " " + operator + " ?");
|
addCondition(withBackQuote(columnName) + " " + operator + " ?");
|
||||||
this.conditionParams.add(queryValue);
|
this.conditionParams.add(queryValue);
|
||||||
return getThis();
|
return getThis();
|
||||||
@@ -76,6 +74,7 @@ public abstract class AbstractConditionalBuilder<B extends ConditionalBuilder<B,
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public B addNotNullCondition(@NotNull String columnName) {
|
public B addNotNullCondition(@NotNull String columnName) {
|
||||||
|
Objects.requireNonNull(columnName, "columnName could not be null");
|
||||||
return addCondition(withBackQuote(columnName) + " IS NOT NULL");
|
return addCondition(withBackQuote(columnName) + " IS NOT NULL");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -84,6 +83,7 @@ public abstract class AbstractConditionalBuilder<B extends ConditionalBuilder<B,
|
|||||||
public B addTimeCondition(
|
public B addTimeCondition(
|
||||||
@NotNull String columnName, @Nullable Date startDate, @Nullable Date endDate
|
@NotNull String columnName, @Nullable Date startDate, @Nullable Date endDate
|
||||||
) {
|
) {
|
||||||
|
Objects.requireNonNull(columnName, "columnName could not be null");
|
||||||
if (startDate == null && endDate == null) return getThis(); // 都不限定时间,不用判断了
|
if (startDate == null && endDate == null) return getThis(); // 都不限定时间,不用判断了
|
||||||
if (startDate != null) {
|
if (startDate != null) {
|
||||||
addCondition(withBackQuote(columnName) + " BETWEEN ? AND ?");
|
addCondition(withBackQuote(columnName) + " BETWEEN ? AND ?");
|
||||||
|
|||||||
@@ -10,6 +10,8 @@ import cc.carm.lib.easysql.builder.AbstractSQLBuilder;
|
|||||||
import cc.carm.lib.easysql.manager.SQLManagerImpl;
|
import cc.carm.lib.easysql.manager.SQLManagerImpl;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
public class QueryBuilderImpl extends AbstractSQLBuilder implements QueryBuilder {
|
public class QueryBuilderImpl extends AbstractSQLBuilder implements QueryBuilder {
|
||||||
public QueryBuilderImpl(@NotNull SQLManagerImpl manager) {
|
public QueryBuilderImpl(@NotNull SQLManagerImpl manager) {
|
||||||
super(manager);
|
super(manager);
|
||||||
@@ -18,16 +20,19 @@ public class QueryBuilderImpl extends AbstractSQLBuilder implements QueryBuilder
|
|||||||
@Override
|
@Override
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public QueryAction withSQL(@NotNull String sql) {
|
public QueryAction withSQL(@NotNull String sql) {
|
||||||
|
Objects.requireNonNull(sql, "sql could not be null");
|
||||||
return new QueryActionImpl(getManager(), sql);
|
return new QueryActionImpl(getManager(), sql);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PreparedQueryAction withPreparedSQL(@NotNull String sql) {
|
public PreparedQueryAction withPreparedSQL(@NotNull String sql) {
|
||||||
|
Objects.requireNonNull(sql, "sql could not be null");
|
||||||
return new PreparedQueryActionImpl(getManager(), sql);
|
return new PreparedQueryActionImpl(getManager(), sql);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public TableQueryBuilder inTable(@NotNull String tableName) {
|
public TableQueryBuilder inTable(@NotNull String tableName) {
|
||||||
|
Objects.requireNonNull(tableName, "tableName could not be null");
|
||||||
return new TableQueryBuilderImpl(getManager(), tableName);
|
return new TableQueryBuilderImpl(getManager(), tableName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ import cc.carm.lib.easysql.manager.SQLManagerImpl;
|
|||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
import static cc.carm.lib.easysql.api.SQLBuilder.withBackQuote;
|
import static cc.carm.lib.easysql.api.SQLBuilder.withBackQuote;
|
||||||
import static cc.carm.lib.easysql.api.SQLBuilder.withQuote;
|
import static cc.carm.lib.easysql.api.SQLBuilder.withQuote;
|
||||||
|
|
||||||
@@ -27,6 +29,7 @@ public class TableAlterBuilderImpl extends AbstractSQLBuilder implements TableAl
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public SQLAction<Integer> renameTo(@NotNull String newTableName) {
|
public SQLAction<Integer> renameTo(@NotNull String newTableName) {
|
||||||
|
Objects.requireNonNull(newTableName, "table name could not be null");
|
||||||
return new SQLUpdateActionImpl(getManager(),
|
return new SQLUpdateActionImpl(getManager(),
|
||||||
"ALTER TABLE " + withBackQuote(getTableName()) + " RENAME TO " + withBackQuote(newTableName) + ""
|
"ALTER TABLE " + withBackQuote(getTableName()) + " RENAME TO " + withBackQuote(newTableName) + ""
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -7,6 +7,8 @@ import cc.carm.lib.easysql.manager.SQLManagerImpl;
|
|||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
import static cc.carm.lib.easysql.api.SQLBuilder.withBackQuote;
|
import static cc.carm.lib.easysql.api.SQLBuilder.withBackQuote;
|
||||||
|
|
||||||
public class TableQueryBuilderImpl
|
public class TableQueryBuilderImpl
|
||||||
@@ -72,6 +74,7 @@ public class TableQueryBuilderImpl
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public TableQueryBuilder orderBy(@NotNull String columnName, boolean asc) {
|
public TableQueryBuilder orderBy(@NotNull String columnName, boolean asc) {
|
||||||
|
Objects.requireNonNull(columnName, "columnName could not be null");
|
||||||
this.orderBy = "ORDER BY " + withBackQuote(columnName) + " " + (asc ? "ASC" : "DESC");
|
this.orderBy = "ORDER BY " + withBackQuote(columnName) + " " + (asc ? "ASC" : "DESC");
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,10 +8,7 @@ import cc.carm.lib.easysql.manager.SQLManagerImpl;
|
|||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.*;
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import static cc.carm.lib.easysql.api.SQLBuilder.withBackQuote;
|
import static cc.carm.lib.easysql.api.SQLBuilder.withBackQuote;
|
||||||
|
|
||||||
@@ -60,6 +57,7 @@ public class UpdateBuilderImpl
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public UpdateBuilder addColumnValue(@NotNull String columnName, Object columnValue) {
|
public UpdateBuilder addColumnValue(@NotNull String columnName, Object columnValue) {
|
||||||
|
Objects.requireNonNull(columnName, "columnName could not be null");
|
||||||
this.columnData.put(columnName, columnValue);
|
this.columnData.put(columnName, columnValue);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -72,6 +70,7 @@ public class UpdateBuilderImpl
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public UpdateBuilder setColumnValues(@NotNull String[] columnNames, @Nullable Object[] columnValues) {
|
public UpdateBuilder setColumnValues(@NotNull String[] columnNames, @Nullable Object[] columnValues) {
|
||||||
|
Objects.requireNonNull(columnNames, "columnName could not be null");
|
||||||
if (columnNames.length != columnValues.length) {
|
if (columnNames.length != columnValues.length) {
|
||||||
throw new RuntimeException("columnNames are not match with columnValues");
|
throw new RuntimeException("columnNames are not match with columnValues");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user