X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.api.uuid%2Fsrc%2Forg%2Fargeo%2Fapi%2Fuuid%2FAbstractUuidFactory.java;h=75a6339b01681f48a1890468b4a56f303bbee43b;hb=5f820a14abf7371714514ed5f20580ceb5edaeec;hp=d348504adff6784bc259953bf4ff58f462aef6fd;hpb=475dc8545eb01b541c63be6a480fdd8d808e75a4;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.api.uuid/src/org/argeo/api/uuid/AbstractUuidFactory.java b/org.argeo.api.uuid/src/org/argeo/api/uuid/AbstractUuidFactory.java index d348504ad..75a6339b0 100644 --- a/org.argeo.api.uuid/src/org/argeo/api/uuid/AbstractUuidFactory.java +++ b/org.argeo.api.uuid/src/org/argeo/api/uuid/AbstractUuidFactory.java @@ -55,7 +55,7 @@ public abstract class AbstractUuidFactory implements UuidFactory { protected UUID timeUUID(Temporal time, long clockSequence, byte[] node, int offset) { // TODO add checks - Duration duration = Duration.between(TimeUuidState.GREGORIAN_START, time); + Duration duration = Duration.between(TimeUuid.TIMESTAMP_ZERO, time); // Number of 100 ns intervals in one second: 1000000000 / 100 = 10000000 long timestamp = duration.getSeconds() * 10000000 + duration.getNano() / 100; return newTimeUUID(timestamp, clockSequence, node, offset); @@ -69,12 +69,12 @@ public abstract class AbstractUuidFactory implements UuidFactory { Objects.requireNonNull(namespace, "Namespace cannot be null"); Objects.requireNonNull(name, "Name cannot be null"); - byte[] bytes = sha1(toBytes(namespace), name); + byte[] bytes = sha1(UuidBinaryUtils.toBytes(namespace), name); bytes[6] &= 0x0f; bytes[6] |= 0x50;// v5 bytes[8] &= 0x3f; bytes[8] |= 0x80;// variant 1 - UUID result = fromBytes(bytes, 0); + UUID result = UuidBinaryUtils.fromBytes(bytes, 0); return result; } @@ -83,7 +83,7 @@ public abstract class AbstractUuidFactory implements UuidFactory { Objects.requireNonNull(name, "Name cannot be null"); byte[] arr = new byte[name.length + 16]; - copyBytes(namespace, arr, 0); + UuidBinaryUtils.copyBytes(namespace, arr, 0); System.arraycopy(name, 0, arr, 16, name.length); return UUID.nameUUIDFromBytes(arr); } @@ -98,7 +98,31 @@ public abstract class AbstractUuidFactory implements UuidFactory { arr[6] |= 0x40;// v4 arr[8] &= 0x3f; arr[8] |= 0x80;// variant 1 - return fromBytes(arr); + return UuidBinaryUtils.fromBytes(arr); + } + + /* + * SPI UTILITIES + */ + /** Guarantees that a byte array of length 6 will be returned. */ + protected static byte[] toNodeIdBytes(byte[] source, int offset) { + if (source == null) + return null; + if (offset < 0 || offset + 6 > source.length) + throw new ArrayIndexOutOfBoundsException(offset); + byte[] nodeId = new byte[6]; + System.arraycopy(source, offset, nodeId, 0, 6); + return nodeId; + } + + /** + * Force this node id to be identified as no MAC address. + * + * @see https://datatracker.ietf.org/doc/html/rfc4122#section-4.5 + */ + protected static void forceToNoMacAddress(byte[] nodeId, int offset) { + assert nodeId != null && offset < nodeId.length; + nodeId[offset] = (byte) (nodeId[offset] | 1); } /* @@ -108,7 +132,7 @@ public abstract class AbstractUuidFactory implements UuidFactory { private final static String MD5 = "MD5"; private final static String SHA1 = "SHA1"; - protected byte[] sha1(byte[]... bytes) { + protected static byte[] sha1(byte[]... bytes) { MessageDigest digest = getSha1Digest(); for (byte[] arr : bytes) digest.update(arr); @@ -116,7 +140,7 @@ public abstract class AbstractUuidFactory implements UuidFactory { return checksum; } - protected byte[] md5(byte[]... bytes) { + protected static byte[] md5(byte[]... bytes) { MessageDigest digest = getMd5Digest(); for (byte[] arr : bytes) digest.update(arr); @@ -124,15 +148,15 @@ public abstract class AbstractUuidFactory implements UuidFactory { return checksum; } - protected MessageDigest getSha1Digest() { + protected static MessageDigest getSha1Digest() { return getDigest(SHA1); } - protected MessageDigest getMd5Digest() { + protected static MessageDigest getMd5Digest() { return getDigest(MD5); } - private MessageDigest getDigest(String name) { + private static MessageDigest getDigest(String name) { try { return MessageDigest.getInstance(name); } catch (NoSuchAlgorithmException e) { @@ -140,177 +164,4 @@ public abstract class AbstractUuidFactory implements UuidFactory { } } - /* - * UTILITIES - */ - /** - * Convert bytes to an UUID. Byte array must not be null and be exactly of - * length 16. - */ - protected UUID fromBytes(byte[] data) { - Objects.requireNonNull(data, "Byte array must not be null"); - if (data.length != 16) - throw new IllegalArgumentException("Byte array as length " + data.length); - return fromBytes(data, 0); - } - - /** - * Convert bytes to an UUID, starting to read the array at this offset. - */ - protected UUID fromBytes(byte[] data, int offset) { - Objects.requireNonNull(data, "Byte array cannot be null"); - long msb = 0; - long lsb = 0; - for (int i = offset; i < 8 + offset; i++) - msb = (msb << 8) | (data[i] & 0xff); - for (int i = 8 + offset; i < 16 + offset; i++) - lsb = (lsb << 8) | (data[i] & 0xff); - return new UUID(msb, lsb); - } - - protected long longFromBytes(byte[] data) { - long msb = 0; - for (int i = 0; i < data.length; i++) - msb = (msb << 8) | (data[i] & 0xff); - return msb; - } - - protected byte[] toBytes(UUID uuid) { - Objects.requireNonNull(uuid, "UUID cannot be null"); - long msb = uuid.getMostSignificantBits(); - long lsb = uuid.getLeastSignificantBits(); - return toBytes(msb, lsb); - } - - protected void copyBytes(UUID uuid, byte[] arr, int offset) { - Objects.requireNonNull(uuid, "UUID cannot be null"); - long msb = uuid.getMostSignificantBits(); - long lsb = uuid.getLeastSignificantBits(); - copyBytes(msb, lsb, arr, offset); - } - - /** - * Converts an UUID hex representation without '-' to the standard form (with - * '-'). - */ - public String compactToStd(String compact) { - if (compact.length() != 32) - throw new IllegalArgumentException( - "Compact UUID '" + compact + "' has length " + compact.length() + " and not 32."); - StringBuilder sb = new StringBuilder(36); - for (int i = 0; i < 32; i++) { - if (i == 8 || i == 12 || i == 16 || i == 20) - sb.append('-'); - sb.append(compact.charAt(i)); - } - String std = sb.toString(); - assert std.length() == 36; - assert UUID.fromString(std).toString().equals(std); - return std; - } - - /** - * Converts an UUID hex representation without '-' to an {@link UUID}. - */ - public UUID fromCompact(String compact) { - return UUID.fromString(compactToStd(compact)); - } - - /** To a 32 characters hex string without '-'. */ - public String toCompact(UUID uuid) { - return toHexString(toBytes(uuid)); - } - - final protected static char[] hexArray = "0123456789abcdef".toCharArray(); - - /** Convert two longs to a byte array with length 16. */ - protected byte[] toBytes(long long1, long long2) { - byte[] result = new byte[16]; - for (int i = 0; i < 8; i++) - result[i] = (byte) ((long1 >> ((7 - i) * 8)) & 0xff); - for (int i = 8; i < 16; i++) - result[i] = (byte) ((long2 >> ((15 - i) * 8)) & 0xff); - return result; - } - - protected void copyBytes(long long1, long long2, byte[] arr, int offset) { - assert arr.length >= 16 + offset; - for (int i = offset; i < 8 + offset; i++) - arr[i] = (byte) ((long1 >> ((7 - i) * 8)) & 0xff); - for (int i = 8 + offset; i < 16 + offset; i++) - arr[i] = (byte) ((long2 >> ((15 - i) * 8)) & 0xff); - } - - /** Converts a byte array to an hex String. */ - protected String toHexString(byte[] bytes) { - char[] hexChars = new char[bytes.length * 2]; - for (int j = 0; j < bytes.length; j++) { - int v = bytes[j] & 0xFF; - hexChars[j * 2] = hexArray[v >>> 4]; - hexChars[j * 2 + 1] = hexArray[v & 0x0F]; - } - return new String(hexChars); - } - - protected byte[] toNodeIdBytes(byte[] source, int offset) { - if (source == null) - return null; - if (offset < 0 || offset + 6 > source.length) - throw new ArrayIndexOutOfBoundsException(offset); - byte[] nodeId = new byte[6]; - System.arraycopy(source, offset, nodeId, 0, 6); - return nodeId; - } - - /* - * STATIC UTILITIES - */ - /** - * Converts an UUID to a binary string (list of 0 and 1), with a separator to - * make it more readable. - */ - public static String toBinaryString(UUID uuid, int charsPerSegment, char separator) { - Objects.requireNonNull(uuid, "UUID cannot be null"); - String binaryString = toBinaryString(uuid); - StringBuilder sb = new StringBuilder(128 + (128 / charsPerSegment)); - for (int i = 0; i < binaryString.length(); i++) { - if (i != 0 && i % charsPerSegment == 0) - sb.append(separator); - sb.append(binaryString.charAt(i)); - } - return sb.toString(); - } - - /** Converts an UUID to a binary string (list of 0 and 1). */ - public static String toBinaryString(UUID uuid) { - Objects.requireNonNull(uuid, "UUID cannot be null"); - String most = zeroTo64Chars(Long.toBinaryString(uuid.getMostSignificantBits())); - String least = zeroTo64Chars(Long.toBinaryString(uuid.getLeastSignificantBits())); - String binaryString = most + least; - assert binaryString.length() == 128; - return binaryString; - } - - /** - * Force this node id to be identified as no MAC address. - * - * @see https://datatracker.ietf.org/doc/html/rfc4122#section-4.5 - */ - public static void forceToNoMacAddress(byte[] nodeId, int offset) { - assert nodeId != null && offset < nodeId.length; - nodeId[offset] = (byte) (nodeId[offset] | 1); - } - - private static String zeroTo64Chars(String str) { - assert str.length() <= 64; - if (str.length() < 64) { - StringBuilder sb = new StringBuilder(64); - for (int i = 0; i < 64 - str.length(); i++) - sb.append('0'); - sb.append(str); - return sb.toString(); - } else - return str; - } - }