Skip to content

Commit 0982aff

Browse files
authored
Make namespaces UUIDs not strings (#175)
1 parent 7bc6b77 commit 0982aff

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

morphir/sdk/core/jvm/src/morphir/sdk/UUID.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ object UUID {
1717

1818
val Nil: UUID = MUUID.Nil
1919

20-
val dnsNamespace = "6ba7b810-9dad-11d1-80b4-00c04fd430c8"
21-
val urlNamespace = "6ba7b811-9dad-11d1-80b4-00c04fd430c8"
22-
val oidNamespace = "6ba7b812-9dad-11d1-80b4-00c04fd430c8"
23-
val x500Namespace = "6ba7b814-9dad-11d1-80b4-00c04fd430c8"
20+
val dnsNamespace: UUID = memeid.UUID.fromString("6ba7b810-9dad-11d1-80b4-00c04fd430c8")
21+
val urlNamespace: UUID = memeid.UUID.fromString("6ba7b811-9dad-11d1-80b4-00c04fd430c8")
22+
val oidNamespace: UUID = memeid.UUID.fromString("6ba7b812-9dad-11d1-80b4-00c04fd430c8")
23+
val x500Namespace: UUID = memeid.UUID.fromString("6ba7b814-9dad-11d1-80b4-00c04fd430c8")
2424

2525
def compare(uuid1: UUID)(uuid2: UUID): Int = uuid1.compareTo(uuid2)
2626
def forName(s: String)(uuid: UUID): UUID = MUUID.V5(uuid, s)

morphir/sdk/core/test/jvm/src/UUIDSpec.scala

+18
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,24 @@ object UUIDSpec extends MorphirBaseSpec {
6969
val u2 = UUID.forName(name2)(namespace)
7070
assertTrue(u1 != u2)
7171
}
72+
),
73+
suite("Known namespaces")(
74+
test("dnsNamespace should be a valid UUID") {
75+
val uuid = UUID.dnsNamespace
76+
assertTrue(uuid.isInstanceOf[UUID.UUID])
77+
},
78+
test("urlNamespace should be a valid UUID") {
79+
val uuid = UUID.urlNamespace
80+
assertTrue(uuid.isInstanceOf[UUID.UUID])
81+
},
82+
test("oidNamespace should be a valid UUID") {
83+
val uuid = UUID.oidNamespace
84+
assertTrue(uuid.isInstanceOf[UUID.UUID])
85+
},
86+
test("x500Namespace should be a valid UUID") {
87+
val uuid = UUID.x500Namespace
88+
assertTrue(uuid.isInstanceOf[UUID.UUID])
89+
}
7290
)
7391
)
7492

0 commit comments

Comments
 (0)