Merge pull request '合并更改。' (#1) from dev into master

Reviewed-on: #1

pom.xml

@@ -14,19 +14,38 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <lombok.version>1.18.24</lombok.version>
         <jackson.version>2.13.4</jackson.version>
+        <google-jsr305.version>3.0.2</google-jsr305.version>
+        <guava.version>31.1-jre</guava.version>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>org.projectlombok</groupId>
+            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>lombok</artifactId>
+            <artifactId>jsr305</artifactId>
-            <version>${lombok.version}</version>
+            <version>${google-jsr305.version}</version>
-            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
             <version>${jackson.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.9.2</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

src/main/java/xyz/zhouxy/plusone/commons/constant/PatternConsts.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2022-2023 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.constant;
 
 import java.util.regex.Pattern;

src/main/java/xyz/zhouxy/plusone/commons/constant/RegexConsts.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2022-2023 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.constant;
 
 /**

src/main/java/xyz/zhouxy/plusone/commons/exception/BaseException.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2022-2023 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;
 
 /**

src/main/java/xyz/zhouxy/plusone/commons/exception/IWithCode.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2022-2023 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;
 
 /**

src/main/java/xyz/zhouxy/plusone/commons/util/Arrays2.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2022-2023 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;
 
 public abstract class Arrays2 {
@@ -31,6 +47,14 @@ public abstract class Arrays2 {
         return values;
     }
 
+    public static double[] of(final double... values) {
+        return values;
+    }
+
+    public static float[] of(final float... values) {
+        return values;
+    }
+
     private Arrays2() {
         throw new IllegalStateException("Utility class");
     }

src/main/java/xyz/zhouxy/plusone/commons/util/EnumUtil.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2022-2023 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;

src/main/java/xyz/zhouxy/plusone/commons/util/Enumeration.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2022-2023 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.Map;
@@ -43,9 +59,7 @@ public abstract class Enumeration<T extends Enumeration<T>> {
 
     @Override
     public String toString() {
-        StringBuilder builder = new StringBuilder();
+        return "[" + value + ": " + name + "]";
-        builder.append("[").append(value).append(": ").append(name).append("]");
-        return builder.toString();
     }
 
     protected static final class EnumerationValuesHolder<T extends Enumeration<T>> {

src/main/java/xyz/zhouxy/plusone/commons/util/NumberUtil.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2022-2023 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;
 
 /**
@@ -11,7 +27,15 @@ public class NumberUtil {
         throw new IllegalStateException("Utility class");
     }
 
-    public static int sum(int... numbers) {
+    public static int sum(short... numbers) {
+        int result = 0;
+        for (short number : numbers) {
+            result += number;
+        }
+        return result;
+    }
+
+    public static long sum(int... numbers) {
         int result = 0;
         for (int number : numbers) {
             result += number;
@@ -26,4 +50,20 @@ public class NumberUtil {
         }
         return result;
     }
+
+    public static double sum(float... numbers) {
+        double result = 0;
+        for (double number : numbers) {
+            result += number;
+        }
+        return result;
+    }
+
+    public static double sum(double... numbers) {
+        double result = 0;
+        for (double number : numbers) {
+            result += number;
+        }
+        return result;
+    }
 }

src/main/java/xyz/zhouxy/plusone/commons/util/PageDTO.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2022-2023 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.List;

src/main/java/xyz/zhouxy/plusone/commons/util/PagingAndSortingQueryParams.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2022-2023 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.Arrays;

src/main/java/xyz/zhouxy/plusone/commons/util/RegexUtil.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2022-2023 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.regex.Pattern;

src/main/java/xyz/zhouxy/plusone/commons/util/RestfulResult.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2022-2023 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 com.fasterxml.jackson.annotation.JsonInclude;

src/test/java/xyz/zhouxy/plusone/commons/EnumerationTests.java

@@ -0,0 +1,39 @@
+package xyz.zhouxy.plusone.commons;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+import xyz.zhouxy.plusone.commons.util.Enumeration;
+
+class EnumerationTests {
+
+    @Test
+    void testEnumeration() {
+        assertEquals(EntityStatus.AVAILABLE, EntityStatus.of(0));
+    }
+}
+
+final class EntityStatus extends Enumeration<EntityStatus> {
+
+    private EntityStatus(int value, String name) {
+        super(value, name);
+    }
+
+    // 常量
+    public static final EntityStatus AVAILABLE = new EntityStatus(0, "正常");
+    public static final EntityStatus DISABLED = new EntityStatus(1, "禁用");
+
+    private static final EnumerationValuesHolder<EntityStatus> ENUMERATION_VALUES = new EnumerationValuesHolder<>(
+            AVAILABLE,
+            DISABLED);
+
+    public static EntityStatus of(int value) {
+        return ENUMERATION_VALUES.get(value);
+    }
+
+    @Override
+    public String toString() {
+        return "EntityStatus" + super.toString();
+    }
+}

src/test/java/xyz/zhouxy/plusone/commons/util/NumberUtilTest.java

@@ -0,0 +1,35 @@
+package xyz.zhouxy.plusone.commons.util;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+class NumberUtilTest {
+    @Test
+    void testSum() {
+        long result = 0;
+        for (int i = 0; i < Integer.MAX_VALUE; i++) {
+            result += Short.MAX_VALUE;
+        }
+        System.out.println("Integer.MAX_VALUE: " + Integer.MAX_VALUE);
+        System.out.println("result: " + result);
+        assertFalse(Integer.MAX_VALUE > result);
+
+        result = 0;
+        for (int i = 0; i < Integer.MAX_VALUE; i++) {
+            result += Short.MAX_VALUE;
+        }
+        System.out.println("Long.MAX_VALUE: " + Long.MAX_VALUE);
+        System.out.println("result: " + result);
+        assertTrue(Long.MAX_VALUE > result);
+
+        result = 0;
+        for (int i = 0; i < Integer.MAX_VALUE; i++) {
+            result += Integer.MAX_VALUE;
+        }
+        System.out.println("Long.MAX_VALUE: " + Long.MAX_VALUE);
+        System.out.println("result: " + result);
+        assertTrue(Long.MAX_VALUE > result);
+    }
+}