This commit is contained in:
Looly
2022-04-28 03:20:23 +08:00
parent 17cd183722
commit 8e2c06c671
96 changed files with 175 additions and 167 deletions

View File

@@ -70,4 +70,4 @@ public class TransCollection<F, T> extends AbstractCollection<T> {
public int size() {
return fromCollection.size();
}
}
}

View File

@@ -1,6 +1,12 @@
package cn.hutool.core.exceptions;
import cn.hutool.core.lang.func.*;
import cn.hutool.core.lang.func.Func;
import cn.hutool.core.lang.func.Func0;
import cn.hutool.core.lang.func.Func1;
import cn.hutool.core.lang.func.Supplier1;
import cn.hutool.core.lang.func.VoidFunc;
import cn.hutool.core.lang.func.VoidFunc0;
import cn.hutool.core.lang.func.VoidFunc1;
import java.util.Objects;

View File

@@ -98,4 +98,4 @@ public class ConsistentHash<T> implements Serializable{
//正好命中
return circle.get(hash);
}
}
}

View File

@@ -4,9 +4,9 @@ import cn.hutool.core.bean.BeanPath;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.getter.BasicTypeGetter;
import cn.hutool.core.lang.func.Func0;
import cn.hutool.core.lang.func.LambdaUtil;
import cn.hutool.core.getter.BasicTypeGetter;
import java.math.BigDecimal;
import java.math.BigInteger;

View File

@@ -14,4 +14,4 @@ public interface Filter<T> {
* @return 是否接受对象
*/
boolean accept(T t);
}
}

View File

View File

View File

View File

View File

@@ -1,7 +1,7 @@
package cn.hutool.core.lang;
import cn.hutool.core.date.SystemClock;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.lang.id.IdUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;

View File

View File

View File

View File

View File

View File

View File

View File

View File

@@ -4,4 +4,4 @@
* @author looly
*
*/
package cn.hutool.core.lang.caller;
package cn.hutool.core.lang.caller;

View File

@@ -4,4 +4,4 @@
* @author looly
*
*/
package cn.hutool.core.lang.copier;
package cn.hutool.core.lang.copier;

View File

View File

View File

View File

View File

View File

View File

@@ -7,4 +7,4 @@
* @author looly
*
*/
package cn.hutool.core.lang.func;
package cn.hutool.core.lang.func;

View File

@@ -1,6 +1,6 @@
package cn.hutool.core.lang.generator;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.lang.id.IdUtil;
/**
* UUID生成器

View File

@@ -4,4 +4,4 @@
* @author looly
*
*/
package cn.hutool.core.lang.generator;
package cn.hutool.core.lang.generator;

View File

View File

@@ -4,4 +4,4 @@
* @author looly
*
*/
package cn.hutool.core.lang.hash;
package cn.hutool.core.lang.hash;

View File

@@ -1,13 +1,14 @@
package cn.hutool.core.util;
package cn.hutool.core.lang.id;
import cn.hutool.core.exceptions.UtilException;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.lang.ObjectId;
import cn.hutool.core.lang.Singleton;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.lang.UUID;
import cn.hutool.core.lang.id.UUID;
import cn.hutool.core.lang.id.NanoId;
import cn.hutool.core.net.NetUtil;
import cn.hutool.core.util.RuntimeUtil;
/**
* ID生成器工具类此工具类中主要封装

View File

@@ -15,7 +15,7 @@ import java.util.Random;
* </ul>
*
* <p>
* 此实现的逻辑基于JavaScript的NanoId实现https://github.com/ai/nanoid
* 此实现的逻辑基于JavaScript的NanoId实现<a href="https://github.com/ai/nanoid">https://github.com/ai/nanoid</a>
*
* @author David Klebanoff
*/

View File

@@ -1,4 +1,4 @@
package cn.hutool.core.lang;
package cn.hutool.core.lang.id;
import cn.hutool.core.exceptions.UtilException;
import cn.hutool.core.util.StrUtil;

View File

@@ -1,4 +1,4 @@
package cn.hutool.core.lang;
package cn.hutool.core.lang.id;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;

View File

View File

@@ -18,4 +18,4 @@ public interface Interner<T> {
* @return 样例对象
*/
T intern(T sample);
}
}

View File

View File

@@ -5,4 +5,4 @@
*
* @author looly
*/
package cn.hutool.core.lang.intern;
package cn.hutool.core.lang.intern;

View File

@@ -13,7 +13,7 @@ import java.util.function.Supplier;
*
* @param <T> 被加载对象类型
* @author Mr.Po
* @see cn.hutool.core.lang.loader.LazyLoader
* @see LazyLoader
* @since 5.6.1
*/
public class LazyFunLoader<T> extends LazyLoader<T> {

View File

@@ -4,4 +4,4 @@
* @author looly
*
*/
package cn.hutool.core.lang.loader;
package cn.hutool.core.lang.loader;

View File

@@ -20,4 +20,4 @@ public interface Mutable<T> {
*/
void set(T value);
}
}

View File

@@ -4,4 +4,4 @@
* @author looly
*
*/
package cn.hutool.core.lang.mutable;
package cn.hutool.core.lang.mutable;

View File

@@ -4,4 +4,4 @@
* @author looly
*
*/
package cn.hutool.core.lang;
package cn.hutool.core.lang;

View File

@@ -1,7 +1,7 @@
package cn.hutool.core.lang.reflect;
import cn.hutool.core.exceptions.UtilException;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.exceptions.UtilException;
import cn.hutool.core.util.ReflectUtil;
import cn.hutool.core.util.StrUtil;

View File

@@ -4,4 +4,4 @@
* @author looly
* @since 5.4.2
*/
package cn.hutool.core.lang.reflect;
package cn.hutool.core.lang.reflect;

View File

@@ -11,4 +11,4 @@
* @author liangbaikaihttps://gitee.com/liangbaikai00/
* @since 5.2.1
*/
package cn.hutool.core.lang.tree;
package cn.hutool.core.lang.tree;

View File

@@ -3,7 +3,7 @@ package cn.hutool.core.util;
import cn.hutool.core.exceptions.UtilException;
import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.Pid;
import cn.hutool.core.lang.id.Pid;
import cn.hutool.core.text.StrBuilder;
import java.io.File;

View File

@@ -1,5 +1,6 @@
package cn.hutool.core.util;
import cn.hutool.core.lang.id.IdUtil;
import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.text.StrBuilder;
import cn.hutool.core.text.StrFormatter;

View File

@@ -11,7 +11,6 @@ import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAccessor;
import java.util.Date;
public class LocalDateTimeUtilTest {

View File

@@ -11,7 +11,7 @@ import cn.hutool.core.lang.Console;
/**
* 文件监听单元测试
*
*
* @author Looly
*
*/
@@ -43,12 +43,12 @@ public class WatchMonitorTest {
Console.log("Overflow{}-> {}", currentPath, obj);
}
};
WatchMonitor monitor = WatchMonitor.createAll("d:/test/aaa.txt", new DelayWatcher(watcher, 500));
monitor.setMaxDepth(0);
monitor.start();
}
}

View File

@@ -3,30 +3,30 @@ package cn.hutool.core.lang;
import org.junit.Test;
public class AssertTest {
@Test
public void isNullTest(){
String a = null;
cn.hutool.core.lang.Assert.isNull(a);
Assert.isNull(a);
}
@Test
public void notNullTest(){
String a = null;
cn.hutool.core.lang.Assert.isNull(a);
Assert.isNull(a);
}
@Test(expected = IllegalArgumentException.class)
public void isTrueTest() {
int i = 0;
//noinspection ConstantConditions
cn.hutool.core.lang.Assert.isTrue(i > 0, IllegalArgumentException::new);
Assert.isTrue(i > 0, IllegalArgumentException::new);
}
@Test(expected = IndexOutOfBoundsException.class)
public void isTrueTest2() {
int i = -1;
//noinspection ConstantConditions
cn.hutool.core.lang.Assert.isTrue(i >= 0, IndexOutOfBoundsException::new);
Assert.isTrue(i >= 0, IndexOutOfBoundsException::new);
}
@Test(expected = IndexOutOfBoundsException.class)

View File

@@ -8,12 +8,12 @@ import org.junit.Test;
/**
* ObjectId单元测试
*
*
* @author looly
*
*/
public class ObjectIdTest {
@Test
public void distinctTest() {
//生成10000个id测试是否重复
@@ -21,10 +21,10 @@ public class ObjectIdTest {
for(int i = 0; i < 10000; i++) {
set.add(ObjectId.next());
}
Assert.assertEquals(10000, set.size());
}
@Test
@Ignore
public void nextTest() {

View File

@@ -3,7 +3,7 @@ package cn.hutool.core.lang;
import cn.hutool.core.collection.ConcurrentHashSet;
import cn.hutool.core.exceptions.UtilException;
import cn.hutool.core.thread.ThreadUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.lang.id.IdUtil;
import cn.hutool.core.util.StrUtil;
import org.junit.Assert;
import org.junit.Ignore;

View File

@@ -1,6 +1,7 @@
package cn.hutool.core.lang;
import cn.hutool.core.collection.ConcurrentHashSet;
import cn.hutool.core.lang.id.UUID;
import cn.hutool.core.thread.ThreadUtil;
import org.junit.Assert;
import org.junit.Test;

View File

@@ -1,7 +1,7 @@
package cn.hutool.core.lang;
import cn.hutool.core.exceptions.ValidateException;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.lang.id.IdUtil;
import org.junit.Assert;
import org.junit.Test;

View File

@@ -9,25 +9,25 @@ import org.junit.Test;
*
*/
public class CallerTest {
@Test
public void getCallerTest() {
Class<?> caller = CallerUtil.getCaller();
Assert.assertEquals(this.getClass(), caller);
Class<?> caller0 = CallerUtil.getCaller(0);
Assert.assertEquals(CallerUtil.class, caller0);
Class<?> caller1 = CallerUtil.getCaller(1);
Assert.assertEquals(this.getClass(), caller1);
}
@Test
public void getCallerCallerTest() {
Class<?> callerCaller = CallerTestClass.getCaller();
Assert.assertEquals(this.getClass(), callerCaller);
}
private static class CallerTestClass{
public static Class<?> getCaller(){
return CallerUtil.getCallerCaller();

View File

@@ -13,4 +13,4 @@ public class CallerUtilTest {
final String fullCallerMethodName = CallerUtil.getCallerMethodName(true);
Assert.assertEquals("cn.hutool.core.lang.caller.CallerUtilTest.getCallerMethodNameTest", fullCallerMethodName);
}
}
}

View File

@@ -27,7 +27,7 @@ public class TreeSearchTest {
@Test
public void searchNode() {
List<Tree<Long>> treeItems=TreeUtil.build(all_menu, 0L);
List<Tree<Long>> treeItems= TreeUtil.build(all_menu, 0L);
Tree<Long> tree=treeItems.get(0);
Tree<Long> searchResult=tree.getNode(3L);

View File

@@ -14,22 +14,22 @@ import cn.hutool.core.lang.Console;
*
*/
public class ArrangementTest {
@Test
public void arrangementTest() {
long result = Arrangement.count(4, 2);
Assert.assertEquals(12, result);
result = Arrangement.count(4, 1);
Assert.assertEquals(4, result);
result = Arrangement.count(4, 0);
Assert.assertEquals(1, result);
long resultAll = Arrangement.countAll(4);
Assert.assertEquals(64, resultAll);
}
@Test
public void selectTest() {
Arrangement arrangement = new Arrangement(new String[] { "1", "2", "3", "4" });
@@ -47,14 +47,14 @@ public class ArrangementTest {
Assert.assertArrayEquals(new String[] {"4", "1"}, list.get(9));
Assert.assertArrayEquals(new String[] {"4", "2"}, list.get(10));
Assert.assertArrayEquals(new String[] {"4", "3"}, list.get(11));
List<String[]> selectAll = arrangement.selectAll();
Assert.assertEquals(Arrangement.countAll(4), selectAll.size());
List<String[]> list2 = arrangement.select(0);
Assert.assertEquals(1, list2.size());
}
@Test
@Ignore
public void selectTest2() {

View File

@@ -6,6 +6,7 @@ import cn.hutool.core.date.TimeInterval;
import cn.hutool.core.exceptions.UtilException;
import cn.hutool.core.lang.Console;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.lang.id.IdUtil;
import cn.hutool.core.thread.ThreadUtil;
import org.junit.Assert;
import org.junit.Ignore;

View File

@@ -21,4 +21,4 @@ public class A {
t.print();
}};
}
}
}