Reseed secure random for each random UUID.

[lgpl/argeo-commons.git] / org.argeo.api.uuid / src / org / argeo / api / uuid / TimeUuidState.java

diff --git a/org.argeo.api.uuid/src/org/argeo/api/uuid/TimeUuidState.java b/org.argeo.api.uuid/src/org/argeo/api/uuid/TimeUuidState.java
index 4c9eec5a6178e0eddef1e92e8a242630f742fc0b..9c8b6dd69b294b8eb56f8cf9b66d02ae388bd40f 100644 (file)
--- a/org.argeo.api.uuid/src/org/argeo/api/uuid/TimeUuidState.java
+++ b/org.argeo.api.uuid/src/org/argeo/api/uuid/TimeUuidState.java
@@ -3,6 +3,7 @@ package org.argeo.api.uuid;
 import java.time.Instant;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
+import java.util.UUID;
 
 /**
  * The state of a time based UUID generator, as described and discussed in
@@ -11,37 +12,31 @@ import java.time.ZonedDateTime;
  * @see https://datatracker.ietf.org/doc/html/rfc4122#section-4.2.1
  */
 public interface TimeUuidState {
+       long MOST_SIG_VERSION1 = (1l << 12);
+       long LEAST_SIG_RFC4122_VARIANT = (1l << 63);
 
        /** Start of the Gregorian time, used by time-based UUID (v1). */
        final static Instant GREGORIAN_START = ZonedDateTime.of(1582, 10, 15, 0, 0, 0, 0, ZoneOffset.UTC).toInstant();
 
-       long useTimestamp();
+       /** Current node id and clock sequence for this thread. */
+       long getLeastSignificantBits();
 
+       /** A new current timestamp for this thread. */
+       long getMostSignificantBits();
+
+       /**
+        * The last timestamp which was produced by this thread, as returned by
+        * {@link UUID#timestamp()}.
+        */
+       long getLastTimestamp();
+
+       /**
+        * The current clock sequence for this thread, as returned by
+        * {@link UUID#clockSequence()}.
+        */
        long getClockSequence();
 
        static boolean isNoMacAddressNodeId(byte[] nodeId) {
                return (nodeId[0] & 1) != 0;
        }
-
-       static class Holder {
-               long lastTimestamp;
-               long clockSequence;
-
-               public long getLastTimestamp() {
-                       return lastTimestamp;
-               }
-
-               public void setLastTimestamp(long lastTimestamp) {
-                       this.lastTimestamp = lastTimestamp;
-               }
-
-               public long getClockSequence() {
-                       return clockSequence;
-               }
-
-               public void setClockSequence(long clockSequence) {
-                       this.clockSequence = clockSequence;
-               }
-
-       }
 }