X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.api.acr%2Fsrc%2Forg%2Fargeo%2Fapi%2Facr%2Fuuid%2FUuidFactory.java;h=94e5158df07a4f8ba47b1f71e349fbc5c51e3613;hb=0e650c99f0cc4c13165ef6015018514e5745c380;hp=eb46c302dabcb141b15b9bb697690bcbbfe99425;hpb=fe1ca8a0124a593a07055a06e639f2d97e0d63dd;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.api.acr/src/org/argeo/api/acr/uuid/UuidFactory.java b/org.argeo.api.acr/src/org/argeo/api/acr/uuid/UuidFactory.java
index eb46c302d..94e5158df 100644
--- a/org.argeo.api.acr/src/org/argeo/api/acr/uuid/UuidFactory.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/uuid/UuidFactory.java
@@ -2,8 +2,9 @@ package org.argeo.api.acr.uuid;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import java.util.Random;
+import java.util.Objects;
 import java.util.UUID;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.Supplier;
 
 /**
@@ -27,31 +28,44 @@ public interface UuidFactory extends Supplier<UUID> {
 	 * NAME BASED (version 3 and 5)
 	 */
 
-	UUID nameUUIDv5(UUID namespace, byte[] name);
+	UUID nameUUIDv5(UUID namespace, byte[] data);
 
-	UUID nameUUIDv3(UUID namespace, byte[] name);
+	UUID nameUUIDv3(UUID namespace, byte[] data);
 
 	default UUID nameUUIDv5(UUID namespace, String name) {
-		if (name == null)
-			throw new IllegalArgumentException("Name cannot be null");
+		Objects.requireNonNull(name, "Name cannot be null");
 		return nameUUIDv5(namespace, name.getBytes(UTF_8));
 	}
 
 	default UUID nameUUIDv3(UUID namespace, String name) {
-		if (name == null)
-			throw new IllegalArgumentException("Name cannot be null");
+		Objects.requireNonNull(name, "Name cannot be null");
 		return nameUUIDv3(namespace, name.getBytes(UTF_8));
 	}
 
 	/*
-	 * RANDOM v4
+	 * RANDOM (version 4)
 	 */
-	UUID randomUUID(Random random);
+	/** A random UUID at least as good as {@link UUID#randomUUID()}. */
+	UUID randomUUIDStrong();
 
+	/**
+	 * An {@link UUID} generated based on {@link ThreadLocalRandom}. Implementations
+	 * should always provide it synchronously.
+	 */
+	UUID randomUUIDWeak();
+
+	/**
+	 * The default random {@link UUID} (v4) generator to use. This default
+	 * implementation returns {@link #randomUUIDStrong()}.
+	 */
 	default UUID randomUUID() {
-		return UUID.randomUUID();
+		return randomUUIDStrong();
 	}
 
+	/**
+	 * The default {@link UUID} to provide, either random (v4) or time based (v1).
+	 * This default implementations returns {@link #randomUUID()}.
+	 */
 	@Override
 	default UUID get() {
 		return randomUUID();
@@ -112,9 +126,4 @@ public interface UuidFactory extends Supplier<UUID> {
 	static boolean isNameBased(UUID uuid) {
 		return uuid.version() == 3 || uuid.version() == 5;
 	}
-
-	/*
-	 * DEFAULT
-	 */
-	final static UuidFactory DEFAULT = new SimpleUuidFactory(null, -1, null);
 }