Changed code structure to avoid code duplication.

Author: amsga

UUIDUtil/UUIDv1.cs

@@ -200,19 +200,7 @@ public static DateTime ToDateTime(Uuid uuid)
             if (!IsUUIDv1(uuid))
                 throw new ArgumentException(String.Format("{0} is not a Version 1 UUID.", uuid), nameof(uuid));
 
-            Byte[] time = new Byte[8];
-            Byte[] hex = uuid.ToByteArray();
-
-            time[0] = (Byte)(hex[6] & 0x0F);
-            time[1] = hex[7];
-            time[2] = hex[4];
-            time[3] = hex[5];
-            time[4] = hex[0];
-            time[5] = hex[1];
-            time[6] = hex[2];
-            time[7] = hex[3];
-
-            Int64 timeInterval = System.Net.IPAddress.NetworkToHostOrder(BitConverter.ToInt64(time, 0));
+            long timeInterval = GetTimeInterval(uuid);
             TimeSpan timeSpan = TimeSpan.FromTicks(timeInterval);
 
             return s_epoch.ToUniversalTime() + timeSpan;
@@ -229,21 +217,11 @@ public static Uuid ToUUIDv6(Uuid uuid)
             if (!IsUUIDv1(uuid))
                 throw new ArgumentException(String.Format("{0} is not a Version 1 UUID.", uuid), nameof(uuid));
 
-            Byte[] time = new Byte[8];
-            Byte[] hex = uuid.ToByteArray();
+            Int64 timeInterval = GetTimeInterval(uuid);
 
-            time[0] = (Byte)(hex[6] & 0x0F);
-            time[1] = hex[7];
-            time[2] = hex[4];
-            time[3] = hex[5];
-            time[4] = hex[0];
-            time[5] = hex[1];
-            time[6] = hex[2];
-            time[7] = hex[3];
-
-            Int64 timeInterval = System.Net.IPAddress.NetworkToHostOrder(BitConverter.ToInt64(time, 0));
+            Byte[] hex = uuid.ToByteArray();
             timeInterval <<= 4;
-            time = BitConverter.GetBytes(System.Net.IPAddress.HostToNetworkOrder(timeInterval));
+            Byte[] time = BitConverter.GetBytes(System.Net.IPAddress.HostToNetworkOrder(timeInterval));
 
             hex[0] = time[0];
             hex[1] = time[1];
@@ -258,5 +236,23 @@ public static Uuid ToUUIDv6(Uuid uuid)
 
             return new Uuid(hex);
         }
+
+        private static Int64 GetTimeInterval(Uuid uuid)
+        {
+            Byte[] hex = uuid.ToByteArray();
+            Byte[] time = new Byte[8];
+
+            time[0] = (Byte)(hex[6] & 0x0F);
+            time[1] = hex[7];
+            time[2] = hex[4];
+            time[3] = hex[5];
+            time[4] = hex[0];
+            time[5] = hex[1];
+            time[6] = hex[2];
+            time[7] = hex[3];
+
+            Int64 timeInterval = System.Net.IPAddress.NetworkToHostOrder(BitConverter.ToInt64(time, 0));
+            return timeInterval;
+        }
     }
 }

UUIDUtil/UUIDv6.cs

@@ -184,20 +184,7 @@ public static DateTime ToDateTime(Uuid uuid)
             if (!IsUUIDv6(uuid))
                 throw new ArgumentException(String.Format("{0} is not a Version 6 UUID.", uuid), nameof(uuid));
 
-            Byte[] time = new Byte[8];
-            Byte[] hex = uuid.ToByteArray();
-
-            time[0] = hex[0];
-            time[1] = hex[1];
-            time[2] = hex[2];
-            time[3] = hex[3];
-            time[4] = hex[4];
-            time[5] = hex[5];
-            time[6] = (Byte)((Byte)((hex[6] & 0x0F) << 4) + (hex[7] >> 4));
-            time[7] = (Byte)(hex[7] << 4);
-
-            Int64 timeInterval = System.Net.IPAddress.NetworkToHostOrder(BitConverter.ToInt64(time, 0));
-            timeInterval >>= 4;
+            long timeInterval = GetTimeInterval(uuid);
             TimeSpan timeSpan = TimeSpan.FromTicks(timeInterval);
 
             return s_epoch.ToUniversalTime() + timeSpan;
@@ -214,21 +201,10 @@ public static Uuid ToUUIDv1(Uuid uuid)
             if (!IsUUIDv6(uuid))
                 throw new ArgumentException(String.Format("{0} is not a Version 6 UUID.", uuid), nameof(uuid));
 
-            Byte[] time = new Byte[8];
-            Byte[] hex = uuid.ToByteArray();
-
-            time[0] = hex[0];
-            time[1] = hex[1];
-            time[2] = hex[2];
-            time[3] = hex[3];
-            time[4] = hex[4];
-            time[5] = hex[5];
-            time[6] = (Byte)((Byte)((hex[6] & 0x0F) << 4) + (hex[7] >> 4));
-            time[7] = (Byte)(hex[7] << 4);
+            Int64 timeInterval = GetTimeInterval(uuid);
 
-            Int64 timeInterval = System.Net.IPAddress.NetworkToHostOrder(BitConverter.ToInt64(time, 0));
-            timeInterval >>= 4;
-            time = BitConverter.GetBytes(System.Net.IPAddress.HostToNetworkOrder(timeInterval));
+            Byte[] hex = uuid.ToByteArray();
+            Byte[] time = BitConverter.GetBytes(System.Net.IPAddress.HostToNetworkOrder(timeInterval));
 
             hex[0] = time[4];
             hex[1] = time[5];
@@ -243,5 +219,24 @@ public static Uuid ToUUIDv1(Uuid uuid)
 
             return new Uuid(hex);
         }
+
+        private static Int64 GetTimeInterval(Uuid uuid)
+        {
+            Byte[] hex = uuid.ToByteArray();
+            Byte[] time = new Byte[8];
+
+            time[0] = hex[0];
+            time[1] = hex[1];
+            time[2] = hex[2];
+            time[3] = hex[3];
+            time[4] = hex[4];
+            time[5] = hex[5];
+            time[6] = (Byte)((Byte)((hex[6] & 0x0F) << 4) + (hex[7] >> 4));
+            time[7] = (Byte)(hex[7] << 4);
+
+            Int64 timeInterval = System.Net.IPAddress.NetworkToHostOrder(BitConverter.ToInt64(time, 0));
+            timeInterval >>= 4;
+            return timeInterval;
+        }
     }
 }

UUIDUtil/UUIDv7.cs

@@ -226,8 +226,16 @@ public static DateTime ToDateTime(Uuid uuid)
             if (!IsUUIDv7(uuid))
                 throw new ArgumentException(String.Format("{0} is not a Version 7 UUID.", uuid), nameof(uuid));
 
-            Byte[] time = new Byte[8];
+            long timeInterval = GetTimeInterval(uuid);
+            TimeSpan timeSpan = TimeSpan.FromMilliseconds(timeInterval);
+
+            return s_epoch.ToUniversalTime() + timeSpan;
+        }
+
+        private static Int64 GetTimeInterval(Uuid uuid)
+        {
             Byte[] hex = uuid.ToByteArray();
+            Byte[] time = new Byte[8];
 
             time[0] = hex[0];
             time[1] = hex[1];
@@ -240,9 +248,7 @@ public static DateTime ToDateTime(Uuid uuid)
 
             Int64 timeInterval = System.Net.IPAddress.NetworkToHostOrder(BitConverter.ToInt64(time, 0));
             timeInterval >>= 16;
-            TimeSpan timeSpan = TimeSpan.FromMilliseconds(timeInterval);
-
-            return s_epoch.ToUniversalTime() + timeSpan;
+            return timeInterval;
         }
     }
 }