\\d)([\\dX])$";
private RegexConsts() {
throw new IllegalStateException("Utility class");
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/exception/DataNotExistsException.java b/src/main/java/xyz/zhouxy/plusone/commons/exception/DataNotExistsException.java
new file mode 100644
index 0000000..5877a68
--- /dev/null
+++ b/src/main/java/xyz/zhouxy/plusone/commons/exception/DataNotExistsException.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package xyz.zhouxy.plusone.commons.exception;
+
+/**
+ * 数据不存在异常
+ *
+ * @author ZhouXY
+ * @since 0.1.0
+ */
+public final class DataNotExistsException extends Exception {
+
+ private static final long serialVersionUID = 6536955800679703111L;
+
+ public DataNotExistsException() {
+ super();
+ }
+
+ public DataNotExistsException(String message) {
+ super(message);
+ }
+
+ public DataNotExistsException(Throwable cause) {
+ super(cause);
+ }
+
+ public DataNotExistsException(String message, Throwable cause) {
+ super(message, cause);
+ }
+}
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/exception/ExceptionType.java b/src/main/java/xyz/zhouxy/plusone/commons/exception/ExceptionType.java
new file mode 100644
index 0000000..f8ad83b
--- /dev/null
+++ b/src/main/java/xyz/zhouxy/plusone/commons/exception/ExceptionType.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package xyz.zhouxy.plusone.commons.exception;
+
+import javax.annotation.Nonnull;
+
+import xyz.zhouxy.plusone.commons.base.IWithCode;
+
+/**
+ * 异常类型
+ *
+ *
+ * 异常在不同场景下被抛出，可以用不同的枚举值，表示不同的异常类型。
+ * 该枚举实现本接口，用于基于不同类型创建异常。
+ *
+ *
+ * public final class LoginException extends RuntimeException {
+ * private final Type type;
+ * private LoginException(Type type, String message) {
+ * super(message);
+ * this.type = type;
+ * }
+ *
+ * private LoginException(Type type, Throwable cause) {
+ * super(cause);
+ * this.type = type;
+ * }
+ *
+ * private LoginException(Type type, String message, Throwable cause) {
+ * super(message, cause);
+ * this.type = type;
+ * }
+ *
+ * // ...
+ *
+ * public enum Type implements ExceptionType {
+ * DEFAULT("00", "当前会话未登录"),
+ * NOT_TOKEN("10", "未提供token"),
+ * INVALID_TOKEN("20", "token无效"),
+ * TOKEN_TIMEOUT("30", "token已过期"),
+ * BE_REPLACED("40", "token已被顶下线"),
+ * KICK_OUT("50", "token已被踢下线"),
+ * ;
+ *
+ * @Nonnull
+ * private final String code;
+ * @Nonnull
+ * private final String defaultMessage;
+ *
+ * Type(String code, String defaultMessage) {
+ * this.code = code;
+ * this.defaultMessage = defaultMessage;
+ * }
+ *
+ * @Override
+ * @Nonnull
+ * public String getCode() {
+ * return code;
+ * }
+ *
+ * @Override
+ * public String getDefaultMessage() {
+ * return defaultMessage;
+ * }
+ *
+ * @Override
+ * @Nonnull
+ * public LoginException create() {
+ * return new LoginException(this, this.defaultMessage);
+ * }
+ *
+ * @Override
+ * @Nonnull
+ * public LoginException create(String message) {
+ * return new LoginException(this, message);
+ * }
+ *
+ * @Override
+ * @Nonnull
+ * public LoginException create(Throwable cause) {
+ * return new LoginException(this, cause);
+ * }
+ *
+ * @Override
+ * @Nonnull
+ * public LoginException create(String message, Throwable cause) {
+ * return new LoginException(this, message, cause);
+ * }
+ * }
+ * }
+ *
+ *
+ * 使用时，可以使用这种方式创建并抛出异常：
+ *
+ * throw LoginException.Type.TOKEN_TIMEOUT.create();
+ *
+ *
+ *
+ * @author ZhouXY
+ */
+public interface ExceptionType extends IWithCode {
+
+ String getDefaultMessage();
+
+ @Nonnull
+ E create();
+
+ @Nonnull
+ E create(String message);
+
+ @Nonnull
+ E create(Throwable cause);
+
+ @Nonnull
+ E create(String message, Throwable cause);
+
+}
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/exception/ParsingFailureException.java b/src/main/java/xyz/zhouxy/plusone/commons/exception/ParsingFailureException.java
index 5f9ae68..0a86545 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/exception/ParsingFailureException.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/exception/ParsingFailureException.java
@@ -18,13 +18,20 @@ package xyz.zhouxy.plusone.commons.exception;
import java.time.format.DateTimeParseException;
+import javax.annotation.Nonnull;
+
+import xyz.zhouxy.plusone.commons.exception.business.RequestParamsException;
+
/**
* 解析失败异常
*
*
- * 解析失败的不一定是客户传的参数，也可能是其它来源的数据解析失败
- * 如果表示用户传参造成的解析失败，可使用 RequestParamsException(Throwable cause)，
- * 将 ParsingFailureException 包装成 {@link RequestParamsException} 再抛出
+ * 解析失败的不一定是客户传的参数，也可能是其它来源的数据解析失败。
+ * 如果表示用户传参造成的解析失败，可使用 {@link RequestParamsException#RequestParamsException(Throwable)}，
+ * 将 ParsingFailureException 包装成 {@link RequestParamsException} 再抛出。
+ *
+ * throw new RequestParamsException(ParsingFailureException.of(ParsingFailureException.Type.NUMBER_PARSING_FAILURE));
+ *
*
*
* @author ZhouXY
@@ -34,13 +41,8 @@ public final class ParsingFailureException extends RuntimeException {
private final Type type;
- private ParsingFailureException(Type type) {
- super(type.getDefaultMsg());
- this.type = type;
- }
-
- private ParsingFailureException(Type type, String msg) {
- super(msg);
+ private ParsingFailureException(Type type, String message) {
+ super(message);
this.type = type;
}
@@ -49,61 +51,114 @@ public final class ParsingFailureException extends RuntimeException {
this.type = type;
}
- private ParsingFailureException(Type type, String msg, Throwable cause) {
- super(msg, cause);
+ private ParsingFailureException(Type type, String message, Throwable cause) {
+ super(message, cause);
this.type = type;
}
- public static ParsingFailureException of(Type type) {
- return new ParsingFailureException(type);
+ public ParsingFailureException() {
+ this(Type.DEFAULT, Type.DEFAULT.getDefaultMessage());
}
- public static ParsingFailureException of(Type type, String msg) {
- return new ParsingFailureException(type, msg);
+ public ParsingFailureException(String message) {
+ this(Type.DEFAULT, message);
}
- public static ParsingFailureException of(Type type, Throwable e) {
- return new ParsingFailureException(type, e);
+ public ParsingFailureException(Throwable cause) {
+ this(Type.DEFAULT, cause);
}
- public static ParsingFailureException of(Type type, String msg, Throwable e) {
- return new ParsingFailureException(type, msg, e);
+ public ParsingFailureException(String message, Throwable cause) {
+ this(Type.DEFAULT, message, cause);
}
- public static ParsingFailureException of(DateTimeParseException e) {
- return new ParsingFailureException(Type.DATE_TIME_PARSING_FAILURE, e.getMessage(), e);
+ public static ParsingFailureException of(DateTimeParseException cause) {
+ if (cause == null) {
+ return Type.DATE_TIME_PARSING_FAILURE.create();
+ }
+ return Type.DATE_TIME_PARSING_FAILURE.create(cause.getMessage(), cause);
}
- public static ParsingFailureException of(String msg, DateTimeParseException e) {
- return new ParsingFailureException(Type.DATE_TIME_PARSING_FAILURE, msg, e);
+ public static ParsingFailureException of(String message, DateTimeParseException cause) {
+ return Type.DATE_TIME_PARSING_FAILURE.create(message, cause);
+ }
+
+ public static ParsingFailureException of(NumberFormatException cause) {
+ if (cause == null) {
+ return Type.NUMBER_PARSING_FAILURE.create();
+ }
+ return Type.NUMBER_PARSING_FAILURE.create(cause.getMessage(), cause);
+ }
+
+ public static ParsingFailureException of(String message, NumberFormatException cause) {
+ return Type.NUMBER_PARSING_FAILURE.create(message, cause);
}
public Type getType() {
return type;
}
- public enum Type {
- DEFAULT("4010500", "解析失败"),
- NUMBER_PARSING_FAILURE("4010501", "数字转换失败"),
- DATE_TIME_PARSING_FAILURE("4010502", "时间解析失败"),
- JSON_PARSING_FAILURE("4010503", "JSON 解析失败"),
- XML_PARSING_FAILURE("4010504", "XML 解析失败"),
+ public String getCode() {
+ return this.type.code;
+ }
+
+ public static final Type DEFAULT = Type.DEFAULT;
+ public static final Type NUMBER_PARSING_FAILURE = Type.NUMBER_PARSING_FAILURE;
+ public static final Type DATE_TIME_PARSING_FAILURE = Type.DATE_TIME_PARSING_FAILURE;
+ public static final Type JSON_PARSING_FAILURE = Type.JSON_PARSING_FAILURE;
+ public static final Type XML_PARSING_FAILURE = Type.XML_PARSING_FAILURE;
+
+ public enum Type implements ExceptionType {
+ DEFAULT("00", "解析失败"),
+ NUMBER_PARSING_FAILURE("10", "数字转换失败"),
+ DATE_TIME_PARSING_FAILURE("20", "时间解析失败"),
+ JSON_PARSING_FAILURE("30", "JSON 解析失败"),
+ XML_PARSING_FAILURE("40", "XML 解析失败"),
;
- final String code;
- final String defaultMsg;
+ @Nonnull
+ private final String code;
+ @Nonnull
+ private final String defaultMessage;
- Type(String code, String defaultMsg) {
+ Type(String code, String defaultMessage) {
this.code = code;
- this.defaultMsg = defaultMsg;
+ this.defaultMessage = defaultMessage;
}
+ @Override
+ @Nonnull
public String getCode() {
return code;
}
- public String getDefaultMsg() {
- return defaultMsg;
+ @Override
+ public String getDefaultMessage() {
+ return defaultMessage;
+ }
+
+ @Override
+ @Nonnull
+ public ParsingFailureException create() {
+ return new ParsingFailureException(this, this.defaultMessage);
+ }
+
+ @Override
+ @Nonnull
+ public ParsingFailureException create(String message) {
+ return new ParsingFailureException(this, message);
+ }
+
+ @Override
+ @Nonnull
+ public ParsingFailureException create(Throwable cause) {
+ return new ParsingFailureException(this, cause);
+ }
+
+ @Override
+ @Nonnull
+ public ParsingFailureException create(String message, Throwable cause) {
+ return new ParsingFailureException(this, message, cause);
}
}
}
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/exception/business/BizException.java b/src/main/java/xyz/zhouxy/plusone/commons/exception/business/BizException.java
index eee5262..ed4b664 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/exception/business/BizException.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/exception/business/BizException.java
@@ -37,16 +37,16 @@ public class BizException extends RuntimeException {
super(DEFAULT_MSG);
}
- public BizException(String msg) {
- super(msg);
+ public BizException(String message) {
+ super(message);
}
public BizException(Throwable cause) {
super(cause);
}
- public BizException(String msg, Throwable cause) {
- super(msg, cause);
+ public BizException(String message, Throwable cause) {
+ super(message, cause);
}
}
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/exception/business/InvalidInputException.java b/src/main/java/xyz/zhouxy/plusone/commons/exception/business/InvalidInputException.java
index 8b8495c..aacf7a6 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/exception/business/InvalidInputException.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/exception/business/InvalidInputException.java
@@ -16,6 +16,10 @@
package xyz.zhouxy.plusone.commons.exception.business;
+import javax.annotation.Nonnull;
+
+import xyz.zhouxy.plusone.commons.exception.ExceptionType;
+
/**
* InvalidInputException
*
@@ -34,12 +38,12 @@ public final class InvalidInputException extends RequestParamsException {
private final Type type;
private InvalidInputException(Type type) {
- super(type.getDefaultMsg());
+ super(type.getDefaultMessage());
this.type = type;
}
- private InvalidInputException(Type type, String msg) {
- super(msg);
+ private InvalidInputException(Type type, String message) {
+ super(message);
this.type = type;
}
@@ -48,40 +52,36 @@ public final class InvalidInputException extends RequestParamsException {
this.type = type;
}
- private InvalidInputException(Type type, String msg, Throwable cause) {
- super(msg, cause);
+ private InvalidInputException(Type type, String message, Throwable cause) {
+ super(message, cause);
this.type = type;
}
- public static InvalidInputException of(Type type) {
- return new InvalidInputException(type);
+ public InvalidInputException() {
+ this(Type.DEFAULT);
}
- public static InvalidInputException of(Type type, String msg) {
- return new InvalidInputException(type, msg);
+ public InvalidInputException(String message) {
+ this(Type.DEFAULT, message);
}
- public static InvalidInputException of(Type type, Throwable e) {
- return new InvalidInputException(type, e);
+ public InvalidInputException(Throwable cause) {
+ this(Type.DEFAULT, cause);
}
- public static InvalidInputException of(Type type, String msg, Throwable e) {
- return new InvalidInputException(type, msg, e);
- }
-
- public static InvalidInputException of(Throwable e) {
- return new InvalidInputException(Type.DEFAULT, e.getMessage(), e);
- }
-
- public static InvalidInputException of(String msg, Throwable e) {
- return new InvalidInputException(Type.DEFAULT, msg, e);
+ public InvalidInputException(String message, Throwable cause) {
+ this(Type.DEFAULT, message, cause);
}
public Type getType() {
- return type;
+ return this.type;
}
- public enum Type {
+ public Object getCode() {
+ return this.type.code;
+ }
+
+ public enum Type implements ExceptionType {
DEFAULT("00", "用户输入内容非法"),
CONTAINS_ILLEGAL_AND_MALICIOUS_LINKS("01", "包含非法恶意跳转链接"),
CONTAINS_ILLEGAL_WORDS("02", "包含违禁敏感词"),
@@ -89,20 +89,49 @@ public final class InvalidInputException extends RequestParamsException {
INFRINGE_COPYRIGHT("04", "文件侵犯版权"),
;
+ @Nonnull
final String code;
- final String defaultMsg;
+ @Nonnull
+ final String defaultMessage;
Type(String code, String defaultMsg) {
this.code = code;
- this.defaultMsg = defaultMsg;
+ this.defaultMessage = defaultMsg;
}
+ @Override
+ @Nonnull
public String getCode() {
return code;
}
- public String getDefaultMsg() {
- return defaultMsg;
+ @Override
+ public String getDefaultMessage() {
+ return defaultMessage;
+ }
+
+ @Override
+ @Nonnull
+ public InvalidInputException create() {
+ return new InvalidInputException(this);
+ }
+
+ @Override
+ @Nonnull
+ public InvalidInputException create(String message) {
+ return new InvalidInputException(this, message);
+ }
+
+ @Override
+ @Nonnull
+ public InvalidInputException create(Throwable cause) {
+ return new InvalidInputException(this, cause);
+ }
+
+ @Override
+ @Nonnull
+ public InvalidInputException create(String message, Throwable cause) {
+ return new InvalidInputException(this, message, cause);
}
}
}
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/exception/business/RequestParamsException.java b/src/main/java/xyz/zhouxy/plusone/commons/exception/business/RequestParamsException.java
index 8f4f383..4d9155a 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/exception/business/RequestParamsException.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/exception/business/RequestParamsException.java
@@ -34,16 +34,16 @@ public class RequestParamsException extends BizException {
super(DEFAULT_MSG);
}
- public RequestParamsException(String msg) {
- super(msg);
+ public RequestParamsException(String message) {
+ super(message);
}
public RequestParamsException(Throwable cause) {
super(cause);
}
- public RequestParamsException(String msg, Throwable cause) {
- super(msg, cause);
+ public RequestParamsException(String message, Throwable cause) {
+ super(message, cause);
}
}
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/exception/system/DataOperationResultException.java b/src/main/java/xyz/zhouxy/plusone/commons/exception/system/DataOperationResultException.java
index 99db690..bbb49f6 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/exception/system/DataOperationResultException.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/exception/system/DataOperationResultException.java
@@ -39,15 +39,15 @@ public final class DataOperationResultException extends SysException {
super(DEFAULT_MSG);
}
- public DataOperationResultException(String msg) {
- super(msg);
+ public DataOperationResultException(String message) {
+ super(message);
}
public DataOperationResultException(Throwable cause) {
super(cause);
}
- public DataOperationResultException(String msg, Throwable cause) {
- super(msg, cause);
+ public DataOperationResultException(String message, Throwable cause) {
+ super(message, cause);
}
}
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/exception/system/NoAvailableMacFoundException.java b/src/main/java/xyz/zhouxy/plusone/commons/exception/system/NoAvailableMacFoundException.java
index 7897b46..d7c76f8 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/exception/system/NoAvailableMacFoundException.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/exception/system/NoAvailableMacFoundException.java
@@ -33,15 +33,15 @@ public class NoAvailableMacFoundException extends SysException {
super();
}
- public NoAvailableMacFoundException(String msg) {
- super(msg);
+ public NoAvailableMacFoundException(String message) {
+ super(message);
}
- public NoAvailableMacFoundException(Throwable e) {
- super(e);
+ public NoAvailableMacFoundException(Throwable cause) {
+ super(cause);
}
- public NoAvailableMacFoundException(String msg, Throwable e) {
- super(msg, e);
+ public NoAvailableMacFoundException(String message, Throwable cause) {
+ super(message, cause);
}
}
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/exception/system/SysException.java b/src/main/java/xyz/zhouxy/plusone/commons/exception/system/SysException.java
index 877d43a..7480bd6 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/exception/system/SysException.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/exception/system/SysException.java
@@ -30,19 +30,19 @@ public class SysException extends RuntimeException {
private static final String DEFAULT_MSG = "系统异常";
- protected SysException() {
+ public SysException() {
super(DEFAULT_MSG);
}
- public SysException(String msg) {
- super(msg);
+ public SysException(String message) {
+ super(message);
}
public SysException(Throwable cause) {
super(cause);
}
- public SysException(String msg, Throwable cause) {
- super(msg, cause);
+ public SysException(String message, Throwable cause) {
+ super(message, cause);
}
}
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/function/ThrowingFunction.java b/src/main/java/xyz/zhouxy/plusone/commons/function/ThrowingFunction.java
new file mode 100644
index 0000000..08ed960
--- /dev/null
+++ b/src/main/java/xyz/zhouxy/plusone/commons/function/ThrowingFunction.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package xyz.zhouxy.plusone.commons.function;
+
+@FunctionalInterface
+public interface ThrowingFunction {
+
+ /**
+ * Applies this function to the given argument.
+ *
+ * @param t the function argument
+ * @return the function result
+ */
+ R apply(T t) throws E;
+
+}
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/function/package-info.java b/src/main/java/xyz/zhouxy/plusone/commons/function/package-info.java
new file mode 100644
index 0000000..2c731f4
--- /dev/null
+++ b/src/main/java/xyz/zhouxy/plusone/commons/function/package-info.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * 函数式编程
+ *
+ * PredicateTools
+ *
+ * {@link PredicateTools} 用于 {@link java.util.function.Predicate} 的相关操作。
+ *
+ *
+ * Functional interfaces
+ *
+ * 补充一些 JDK 没有，而项目中可能用得上的函数式接口：
+ *
+ * | Group | FunctionalInterface | method |
+ * | ------------- | -------------------- | -------------------------------- |
+ * | UnaryOperator | BoolUnaryOperator | boolean applyAsBool (boolean) |
+ * | UnaryOperator | CharUnaryOperator | char applyAsChar(char) |
+ * | Throwing | Executable | void execute() throws E |
+ * | Throwing | ThrowingConsumer | void accept(T) throws E |
+ * | Throwing | ThrowingFunction | R apply(T) throws E |
+ * | Throwing | ThrowingPredicate | boolean test(T) throws E |
+ * | Throwing | ThrowingSupplier | T get() throws E |
+ * | Optional | OptionalSupplier | Optional<T> get() throws E |
+ * | Optional | ToOptionalBiFunction | Optional<R> apply(T,U) |
+ * | Optional | ToOptionalFunction | Optional<R> apply(T) |
+ *
+ *
+ */
+package xyz.zhouxy.plusone.commons.function;
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/math/Interval.java b/src/main/java/xyz/zhouxy/plusone/commons/math/Interval.java
deleted file mode 100644
index aed22e9..0000000
--- a/src/main/java/xyz/zhouxy/plusone/commons/math/Interval.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2024 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package xyz.zhouxy.plusone.commons.math;
-
-import java.util.Optional;
-
-import javax.annotation.Nonnull;
-
-import com.google.common.base.Preconditions;
-import com.google.errorprone.annotations.Immutable;
-
-import xyz.zhouxy.plusone.commons.util.Numbers;
-
-@Immutable
-public class Interval> {
- @Nonnull
- private final IntervalType intervalType;
- private final T lowerBound;
- private final T upperBound;
-
- public Interval(@Nonnull IntervalType intervalType, T lowerBound, T upperBound) {
- Preconditions.checkNotNull(intervalType);
- if (intervalType.isLeftClosed()) {
- Preconditions.checkArgument(lowerBound != null,
- "The lower bound cannot be null, when the interval is left-closed.");
- }
- if (intervalType.isRightClosed()) {
- Preconditions.checkArgument(upperBound != null,
- "The upper bound cannot be null, when the interval is right-closed.");
- }
- if (lowerBound != null && upperBound != null) {
- Preconditions.checkArgument(lowerBound.compareTo(upperBound) <= 0,
- "The lower bound must less than the upper bound.");
- }
- this.intervalType = intervalType;
- this.lowerBound = lowerBound;
- this.upperBound = upperBound;
- }
-
- @Nonnull
- public final IntervalType getIntervalType() {
- return intervalType;
- }
-
- @Nonnull
- public final Optional getLowerBound() {
- return Optional.ofNullable(lowerBound);
- }
-
- @Nonnull
- public final Optional getUpperBound() {
- return Optional.ofNullable(upperBound);
- }
-
- public final boolean isLeftClosed() {
- return this.intervalType.isLeftClosed();
- }
-
- public final boolean isRightClosed() {
- return this.intervalType.isRightClosed();
- }
-
- public final boolean validValue(@Nonnull T value) {
- return Numbers.between(value, this.lowerBound, this.upperBound, this.intervalType);
- }
-}
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/math/IntervalType.java b/src/main/java/xyz/zhouxy/plusone/commons/math/IntervalType.java
deleted file mode 100644
index 1127820..0000000
--- a/src/main/java/xyz/zhouxy/plusone/commons/math/IntervalType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2024 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package xyz.zhouxy.plusone.commons.math;
-
-public enum IntervalType {
- /** 开区间。(a,b)={x|a < x < b} */
- OPEN(false, false),
- /** 闭区间。[a,b]={x|a ≤ x ≤ b} */
- CLOSED(true, true),
- /** 左闭右开区间。[a,b)={x|a ≤ x < b} */
- CLOSED_OPEN(true, false),
- /** 左开右闭区间。(a,b]={x|a < x ≤ b} */
- OPEN_CLOSED(false, true);
-
- private final boolean leftClosed;
- private final boolean rightClosed;
-
- IntervalType(boolean leftClosed, boolean rightClosed) {
- this.leftClosed = leftClosed;
- this.rightClosed = rightClosed;
- }
-
- public final boolean isLeftClosed() {
- return leftClosed;
- }
-
- public final boolean isRightClosed() {
- return rightClosed;
- }
-
- public final > Interval buildInterval(T left, T right) {
- return new Interval<>(this, left, right);
- }
-}
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/model/Chinese2ndGenIDCardNumber.java b/src/main/java/xyz/zhouxy/plusone/commons/model/Chinese2ndGenIDCardNumber.java
index c6ad7a7..f802468 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/model/Chinese2ndGenIDCardNumber.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/model/Chinese2ndGenIDCardNumber.java
@@ -18,18 +18,35 @@ package xyz.zhouxy.plusone.commons.model;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
import java.util.Map;
import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
+import com.google.errorprone.annotations.Immutable;
+
+import xyz.zhouxy.plusone.commons.annotation.ReaderMethod;
+import xyz.zhouxy.plusone.commons.annotation.ValueObject;
+import xyz.zhouxy.plusone.commons.constant.PatternConsts;
+import xyz.zhouxy.plusone.commons.util.AssertTools;
+import xyz.zhouxy.plusone.commons.util.StringTools;
/**
+ * Chinese2ndGenIDCardNumber
+ *
+ *
* 中国第二代居民身份证号
+ *
+ *
+ * @author ZhouXY
+ * @since 1.0
+ * @see xyz.zhouxy.plusone.commons.constant.PatternConsts#CHINESE_2ND_ID_CARD_NUMBER
*/
-public class Chinese2ndGenIDCardNumber extends IDCardNumber {
+@ValueObject
+@Immutable
+public class Chinese2ndGenIDCardNumber
+ extends ValidatableStringRecord
+ implements IDCardNumber {
/** 省份编码 */
private final String provinceCode;
@@ -42,83 +59,101 @@ public class Chinese2ndGenIDCardNumber extends IDCardNumber {
/** 出生日期 */
private final LocalDate birthDate;
- public static final Pattern PATTERN = Pattern.compile("^(((\\d{2})\\d{2})\\d{2})(\\d{8})\\d{2}(\\d)([\\dXx])$");
private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMdd");
- private Chinese2ndGenIDCardNumber(String idNumber) {
- super(idNumber, PATTERN, "Invalid ID number");
+ private Chinese2ndGenIDCardNumber(String value) {
+ super(value.toUpperCase(), PatternConsts.CHINESE_2ND_ID_CARD_NUMBER, () -> "二代居民身份证校验失败：" + value);
+
+ final Matcher matcher = getMatcher();
+
+ final String provinceCodeValue = matcher.group("province");
+ AssertTools.checkArgument(Chinese2ndGenIDCardNumber.PROVINCE_CODES.containsKey(provinceCodeValue));
+
+ final String cityCodeValue = matcher.group("city");
+ final String countyCodeValue = matcher.group("county");
+
+ final Gender genderValue;
+ final LocalDate birthDateValue;
try {
- final Matcher matcher = getMatcher();
- this.provinceCode = matcher.group(3);
- this.cityCode = matcher.group(2);
- this.countyCode = matcher.group(1);
+ // 出生日期
+ final String birthDateStr = matcher.group("birthDate");
+ birthDateValue = LocalDate.parse(birthDateStr, DATE_FORMATTER);
// 性别
- final String genderStr = matcher.group(5);
- final int genderIndex = Integer.parseInt(genderStr);
- this.gender = genderIndex % 2 == 0 ? Gender.FEMALE : Gender.MALE;
-
- // 出生日期
- final String birthDateStr = matcher.group(4);
- this.birthDate = LocalDate.parse(birthDateStr, DATE_FORMATTER);
+ final int genderCode = Integer.parseInt(matcher.group("gender"));
+ genderValue = genderCode % 2 == 0 ? Gender.FEMALE : Gender.MALE;
}
- catch (DateTimeParseException e) {
+ catch (Exception e) {
throw new IllegalArgumentException(e);
}
+
+ this.provinceCode = provinceCodeValue;
+ this.cityCode = cityCodeValue;
+ this.countyCode = countyCodeValue;
+ this.gender = genderValue;
+ this.birthDate = birthDateValue;
}
- public static Chinese2ndGenIDCardNumber of(String idNumber) {
- return new Chinese2ndGenIDCardNumber(idNumber);
+ public static Chinese2ndGenIDCardNumber of(final String value) {
+ AssertTools.checkArgument(StringTools.isNotBlank(value), "二代居民身份证校验失败：号码为空");
+ return new Chinese2ndGenIDCardNumber(value);
}
+ // ================================
+ // #region - reader methods
+ // ================================
+
+ @ReaderMethod
public String getProvinceCode() {
return provinceCode;
}
+ @ReaderMethod
public String getProvinceName() {
return PROVINCE_CODES.get(this.provinceCode);
}
+ @ReaderMethod
public String getFullProvinceCode() {
return Strings.padEnd(this.provinceCode, 12, '0');
}
+ @ReaderMethod
public String getCityCode() {
return cityCode;
}
+ @ReaderMethod
public String getFullCityCode() {
return Strings.padEnd(this.cityCode, 12, '0');
}
+ @ReaderMethod
public String getCountyCode() {
return countyCode;
}
+ @ReaderMethod
public String getFullCountyCode() {
return Strings.padEnd(this.countyCode, 12, '0');
}
+ @ReaderMethod
@Override
public Gender getGender() {
return gender;
}
+ @ReaderMethod
@Override
public LocalDate getBirthDate() {
return birthDate;
}
- @Override
- public int hashCode() {
- return super.hashCode();
- }
-
- @Override
- public boolean equals(Object obj) {
- return super.equals(obj);
- }
+ // ================================
+ // #endregion - reader methods
+ // ================================
/**
* 省份代码表
@@ -165,4 +200,14 @@ public class Chinese2ndGenIDCardNumber extends IDCardNumber {
.put("91", "国外")
.build();
}
+
+ @Override
+ public int hashCode() {
+ return super.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return super.equals(obj);
+ }
}
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/model/Gender.java b/src/main/java/xyz/zhouxy/plusone/commons/model/Gender.java
index 24dbeb9..7922305 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/model/Gender.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/model/Gender.java
@@ -16,6 +16,7 @@
package xyz.zhouxy.plusone.commons.model;
+import xyz.zhouxy.plusone.commons.base.IWithIntCode;
import xyz.zhouxy.plusone.commons.util.AssertTools;
/**
@@ -23,7 +24,7 @@ import xyz.zhouxy.plusone.commons.util.AssertTools;
*
* @author ZhouXY
*/
-public enum Gender {
+public enum Gender implements IWithIntCode {
UNKNOWN(0, "Unknown", "未知"),
MALE(1, "Male", "男"),
FEMALE(2, "Female", "女"),
@@ -60,4 +61,9 @@ public enum Gender {
return displayNameZh;
}
+ @Override
+ public int getCode() {
+ return getValue();
+ }
+
}
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/model/IDCardNumber.java b/src/main/java/xyz/zhouxy/plusone/commons/model/IDCardNumber.java
index f6e3114..3e7c56d 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/model/IDCardNumber.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/model/IDCardNumber.java
@@ -18,44 +18,60 @@ package xyz.zhouxy.plusone.commons.model;
import java.time.LocalDate;
import java.time.Period;
-import java.util.function.Supplier;
-import java.util.regex.Pattern;
-import javax.annotation.Nonnull;
+import xyz.zhouxy.plusone.commons.util.AssertTools;
/**
* 身份证号
*/
-public abstract class IDCardNumber extends ValidatableStringRecord {
+public interface IDCardNumber {
- protected IDCardNumber(@Nonnull String idNumber, @Nonnull Pattern pattern)
- throws IllegalArgumentException{
- super(idNumber, pattern);
- }
+ static final char DEFAULT_REPLACED_CHAR = '*';
+ static final int DEFAULT_DISPLAY_FRONT = 1;
+ static final int DEFAULT_DISPLAY_END = 2;
- protected IDCardNumber(@Nonnull String idNumber, @Nonnull Pattern pattern,
- @Nonnull String errorMessage) {
- super(idNumber, pattern, errorMessage);
- }
-
- protected IDCardNumber(@Nonnull String idNumber, @Nonnull Pattern pattern,
- @Nonnull Supplier errorMessage) {
- super(idNumber, pattern, errorMessage);
- }
+ String value();
/**
* 根据身份证号判断性别
*/
- public abstract Gender getGender();
+ Gender getGender();
/**
* 获取出生日期
*/
- public abstract LocalDate getBirthDate();
+ LocalDate getBirthDate();
/** 计算年龄 */
- public final int calculateAge() {
+ default int getAge() {
LocalDate now = LocalDate.now();
return Period.between(getBirthDate(), now).getYears();
}
+
+ // ================================
+ // #region - toString
+ // ================================
+
+ default String toDesensitizedString() {
+ return toDesensitizedString(DEFAULT_REPLACED_CHAR, DEFAULT_DISPLAY_FRONT, DEFAULT_DISPLAY_END);
+ }
+
+ default String toDesensitizedString(int front, int end) {
+ return toDesensitizedString(DEFAULT_REPLACED_CHAR, front, end);
+ }
+
+ default String toDesensitizedString(char replacedChar, int front, int end) {
+ final String value = value();
+ AssertTools.checkArgument(front >= 0 && end >= 0);
+ AssertTools.checkArgument((front + end) <= value.length(), "需要截取的长度不能大于身份证号长度");
+ final char[] charArray = value.toCharArray();
+ for (int i = front; i < charArray.length - end; i++) {
+ charArray[i] = replacedChar;
+ }
+ return String.valueOf(charArray);
+ }
+
+ // ================================
+ // #endregion - toString
+ // ================================
}
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/model/ValidatableStringRecord.java b/src/main/java/xyz/zhouxy/plusone/commons/model/ValidatableStringRecord.java
index fc63894..c679a14 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/model/ValidatableStringRecord.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/model/ValidatableStringRecord.java
@@ -23,6 +23,7 @@ import java.util.regex.Pattern;
import javax.annotation.Nonnull;
+import xyz.zhouxy.plusone.commons.annotation.ReaderMethod;
import xyz.zhouxy.plusone.commons.util.AssertTools;
/**
@@ -31,8 +32,8 @@ import xyz.zhouxy.plusone.commons.util.AssertTools;
* @author ZhouXY
* @since 0.1.0
*/
-public abstract class ValidatableStringRecord
- implements Comparable {
+public abstract class ValidatableStringRecord>
+ implements Comparable {
@Nonnull
private final String value;
@@ -50,8 +51,8 @@ public abstract class ValidatableStringRecord
protected ValidatableStringRecord(@Nonnull String value, @Nonnull Pattern pattern,
@Nonnull String errorMessage) {
- AssertTools.checkArgumentNotNull(value, "The value cannot be null.");
- AssertTools.checkArgumentNotNull(pattern, "The pattern cannot be null.");
+ AssertTools.checkArgument(Objects.nonNull(value), "The value cannot be null.");
+ AssertTools.checkArgument(Objects.nonNull(pattern), "The pattern cannot be null.");
this.matcher = pattern.matcher(value);
AssertTools.checkArgument(this.matcher.matches(), errorMessage);
this.value = value;
@@ -62,18 +63,19 @@ public abstract class ValidatableStringRecord
*
* @return 字符串（不为空）
*/
+ @ReaderMethod
public final String value() {
return this.value;
}
@Override
- public int compareTo(ValidatableStringRecord o) {
- return this.value.compareTo(o.value);
+ public int compareTo(T o) {
+ return this.value.compareTo(o.value());
}
@Override
public int hashCode() {
- return Objects.hash(value);
+ return Objects.hash(getClass(), value);
}
@Override
@@ -84,8 +86,9 @@ public abstract class ValidatableStringRecord
return false;
if (getClass() != obj.getClass())
return false;
- ValidatableStringRecord other = (ValidatableStringRecord) obj;
- return Objects.equals(value, other.value);
+ @SuppressWarnings("unchecked")
+ T other = (T) obj;
+ return Objects.equals(value, other.value());
}
@Override
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/model/dto/PageResult.java b/src/main/java/xyz/zhouxy/plusone/commons/model/dto/PageResult.java
index 3467182..353d86f 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/model/dto/PageResult.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/model/dto/PageResult.java
@@ -16,11 +16,11 @@
package xyz.zhouxy.plusone.commons.model.dto;
+import java.util.Collections;
import java.util.List;
-import com.google.common.base.Preconditions;
-
import xyz.zhouxy.plusone.commons.annotation.StaticFactoryMethod;
+import xyz.zhouxy.plusone.commons.collection.CollectionTools;
/**
* 返回分页查询的结果
@@ -37,8 +37,7 @@ public class PageResult {
private final List content;
private PageResult(List content, long total) {
- Preconditions.checkNotNull(content, "Content must not be null.");
- this.content = content;
+ this.content = CollectionTools.nullToEmptyList(content);
this.total = total;
}
@@ -47,6 +46,11 @@ public class PageResult {
return new PageResult<>(content, total);
}
+ @StaticFactoryMethod(PageResult.class)
+ public static PageResult empty() {
+ return new PageResult<>(Collections.emptyList(), 0L);
+ }
+
public long getTotal() {
return total;
}
@@ -57,6 +61,6 @@ public class PageResult {
@Override
public String toString() {
- return "PageDTO [total=" + total + ", content=" + content + "]";
+ return "PageResult [total=" + total + ", content=" + content + "]";
}
}
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/model/dto/PagingAndSortingQueryParams.java b/src/main/java/xyz/zhouxy/plusone/commons/model/dto/PagingAndSortingQueryParams.java
index 64f8db2..6eb0106 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/model/dto/PagingAndSortingQueryParams.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/model/dto/PagingAndSortingQueryParams.java
@@ -21,12 +21,15 @@ import java.util.Map;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import xyz.zhouxy.plusone.commons.annotation.Virtual;
+import xyz.zhouxy.plusone.commons.collection.CollectionTools;
+import xyz.zhouxy.plusone.commons.util.AssertTools;
+import xyz.zhouxy.plusone.commons.util.RegexTools;
import xyz.zhouxy.plusone.commons.util.StringTools;
/**
@@ -48,15 +51,15 @@ public class PagingAndSortingQueryParams {
private Long pageNum;
private List orderBy;
- private static final Pattern sortStrPattern = Pattern.compile("^[a-zA-Z]\\w+-(desc|asc|DESC|ASC)$");
+ private static final Pattern SORT_STR_PATTERN = Pattern.compile("^[a-zA-Z]\\w+-(desc|asc|DESC|ASC)$");
private final Map sortableProperties;
- public PagingAndSortingQueryParams(Map sortableProperties) {
- Preconditions.checkArgument(sortableProperties != null && !sortableProperties.isEmpty(),
+ public PagingAndSortingQueryParams(@Nonnull Map sortableProperties) {
+ AssertTools.checkArgument(CollectionTools.isNotEmpty(sortableProperties),
"Sortable properties can not be empty.");
sortableProperties.forEach((k, v) ->
- Preconditions.checkArgument(StringTools.isNotBlank(k) && StringTools.isNotBlank(v),
+ AssertTools.checkArgument(StringTools.isNotBlank(k) && StringTools.isNotBlank(v),
"Property name must not be blank."));
this.sortableProperties = ImmutableMap.copyOf(sortableProperties);
}
@@ -101,12 +104,12 @@ public class PagingAndSortingQueryParams {
}
private SortableProperty generateSortableProperty(String orderByStr) {
- Preconditions.checkArgument(PagingAndSortingQueryParams.sortStrPattern.matcher(orderByStr).matches());
+ AssertTools.checkArgument(RegexTools.matches(orderByStr, SORT_STR_PATTERN));
String[] propertyNameAndOrderType = orderByStr.split("-");
- Preconditions.checkArgument(propertyNameAndOrderType.length == 2);
+ AssertTools.checkArgument(propertyNameAndOrderType.length == 2);
String propertyName = propertyNameAndOrderType[0];
- Preconditions.checkArgument(sortableProperties.containsKey(propertyName),
+ AssertTools.checkArgument(sortableProperties.containsKey(propertyName),
"The property name must be in the set of sortable properties.");
String columnName = sortableProperties.get(propertyName);
String orderType = propertyNameAndOrderType[1];
@@ -123,7 +126,7 @@ public class PagingAndSortingQueryParams {
SortableProperty(String propertyName, String columnName, String orderType) {
this.propertyName = propertyName;
this.columnName = columnName;
- Preconditions.checkArgument("ASC".equalsIgnoreCase(orderType) || "DESC".equalsIgnoreCase(orderType));
+ AssertTools.checkArgument("ASC".equalsIgnoreCase(orderType) || "DESC".equalsIgnoreCase(orderType));
this.orderType = orderType.toUpperCase();
this.sqlSnippet = this.propertyName + " " + this.orderType;
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/model/dto/UnifiedResponse.java b/src/main/java/xyz/zhouxy/plusone/commons/model/dto/UnifiedResponse.java
index 143fc86..d33d0df 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/model/dto/UnifiedResponse.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/model/dto/UnifiedResponse.java
@@ -22,7 +22,7 @@ import java.util.function.Supplier;
import javax.annotation.Nullable;
-import com.google.common.base.Preconditions;
+import xyz.zhouxy.plusone.commons.util.AssertTools;
/**
* 统一结果，对返回给前端的数据进行封装。
@@ -78,16 +78,16 @@ public abstract class UnifiedResponse {
public static UnifiedResponse of(final boolean isSuccess,
final Supplier successResult, final Supplier errorResult) {
- Preconditions.checkNotNull(successResult, "Success supplier must not be null.");
- Preconditions.checkNotNull(errorResult, "Error supplier must not be null.");
+ AssertTools.checkNotNull(successResult, "Success supplier must not be null.");
+ AssertTools.checkNotNull(errorResult, "Error supplier must not be null.");
return isSuccess ? successResult.get() : errorResult.get();
}
public static UnifiedResponse of(final BooleanSupplier isSuccess,
final Supplier successResult, final Supplier errorResult) {
- Preconditions.checkNotNull(isSuccess, "Conditions for success must not be null.");
- Preconditions.checkNotNull(successResult, "Success supplier must not be null.");
- Preconditions.checkNotNull(errorResult, "Error supplier must not be null.");
+ AssertTools.checkNotNull(isSuccess, "Conditions for success must not be null.");
+ AssertTools.checkNotNull(successResult, "Success supplier must not be null.");
+ AssertTools.checkNotNull(errorResult, "Error supplier must not be null.");
return isSuccess.getAsBoolean() ? successResult.get() : errorResult.get();
}
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/sql/JdbcSql.java b/src/main/java/xyz/zhouxy/plusone/commons/sql/JdbcSql.java
deleted file mode 100644
index d24ed8a..0000000
--- a/src/main/java/xyz/zhouxy/plusone/commons/sql/JdbcSql.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2023-2024 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package xyz.zhouxy.plusone.commons.sql;
-
-import java.util.Collection;
-
-public class JdbcSql extends SQL {
-
- JdbcSql() {
- super();
- }
-
- public static JdbcSql newSql() {
- return new JdbcSql();
- }
-
- @Override
- public JdbcSql getSelf() {
- return this;
- }
-
- public static String IN(String col, Collection c) {
- return IN(col, c.size());
- }
-
- public static String IN(String col, T[] c) {
- return IN(col, c.length);
- }
-
- private static String IN(String col, int length) {
- return col + " IN (" + String.valueOf(buildQuestionsList(length)) + ')';
- }
-
- public static String NOT_IN(String col, Collection c) {
- return NOT_IN(col, c.size());
- }
-
- public static String NOT_IN(String col, T[] c) {
- return NOT_IN(col, c.length);
- }
-
- private static String NOT_IN(String col, int length) {
- return col + " NOT IN (" + String.valueOf(buildQuestionsList(length)) + ')';
- }
-
- private static char[] buildQuestionsList(int times) {
- char[] arr = new char[times * 3 - 2];
- int i = 0;
- for (int t = 1; t <= times; t++) {
- arr[i++] = '?';
- if (t < times) {
- arr[i++] = ',';
- arr[i++] = ' ';
- }
- }
- return arr;
- }
-}
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/sql/MyBatisSql.java b/src/main/java/xyz/zhouxy/plusone/commons/sql/MyBatisSql.java
deleted file mode 100644
index 3592205..0000000
--- a/src/main/java/xyz/zhouxy/plusone/commons/sql/MyBatisSql.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2023-2024 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package xyz.zhouxy.plusone.commons.sql;
-
-import com.google.common.annotations.Beta;
-
-@Beta
-public class MyBatisSql extends SQL {
-
- private final boolean withScript;
-
- MyBatisSql(boolean withScript) {
- super();
- this.withScript = withScript;
- }
-
- public static MyBatisSql newSql() {
- return new MyBatisSql(false);
- }
-
- public static MyBatisSql newScriptSql() {
- return new MyBatisSql(true);
- }
-
- @Override
- public MyBatisSql getSelf() {
- return this;
- }
-
- public static String IN(String col, String paramName) {
- return " " + col + " IN" + buildForeach(col, paramName);
- }
-
- public static String NOT_IN(String col, String paramName) {
- return col + " NOT IN" + buildForeach(col, paramName);
- }
-
- private static String buildForeach(String col, String paramName) {
- final String format = "" +
- "#{%s}" +
- "";
- return String.format(format, col, paramName, col);
- }
-
- @Override
- public String toString() {
- if (withScript) {
- return "";
- }
- return super.toString();
- }
-}
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/sql/SQL.java b/src/main/java/xyz/zhouxy/plusone/commons/sql/SQL.java
deleted file mode 100644
index b0ef318..0000000
--- a/src/main/java/xyz/zhouxy/plusone/commons/sql/SQL.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2023-2024 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package xyz.zhouxy.plusone.commons.sql;
-
-import org.apache.ibatis.jdbc.AbstractSQL;
-
-import com.google.common.annotations.Beta;
-
-/**
- * @author ZhouXY
- */
-@Beta
-public abstract class SQL extends AbstractSQL {
-
- public static JdbcSql newJdbcSql() {
- return new JdbcSql();
- }
-
- public static MyBatisSql newMyBatisSql(boolean withScript) {
- return new MyBatisSql(withScript);
- }
-
- public T WHERE(boolean condition, String sqlCondition) {
- if (condition) {
- return WHERE(sqlCondition);
- }
- return getSelf();
- }
-
- public T WHERE(boolean condition, String ifSqlCondition, String elseSqlCondition) {
- return WHERE(condition ? ifSqlCondition : elseSqlCondition);
- }
-}
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/time/Quarter.java b/src/main/java/xyz/zhouxy/plusone/commons/time/Quarter.java
index db2a5f6..279ca23 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/time/Quarter.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/time/Quarter.java
@@ -16,20 +16,23 @@
package xyz.zhouxy.plusone.commons.time;
+import java.time.DateTimeException;
import java.time.Month;
import java.time.MonthDay;
+import java.time.temporal.ChronoField;
-import com.google.common.base.Preconditions;
+import com.google.common.collect.Range;
import xyz.zhouxy.plusone.commons.annotation.StaticFactoryMethod;
-import xyz.zhouxy.plusone.commons.util.Numbers;
+import xyz.zhouxy.plusone.commons.base.IWithIntCode;
+import xyz.zhouxy.plusone.commons.util.AssertTools;
/**
* 季度
*
* @author ZhouXY
*/
-public enum Quarter {
+public enum Quarter implements IWithIntCode {
/** 第一季度 */
Q1(1),
/** 第二季度 */
@@ -43,11 +46,7 @@ public enum Quarter {
/** 季度值 (1/2/3/4) */
private final int value;
- /** 季度开始月份 */
- private final int firstMonth;
-
- /** 季度结束月份 */
- private final int lastMonth;
+ private final Range monthRange;
/** 常量值 */
private static final Quarter[] ENUMS = Quarter.values();
@@ -58,8 +57,10 @@ public enum Quarter {
Quarter(int value) {
this.value = value;
- this.lastMonth = value * 3;
- this.firstMonth = this.lastMonth - 2;
+ final int lastMonth = value * 3;
+ final int firstMonth = lastMonth - 2;
+
+ this.monthRange = Range.closed(firstMonth, lastMonth);
}
// StaticFactoryMethods
@@ -73,7 +74,7 @@ public enum Quarter {
*/
@StaticFactoryMethod(Quarter.class)
public static Quarter fromMonth(int monthValue) {
- Preconditions.checkArgument(Numbers.between(monthValue, 1, 13), "Invalid value for MonthOfYear: " + monthValue);
+ ChronoField.MONTH_OF_YEAR.checkValidValue(monthValue);
return of(computeQuarterValueInternal(monthValue));
}
@@ -109,26 +110,23 @@ public enum Quarter {
*/
@StaticFactoryMethod(Quarter.class)
public static Quarter of(int value) {
- if (value < 1 || value > 4) {
- throw new IllegalArgumentException("Invalid value for Quarter: " + value);
- }
- return ENUMS[value - 1];
+ return ENUMS[checkValidIntValue(value) - 1];
}
// StaticFactoryMethods end
- // computs
+ // computes
- public Quarter plus(long quarters) { // TODO 单元测试
+ public Quarter plus(long quarters) {
final int amount = (int) ((quarters % 4) + 4);
return ENUMS[(ordinal() + amount) % 4];
}
- public Quarter minus(long quarters) { // TODO 单元测试
+ public Quarter minus(long quarters) {
return plus(-(quarters % 4));
}
- // computs end
+ // computes end
// Getters
@@ -136,24 +134,29 @@ public enum Quarter {
return value;
}
+ @Override
+ public int getCode() {
+ return getValue();
+ }
+
public Month firstMonth() {
- return Month.of(firstMonth);
+ return Month.of(firstMonthValue());
}
public int firstMonthValue() {
- return firstMonth;
+ return this.monthRange.lowerEndpoint();
}
public Month lastMonth() {
- return Month.of(lastMonth);
+ return Month.of(lastMonthValue());
}
public int lastMonthValue() {
- return lastMonth;
+ return this.monthRange.upperEndpoint();
}
public MonthDay firstMonthDay() {
- return MonthDay.of(this.firstMonth, 1);
+ return MonthDay.of(firstMonth(), 1);
}
public MonthDay lastMonthDay() {
@@ -163,11 +166,17 @@ public enum Quarter {
}
public int firstDayOfYear(boolean leapYear) {
- return Month.of(this.firstMonth).firstDayOfYear(leapYear);
+ return firstMonth().firstDayOfYear(leapYear);
}
// Getters end
+ public static int checkValidIntValue(int value) {
+ AssertTools.checkCondition(value >= 1 && value <= 4,
+ () -> new DateTimeException("Invalid value for Quarter: " + value));
+ return value;
+ }
+
// Internal
/**
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/time/YearQuarter.java b/src/main/java/xyz/zhouxy/plusone/commons/time/YearQuarter.java
index 2925d99..947b065 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/time/YearQuarter.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/time/YearQuarter.java
@@ -22,16 +22,17 @@ import java.io.Serializable;
import java.time.LocalDate;
import java.time.Month;
import java.time.YearMonth;
+import java.time.temporal.ChronoField;
import java.util.Calendar;
import java.util.Date;
import java.util.Objects;
import javax.annotation.Nonnull;
-import com.google.common.base.Preconditions;
import com.google.errorprone.annotations.Immutable;
import xyz.zhouxy.plusone.commons.annotation.StaticFactoryMethod;
+import xyz.zhouxy.plusone.commons.util.AssertTools;
/**
* 表示年份与季度
@@ -52,14 +53,13 @@ public final class YearQuarter implements Comparable, Serializable
private final LocalDate lastDate;
private YearQuarter(int year, @Nonnull Quarter quarter) {
- Preconditions.checkNotNull(quarter, "Quarter can not be null.");
this.year = year;
this.quarter = quarter;
this.firstDate = quarter.firstMonthDay().atYear(year);
this.lastDate = quarter.lastMonthDay().atYear(year);
}
- // #region - StaticFactoryMethod
+ // #region - StaticFactory
/**
* 根据指定年份与季度，创建 {@link YearQuarter} 实例
@@ -70,7 +70,7 @@ public final class YearQuarter implements Comparable, Serializable
*/
@StaticFactoryMethod(YearQuarter.class)
public static YearQuarter of(int year, int quarter) {
- return of(year, Quarter.of(quarter));
+ return new YearQuarter(YEAR.checkValidIntValue(year), Quarter.of(quarter));
}
/**
@@ -81,8 +81,8 @@ public final class YearQuarter implements Comparable, Serializable
* @return {@link YearQuarter} 实例
*/
@StaticFactoryMethod(YearQuarter.class)
- public static YearQuarter of(int year, @Nonnull Quarter quarter) {
- return new YearQuarter(year, quarter);
+ public static YearQuarter of(int year, Quarter quarter) {
+ return new YearQuarter(YEAR.checkValidIntValue(year), Objects.requireNonNull(quarter));
}
/**
@@ -92,8 +92,9 @@ public final class YearQuarter implements Comparable, Serializable
* @return {@link YearQuarter} 实例
*/
@StaticFactoryMethod(YearQuarter.class)
- public static YearQuarter of(@Nonnull LocalDate date) {
- return of(date.getYear(), Quarter.fromMonth(date.getMonth()));
+ public static YearQuarter of(LocalDate date) {
+ AssertTools.checkNotNull(date);
+ return new YearQuarter(date.getYear(), Quarter.fromMonth(date.getMonth()));
}
/**
@@ -103,12 +104,13 @@ public final class YearQuarter implements Comparable, Serializable
* @return {@link YearQuarter} 实例
*/
@StaticFactoryMethod(YearQuarter.class)
- public static YearQuarter of(@Nonnull Date date) {
+ public static YearQuarter of(Date date) {
+ AssertTools.checkNotNull(date);
@SuppressWarnings("deprecation")
- final int year = date.getYear() + 1900;
+ final int yearValue = YEAR.checkValidIntValue(date.getYear() + 1900L);
@SuppressWarnings("deprecation")
- final int month = date.getMonth() + 1;
- return of(year, Quarter.fromMonth(month));
+ final int monthValue = date.getMonth() + 1;
+ return new YearQuarter(yearValue, Quarter.fromMonth(monthValue));
}
/**
@@ -119,7 +121,10 @@ public final class YearQuarter implements Comparable, Serializable
*/
@StaticFactoryMethod(YearQuarter.class)
public static YearQuarter of(Calendar date) {
- return of(date.get(Calendar.YEAR), Quarter.fromMonth(date.get(Calendar.MONTH) + 1));
+ AssertTools.checkNotNull(date);
+ final int yearValue = ChronoField.YEAR.checkValidIntValue(date.get(Calendar.YEAR));
+ final int monthValue = date.get(Calendar.MONTH) + 1;
+ return new YearQuarter(yearValue, Quarter.fromMonth(monthValue));
}
/**
@@ -130,19 +135,29 @@ public final class YearQuarter implements Comparable, Serializable
*/
@StaticFactoryMethod(YearQuarter.class)
public static YearQuarter of(YearMonth yearMonth) {
+ AssertTools.checkNotNull(yearMonth);
return of(yearMonth.getYear(), Quarter.fromMonth(yearMonth.getMonth()));
}
+ @StaticFactoryMethod(YearQuarter.class)
+ public static YearQuarter now() {
+ return of(LocalDate.now());
+ }
+
// #endregion
// #region - Getters
public int getYear() {
- return year;
+ return this.year;
}
public Quarter getQuarter() {
- return quarter;
+ return this.quarter;
+ }
+
+ public int getQuarterValue() {
+ return this.quarter.getValue();
}
public YearMonth firstYearMonth() {
@@ -181,33 +196,49 @@ public final class YearQuarter implements Comparable, Serializable
// #region - computes
- public YearQuarter plusQuarters(long quartersToAdd) { // TODO 单元测试
- if (quartersToAdd == 0) {
+ public YearQuarter plusQuarters(long quartersToAdd) {
+ if (quartersToAdd == 0L) {
return this;
}
long quarterCount = this.year * 4L + (this.quarter.getValue() - 1);
long calcQuarters = quarterCount + quartersToAdd; // safe overflow
int newYear = YEAR.checkValidIntValue(Math.floorDiv(calcQuarters, 4));
int newQuarter = (int) Math.floorMod(calcQuarters, 4) + 1;
- return of(newYear, Quarter.of(newQuarter));
+ return new YearQuarter(newYear, Quarter.of(newQuarter));
}
- public YearQuarter minusQuarters(long quartersToAdd) { // TODO 单元测试
+ public YearQuarter minusQuarters(long quartersToAdd) {
return plusQuarters(-quartersToAdd);
}
- public YearQuarter plusYears(long yearsToAdd) { // TODO 单元测试
- if (yearsToAdd == 0) {
+ public YearQuarter nextQuarter() {
+ return plusQuarters(1L);
+ }
+
+ public YearQuarter lastQuarter() {
+ return minusQuarters(1L);
+ }
+
+ public YearQuarter plusYears(long yearsToAdd) {
+ if (yearsToAdd == 0L) {
return this;
}
int newYear = YEAR.checkValidIntValue(this.year + yearsToAdd); // safe overflow
- return of(newYear, this.quarter);
+ return new YearQuarter(newYear, this.quarter);
}
public YearQuarter minusYears(long yearsToAdd) {
return plusYears(-yearsToAdd);
}
+ public YearQuarter nextYear() {
+ return plusYears(1L);
+ }
+
+ public YearQuarter lastYear() {
+ return minusYears(1L);
+ }
+
// #endregion
// #region - hashCode & equals
@@ -231,7 +262,7 @@ public final class YearQuarter implements Comparable, Serializable
// #endregion
- // #region - compareTo
+ // #region - compare
@Override
public int compareTo(YearQuarter other) {
@@ -250,6 +281,14 @@ public final class YearQuarter implements Comparable, Serializable
return this.compareTo(other) > 0;
}
+ public static YearQuarter min(YearQuarter yearQuarter1, YearQuarter yearQuarter2) {
+ return yearQuarter1.compareTo(yearQuarter2) <= 0 ? yearQuarter1 : yearQuarter2;
+ }
+
+ public static YearQuarter max(YearQuarter yearQuarter1, YearQuarter yearQuarter2) {
+ return yearQuarter1.compareTo(yearQuarter2) >= 0 ? yearQuarter1 : yearQuarter2;
+ }
+
// #endregion
// #region - toString
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/ArrayTools.java b/src/main/java/xyz/zhouxy/plusone/commons/util/ArrayTools.java
index 1fd381d..8ad67ee 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/util/ArrayTools.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/util/ArrayTools.java
@@ -16,26 +16,45 @@
package xyz.zhouxy.plusone.commons.util;
+import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+/**
+ * ArrayTools
+ *
+ *
+ * 数组工具类
+ *
+ *
+ * @author ZhouXY
+ * @since 0.1.0
+ */
public class ArrayTools {
// #region - empty arrays
public static final char[] EMPTY_CHAR_ARRAY = {};
- public static final int[] EMPTY_INTEGER_ARRAY = {};
+ public static final byte[] EMPTY_BYTE_ARRAY = {};
+ public static final short[] EMPTY_SHORT_ARRAY = {};
+ public static final int[] EMPTY_INT_ARRAY = {};
public static final long[] EMPTY_LONG_ARRAY = {};
public static final float[] EMPTY_FLOAT_ARRAY = {};
public static final double[] EMPTY_DOUBLE_ARRAY = {};
// #endregion
+ public static final int NOT_FOUND_INDEX = -1;
+
// #region - isNullOrEmpty
// isNullOrEmpty
@@ -51,6 +70,61 @@ public class ArrayTools {
return arr == null || arr.length == 0;
}
+ // isNullOrEmpty - char
+ /**
+ * 检查给定数组是否为空
+ *
+ * @param arr 待检查的数组，可以为 {@code null}
+ * @return 如果数组为 {@code null} 或长度为 0，则返回 {@code true}；否则返回 {@code false}
+ */
+ public static boolean isNullOrEmpty(@Nullable char[] arr) {
+ return arr == null || arr.length == 0;
+ }
+
+ // isNullOrEmpty - byte
+ /**
+ * 检查给定数组是否为空
+ *
+ * @param arr 待检查的数组，可以为 {@code null}
+ * @return 如果数组为 {@code null} 或长度为 0，则返回 {@code true}；否则返回 {@code false}
+ */
+ public static boolean isNullOrEmpty(@Nullable byte[] arr) {
+ return arr == null || arr.length == 0;
+ }
+
+ // isNullOrEmpty - short
+ /**
+ * 检查给定数组是否为空
+ *
+ * @param arr 待检查的数组，可以为 {@code null}
+ * @return 如果数组为 {@code null} 或长度为 0，则返回 {@code true}；否则返回 {@code false}
+ */
+ public static boolean isNullOrEmpty(@Nullable short[] arr) {
+ return arr == null || arr.length == 0;
+ }
+
+ // isNullOrEmpty - int
+ /**
+ * 检查给定数组是否为空
+ *
+ * @param arr 待检查的数组，可以为 {@code null}
+ * @return 如果数组为 {@code null} 或长度为 0，则返回 {@code true}；否则返回 {@code false}
+ */
+ public static boolean isNullOrEmpty(@Nullable int[] arr) {
+ return arr == null || arr.length == 0;
+ }
+
+ // isNullOrEmpty - long
+ /**
+ * 检查给定数组是否为空
+ *
+ * @param arr 待检查的数组，可以为 {@code null}
+ * @return 如果数组为 {@code null} 或长度为 0，则返回 {@code true}；否则返回 {@code false}
+ */
+ public static boolean isNullOrEmpty(@Nullable long[] arr) {
+ return arr == null || arr.length == 0;
+ }
+
// isNullOrEmpty - float
/**
* 检查给定数组是否为空
@@ -73,39 +147,6 @@ public class ArrayTools {
return arr == null || arr.length == 0;
}
- // isNullOrEmpty - byte
- /**
- * 检查给定数组是否为空
- *
- * @param arr 待检查的数组，可以为 {@code null}
- * @return 如果数组为 {@code null} 或长度为 0，则返回 {@code true}；否则返回 {@code false}
- */
- public static boolean isNullOrEmpty(@Nullable byte[] arr) {
- return arr == null || arr.length == 0;
- }
-
- // isNullOrEmpty - long
- /**
- * 检查给定数组是否为空
- *
- * @param arr 待检查的数组，可以为 {@code null}
- * @return 如果数组为 {@code null} 或长度为 0，则返回 {@code true}；否则返回 {@code false}
- */
- public static boolean isNullOrEmpty(@Nullable long[] arr) {
- return arr == null || arr.length == 0;
- }
-
- // isNullOrEmpty - int
- /**
- * 检查给定数组是否为空
- *
- * @param arr 待检查的数组，可以为 {@code null}
- * @return 如果数组为 {@code null} 或长度为 0，则返回 {@code true}；否则返回 {@code false}
- */
- public static boolean isNullOrEmpty(@Nullable int[] arr) {
- return arr == null || arr.length == 0;
- }
-
// #endregion
// #region - isNotEmpty
@@ -122,6 +163,61 @@ public class ArrayTools {
return arr != null && arr.length > 0;
}
+ // isNotEmpty - char
+ /**
+ * 检查给定数组是否不为空
+ *
+ * @param arr 待检查的数组，可以为 {@code null}
+ * @return 如果数组不为 {@code null} 且长度大于 0，则返回 {@code true}；否则返回 {@code false}
+ */
+ public static boolean isNotEmpty(@Nullable char[] arr) {
+ return arr != null && arr.length > 0;
+ }
+
+ // isNotEmpty - byte
+ /**
+ * 检查给定数组是否不为空
+ *
+ * @param arr 待检查的数组，可以为 {@code null}
+ * @return 如果数组不为 {@code null} 且长度大于 0，则返回 {@code true}；否则返回 {@code false}
+ */
+ public static boolean isNotEmpty(@Nullable byte[] arr) {
+ return arr != null && arr.length > 0;
+ }
+
+ // isNotEmpty - short
+ /**
+ * 检查给定数组是否不为空
+ *
+ * @param arr 待检查的数组，可以为 {@code null}
+ * @return 如果数组不为 {@code null} 且长度大于 0，则返回 {@code true}；否则返回 {@code false}
+ */
+ public static boolean isNotEmpty(@Nullable short[] arr) {
+ return arr != null && arr.length > 0;
+ }
+
+ // isNotEmpty - int
+ /**
+ * 检查给定数组是否不为空
+ *
+ * @param arr 待检查的数组，可以为 {@code null}
+ * @return 如果数组不为 {@code null} 且长度大于 0，则返回 {@code true}；否则返回 {@code false}
+ */
+ public static boolean isNotEmpty(@Nullable int[] arr) {
+ return arr != null && arr.length > 0;
+ }
+
+ // isNotEmpty - long
+ /**
+ * 检查给定数组是否不为空
+ *
+ * @param arr 待检查的数组，可以为 {@code null}
+ * @return 如果数组不为 {@code null} 且长度大于 0，则返回 {@code true}；否则返回 {@code false}
+ */
+ public static boolean isNotEmpty(@Nullable long[] arr) {
+ return arr != null && arr.length > 0;
+ }
+
// isNotEmpty - float
/**
* 检查给定数组是否不为空
@@ -144,39 +240,6 @@ public class ArrayTools {
return arr != null && arr.length > 0;
}
- // isNotEmpty - byte
- /**
- * 检查给定数组是否不为空
- *
- * @param arr 待检查的数组，可以为 {@code null}
- * @return 如果数组不为 {@code null} 且长度大于 0，则返回 {@code true}；否则返回 {@code false}
- */
- public static boolean isNotEmpty(@Nullable byte[] arr) {
- return arr != null && arr.length > 0;
- }
-
- // isNotEmpty - long
- /**
- * 检查给定数组是否不为空
- *
- * @param arr 待检查的数组，可以为 {@code null}
- * @return 如果数组不为 {@code null} 且长度大于 0，则返回 {@code true}；否则返回 {@code false}
- */
- public static boolean isNotEmpty(@Nullable long[] arr) {
- return arr != null && arr.length > 0;
- }
-
- // isNotEmpty - int
- /**
- * 检查给定数组是否不为空
- *
- * @param arr 待检查的数组，可以为 {@code null}
- * @return 如果数组不为 {@code null} 且长度大于 0，则返回 {@code true}；否则返回 {@code false}
- */
- public static boolean isNotEmpty(@Nullable int[] arr) {
- return arr != null && arr.length > 0;
- }
-
// #endregion
// #region - isAllElementsNotNull
@@ -198,12 +261,7 @@ public class ArrayTools {
*/
public static boolean isAllElementsNotNull(@Nonnull final T[] arr) {
AssertTools.checkArgument(arr != null, "The array cannot be null.");
- for (T element : arr) {
- if (element == null) {
- return false;
- }
- }
- return true;
+ return Arrays.stream(arr).allMatch(Objects::nonNull);
}
// #endregion
@@ -216,14 +274,18 @@ public class ArrayTools {
* @param arrays 数组集合，可以为 {@code null}
* @return 拼接后的数组
*/
- public static float[] concatFloatArray(@Nullable Collection arrays) {
+ public static char[] concatCharArray(@Nullable final Collection arrays) {
if (arrays == null || arrays.isEmpty()) {
- return new float[0];
+ return new char[0];
}
- final int length = arrays.stream().mapToInt(a -> a.length).sum();
- final float[] result = new float[length];
+ final Collection arraysToConcat = arrays
+ .stream()
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+ final int length = arraysToConcat.stream().mapToInt(a -> a.length).sum();
+ final char[] result = new char[length];
int i = 0;
- for (float[] arr : arrays) {
+ for (char[] arr : arraysToConcat) {
System.arraycopy(arr, 0, result, i, arr.length);
i += arr.length;
}
@@ -236,34 +298,18 @@ public class ArrayTools {
* @param arrays 数组集合，可以为 {@code null}
* @return 拼接后的数组
*/
- public static double[] concatDoubleArray(@Nullable Collection arrays) {
- if (arrays == null || arrays.isEmpty()) {
- return new double[0];
- }
- final int length = arrays.stream().mapToInt(a -> a.length).sum();
- final double[] result = new double[length];
- int i = 0;
- for (double[] arr : arrays) {
- System.arraycopy(arr, 0, result, i, arr.length);
- i += arr.length;
- }
- return result;
- }
-
- /**
- * 拼接多个数组
- *
- * @param arrays 数组集合，可以为 {@code null}
- * @return 拼接后的数组
- */
- public static byte[] concatByteArray(@Nullable Collection arrays) {
+ public static byte[] concatByteArray(@Nullable final Collection arrays) {
if (arrays == null || arrays.isEmpty()) {
return new byte[0];
}
- final int length = arrays.stream().mapToInt(a -> a.length).sum();
+ final Collection arraysToConcat = arrays
+ .stream()
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+ final int length = arraysToConcat.stream().mapToInt(a -> a.length).sum();
final byte[] result = new byte[length];
int i = 0;
- for (byte[] arr : arrays) {
+ for (byte[] arr : arraysToConcat) {
System.arraycopy(arr, 0, result, i, arr.length);
i += arr.length;
}
@@ -276,14 +322,18 @@ public class ArrayTools {
* @param arrays 数组集合，可以为 {@code null}
* @return 拼接后的数组
*/
- public static long[] concatLongArray(@Nullable Collection arrays) {
+ public static short[] concatShortArray(@Nullable final Collection arrays) {
if (arrays == null || arrays.isEmpty()) {
- return new long[0];
+ return new short[0];
}
- final int length = arrays.stream().mapToInt(a -> a.length).sum();
- final long[] result = new long[length];
+ final Collection arraysToConcat = arrays
+ .stream()
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+ final int length = arraysToConcat.stream().mapToInt(a -> a.length).sum();
+ final short[] result = new short[length];
int i = 0;
- for (long[] arr : arrays) {
+ for (short[] arr : arraysToConcat) {
System.arraycopy(arr, 0, result, i, arr.length);
i += arr.length;
}
@@ -296,14 +346,90 @@ public class ArrayTools {
* @param arrays 数组集合，可以为 {@code null}
* @return 拼接后的数组
*/
- public static int[] concatIntArray(@Nullable Collection arrays) {
+ public static int[] concatIntArray(@Nullable final Collection arrays) {
if (arrays == null || arrays.isEmpty()) {
return new int[0];
}
- final int length = arrays.stream().mapToInt(a -> a.length).sum();
+ final Collection arraysToConcat = arrays
+ .stream()
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+ final int length = arraysToConcat.stream().mapToInt(a -> a.length).sum();
final int[] result = new int[length];
int i = 0;
- for (int[] arr : arrays) {
+ for (int[] arr : arraysToConcat) {
+ System.arraycopy(arr, 0, result, i, arr.length);
+ i += arr.length;
+ }
+ return result;
+ }
+
+ /**
+ * 拼接多个数组
+ *
+ * @param arrays 数组集合，可以为 {@code null}
+ * @return 拼接后的数组
+ */
+ public static long[] concatLongArray(@Nullable final Collection arrays) {
+ if (arrays == null || arrays.isEmpty()) {
+ return new long[0];
+ }
+ final Collection arraysToConcat = arrays
+ .stream()
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+ final int length = arraysToConcat.stream().mapToInt(a -> a.length).sum();
+ final long[] result = new long[length];
+ int i = 0;
+ for (long[] arr : arraysToConcat) {
+ System.arraycopy(arr, 0, result, i, arr.length);
+ i += arr.length;
+ }
+ return result;
+ }
+
+ /**
+ * 拼接多个数组
+ *
+ * @param arrays 数组集合，可以为 {@code null}
+ * @return 拼接后的数组
+ */
+ public static float[] concatFloatArray(@Nullable final Collection arrays) {
+ if (arrays == null || arrays.isEmpty()) {
+ return new float[0];
+ }
+ final Collection arraysToConcat = arrays
+ .stream()
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+ final int length = arraysToConcat.stream().mapToInt(a -> a.length).sum();
+ final float[] result = new float[length];
+ int i = 0;
+ for (float[] arr : arraysToConcat) {
+ System.arraycopy(arr, 0, result, i, arr.length);
+ i += arr.length;
+ }
+ return result;
+ }
+
+ /**
+ * 拼接多个数组
+ *
+ * @param arrays 数组集合，可以为 {@code null}
+ * @return 拼接后的数组
+ */
+ public static double[] concatDoubleArray(@Nullable final Collection arrays) {
+ if (arrays == null || arrays.isEmpty()) {
+ return new double[0];
+ }
+ final Collection arraysToConcat = arrays
+ .stream()
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+ final int length = arraysToConcat.stream().mapToInt(a -> a.length).sum();
+ final double[] result = new double[length];
+ int i = 0;
+ for (double[] arr : arraysToConcat) {
System.arraycopy(arr, 0, result, i, arr.length);
i += arr.length;
}
@@ -317,17 +443,21 @@ public class ArrayTools {
* @param 泛型参数，表示数组的元素类型
* @return 返回连接后的列表，如果输入的集合为空或包含空数组，则返回空列表
*/
- public static List concatToList(@Nullable Collection arrays) {
+ public static List concatToList(@Nullable final Collection arrays) {
// 如果输入的集合是否为空，则直接返回一个空列表
if (arrays == null || arrays.isEmpty()) {
return Collections.emptyList();
}
+ final Collection arraysToConcat = arrays
+ .stream()
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
// 计算所有数组的总长度，用于初始化列表的容量
- final int length = arrays.stream().mapToInt(a -> a.length).sum();
+ final int length = arraysToConcat.stream().mapToInt(a -> a.length).sum();
final List result = new ArrayList<>(length);
- for (T[] arr : arrays) {
+ for (T[] arr : arraysToConcat) {
Collections.addAll(result, arr);
}
@@ -337,11 +467,162 @@ public class ArrayTools {
// #endregion
+ // #region - repeat
+
+ // repeat - char
+
+ public static char[] repeat(char[] arr, int times) {
+ return repeat(arr, times, Integer.MAX_VALUE);
+ }
+
+ public static char[] repeat(char[] arr, int times, int maxLength) {
+ AssertTools.checkArgument(Objects.nonNull(arr));
+ AssertTools.checkArgument(times >= 0,
+ "The number of times must be greater than or equal to zero");
+ AssertTools.checkArgument(maxLength >= 0,
+ "The max length must be greater than or equal to zero");
+ if (times == 0) {
+ return EMPTY_CHAR_ARRAY;
+ }
+ final int length = Integer.min(arr.length * times, maxLength);
+ final char[] result = new char[length];
+ fill(result, 0, length, arr);
+ return result;
+ }
+
+ // repeat - byte
+
+ public static byte[] repeat(byte[] arr, int times) {
+ return repeat(arr, times, Integer.MAX_VALUE);
+ }
+
+ public static byte[] repeat(byte[] arr, int times, int maxLength) {
+ AssertTools.checkArgument(Objects.nonNull(arr));
+ AssertTools.checkArgument(times >= 0,
+ "The number of times must be greater than or equal to zero");
+ AssertTools.checkArgument(maxLength >= 0,
+ "The max length must be greater than or equal to zero");
+ if (times == 0) {
+ return EMPTY_BYTE_ARRAY;
+ }
+ final int length = Integer.min(arr.length * times, maxLength);
+ final byte[] result = new byte[length];
+ fill(result, 0, length, arr);
+ return result;
+ }
+
+ // repeat - short
+
+ public static short[] repeat(short[] arr, int times) {
+ return repeat(arr, times, Integer.MAX_VALUE);
+ }
+
+ public static short[] repeat(short[] arr, int times, int maxLength) {
+ AssertTools.checkArgument(Objects.nonNull(arr));
+ AssertTools.checkArgument(times >= 0,
+ "The number of times must be greater than or equal to zero");
+ AssertTools.checkArgument(maxLength >= 0,
+ "The max length must be greater than or equal to zero");
+ if (times == 0) {
+ return EMPTY_SHORT_ARRAY;
+ }
+ final int length = Integer.min(arr.length * times, maxLength);
+ final short[] result = new short[length];
+ fill(result, 0, length, arr);
+ return result;
+ }
+
+ // repeat - int
+
+ public static int[] repeat(int[] arr, int times) {
+ return repeat(arr, times, Integer.MAX_VALUE);
+ }
+
+ public static int[] repeat(int[] arr, int times, int maxLength) {
+ AssertTools.checkArgument(Objects.nonNull(arr));
+ AssertTools.checkArgument(times >= 0,
+ "The number of times must be greater than or equal to zero");
+ AssertTools.checkArgument(maxLength >= 0,
+ "The max length must be greater than or equal to zero");
+ if (times == 0) {
+ return EMPTY_INT_ARRAY;
+ }
+ final int length = Integer.min(arr.length * times, maxLength);
+ final int[] result = new int[length];
+ fill(result, 0, length, arr);
+ return result;
+ }
+
+ // repeat - long
+
+ public static long[] repeat(long[] arr, int times) {
+ return repeat(arr, times, Integer.MAX_VALUE);
+ }
+
+ public static long[] repeat(long[] arr, int times, int maxLength) {
+ AssertTools.checkArgument(Objects.nonNull(arr));
+ AssertTools.checkArgument(times >= 0,
+ "The number of times must be greater than or equal to zero");
+ AssertTools.checkArgument(maxLength >= 0,
+ "The max length must be greater than or equal to zero");
+ if (times == 0) {
+ return EMPTY_LONG_ARRAY;
+ }
+ final int length = Integer.min(arr.length * times, maxLength);
+ final long[] result = new long[length];
+ fill(result, 0, length, arr);
+ return result;
+ }
+
+ // repeat - float
+
+ public static float[] repeat(float[] arr, int times) {
+ return repeat(arr, times, Integer.MAX_VALUE);
+ }
+
+ public static float[] repeat(float[] arr, int times, int maxLength) {
+ AssertTools.checkArgument(Objects.nonNull(arr));
+ AssertTools.checkArgument(times >= 0,
+ "The number of times must be greater than or equal to zero");
+ AssertTools.checkArgument(maxLength >= 0,
+ "The max length must be greater than or equal to zero");
+ if (times == 0) {
+ return EMPTY_FLOAT_ARRAY;
+ }
+ final int length = Integer.min(arr.length * times, maxLength);
+ final float[] result = new float[length];
+ fill(result, 0, length, arr);
+ return result;
+ }
+
+ // repeat - double
+
+ public static double[] repeat(double[] arr, int times) {
+ return repeat(arr, times, Integer.MAX_VALUE);
+ }
+
+ public static double[] repeat(double[] arr, int times, int maxLength) {
+ AssertTools.checkArgument(Objects.nonNull(arr));
+ AssertTools.checkArgument(times >= 0,
+ "The number of times must be greater than or equal to zero");
+ AssertTools.checkArgument(maxLength >= 0,
+ "The max length must be greater than or equal to zero");
+ if (times == 0) {
+ return EMPTY_DOUBLE_ARRAY;
+ }
+ final int length = Integer.min(arr.length * times, maxLength);
+ final double[] result = new double[length];
+ fill(result, 0, length, arr);
+ return result;
+ }
+
+ // #endregion
+
// #region - fill
// fill - char
- public static void fill(char[] a, char... values) {
+ public static void fill(char[] a, char[] values) {
fill(a, 0, a.length, values);
}
@@ -349,9 +630,96 @@ public class ArrayTools {
fill(a, 0, a.length, values != null ? values.toCharArray() : EMPTY_CHAR_ARRAY);
}
- public static void fill(char[] a, int fromIndex, int toIndex, char... values) {
- AssertTools.checkArgumentNotNull(a);
- if (values.length == 0) {
+ public static void fill(char[] a, int fromIndex, int toIndex, char[] values) {
+ AssertTools.checkArgument(Objects.nonNull(a));
+ if (values == null || values.length == 0) {
+ return;
+ }
+ final int start = Integer.max(fromIndex, 0);
+ final int end = Integer.min(toIndex, a.length);
+ if (start >= end) {
+ return;
+ }
+ for (int i = start; i < end; i += values.length) {
+ for (int j = 0; j < values.length; j++) {
+ final int k = (i + j);
+ if (k < end) {
+ a[k] = values[j];
+ }
+ else {
+ break;
+ }
+ }
+ }
+ }
+
+ // fill - byte
+
+ public static void fill(byte[] a, byte[] values) {
+ fill(a, 0, a.length, values);
+ }
+
+ public static void fill(byte[] a, int fromIndex, int toIndex, byte[] values) {
+ AssertTools.checkArgument(Objects.nonNull(a));
+ if (values == null || values.length == 0) {
+ return;
+ }
+ final int start = Integer.max(fromIndex, 0);
+ final int end = Integer.min(toIndex, a.length);
+ if (start >= end) {
+ return;
+ }
+ for (int i = start; i < end; i += values.length) {
+ for (int j = 0; j < values.length; j++) {
+ final int k = (i + j);
+ if (k < end) {
+ a[k] = values[j];
+ }
+ else {
+ break;
+ }
+ }
+ }
+ }
+
+ // fill - short
+
+ public static void fill(short[] a, short[] values) {
+ fill(a, 0, a.length, values);
+ }
+
+ public static void fill(short[] a, int fromIndex, int toIndex, short[] values) {
+ AssertTools.checkArgument(Objects.nonNull(a));
+ if (values == null || values.length == 0) {
+ return;
+ }
+ final int start = Integer.max(fromIndex, 0);
+ final int end = Integer.min(toIndex, a.length);
+ if (start >= end) {
+ return;
+ }
+ for (int i = start; i < end; i += values.length) {
+ for (int j = 0; j < values.length; j++) {
+ final int k = (i + j);
+ if (k < end) {
+ a[k] = values[j];
+ }
+ else {
+ break;
+ }
+ }
+ }
+ }
+
+ // fill - int
+
+ public static void fill(int[] a, int[] values) {
+ fill(a, 0, a.length, values);
+ }
+
+ public static void fill(int[] a, int fromIndex, int toIndex, int[] values) {
+ AssertTools.checkArgument(Objects.nonNull(a));
+ if (values == null || values.length == 0) {
return;
}
final int start = Integer.max(fromIndex, 0);
@@ -374,13 +742,13 @@ public class ArrayTools {
// fill - long
- public static void fill(long[] a, long... values) {
+ public static void fill(long[] a, long[] values) {
fill(a, 0, a.length, values);
}
- public static void fill(long[] a, int fromIndex, int toIndex, long... values) {
- AssertTools.checkArgumentNotNull(a);
- if (values.length == 0) {
+ public static void fill(long[] a, int fromIndex, int toIndex, long[] values) {
+ AssertTools.checkArgument(Objects.nonNull(a));
+ if (values == null || values.length == 0) {
return;
}
final int start = Integer.max(fromIndex, 0);
@@ -403,13 +771,13 @@ public class ArrayTools {
// fill - float
- public static void fill(float[] a, float... values) {
+ public static void fill(float[] a, float[] values) {
fill(a, 0, a.length, values);
}
- public static void fill(float[] a, int fromIndex, int toIndex, float... values) {
- AssertTools.checkArgumentNotNull(a);
- if (values.length == 0) {
+ public static void fill(float[] a, int fromIndex, int toIndex, float[] values) {
+ AssertTools.checkArgument(Objects.nonNull(a));
+ if (values == null || values.length == 0) {
return;
}
final int start = Integer.max(fromIndex, 0);
@@ -432,13 +800,13 @@ public class ArrayTools {
// fill - double
- public static void fill(double[] a, double... values) {
+ public static void fill(double[] a, double[] values) {
fill(a, 0, a.length, values);
}
- public static void fill(double[] a, int fromIndex, int toIndex, double... values) {
- AssertTools.checkArgumentNotNull(a);
- if (values.length == 0) {
+ public static void fill(double[] a, int fromIndex, int toIndex, double[] values) {
+ AssertTools.checkArgument(Objects.nonNull(a));
+ if (values == null || values.length == 0) {
return;
}
final int start = Integer.max(fromIndex, 0);
@@ -470,7 +838,7 @@ public class ArrayTools {
}
private static void fillInternal(@Nonnull T[] a, int fromIndex, int toIndex, @Nullable T[] values) {
- AssertTools.checkArgumentNotNull(a);
+ AssertTools.checkArgument(Objects.nonNull(a));
if (values == null || values.length == 0) {
return;
}
@@ -494,6 +862,256 @@ public class ArrayTools {
// #endregion
+ // #region - indexOf
+
+ public static int indexOfWithPredicate(T[] arr, Predicate predicate) {
+ AssertTools.checkNotNull(predicate);
+ if (isNullOrEmpty(arr)) {
+ return NOT_FOUND_INDEX;
+ }
+ for (int i = 0; i < arr.length; i++) {
+ if (predicate.test(arr[i])) {
+ return i;
+ }
+ }
+ return NOT_FOUND_INDEX;
+ }
+
+ public static int indexOf(T[] arr, T obj) {
+ return indexOfWithPredicate(arr, item -> Objects.equals(item, obj));
+ }
+
+ public static int indexOf(char[] arr, char value) {
+ if (isNullOrEmpty(arr)) {
+ return NOT_FOUND_INDEX;
+ }
+ for (int i = 0; i < arr.length; i++) {
+ if (arr[i] == value) {
+ return i;
+ }
+ }
+ return NOT_FOUND_INDEX;
+ }
+
+ public static int indexOf(byte[] arr, byte value) {
+ if (isNullOrEmpty(arr)) {
+ return NOT_FOUND_INDEX;
+ }
+ for (int i = 0; i < arr.length; i++) {
+ if (arr[i] == value) {
+ return i;
+ }
+ }
+ return NOT_FOUND_INDEX;
+ }
+
+ public static int indexOf(short[] arr, short value) {
+ if (isNullOrEmpty(arr)) {
+ return NOT_FOUND_INDEX;
+ }
+ for (int i = 0; i < arr.length; i++) {
+ if (arr[i] == value) {
+ return i;
+ }
+ }
+ return NOT_FOUND_INDEX;
+ }
+
+ public static int indexOf(int[] arr, int value) {
+ if (isNullOrEmpty(arr)) {
+ return NOT_FOUND_INDEX;
+ }
+ for (int i = 0; i < arr.length; i++) {
+ if (arr[i] == value) {
+ return i;
+ }
+ }
+ return NOT_FOUND_INDEX;
+ }
+
+ public static int indexOf(long[] arr, long value) {
+ if (isNullOrEmpty(arr)) {
+ return NOT_FOUND_INDEX;
+ }
+ for (int i = 0; i < arr.length; i++) {
+ if (arr[i] == value) {
+ return i;
+ }
+ }
+ return NOT_FOUND_INDEX;
+ }
+
+ public static int indexOf(float[] arr, float value) {
+ if (isNullOrEmpty(arr)) {
+ return NOT_FOUND_INDEX;
+ }
+ for (int i = 0; i < arr.length; i++) {
+ if (arr[i] == value) {
+ return i;
+ }
+ }
+ return NOT_FOUND_INDEX;
+ }
+
+ public static int indexOf(double[] arr, double value) {
+ if (isNullOrEmpty(arr)) {
+ return NOT_FOUND_INDEX;
+ }
+ for (int i = 0; i < arr.length; i++) {
+ if (arr[i] == value) {
+ return i;
+ }
+ }
+ return NOT_FOUND_INDEX;
+ }
+
+ // #endregion
+
+ // #region - lastIndexOf
+
+ public static int lastIndexOfWithPredicate(T[] arr, @Nonnull Predicate predicate) {
+ AssertTools.checkNotNull(predicate);
+ if (isNullOrEmpty(arr)) {
+ return NOT_FOUND_INDEX;
+ }
+ for (int i = arr.length - 1; i >= 0; i--) {
+ if (predicate.test(arr[i])) {
+ return i;
+ }
+ }
+ return NOT_FOUND_INDEX;
+ }
+
+ public static int lastIndexOf(T[] arr, T obj) {
+ return lastIndexOfWithPredicate(arr, item -> Objects.equals(item, obj));
+ }
+
+ public static int lastIndexOf(char[] arr, char value) {
+ if (isNullOrEmpty(arr)) {
+ return NOT_FOUND_INDEX;
+ }
+ for (int i = arr.length - 1; i >= 0; i--) {
+ if (value == arr[i]) {
+ return i;
+ }
+ }
+ return NOT_FOUND_INDEX;
+ }
+
+ public static int lastIndexOf(byte[] arr, byte value) {
+ if (isNullOrEmpty(arr)) {
+ return NOT_FOUND_INDEX;
+ }
+ for (int i = arr.length - 1; i >= 0; i--) {
+ if (value == arr[i]) {
+ return i;
+ }
+ }
+ return NOT_FOUND_INDEX;
+ }
+
+ public static int lastIndexOf(short[] arr, short value) {
+ if (isNullOrEmpty(arr)) {
+ return NOT_FOUND_INDEX;
+ }
+ for (int i = arr.length - 1; i >= 0; i--) {
+ if (value == arr[i]) {
+ return i;
+ }
+ }
+ return NOT_FOUND_INDEX;
+ }
+
+ public static int lastIndexOf(int[] arr, int value) {
+ if (isNullOrEmpty(arr)) {
+ return NOT_FOUND_INDEX;
+ }
+ for (int i = arr.length - 1; i >= 0; i--) {
+ if (value == arr[i]) {
+ return i;
+ }
+ }
+ return NOT_FOUND_INDEX;
+ }
+
+ public static int lastIndexOf(long[] arr, long value) {
+ if (isNullOrEmpty(arr)) {
+ return NOT_FOUND_INDEX;
+ }
+ for (int i = arr.length - 1; i >= 0; i--) {
+ if (value == arr[i]) {
+ return i;
+ }
+ }
+ return NOT_FOUND_INDEX;
+ }
+
+ public static int lastIndexOf(float[] arr, float value) {
+ if (isNullOrEmpty(arr)) {
+ return NOT_FOUND_INDEX;
+ }
+ for (int i = arr.length - 1; i >= 0; i--) {
+ if (value == arr[i]) {
+ return i;
+ }
+ }
+ return NOT_FOUND_INDEX;
+ }
+
+ public static int lastIndexOf(double[] arr, double value) {
+ if (isNullOrEmpty(arr)) {
+ return NOT_FOUND_INDEX;
+ }
+ for (int i = arr.length - 1; i >= 0; i--) {
+ if (value == arr[i]) {
+ return i;
+ }
+ }
+ return NOT_FOUND_INDEX;
+ }
+
+ // #endregion
+
+ // #region - contains
+
+ public static boolean contains(T[] arr, T obj) {
+ return indexOf(arr, obj) > NOT_FOUND_INDEX;
+ }
+
+ public static boolean contains(char[] arr, char obj) {
+ return indexOf(arr, obj) > NOT_FOUND_INDEX;
+ }
+
+ public static boolean contains(byte[] arr, byte obj) {
+ return indexOf(arr, obj) > NOT_FOUND_INDEX;
+ }
+
+ public static boolean contains(short[] arr, short obj) {
+ return indexOf(arr, obj) > NOT_FOUND_INDEX;
+ }
+
+ public static boolean contains(int[] arr, int obj) {
+ return indexOf(arr, obj) > NOT_FOUND_INDEX;
+ }
+
+ public static boolean contains(long[] arr, long obj) {
+ return indexOf(arr, obj) > NOT_FOUND_INDEX;
+ }
+
+ public static boolean contains(float[] arr, float obj) {
+ return indexOf(arr, obj) > NOT_FOUND_INDEX;
+ }
+
+ public static boolean contains(double[] arr, double obj) {
+ return indexOf(arr, obj) > NOT_FOUND_INDEX;
+ }
+
+ public static boolean containsValue(BigDecimal[] arr, BigDecimal obj) {
+ return indexOfWithPredicate(arr, item -> BigDecimals.equalsValue(item, obj)) > NOT_FOUND_INDEX;
+ }
+
+ // #endregion
+
// #region - private constructor
private ArrayTools() {
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/AssertTools.java b/src/main/java/xyz/zhouxy/plusone/commons/util/AssertTools.java
index 8212eb7..cf31308 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/util/AssertTools.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/util/AssertTools.java
@@ -16,10 +16,15 @@
package xyz.zhouxy.plusone.commons.util;
+import java.util.Objects;
+import java.util.Optional;
import java.util.function.Supplier;
import javax.annotation.Nonnull;
+import xyz.zhouxy.plusone.commons.exception.DataNotExistsException;
+import xyz.zhouxy.plusone.commons.exception.system.DataOperationResultException;
+
/**
* 断言工具
*
@@ -30,91 +35,249 @@ import javax.annotation.Nonnull;
*
* AssertTools.checkArgument(StringUtils.hasText(str), "The argument cannot be blank.");
* AssertTools.checkState(ArrayUtils.isNotEmpty(result), "The result cannot be empty.");
- * AssertTools.checkCondition(!CollectionUtils.isEmpty(roles), () -> new InvalidInputException("The roles cannot be empty."));
- * AssertTools.checkCondition(RegexTools.matches(email, PatternConsts.EMAIL), "must be a well-formed email address");
+ * AssertTools.checkCondition(!CollectionUtils.isEmpty(roles),
+ * () -> new InvalidInputException("The roles cannot be empty."));
+ * AssertTools.checkCondition(RegexTools.matches(email, PatternConsts.EMAIL),
+ * "must be a well-formed email address");
*
*
* @author ZhouXY
*/
public class AssertTools {
- // #region - checkArgument
-
- public static void checkArgumentNotNull(T argument) {
- checkCondition(argument != null, () -> new IllegalArgumentException("The argument cannot be null."));
- }
-
- public static void checkArgumentNotNull(T argument, String errMsg) {
- checkCondition(argument != null, () -> new IllegalArgumentException(errMsg));
- }
-
- public static void checkArgumentNotNull(T argument, Supplier messageSupplier) {
- checkCondition(argument != null, () -> new IllegalArgumentException(messageSupplier.get()));
- }
-
- public static void checkArgumentNotNull(T argument, String format, Object... args) {
- checkCondition(argument != null, () -> new IllegalArgumentException(String.format(format, args)));
- }
+ // ================================
+ // #region - Argument
+ // ================================
+ /** Throw {@link IllegalArgumentException} if the {@code condition} is false. */
public static void checkArgument(boolean condition) {
checkCondition(condition, IllegalArgumentException::new);
}
+ /** Throw {@link IllegalArgumentException} if the {@code condition} is false. */
public static void checkArgument(boolean condition, String errMsg) {
checkCondition(condition, () -> new IllegalArgumentException(errMsg));
}
- public static void checkArgument(boolean condition, Supplier messageSupplier) {
+ /** Throw {@link IllegalArgumentException} if the {@code condition} is false. */
+ public static void checkArgument(boolean condition, @Nonnull Supplier messageSupplier) {
checkCondition(condition, () -> new IllegalArgumentException(messageSupplier.get()));
}
+ /** Throw {@link IllegalArgumentException} if the {@code condition} is false. */
public static void checkArgument(boolean condition, String format, Object... args) {
checkCondition(condition, () -> new IllegalArgumentException(String.format(format, args)));
}
- // #endregion
+ // ================================
+ // #endregion - Argument
+ // ================================
- // #region - checkState
+ // ================================
+ // #region - State
+ // ================================
+ /** Throw {@link IllegalStateException} if the {@code condition} is false. */
public static void checkState(boolean condition) {
checkCondition(condition, IllegalStateException::new);
}
+ /** Throw {@link IllegalStateException} if the {@code condition} is false. */
public static void checkState(boolean condition, String errMsg) {
checkCondition(condition, () -> new IllegalStateException(errMsg));
}
- public static void checkState(boolean condition, Supplier messageSupplier) {
+ /** Throw {@link IllegalStateException} if the {@code condition} is false. */
+ public static void checkState(boolean condition, @Nonnull Supplier messageSupplier) {
checkCondition(condition, () -> new IllegalStateException(messageSupplier.get()));
}
+ /** Throw {@link IllegalStateException} if the {@code condition} is false. */
public static void checkState(boolean condition, String format, Object... args) {
checkCondition(condition, () -> new IllegalStateException(String.format(format, args)));
}
+ // ================================
// #endregion
+ // ================================
- // #region - checkNotNull
+ // ================================
+ // #region - NotNull
+ // ================================
+ /** Throw {@link NullPointerException} if the {@code obj} is null. */
public static void checkNotNull(T obj) {
checkCondition(obj != null, NullPointerException::new);
}
+ /** Throw {@link NullPointerException} if the {@code obj} is null. */
public static void checkNotNull(T obj, String errMsg) {
checkCondition(obj != null, () -> new NullPointerException(errMsg));
}
- public static void checkNotNull(T obj, Supplier messageSupplier) {
+ /** Throw {@link NullPointerException} if the {@code obj} is null. */
+ public static void checkNotNull(T obj, @Nonnull Supplier messageSupplier) {
checkCondition(obj != null, () -> new NullPointerException(messageSupplier.get()));
}
+ /** Throw {@link NullPointerException} if the {@code obj} is null. */
public static void checkNotNull(T obj, String format, Object... args) {
checkCondition(obj != null, () -> new NullPointerException(String.format(format, args)));
}
+ // ================================
// #endregion
+ // ================================
- // #region - checkCondition
+ // ================================
+ // #region - Exists
+ // ================================
+
+ /** Throw {@link DataNotExistsException} if the {@code obj} is null. */
+ public static T checkExists(T obj)
+ throws DataNotExistsException {
+ checkCondition(Objects.nonNull(obj), DataNotExistsException::new);
+ return obj;
+ }
+
+ /** Throw {@link DataNotExistsException} if the {@code obj} is null. */
+ public static T checkExists(T obj, String message)
+ throws DataNotExistsException {
+ checkCondition(Objects.nonNull(obj), () -> new DataNotExistsException(message));
+ return obj;
+ }
+
+ /** Throw {@link DataNotExistsException} if the {@code obj} is null. */
+ public static T checkExists(T obj, @Nonnull Supplier messageSupplier)
+ throws DataNotExistsException {
+ checkCondition(Objects.nonNull(obj), () -> new DataNotExistsException(messageSupplier.get()));
+ return obj;
+ }
+
+ /** Throw {@link DataNotExistsException} if the {@code obj} is null. */
+ public static T checkExists(T obj, String format, Object... args)
+ throws DataNotExistsException {
+ checkCondition(Objects.nonNull(obj), () -> new DataNotExistsException(String.format(format, args)));
+ return obj;
+ }
+
+ /** Throw {@link DataNotExistsException} if the {@code optional} is present. */
+ public static T checkExists(@Nonnull Optional optional)
+ throws DataNotExistsException {
+ checkCondition(optional.isPresent(), DataNotExistsException::new);
+ return optional.get();
+ }
+
+ /** Throw {@link DataNotExistsException} if the {@code optional} is present. */
+ public static T checkExists(@Nonnull Optional optional, String message)
+ throws DataNotExistsException {
+ checkCondition(optional.isPresent(), () -> new DataNotExistsException(message));
+ return optional.get();
+ }
+
+ /** Throw {@link DataNotExistsException} if the {@code optional} is present. */
+ public static T checkExists(@Nonnull Optional optional, @Nonnull Supplier messageSupplier)
+ throws DataNotExistsException {
+ checkCondition(optional.isPresent(), () -> new DataNotExistsException(messageSupplier.get()));
+ return optional.get();
+ }
+
+ /** Throw {@link DataNotExistsException} if the {@code optional} is present. */
+ public static T checkExists(@Nonnull Optional optional, String format, Object... args)
+ throws DataNotExistsException {
+ checkCondition(optional.isPresent(), () -> new DataNotExistsException(String.format(format, args)));
+ return optional.get();
+ }
+
+ // ================================
+ // #endregion - Exists
+ // ================================
+
+ // ================================
+ // #region - AffectedRows
+ // ================================
+
+ public static void checkAffectedRows(int expectedValue, int result) {
+ checkAffectedRows(expectedValue, result,
+ "The number of rows affected is expected to be %d, but is: %d", expectedValue, result);
+ }
+
+ public static void checkAffectedRows(int expectedValue, int result, String message) {
+ checkCondition(expectedValue == result, () -> new DataOperationResultException(message));
+ }
+
+ public static void checkAffectedRows(int expectedValue, int result,
+ @Nonnull Supplier messageSupplier) {
+ checkCondition(expectedValue == result,
+ () -> new DataOperationResultException(messageSupplier.get()));
+ }
+
+ public static void checkAffectedRows(int expectedValue, int result, String format, Object... args) {
+ checkCondition(expectedValue == result,
+ () -> new DataOperationResultException(String.format(format, args)));
+ }
+
+ public static void checkAffectedRows(long expectedValue, long result) {
+ checkAffectedRows(expectedValue, result,
+ "The number of rows affected is expected to be %d, but is: %d", expectedValue, result);
+ }
+
+ public static void checkAffectedRows(long expectedValue, long result, String message) {
+ checkCondition(expectedValue == result, () -> new DataOperationResultException(message));
+ }
+
+ public static void checkAffectedRows(long expectedValue, long result,
+ @Nonnull Supplier messageSupplier) {
+ checkCondition(expectedValue == result,
+ () -> new DataOperationResultException(messageSupplier.get()));
+ }
+
+ public static void checkAffectedRows(long expectedValue, long result, String format, Object... args) {
+ checkCondition(expectedValue == result,
+ () -> new DataOperationResultException(String.format(format, args)));
+ }
+
+ public static void checkAffectedOneRow(int result) {
+ checkAffectedRows(1, result,
+ () -> "The number of rows affected is expected to be 1, but is: " + result);
+ }
+
+ public static void checkAffectedOneRow(int result, String message) {
+ checkAffectedRows(1, result, message);
+ }
+
+ public static void checkAffectedOneRow(int result, @Nonnull Supplier messageSupplier) {
+ checkAffectedRows(1, result, messageSupplier);
+ }
+
+ public static void checkAffectedOneRow(int result, String format, Object... args) {
+ checkAffectedRows(1, result, format, args);
+ }
+
+ public static void checkAffectedOneRow(long result) {
+ checkAffectedRows(1L, result,
+ () -> "The number of rows affected is expected to be 1, but is: " + result);
+ }
+
+ public static void checkAffectedOneRow(long result, String message) {
+ checkAffectedRows(1L, result, message);
+ }
+
+ public static void checkAffectedOneRow(long result, @Nonnull Supplier messageSupplier) {
+ checkAffectedRows(1L, result, messageSupplier);
+ }
+
+ public static void checkAffectedOneRow(long result, String format, Object... args) {
+ checkAffectedRows(1L, result, format, args);
+ }
+
+ // ================================
+ // #endregion - AffectedRows
+ // ================================
+
+ // ================================
+ // #region - Condition
+ // ================================
public static void checkCondition(boolean condition, @Nonnull Supplier e)
throws T {
@@ -123,13 +286,19 @@ public class AssertTools {
}
}
+ // ================================
// #endregion
+ // ================================
- // #region - private constructor
+ // ================================
+ // #region - constructor
+ // ================================
private AssertTools() {
throw new IllegalStateException("Utility class");
}
+ // ================================
// #endregion
+ // ================================
}
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/BigDecimals.java b/src/main/java/xyz/zhouxy/plusone/commons/util/BigDecimals.java
index 90a707e..1b006c7 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/util/BigDecimals.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/util/BigDecimals.java
@@ -17,21 +17,31 @@
package xyz.zhouxy.plusone.commons.util;
import java.math.BigDecimal;
-import javax.annotation.Nullable;
-import com.google.common.base.Preconditions;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import xyz.zhouxy.plusone.commons.annotation.StaticFactoryMethod;
+/**
+ * BigDecimals
+ *
+ *
+ * BigDecimal 工具类
+ *
+ *
+ * @author ZhouXY
+ * @since 0.1.0
+ */
public class BigDecimals {
public static boolean equalsValue(@Nullable BigDecimal a, @Nullable BigDecimal b) {
- return (a == b) || (a != null && a.compareTo(b) == 0);
+ return (a == b) || (a != null && b != null && a.compareTo(b) == 0);
}
public static boolean gt(BigDecimal a, BigDecimal b) {
- Preconditions.checkNotNull(a, "Parameter could not be null.");
- Preconditions.checkNotNull(b, "Parameter could not be null.");
+ AssertTools.checkNotNull(a, "Parameter could not be null.");
+ AssertTools.checkNotNull(b, "Parameter could not be null.");
return (a != b) && (a.compareTo(b) > 0);
}
@@ -40,8 +50,8 @@ public class BigDecimals {
}
public static boolean lt(BigDecimal a, BigDecimal b) {
- Preconditions.checkNotNull(a, "Parameter could not be null.");
- Preconditions.checkNotNull(b, "Parameter could not be null.");
+ AssertTools.checkNotNull(a, "Parameter could not be null.");
+ AssertTools.checkNotNull(b, "Parameter could not be null.");
return (a != b) && (a.compareTo(b) < 0);
}
@@ -49,6 +59,25 @@ public class BigDecimals {
return lt(a, b) || equalsValue(a, b);
}
+ public static BigDecimal sum(final BigDecimal... numbers) {
+ if (ArrayTools.isNullOrEmpty(numbers)) {
+ return BigDecimal.ZERO;
+ }
+ BigDecimal result = BigDecimals.nullToZero(numbers[0]);
+ for (int i = 1; i < numbers.length; i++) {
+ BigDecimal value = numbers[i];
+ if (value != null) {
+ result = result.add(value);
+ }
+ }
+ return result;
+ }
+
+ @Nonnull
+ public static BigDecimal nullToZero(@Nullable final BigDecimal val) {
+ return val != null ? val : BigDecimal.ZERO;
+ }
+
@StaticFactoryMethod(BigDecimal.class)
public static BigDecimal of(final String val) {
return (StringTools.isNotBlank(val)) ? new BigDecimal(val) : BigDecimal.ZERO;
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/ConcurrentHashMapTools.java b/src/main/java/xyz/zhouxy/plusone/commons/util/ConcurrentHashMapTools.java
deleted file mode 100644
index c36ecf0..0000000
--- a/src/main/java/xyz/zhouxy/plusone/commons/util/ConcurrentHashMapTools.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2023-2024 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package xyz.zhouxy.plusone.commons.util;
-
-import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Function;
-
-import xyz.zhouxy.plusone.commons.base.JRE;
-import xyz.zhouxy.plusone.commons.collection.SafeConcurrentHashMap;
-
-/**
- * ConcurrentHashMapTools
- *
- *
- * Java 8 的 {@link ConcurrentHashMap#computeIfAbsent(Object, Function)} 方法有 bug，
- * 可使用这个工具类的 {@link computeIfAbsentForJava8} 进行替换。
- *
- *
- * NOTE: 方法来自Dubbo，见：issues#2349
- *
- * @author ZhouXY
- * @since 1.0
- * @see ConcurrentHashMap
- * @see SafeConcurrentHashMap
- */
-public class ConcurrentHashMapTools {
-
- public static V computeIfAbsent(
- ConcurrentHashMap map, final K key, // NOSONAR
- final Function mappingFunction) {
- Objects.requireNonNull(map, "map");
- return JRE.isJava8()
- ? computeIfAbsentForJava8(map, key, mappingFunction)
- : map.computeIfAbsent(key, mappingFunction);
- }
-
- public static V computeIfAbsentForJava8(
- ConcurrentHashMap map, final K key, // NOSONAR
- final Function mappingFunction) {
- Objects.requireNonNull(key);
- Objects.requireNonNull(mappingFunction);
- V v = map.get(key);
- if (null == v) {
- v = mappingFunction.apply(key);
- if (null == v) {
- return null;
- }
- final V res = map.putIfAbsent(key, v);
- if (null != res) {
- return res;
- }
- }
- return v;
- }
-
- private ConcurrentHashMapTools() {
- throw new IllegalStateException("Utility class");
- }
-}
diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/DateTimeTools.java b/src/main/java/xyz/zhouxy/plusone/commons/util/DateTimeTools.java
index c2597fe..e580706 100644
--- a/src/main/java/xyz/zhouxy/plusone/commons/util/DateTimeTools.java
+++ b/src/main/java/xyz/zhouxy/plusone/commons/util/DateTimeTools.java
@@ -16,24 +16,23 @@
package xyz.zhouxy.plusone.commons.util;
+import static java.time.temporal.ChronoField.*;
+
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.Month;
+import java.time.Year;
import java.time.YearMonth;
import java.time.ZoneId;
import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
+import java.time.chrono.IsoChronology;
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
-import javax.annotation.Nonnull;
-
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
+import com.google.common.collect.Range;
import xyz.zhouxy.plusone.commons.time.Quarter;
import xyz.zhouxy.plusone.commons.time.YearQuarter;
@@ -45,86 +44,35 @@ import xyz.zhouxy.plusone.commons.time.YearQuarter;
*/
public class DateTimeTools {
- /**
- * 缓存时间格式化器
- */
- private static final LoadingCache