X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=blobdiff_plain;f=org.argeo.api.uuid%2Fsrc%2Forg%2Fargeo%2Fapi%2Fuuid%2FAbstractAsyncUuidFactory.java;h=f57462388959f2fb9e64c8dd55c0da38cdaf8bd0;hp=2cdb59f77f08b5d4ff2eeaedfe548e2107c3d51d;hb=e846ef84146b66ae543c29c5f17b2991ff0f5973;hpb=e491ed1cde076e741062de5db37cdb02cacd6fbe

diff --git a/org.argeo.api.uuid/src/org/argeo/api/uuid/AbstractAsyncUuidFactory.java b/org.argeo.api.uuid/src/org/argeo/api/uuid/AbstractAsyncUuidFactory.java
index 2cdb59f77..f57462388 100644
--- a/org.argeo.api.uuid/src/org/argeo/api/uuid/AbstractAsyncUuidFactory.java
+++ b/org.argeo.api.uuid/src/org/argeo/api/uuid/AbstractAsyncUuidFactory.java
@@ -20,7 +20,9 @@ import java.util.concurrent.ThreadLocalRandom;
  */
 public abstract class AbstractAsyncUuidFactory extends AbstractUuidFactory implements AsyncUuidFactory {
 	private SecureRandom secureRandom;
-	protected TimeUuidState timeUuidState;
+	protected ConcurrentTimeUuidState timeUuidState;
+
+	private NodeIdSupplier nodeIdSupplier;
 
 	public AbstractAsyncUuidFactory() {
 		secureRandom = newSecureRandom();
@@ -30,11 +32,22 @@ public abstract class AbstractAsyncUuidFactory extends AbstractUuidFactory imple
 	 * ABSTRACT METHODS
 	 */
 
-	protected abstract UUID newTimeUUID();
+	protected abstract SecureRandom newSecureRandom();
 
-	protected abstract UUID newTimeUUIDwithMacAddress();
+	/*
+	 * STATE
+	 */
+	public void reset() {
+		if (nodeIdSupplier == null)
+			throw new IllegalStateException("No node id supplier available");
+		long nodeIdBase = nodeIdSupplier.get();
+		timeUuidState.reset(nodeIdBase);
+	}
 
-	protected abstract SecureRandom newSecureRandom();
+	public void setNodeIdSupplier(NodeIdSupplier nodeIdSupplier) {
+		this.nodeIdSupplier = nodeIdSupplier;
+		reset();
+	}
 
 	/*
 	 * SYNC OPERATIONS
@@ -47,6 +60,22 @@ public abstract class AbstractAsyncUuidFactory extends AbstractUuidFactory imple
 		return newRandomUUID(ThreadLocalRandom.current());
 	}
 
+	protected UUID newTimeUUID() {
+		if (nodeIdSupplier == null)
+			throw new IllegalStateException("No node id supplier available");
+		UUID uuid = new UUID(timeUuidState.getMostSignificantBits(), timeUuidState.getLeastSignificantBits());
+		long clockSequence = timeUuidState.getClockSequence(); 
+		long timestamp = timeUuidState.getLastTimestamp(); 
+		// assert uuid.node() == longFromBytes(node);
+		assert uuid.timestamp() == timestamp;
+		assert uuid.clockSequence() == clockSequence
+				: "uuid.clockSequence()=" + uuid.clockSequence() + " clockSequence=" + clockSequence;
+		assert uuid.version() == 1;
+		assert uuid.variant() == 2;
+
+		return uuid;
+	}
+
 	/*
 	 * ASYNC OPERATIONS (heavy)
 	 */
@@ -74,11 +103,6 @@ public abstract class AbstractAsyncUuidFactory extends AbstractUuidFactory imple
 		return request(futureTimeUUID());
 	}
 
-	@Override
-	public CompletionStage<UUID> requestTimeUUIDwithMacAddress() {
-		return request(futureTimeUUIDwithMacAddress());
-	}
-
 	/*
 	 * ASYNC OPERATIONS (light)
 	 */
@@ -105,26 +129,4 @@ public abstract class AbstractAsyncUuidFactory extends AbstractUuidFactory imple
 	public ForkJoinTask<UUID> futureTimeUUID() {
 		return submit(this::newTimeUUID);
 	}
-
-	@Override
-	public ForkJoinTask<UUID> futureTimeUUIDwithMacAddress() {
-		return submit(this::newTimeUUIDwithMacAddress);
-	}
-
-//	@Override
-//	public UUID timeUUID() {
-//		if (ConcurrentTimeUuidState.isTimeUuidThread.get())
-//			return newTimeUUID();
-//		else
-//			return futureTimeUUID().join();
-//	}
-//
-//	@Override
-//	public UUID timeUUIDwithMacAddress() {
-//		if (ConcurrentTimeUuidState.isTimeUuidThread.get())
-//			return newTimeUUIDwithMacAddress();
-//		else
-//			return futureTimeUUIDwithMacAddress().join();
-//	}
-
 }