fix: incorrect timestamp in UUIDv7 when using user-specified instant #107

Author: fabiolimace

CHANGELOG.md

@@ -6,6 +6,10 @@ All notable changes to this project will be documented in this file.
 
 Nothing unreleased.
 
+## [6.1.1] - 2025-04-13
+
+- Fixed incorrect timestamp in UUIDv7 when using user-specified instant. #107
+
 ## [6.1.0] - 2025-03-29
 
 - Added microsecond precision to UUIDv7;
@@ -418,7 +422,8 @@ Remove `Fingerprint` // too complex
 -   Removed UuidSettings.getNodeIdentifierDeprecated // remove deprecated
 -   Renamed UuidSettings to UuidCreatorSettings
 
-[unreleased]: https://github.com/f4b6a3/uuid-creator/compare/uuid-creator-6.1.0...HEAD
+[unreleased]: https://github.com/f4b6a3/uuid-creator/compare/uuid-creator-6.1.1...HEAD
+[6.1.1]: https://github.com/f4b6a3/uuid-creator/compare/uuid-creator-6.1.0...uuid-creator-6.1.1
 [6.1.0]: https://github.com/f4b6a3/uuid-creator/compare/uuid-creator-6.0.0...uuid-creator-6.1.0
 [6.0.0]: https://github.com/f4b6a3/uuid-creator/compare/uuid-creator-5.3.7...uuid-creator-6.0.0
 [5.3.7]: https://github.com/f4b6a3/uuid-creator/compare/uuid-creator-5.3.6...uuid-creator-5.3.7

README.md

@@ -44,7 +44,7 @@ Maven:
 <dependency>
   <groupId>com.github.f4b6a3</groupId>
   <artifactId>uuid-creator</artifactId>
-  <version>6.1.0</version>
+  <version>6.1.1</version>
 </dependency>
 ```
 

src/main/java/com/github/f4b6a3/uuid/factory/standard/TimeOrderedEpochFactory.java

@@ -255,7 +255,7 @@ public static Builder builder() {
 	 */
 	@Override
 	public UUID create() {
-		UUID uuid = this.uuidFunction.apply(instantFunction.get());
+		UUID uuid = this.uuidFunction.apply(null);
 		return toUuid(uuid.getMostSignificantBits(), uuid.getLeastSignificantBits());
 	}
 
@@ -308,18 +308,25 @@ public UUID apply(final Instant instant) {
 			lock.lock();
 			try {
 
+				if (instant != null) {
+					reset(instant); // user specified
+					return new UUID(this.msb, this.lsb);
+				}
+
+				Instant now = instantFunction.get();
+
 				long lastTime = this.lastTime();
-				long time = instant.toEpochMilli();
+				long time = now.toEpochMilli();
 
 				// is it not too much ahead of system clock?
 				if (advanceMax > Math.abs(lastTime - time)) {
 					time = Math.max(lastTime, time);
 				}
 
 				if (time == lastTime) {
-					increment(instant);
+					increment(now);
 				} else {
-					reset(instant);
+					reset(now);
 				}
 
 				return new UUID(this.msb, this.lsb);