Remove # prefix in contract references

C0nquistadore · C0nquistadore · commit 78d9d3becb9f · 2022-09-23T14:24:18.000+02:00
diff --git a/README.md b/README.md
@@ -79,15 +79,15 @@ In this walkthrough, we try to create the following endpoints, that make up a RE
       "isPartOfKey": "true"
     },
     "Name": "string",
-    "Gender": "#Gender",
-    "AccessRights": "#AccessRights",
-    "BankAccounts": "#BankAccounts*",
+    "Gender": "Gender",
+    "AccessRights": "AccessRights",
+    "BankAccounts": "BankAccounts*",
     "PetId": "int64?"
   },
   "CreatePersonRequest": {
     "Name": "string",
-    "Gender": "#Gender",
-    "AccessRights": "#AccessRights",
+    "Gender": "Gender",
+    "AccessRights": "AccessRights",
     "PetId": "int64?"
   },
   "Pet":{
@@ -96,9 +96,9 @@ In this walkthrough, we try to create the following endpoints, that make up a RE
   },
   "UpdatePersonRequest": {
     "Name": "string",
-    "Gender": "#Gender",
-    "AccessRights": "#AccessRights",
-    "Pets": "#Pet*"
+    "Gender": "Gender",
+    "AccessRights": "AccessRights",
+    "Pets": "Pet*"
   }
 }
 ```
diff --git a/src/Dibix.Sdk/Schema/dibix.contracts.schema.json b/src/Dibix.Sdk/Schema/dibix.contracts.schema.json
@@ -7,7 +7,7 @@
     },
     "SchemaTypeReference": {
       "type": "string",
-      "pattern": "^#([\\w]+)(.([\\w]+))*\\??\\*?$"
+      "pattern": "^([\\w]+)(.([\\w]+))*\\??\\*?$"
     },
     "PropertyType": {
       "anyOf": [
diff --git a/tests/Dibix.Sdk.Tests.Database/Contracts/AnotherInputContract.json b/tests/Dibix.Sdk.Tests.Database/Contracts/AnotherInputContract.json
@@ -6,7 +6,7 @@
       "type": "string",
       "isOptional": true
     },
-    "SomeIds": "#AnotherEntry*",
+    "SomeIds": "AnotherEntry*",
     "D": "uuid",
     "Password": "string",
     "E": "boolean",
diff --git a/tests/Dibix.Sdk.Tests.Database/Contracts/Extension/MultiMapContract.json b/tests/Dibix.Sdk.Tests.Database/Contracts/Extension/MultiMapContract.json
@@ -1,7 +1,7 @@
 ﻿{
   "MultiMapContract": {
     "X": "uuid?",
-    "Y": "#GenericContract*",
-    "Directions": "#Direction*"
+    "Y": "GenericContract*",
+    "Directions": "Direction*"
   }
 }
diff --git a/tests/Dibix.Sdk.Tests.Database/Contracts/GenericContract.json b/tests/Dibix.Sdk.Tests.Database/Contracts/GenericContract.json
@@ -16,7 +16,7 @@
       "isDiscriminator": true
     },
     "Role": {
-      "type": "#Role",
+      "type": "Role",
       "default": "User"
     },
     "CreationTime": {
diff --git a/tests/Dibix.Sdk.Tests.Database/Contracts/Grid/GridResult.json b/tests/Dibix.Sdk.Tests.Database/Contracts/Grid/GridResult.json
@@ -1,6 +1,6 @@
 ﻿{
   "GridResult": {
-    "Item": "#Extension.MultiMapContract",
-    "Directions": "#Direction*"
+    "Item": "Extension.MultiMapContract",
+    "Directions": "Direction*"
   }
 }
diff --git a/tests/Dibix.Sdk.Tests.Database/Contracts/InputContract.json b/tests/Dibix.Sdk.Tests.Database/Contracts/InputContract.json
@@ -6,7 +6,7 @@
       "type": "string",
       "isOptional": true
     },
-    "Ids": "#Entry*",
+    "Ids": "Entry*",
     "D": "uuid",
     "Password": "string",
     "E": "boolean",
diff --git a/tests/Dibix.Sdk.Tests.Database/Contracts/JointContract.json b/tests/Dibix.Sdk.Tests.Database/Contracts/JointContract.json
@@ -1,7 +1,7 @@
 ﻿{
   "JointContract": {
-    "A": "#GenericContract",
-    "B": "#Direction",
-    "C": "#AccessRights"
+    "A": "GenericContract",
+    "B": "Direction",
+    "C": "AccessRights"
   }
 }
diff --git a/tests/Dibix.Sdk.Tests.Database/Contracts/Request.json b/tests/Dibix.Sdk.Tests.Database/Contracts/Request.json
@@ -1,6 +1,6 @@
 ﻿{
   "Request": {
-    "Id": "#Entry",
-    "Ids": "#Entry*"
+    "Id": "Entry",
+    "Ids": "Entry*"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"MultiMapContract": {`
`3`	`3`	`"X": "uuid?",`
`4`		`- "Y": "#GenericContract*",`
`5`		`- "Directions": "#Direction*"`
	`4`	`+ "Y": "GenericContract*",`
	`5`	`+ "Directions": "Direction*"`
`6`	`6`	`}`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"GridResult": {`
`3`		`- "Item": "#Extension.MultiMapContract",`
`4`		`- "Directions": "#Direction*"`
	`3`	`+ "Item": "Extension.MultiMapContract",`
	`4`	`+ "Directions": "Direction*"`
`5`	`5`	`}`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"JointContract": {`
`3`		`- "A": "#GenericContract",`
`4`		`- "B": "#Direction",`
`5`		`- "C": "#AccessRights"`
	`3`	`+ "A": "GenericContract",`
	`4`	`+ "B": "Direction",`
	`5`	`+ "C": "AccessRights"`
`6`	`6`	`}`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"Request": {`
`3`		`- "Id": "#Entry",`
`4`		`- "Ids": "#Entry*"`
	`3`	`+ "Id": "Entry",`
	`4`	`+ "Ids": "Entry*"`
`5`	`5`	`}`
`6`	`6`	`}`