Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make namespaces UUIDs not strings #175

Merged
merged 1 commit into from
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions morphir/sdk/core/jvm/src/morphir/sdk/UUID.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ object UUID {

val Nil: UUID = MUUID.Nil

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

def compare(uuid1: UUID)(uuid2: UUID): Int = uuid1.compareTo(uuid2)
def forName(s: String)(uuid: UUID): UUID = MUUID.V5(uuid, s)
Expand Down
18 changes: 18 additions & 0 deletions morphir/sdk/core/test/jvm/src/UUIDSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,24 @@ object UUIDSpec extends MorphirBaseSpec {
val u2 = UUID.forName(name2)(namespace)
assertTrue(u1 != u2)
}
),
suite("Known namespaces")(
test("dnsNamespace should be a valid UUID") {
val uuid = UUID.dnsNamespace
assertTrue(uuid.isInstanceOf[UUID.UUID])
},
test("urlNamespace should be a valid UUID") {
val uuid = UUID.urlNamespace
assertTrue(uuid.isInstanceOf[UUID.UUID])
},
test("oidNamespace should be a valid UUID") {
val uuid = UUID.oidNamespace
assertTrue(uuid.isInstanceOf[UUID.UUID])
},
test("x500Namespace should be a valid UUID") {
val uuid = UUID.x500Namespace
assertTrue(uuid.isInstanceOf[UUID.UUID])
}
)
)

Expand Down