Check identity constraint refs don't have invalid attributes

pdvrieze · Jan 31, 2024 · 1892106 · 1892106
1 parent 2a1b83d
commit 1892106
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 9 deletions.
diff --git a/.../src/commonMain/kotlin/io/github/pdvrieze/formats/xmlschema/resolved/ResolvedDirectKey.kt b/.../src/commonMain/kotlin/io/github/pdvrieze/formats/xmlschema/resolved/ResolvedDirectKey.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023.
+ * Copyright (c) 2024.
  *
  * This file is part of xmlutil.
  *
@@ -31,6 +31,10 @@ class ResolvedDirectKey(
     owner: ResolvedElement,
 ): ResolvedDirectReferenceable(rawPart, schema, owner), ResolvedKey {
 
+    init {
+        require(rawPart.ref == null) { "A key can either have a name or ref" }
+    }
+
     override val mdlQName: QName = checkNotNull(rawPart.name).toQname(schema.targetNamespace)
 
     override val selector: XSSelector = checkNotNull(rawPart.selector)

diff --git a/...c/commonMain/kotlin/io/github/pdvrieze/formats/xmlschema/resolved/ResolvedDirectUnique.kt b/...c/commonMain/kotlin/io/github/pdvrieze/formats/xmlschema/resolved/ResolvedDirectUnique.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023.
+ * Copyright (c) 2024.
  *
  * This file is part of xmlutil.
  *
@@ -23,7 +23,6 @@ package io.github.pdvrieze.formats.xmlschema.resolved
 import io.github.pdvrieze.formats.xmlschema.datatypes.serialization.XSField
 import io.github.pdvrieze.formats.xmlschema.datatypes.serialization.XSSelector
 import io.github.pdvrieze.formats.xmlschema.datatypes.serialization.XSUnique
-import io.github.pdvrieze.formats.xmlschema.resolved.checking.CheckHelper
 import nl.adaptivity.xmlutil.QName
 
 class ResolvedDirectUnique(
@@ -32,6 +31,10 @@ class ResolvedDirectUnique(
     owner: ResolvedElement,
 ): ResolvedDirectReferenceable(rawPart, schema, owner), ResolvedUnique {
 
+    init {
+        require(rawPart.ref == null) { "A unique can either have a name or ref" }
+    }
+
     override val constraint: ResolvedDirectUnique
         get() = this
 

diff --git a/...rc/commonMain/kotlin/io/github/pdvrieze/formats/xmlschema/resolved/ResolvedIndirectKey.kt b/...rc/commonMain/kotlin/io/github/pdvrieze/formats/xmlschema/resolved/ResolvedIndirectKey.kt
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2023.
+ * Copyright (c) 2024.
  *
- * This file is part of XmlUtil.
+ * This file is part of xmlutil.
  *
  * This file is licenced to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
@@ -31,6 +31,8 @@ class ResolvedIndirectKey(
 
     init {
         check(rawPart.name == null)
+        check(rawPart.selector == null) { "When reference only id is valid member, not selector" }
+        check(rawPart.fields.isEmpty()) { "When reference only id is valid member, not fields" }
     }
 
     override val mdlIdentityConstraintCategory: ResolvedIdentityConstraint.Category get() = super.mdlIdentityConstraintCategory

diff --git a/...commonMain/kotlin/io/github/pdvrieze/formats/xmlschema/resolved/ResolvedIndirectKeyRef.kt b/...commonMain/kotlin/io/github/pdvrieze/formats/xmlschema/resolved/ResolvedIndirectKeyRef.kt
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2023.
+ * Copyright (c) 2024.
  *
- * This file is part of XmlUtil.
+ * This file is part of xmlutil.
  *
  * This file is licenced to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
@@ -29,6 +29,9 @@ class ResolvedIndirectKeyRef(rawPart: XSKeyRef, schema: ResolvedSchemaLike, owne
 
     init {
         check(rawPart.name == null)
+        check(rawPart.refer == null) { "When reference only id is valid member, not refer" }
+        check(rawPart.selector == null) { "When reference only id is valid member, not selector" }
+        check(rawPart.fields.isEmpty()) { "When reference only id is valid member, not fields" }
     }
 
     override val constraint: ResolvedIndirectKeyRef get() = this

diff --git a/...commonMain/kotlin/io/github/pdvrieze/formats/xmlschema/resolved/ResolvedIndirectUnique.kt b/...commonMain/kotlin/io/github/pdvrieze/formats/xmlschema/resolved/ResolvedIndirectUnique.kt
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2023.
+ * Copyright (c) 2024.
  *
- * This file is part of XmlUtil.
+ * This file is part of xmlutil.
  *
  * This file is licenced to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
@@ -30,6 +30,8 @@ class ResolvedIndirectUnique(
 ): ResolvedIndirectIdentityConstraint<ResolvedDirectUnique>(rawPart, schema, owner), ResolvedUnique {
     init {
         check(rawPart.name == null)
+        check(rawPart.selector == null) { "When reference only id is valid member, not selector" }
+        check(rawPart.fields.isEmpty()) { "When reference only id is valid member, not fields" }
     }
     override val constraint: ResolvedIndirectUnique
         get() = this