From d39b871bf1ba1cd762eb1b376571aee50ea7c38f Mon Sep 17 00:00:00 2001 From: "Taro L. Saito" Date: Sun, 25 May 2025 23:47:56 -0700 Subject: [PATCH 1/2] feature: Move ULID related classes to util package --- .../wvlet/ai/core/{ulid => util}/CrockfordBase32.scala | 2 +- .../scala/wvlet/ai/core/{ulid => util}/PrefixedULID.scala | 2 +- .../src/main/scala/wvlet/ai/core/{ulid => util}/ULID.scala | 6 +++--- .../wvlet/ai/core/{ulid => util}/CrockfordBase32Test.scala | 4 ++-- .../wvlet/ai/core/{ulid => util}/PrefixedULIDTest.scala | 4 ++-- .../test/scala/wvlet/ai/core/{ulid => util}/ULIDTest.scala | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) rename ai-core/src/main/scala/wvlet/ai/core/{ulid => util}/CrockfordBase32.scala (99%) rename ai-core/src/main/scala/wvlet/ai/core/{ulid => util}/PrefixedULID.scala (98%) rename ai-core/src/main/scala/wvlet/ai/core/{ulid => util}/ULID.scala (98%) rename ai-core/src/test/scala/wvlet/ai/core/{ulid => util}/CrockfordBase32Test.scala (93%) rename ai-core/src/test/scala/wvlet/ai/core/{ulid => util}/PrefixedULIDTest.scala (97%) rename ai-core/src/test/scala/wvlet/ai/core/{ulid => util}/ULIDTest.scala (98%) diff --git a/ai-core/src/main/scala/wvlet/ai/core/ulid/CrockfordBase32.scala b/ai-core/src/main/scala/wvlet/ai/core/util/CrockfordBase32.scala similarity index 99% rename from ai-core/src/main/scala/wvlet/ai/core/ulid/CrockfordBase32.scala rename to ai-core/src/main/scala/wvlet/ai/core/util/CrockfordBase32.scala index 827a912c..e8432f78 100644 --- a/ai-core/src/main/scala/wvlet/ai/core/ulid/CrockfordBase32.scala +++ b/ai-core/src/main/scala/wvlet/ai/core/util/CrockfordBase32.scala @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package wvlet.ai.core.ulid +package wvlet.ai.core.util /** * Base 32 encoding by Douglas Crockford: https://www.crockford.com/base32.html diff --git a/ai-core/src/main/scala/wvlet/ai/core/ulid/PrefixedULID.scala b/ai-core/src/main/scala/wvlet/ai/core/util/PrefixedULID.scala similarity index 98% rename from ai-core/src/main/scala/wvlet/ai/core/ulid/PrefixedULID.scala rename to ai-core/src/main/scala/wvlet/ai/core/util/PrefixedULID.scala index 9a8cf56a..bc861f3a 100644 --- a/ai-core/src/main/scala/wvlet/ai/core/ulid/PrefixedULID.scala +++ b/ai-core/src/main/scala/wvlet/ai/core/util/PrefixedULID.scala @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package wvlet.ai.core.ulid +package wvlet.ai.core.util object PrefixedULID: val DELIMITER = ':' diff --git a/ai-core/src/main/scala/wvlet/ai/core/ulid/ULID.scala b/ai-core/src/main/scala/wvlet/ai/core/util/ULID.scala similarity index 98% rename from ai-core/src/main/scala/wvlet/ai/core/ulid/ULID.scala rename to ai-core/src/main/scala/wvlet/ai/core/util/ULID.scala index efe428a8..2ac88db2 100644 --- a/ai-core/src/main/scala/wvlet/ai/core/ulid/ULID.scala +++ b/ai-core/src/main/scala/wvlet/ai/core/util/ULID.scala @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package wvlet.ai.core.ulid +package wvlet.ai.core.util import wvlet.ai.core.util.{SecureRandom, ThreadUtil} @@ -98,8 +98,8 @@ end ULID object ULID: val MinValue: ULID = ULID("00000000000000000000000000") val MaxValue: ULID = ULID("7ZZZZZZZZZZZZZZZZZZZZZZZZZ") - private[ulid] val MinTime = 0L - private[ulid] val MaxTime = (~0L) >>> (64 - 48) // Timestamp uses 48-bit range + private[util] val MinTime = 0L + private[util] val MaxTime = (~0L) >>> (64 - 48) private var _generator: ULIDGenerator = defaultULIDGenerator diff --git a/ai-core/src/test/scala/wvlet/ai/core/ulid/CrockfordBase32Test.scala b/ai-core/src/test/scala/wvlet/ai/core/util/CrockfordBase32Test.scala similarity index 93% rename from ai-core/src/test/scala/wvlet/ai/core/ulid/CrockfordBase32Test.scala rename to ai-core/src/test/scala/wvlet/ai/core/util/CrockfordBase32Test.scala index 53c8c4c4..828340b9 100644 --- a/ai-core/src/test/scala/wvlet/ai/core/ulid/CrockfordBase32Test.scala +++ b/ai-core/src/test/scala/wvlet/ai/core/util/CrockfordBase32Test.scala @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package wvlet.ai.core.ulid +package wvlet.ai.core.util -import wvlet.ai.core.ulid.CrockfordBase32 +import wvlet.ai.core.util.CrockfordBase32 import wvlet.airspec.AirSpec import wvlet.airspec.spi.PropertyCheck diff --git a/ai-core/src/test/scala/wvlet/ai/core/ulid/PrefixedULIDTest.scala b/ai-core/src/test/scala/wvlet/ai/core/util/PrefixedULIDTest.scala similarity index 97% rename from ai-core/src/test/scala/wvlet/ai/core/ulid/PrefixedULIDTest.scala rename to ai-core/src/test/scala/wvlet/ai/core/util/PrefixedULIDTest.scala index 2e2c9d54..b7b391af 100644 --- a/ai-core/src/test/scala/wvlet/ai/core/ulid/PrefixedULIDTest.scala +++ b/ai-core/src/test/scala/wvlet/ai/core/util/PrefixedULIDTest.scala @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package wvlet.ai.core.ulid +package wvlet.ai.core.util -import wvlet.ai.core.ulid.{PrefixedULID, ULID} +import wvlet.ai.core.util.{PrefixedULID, ULID} import wvlet.airspec.AirSpec import wvlet.airspec.spi.PropertyCheck diff --git a/ai-core/src/test/scala/wvlet/ai/core/ulid/ULIDTest.scala b/ai-core/src/test/scala/wvlet/ai/core/util/ULIDTest.scala similarity index 98% rename from ai-core/src/test/scala/wvlet/ai/core/ulid/ULIDTest.scala rename to ai-core/src/test/scala/wvlet/ai/core/util/ULIDTest.scala index d12899cd..5544ee60 100644 --- a/ai-core/src/test/scala/wvlet/ai/core/ulid/ULIDTest.scala +++ b/ai-core/src/test/scala/wvlet/ai/core/util/ULIDTest.scala @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package wvlet.ai.core.ulid +package wvlet.ai.core.util -import wvlet.ai.core.ulid.{CrockfordBase32, ULID} +import wvlet.ai.core.util.{CrockfordBase32, ULID} import wvlet.airspec.AirSpec import wvlet.airspec.spi.PropertyCheck From 5a36afb2a8d4deafc30d9838c4c81e9dac1d7e18 Mon Sep 17 00:00:00 2001 From: "Taro L. Saito" Date: Sun, 25 May 2025 23:56:48 -0700 Subject: [PATCH 2/2] maintain the comment --- ai-core/src/main/scala/wvlet/ai/core/util/ULID.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ai-core/src/main/scala/wvlet/ai/core/util/ULID.scala b/ai-core/src/main/scala/wvlet/ai/core/util/ULID.scala index 2ac88db2..7ba37f50 100644 --- a/ai-core/src/main/scala/wvlet/ai/core/util/ULID.scala +++ b/ai-core/src/main/scala/wvlet/ai/core/util/ULID.scala @@ -99,7 +99,7 @@ object ULID: val MinValue: ULID = ULID("00000000000000000000000000") val MaxValue: ULID = ULID("7ZZZZZZZZZZZZZZZZZZZZZZZZZ") private[util] val MinTime = 0L - private[util] val MaxTime = (~0L) >>> (64 - 48) + private[util] val MaxTime = (~0L) >>> (64 - 48) // Timestamp uses 48-bit range private var _generator: ULIDGenerator = defaultULIDGenerator