diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/ObjectIdGenerator.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/ObjectIdGenerator.java similarity index 82% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/ObjectIdGenerator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/data/id/ObjectIdGenerator.java index b894767fa..1fc313daf 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/ObjectIdGenerator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/ObjectIdGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2023. looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.core.lang.generator; +package org.dromara.hutool.core.data.id; -import org.dromara.hutool.core.data.id.ObjectId; +import org.dromara.hutool.core.lang.generator.Generator; /** * ObjectId生成器 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/Pid.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/Pid.java index fb7eb8441..23b50fe3e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/data/id/Pid.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/Pid.java @@ -25,6 +25,9 @@ import java.lang.management.ManagementFactory; * @since 5.8.0 */ public enum Pid { + /** + * 单例 + */ INSTANCE; private final int pid; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/SnowflakeGenerator.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/SnowflakeGenerator.java similarity index 89% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/SnowflakeGenerator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/data/id/SnowflakeGenerator.java index e9319c5a3..1d090af2a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/SnowflakeGenerator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/SnowflakeGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2023. looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.core.lang.generator; +package org.dromara.hutool.core.data.id; -import org.dromara.hutool.core.data.id.Snowflake; +import org.dromara.hutool.core.lang.generator.Generator; /** * Snowflake生成器
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/UUIDGenerator.java b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/UUIDGenerator.java similarity index 82% rename from hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/UUIDGenerator.java rename to hutool-core/src/main/java/org/dromara/hutool/core/data/id/UUIDGenerator.java index c34d4acf4..4dc3c79f3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/generator/UUIDGenerator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/data/id/UUIDGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 looly(loolly@aliyun.com) + * Copyright (c) 2023. looly(loolly@aliyun.com) * Hutool is licensed under Mulan PSL v2. * You can use this software according to the terms and conditions of the Mulan PSL v2. * You may obtain a copy of Mulan PSL v2 at: @@ -10,9 +10,9 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.core.lang.generator; +package org.dromara.hutool.core.data.id; -import org.dromara.hutool.core.data.id.IdUtil; +import org.dromara.hutool.core.lang.generator.Generator; /** * UUID生成器