diff --git a/.gitignore b/.gitignore index 744673c31..5c9e69536 100644 --- a/.gitignore +++ b/.gitignore @@ -153,3 +153,5 @@ local.properties .texlipse /org.hl7.fhir.r4/src/test/resources/gen /org.hl7.fhir.r4/src/test/resources/graphql/*.out +/org.hl7.fhir.r4/src/main/resources/graphql/*.out +/org.hl7.fhir.r4/src/main/resources/gen diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/test/utils/TestingUtilities.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/test/utils/TestingUtilities.java index d18e57f30..f3dbad616 100644 --- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/test/utils/TestingUtilities.java +++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/test/utils/TestingUtilities.java @@ -441,12 +441,12 @@ public class TestingUtilities { public static String resourceNameToFile(String name) throws IOException { - return Utilities.path(System.getProperty("user.dir"), "src", "test", "resources", name); + return Utilities.path(System.getProperty("user.dir"), "src", "main", "resources", name); } public static String resourceNameToFile(String subFolder, String name) throws IOException { - return Utilities.path(System.getProperty("user.dir"), "src", "test", "resources", subFolder, name); + return Utilities.path(System.getProperty("user.dir"), "src", "main", "resources", subFolder, name); } } diff --git a/org.hl7.fhir.r4/src/test/resources/bundle-example.ttl b/org.hl7.fhir.r4/src/main/resources/bundle-example.ttl similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/bundle-example.ttl rename to org.hl7.fhir.r4/src/main/resources/bundle-example.ttl diff --git a/org.hl7.fhir.r4/src/test/resources/condition-example.xml b/org.hl7.fhir.r4/src/main/resources/condition-example.xml similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/condition-example.xml rename to org.hl7.fhir.r4/src/main/resources/condition-example.xml diff --git a/org.hl7.fhir.r4/src/test/resources/fhirpath/tests-fhir-r4.xml b/org.hl7.fhir.r4/src/main/resources/fhirpath/tests-fhir-r4.xml similarity index 97% rename from org.hl7.fhir.r4/src/test/resources/fhirpath/tests-fhir-r4.xml rename to org.hl7.fhir.r4/src/main/resources/fhirpath/tests-fhir-r4.xml index 0e00319d8..c027bc6e5 100644 --- a/org.hl7.fhir.r4/src/test/resources/fhirpath/tests-fhir-r4.xml +++ b/org.hl7.fhir.r4/src/main/resources/fhirpath/tests-fhir-r4.xml @@ -612,7 +612,10 @@ 0.0 = 0true @2012-04-15 = @2012-04-15true @2012-04-15 = @2012-04-16false - @2012-04-15 = @2012-04-15T10:00:00false + @2012-04-15 = @2012-04-15T10:00:00 + @2012-04-15T15:00:00 = @2012-04-15T10:00:00false + @2012-04-15T15:00:00Z = @2012-04-15T10:00:00 + @2012-04-15T15:00:00+02:00 = @2012-04-15T14:00:00+03:00true name = nametrue name.take(2) = name.take(2).first() | name.take(2).last()true name.take(2) = name.take(2).last() | name.take(2).first()false @@ -632,7 +635,10 @@ 0.0 != 0false @2012-04-15 != @2012-04-15false @2012-04-15 != @2012-04-16true - @2012-04-15 != @2012-04-15T10:00:00true + @2012-04-15 != @2012-04-15T10:00:00 + @2012-04-15T15:00:00 != @2012-04-15T10:00:00true + @2012-04-15T15:00:00Z != @2012-04-15T10:00:00 + @2012-04-15T15:00:00+02:00 != @2012-04-15T14:00:00+03:00false name != namefalse name.take(2) != name.take(2).first() | name.take(2).last()false name.take(2) != name.take(2).last() | name.take(2).first()true @@ -641,7 +647,8 @@ 1 ~ 1true - {} ~ {} + {} ~ {}true + 1 ~ {}false 1 ~ 2false 'a' ~ 'a'true 'a' ~ 'A'true @@ -662,7 +669,8 @@ 1 !~ 1false - {} !~ {} + {} !~ {}false + {} !~ 1true 1 !~ 2true 'a' !~ 'a'false 'a' !~ 'A'false diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/directive-include.gql b/org.hl7.fhir.r4/src/main/resources/graphql/directive-include.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/directive-include.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/directive-include.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/directive-include.json b/org.hl7.fhir.r4/src/main/resources/graphql/directive-include.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/directive-include.json rename to org.hl7.fhir.r4/src/main/resources/graphql/directive-include.json diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/directive-skip.gql b/org.hl7.fhir.r4/src/main/resources/graphql/directive-skip.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/directive-skip.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/directive-skip.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/directive-skip.json b/org.hl7.fhir.r4/src/main/resources/graphql/directive-skip.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/directive-skip.json rename to org.hl7.fhir.r4/src/main/resources/graphql/directive-skip.json diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/directive-variable.gql b/org.hl7.fhir.r4/src/main/resources/graphql/directive-variable.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/directive-variable.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/directive-variable.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/directive-variable.json b/org.hl7.fhir.r4/src/main/resources/graphql/directive-variable.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/directive-variable.json rename to org.hl7.fhir.r4/src/main/resources/graphql/directive-variable.json diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/extension-complex-in.gql b/org.hl7.fhir.r4/src/main/resources/graphql/extension-complex-in.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/extension-complex-in.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/extension-complex-in.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/extension-complex-in.json b/org.hl7.fhir.r4/src/main/resources/graphql/extension-complex-in.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/extension-complex-in.json rename to org.hl7.fhir.r4/src/main/resources/graphql/extension-complex-in.json diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/extension-complex-out.gql b/org.hl7.fhir.r4/src/main/resources/graphql/extension-complex-out.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/extension-complex-out.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/extension-complex-out.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/extension-complex-out.json b/org.hl7.fhir.r4/src/main/resources/graphql/extension-complex-out.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/extension-complex-out.json rename to org.hl7.fhir.r4/src/main/resources/graphql/extension-complex-out.json diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/extension-complex.gql b/org.hl7.fhir.r4/src/main/resources/graphql/extension-complex.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/extension-complex.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/extension-complex.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/extension-complex.json b/org.hl7.fhir.r4/src/main/resources/graphql/extension-complex.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/extension-complex.json rename to org.hl7.fhir.r4/src/main/resources/graphql/extension-complex.json diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/extension-simple.gql b/org.hl7.fhir.r4/src/main/resources/graphql/extension-simple.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/extension-simple.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/extension-simple.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/extension-simple.json b/org.hl7.fhir.r4/src/main/resources/graphql/extension-simple.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/extension-simple.json rename to org.hl7.fhir.r4/src/main/resources/graphql/extension-simple.json diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/filter-fhirpath.gql b/org.hl7.fhir.r4/src/main/resources/graphql/filter-fhirpath.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/filter-fhirpath.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/filter-fhirpath.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/filter-fhirpath.json b/org.hl7.fhir.r4/src/main/resources/graphql/filter-fhirpath.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/filter-fhirpath.json rename to org.hl7.fhir.r4/src/main/resources/graphql/filter-fhirpath.json diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/flatten-first.gql b/org.hl7.fhir.r4/src/main/resources/graphql/flatten-first.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/flatten-first.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/flatten-first.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/flatten-first.json b/org.hl7.fhir.r4/src/main/resources/graphql/flatten-first.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/flatten-first.json rename to org.hl7.fhir.r4/src/main/resources/graphql/flatten-first.json diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/flatten-singleton1.gql b/org.hl7.fhir.r4/src/main/resources/graphql/flatten-singleton1.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/flatten-singleton1.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/flatten-singleton1.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/flatten-singleton1.json b/org.hl7.fhir.r4/src/main/resources/graphql/flatten-singleton1.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/flatten-singleton1.json rename to org.hl7.fhir.r4/src/main/resources/graphql/flatten-singleton1.json diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/flatten-singleton2.gql b/org.hl7.fhir.r4/src/main/resources/graphql/flatten-singleton2.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/flatten-singleton2.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/flatten-singleton2.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/flatten-singleton3.gql b/org.hl7.fhir.r4/src/main/resources/graphql/flatten-singleton3.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/flatten-singleton3.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/flatten-singleton3.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/flatten-singleton3.json b/org.hl7.fhir.r4/src/main/resources/graphql/flatten-singleton3.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/flatten-singleton3.json rename to org.hl7.fhir.r4/src/main/resources/graphql/flatten-singleton3.json diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/flatten-slice1.gql b/org.hl7.fhir.r4/src/main/resources/graphql/flatten-slice1.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/flatten-slice1.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/flatten-slice1.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/flatten-slice1.json b/org.hl7.fhir.r4/src/main/resources/graphql/flatten-slice1.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/flatten-slice1.json rename to org.hl7.fhir.r4/src/main/resources/graphql/flatten-slice1.json diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/flatten-slice2.gql b/org.hl7.fhir.r4/src/main/resources/graphql/flatten-slice2.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/flatten-slice2.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/flatten-slice2.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/flatten-slice2.json b/org.hl7.fhir.r4/src/main/resources/graphql/flatten-slice2.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/flatten-slice2.json rename to org.hl7.fhir.r4/src/main/resources/graphql/flatten-slice2.json diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/flatten.gql b/org.hl7.fhir.r4/src/main/resources/graphql/flatten.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/flatten.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/flatten.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/flatten.json b/org.hl7.fhir.r4/src/main/resources/graphql/flatten.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/flatten.json rename to org.hl7.fhir.r4/src/main/resources/graphql/flatten.json diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/list-sub.gql b/org.hl7.fhir.r4/src/main/resources/graphql/list-sub.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/list-sub.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/list-sub.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/list-sub.json b/org.hl7.fhir.r4/src/main/resources/graphql/list-sub.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/list-sub.json rename to org.hl7.fhir.r4/src/main/resources/graphql/list-sub.json diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/manifest.xml b/org.hl7.fhir.r4/src/main/resources/graphql/manifest.xml similarity index 94% rename from org.hl7.fhir.r4/src/test/resources/graphql/manifest.xml rename to org.hl7.fhir.r4/src/main/resources/graphql/manifest.xml index da798a53b..ff1e6b27c 100644 --- a/org.hl7.fhir.r4/src/test/resources/graphql/manifest.xml +++ b/org.hl7.fhir.r4/src/main/resources/graphql/manifest.xml @@ -6,7 +6,7 @@ - + diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/parser-tests.gql b/org.hl7.fhir.r4/src/main/resources/graphql/parser-tests.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/parser-tests.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/parser-tests.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/polymorphic.gql b/org.hl7.fhir.r4/src/main/resources/graphql/polymorphic.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/polymorphic.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/polymorphic.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/polymorphic.json b/org.hl7.fhir.r4/src/main/resources/graphql/polymorphic.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/polymorphic.json rename to org.hl7.fhir.r4/src/main/resources/graphql/polymorphic.json diff --git a/org.hl7.fhir.r4/src/test/resources/turtle/turtle-syntax-file-01.ttl b/org.hl7.fhir.r4/src/main/resources/graphql/query.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/turtle/turtle-syntax-file-01.ttl rename to org.hl7.fhir.r4/src/main/resources/graphql/query.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/reference-broken.gql b/org.hl7.fhir.r4/src/main/resources/graphql/reference-broken.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/reference-broken.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/reference-broken.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/reference-fragment-type.gql b/org.hl7.fhir.r4/src/main/resources/graphql/reference-fragment-type.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/reference-fragment-type.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/reference-fragment-type.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/reference-fragment-type.json b/org.hl7.fhir.r4/src/main/resources/graphql/reference-fragment-type.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/reference-fragment-type.json rename to org.hl7.fhir.r4/src/main/resources/graphql/reference-fragment-type.json diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/reference-optional.gql b/org.hl7.fhir.r4/src/main/resources/graphql/reference-optional.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/reference-optional.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/reference-optional.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/reference-optional.json b/org.hl7.fhir.r4/src/main/resources/graphql/reference-optional.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/reference-optional.json rename to org.hl7.fhir.r4/src/main/resources/graphql/reference-optional.json diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/reference-reverse.gql b/org.hl7.fhir.r4/src/main/resources/graphql/reference-reverse.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/reference-reverse.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/reference-reverse.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/reference-reverse.json b/org.hl7.fhir.r4/src/main/resources/graphql/reference-reverse.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/reference-reverse.json rename to org.hl7.fhir.r4/src/main/resources/graphql/reference-reverse.json diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/reference-type-in.gql b/org.hl7.fhir.r4/src/main/resources/graphql/reference-type-in.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/reference-type-in.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/reference-type-in.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/reference-type-in.json b/org.hl7.fhir.r4/src/main/resources/graphql/reference-type-in.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/reference-type-in.json rename to org.hl7.fhir.r4/src/main/resources/graphql/reference-type-in.json diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/reference-type-out.gql b/org.hl7.fhir.r4/src/main/resources/graphql/reference-type-out.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/reference-type-out.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/reference-type-out.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/reference-type-out.json b/org.hl7.fhir.r4/src/main/resources/graphql/reference-type-out.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/reference-type-out.json rename to org.hl7.fhir.r4/src/main/resources/graphql/reference-type-out.json diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/reference.gql b/org.hl7.fhir.r4/src/main/resources/graphql/reference.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/reference.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/reference.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/reference.json b/org.hl7.fhir.r4/src/main/resources/graphql/reference.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/reference.json rename to org.hl7.fhir.r4/src/main/resources/graphql/reference.json diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/search-full.gql b/org.hl7.fhir.r4/src/main/resources/graphql/search-full.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/search-full.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/search-full.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/search-full.json b/org.hl7.fhir.r4/src/main/resources/graphql/search-full.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/search-full.json rename to org.hl7.fhir.r4/src/main/resources/graphql/search-full.json diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/search-simple.gql b/org.hl7.fhir.r4/src/main/resources/graphql/search-simple.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/search-simple.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/search-simple.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/search-simple.json b/org.hl7.fhir.r4/src/main/resources/graphql/search-simple.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/search-simple.json rename to org.hl7.fhir.r4/src/main/resources/graphql/search-simple.json diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/search-single.gql b/org.hl7.fhir.r4/src/main/resources/graphql/search-single.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/search-single.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/search-single.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/search-single.json b/org.hl7.fhir.r4/src/main/resources/graphql/search-single.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/search-single.json rename to org.hl7.fhir.r4/src/main/resources/graphql/search-single.json diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/simple.gql b/org.hl7.fhir.r4/src/main/resources/graphql/simple.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/simple.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/simple.gql diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/simple.json b/org.hl7.fhir.r4/src/main/resources/graphql/simple.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/simple.json rename to org.hl7.fhir.r4/src/main/resources/graphql/simple.json diff --git a/org.hl7.fhir.r4/src/test/resources/graphql/wrong-field.gql b/org.hl7.fhir.r4/src/main/resources/graphql/wrong-field.gql similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/graphql/wrong-field.gql rename to org.hl7.fhir.r4/src/main/resources/graphql/wrong-field.gql diff --git a/org.hl7.fhir.r4/src/test/resources/liquid/liquid-tests.json b/org.hl7.fhir.r4/src/main/resources/liquid/liquid-tests.json similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/liquid/liquid-tests.json rename to org.hl7.fhir.r4/src/main/resources/liquid/liquid-tests.json diff --git a/org.hl7.fhir.r4/src/test/resources/list-example-long.xml b/org.hl7.fhir.r4/src/main/resources/list-example-long.xml similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/list-example-long.xml rename to org.hl7.fhir.r4/src/main/resources/list-example-long.xml diff --git a/org.hl7.fhir.r4/src/test/resources/medicationdispenseexample8.xml b/org.hl7.fhir.r4/src/main/resources/medicationdispense8.xml similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/medicationdispenseexample8.xml rename to org.hl7.fhir.r4/src/main/resources/medicationdispense8.xml diff --git a/org.hl7.fhir.r4/src/main/resources/medicationdispenseexample8.xml b/org.hl7.fhir.r4/src/main/resources/medicationdispenseexample8.xml new file mode 100644 index 000000000..30a5f89f2 --- /dev/null +++ b/org.hl7.fhir.r4/src/main/resources/medicationdispenseexample8.xml @@ -0,0 +1,95 @@ + + +

Generated Narrative with Details

id: meddisp0308

contained:

status: completed

medication: Timoptic 5mg/ml solution. Generated Summary: id: med0305; Timoptic 5mg/ml solution (Details : {http://hl7.org/fhir/sid/ndc code '2501-813-16' = '2501-813-16', given as 'Timoptic 5mg/ml solution'})

subject: Donald Duck

Performers

-Actor
*Practitioner/f006

authorizingPrescription: MedicationRequest/medrx0330

type: Refill - Part Fill (Details : {http://terminology.hl7.org/CodeSystem/v3-ActCode code 'RFP' = 'Refill - Part Fill', given as 'Refill - Part Fill'})

quantity: 10 mL (Details: UCUM code mL = 'mL')

daysSupply: 30 Day (Details: UCUM code d = 'd')

whenPrepared: 25/06/2015 7:13:00 AM

whenHandedOver: 26/06/2015 7:13:00 AM

dosageInstruction:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/org.hl7.fhir.r4/src/test/resources/observation-example-20minute-apgar-score.xml b/org.hl7.fhir.r4/src/main/resources/observation-example-20minute-apgar-score.xml similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/observation-example-20minute-apgar-score.xml rename to org.hl7.fhir.r4/src/main/resources/observation-example-20minute-apgar-score.xml diff --git a/org.hl7.fhir.r4/src/test/resources/observation-example.xml b/org.hl7.fhir.r4/src/main/resources/observation-example.xml similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/observation-example.xml rename to org.hl7.fhir.r4/src/main/resources/observation-example.xml diff --git a/org.hl7.fhir.r4/src/test/resources/patient-example-xds.xml b/org.hl7.fhir.r4/src/main/resources/patient-example-xds.xml similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/patient-example-xds.xml rename to org.hl7.fhir.r4/src/main/resources/patient-example-xds.xml diff --git a/org.hl7.fhir.r4/src/test/resources/patient-example.xml b/org.hl7.fhir.r4/src/main/resources/patient-example.xml similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/patient-example.xml rename to org.hl7.fhir.r4/src/main/resources/patient-example.xml diff --git a/org.hl7.fhir.r4/src/test/resources/patient-glossy-example.xml b/org.hl7.fhir.r4/src/main/resources/patient-glossy-example.xml similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/patient-glossy-example.xml rename to org.hl7.fhir.r4/src/main/resources/patient-glossy-example.xml diff --git a/org.hl7.fhir.r4/src/test/resources/questionnaire-example-f201-lifelines.xml b/org.hl7.fhir.r4/src/main/resources/questionnaire-example-f201-lifelines.xml similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/questionnaire-example-f201-lifelines.xml rename to org.hl7.fhir.r4/src/main/resources/questionnaire-example-f201-lifelines.xml diff --git a/org.hl7.fhir.r4/src/test/resources/questionnaire-example.xml b/org.hl7.fhir.r4/src/main/resources/questionnaire-example.xml similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/questionnaire-example.xml rename to org.hl7.fhir.r4/src/main/resources/questionnaire-example.xml diff --git a/org.hl7.fhir.r4/src/test/resources/questionnaireresponse-example-f201-lifelines.xml b/org.hl7.fhir.r4/src/main/resources/questionnaireresponse-example-f201-lifelines.xml similarity index 100% rename from org.hl7.fhir.r4/src/test/resources/questionnaireresponse-example-f201-lifelines.xml rename to org.hl7.fhir.r4/src/main/resources/questionnaireresponse-example-f201-lifelines.xml diff --git a/org.hl7.fhir.r4/src/test/resources/snapshot-generation-tests.xml b/org.hl7.fhir.r4/src/main/resources/snapshot-generation-tests.xml similarity index 97% rename from org.hl7.fhir.r4/src/test/resources/snapshot-generation-tests.xml rename to org.hl7.fhir.r4/src/main/resources/snapshot-generation-tests.xml index ce6974fdf..15ad8434d 100644 --- a/org.hl7.fhir.r4/src/test/resources/snapshot-generation-tests.xml +++ b/org.hl7.fhir.r4/src/main/resources/snapshot-generation-tests.xml @@ -1926,7 +1926,7 @@