diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/elementmodel/Element.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/elementmodel/Element.java index 37605a9d8..3c4146450 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/elementmodel/Element.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/elementmodel/Element.java @@ -512,12 +512,12 @@ public class Element extends Base { @SuppressWarnings("unchecked") List decorations = (List) getUserData("fhir.decorations"); if (decorations == null) { - decorations = new ArrayList(); + decorations = new ArrayList<>(); setUserData("fhir.decorations", decorations); } decorations.add(new ElementDecoration(DecorationType.TYPE, profile.getUserString("path"), definition.getPath())); - if (tail(definition.getId()).contains(":")) { - String[] details = tail(definition.getId()).split("\\:"); + if (definition.getId() != null && tail(definition.getId()).contains(":")) { + String[] details = tail(definition.getId()).split(":"); decorations.add(new ElementDecoration(DecorationType.SLICE, null, details[1])); } } diff --git a/org.hl7.fhir.r4/src/main/resources/graphdefinition/full-syntax.gdl b/org.hl7.fhir.r4/src/main/resources/graphdefinition/full-syntax.gdl new file mode 100644 index 000000000..6df001f17 --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/graphdefinition/full-syntax.gdl @@ -0,0 +1,18 @@ +Patient(http://hl7.org/fhir/us/core/Patient) { + managingOrganization cardinality 0..1 'description of item' : + Organization(http://hl7.org/fhir/us/core/Organization) { + endpoint : Endpoint + }; + Basic; + Group { + item : Patient + }, + generalPractitioner : Organization, + search Observation?patient={ref} cardinality 0..10 'Observations for the patient' { + performer : Practitioner, + related.where(type='has-member').target : Observation require matching Patient, + related.where(type='derived-from').target : Observation where identical Patient, + related.where(type='sequel-to').target : Observation where different Patient, + related.where(type='qualified-by').target : Observation where custom Patient = path + } +} \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/graphdefinition/full-syntax.gdl.bundle b/org.hl7.fhir.r4/src/main/resources/graphdefinition/full-syntax.gdl.bundle new file mode 100644 index 000000000..37a2dddbd --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/graphdefinition/full-syntax.gdl.bundle @@ -0,0 +1,186 @@ + + + + + + + + + +
+ + + + + + + + + + + + + +
NamePeter James + Chalmers("Jim")
Address534 Erewhon, Pleasantville, Vic, 3999
ContactsHome: unknown. Work: (03) 5555 6473
IdMRN: 12345 (Acme Healthcare)
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+

Gastroenterology @ Acme Hospital. ph: +1 555 234 3523, email: + gastro@acme.org

+ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/graphdefinition/manifest.xml b/org.hl7.fhir.r4/src/main/resources/graphdefinition/manifest.xml new file mode 100644 index 000000000..09e126d9b --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/graphdefinition/manifest.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/graphdefinition/simple.gdl b/org.hl7.fhir.r4/src/main/resources/graphdefinition/simple.gdl new file mode 100644 index 000000000..c3016052a --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/graphdefinition/simple.gdl @@ -0,0 +1 @@ +Patient{managingOrganization:Organization{endpoint:Endpoint}} diff --git a/org.hl7.fhir.r4/src/main/resources/graphdefinition/simple.gdl.bundle b/org.hl7.fhir.r4/src/main/resources/graphdefinition/simple.gdl.bundle new file mode 100644 index 000000000..37a2dddbd --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/graphdefinition/simple.gdl.bundle @@ -0,0 +1,186 @@ + + + + + + + + + +
+ + + + + + + + + + + + + +
NamePeter James + Chalmers("Jim")
Address534 Erewhon, Pleasantville, Vic, 3999
ContactsHome: unknown. Work: (03) 5555 6473
IdMRN: 12345 (Acme Healthcare)
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+

Gastroenterology @ Acme Hospital. ph: +1 555 234 3523, email: + gastro@acme.org

+ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/patch/fhir-path-tests.xml b/org.hl7.fhir.r4/src/main/resources/patch/fhir-path-tests.xml new file mode 100644 index 000000000..48c29084e --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/patch/fhir-path-tests.xml @@ -0,0 +1,1723 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NamePeter James + Chalmers ("Jim") +
Address534 Erewhon, Pleasantville, Vic, 3999
ContactsHome: unknown. Work: (03) 5555 6473
IdMRN: 12345 (Acme Healthcare)
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NamePeter James + Chalmers1 ("Jim") +
Address534 Erewhon, Pleasantville, Vic, 3999
ContactsHome: unknown. Work: (03) 5555 6473
IdMRN: 12345 (Acme Healthcare)
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
+ + + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/patch/json-patch-tests.json b/org.hl7.fhir.r4/src/main/resources/patch/json-patch-tests.json new file mode 100644 index 000000000..53b12fda2 --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/patch/json-patch-tests.json @@ -0,0 +1,272 @@ +[{ + "comment": "4.1. add with missing object", + "doc": { + "q": { + "bar": 2 + } + }, + "patch": [{ + "op": "add", + "path": "/a/b", + "value": 1 + }], + "error": "path /a does not exist -- missing objects are not created recursively" +}, +{ + "comment": "A.1. Adding an Object Member", + "doc": { + "foo": "bar" + }, + "patch": [{ + "op": "add", + "path": "/baz", + "value": "qux" + }], + "expected": { + "baz": "qux", + "foo": "bar" + } +}, +{ + "comment": "A.2. Adding an Array Element", + "doc": { + "foo": ["bar", + "baz"] + }, + "patch": [{ + "op": "add", + "path": "/foo/1", + "value": "qux" + }], + "expected": { + "foo": ["bar", + "qux", + "baz"] + } +}, +{ + "comment": "A.3. Removing an Object Member", + "doc": { + "baz": "qux", + "foo": "bar" + }, + "patch": [{ + "op": "remove", + "path": "/baz" + }], + "expected": { + "foo": "bar" + } +}, +{ + "comment": "A.4. Removing an Array Element", + "doc": { + "foo": ["bar", + "qux", + "baz"] + }, + "patch": [{ + "op": "remove", + "path": "/foo/1" + }], + "expected": { + "foo": ["bar", + "baz"] + } +}, +{ + "comment": "A.5. Replacing a Value", + "doc": { + "baz": "qux", + "foo": "bar" + }, + "patch": [{ + "op": "replace", + "path": "/baz", + "value": "boo" + }], + "expected": { + "baz": "boo", + "foo": "bar" + } +}, +{ + "comment": "A.6. Moving a Value", + "doc": { + "foo": { + "bar": "baz", + "waldo": "fred" + }, + "qux": { + "corge": "grault" + } + }, + "patch": [{ + "op": "move", + "from": "/foo/waldo", + "path": "/qux/thud" + }], + "expected": { + "foo": { + "bar": "baz" + }, + "qux": { + "corge": "grault", + "thud": "fred" + } + } +}, +{ + "comment": "A.7. Moving an Array Element", + "doc": { + "foo": ["all", + "grass", + "cows", + "eat"] + }, + "patch": [{ + "op": "move", + "from": "/foo/1", + "path": "/foo/3" + }], + "expected": { + "foo": ["all", + "cows", + "eat", + "grass"] + } +}, +{ + "comment": "A.8. Testing a Value: Success", + "doc": { + "baz": "qux", + "foo": ["a", + 2, + "c"] + }, + "patch": [{ + "op": "test", + "path": "/baz", + "value": "qux" + }, + { + "op": "test", + "path": "/foo/1", + "value": 2 + }], + "expected": { + "baz": "qux", + "foo": ["a", + 2, + "c"] + } +}, +{ + "comment": "A.9. Testing a Value: Error", + "doc": { + "baz": "qux" + }, + "patch": [{ + "op": "test", + "path": "/baz", + "value": "bar" + }], + "error": "string not equivalent" +}, +{ + "comment": "A.10. Adding a nested Member Object", + "doc": { + "foo": "bar" + }, + "patch": [{ + "op": "add", + "path": "/child", + "value": { + "grandchild": { + + } + } + }], + "expected": { + "foo": "bar", + "child": { + "grandchild": { + + } + } + } +}, +{ + "comment": "A.11. Ignoring Unrecognized Elements", + "doc": { + "foo": "bar" + }, + "patch": [{ + "op": "add", + "path": "/baz", + "value": "qux", + "xyz": 123 + }], + "expected": { + "foo": "bar", + "baz": "qux" + } +}, +{ + "comment": "A.12. Adding to a Non-existent Target", + "doc": { + "foo": "bar" + }, + "patch": [{ + "op": "add", + "path": "/baz/bat", + "value": "qux" + }], + "error": "add to a non-existent target" +}, +{ + "comment": "A.14. ~ Escape Ordering", + "doc": { + "/": 9, + "~1": 10 + }, + "patch": [{ + "op": "test", + "path": "/~01", + "value": 10 + }], + "expected": { + "/": 9, + "~1": 10 + } +}, +{ + "comment": "A.15. Comparing Strings and Numbers", + "doc": { + "/": 9, + "~1": 10 + }, + "patch": [{ + "op": "test", + "path": "/~01", + "value": "10" + }], + "error": "number is not equal to string" +}, +{ + "comment": "A.16. Adding an Array Value", + "doc": { + "foo": ["bar"] + }, + "patch": [{ + "op": "add", + "path": "/foo/-", + "value": ["abc", + "def"] + }], + "expected": { + "foo": ["bar", + ["abc", + "def"]] + } +}] \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/patch/xml-patch-tests.xml b/org.hl7.fhir.r4/src/main/resources/patch/xml-patch-tests.xml new file mode 100644 index 000000000..8d410a736 --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/patch/xml-patch-tests.xml @@ -0,0 +1,531 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + test + + + + + + + + + + + + + + test + test + + + + + + + + + + + + test + test1 + + + + + + + + test1 + + + + + + + + test + test1 + + + + + + + + test + + + + + + + + test + test1 + + + + + + + + test1 + + + + + + + + test + test1 + + + + + + + + test + + + + + + + + test + test1 + + + + + + + + test + test1 + + + + + + + + test + test1 + + + + + + + + test + + + + + + + + + test + + + + + + + + + + + + + + test + + + + + + + + + + + + + + + + This is a new child + + + + This is a new child + + + + + + + + + + This is new text + + + This is new text + + + + + + + + + Attribute text + + + + + + + + + + + +
some html
 + + +
some html
 + + + + + + + + + + This is a sample document + + + + This is a new child + + + + This is a sample document + This is a new child + + + + + + + This is a sample document + This is a new child + + + + Bob + + + + This is a sample document + This is a new child + + + + + + + + This is a sample document + This is a new child + + + + urn:ns:xxx + + + + This is a sample document + This is a new child + + + + + + + This is a sample document + This is a new child + + + + + + + + This is a sample document + + This is a new child + + + + + + + + This is a sample document + + + + This is a new child + + + + This is a sample document + This is a new child + + + + + + + + This is a sample document + + + + + + + + + + + + + + + + This is a sample document + + + + new value + + + + This is a sample document + + + + + + + + + This is a sample document + + + + + + + + + This is a sample document + + + + + + + + + + This is a sample document + + + + This is the new text content + + + + This is the new text content + + + + + + + + This is a sample document + + + + + + + + + + + + + + This is a sample document + + + + + + + + This is a sample document + + + + + + + + + This is a sample document + + + + + + + + + This is a sample document + + + + + + + + This is a sample document + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/instance-name+comments-ext.xml b/org.hl7.fhir.r4/src/main/resources/profiles/instance-name+comments-ext.xml new file mode 100644 index 000000000..d1a713a35 --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/instance-name+comments-ext.xml @@ -0,0 +1,22 @@ + + + + +
mandatory text
+ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/instance-name+comments-ext2.xml b/org.hl7.fhir.r4/src/main/resources/profiles/instance-name+comments-ext2.xml new file mode 100644 index 000000000..267efdd5e --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/instance-name+comments-ext2.xml @@ -0,0 +1,22 @@ + + + + +
mandatory text
+ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/instance-name+comments-ext3.xml b/org.hl7.fhir.r4/src/main/resources/profiles/instance-name+comments-ext3.xml new file mode 100644 index 000000000..d48a6b042 --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/instance-name+comments-ext3.xml @@ -0,0 +1,22 @@ + + + + +
mandatory text
+ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/instance-name+comments-long.xml b/org.hl7.fhir.r4/src/main/resources/profiles/instance-name+comments-long.xml new file mode 100644 index 000000000..cbf593673 --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/instance-name+comments-long.xml @@ -0,0 +1,17 @@ + + + + +
mandatory text
+ + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/instance-name+comments.xml b/org.hl7.fhir.r4/src/main/resources/profiles/instance-name+comments.xml new file mode 100644 index 000000000..fea4a9524 --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/instance-name+comments.xml @@ -0,0 +1,17 @@ + + + + +
mandatory text
+ + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/instance-name+issued.xml b/org.hl7.fhir.r4/src/main/resources/profiles/instance-name+issued.xml new file mode 100644 index 000000000..2d46ed43d --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/instance-name+issued.xml @@ -0,0 +1,17 @@ + + + + +
mandatory text
+ + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/instance-name-only.xml b/org.hl7.fhir.r4/src/main/resources/profiles/instance-name-only.xml new file mode 100644 index 000000000..d1122690a --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/instance-name-only.xml @@ -0,0 +1,16 @@ + + + + +
mandatory text
+ + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/instance-name-quantity.xml b/org.hl7.fhir.r4/src/main/resources/profiles/instance-name-quantity.xml new file mode 100644 index 000000000..a22876624 --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/instance-name-quantity.xml @@ -0,0 +1,20 @@ + + + + +
mandatory text
+ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/instance-name-quantity2.xml b/org.hl7.fhir.r4/src/main/resources/profiles/instance-name-quantity2.xml new file mode 100644 index 000000000..df88a0d8f --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/instance-name-quantity2.xml @@ -0,0 +1,20 @@ + + + + +
mandatory text
+ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/instance-name-value.xml b/org.hl7.fhir.r4/src/main/resources/profiles/instance-name-value.xml new file mode 100644 index 000000000..d1ed5ad51 --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/instance-name-value.xml @@ -0,0 +1,17 @@ + + + + +
mandatory text
+ + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/profile-base+comments-ext.xml b/org.hl7.fhir.r4/src/main/resources/profiles/profile-base+comments-ext.xml new file mode 100644 index 000000000..61aeb548c --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/profile-base+comments-ext.xml @@ -0,0 +1,527 @@ + + + + + +
Text goes here
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/profile-base+comments-ext3.xml b/org.hl7.fhir.r4/src/main/resources/profiles/profile-base+comments-ext3.xml new file mode 100644 index 000000000..ab19e7594 --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/profile-base+comments-ext3.xml @@ -0,0 +1,527 @@ + + + + + +
Text goes here
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/profile-base+comments-fixed.xml b/org.hl7.fhir.r4/src/main/resources/profiles/profile-base+comments-fixed.xml new file mode 100644 index 000000000..514fd01a8 --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/profile-base+comments-fixed.xml @@ -0,0 +1,522 @@ + + + + + +
Text goes here
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/profile-base+comments-length.xml b/org.hl7.fhir.r4/src/main/resources/profiles/profile-base+comments-length.xml new file mode 100644 index 000000000..7a7877a6b --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/profile-base+comments-length.xml @@ -0,0 +1,522 @@ + + + + + +
Text goes here
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/profile-base+comments.xml b/org.hl7.fhir.r4/src/main/resources/profiles/profile-base+comments.xml new file mode 100644 index 000000000..71d124e99 --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/profile-base+comments.xml @@ -0,0 +1,521 @@ + + + + + +
Text goes here
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/profile-base-no-comments.xml b/org.hl7.fhir.r4/src/main/resources/profiles/profile-base-no-comments.xml new file mode 100644 index 000000000..e2d527cc2 --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/profile-base-no-comments.xml @@ -0,0 +1,521 @@ + + + + + +
Text goes here
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/profile-base.xml b/org.hl7.fhir.r4/src/main/resources/profiles/profile-base.xml new file mode 100644 index 000000000..e31c62905 --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/profile-base.xml @@ -0,0 +1,519 @@ + + + + + +
Text goes here
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/profile-comments-xpath.xml b/org.hl7.fhir.r4/src/main/resources/profiles/profile-comments-xpath.xml new file mode 100644 index 000000000..26ea08f24 --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/profile-comments-xpath.xml @@ -0,0 +1,527 @@ + + + + + +
Text goes here
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/profile-issued.xml b/org.hl7.fhir.r4/src/main/resources/profiles/profile-issued.xml new file mode 100644 index 000000000..7c7459ebd --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/profile-issued.xml @@ -0,0 +1,522 @@ + + + + + +
Text goes here
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/profile-value-quantity-fixed.xml b/org.hl7.fhir.r4/src/main/resources/profiles/profile-value-quantity-fixed.xml new file mode 100644 index 000000000..9c48dfc91 --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/profile-value-quantity-fixed.xml @@ -0,0 +1,504 @@ + + + + + +
Text goes here
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/profile-value-quantity.xml b/org.hl7.fhir.r4/src/main/resources/profiles/profile-value-quantity.xml new file mode 100644 index 000000000..fac69dda3 --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/profile-value-quantity.xml @@ -0,0 +1,500 @@ + + + + + +
Text goes here
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/profile-value-string-2.xml b/org.hl7.fhir.r4/src/main/resources/profiles/profile-value-string-2.xml new file mode 100644 index 000000000..1a1b88bd1 --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/profile-value-string-2.xml @@ -0,0 +1,500 @@ + + + + + +
Text goes here
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/profile-value-string.xml b/org.hl7.fhir.r4/src/main/resources/profiles/profile-value-string.xml new file mode 100644 index 000000000..a90498ca8 --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/profile-value-string.xml @@ -0,0 +1,521 @@ + + + + + +
Text goes here
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/profile-value.xml b/org.hl7.fhir.r4/src/main/resources/profiles/profile-value.xml new file mode 100644 index 000000000..a90498ca8 --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/profile-value.xml @@ -0,0 +1,521 @@ + + + + + +
Text goes here
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/registry.xml b/org.hl7.fhir.r4/src/main/resources/profiles/registry.xml new file mode 100644 index 000000000..257121462 --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/registry.xml @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/org.hl7.fhir.r4/src/main/resources/profiles/run-profile-tests.bat b/org.hl7.fhir.r4/src/main/resources/profiles/run-profile-tests.bat new file mode 100644 index 000000000..a52de0edf --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/profiles/run-profile-tests.bat @@ -0,0 +1 @@ +java -jar ..\..\tools\bin\org.hl7.fhir.validator.jar -profile-tests registry.xml -defn ..\..\publish\validation.zip \ No newline at end of file diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index 5bf52803b..22b6bb0ca 100644 --- a/org.hl7.fhir.validation.cli/pom.xml +++ b/org.hl7.fhir.validation.cli/pom.xml @@ -55,29 +55,63 @@ + + org.apache.maven.plugins - maven-shade-plugin - 3.2.1 + maven-dependency-plugin - package + unpack-dependencies + process-classes - shade + unpack-dependencies - standalone - - - org.hl7.fhir.r4.validation.Validator - - - true + **/module-info.class + ${project.build.directory}/classes + false + true + test + compile + + org.apache.maven.plugins + maven-jar-plugin + + + + true + org.hl7.fhir.r4.validation.Validator + + + + + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + true + + + + org.basepom.maven + duplicate-finder-maven-plugin + + true + + +