oasis-tcs · HeikoTheissen · Apr 14, 2022 · Apr 1, 2022 · Apr 1, 2022 · Apr 7, 2022
diff --git a/examples/counterexamples/annotationtarget1.xml b/examples/counterexamples/annotationtarget1.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" xmlns="http://docs.oasis-open.org/odata/ns/edm" Version="4.01">
+  <edmx:DataServices>
+    <Schema Namespace="org.example">
+      <Annotations Target="org.example.Function1(org.example.Type1,)">
+        <Annotation Term="Core.Description" />
+      </Annotations>
+    </Schema>
+  </edmx:DataServices>
+</edmx:Edmx>
diff --git a/examples/counterexamples/test.properties b/examples/counterexamples/test.properties
@@ -0,0 +1,6 @@
+test1.xml.line=9
+test1.xml.col=14
+test1.xml.rule=cvc-complex-type.2.4.a
+annotationtarget1.xml.line=5
+annotationtarget1.xml.col=71
+annotationtarget1.xml.rule=cvc-pattern-valid
diff --git a/examples/counterexamples/test1.xml b/examples/counterexamples/test1.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" xmlns="http://docs.oasis-open.org/odata/ns/edm" Version="4.01">
+  <edmx:DataServices>
+    <Schema Namespace="org.example">
+      <EntityType Name="DoubleKey">
+        <Key>
+          <PropertyRef Name="ID" />
+        </Key>
+        <Key>
+          <PropertyRef Name="FirstName" />
+          <PropertyRef Name="LastName" />
+        </Key>
+        <Property Name="ID" Type="Edm.String" Nullable="false" />
+        <Property Name="FirstName" Type="Edm.String" Nullable="false" />
+        <Property Name="LastName" Type="Edm.String" Nullable="false" />
+      </EntityType>
+    </Schema>
+  </edmx:DataServices>
+</edmx:Edmx>
diff --git a/examples/miscellaneous2.json b/examples/miscellaneous2.json
@@ -7,6 +7,14 @@
                     "$Namespace": "Some.Other.Schema"
                 }
             ]
+        },
+        "https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Core.V1.json": {
+            "$Include": [
+                {
+                    "$Namespace": "Org.OData.Core.V1",
+                    "$Alias": "Core"
+                }
+            ]
         }
     },
     "org.example2": {
@@ -51,6 +59,22 @@
             }
         ],
         "OddWaldos": [
+            {
+                "$Kind": "Function",
+                "$EntitySetPath": "waldos",
+                "$IsBound": true,
+                "$Parameter": [
+                    {
+                        "$Name": "waldos",
+                        "$Collection": true,
+                        "$Type": "One.Waldo"
+                    }
+                ],
+                "$ReturnType": {
+                    "$Collection": true,
+                    "$Type": "One.Waldo"
+                }
+            },
             {
                 "$Kind": "Function",
                 "$EntitySetPath": "waldos",
@@ -77,8 +101,11 @@
                 "$IsBound": true,
                 "$Parameter": [
                     {
-                        "$Name": "foo",
+                        "$Name": "bar",
                         "$Type": "One.Waldo"
+                    },
+                    {
+                        "$Name": "Reason"
                     }
                 ]
             },
@@ -87,11 +114,9 @@
                 "$IsBound": true,
                 "$Parameter": [
                     {
-                        "$Name": "bar",
+                        "$Name": "foo",
+                        "$Collection": true,
                         "$Type": "One.Waldo"
-                    },
-                    {
-                        "$Name": "Reason"
                     }
                 ]
             }
@@ -102,6 +127,26 @@
                 "ID"
             ],
             "ID": {}
+        },
+        "$Annotations": {
+            "One.Foo()": {
+                "@Core.Description": "Unbound function"
+            },
+            "One.OddWaldos(Collection(One.Waldo),One.Waldo)": {
+                "@Core.Description": "Function bound to a collection of Waldos with an additional parameter"
+            },
+            "One.OddWaldos(Collection(One.Waldo))": {
+                "@Core.Description": "Function bound to a collection of Waldos"
+            },
+            "One.Rejection()": {
+                "@Core.Description": "Unbound action"
+            },
+            "One.Rejection(One.Waldo)": {
+                "@Core.Description": "Action bound to a single Waldo"
+            },
+            "One.Rejection(Collection(One.Waldo))": {
+                "@Core.Description": "Action bound to a collection of Waldos"
+            }
         }
     },
     "Schema.Two": {

diff --git a/examples/miscellaneous2.xml b/examples/miscellaneous2.xml
@@ -3,6 +3,9 @@
   <edmx:Reference Uri="SomeOther.xml">
     <edmx:Include Namespace="Some.Other.Schema" />
   </edmx:Reference>
+  <edmx:Reference Uri="https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Core.V1.xml">
+    <edmx:Include Alias="Core" Namespace="Org.OData.Core.V1" />
+  </edmx:Reference>
 
   <edmx:DataServices>
     <Schema Namespace="org.example2">
@@ -26,24 +29,52 @@
       <Function Name="Foo">
         <ReturnType Type="Edm.String" MaxLength="42" />
       </Function>
+
+      <Function Name="OddWaldos" IsBound="true" EntitySetPath="waldos">
+        <Parameter Name="waldos" Type="Collection(One.Waldo)" />
+        <ReturnType Type="Collection(One.Waldo)" />
+      </Function>
       <Function Name="OddWaldos" IsBound="true" EntitySetPath="waldos">
         <Parameter Name="waldos" Type="Collection(One.Waldo)" />
         <ReturnType Type="Collection(One.Waldo)" />
       </Function>
+
       <Action Name="Rejection" />
-      <Action Name="Rejection" IsBound="true">
-        <Parameter Name="foo" Type="One.Waldo" Nullable="false" />
-      </Action>
       <Action Name="Rejection" IsBound="true">
         <Parameter Name="bar" Type="One.Waldo" Nullable="false" />
         <Parameter Name="Reason" Type="Edm.String" MaxLength="max" Nullable="false" />
       </Action>
+      <Action Name="Rejection" IsBound="true">
+        <Parameter Name="foo" Type="Collection(One.Waldo)" Nullable="false" />
+      </Action>
+
       <EntityType Name="Waldo">
         <Key>
           <PropertyRef Name="ID" />
         </Key>
         <Property Name="ID" Type="Edm.String" Nullable="false" />
       </EntityType>
+
+      <Annotations Target="One.Foo()">
+        <Annotation Term="Core.Description" String="Unbound function" />
+      </Annotations>
+
+      <Annotations Target="One.OddWaldos(Collection(One.Waldo),One.Waldo)">
+        <Annotation Term="Core.Description" String="Function bound to a collection of Waldos with an additional parameter" />
+      </Annotations>
+      <Annotations Target="One.OddWaldos(Collection(One.Waldo))">
+        <Annotation Term="Core.Description" String="Function bound to a collection of Waldos" />
+      </Annotations>
+
+      <Annotations Target="One.Rejection()">
+        <Annotation Term="Core.Description" String="Unbound action" />
+      </Annotations>
+      <Annotations Target="One.Rejection(One.Waldo)">
+        <Annotation Term="Core.Description" String="Action bound to a single Waldo" />
+      </Annotations>
+      <Annotations Target="One.Rejection(Collection(One.Waldo))">
+        <Annotation Term="Core.Description" String="Action bound to a collection of Waldos" />
+      </Annotations>
     </Schema>
 
     <Schema Namespace="Schema.Two" Alias="Two">

diff --git a/java/Validator.java b/java/Validator.java
@@ -2,9 +2,12 @@
 import javax.xml.validation.SchemaFactory;
 import javax.xml.XMLConstants;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.util.Properties;
 import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 
 class XMLFiles implements FilenameFilter {
 	public boolean accept(File dir, String name) {
@@ -20,5 +23,33 @@ public static void main(String[] args) throws IOException, SAXException {
 			System.out.println(file.getName());
 			validator.validate(new StreamSource(file));
 		}
+		var test = new Properties();
+		test.load(new FileInputStream("examples/counterexamples/test.properties"));
+		for (var file : new File("examples/counterexamples").listFiles(new XMLFiles())) {
+			int line = Integer.parseInt(test.getProperty(file.getName() + ".line"));
+			int col = Integer.parseInt(test.getProperty(file.getName() + ".col"));
+			String rule = test.getProperty(file.getName() + ".rule");
+			try {
+				validator.validate(new StreamSource(file));
+				System.err.println(file.getName() + " does not fail at line " +
+						line + ", column " +
+						col + ", rule " + rule);
+				System.exit(1);
+			} catch(SAXParseException e) {
+				if (e.getColumnNumber() == col &&
+						e.getLineNumber() == line &&
+						e.getMessage().startsWith(rule + ":"))
+					System.out.println("Negative test " + file.getName());
+				else {
+					System.err.println(file.getName() + " fails at line " +
+							e.getLineNumber() + ", column " +
+							e.getColumnNumber() + ", rule " + e.getMessage());
+					System.err.println("instead of line " +
+							line + ", column " +
+							col + ", rule " + rule);
+					System.exit(1);
+				}
+			}
+		}
 	}
 }
diff --git a/schemas/edm.xsd b/schemas/edm.xsd
@@ -54,9 +54,7 @@
   prose specification document take precedence.
 
 -->
-<xs:schema elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:edm="http://docs.oasis-open.org/odata/ns/edm" targetNamespace="http://docs.oasis-open.org/odata/ns/edm"
->
+<xs:schema elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:edm="http://docs.oasis-open.org/odata/ns/edm" targetNamespace="http://docs.oasis-open.org/odata/ns/edm">
   <xs:annotation>
     <xs:documentation xml:lang="en">
       Entity Data Model part of the Common Schema Definition Language
@@ -604,15 +602,13 @@
     <xs:restriction base="xs:NCName">
       <xs:maxLength value="511" />
       <!-- one or more SimpleIdentifiers separated by dots -->
-      <xs:pattern
-        value="[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}(\.[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}){0,}" />
+      <xs:pattern value="[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}(\.[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}){0,}" />
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="TQualifiedName">
     <xs:restriction base="xs:NCName">
       <!-- a NamespaceName followed by a dot and a SimpleIdentifier -->
-      <xs:pattern
-        value="[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}(\.[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}){1,}" />
+      <xs:pattern value="[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}(\.[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}){1,}" />
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="TEnumMemberList">
@@ -624,8 +620,7 @@
         <xs:restriction base="xs:token">
           <!-- The below pattern represents the allowed identifiers in the ECMAScript specification plus the '.' for namespace qualification
             and the Collection() wrapper -->
-          <xs:pattern
-            value="Collection\([\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}(\.[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}){1,}\)" />
+          <xs:pattern value="Collection\([\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}(\.[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}){1,}\)" />
         </xs:restriction>
       </xs:simpleType>
     </xs:union>
@@ -634,8 +629,7 @@
     <xs:restriction base="xs:string">
       <!-- The below pattern represents the allowed identifiers in the ECMAScript specification plus the '.' for namespace qualification
         and the '/' for path segment separation -->
-      <xs:pattern
-        value="[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}([\./][\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}){0,}" />
+      <xs:pattern value="[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}([\./][\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}){0,}" />
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="TInstancePath">
@@ -648,16 +642,15 @@
       <!-- The below pattern represents the allowed identifiers in the ECMAScript specification plus the '/' for path segment separation
         and
         the '.' for namespace qualification inside the segments. -->
-      <xs:pattern
-        value="(/?@?[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}(([\./#@]|/@)[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}){0,}(/$count)?)?" />
+      <xs:pattern value="(/?@?[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}(([\./#@]|/@)[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}){0,}(/$count)?)?" />
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="TTarget">
     <xs:restriction base="xs:string">
       <!-- The below pattern represents the allowed identifiers in the ECMAScript specification plus the '.' for namespace qualification,
         the '/' for path segment separation, and parentheses and comma for overload targeting -->
       <xs:pattern
-        value="[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}(([\.\(,#]|/@?)(\)|[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}\)?)){0,}(/$ReturnType)?" />
+        value="[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}(([.,#(]|/@?|\(?\){1,}((,|/@?))?)[\p{L}\p{Nl}_][\p{L}\p{Nl}\p{Nd}\p{Mn}\p{Mc}\p{Pc}\p{Cf}]{0,}){0,}\(?\){0,}(/$ReturnType)?" />
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="TClientFunction">
@@ -889,8 +882,7 @@
   <!-- binary data in base64url encoding -->
   <xs:simpleType name="binary">
     <xs:restriction base="xs:string">
-      <xs:pattern
-        value="([A-Za-z0-9_\-]{4})*([A-Za-z0-9_\-]{3}[A-Za-z0-9_\-]|[A-Za-z0-9_\-]{2}[AEIMQUYcgkosw048]=?|[A-Za-z0-9_\-][AQgw](==)?)?" />
+      <xs:pattern value="([A-Za-z0-9_\-]{4})*([A-Za-z0-9_\-]{3}[A-Za-z0-9_\-]|[A-Za-z0-9_\-]{2}[AEIMQUYcgkosw048]=?|[A-Za-z0-9_\-][AQgw](==)?)?" />
     </xs:restriction>
   </xs:simpleType>
   <!--boolean without 0 and 1 -->
@@ -922,4 +914,4 @@
       <xs:pattern value="[^YM]*[DT].*" />
     </xs:restriction>
   </xs:simpleType>
-</xs:schema>
+</xs:schema>