diff --git a/.swift-version b/.swift-version index bf77d549..819e07a2 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.2 +5.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index fe0ab9d5..57748e1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ Changelog ========= +## 4.1 + +- Update to Swift 5.0 + ## 4.0 - Update to FHIR `R4` (v4.0.0-a53ec6ee1b) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..ba4030fd --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,13 @@ +Contributing +============ + +For fixes, improvements and ideas, fork the repository and issue a pull request. +To get a pull request accepted, please adhere to these two rules: + +- Work from the latest `develop` branch, unless it's a very small fix +- Respect current code style (indent with tabs, compare to existing code for more clues) + +Ideally, only work on one feature at a time. +If you've done work on the code (i.e. not just fixes to the README), add yourself to the top of [`CONTRIBUTORS.md`](./CONTRIBUTORS.md). + +Happy coding! diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md new file mode 100644 index 00000000..d80cca72 --- /dev/null +++ b/CONTRIBUTORS.md @@ -0,0 +1,8 @@ +Contributors +============ + +Contributors to the codebase, in reverse chronological order: + +- Dave Carlson, @drdavec +- Pascal Pfiffner, @p2 + diff --git a/FHIR.podspec b/FHIR.podspec index 0b2d1668..38b49dd9 100644 --- a/FHIR.podspec +++ b/FHIR.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |s| s.name = "FHIR" - s.version = "4.0.0" + s.version = "4.1.0" s.summary = "Swift 🔥FHIR data model classes, with some goodies." s.description = <<-DESC Swift 🔥FHIR data model classes, generated from spec. Uses custom Date/Time structs to facilitate diff --git a/Info.plist b/Info.plist index 87d82153..d4e8d67b 100644 --- a/Info.plist +++ b/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 4.0 + 4.1 CFBundleSignature ???? CFBundleVersion - 4.0.0.0 + 4.1.0.0 NSHumanReadableCopyright Copyright © 2014 CHIP. All rights reserved. NSPrincipalClass diff --git a/README.md b/README.md index 12793421..1d9d2bb8 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ See [tags/releases](https://github.com/smart-on-fhir/Swift-FHIR/releases). Version | Swift | FHIR |   ---------|-----------|---------------|----------------------------- +**4.1**| 5.0 | `4.0.0-a53ec6ee1b` | R4 **4.0**| 4.2 | `4.0.0-a53ec6ee1b` | R4 **3.1**| 3.2 | `3.0.0.11832` | STU 3 **3.0** | 3.0 | `3.0.0.11832` | STU 3 diff --git a/Sources/Client/Element+Extensions.swift b/Sources/Client/Element+Extensions.swift index 6ae5937d..e3759772 100644 --- a/Sources/Client/Element+Extensions.swift +++ b/Sources/Client/Element+Extensions.swift @@ -19,7 +19,7 @@ public extension FHIRPrimitive { - parameter forURI: The URI defining the extension on the receiver */ - public func extensions(forURI uri: String) -> [Extension]? { + func extensions(forURI uri: String) -> [Extension]? { return extension_fhir?.filter() { return $0.url?.string == uri } } } @@ -32,7 +32,7 @@ public extension Element { - parameter forURI: The URI defining the extension on the receiver */ - public final func extensions(forURI uri: String) -> [Extension]? { + final func extensions(forURI uri: String) -> [Extension]? { return extension_fhir?.filter() { return $0.url?.string == uri } } } @@ -45,7 +45,7 @@ public extension DomainResource { - parameter forURI: The URI defining the extension on the receiver */ - public final func extensions(forURI uri: String) -> [Extension]? { + final func extensions(forURI uri: String) -> [Extension]? { return extension_fhir?.filter() { return $0.url?.string == uri } } @@ -54,7 +54,7 @@ public extension DomainResource { - parameter forURI: The URI defining the modifier extension on the receiver */ - public final func modifierExtensions(forURI uri: String) -> [Extension]? { + final func modifierExtensions(forURI uri: String) -> [Extension]? { return modifierExtension?.filter() { return $0.url?.string == uri } } } diff --git a/Sources/Client/FHIRCanonical+Resolving.swift b/Sources/Client/FHIRCanonical+Resolving.swift new file mode 100644 index 00000000..aa1ac9f3 --- /dev/null +++ b/Sources/Client/FHIRCanonical+Resolving.swift @@ -0,0 +1,160 @@ +// +// FHIRCanonical+Resolving.swift +// SwiftFHIR +// +// Created by Dave Carlson, May 2019 +// + +import Foundation +#if !NO_MODEL_IMPORT +import Models +#endif + + +/** +An extension to FHIRCanonical. This allows reference resolving while keeping the superclass'es attributes in place. + +Systems resolving references to canonical URLs SHOULD first try to resolve the reference using the canonical reference (e.g. search on a known registry of terminology, conformance, or knowledge resources as appropriate), and then fall back to direct resolution using the URL as a literal reference if a local version of the canonical resource cannot be found. This approach is safe because the approaches must refer to the same artifact, though implementations will need to make appropriate arrangements regarding the version and/or currency of their local copy of the artifact. + +This is a version specific reference to a value set. Note that this refers to the ValueSet.version not the ValueSet.meta.versionId. Searching for this on a FHIR server would look like this: + + GET fhir/ValueSet?url=http://hl7.org/fhir/ValueSet/my-valueset&version=0.8 +*/ +extension FHIRCanonical { + + /** + Determines if a reference has already been resolved, if it is a contained or a bundled resource which can be returned immediately. + + If this method returns nil, it's possible that the referenced resource must be fetched from a server. Use the `resolve(type:callback:)` + method to achive that feat. That method will initially call this method and hence may return immediately if a reference has already been + resolved (or is contained/bundled). + + - parameter type: The resource type that should be dereferenced + - returns: An instance of the desired type, nil if it cannot immediately be resolved OR if it is of a different type + */ + public func resolved(_ type: T.Type) -> T? { + if let refid = self.fragment { + if let resolved = _owner?.resolvedReference(refid) { + if let res = resolved as? T { + return res + } + fhir_warn("reference “\(refid)” was dereferenced to «\(resolved)», which is not of the expected type “\(T.self)”") + } + + // not yet resolved, let's look at contained resources + if let contained = _owner?._owningResource?.containedResource(refid) { + if let contained = contained as? T { + return contained + } + fhir_warn("reference “\(refid)” was contained as «\(contained)», which is not of the expected type “\(T.self)”") + return nil + } + } + + // not contained, are we in a bundle and the resource is bundled? + if let refUrl = self.url?.absoluteString { + var bundle = _owner?._owningBundle + while nil != bundle { + if let entries = bundle?.entry { + for entry in entries { + if let resource = entry.resource, resource.hasURI(self) { + if let found = entry.resource as? T { + return found + } + fhir_warn("reference “\(refUrl)” was bundled as «\(String(describing: entry.resource))», which is not of the expected type “\(T.self)”") + return nil + } + } + } + bundle = bundle?._owningBundle + } + } + + // TODO attempt to retrieve resource from repository, database, or cache of Definition type resources. + // Define a repostory protocol with default implementation within the framework. + + return nil + } + + /** + Resolves the canonical URI by attempting to fetch from a server. + + Checks if a reference can be resolved immediately by calling `resolved(type:)` first, if not proceeds to request the referenced resource + from the respective location. + + - parameter type: The type of the resource to expect + - parameter callback: The callback to call upon success or failure, with the resolved resource or nil + */ + public func resolve(_ type: T.Type, callback: @escaping ((T?) -> Void)) { + if let resolved = resolved(T.self) { + callback(resolved) + } + else if let ref = self.url?.absoluteFHIRString { + var server: FHIRServer? = nil + var path = ref.string + + // absolute URL + if let _ = ref.string.range(of: "://") { + if let url = URL(string: ref.string) { + let base = url.deletingLastPathComponent().deletingLastPathComponent() + path = (url.absoluteString.replacingOccurrences(of: base.absoluteString, with: "")) + server = FHIRMinimalServer(baseURL: base, auth: nil) // TODO: what if it's protected? + } + else { + fhir_warn("Unable to construct NSURL from absolute reference «\(ref)»") + } + } + + if let server = server { + T.readFrom(path, server: server) { resource, error in + if let res = resource, res.hasURI(self) { + self._owner?._owningResource?.didResolveReference(ref.string, resolved: res) + callback(res as? T) // `readFrom()` will always instantiate its own type, so this should never turn into nil + } + else { + if let err = error { + fhir_warn("error resolving reference «\(ref)»: \(err)") + } + callback(nil) + } + } + } + else { + fhir_warn("resource \(self) does not have a server instance nor does it contain «\(ref)», cannot resolve") + callback(nil) + } + } + } +} + + +extension Resource { + + /** + Check if Resource has 'url' and 'version' elements (i.e. a FHIR Definition type resource), + return true if resource url and version match this canonical URI. + */ + func hasURI(_ canonical: FHIRCanonical) -> Bool { + var match = false + + // No class reflection in Swift, serialize to JSON and look for key value. + var json = FHIRJSON() + var errors = [FHIRValidationError]() + self.decorate(json: &json, withKey: "resource", errors: &errors) + + if let resourceJSON = json["resource"] as? FHIRJSON { + if let url = resourceJSON["url"] as? String, url == canonical.url?.absoluteString { + // if canonical URI specifies a version, then resource version must match + if let version = canonical.version { + match = version == resourceJSON["version"] as? String + } + else { + match = true + } + } + } + + return match + } + +} diff --git a/Sources/Client/Resource+Instantiation.swift b/Sources/Client/Resource+Instantiation.swift index 3a9e776c..0b584fb2 100644 --- a/Sources/Client/Resource+Instantiation.swift +++ b/Sources/Client/Resource+Instantiation.swift @@ -38,7 +38,7 @@ public extension Foundation.Bundle { - parameter type: The type the resource is expected to be; must be a subclass of `Resource` - returns: A Resource subclass corresponding to the "resourceType" entry, as specified under `type` */ - public func fhir_bundledResource(_ name: String, type: T.Type) throws -> T { + func fhir_bundledResource(_ name: String, type: T.Type) throws -> T { return try fhir_bundledResource(name, subdirectory: nil, type: type) } @@ -51,7 +51,7 @@ public extension Foundation.Bundle { - parameter type: The type the resource is expected to be; must be a subclass of `Resource` - returns: A Resource subclass corresponding to the "resourceType" entry, as specified under `type` */ - public func fhir_bundledResource(_ name: String, subdirectory: String?, type: T.Type) throws -> T { + func fhir_bundledResource(_ name: String, subdirectory: String?, type: T.Type) throws -> T { let json = try fhir_json(from: name, subdirectory: subdirectory) var context = FHIRInstantiationContext() let resource = T.instantiate(from: json, owner: nil, context: &context) @@ -68,7 +68,7 @@ public extension Foundation.Bundle { - parameter type: The type the resource is expected to be; must be a subclass of `Resource` - returns: A Resource subclass corresponding to the "resourceType" entry, as specified under `type` */ - public func fhir_json(from name: String, subdirectory: String?) throws -> FHIRJSON { + func fhir_json(from name: String, subdirectory: String?) throws -> FHIRJSON { if let url = url(forResource: name, withExtension: "json", subdirectory: subdirectory) { let data = try Data(contentsOf: url) if let json = try JSONSerialization.jsonObject(with: data, options: []) as? FHIRJSON { diff --git a/Sources/Client/Resource+Operation.swift b/Sources/Client/Resource+Operation.swift index 55c1e898..da582230 100644 --- a/Sources/Client/Resource+Operation.swift +++ b/Sources/Client/Resource+Operation.swift @@ -25,7 +25,7 @@ public extension Resource { UNFINISHED. */ - public func search(_ query: Any) -> FHIRSearch { + func search(_ query: Any) -> FHIRSearch { if let _ = self.id { NSLog("UNFINISHED, must add '_id' reference to search expression") //return FHIRSearch(subject: "_id", reference: myID, type: type(of: self)) @@ -36,7 +36,7 @@ public extension Resource { /** Perform a search, wich the given query construct, against the receiver's compartment. */ - public class func search(_ query: Any) -> FHIRSearch { + class func search(_ query: Any) -> FHIRSearch { return FHIRSearch(type: self, query: query) } @@ -46,7 +46,7 @@ public extension Resource { /** Perform a given operation on the receiver. */ - public func perform(operation: FHIROperation, callback: @escaping FHIRResourceErrorCallback) { + func perform(operation: FHIROperation, callback: @escaping FHIRResourceErrorCallback) { if let server = _server { if let server = server as? FHIROpenServer { operation.instance = self @@ -64,7 +64,7 @@ public extension Resource { /** Perform a given operation on the receiving type. */ - public class func perform(operation: FHIROperation, server: FHIROpenServer, callback: @escaping FHIRResourceErrorCallback) { + class func perform(operation: FHIROperation, server: FHIROpenServer, callback: @escaping FHIRResourceErrorCallback) { operation.type = self _perform(operation: operation, server: server, callback: callback) } diff --git a/Sources/Client/Resource+REST.swift b/Sources/Client/Resource+REST.swift index 321f72f0..6f1af284 100644 --- a/Sources/Client/Resource+REST.swift +++ b/Sources/Client/Resource+REST.swift @@ -30,7 +30,7 @@ public extension Resource { - returns: A Reference instance on success */ - public func asRelativeReference() throws -> Reference { + func asRelativeReference() throws -> Reference { let path = try relativeURLPath() let reference = Reference() reference.reference = FHIRString(path) @@ -41,7 +41,7 @@ public extension Resource { } /** The string used to fill a reference's "display" property for the instance. */ - public func preferredRelativeReferenceDisplay() -> String? { + func preferredRelativeReferenceDisplay() -> String? { return nil } @@ -53,7 +53,7 @@ public extension Resource { - returns: A string indicating the relative URL base, e.g. "MedicationPrescription" */ - public func relativeURLBase() -> String { + func relativeURLBase() -> String { return type(of: self).resourceType } @@ -62,7 +62,7 @@ public extension Resource { - returns: A string indicating the relative URL, e.g. "MedicationPrescription/1234" */ - public func relativeURLPath() throws -> String { + func relativeURLPath() throws -> String { if let myID = id { return "\(relativeURLBase())/\(myID)" } @@ -74,7 +74,7 @@ public extension Resource { - returns: The resource's absolute URL, e.g. "https://fhir.smarthealthit.org/MedicationPrescription/1234" */ - public func absoluteURL() throws -> URL { + func absoluteURL() throws -> URL { let relative = try relativeURLPath() if let server = _server { return server.baseURL.appendingPathComponent(relative) @@ -95,7 +95,7 @@ public extension Resource { - parameter options: Options to use when executing this request, if any - parameter callback: The callback to execute once done. The callback is NOT guaranteed to be executed on the main thread! */ - public class func read(_ id: String, server: FHIRServer, options: FHIRRequestOption = [], callback: @escaping FHIRResourceErrorCallback) { + class func read(_ id: String, server: FHIRServer, options: FHIRRequestOption = [], callback: @escaping FHIRResourceErrorCallback) { let path = "\(resourceType)/\(id)" readFrom(path, server: server, options: options, callback: callback) } @@ -110,7 +110,7 @@ public extension Resource { - parameter options: Options to use when executing this request, if any - parameter callback: The callback to execute once done. The callback is NOT guaranteed to be executed on the main thread! */ - public class func readFrom(_ path: String, server: FHIRServer, options: FHIRRequestOption = [], callback: @escaping FHIRResourceErrorCallback) { + class func readFrom(_ path: String, server: FHIRServer, options: FHIRRequestOption = [], callback: @escaping FHIRResourceErrorCallback) { guard var handler = server.handlerForRequest(withMethod: .GET, resource: nil) else { callback(nil, FHIRError.noRequestHandlerAvailable(.GET)) return @@ -150,7 +150,7 @@ public extension Resource { - parameter server: The server on which to create the resource - parameter callback: The callback to execute once done. The callback is NOT guaranteed to be executed on the main thread! */ - public func create(_ server: FHIRServer, callback: @escaping FHIRErrorCallback) { + func create(_ server: FHIRServer, callback: @escaping FHIRErrorCallback) { guard nil == id else { callback(FHIRError.resourceAlreadyHasId) return @@ -254,7 +254,7 @@ public extension Resource { - parameter callback: The callback to execute once done. The callback is NOT guaranteed to be executed on the main thread! */ - public func update(callback: @escaping FHIRErrorCallback) { + func update(callback: @escaping FHIRErrorCallback) { if let server = _server { do { guard let handler = server.handlerForRequest(withMethod: .PUT, resource: self) else { @@ -285,7 +285,7 @@ public extension Resource { This method forwards to the `delete` class method, substituting the receiver's path and server. */ - public func delete(callback: @escaping FHIRErrorCallback) { + func delete(callback: @escaping FHIRErrorCallback) { if let server = _server { do { let path = try relativeURLPath() @@ -305,7 +305,7 @@ public extension Resource { This implementation issues a DELETE call against the given path on the given server. */ - public class func delete(_ path: String, server: FHIRServer, callback: @escaping FHIRErrorCallback) { + class func delete(_ path: String, server: FHIRServer, callback: @escaping FHIRErrorCallback) { guard let handler = server.handlerForRequest(withMethod: .DELETE, resource: nil) else { callback(FHIRError.noRequestHandlerAvailable(.DELETE)) return diff --git a/Sources/Models/Account.swift b/Sources/Models/Account.swift index 2c6d0eb9..422404bb 100644 --- a/Sources/Models/Account.swift +++ b/Sources/Models/Account.swift @@ -2,7 +2,7 @@ // Account.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Account) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Account) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/ActivityDefinition.swift b/Sources/Models/ActivityDefinition.swift index 6da62ec0..bb6129b6 100644 --- a/Sources/Models/ActivityDefinition.swift +++ b/Sources/Models/ActivityDefinition.swift @@ -2,7 +2,7 @@ // ActivityDefinition.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ActivityDefinition) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ActivityDefinition) on 2019-05-21. // 2019, SMART Health IT. // @@ -83,7 +83,7 @@ open class ActivityDefinition: DomainResource { public var lastReviewDate: FHIRDate? /// Logic used by the activity definition. - public var library: [FHIRURL]? + public var library: [FHIRCanonical]? /// Where it should happen. public var location: Reference? @@ -110,7 +110,7 @@ open class ActivityDefinition: DomainResource { public var productReference: Reference? /// What profile the resource needs to conform to. - public var profile: FHIRURL? + public var profile: FHIRCanonical? /// Name of the publisher (organization or individual). public var publisher: FHIRString? @@ -167,7 +167,7 @@ open class ActivityDefinition: DomainResource { public var topic: [CodeableConcept]? /// Transform to apply the template. - public var transform: FHIRURL? + public var transform: FHIRCanonical? /// Canonical identifier for this activity definition, represented as a URI (globally unique). public var url: FHIRURL? @@ -212,7 +212,7 @@ open class ActivityDefinition: DomainResource { jurisdiction = createInstances(of: CodeableConcept.self, for: "jurisdiction", in: json, context: &instCtx, owner: self) ?? jurisdiction kind = createEnum(type: RequestResourceType.self, for: "kind", in: json, context: &instCtx) ?? kind lastReviewDate = createInstance(type: FHIRDate.self, for: "lastReviewDate", in: json, context: &instCtx, owner: self) ?? lastReviewDate - library = createInstances(of: FHIRURL.self, for: "library", in: json, context: &instCtx, owner: self) ?? library + library = createInstances(of: FHIRCanonical.self, for: "library", in: json, context: &instCtx, owner: self) ?? library location = createInstance(type: Reference.self, for: "location", in: json, context: &instCtx, owner: self) ?? location name = createInstance(type: FHIRString.self, for: "name", in: json, context: &instCtx, owner: self) ?? name observationRequirement = createInstances(of: Reference.self, for: "observationRequirement", in: json, context: &instCtx, owner: self) ?? observationRequirement @@ -221,7 +221,7 @@ open class ActivityDefinition: DomainResource { priority = createEnum(type: RequestPriority.self, for: "priority", in: json, context: &instCtx) ?? priority productCodeableConcept = createInstance(type: CodeableConcept.self, for: "productCodeableConcept", in: json, context: &instCtx, owner: self) ?? productCodeableConcept productReference = createInstance(type: Reference.self, for: "productReference", in: json, context: &instCtx, owner: self) ?? productReference - profile = createInstance(type: FHIRURL.self, for: "profile", in: json, context: &instCtx, owner: self) ?? profile + profile = createInstance(type: FHIRCanonical.self, for: "profile", in: json, context: &instCtx, owner: self) ?? profile publisher = createInstance(type: FHIRString.self, for: "publisher", in: json, context: &instCtx, owner: self) ?? publisher purpose = createInstance(type: FHIRString.self, for: "purpose", in: json, context: &instCtx, owner: self) ?? purpose quantity = createInstance(type: Quantity.self, for: "quantity", in: json, context: &instCtx, owner: self) ?? quantity @@ -243,7 +243,7 @@ open class ActivityDefinition: DomainResource { timingTiming = createInstance(type: Timing.self, for: "timingTiming", in: json, context: &instCtx, owner: self) ?? timingTiming title = createInstance(type: FHIRString.self, for: "title", in: json, context: &instCtx, owner: self) ?? title topic = createInstances(of: CodeableConcept.self, for: "topic", in: json, context: &instCtx, owner: self) ?? topic - transform = createInstance(type: FHIRURL.self, for: "transform", in: json, context: &instCtx, owner: self) ?? transform + transform = createInstance(type: FHIRCanonical.self, for: "transform", in: json, context: &instCtx, owner: self) ?? transform url = createInstance(type: FHIRURL.self, for: "url", in: json, context: &instCtx, owner: self) ?? url usage = createInstance(type: FHIRString.self, for: "usage", in: json, context: &instCtx, owner: self) ?? usage useContext = createInstances(of: UsageContext.self, for: "useContext", in: json, context: &instCtx, owner: self) ?? useContext diff --git a/Sources/Models/Address.swift b/Sources/Models/Address.swift index 73c108a6..70834fab 100644 --- a/Sources/Models/Address.swift +++ b/Sources/Models/Address.swift @@ -2,7 +2,7 @@ // Address.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Address) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Address) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/AdverseEvent.swift b/Sources/Models/AdverseEvent.swift index e1de86fb..7c1f9565 100644 --- a/Sources/Models/AdverseEvent.swift +++ b/Sources/Models/AdverseEvent.swift @@ -2,7 +2,7 @@ // AdverseEvent.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/AdverseEvent) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/AdverseEvent) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Age.swift b/Sources/Models/Age.swift index 10bcc960..51bfb127 100644 --- a/Sources/Models/Age.swift +++ b/Sources/Models/Age.swift @@ -2,7 +2,7 @@ // Age.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Age) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Age) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/AllergyIntolerance.swift b/Sources/Models/AllergyIntolerance.swift index 66f4de9b..9e5360b8 100644 --- a/Sources/Models/AllergyIntolerance.swift +++ b/Sources/Models/AllergyIntolerance.swift @@ -2,7 +2,7 @@ // AllergyIntolerance.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/AllergyIntolerance) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/AllergyIntolerance) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Annotation.swift b/Sources/Models/Annotation.swift index 2d89af3d..86bb8e02 100644 --- a/Sources/Models/Annotation.swift +++ b/Sources/Models/Annotation.swift @@ -2,7 +2,7 @@ // Annotation.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Annotation) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Annotation) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Appointment.swift b/Sources/Models/Appointment.swift index 8573ad0c..1aecb546 100644 --- a/Sources/Models/Appointment.swift +++ b/Sources/Models/Appointment.swift @@ -2,7 +2,7 @@ // Appointment.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Appointment) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Appointment) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/AppointmentResponse.swift b/Sources/Models/AppointmentResponse.swift index d68ca575..1f532899 100644 --- a/Sources/Models/AppointmentResponse.swift +++ b/Sources/Models/AppointmentResponse.swift @@ -2,7 +2,7 @@ // AppointmentResponse.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/AppointmentResponse) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/AppointmentResponse) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Attachment.swift b/Sources/Models/Attachment.swift index 55818616..c7bde6cc 100644 --- a/Sources/Models/Attachment.swift +++ b/Sources/Models/Attachment.swift @@ -2,7 +2,7 @@ // Attachment.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Attachment) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Attachment) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/AuditEvent.swift b/Sources/Models/AuditEvent.swift index 587d5c51..f0b56a0c 100644 --- a/Sources/Models/AuditEvent.swift +++ b/Sources/Models/AuditEvent.swift @@ -2,7 +2,7 @@ // AuditEvent.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/AuditEvent) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/AuditEvent) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/BackboneElement.swift b/Sources/Models/BackboneElement.swift index 76c5f4a4..9bf3864d 100644 --- a/Sources/Models/BackboneElement.swift +++ b/Sources/Models/BackboneElement.swift @@ -2,7 +2,7 @@ // BackboneElement.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/BackboneElement) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/BackboneElement) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Basic.swift b/Sources/Models/Basic.swift index f2e4ce64..222ae7b1 100644 --- a/Sources/Models/Basic.swift +++ b/Sources/Models/Basic.swift @@ -2,7 +2,7 @@ // Basic.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Basic) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Basic) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Binary.swift b/Sources/Models/Binary.swift index 306a31a5..df992a00 100644 --- a/Sources/Models/Binary.swift +++ b/Sources/Models/Binary.swift @@ -2,7 +2,7 @@ // Binary.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Binary) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Binary) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/BiologicallyDerivedProduct.swift b/Sources/Models/BiologicallyDerivedProduct.swift index e804ed27..e85d6943 100644 --- a/Sources/Models/BiologicallyDerivedProduct.swift +++ b/Sources/Models/BiologicallyDerivedProduct.swift @@ -2,7 +2,7 @@ // BiologicallyDerivedProduct.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/BiologicallyDerivedProduct) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/BiologicallyDerivedProduct) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/BodyStructure.swift b/Sources/Models/BodyStructure.swift index c992a722..ef22b40b 100644 --- a/Sources/Models/BodyStructure.swift +++ b/Sources/Models/BodyStructure.swift @@ -2,7 +2,7 @@ // BodyStructure.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/BodyStructure) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/BodyStructure) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Bundle.swift b/Sources/Models/Bundle.swift index d180b968..51405b65 100644 --- a/Sources/Models/Bundle.swift +++ b/Sources/Models/Bundle.swift @@ -2,7 +2,7 @@ // Bundle.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Bundle) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Bundle) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/CapabilityStatement.swift b/Sources/Models/CapabilityStatement.swift index e370fa2c..434fb0c3 100644 --- a/Sources/Models/CapabilityStatement.swift +++ b/Sources/Models/CapabilityStatement.swift @@ -2,7 +2,7 @@ // CapabilityStatement.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/CapabilityStatement) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/CapabilityStatement) on 2019-05-21. // 2019, SMART Health IT. // @@ -49,13 +49,13 @@ open class CapabilityStatement: DomainResource { public var implementation: CapabilityStatementImplementation? /// Implementation guides supported. - public var implementationGuide: [FHIRURL]? + public var implementationGuide: [FHIRCanonical]? /// Canonical URL of another capability statement this adds to. - public var imports: [FHIRURL]? + public var imports: [FHIRCanonical]? /// Canonical URL of another capability statement this implements. - public var instantiates: [FHIRURL]? + public var instantiates: [FHIRCanonical]? /// Intended jurisdiction for capability statement (if applicable). public var jurisdiction: [CodeableConcept]? @@ -133,9 +133,9 @@ open class CapabilityStatement: DomainResource { instCtx.addError(FHIRValidationError(missing: "format")) } implementation = createInstance(type: CapabilityStatementImplementation.self, for: "implementation", in: json, context: &instCtx, owner: self) ?? implementation - implementationGuide = createInstances(of: FHIRURL.self, for: "implementationGuide", in: json, context: &instCtx, owner: self) ?? implementationGuide - imports = createInstances(of: FHIRURL.self, for: "imports", in: json, context: &instCtx, owner: self) ?? imports - instantiates = createInstances(of: FHIRURL.self, for: "instantiates", in: json, context: &instCtx, owner: self) ?? instantiates + implementationGuide = createInstances(of: FHIRCanonical.self, for: "implementationGuide", in: json, context: &instCtx, owner: self) ?? implementationGuide + imports = createInstances(of: FHIRCanonical.self, for: "imports", in: json, context: &instCtx, owner: self) ?? imports + instantiates = createInstances(of: FHIRCanonical.self, for: "instantiates", in: json, context: &instCtx, owner: self) ?? instantiates jurisdiction = createInstances(of: CodeableConcept.self, for: "jurisdiction", in: json, context: &instCtx, owner: self) ?? jurisdiction kind = createEnum(type: CapabilityStatementKind.self, for: "kind", in: json, context: &instCtx) ?? kind if nil == kind && !instCtx.containsKey("kind") { @@ -223,11 +223,11 @@ open class CapabilityStatementDocument: BackboneElement { public var mode: DocumentMode? /// Constraint on the resources used in the document. - public var profile: FHIRURL? + public var profile: FHIRCanonical? /** Convenience initializer, taking all required properties as arguments. */ - public convenience init(mode: DocumentMode, profile: FHIRURL) { + public convenience init(mode: DocumentMode, profile: FHIRCanonical) { self.init() self.mode = mode self.profile = profile @@ -242,7 +242,7 @@ open class CapabilityStatementDocument: BackboneElement { if nil == mode && !instCtx.containsKey("mode") { instCtx.addError(FHIRValidationError(missing: "mode")) } - profile = createInstance(type: FHIRURL.self, for: "profile", in: json, context: &instCtx, owner: self) ?? profile + profile = createInstance(type: FHIRCanonical.self, for: "profile", in: json, context: &instCtx, owner: self) ?? profile if nil == profile && !instCtx.containsKey("profile") { instCtx.addError(FHIRValidationError(missing: "profile")) } @@ -423,14 +423,14 @@ open class CapabilityStatementMessagingSupportedMessage: BackboneElement { } /// Message supported by this system. - public var definition: FHIRURL? + public var definition: FHIRCanonical? /// The mode of this event declaration - whether application is sender or receiver. public var mode: EventCapabilityMode? /** Convenience initializer, taking all required properties as arguments. */ - public convenience init(definition: FHIRURL, mode: EventCapabilityMode) { + public convenience init(definition: FHIRCanonical, mode: EventCapabilityMode) { self.init() self.definition = definition self.mode = mode @@ -440,7 +440,7 @@ open class CapabilityStatementMessagingSupportedMessage: BackboneElement { override open func populate(from json: FHIRJSON, context instCtx: inout FHIRInstantiationContext) { super.populate(from: json, context: &instCtx) - definition = createInstance(type: FHIRURL.self, for: "definition", in: json, context: &instCtx, owner: self) ?? definition + definition = createInstance(type: FHIRCanonical.self, for: "definition", in: json, context: &instCtx, owner: self) ?? definition if nil == definition && !instCtx.containsKey("definition") { instCtx.addError(FHIRValidationError(missing: "definition")) } @@ -476,7 +476,7 @@ open class CapabilityStatementRest: BackboneElement { } /// Compartments served/used by system. - public var compartment: [FHIRURL]? + public var compartment: [FHIRCanonical]? /// General description of implementation. public var documentation: FHIRString? @@ -511,7 +511,7 @@ open class CapabilityStatementRest: BackboneElement { override open func populate(from json: FHIRJSON, context instCtx: inout FHIRInstantiationContext) { super.populate(from: json, context: &instCtx) - compartment = createInstances(of: FHIRURL.self, for: "compartment", in: json, context: &instCtx, owner: self) ?? compartment + compartment = createInstances(of: FHIRCanonical.self, for: "compartment", in: json, context: &instCtx, owner: self) ?? compartment documentation = createInstance(type: FHIRString.self, for: "documentation", in: json, context: &instCtx, owner: self) ?? documentation interaction = createInstances(of: CapabilityStatementRestInteraction.self, for: "interaction", in: json, context: &instCtx, owner: self) ?? interaction mode = createEnum(type: RestfulCapabilityMode.self, for: "mode", in: json, context: &instCtx) ?? mode @@ -621,7 +621,7 @@ open class CapabilityStatementRestResource: BackboneElement { public var operation: [CapabilityStatementRestResourceOperation]? /// Base System profile for all uses of resource. - public var profile: FHIRURL? + public var profile: FHIRCanonical? /// Whether vRead can return past versions. public var readHistory: FHIRBool? @@ -639,7 +639,7 @@ open class CapabilityStatementRestResource: BackboneElement { public var searchRevInclude: [FHIRString]? /// Profiles for use cases supported. - public var supportedProfile: [FHIRURL]? + public var supportedProfile: [FHIRCanonical]? /// A type of resource exposed via the restful interface. public var type: ResourceType? @@ -671,13 +671,13 @@ open class CapabilityStatementRestResource: BackboneElement { documentation = createInstance(type: FHIRString.self, for: "documentation", in: json, context: &instCtx, owner: self) ?? documentation interaction = createInstances(of: CapabilityStatementRestResourceInteraction.self, for: "interaction", in: json, context: &instCtx, owner: self) ?? interaction operation = createInstances(of: CapabilityStatementRestResourceOperation.self, for: "operation", in: json, context: &instCtx, owner: self) ?? operation - profile = createInstance(type: FHIRURL.self, for: "profile", in: json, context: &instCtx, owner: self) ?? profile + profile = createInstance(type: FHIRCanonical.self, for: "profile", in: json, context: &instCtx, owner: self) ?? profile readHistory = createInstance(type: FHIRBool.self, for: "readHistory", in: json, context: &instCtx, owner: self) ?? readHistory referencePolicy = createEnums(of: ReferenceHandlingPolicy.self, for: "referencePolicy", in: json, context: &instCtx) ?? referencePolicy searchInclude = createInstances(of: FHIRString.self, for: "searchInclude", in: json, context: &instCtx, owner: self) ?? searchInclude searchParam = createInstances(of: CapabilityStatementRestResourceSearchParam.self, for: "searchParam", in: json, context: &instCtx, owner: self) ?? searchParam searchRevInclude = createInstances(of: FHIRString.self, for: "searchRevInclude", in: json, context: &instCtx, owner: self) ?? searchRevInclude - supportedProfile = createInstances(of: FHIRURL.self, for: "supportedProfile", in: json, context: &instCtx, owner: self) ?? supportedProfile + supportedProfile = createInstances(of: FHIRCanonical.self, for: "supportedProfile", in: json, context: &instCtx, owner: self) ?? supportedProfile type = createEnum(type: ResourceType.self, for: "type", in: json, context: &instCtx) ?? type if nil == type && !instCtx.containsKey("type") { instCtx.addError(FHIRValidationError(missing: "type")) @@ -772,7 +772,7 @@ open class CapabilityStatementRestResourceOperation: BackboneElement { } /// The defined operation/query. - public var definition: FHIRURL? + public var definition: FHIRCanonical? /// Specific details about operation behavior. public var documentation: FHIRString? @@ -782,7 +782,7 @@ open class CapabilityStatementRestResourceOperation: BackboneElement { /** Convenience initializer, taking all required properties as arguments. */ - public convenience init(definition: FHIRURL, name: FHIRString) { + public convenience init(definition: FHIRCanonical, name: FHIRString) { self.init() self.definition = definition self.name = name @@ -792,7 +792,7 @@ open class CapabilityStatementRestResourceOperation: BackboneElement { override open func populate(from json: FHIRJSON, context instCtx: inout FHIRInstantiationContext) { super.populate(from: json, context: &instCtx) - definition = createInstance(type: FHIRURL.self, for: "definition", in: json, context: &instCtx, owner: self) ?? definition + definition = createInstance(type: FHIRCanonical.self, for: "definition", in: json, context: &instCtx, owner: self) ?? definition if nil == definition && !instCtx.containsKey("definition") { instCtx.addError(FHIRValidationError(missing: "definition")) } @@ -831,7 +831,7 @@ open class CapabilityStatementRestResourceSearchParam: BackboneElement { } /// Source of definition for parameter. - public var definition: FHIRURL? + public var definition: FHIRCanonical? /// Server-specific usage. public var documentation: FHIRString? @@ -854,7 +854,7 @@ open class CapabilityStatementRestResourceSearchParam: BackboneElement { override open func populate(from json: FHIRJSON, context instCtx: inout FHIRInstantiationContext) { super.populate(from: json, context: &instCtx) - definition = createInstance(type: FHIRURL.self, for: "definition", in: json, context: &instCtx, owner: self) ?? definition + definition = createInstance(type: FHIRCanonical.self, for: "definition", in: json, context: &instCtx, owner: self) ?? definition documentation = createInstance(type: FHIRString.self, for: "documentation", in: json, context: &instCtx, owner: self) ?? documentation name = createInstance(type: FHIRString.self, for: "name", in: json, context: &instCtx, owner: self) ?? name if nil == name && !instCtx.containsKey("name") { diff --git a/Sources/Models/CarePlan.swift b/Sources/Models/CarePlan.swift index 159441b0..8849c953 100644 --- a/Sources/Models/CarePlan.swift +++ b/Sources/Models/CarePlan.swift @@ -2,7 +2,7 @@ // CarePlan.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/CarePlan) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/CarePlan) on 2019-05-21. // 2019, SMART Health IT. // @@ -57,7 +57,7 @@ open class CarePlan: DomainResource { public var identifier: [Identifier]? /// Instantiates FHIR protocol or definition. - public var instantiatesCanonical: [FHIRURL]? + public var instantiatesCanonical: [FHIRCanonical]? /// Instantiates external protocol or definition. public var instantiatesUri: [FHIRURL]? @@ -117,7 +117,7 @@ open class CarePlan: DomainResource { encounter = createInstance(type: Reference.self, for: "encounter", in: json, context: &instCtx, owner: self) ?? encounter goal = createInstances(of: Reference.self, for: "goal", in: json, context: &instCtx, owner: self) ?? goal identifier = createInstances(of: Identifier.self, for: "identifier", in: json, context: &instCtx, owner: self) ?? identifier - instantiatesCanonical = createInstances(of: FHIRURL.self, for: "instantiatesCanonical", in: json, context: &instCtx, owner: self) ?? instantiatesCanonical + instantiatesCanonical = createInstances(of: FHIRCanonical.self, for: "instantiatesCanonical", in: json, context: &instCtx, owner: self) ?? instantiatesCanonical instantiatesUri = createInstances(of: FHIRURL.self, for: "instantiatesUri", in: json, context: &instCtx, owner: self) ?? instantiatesUri intent = createEnum(type: RequestIntent.self, for: "intent", in: json, context: &instCtx) ?? intent if nil == intent && !instCtx.containsKey("intent") { @@ -254,7 +254,7 @@ open class CarePlanActivityDetail: BackboneElement { public var goal: [Reference]? /// Instantiates FHIR protocol or definition. - public var instantiatesCanonical: [FHIRURL]? + public var instantiatesCanonical: [FHIRCanonical]? /// Instantiates external protocol or definition. public var instantiatesUri: [FHIRURL]? @@ -317,7 +317,7 @@ open class CarePlanActivityDetail: BackboneElement { description_fhir = createInstance(type: FHIRString.self, for: "description", in: json, context: &instCtx, owner: self) ?? description_fhir doNotPerform = createInstance(type: FHIRBool.self, for: "doNotPerform", in: json, context: &instCtx, owner: self) ?? doNotPerform goal = createInstances(of: Reference.self, for: "goal", in: json, context: &instCtx, owner: self) ?? goal - instantiatesCanonical = createInstances(of: FHIRURL.self, for: "instantiatesCanonical", in: json, context: &instCtx, owner: self) ?? instantiatesCanonical + instantiatesCanonical = createInstances(of: FHIRCanonical.self, for: "instantiatesCanonical", in: json, context: &instCtx, owner: self) ?? instantiatesCanonical instantiatesUri = createInstances(of: FHIRURL.self, for: "instantiatesUri", in: json, context: &instCtx, owner: self) ?? instantiatesUri kind = createEnum(type: ResourceType.self, for: "kind", in: json, context: &instCtx) ?? kind location = createInstance(type: Reference.self, for: "location", in: json, context: &instCtx, owner: self) ?? location diff --git a/Sources/Models/CareTeam.swift b/Sources/Models/CareTeam.swift index a5520121..e28d3126 100644 --- a/Sources/Models/CareTeam.swift +++ b/Sources/Models/CareTeam.swift @@ -2,7 +2,7 @@ // CareTeam.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/CareTeam) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/CareTeam) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/CatalogEntry.swift b/Sources/Models/CatalogEntry.swift index faea4ba5..b31aff80 100644 --- a/Sources/Models/CatalogEntry.swift +++ b/Sources/Models/CatalogEntry.swift @@ -2,7 +2,7 @@ // CatalogEntry.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/CatalogEntry) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/CatalogEntry) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/ChargeItem.swift b/Sources/Models/ChargeItem.swift index 01136ff7..3b5ad987 100644 --- a/Sources/Models/ChargeItem.swift +++ b/Sources/Models/ChargeItem.swift @@ -2,7 +2,7 @@ // ChargeItem.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ChargeItem) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ChargeItem) on 2019-05-21. // 2019, SMART Health IT. // @@ -38,7 +38,7 @@ open class ChargeItem: DomainResource { public var costCenter: Reference? /// Resource defining the code of this ChargeItem. - public var definitionCanonical: [FHIRURL]? + public var definitionCanonical: [FHIRCanonical]? /// Defining information about the code of this charge item. public var definitionUri: [FHIRURL]? @@ -130,7 +130,7 @@ open class ChargeItem: DomainResource { } context = createInstance(type: Reference.self, for: "context", in: json, context: &instCtx, owner: self) ?? context costCenter = createInstance(type: Reference.self, for: "costCenter", in: json, context: &instCtx, owner: self) ?? costCenter - definitionCanonical = createInstances(of: FHIRURL.self, for: "definitionCanonical", in: json, context: &instCtx, owner: self) ?? definitionCanonical + definitionCanonical = createInstances(of: FHIRCanonical.self, for: "definitionCanonical", in: json, context: &instCtx, owner: self) ?? definitionCanonical definitionUri = createInstances(of: FHIRURL.self, for: "definitionUri", in: json, context: &instCtx, owner: self) ?? definitionUri enteredDate = createInstance(type: DateTime.self, for: "enteredDate", in: json, context: &instCtx, owner: self) ?? enteredDate enterer = createInstance(type: Reference.self, for: "enterer", in: json, context: &instCtx, owner: self) ?? enterer diff --git a/Sources/Models/ChargeItemDefinition.swift b/Sources/Models/ChargeItemDefinition.swift index 2df654de..e8fd0c15 100644 --- a/Sources/Models/ChargeItemDefinition.swift +++ b/Sources/Models/ChargeItemDefinition.swift @@ -2,7 +2,7 @@ // ChargeItemDefinition.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ChargeItemDefinition) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ChargeItemDefinition) on 2019-05-21. // 2019, SMART Health IT. // @@ -64,7 +64,7 @@ open class ChargeItemDefinition: DomainResource { public var lastReviewDate: FHIRDate? /// A larger definition of which this particular definition is a component or step. - public var partOf: [FHIRURL]? + public var partOf: [FHIRCanonical]? /// Group of properties which are applicable under the same conditions. public var propertyGroup: [ChargeItemDefinitionPropertyGroup]? @@ -73,7 +73,7 @@ open class ChargeItemDefinition: DomainResource { public var publisher: FHIRString? /// Completed or terminated request(s) whose function is taken by this new request. - public var replaces: [FHIRURL]? + public var replaces: [FHIRCanonical]? /// The current state of the ChargeItemDefinition. public var status: PublicationStatus? @@ -116,10 +116,10 @@ open class ChargeItemDefinition: DomainResource { instance = createInstances(of: Reference.self, for: "instance", in: json, context: &instCtx, owner: self) ?? instance jurisdiction = createInstances(of: CodeableConcept.self, for: "jurisdiction", in: json, context: &instCtx, owner: self) ?? jurisdiction lastReviewDate = createInstance(type: FHIRDate.self, for: "lastReviewDate", in: json, context: &instCtx, owner: self) ?? lastReviewDate - partOf = createInstances(of: FHIRURL.self, for: "partOf", in: json, context: &instCtx, owner: self) ?? partOf + partOf = createInstances(of: FHIRCanonical.self, for: "partOf", in: json, context: &instCtx, owner: self) ?? partOf propertyGroup = createInstances(of: ChargeItemDefinitionPropertyGroup.self, for: "propertyGroup", in: json, context: &instCtx, owner: self) ?? propertyGroup publisher = createInstance(type: FHIRString.self, for: "publisher", in: json, context: &instCtx, owner: self) ?? publisher - replaces = createInstances(of: FHIRURL.self, for: "replaces", in: json, context: &instCtx, owner: self) ?? replaces + replaces = createInstances(of: FHIRCanonical.self, for: "replaces", in: json, context: &instCtx, owner: self) ?? replaces status = createEnum(type: PublicationStatus.self, for: "status", in: json, context: &instCtx) ?? status if nil == status && !instCtx.containsKey("status") { instCtx.addError(FHIRValidationError(missing: "status")) diff --git a/Sources/Models/Claim.swift b/Sources/Models/Claim.swift index d2524c6d..0458a64e 100644 --- a/Sources/Models/Claim.swift +++ b/Sources/Models/Claim.swift @@ -2,7 +2,7 @@ // Claim.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Claim) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Claim) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/ClaimResponse.swift b/Sources/Models/ClaimResponse.swift index 165b9d31..55e2fb22 100644 --- a/Sources/Models/ClaimResponse.swift +++ b/Sources/Models/ClaimResponse.swift @@ -2,7 +2,7 @@ // ClaimResponse.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ClaimResponse) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ClaimResponse) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/ClinicalImpression.swift b/Sources/Models/ClinicalImpression.swift index 0fe2900f..fe1c0af4 100644 --- a/Sources/Models/ClinicalImpression.swift +++ b/Sources/Models/ClinicalImpression.swift @@ -2,7 +2,7 @@ // ClinicalImpression.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ClinicalImpression) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ClinicalImpression) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/CodeSystem.swift b/Sources/Models/CodeSystem.swift index daebf70c..c8f1e967 100644 --- a/Sources/Models/CodeSystem.swift +++ b/Sources/Models/CodeSystem.swift @@ -2,7 +2,7 @@ // CodeSystem.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/CodeSystem) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/CodeSystem) on 2019-05-21. // 2019, SMART Health IT. // @@ -79,7 +79,7 @@ open class CodeSystem: DomainResource { public var status: PublicationStatus? /// Canonical URL of Code System this adds designations and properties to. - public var supplements: FHIRURL? + public var supplements: FHIRCanonical? /// Name for this code system (human friendly). public var title: FHIRString? @@ -91,7 +91,7 @@ open class CodeSystem: DomainResource { public var useContext: [UsageContext]? /// Canonical reference to the value set with entire code system. - public var valueSet: FHIRURL? + public var valueSet: FHIRCanonical? /// Business version of the code system (Coding.version). public var version: FHIRString? @@ -136,11 +136,11 @@ open class CodeSystem: DomainResource { if nil == status && !instCtx.containsKey("status") { instCtx.addError(FHIRValidationError(missing: "status")) } - supplements = createInstance(type: FHIRURL.self, for: "supplements", in: json, context: &instCtx, owner: self) ?? supplements + supplements = createInstance(type: FHIRCanonical.self, for: "supplements", in: json, context: &instCtx, owner: self) ?? supplements title = createInstance(type: FHIRString.self, for: "title", in: json, context: &instCtx, owner: self) ?? title url = createInstance(type: FHIRURL.self, for: "url", in: json, context: &instCtx, owner: self) ?? url useContext = createInstances(of: UsageContext.self, for: "useContext", in: json, context: &instCtx, owner: self) ?? useContext - valueSet = createInstance(type: FHIRURL.self, for: "valueSet", in: json, context: &instCtx, owner: self) ?? valueSet + valueSet = createInstance(type: FHIRCanonical.self, for: "valueSet", in: json, context: &instCtx, owner: self) ?? valueSet version = createInstance(type: FHIRString.self, for: "version", in: json, context: &instCtx, owner: self) ?? version versionNeeded = createInstance(type: FHIRBool.self, for: "versionNeeded", in: json, context: &instCtx, owner: self) ?? versionNeeded } diff --git a/Sources/Models/CodeSystems.swift b/Sources/Models/CodeSystems.swift index 31e80b01..9d0e91a9 100644 --- a/Sources/Models/CodeSystems.swift +++ b/Sources/Models/CodeSystems.swift @@ -2,7 +2,7 @@ // CodeSystems.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/CodeableConcept.swift b/Sources/Models/CodeableConcept.swift index 3ce9068b..44f5f33c 100644 --- a/Sources/Models/CodeableConcept.swift +++ b/Sources/Models/CodeableConcept.swift @@ -2,7 +2,7 @@ // CodeableConcept.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/CodeableConcept) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/CodeableConcept) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Coding.swift b/Sources/Models/Coding.swift index e93520af..475153b3 100644 --- a/Sources/Models/Coding.swift +++ b/Sources/Models/Coding.swift @@ -2,7 +2,7 @@ // Coding.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Coding) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Coding) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Communication.swift b/Sources/Models/Communication.swift index b6809fca..415f03fb 100644 --- a/Sources/Models/Communication.swift +++ b/Sources/Models/Communication.swift @@ -2,7 +2,7 @@ // Communication.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Communication) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Communication) on 2019-05-21. // 2019, SMART Health IT. // @@ -39,7 +39,7 @@ open class Communication: DomainResource { public var inResponseTo: [Reference]? /// Instantiates FHIR protocol or definition. - public var instantiatesCanonical: [FHIRURL]? + public var instantiatesCanonical: [FHIRCanonical]? /// Instantiates external protocol or definition. public var instantiatesUri: [FHIRURL]? @@ -107,7 +107,7 @@ open class Communication: DomainResource { encounter = createInstance(type: Reference.self, for: "encounter", in: json, context: &instCtx, owner: self) ?? encounter identifier = createInstances(of: Identifier.self, for: "identifier", in: json, context: &instCtx, owner: self) ?? identifier inResponseTo = createInstances(of: Reference.self, for: "inResponseTo", in: json, context: &instCtx, owner: self) ?? inResponseTo - instantiatesCanonical = createInstances(of: FHIRURL.self, for: "instantiatesCanonical", in: json, context: &instCtx, owner: self) ?? instantiatesCanonical + instantiatesCanonical = createInstances(of: FHIRCanonical.self, for: "instantiatesCanonical", in: json, context: &instCtx, owner: self) ?? instantiatesCanonical instantiatesUri = createInstances(of: FHIRURL.self, for: "instantiatesUri", in: json, context: &instCtx, owner: self) ?? instantiatesUri medium = createInstances(of: CodeableConcept.self, for: "medium", in: json, context: &instCtx, owner: self) ?? medium note = createInstances(of: Annotation.self, for: "note", in: json, context: &instCtx, owner: self) ?? note diff --git a/Sources/Models/CommunicationRequest.swift b/Sources/Models/CommunicationRequest.swift index 9cfa0030..63a445af 100644 --- a/Sources/Models/CommunicationRequest.swift +++ b/Sources/Models/CommunicationRequest.swift @@ -2,7 +2,7 @@ // CommunicationRequest.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/CommunicationRequest) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/CommunicationRequest) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/CompartmentDefinition.swift b/Sources/Models/CompartmentDefinition.swift index 0f4e06ee..ee16648d 100644 --- a/Sources/Models/CompartmentDefinition.swift +++ b/Sources/Models/CompartmentDefinition.swift @@ -2,7 +2,7 @@ // CompartmentDefinition.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/CompartmentDefinition) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/CompartmentDefinition) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Composition.swift b/Sources/Models/Composition.swift index 5a3f7302..8c15738c 100644 --- a/Sources/Models/Composition.swift +++ b/Sources/Models/Composition.swift @@ -2,7 +2,7 @@ // Composition.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Composition) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Composition) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/ConceptMap.swift b/Sources/Models/ConceptMap.swift index e71d6b92..dca50e68 100644 --- a/Sources/Models/ConceptMap.swift +++ b/Sources/Models/ConceptMap.swift @@ -2,7 +2,7 @@ // ConceptMap.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ConceptMap) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ConceptMap) on 2019-05-21. // 2019, SMART Health IT. // @@ -54,7 +54,7 @@ open class ConceptMap: DomainResource { public var purpose: FHIRString? /// The source value set that contains the concepts that are being mapped. - public var sourceCanonical: FHIRURL? + public var sourceCanonical: FHIRCanonical? /// The source value set that contains the concepts that are being mapped. public var sourceUri: FHIRURL? @@ -63,7 +63,7 @@ open class ConceptMap: DomainResource { public var status: PublicationStatus? /// The target value set which provides context for the mappings. - public var targetCanonical: FHIRURL? + public var targetCanonical: FHIRCanonical? /// The target value set which provides context for the mappings. public var targetUri: FHIRURL? @@ -102,13 +102,13 @@ open class ConceptMap: DomainResource { name = createInstance(type: FHIRString.self, for: "name", in: json, context: &instCtx, owner: self) ?? name publisher = createInstance(type: FHIRString.self, for: "publisher", in: json, context: &instCtx, owner: self) ?? publisher purpose = createInstance(type: FHIRString.self, for: "purpose", in: json, context: &instCtx, owner: self) ?? purpose - sourceCanonical = createInstance(type: FHIRURL.self, for: "sourceCanonical", in: json, context: &instCtx, owner: self) ?? sourceCanonical + sourceCanonical = createInstance(type: FHIRCanonical.self, for: "sourceCanonical", in: json, context: &instCtx, owner: self) ?? sourceCanonical sourceUri = createInstance(type: FHIRURL.self, for: "sourceUri", in: json, context: &instCtx, owner: self) ?? sourceUri status = createEnum(type: PublicationStatus.self, for: "status", in: json, context: &instCtx) ?? status if nil == status && !instCtx.containsKey("status") { instCtx.addError(FHIRValidationError(missing: "status")) } - targetCanonical = createInstance(type: FHIRURL.self, for: "targetCanonical", in: json, context: &instCtx, owner: self) ?? targetCanonical + targetCanonical = createInstance(type: FHIRCanonical.self, for: "targetCanonical", in: json, context: &instCtx, owner: self) ?? targetCanonical targetUri = createInstance(type: FHIRURL.self, for: "targetUri", in: json, context: &instCtx, owner: self) ?? targetUri title = createInstance(type: FHIRString.self, for: "title", in: json, context: &instCtx, owner: self) ?? title url = createInstance(type: FHIRURL.self, for: "url", in: json, context: &instCtx, owner: self) ?? url @@ -335,7 +335,7 @@ open class ConceptMapGroupElementTargetDependsOn: BackboneElement { public var property: FHIRURL? /// Code System (if necessary). - public var system: FHIRURL? + public var system: FHIRCanonical? /// Value of the referenced element. public var value: FHIRString? @@ -357,7 +357,7 @@ open class ConceptMapGroupElementTargetDependsOn: BackboneElement { if nil == property && !instCtx.containsKey("property") { instCtx.addError(FHIRValidationError(missing: "property")) } - system = createInstance(type: FHIRURL.self, for: "system", in: json, context: &instCtx, owner: self) ?? system + system = createInstance(type: FHIRCanonical.self, for: "system", in: json, context: &instCtx, owner: self) ?? system value = createInstance(type: FHIRString.self, for: "value", in: json, context: &instCtx, owner: self) ?? value if nil == value && !instCtx.containsKey("value") { instCtx.addError(FHIRValidationError(missing: "value")) @@ -405,7 +405,7 @@ open class ConceptMapGroupUnmapped: BackboneElement { public var mode: ConceptMapGroupUnmappedMode? /// canonical reference to an additional ConceptMap to use for mapping if the source concept is unmapped. - public var url: FHIRURL? + public var url: FHIRCanonical? /** Convenience initializer, taking all required properties as arguments. */ @@ -424,7 +424,7 @@ open class ConceptMapGroupUnmapped: BackboneElement { if nil == mode && !instCtx.containsKey("mode") { instCtx.addError(FHIRValidationError(missing: "mode")) } - url = createInstance(type: FHIRURL.self, for: "url", in: json, context: &instCtx, owner: self) ?? url + url = createInstance(type: FHIRCanonical.self, for: "url", in: json, context: &instCtx, owner: self) ?? url } override open func decorate(json: inout FHIRJSON, errors: inout [FHIRValidationError]) { diff --git a/Sources/Models/Condition.swift b/Sources/Models/Condition.swift index b2b1c562..0dd3e19a 100644 --- a/Sources/Models/Condition.swift +++ b/Sources/Models/Condition.swift @@ -2,7 +2,7 @@ // Condition.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Condition) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Condition) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Consent.swift b/Sources/Models/Consent.swift index 32e5cef0..d19260b9 100644 --- a/Sources/Models/Consent.swift +++ b/Sources/Models/Consent.swift @@ -2,7 +2,7 @@ // Consent.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Consent) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Consent) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/ContactDetail.swift b/Sources/Models/ContactDetail.swift index 90fdb53e..17eb4e0b 100644 --- a/Sources/Models/ContactDetail.swift +++ b/Sources/Models/ContactDetail.swift @@ -2,7 +2,7 @@ // ContactDetail.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ContactDetail) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ContactDetail) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/ContactPoint.swift b/Sources/Models/ContactPoint.swift index 7b3791ad..6378e87e 100644 --- a/Sources/Models/ContactPoint.swift +++ b/Sources/Models/ContactPoint.swift @@ -2,7 +2,7 @@ // ContactPoint.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ContactPoint) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ContactPoint) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Contract.swift b/Sources/Models/Contract.swift index f0d6754a..3823a167 100644 --- a/Sources/Models/Contract.swift +++ b/Sources/Models/Contract.swift @@ -2,7 +2,7 @@ // Contract.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Contract) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Contract) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Contributor.swift b/Sources/Models/Contributor.swift index 867d0b52..db039856 100644 --- a/Sources/Models/Contributor.swift +++ b/Sources/Models/Contributor.swift @@ -2,7 +2,7 @@ // Contributor.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Contributor) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Contributor) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Count.swift b/Sources/Models/Count.swift index 032449c4..21af516c 100644 --- a/Sources/Models/Count.swift +++ b/Sources/Models/Count.swift @@ -2,7 +2,7 @@ // Count.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Count) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Count) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Coverage.swift b/Sources/Models/Coverage.swift index 3933a27d..fdfbb596 100644 --- a/Sources/Models/Coverage.swift +++ b/Sources/Models/Coverage.swift @@ -2,7 +2,7 @@ // Coverage.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Coverage) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Coverage) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/CoverageEligibilityRequest.swift b/Sources/Models/CoverageEligibilityRequest.swift index fc4102e2..6ff52c1f 100644 --- a/Sources/Models/CoverageEligibilityRequest.swift +++ b/Sources/Models/CoverageEligibilityRequest.swift @@ -2,7 +2,7 @@ // CoverageEligibilityRequest.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/CoverageEligibilityRequest) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/CoverageEligibilityRequest) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/CoverageEligibilityResponse.swift b/Sources/Models/CoverageEligibilityResponse.swift index a08749f8..35f28ac9 100644 --- a/Sources/Models/CoverageEligibilityResponse.swift +++ b/Sources/Models/CoverageEligibilityResponse.swift @@ -2,7 +2,7 @@ // CoverageEligibilityResponse.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/CoverageEligibilityResponse) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/CoverageEligibilityResponse) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/DataRequirement.swift b/Sources/Models/DataRequirement.swift index 5f679440..116fc337 100644 --- a/Sources/Models/DataRequirement.swift +++ b/Sources/Models/DataRequirement.swift @@ -2,7 +2,7 @@ // DataRequirement.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/DataRequirement) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/DataRequirement) on 2019-05-21. // 2019, SMART Health IT. // @@ -33,7 +33,7 @@ open class DataRequirement: Element { public var mustSupport: [FHIRString]? /// The profile of the required data. - public var profile: [FHIRURL]? + public var profile: [FHIRCanonical]? /// Order of the results. public var sort: [DataRequirementSort]? @@ -62,7 +62,7 @@ open class DataRequirement: Element { dateFilter = createInstances(of: DataRequirementDateFilter.self, for: "dateFilter", in: json, context: &instCtx, owner: self) ?? dateFilter limit = createInstance(type: FHIRInteger.self, for: "limit", in: json, context: &instCtx, owner: self) ?? limit mustSupport = createInstances(of: FHIRString.self, for: "mustSupport", in: json, context: &instCtx, owner: self) ?? mustSupport - profile = createInstances(of: FHIRURL.self, for: "profile", in: json, context: &instCtx, owner: self) ?? profile + profile = createInstances(of: FHIRCanonical.self, for: "profile", in: json, context: &instCtx, owner: self) ?? profile sort = createInstances(of: DataRequirementSort.self, for: "sort", in: json, context: &instCtx, owner: self) ?? sort subjectCodeableConcept = createInstance(type: CodeableConcept.self, for: "subjectCodeableConcept", in: json, context: &instCtx, owner: self) ?? subjectCodeableConcept subjectReference = createInstance(type: Reference.self, for: "subjectReference", in: json, context: &instCtx, owner: self) ?? subjectReference @@ -112,7 +112,7 @@ open class DataRequirementCodeFilter: Element { public var searchParam: FHIRString? /// Valueset for the filter. - public var valueSet: FHIRURL? + public var valueSet: FHIRCanonical? override open func populate(from json: FHIRJSON, context instCtx: inout FHIRInstantiationContext) { @@ -121,7 +121,7 @@ open class DataRequirementCodeFilter: Element { code = createInstances(of: Coding.self, for: "code", in: json, context: &instCtx, owner: self) ?? code path = createInstance(type: FHIRString.self, for: "path", in: json, context: &instCtx, owner: self) ?? path searchParam = createInstance(type: FHIRString.self, for: "searchParam", in: json, context: &instCtx, owner: self) ?? searchParam - valueSet = createInstance(type: FHIRURL.self, for: "valueSet", in: json, context: &instCtx, owner: self) ?? valueSet + valueSet = createInstance(type: FHIRCanonical.self, for: "valueSet", in: json, context: &instCtx, owner: self) ?? valueSet } override open func decorate(json: inout FHIRJSON, errors: inout [FHIRValidationError]) { diff --git a/Sources/Models/DetectedIssue.swift b/Sources/Models/DetectedIssue.swift index bba8d577..60a56696 100644 --- a/Sources/Models/DetectedIssue.swift +++ b/Sources/Models/DetectedIssue.swift @@ -2,7 +2,7 @@ // DetectedIssue.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/DetectedIssue) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/DetectedIssue) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Device.swift b/Sources/Models/Device.swift index eba7d1c8..3870cb96 100644 --- a/Sources/Models/Device.swift +++ b/Sources/Models/Device.swift @@ -2,7 +2,7 @@ // Device.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Device) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Device) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/DeviceDefinition.swift b/Sources/Models/DeviceDefinition.swift index d68ad602..41a4181a 100644 --- a/Sources/Models/DeviceDefinition.swift +++ b/Sources/Models/DeviceDefinition.swift @@ -2,7 +2,7 @@ // DeviceDefinition.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/DeviceDefinition) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/DeviceDefinition) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/DeviceMetric.swift b/Sources/Models/DeviceMetric.swift index 123c8330..84ab80ba 100644 --- a/Sources/Models/DeviceMetric.swift +++ b/Sources/Models/DeviceMetric.swift @@ -2,7 +2,7 @@ // DeviceMetric.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/DeviceMetric) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/DeviceMetric) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/DeviceRequest.swift b/Sources/Models/DeviceRequest.swift index 93cf945d..e58ca405 100644 --- a/Sources/Models/DeviceRequest.swift +++ b/Sources/Models/DeviceRequest.swift @@ -2,7 +2,7 @@ // DeviceRequest.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/DeviceRequest) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/DeviceRequest) on 2019-05-21. // 2019, SMART Health IT. // @@ -42,7 +42,7 @@ open class DeviceRequest: DomainResource { public var identifier: [Identifier]? /// Instantiates FHIR protocol or definition. - public var instantiatesCanonical: [FHIRURL]? + public var instantiatesCanonical: [FHIRCanonical]? /// Instantiates external protocol or definition. public var instantiatesUri: [FHIRURL]? @@ -129,7 +129,7 @@ open class DeviceRequest: DomainResource { encounter = createInstance(type: Reference.self, for: "encounter", in: json, context: &instCtx, owner: self) ?? encounter groupIdentifier = createInstance(type: Identifier.self, for: "groupIdentifier", in: json, context: &instCtx, owner: self) ?? groupIdentifier identifier = createInstances(of: Identifier.self, for: "identifier", in: json, context: &instCtx, owner: self) ?? identifier - instantiatesCanonical = createInstances(of: FHIRURL.self, for: "instantiatesCanonical", in: json, context: &instCtx, owner: self) ?? instantiatesCanonical + instantiatesCanonical = createInstances(of: FHIRCanonical.self, for: "instantiatesCanonical", in: json, context: &instCtx, owner: self) ?? instantiatesCanonical instantiatesUri = createInstances(of: FHIRURL.self, for: "instantiatesUri", in: json, context: &instCtx, owner: self) ?? instantiatesUri insurance = createInstances(of: Reference.self, for: "insurance", in: json, context: &instCtx, owner: self) ?? insurance intent = createEnum(type: RequestIntent.self, for: "intent", in: json, context: &instCtx) ?? intent diff --git a/Sources/Models/DeviceUseStatement.swift b/Sources/Models/DeviceUseStatement.swift index 4b33293f..e39521b4 100644 --- a/Sources/Models/DeviceUseStatement.swift +++ b/Sources/Models/DeviceUseStatement.swift @@ -2,7 +2,7 @@ // DeviceUseStatement.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/DeviceUseStatement) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/DeviceUseStatement) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/DiagnosticReport.swift b/Sources/Models/DiagnosticReport.swift index 3c4dcfa6..1b065791 100644 --- a/Sources/Models/DiagnosticReport.swift +++ b/Sources/Models/DiagnosticReport.swift @@ -2,7 +2,7 @@ // DiagnosticReport.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/DiagnosticReport) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/DiagnosticReport) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Distance.swift b/Sources/Models/Distance.swift index 73e0e1c5..dc63eb0d 100644 --- a/Sources/Models/Distance.swift +++ b/Sources/Models/Distance.swift @@ -2,7 +2,7 @@ // Distance.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Distance) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Distance) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/DocumentManifest.swift b/Sources/Models/DocumentManifest.swift index 2a002176..28763569 100644 --- a/Sources/Models/DocumentManifest.swift +++ b/Sources/Models/DocumentManifest.swift @@ -2,7 +2,7 @@ // DocumentManifest.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/DocumentManifest) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/DocumentManifest) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/DocumentReference.swift b/Sources/Models/DocumentReference.swift index c056aafd..002dbbc5 100644 --- a/Sources/Models/DocumentReference.swift +++ b/Sources/Models/DocumentReference.swift @@ -2,7 +2,7 @@ // DocumentReference.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/DocumentReference) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/DocumentReference) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/DomainResource.swift b/Sources/Models/DomainResource.swift index 6048292c..fc6d9c43 100644 --- a/Sources/Models/DomainResource.swift +++ b/Sources/Models/DomainResource.swift @@ -2,7 +2,7 @@ // DomainResource.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/DomainResource) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/DomainResource) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Dosage.swift b/Sources/Models/Dosage.swift index bc8596f2..50917f9b 100644 --- a/Sources/Models/Dosage.swift +++ b/Sources/Models/Dosage.swift @@ -2,7 +2,7 @@ // Dosage.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Dosage) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Dosage) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Duration.swift b/Sources/Models/Duration.swift index eb555a9c..45720818 100644 --- a/Sources/Models/Duration.swift +++ b/Sources/Models/Duration.swift @@ -2,7 +2,7 @@ // Duration.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Duration) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Duration) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/EffectEvidenceSynthesis.swift b/Sources/Models/EffectEvidenceSynthesis.swift index fc093443..e2a4ee4e 100644 --- a/Sources/Models/EffectEvidenceSynthesis.swift +++ b/Sources/Models/EffectEvidenceSynthesis.swift @@ -2,7 +2,7 @@ // EffectEvidenceSynthesis.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/EffectEvidenceSynthesis) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/EffectEvidenceSynthesis) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Element.swift b/Sources/Models/Element.swift index 829519f2..410c9377 100644 --- a/Sources/Models/Element.swift +++ b/Sources/Models/Element.swift @@ -2,7 +2,7 @@ // Element.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Element) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Element) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/ElementDefinition.swift b/Sources/Models/ElementDefinition.swift index b2e4e21a..cc682f5b 100644 --- a/Sources/Models/ElementDefinition.swift +++ b/Sources/Models/ElementDefinition.swift @@ -2,7 +2,7 @@ // ElementDefinition.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ElementDefinition) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ElementDefinition) on 2019-05-21. // 2019, SMART Health IT. // @@ -62,7 +62,7 @@ open class ElementDefinition: BackboneElement { public var defaultValueBoolean: FHIRBool? /// Specified value if missing from instance. - public var defaultValueCanonical: FHIRURL? + public var defaultValueCanonical: FHIRCanonical? /// Specified value if missing from instance. public var defaultValueCode: FHIRString? @@ -215,7 +215,7 @@ open class ElementDefinition: BackboneElement { public var fixedBoolean: FHIRBool? /// Value must be exactly this. - public var fixedCanonical: FHIRURL? + public var fixedCanonical: FHIRCanonical? /// Value must be exactly this. public var fixedCode: FHIRString? @@ -452,7 +452,7 @@ open class ElementDefinition: BackboneElement { public var patternBoolean: FHIRBool? /// Value must have at least these property values. - public var patternCanonical: FHIRURL? + public var patternCanonical: FHIRCanonical? /// Value must have at least these property values. public var patternCode: FHIRString? @@ -626,7 +626,7 @@ open class ElementDefinition: BackboneElement { defaultValueAttachment = createInstance(type: Attachment.self, for: "defaultValueAttachment", in: json, context: &instCtx, owner: self) ?? defaultValueAttachment defaultValueBase64Binary = createInstance(type: Base64Binary.self, for: "defaultValueBase64Binary", in: json, context: &instCtx, owner: self) ?? defaultValueBase64Binary defaultValueBoolean = createInstance(type: FHIRBool.self, for: "defaultValueBoolean", in: json, context: &instCtx, owner: self) ?? defaultValueBoolean - defaultValueCanonical = createInstance(type: FHIRURL.self, for: "defaultValueCanonical", in: json, context: &instCtx, owner: self) ?? defaultValueCanonical + defaultValueCanonical = createInstance(type: FHIRCanonical.self, for: "defaultValueCanonical", in: json, context: &instCtx, owner: self) ?? defaultValueCanonical defaultValueCode = createInstance(type: FHIRString.self, for: "defaultValueCode", in: json, context: &instCtx, owner: self) ?? defaultValueCode defaultValueCodeableConcept = createInstance(type: CodeableConcept.self, for: "defaultValueCodeableConcept", in: json, context: &instCtx, owner: self) ?? defaultValueCodeableConcept defaultValueCoding = createInstance(type: Coding.self, for: "defaultValueCoding", in: json, context: &instCtx, owner: self) ?? defaultValueCoding @@ -677,7 +677,7 @@ open class ElementDefinition: BackboneElement { fixedAttachment = createInstance(type: Attachment.self, for: "fixedAttachment", in: json, context: &instCtx, owner: self) ?? fixedAttachment fixedBase64Binary = createInstance(type: Base64Binary.self, for: "fixedBase64Binary", in: json, context: &instCtx, owner: self) ?? fixedBase64Binary fixedBoolean = createInstance(type: FHIRBool.self, for: "fixedBoolean", in: json, context: &instCtx, owner: self) ?? fixedBoolean - fixedCanonical = createInstance(type: FHIRURL.self, for: "fixedCanonical", in: json, context: &instCtx, owner: self) ?? fixedCanonical + fixedCanonical = createInstance(type: FHIRCanonical.self, for: "fixedCanonical", in: json, context: &instCtx, owner: self) ?? fixedCanonical fixedCode = createInstance(type: FHIRString.self, for: "fixedCode", in: json, context: &instCtx, owner: self) ?? fixedCode fixedCodeableConcept = createInstance(type: CodeableConcept.self, for: "fixedCodeableConcept", in: json, context: &instCtx, owner: self) ?? fixedCodeableConcept fixedCoding = createInstance(type: Coding.self, for: "fixedCoding", in: json, context: &instCtx, owner: self) ?? fixedCoding @@ -759,7 +759,7 @@ open class ElementDefinition: BackboneElement { patternAttachment = createInstance(type: Attachment.self, for: "patternAttachment", in: json, context: &instCtx, owner: self) ?? patternAttachment patternBase64Binary = createInstance(type: Base64Binary.self, for: "patternBase64Binary", in: json, context: &instCtx, owner: self) ?? patternBase64Binary patternBoolean = createInstance(type: FHIRBool.self, for: "patternBoolean", in: json, context: &instCtx, owner: self) ?? patternBoolean - patternCanonical = createInstance(type: FHIRURL.self, for: "patternCanonical", in: json, context: &instCtx, owner: self) ?? patternCanonical + patternCanonical = createInstance(type: FHIRCanonical.self, for: "patternCanonical", in: json, context: &instCtx, owner: self) ?? patternCanonical patternCode = createInstance(type: FHIRString.self, for: "patternCode", in: json, context: &instCtx, owner: self) ?? patternCode patternCodeableConcept = createInstance(type: CodeableConcept.self, for: "patternCodeableConcept", in: json, context: &instCtx, owner: self) ?? patternCodeableConcept patternCoding = createInstance(type: Coding.self, for: "patternCoding", in: json, context: &instCtx, owner: self) ?? patternCoding @@ -1103,7 +1103,7 @@ open class ElementDefinitionBinding: Element { public var strength: BindingStrength? /// Source of value set. - public var valueSet: FHIRURL? + public var valueSet: FHIRCanonical? /** Convenience initializer, taking all required properties as arguments. */ @@ -1121,7 +1121,7 @@ open class ElementDefinitionBinding: Element { if nil == strength && !instCtx.containsKey("strength") { instCtx.addError(FHIRValidationError(missing: "strength")) } - valueSet = createInstance(type: FHIRURL.self, for: "valueSet", in: json, context: &instCtx, owner: self) ?? valueSet + valueSet = createInstance(type: FHIRCanonical.self, for: "valueSet", in: json, context: &instCtx, owner: self) ?? valueSet } override open func decorate(json: inout FHIRJSON, errors: inout [FHIRValidationError]) { @@ -1164,7 +1164,7 @@ open class ElementDefinitionConstraint: Element { public var severity: ConstraintSeverity? /// Reference to original source of constraint. - public var source: FHIRURL? + public var source: FHIRCanonical? /// XPath expression of constraint. public var xpath: FHIRString? @@ -1196,7 +1196,7 @@ open class ElementDefinitionConstraint: Element { if nil == severity && !instCtx.containsKey("severity") { instCtx.addError(FHIRValidationError(missing: "severity")) } - source = createInstance(type: FHIRURL.self, for: "source", in: json, context: &instCtx, owner: self) ?? source + source = createInstance(type: FHIRCanonical.self, for: "source", in: json, context: &instCtx, owner: self) ?? source xpath = createInstance(type: FHIRString.self, for: "xpath", in: json, context: &instCtx, owner: self) ?? xpath } @@ -1255,7 +1255,7 @@ open class ElementDefinitionExample: Element { public var valueBoolean: FHIRBool? /// Value of Example (one of allowed types). - public var valueCanonical: FHIRURL? + public var valueCanonical: FHIRCanonical? /// Value of Example (one of allowed types). public var valueCode: FHIRString? @@ -1394,7 +1394,7 @@ open class ElementDefinitionExample: Element { else if let value = value as? FHIRBool { self.valueBoolean = value } - else if let value = value as? FHIRURL { + else if let value = value as? FHIRCanonical { self.valueCanonical = value } else if let value = value as? FHIRString { @@ -1554,7 +1554,7 @@ open class ElementDefinitionExample: Element { valueAttachment = createInstance(type: Attachment.self, for: "valueAttachment", in: json, context: &instCtx, owner: self) ?? valueAttachment valueBase64Binary = createInstance(type: Base64Binary.self, for: "valueBase64Binary", in: json, context: &instCtx, owner: self) ?? valueBase64Binary valueBoolean = createInstance(type: FHIRBool.self, for: "valueBoolean", in: json, context: &instCtx, owner: self) ?? valueBoolean - valueCanonical = createInstance(type: FHIRURL.self, for: "valueCanonical", in: json, context: &instCtx, owner: self) ?? valueCanonical + valueCanonical = createInstance(type: FHIRCanonical.self, for: "valueCanonical", in: json, context: &instCtx, owner: self) ?? valueCanonical valueCode = createInstance(type: FHIRString.self, for: "valueCode", in: json, context: &instCtx, owner: self) ?? valueCode valueCodeableConcept = createInstance(type: CodeableConcept.self, for: "valueCodeableConcept", in: json, context: &instCtx, owner: self) ?? valueCodeableConcept valueCoding = createInstance(type: Coding.self, for: "valueCoding", in: json, context: &instCtx, owner: self) ?? valueCoding @@ -1867,10 +1867,10 @@ open class ElementDefinitionType: Element { public var code: FHIRURL? /// Profiles (StructureDefinition or IG) - one must apply. - public var profile: [FHIRURL]? + public var profile: [FHIRCanonical]? /// Profile (StructureDefinition or IG) on the Reference/canonical target - one must apply. - public var targetProfile: [FHIRURL]? + public var targetProfile: [FHIRCanonical]? /// Whether this reference needs to be version specific or version independent, or whether either can be used. public var versioning: ReferenceVersionRules? @@ -1891,8 +1891,8 @@ open class ElementDefinitionType: Element { if nil == code && !instCtx.containsKey("code") { instCtx.addError(FHIRValidationError(missing: "code")) } - profile = createInstances(of: FHIRURL.self, for: "profile", in: json, context: &instCtx, owner: self) ?? profile - targetProfile = createInstances(of: FHIRURL.self, for: "targetProfile", in: json, context: &instCtx, owner: self) ?? targetProfile + profile = createInstances(of: FHIRCanonical.self, for: "profile", in: json, context: &instCtx, owner: self) ?? profile + targetProfile = createInstances(of: FHIRCanonical.self, for: "targetProfile", in: json, context: &instCtx, owner: self) ?? targetProfile versioning = createEnum(type: ReferenceVersionRules.self, for: "versioning", in: json, context: &instCtx) ?? versioning } diff --git a/Sources/Models/Encounter.swift b/Sources/Models/Encounter.swift index b737e45a..5718176c 100644 --- a/Sources/Models/Encounter.swift +++ b/Sources/Models/Encounter.swift @@ -2,7 +2,7 @@ // Encounter.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Encounter) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Encounter) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Endpoint.swift b/Sources/Models/Endpoint.swift index f3ee6f9a..b21770ba 100644 --- a/Sources/Models/Endpoint.swift +++ b/Sources/Models/Endpoint.swift @@ -2,7 +2,7 @@ // Endpoint.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Endpoint) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Endpoint) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/EnrollmentRequest.swift b/Sources/Models/EnrollmentRequest.swift index 8b8ac906..9951403c 100644 --- a/Sources/Models/EnrollmentRequest.swift +++ b/Sources/Models/EnrollmentRequest.swift @@ -2,7 +2,7 @@ // EnrollmentRequest.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/EnrollmentRequest) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/EnrollmentRequest) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/EnrollmentResponse.swift b/Sources/Models/EnrollmentResponse.swift index f6d964ae..771b7ffd 100644 --- a/Sources/Models/EnrollmentResponse.swift +++ b/Sources/Models/EnrollmentResponse.swift @@ -2,7 +2,7 @@ // EnrollmentResponse.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/EnrollmentResponse) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/EnrollmentResponse) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/EpisodeOfCare.swift b/Sources/Models/EpisodeOfCare.swift index 9c2165d5..700adc3f 100644 --- a/Sources/Models/EpisodeOfCare.swift +++ b/Sources/Models/EpisodeOfCare.swift @@ -2,7 +2,7 @@ // EpisodeOfCare.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/EpisodeOfCare) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/EpisodeOfCare) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/EventDefinition.swift b/Sources/Models/EventDefinition.swift index f6c601ed..12756006 100644 --- a/Sources/Models/EventDefinition.swift +++ b/Sources/Models/EventDefinition.swift @@ -2,7 +2,7 @@ // EventDefinition.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/EventDefinition) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/EventDefinition) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Evidence.swift b/Sources/Models/Evidence.swift index 4075d85e..39dc6e1f 100644 --- a/Sources/Models/Evidence.swift +++ b/Sources/Models/Evidence.swift @@ -2,7 +2,7 @@ // Evidence.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Evidence) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Evidence) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/EvidenceVariable.swift b/Sources/Models/EvidenceVariable.swift index fd4ea31b..fb92f8e9 100644 --- a/Sources/Models/EvidenceVariable.swift +++ b/Sources/Models/EvidenceVariable.swift @@ -2,7 +2,7 @@ // EvidenceVariable.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/EvidenceVariable) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/EvidenceVariable) on 2019-05-21. // 2019, SMART Health IT. // @@ -199,7 +199,7 @@ open class EvidenceVariableCharacteristic: BackboneElement { } /// What code or expression defines members?. - public var definitionCanonical: FHIRURL? + public var definitionCanonical: FHIRCanonical? /// What code or expression defines members?. public var definitionCodeableConcept: CodeableConcept? @@ -250,7 +250,7 @@ open class EvidenceVariableCharacteristic: BackboneElement { if let value = definition as? Reference { self.definitionReference = value } - else if let value = definition as? FHIRURL { + else if let value = definition as? FHIRCanonical { self.definitionCanonical = value } else if let value = definition as? CodeableConcept { @@ -274,7 +274,7 @@ open class EvidenceVariableCharacteristic: BackboneElement { override open func populate(from json: FHIRJSON, context instCtx: inout FHIRInstantiationContext) { super.populate(from: json, context: &instCtx) - definitionCanonical = createInstance(type: FHIRURL.self, for: "definitionCanonical", in: json, context: &instCtx, owner: self) ?? definitionCanonical + definitionCanonical = createInstance(type: FHIRCanonical.self, for: "definitionCanonical", in: json, context: &instCtx, owner: self) ?? definitionCanonical definitionCodeableConcept = createInstance(type: CodeableConcept.self, for: "definitionCodeableConcept", in: json, context: &instCtx, owner: self) ?? definitionCodeableConcept definitionDataRequirement = createInstance(type: DataRequirement.self, for: "definitionDataRequirement", in: json, context: &instCtx, owner: self) ?? definitionDataRequirement definitionExpression = createInstance(type: Expression.self, for: "definitionExpression", in: json, context: &instCtx, owner: self) ?? definitionExpression diff --git a/Sources/Models/ExampleScenario.swift b/Sources/Models/ExampleScenario.swift index 4409984b..f879cade 100644 --- a/Sources/Models/ExampleScenario.swift +++ b/Sources/Models/ExampleScenario.swift @@ -2,7 +2,7 @@ // ExampleScenario.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ExampleScenario) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ExampleScenario) on 2019-05-21. // 2019, SMART Health IT. // @@ -66,7 +66,7 @@ open class ExampleScenario: DomainResource { public var version: FHIRString? /// Another nested workflow. - public var workflow: [FHIRURL]? + public var workflow: [FHIRCanonical]? /** Convenience initializer, taking all required properties as arguments. */ @@ -98,7 +98,7 @@ open class ExampleScenario: DomainResource { url = createInstance(type: FHIRURL.self, for: "url", in: json, context: &instCtx, owner: self) ?? url useContext = createInstances(of: UsageContext.self, for: "useContext", in: json, context: &instCtx, owner: self) ?? useContext version = createInstance(type: FHIRString.self, for: "version", in: json, context: &instCtx, owner: self) ?? version - workflow = createInstances(of: FHIRURL.self, for: "workflow", in: json, context: &instCtx, owner: self) ?? workflow + workflow = createInstances(of: FHIRCanonical.self, for: "workflow", in: json, context: &instCtx, owner: self) ?? workflow } override open func decorate(json: inout FHIRJSON, errors: inout [FHIRValidationError]) { diff --git a/Sources/Models/ExplanationOfBenefit.swift b/Sources/Models/ExplanationOfBenefit.swift index 4b124b0a..0ba39fe8 100644 --- a/Sources/Models/ExplanationOfBenefit.swift +++ b/Sources/Models/ExplanationOfBenefit.swift @@ -2,7 +2,7 @@ // ExplanationOfBenefit.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ExplanationOfBenefit) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ExplanationOfBenefit) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Expression.swift b/Sources/Models/Expression.swift index 6b9d8290..0c1f5e36 100644 --- a/Sources/Models/Expression.swift +++ b/Sources/Models/Expression.swift @@ -2,7 +2,7 @@ // Expression.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Expression) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Expression) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Extension.swift b/Sources/Models/Extension.swift index eacde916..6c41f3aa 100644 --- a/Sources/Models/Extension.swift +++ b/Sources/Models/Extension.swift @@ -2,7 +2,7 @@ // Extension.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Extension) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Extension) on 2019-05-21. // 2019, SMART Health IT. // @@ -41,7 +41,7 @@ open class Extension: Element { public var valueBoolean: FHIRBool? /// Value of extension. - public var valueCanonical: FHIRURL? + public var valueCanonical: FHIRCanonical? /// Value of extension. public var valueCode: FHIRString? @@ -190,7 +190,7 @@ open class Extension: Element { valueAttachment = createInstance(type: Attachment.self, for: "valueAttachment", in: json, context: &instCtx, owner: self) ?? valueAttachment valueBase64Binary = createInstance(type: Base64Binary.self, for: "valueBase64Binary", in: json, context: &instCtx, owner: self) ?? valueBase64Binary valueBoolean = createInstance(type: FHIRBool.self, for: "valueBoolean", in: json, context: &instCtx, owner: self) ?? valueBoolean - valueCanonical = createInstance(type: FHIRURL.self, for: "valueCanonical", in: json, context: &instCtx, owner: self) ?? valueCanonical + valueCanonical = createInstance(type: FHIRCanonical.self, for: "valueCanonical", in: json, context: &instCtx, owner: self) ?? valueCanonical valueCode = createInstance(type: FHIRString.self, for: "valueCode", in: json, context: &instCtx, owner: self) ?? valueCode valueCodeableConcept = createInstance(type: CodeableConcept.self, for: "valueCodeableConcept", in: json, context: &instCtx, owner: self) ?? valueCodeableConcept valueCoding = createInstance(type: Coding.self, for: "valueCoding", in: json, context: &instCtx, owner: self) ?? valueCoding diff --git a/Sources/Models/FHIRAbstractBase+Factory.swift b/Sources/Models/FHIRAbstractBase+Factory.swift index 85768aa8..3bdf51aa 100644 --- a/Sources/Models/FHIRAbstractBase+Factory.swift +++ b/Sources/Models/FHIRAbstractBase+Factory.swift @@ -2,7 +2,7 @@ // FHIRAbstractBase+Factory.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/FHIRBool.swift b/Sources/Models/FHIRBool.swift index f2f5330e..16d52367 100644 --- a/Sources/Models/FHIRBool.swift +++ b/Sources/Models/FHIRBool.swift @@ -115,8 +115,8 @@ extension FHIRBool: Equatable, Hashable { } - public var hashValue: Int { - return bool.hashValue - } + public func hash(into hasher: inout Hasher) { + hasher.combine(bool) + } } diff --git a/Sources/Models/FHIRCanonical.swift b/Sources/Models/FHIRCanonical.swift new file mode 100644 index 00000000..6a4ae2aa --- /dev/null +++ b/Sources/Models/FHIRCanonical.swift @@ -0,0 +1,117 @@ +// +// FHIRCanonical.swift +// SwiftFHIR +// +// Created by Dave Carlson on 05.06.2019. +// 2019, Dave Carlson +// + +import Foundation + + +/** +Struct to parse and hold the URL, version and fragment for FHIR canonical type. Extensions may contribute additional convenience functions. Use of the '|' version separator is not valid for general URI syntax, so it must be removed before saving 'url' part of the reference. + +The canonical URL serves as a stable logical identifier for the resource, and is the preferred way to reference a conformance or knowledge resource. The canonical URL SHOULD also resolve to the location where the master copy of the artifact is found, though it is not always possible to arrange this. The canonical URL SHALL NOT refer to some other resource (though it may resolve to a different version of the same resource). + +Canonical URIs may include a fragement, which occurs following the version. Thus, we must parse and retain the fragement, if present, for use when resolving references, e.g. from the FHIR specification: + + or, for contained resources: + +*/ +public struct FHIRCanonical: FHIRPrimitive, CustomStringConvertible { + + /// The actual url, optional if only fragment is included. + public var url: URL? + + /// An optional version suffix using '|' separator. + public var version: String? + + /// An optional fragment suffix using '#' separator. + public var fragment: String? + + /// An optional id of the element. + public var id: String? + + /// The parent/owner of the receiver, if any. Used to dereference resources. + public weak var _owner: FHIRAbstractBase? + + /// Optional extensions of the element. + public var extension_fhir: [Extension]? + + /// Returns true if the string is the empty string. + public var absoluteString: String? { + return url?.absoluteString + } + + + /** + Designated initializer. + + - parameter string: The URL represented by the receiver + - parameter version: Optional version string + - parameter fragment: Optional fragment string + */ + public init(_ url: URL, version: String? = nil, fragment: String? = nil) { + self.url = url + self.version = version + self.fragment = fragment + } + + /** + Convenience initializer. + + - parameter string: The URI string represented by the receiver + */ + public init?(_ string: String) { + let parts = string.components(separatedBy: "|") + let uri = parts.count > 0 ? parts[0] : nil + let version = parts.count > 1 ? parts[1] : nil + + guard let urlString = uri, let url = URL(string: urlString) else { + return nil + } + self.init(url, version: version) + } + + + // MARK: - FHIRJSONType + + public typealias JSONType = String + + public init(json: JSONType, owner: FHIRAbstractBase?, context: inout FHIRInstantiationContext) { + let fragmentParts = json.components(separatedBy: "#") + let urlParts = fragmentParts.count > 0 ? fragmentParts[0] : "" + let fragment = fragmentParts.count > 1 ? fragmentParts[1] : nil + + let versionParts = urlParts.components(separatedBy: "|") + let uri = versionParts.count > 0 ? versionParts[0] : nil + let version = versionParts.count > 1 ? versionParts[1] : nil + + if let urlString = uri, let url = URL(string: urlString) { + self.url = url + } + self.version = version + self.fragment = fragment + + if self.url == nil, self.fragment == nil { + context.addError(FHIRValidationError(key: "", problem: "“\(json)” is not a valid URI")) + url = URL(string: "error")! // empty string is invalid URL + } + _owner = owner + } + + public func asJSON(errors: inout [FHIRValidationError]) -> JSONType { + return self.description + } + + + // MARK: - CustomStringConvertible + + public var description: String { + return (url?.absoluteString ?? "") + (version != nil ? "|\(version!)" : "") + (fragment != nil ? "#\(fragment!)" : "") + } +} + + + diff --git a/Sources/Models/FHIRDecimal.swift b/Sources/Models/FHIRDecimal.swift index 413b6945..f7c8756b 100644 --- a/Sources/Models/FHIRDecimal.swift +++ b/Sources/Models/FHIRDecimal.swift @@ -59,7 +59,7 @@ public struct FHIRDecimal: FHIRPrimitive, LosslessStringConvertible, Expressible #if os(Linux) self.init(Decimal(json)) #else - if let _ = json.stringValue.index(of: ".") { + if let _ = json.stringValue.firstIndex(of: ".") { self.init(stringLiteral: String(format: "%.15g", json.doubleValue)) } else { diff --git a/Sources/Models/FHIRString.swift b/Sources/Models/FHIRString.swift index 58ce4b49..b46eddda 100644 --- a/Sources/Models/FHIRString.swift +++ b/Sources/Models/FHIRString.swift @@ -107,9 +107,9 @@ extension FHIRString: Equatable, Comparable, Hashable { } - public var hashValue: Int { - return string.hashValue - } + public func hash(into hasher: inout Hasher) { + hasher.combine(string) + } } diff --git a/Sources/Models/FamilyMemberHistory.swift b/Sources/Models/FamilyMemberHistory.swift index b29e20b7..b740e4eb 100644 --- a/Sources/Models/FamilyMemberHistory.swift +++ b/Sources/Models/FamilyMemberHistory.swift @@ -2,7 +2,7 @@ // FamilyMemberHistory.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/FamilyMemberHistory) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/FamilyMemberHistory) on 2019-05-21. // 2019, SMART Health IT. // @@ -68,7 +68,7 @@ open class FamilyMemberHistory: DomainResource { public var identifier: [Identifier]? /// Instantiates FHIR protocol or definition. - public var instantiatesCanonical: [FHIRURL]? + public var instantiatesCanonical: [FHIRCanonical]? /// Instantiates external protocol or definition. public var instantiatesUri: [FHIRURL]? @@ -126,7 +126,7 @@ open class FamilyMemberHistory: DomainResource { deceasedString = createInstance(type: FHIRString.self, for: "deceasedString", in: json, context: &instCtx, owner: self) ?? deceasedString estimatedAge = createInstance(type: FHIRBool.self, for: "estimatedAge", in: json, context: &instCtx, owner: self) ?? estimatedAge identifier = createInstances(of: Identifier.self, for: "identifier", in: json, context: &instCtx, owner: self) ?? identifier - instantiatesCanonical = createInstances(of: FHIRURL.self, for: "instantiatesCanonical", in: json, context: &instCtx, owner: self) ?? instantiatesCanonical + instantiatesCanonical = createInstances(of: FHIRCanonical.self, for: "instantiatesCanonical", in: json, context: &instCtx, owner: self) ?? instantiatesCanonical instantiatesUri = createInstances(of: FHIRURL.self, for: "instantiatesUri", in: json, context: &instCtx, owner: self) ?? instantiatesUri name = createInstance(type: FHIRString.self, for: "name", in: json, context: &instCtx, owner: self) ?? name note = createInstances(of: Annotation.self, for: "note", in: json, context: &instCtx, owner: self) ?? note diff --git a/Sources/Models/Flag.swift b/Sources/Models/Flag.swift index bb76b423..29b13536 100644 --- a/Sources/Models/Flag.swift +++ b/Sources/Models/Flag.swift @@ -2,7 +2,7 @@ // Flag.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Flag) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Flag) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Goal.swift b/Sources/Models/Goal.swift index 9f7c5042..42cebe66 100644 --- a/Sources/Models/Goal.swift +++ b/Sources/Models/Goal.swift @@ -2,7 +2,7 @@ // Goal.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Goal) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Goal) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/GraphDefinition.swift b/Sources/Models/GraphDefinition.swift index b7be811c..d95ace4b 100644 --- a/Sources/Models/GraphDefinition.swift +++ b/Sources/Models/GraphDefinition.swift @@ -2,7 +2,7 @@ // GraphDefinition.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/GraphDefinition) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/GraphDefinition) on 2019-05-21. // 2019, SMART Health IT. // @@ -42,7 +42,7 @@ open class GraphDefinition: DomainResource { public var name: FHIRString? /// Profile on base resource. - public var profile: FHIRURL? + public var profile: FHIRCanonical? /// Name of the publisher (organization or individual). public var publisher: FHIRString? @@ -88,7 +88,7 @@ open class GraphDefinition: DomainResource { if nil == name && !instCtx.containsKey("name") { instCtx.addError(FHIRValidationError(missing: "name")) } - profile = createInstance(type: FHIRURL.self, for: "profile", in: json, context: &instCtx, owner: self) ?? profile + profile = createInstance(type: FHIRCanonical.self, for: "profile", in: json, context: &instCtx, owner: self) ?? profile publisher = createInstance(type: FHIRString.self, for: "publisher", in: json, context: &instCtx, owner: self) ?? publisher purpose = createInstance(type: FHIRString.self, for: "purpose", in: json, context: &instCtx, owner: self) ?? purpose start = createEnum(type: ResourceType.self, for: "start", in: json, context: &instCtx) ?? start @@ -204,7 +204,7 @@ open class GraphDefinitionLinkTarget: BackboneElement { public var params: FHIRString? /// Profile for the target resource. - public var profile: FHIRURL? + public var profile: FHIRCanonical? /// None public var type: ResourceType? @@ -223,7 +223,7 @@ open class GraphDefinitionLinkTarget: BackboneElement { compartment = createInstances(of: GraphDefinitionLinkTargetCompartment.self, for: "compartment", in: json, context: &instCtx, owner: self) ?? compartment link = createInstances(of: GraphDefinitionLink.self, for: "link", in: json, context: &instCtx, owner: self) ?? link params = createInstance(type: FHIRString.self, for: "params", in: json, context: &instCtx, owner: self) ?? params - profile = createInstance(type: FHIRURL.self, for: "profile", in: json, context: &instCtx, owner: self) ?? profile + profile = createInstance(type: FHIRCanonical.self, for: "profile", in: json, context: &instCtx, owner: self) ?? profile type = createEnum(type: ResourceType.self, for: "type", in: json, context: &instCtx) ?? type if nil == type && !instCtx.containsKey("type") { instCtx.addError(FHIRValidationError(missing: "type")) diff --git a/Sources/Models/Group.swift b/Sources/Models/Group.swift index 1d711e86..8e10a28f 100644 --- a/Sources/Models/Group.swift +++ b/Sources/Models/Group.swift @@ -2,7 +2,7 @@ // Group.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Group) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Group) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/GuidanceResponse.swift b/Sources/Models/GuidanceResponse.swift index 0913fe78..7a54f586 100644 --- a/Sources/Models/GuidanceResponse.swift +++ b/Sources/Models/GuidanceResponse.swift @@ -2,7 +2,7 @@ // GuidanceResponse.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/GuidanceResponse) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/GuidanceResponse) on 2019-05-21. // 2019, SMART Health IT. // @@ -33,7 +33,7 @@ open class GuidanceResponse: DomainResource { public var identifier: [Identifier]? /// What guidance was requested. - public var moduleCanonical: FHIRURL? + public var moduleCanonical: FHIRCanonical? /// What guidance was requested. public var moduleCodeableConcept: CodeableConcept? @@ -83,7 +83,7 @@ open class GuidanceResponse: DomainResource { if let value = module as? FHIRURL { self.moduleUri = value } - else if let value = module as? FHIRURL { + else if let value = module as? FHIRCanonical { self.moduleCanonical = value } else if let value = module as? CodeableConcept { @@ -103,7 +103,7 @@ open class GuidanceResponse: DomainResource { encounter = createInstance(type: Reference.self, for: "encounter", in: json, context: &instCtx, owner: self) ?? encounter evaluationMessage = createInstances(of: Reference.self, for: "evaluationMessage", in: json, context: &instCtx, owner: self) ?? evaluationMessage identifier = createInstances(of: Identifier.self, for: "identifier", in: json, context: &instCtx, owner: self) ?? identifier - moduleCanonical = createInstance(type: FHIRURL.self, for: "moduleCanonical", in: json, context: &instCtx, owner: self) ?? moduleCanonical + moduleCanonical = createInstance(type: FHIRCanonical.self, for: "moduleCanonical", in: json, context: &instCtx, owner: self) ?? moduleCanonical moduleCodeableConcept = createInstance(type: CodeableConcept.self, for: "moduleCodeableConcept", in: json, context: &instCtx, owner: self) ?? moduleCodeableConcept moduleUri = createInstance(type: FHIRURL.self, for: "moduleUri", in: json, context: &instCtx, owner: self) ?? moduleUri note = createInstances(of: Annotation.self, for: "note", in: json, context: &instCtx, owner: self) ?? note diff --git a/Sources/Models/HealthcareService.swift b/Sources/Models/HealthcareService.swift index 95c6ef18..0ebb5ed9 100644 --- a/Sources/Models/HealthcareService.swift +++ b/Sources/Models/HealthcareService.swift @@ -2,7 +2,7 @@ // HealthcareService.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/HealthcareService) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/HealthcareService) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/HumanName.swift b/Sources/Models/HumanName.swift index 85dae505..8478e9e3 100644 --- a/Sources/Models/HumanName.swift +++ b/Sources/Models/HumanName.swift @@ -2,7 +2,7 @@ // HumanName.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/HumanName) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/HumanName) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Identifier.swift b/Sources/Models/Identifier.swift index bbabc0ba..48031656 100644 --- a/Sources/Models/Identifier.swift +++ b/Sources/Models/Identifier.swift @@ -2,7 +2,7 @@ // Identifier.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Identifier) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Identifier) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/ImagingStudy.swift b/Sources/Models/ImagingStudy.swift index 03ecfbdb..a63640ec 100644 --- a/Sources/Models/ImagingStudy.swift +++ b/Sources/Models/ImagingStudy.swift @@ -2,7 +2,7 @@ // ImagingStudy.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ImagingStudy) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ImagingStudy) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Immunization.swift b/Sources/Models/Immunization.swift index 376e05b3..15785850 100644 --- a/Sources/Models/Immunization.swift +++ b/Sources/Models/Immunization.swift @@ -2,7 +2,7 @@ // Immunization.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Immunization) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Immunization) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/ImmunizationEvaluation.swift b/Sources/Models/ImmunizationEvaluation.swift index dd914c19..00af6b5d 100644 --- a/Sources/Models/ImmunizationEvaluation.swift +++ b/Sources/Models/ImmunizationEvaluation.swift @@ -2,7 +2,7 @@ // ImmunizationEvaluation.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ImmunizationEvaluation) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ImmunizationEvaluation) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/ImmunizationRecommendation.swift b/Sources/Models/ImmunizationRecommendation.swift index 7e4c2bcf..9631a3d5 100644 --- a/Sources/Models/ImmunizationRecommendation.swift +++ b/Sources/Models/ImmunizationRecommendation.swift @@ -2,7 +2,7 @@ // ImmunizationRecommendation.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ImmunizationRecommendation) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ImmunizationRecommendation) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/ImplementationGuide.swift b/Sources/Models/ImplementationGuide.swift index 435dba78..2f18acaa 100644 --- a/Sources/Models/ImplementationGuide.swift +++ b/Sources/Models/ImplementationGuide.swift @@ -2,7 +2,7 @@ // ImplementationGuide.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ImplementationGuide) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ImplementationGuide) on 2019-05-21. // 2019, SMART Health IT. // @@ -439,7 +439,7 @@ open class ImplementationGuideDefinitionResource: BackboneElement { public var exampleBoolean: FHIRBool? /// Is an example/What is this an example of?. - public var exampleCanonical: FHIRURL? + public var exampleCanonical: FHIRCanonical? /// Versions this applies to (if different to IG). public var fhirVersion: [FHIRString]? @@ -466,7 +466,7 @@ open class ImplementationGuideDefinitionResource: BackboneElement { description_fhir = createInstance(type: FHIRString.self, for: "description", in: json, context: &instCtx, owner: self) ?? description_fhir exampleBoolean = createInstance(type: FHIRBool.self, for: "exampleBoolean", in: json, context: &instCtx, owner: self) ?? exampleBoolean - exampleCanonical = createInstance(type: FHIRURL.self, for: "exampleCanonical", in: json, context: &instCtx, owner: self) ?? exampleCanonical + exampleCanonical = createInstance(type: FHIRCanonical.self, for: "exampleCanonical", in: json, context: &instCtx, owner: self) ?? exampleCanonical fhirVersion = createInstances(of: FHIRString.self, for: "fhirVersion", in: json, context: &instCtx, owner: self) ?? fhirVersion groupingId = createInstance(type: FHIRString.self, for: "groupingId", in: json, context: &instCtx, owner: self) ?? groupingId name = createInstance(type: FHIRString.self, for: "name", in: json, context: &instCtx, owner: self) ?? name @@ -564,14 +564,14 @@ open class ImplementationGuideDependsOn: BackboneElement { public var packageId: FHIRString? /// Identity of the IG that this depends on. - public var uri: FHIRURL? + public var uri: FHIRCanonical? /// Version of the IG. public var version: FHIRString? /** Convenience initializer, taking all required properties as arguments. */ - public convenience init(uri: FHIRURL) { + public convenience init(uri: FHIRCanonical) { self.init() self.uri = uri } @@ -581,7 +581,7 @@ open class ImplementationGuideDependsOn: BackboneElement { super.populate(from: json, context: &instCtx) packageId = createInstance(type: FHIRString.self, for: "packageId", in: json, context: &instCtx, owner: self) ?? packageId - uri = createInstance(type: FHIRURL.self, for: "uri", in: json, context: &instCtx, owner: self) ?? uri + uri = createInstance(type: FHIRCanonical.self, for: "uri", in: json, context: &instCtx, owner: self) ?? uri if nil == uri && !instCtx.containsKey("uri") { instCtx.addError(FHIRValidationError(missing: "uri")) } @@ -612,14 +612,14 @@ open class ImplementationGuideGlobal: BackboneElement { } /// Profile that all resources must conform to. - public var profile: FHIRURL? + public var profile: FHIRCanonical? /// The type of resource that all instances must conform to. public var type: ResourceType? /** Convenience initializer, taking all required properties as arguments. */ - public convenience init(profile: FHIRURL, type: ResourceType) { + public convenience init(profile: FHIRCanonical, type: ResourceType) { self.init() self.profile = profile self.type = type @@ -629,7 +629,7 @@ open class ImplementationGuideGlobal: BackboneElement { override open func populate(from json: FHIRJSON, context instCtx: inout FHIRInstantiationContext) { super.populate(from: json, context: &instCtx) - profile = createInstance(type: FHIRURL.self, for: "profile", in: json, context: &instCtx, owner: self) ?? profile + profile = createInstance(type: FHIRCanonical.self, for: "profile", in: json, context: &instCtx, owner: self) ?? profile if nil == profile && !instCtx.containsKey("profile") { instCtx.addError(FHIRValidationError(missing: "profile")) } @@ -781,7 +781,7 @@ open class ImplementationGuideManifestResource: BackboneElement { public var exampleBoolean: FHIRBool? /// Is an example/What is this an example of?. - public var exampleCanonical: FHIRURL? + public var exampleCanonical: FHIRCanonical? /// Location of the resource. public var reference: Reference? @@ -801,7 +801,7 @@ open class ImplementationGuideManifestResource: BackboneElement { super.populate(from: json, context: &instCtx) exampleBoolean = createInstance(type: FHIRBool.self, for: "exampleBoolean", in: json, context: &instCtx, owner: self) ?? exampleBoolean - exampleCanonical = createInstance(type: FHIRURL.self, for: "exampleCanonical", in: json, context: &instCtx, owner: self) ?? exampleCanonical + exampleCanonical = createInstance(type: FHIRCanonical.self, for: "exampleCanonical", in: json, context: &instCtx, owner: self) ?? exampleCanonical reference = createInstance(type: Reference.self, for: "reference", in: json, context: &instCtx, owner: self) ?? reference if nil == reference && !instCtx.containsKey("reference") { instCtx.addError(FHIRValidationError(missing: "reference")) diff --git a/Sources/Models/InsurancePlan.swift b/Sources/Models/InsurancePlan.swift index 80e7be05..812a2643 100644 --- a/Sources/Models/InsurancePlan.swift +++ b/Sources/Models/InsurancePlan.swift @@ -2,7 +2,7 @@ // InsurancePlan.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/InsurancePlan) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/InsurancePlan) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Invoice.swift b/Sources/Models/Invoice.swift index 1fca578c..e855701b 100644 --- a/Sources/Models/Invoice.swift +++ b/Sources/Models/Invoice.swift @@ -2,7 +2,7 @@ // Invoice.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Invoice) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Invoice) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Library.swift b/Sources/Models/Library.swift index 25482e65..afe2f8ce 100644 --- a/Sources/Models/Library.swift +++ b/Sources/Models/Library.swift @@ -2,7 +2,7 @@ // Library.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Library) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Library) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Linkage.swift b/Sources/Models/Linkage.swift index fb11c450..b195fe95 100644 --- a/Sources/Models/Linkage.swift +++ b/Sources/Models/Linkage.swift @@ -2,7 +2,7 @@ // Linkage.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Linkage) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Linkage) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/List.swift b/Sources/Models/List.swift index bf8774e3..c735032c 100644 --- a/Sources/Models/List.swift +++ b/Sources/Models/List.swift @@ -2,7 +2,7 @@ // List.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/List) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/List) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Location.swift b/Sources/Models/Location.swift index 07594532..2328c64f 100644 --- a/Sources/Models/Location.swift +++ b/Sources/Models/Location.swift @@ -2,7 +2,7 @@ // Location.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Location) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Location) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/MarketingStatus.swift b/Sources/Models/MarketingStatus.swift index d801ba41..be77bafd 100644 --- a/Sources/Models/MarketingStatus.swift +++ b/Sources/Models/MarketingStatus.swift @@ -2,7 +2,7 @@ // MarketingStatus.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MarketingStatus) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MarketingStatus) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Measure.swift b/Sources/Models/Measure.swift index 9343b992..7775a66d 100644 --- a/Sources/Models/Measure.swift +++ b/Sources/Models/Measure.swift @@ -2,7 +2,7 @@ // Measure.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Measure) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Measure) on 2019-05-21. // 2019, SMART Health IT. // @@ -80,7 +80,7 @@ open class Measure: DomainResource { public var lastReviewDate: FHIRDate? /// Logic used by the measure. - public var library: [FHIRURL]? + public var library: [FHIRCanonical]? /// Name for this measure (computer friendly). public var name: FHIRString? @@ -176,7 +176,7 @@ open class Measure: DomainResource { improvementNotation = createInstance(type: CodeableConcept.self, for: "improvementNotation", in: json, context: &instCtx, owner: self) ?? improvementNotation jurisdiction = createInstances(of: CodeableConcept.self, for: "jurisdiction", in: json, context: &instCtx, owner: self) ?? jurisdiction lastReviewDate = createInstance(type: FHIRDate.self, for: "lastReviewDate", in: json, context: &instCtx, owner: self) ?? lastReviewDate - library = createInstances(of: FHIRURL.self, for: "library", in: json, context: &instCtx, owner: self) ?? library + library = createInstances(of: FHIRCanonical.self, for: "library", in: json, context: &instCtx, owner: self) ?? library name = createInstance(type: FHIRString.self, for: "name", in: json, context: &instCtx, owner: self) ?? name publisher = createInstance(type: FHIRString.self, for: "publisher", in: json, context: &instCtx, owner: self) ?? publisher purpose = createInstance(type: FHIRString.self, for: "purpose", in: json, context: &instCtx, owner: self) ?? purpose diff --git a/Sources/Models/MeasureReport.swift b/Sources/Models/MeasureReport.swift index 56df3ed4..52c84bf0 100644 --- a/Sources/Models/MeasureReport.swift +++ b/Sources/Models/MeasureReport.swift @@ -2,7 +2,7 @@ // MeasureReport.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MeasureReport) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MeasureReport) on 2019-05-21. // 2019, SMART Health IT. // @@ -36,7 +36,7 @@ open class MeasureReport: DomainResource { public var improvementNotation: CodeableConcept? /// What measure was calculated. - public var measure: FHIRURL? + public var measure: FHIRCanonical? /// What period the report covers. public var period: Period? @@ -59,7 +59,7 @@ open class MeasureReport: DomainResource { /** Convenience initializer, taking all required properties as arguments. */ - public convenience init(measure: FHIRURL, period: Period, status: MeasureReportStatus, type: MeasureReportType) { + public convenience init(measure: FHIRCanonical, period: Period, status: MeasureReportStatus, type: MeasureReportType) { self.init() self.measure = measure self.period = period @@ -76,7 +76,7 @@ open class MeasureReport: DomainResource { group = createInstances(of: MeasureReportGroup.self, for: "group", in: json, context: &instCtx, owner: self) ?? group identifier = createInstances(of: Identifier.self, for: "identifier", in: json, context: &instCtx, owner: self) ?? identifier improvementNotation = createInstance(type: CodeableConcept.self, for: "improvementNotation", in: json, context: &instCtx, owner: self) ?? improvementNotation - measure = createInstance(type: FHIRURL.self, for: "measure", in: json, context: &instCtx, owner: self) ?? measure + measure = createInstance(type: FHIRCanonical.self, for: "measure", in: json, context: &instCtx, owner: self) ?? measure if nil == measure && !instCtx.containsKey("measure") { instCtx.addError(FHIRValidationError(missing: "measure")) } diff --git a/Sources/Models/Media.swift b/Sources/Models/Media.swift index c013086c..41fb4e0e 100644 --- a/Sources/Models/Media.swift +++ b/Sources/Models/Media.swift @@ -2,7 +2,7 @@ // Media.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Media) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Media) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Medication.swift b/Sources/Models/Medication.swift index 2e0946c3..5bb99b47 100644 --- a/Sources/Models/Medication.swift +++ b/Sources/Models/Medication.swift @@ -2,7 +2,7 @@ // Medication.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Medication) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Medication) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/MedicationAdministration.swift b/Sources/Models/MedicationAdministration.swift index 015b598e..b07310a6 100644 --- a/Sources/Models/MedicationAdministration.swift +++ b/Sources/Models/MedicationAdministration.swift @@ -2,7 +2,7 @@ // MedicationAdministration.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicationAdministration) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicationAdministration) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/MedicationDispense.swift b/Sources/Models/MedicationDispense.swift index 8e9ca8b5..b01ef61b 100644 --- a/Sources/Models/MedicationDispense.swift +++ b/Sources/Models/MedicationDispense.swift @@ -2,7 +2,7 @@ // MedicationDispense.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicationDispense) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicationDispense) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/MedicationKnowledge.swift b/Sources/Models/MedicationKnowledge.swift index 1024ed9b..0003e636 100644 --- a/Sources/Models/MedicationKnowledge.swift +++ b/Sources/Models/MedicationKnowledge.swift @@ -2,7 +2,7 @@ // MedicationKnowledge.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicationKnowledge) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicationKnowledge) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/MedicationRequest.swift b/Sources/Models/MedicationRequest.swift index d655f2a6..65bd3496 100644 --- a/Sources/Models/MedicationRequest.swift +++ b/Sources/Models/MedicationRequest.swift @@ -2,7 +2,7 @@ // MedicationRequest.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicationRequest) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicationRequest) on 2019-05-21. // 2019, SMART Health IT. // @@ -59,7 +59,7 @@ open class MedicationRequest: DomainResource { public var identifier: [Identifier]? /// Instantiates FHIR protocol or definition. - public var instantiatesCanonical: [FHIRURL]? + public var instantiatesCanonical: [FHIRCanonical]? /// Instantiates external protocol or definition. public var instantiatesUri: [FHIRURL]? @@ -158,7 +158,7 @@ open class MedicationRequest: DomainResource { eventHistory = createInstances(of: Reference.self, for: "eventHistory", in: json, context: &instCtx, owner: self) ?? eventHistory groupIdentifier = createInstance(type: Identifier.self, for: "groupIdentifier", in: json, context: &instCtx, owner: self) ?? groupIdentifier identifier = createInstances(of: Identifier.self, for: "identifier", in: json, context: &instCtx, owner: self) ?? identifier - instantiatesCanonical = createInstances(of: FHIRURL.self, for: "instantiatesCanonical", in: json, context: &instCtx, owner: self) ?? instantiatesCanonical + instantiatesCanonical = createInstances(of: FHIRCanonical.self, for: "instantiatesCanonical", in: json, context: &instCtx, owner: self) ?? instantiatesCanonical instantiatesUri = createInstances(of: FHIRURL.self, for: "instantiatesUri", in: json, context: &instCtx, owner: self) ?? instantiatesUri insurance = createInstances(of: Reference.self, for: "insurance", in: json, context: &instCtx, owner: self) ?? insurance intent = createEnum(type: MedicationRequestIntent.self, for: "intent", in: json, context: &instCtx) ?? intent diff --git a/Sources/Models/MedicationStatement.swift b/Sources/Models/MedicationStatement.swift index 8071e050..53ca5490 100644 --- a/Sources/Models/MedicationStatement.swift +++ b/Sources/Models/MedicationStatement.swift @@ -2,7 +2,7 @@ // MedicationStatement.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicationStatement) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicationStatement) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/MedicinalProduct.swift b/Sources/Models/MedicinalProduct.swift index 36e1a0d3..53069e34 100644 --- a/Sources/Models/MedicinalProduct.swift +++ b/Sources/Models/MedicinalProduct.swift @@ -2,7 +2,7 @@ // MedicinalProduct.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicinalProduct) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicinalProduct) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/MedicinalProductAuthorization.swift b/Sources/Models/MedicinalProductAuthorization.swift index eb58e48f..626ba25b 100644 --- a/Sources/Models/MedicinalProductAuthorization.swift +++ b/Sources/Models/MedicinalProductAuthorization.swift @@ -2,7 +2,7 @@ // MedicinalProductAuthorization.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicinalProductAuthorization) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicinalProductAuthorization) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/MedicinalProductContraindication.swift b/Sources/Models/MedicinalProductContraindication.swift index 5fc3abd5..228c5d69 100644 --- a/Sources/Models/MedicinalProductContraindication.swift +++ b/Sources/Models/MedicinalProductContraindication.swift @@ -2,7 +2,7 @@ // MedicinalProductContraindication.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicinalProductContraindication) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicinalProductContraindication) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/MedicinalProductIndication.swift b/Sources/Models/MedicinalProductIndication.swift index d3840d6a..f13e0772 100644 --- a/Sources/Models/MedicinalProductIndication.swift +++ b/Sources/Models/MedicinalProductIndication.swift @@ -2,7 +2,7 @@ // MedicinalProductIndication.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicinalProductIndication) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicinalProductIndication) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/MedicinalProductIngredient.swift b/Sources/Models/MedicinalProductIngredient.swift index d8223e7f..c5d43c91 100644 --- a/Sources/Models/MedicinalProductIngredient.swift +++ b/Sources/Models/MedicinalProductIngredient.swift @@ -2,7 +2,7 @@ // MedicinalProductIngredient.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicinalProductIngredient) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicinalProductIngredient) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/MedicinalProductInteraction.swift b/Sources/Models/MedicinalProductInteraction.swift index 5a617e13..35f3b960 100644 --- a/Sources/Models/MedicinalProductInteraction.swift +++ b/Sources/Models/MedicinalProductInteraction.swift @@ -2,7 +2,7 @@ // MedicinalProductInteraction.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicinalProductInteraction) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicinalProductInteraction) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/MedicinalProductManufactured.swift b/Sources/Models/MedicinalProductManufactured.swift index 8f59533e..cbfab79d 100644 --- a/Sources/Models/MedicinalProductManufactured.swift +++ b/Sources/Models/MedicinalProductManufactured.swift @@ -2,7 +2,7 @@ // MedicinalProductManufactured.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicinalProductManufactured) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicinalProductManufactured) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/MedicinalProductPackaged.swift b/Sources/Models/MedicinalProductPackaged.swift index 156a3d49..3d2018bf 100644 --- a/Sources/Models/MedicinalProductPackaged.swift +++ b/Sources/Models/MedicinalProductPackaged.swift @@ -2,7 +2,7 @@ // MedicinalProductPackaged.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicinalProductPackaged) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicinalProductPackaged) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/MedicinalProductPharmaceutical.swift b/Sources/Models/MedicinalProductPharmaceutical.swift index 64ddf7b2..196d95f3 100644 --- a/Sources/Models/MedicinalProductPharmaceutical.swift +++ b/Sources/Models/MedicinalProductPharmaceutical.swift @@ -2,7 +2,7 @@ // MedicinalProductPharmaceutical.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicinalProductPharmaceutical) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicinalProductPharmaceutical) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/MedicinalProductUndesirableEffect.swift b/Sources/Models/MedicinalProductUndesirableEffect.swift index e32bf4d7..1040ccc6 100644 --- a/Sources/Models/MedicinalProductUndesirableEffect.swift +++ b/Sources/Models/MedicinalProductUndesirableEffect.swift @@ -2,7 +2,7 @@ // MedicinalProductUndesirableEffect.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicinalProductUndesirableEffect) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MedicinalProductUndesirableEffect) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/MessageDefinition.swift b/Sources/Models/MessageDefinition.swift index 8830ce3a..0ec40a57 100644 --- a/Sources/Models/MessageDefinition.swift +++ b/Sources/Models/MessageDefinition.swift @@ -2,7 +2,7 @@ // MessageDefinition.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MessageDefinition) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MessageDefinition) on 2019-05-21. // 2019, SMART Health IT. // @@ -24,7 +24,7 @@ open class MessageDefinition: DomainResource { public var allowedResponse: [MessageDefinitionAllowedResponse]? /// Definition this one is based on. - public var base: FHIRURL? + public var base: FHIRCanonical? /// The impact of the content of the message. public var category: MessageSignificanceCategory? @@ -54,7 +54,7 @@ open class MessageDefinition: DomainResource { public var focus: [MessageDefinitionFocus]? /// Canonical reference to a GraphDefinition. - public var graph: [FHIRURL]? + public var graph: [FHIRCanonical]? /// Primary key for the message definition on a given server. public var identifier: [Identifier]? @@ -66,7 +66,7 @@ open class MessageDefinition: DomainResource { public var name: FHIRString? /// Protocol/workflow this is part of. - public var parent: [FHIRURL]? + public var parent: [FHIRCanonical]? /// Name of the publisher (organization or individual). public var publisher: FHIRString? @@ -75,7 +75,7 @@ open class MessageDefinition: DomainResource { public var purpose: FHIRString? /// Takes the place of. - public var replaces: [FHIRURL]? + public var replaces: [FHIRCanonical]? /// Declare at a message definition level whether a response is required or only upon error or success, or never. public var responseRequired: MessageheaderResponseRequest? @@ -117,7 +117,7 @@ open class MessageDefinition: DomainResource { super.populate(from: json, context: &instCtx) allowedResponse = createInstances(of: MessageDefinitionAllowedResponse.self, for: "allowedResponse", in: json, context: &instCtx, owner: self) ?? allowedResponse - base = createInstance(type: FHIRURL.self, for: "base", in: json, context: &instCtx, owner: self) ?? base + base = createInstance(type: FHIRCanonical.self, for: "base", in: json, context: &instCtx, owner: self) ?? base category = createEnum(type: MessageSignificanceCategory.self, for: "category", in: json, context: &instCtx) ?? category contact = createInstances(of: ContactDetail.self, for: "contact", in: json, context: &instCtx, owner: self) ?? contact copyright = createInstance(type: FHIRString.self, for: "copyright", in: json, context: &instCtx, owner: self) ?? copyright @@ -130,14 +130,14 @@ open class MessageDefinition: DomainResource { eventUri = createInstance(type: FHIRURL.self, for: "eventUri", in: json, context: &instCtx, owner: self) ?? eventUri experimental = createInstance(type: FHIRBool.self, for: "experimental", in: json, context: &instCtx, owner: self) ?? experimental focus = createInstances(of: MessageDefinitionFocus.self, for: "focus", in: json, context: &instCtx, owner: self) ?? focus - graph = createInstances(of: FHIRURL.self, for: "graph", in: json, context: &instCtx, owner: self) ?? graph + graph = createInstances(of: FHIRCanonical.self, for: "graph", in: json, context: &instCtx, owner: self) ?? graph identifier = createInstances(of: Identifier.self, for: "identifier", in: json, context: &instCtx, owner: self) ?? identifier jurisdiction = createInstances(of: CodeableConcept.self, for: "jurisdiction", in: json, context: &instCtx, owner: self) ?? jurisdiction name = createInstance(type: FHIRString.self, for: "name", in: json, context: &instCtx, owner: self) ?? name - parent = createInstances(of: FHIRURL.self, for: "parent", in: json, context: &instCtx, owner: self) ?? parent + parent = createInstances(of: FHIRCanonical.self, for: "parent", in: json, context: &instCtx, owner: self) ?? parent publisher = createInstance(type: FHIRString.self, for: "publisher", in: json, context: &instCtx, owner: self) ?? publisher purpose = createInstance(type: FHIRString.self, for: "purpose", in: json, context: &instCtx, owner: self) ?? purpose - replaces = createInstances(of: FHIRURL.self, for: "replaces", in: json, context: &instCtx, owner: self) ?? replaces + replaces = createInstances(of: FHIRCanonical.self, for: "replaces", in: json, context: &instCtx, owner: self) ?? replaces responseRequired = createEnum(type: MessageheaderResponseRequest.self, for: "responseRequired", in: json, context: &instCtx) ?? responseRequired status = createEnum(type: PublicationStatus.self, for: "status", in: json, context: &instCtx) ?? status if nil == status && !instCtx.containsKey("status") { @@ -209,14 +209,14 @@ open class MessageDefinitionAllowedResponse: BackboneElement { } /// Reference to allowed message definition response. - public var message: FHIRURL? + public var message: FHIRCanonical? /// When should this response be used. public var situation: FHIRString? /** Convenience initializer, taking all required properties as arguments. */ - public convenience init(message: FHIRURL) { + public convenience init(message: FHIRCanonical) { self.init() self.message = message } @@ -225,7 +225,7 @@ open class MessageDefinitionAllowedResponse: BackboneElement { override open func populate(from json: FHIRJSON, context instCtx: inout FHIRInstantiationContext) { super.populate(from: json, context: &instCtx) - message = createInstance(type: FHIRURL.self, for: "message", in: json, context: &instCtx, owner: self) ?? message + message = createInstance(type: FHIRCanonical.self, for: "message", in: json, context: &instCtx, owner: self) ?? message if nil == message && !instCtx.containsKey("message") { instCtx.addError(FHIRValidationError(missing: "message")) } @@ -265,7 +265,7 @@ open class MessageDefinitionFocus: BackboneElement { public var min: FHIRInteger? /// Profile that must be adhered to by focus. - public var profile: FHIRURL? + public var profile: FHIRCanonical? /** Convenience initializer, taking all required properties as arguments. */ @@ -288,7 +288,7 @@ open class MessageDefinitionFocus: BackboneElement { if nil == min && !instCtx.containsKey("min") { instCtx.addError(FHIRValidationError(missing: "min")) } - profile = createInstance(type: FHIRURL.self, for: "profile", in: json, context: &instCtx, owner: self) ?? profile + profile = createInstance(type: FHIRCanonical.self, for: "profile", in: json, context: &instCtx, owner: self) ?? profile } override open func decorate(json: inout FHIRJSON, errors: inout [FHIRValidationError]) { diff --git a/Sources/Models/MessageHeader.swift b/Sources/Models/MessageHeader.swift index 7902a32a..fd3262f7 100644 --- a/Sources/Models/MessageHeader.swift +++ b/Sources/Models/MessageHeader.swift @@ -2,7 +2,7 @@ // MessageHeader.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MessageHeader) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MessageHeader) on 2019-05-21. // 2019, SMART Health IT. // @@ -25,7 +25,7 @@ open class MessageHeader: DomainResource { public var author: Reference? /// Link to the definition for this message. - public var definition: FHIRURL? + public var definition: FHIRCanonical? /// Message destination application(s). public var destination: [MessageHeaderDestination]? @@ -78,7 +78,7 @@ open class MessageHeader: DomainResource { super.populate(from: json, context: &instCtx) author = createInstance(type: Reference.self, for: "author", in: json, context: &instCtx, owner: self) ?? author - definition = createInstance(type: FHIRURL.self, for: "definition", in: json, context: &instCtx, owner: self) ?? definition + definition = createInstance(type: FHIRCanonical.self, for: "definition", in: json, context: &instCtx, owner: self) ?? definition destination = createInstances(of: MessageHeaderDestination.self, for: "destination", in: json, context: &instCtx, owner: self) ?? destination enterer = createInstance(type: Reference.self, for: "enterer", in: json, context: &instCtx, owner: self) ?? enterer eventCoding = createInstance(type: Coding.self, for: "eventCoding", in: json, context: &instCtx, owner: self) ?? eventCoding diff --git a/Sources/Models/Meta.swift b/Sources/Models/Meta.swift index 702752c1..727d4853 100644 --- a/Sources/Models/Meta.swift +++ b/Sources/Models/Meta.swift @@ -2,7 +2,7 @@ // Meta.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Meta) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Meta) on 2019-05-21. // 2019, SMART Health IT. // @@ -24,7 +24,7 @@ open class Meta: Element { public var lastUpdated: Instant? /// Profiles this resource claims to conform to. - public var profile: [FHIRURL]? + public var profile: [FHIRCanonical]? /// Security Labels applied to this resource. public var security: [Coding]? @@ -43,7 +43,7 @@ open class Meta: Element { super.populate(from: json, context: &instCtx) lastUpdated = createInstance(type: Instant.self, for: "lastUpdated", in: json, context: &instCtx, owner: self) ?? lastUpdated - profile = createInstances(of: FHIRURL.self, for: "profile", in: json, context: &instCtx, owner: self) ?? profile + profile = createInstances(of: FHIRCanonical.self, for: "profile", in: json, context: &instCtx, owner: self) ?? profile security = createInstances(of: Coding.self, for: "security", in: json, context: &instCtx, owner: self) ?? security source = createInstance(type: FHIRURL.self, for: "source", in: json, context: &instCtx, owner: self) ?? source tag = createInstances(of: Coding.self, for: "tag", in: json, context: &instCtx, owner: self) ?? tag diff --git a/Sources/Models/MetadataResource.swift b/Sources/Models/MetadataResource.swift index 9ff1d62e..85b721e2 100644 --- a/Sources/Models/MetadataResource.swift +++ b/Sources/Models/MetadataResource.swift @@ -2,7 +2,7 @@ // MetadataResource.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MetadataResource) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MetadataResource) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/MolecularSequence.swift b/Sources/Models/MolecularSequence.swift index 8221780f..4ef60039 100644 --- a/Sources/Models/MolecularSequence.swift +++ b/Sources/Models/MolecularSequence.swift @@ -2,7 +2,7 @@ // MolecularSequence.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MolecularSequence) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MolecularSequence) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Money.swift b/Sources/Models/Money.swift index 2c330d37..aeba2765 100644 --- a/Sources/Models/Money.swift +++ b/Sources/Models/Money.swift @@ -2,7 +2,7 @@ // Money.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Money) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Money) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/NamingSystem.swift b/Sources/Models/NamingSystem.swift index 2556d16f..4e0e0f4d 100644 --- a/Sources/Models/NamingSystem.swift +++ b/Sources/Models/NamingSystem.swift @@ -2,7 +2,7 @@ // NamingSystem.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/NamingSystem) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/NamingSystem) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Narrative.swift b/Sources/Models/Narrative.swift index d7c7d8cd..dbc93f99 100644 --- a/Sources/Models/Narrative.swift +++ b/Sources/Models/Narrative.swift @@ -2,7 +2,7 @@ // Narrative.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Narrative) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Narrative) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/NutritionOrder.swift b/Sources/Models/NutritionOrder.swift index 916d4590..1649bc0e 100644 --- a/Sources/Models/NutritionOrder.swift +++ b/Sources/Models/NutritionOrder.swift @@ -2,7 +2,7 @@ // NutritionOrder.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/NutritionOrder) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/NutritionOrder) on 2019-05-21. // 2019, SMART Health IT. // @@ -44,7 +44,7 @@ open class NutritionOrder: DomainResource { public var instantiates: [FHIRURL]? /// Instantiates FHIR protocol or definition. - public var instantiatesCanonical: [FHIRURL]? + public var instantiatesCanonical: [FHIRCanonical]? /// Instantiates external protocol or definition. public var instantiatesUri: [FHIRURL]? @@ -96,7 +96,7 @@ open class NutritionOrder: DomainResource { foodPreferenceModifier = createInstances(of: CodeableConcept.self, for: "foodPreferenceModifier", in: json, context: &instCtx, owner: self) ?? foodPreferenceModifier identifier = createInstances(of: Identifier.self, for: "identifier", in: json, context: &instCtx, owner: self) ?? identifier instantiates = createInstances(of: FHIRURL.self, for: "instantiates", in: json, context: &instCtx, owner: self) ?? instantiates - instantiatesCanonical = createInstances(of: FHIRURL.self, for: "instantiatesCanonical", in: json, context: &instCtx, owner: self) ?? instantiatesCanonical + instantiatesCanonical = createInstances(of: FHIRCanonical.self, for: "instantiatesCanonical", in: json, context: &instCtx, owner: self) ?? instantiatesCanonical instantiatesUri = createInstances(of: FHIRURL.self, for: "instantiatesUri", in: json, context: &instCtx, owner: self) ?? instantiatesUri intent = createEnum(type: RequestIntent.self, for: "intent", in: json, context: &instCtx) ?? intent if nil == intent && !instCtx.containsKey("intent") { diff --git a/Sources/Models/Observation.swift b/Sources/Models/Observation.swift index e045e93c..2fd16954 100644 --- a/Sources/Models/Observation.swift +++ b/Sources/Models/Observation.swift @@ -2,7 +2,7 @@ // Observation.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Observation) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Observation) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/ObservationDefinition.swift b/Sources/Models/ObservationDefinition.swift index d43ea69f..528d3628 100644 --- a/Sources/Models/ObservationDefinition.swift +++ b/Sources/Models/ObservationDefinition.swift @@ -2,7 +2,7 @@ // ObservationDefinition.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ObservationDefinition) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ObservationDefinition) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/OperationDefinition.swift b/Sources/Models/OperationDefinition.swift index 0782e8d1..36a55861 100644 --- a/Sources/Models/OperationDefinition.swift +++ b/Sources/Models/OperationDefinition.swift @@ -2,7 +2,7 @@ // OperationDefinition.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/OperationDefinition) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/OperationDefinition) on 2019-05-21. // 2019, SMART Health IT. // @@ -24,7 +24,7 @@ open class OperationDefinition: DomainResource { public var affectsState: FHIRBool? /// Marks this as a profile of the base. - public var base: FHIRURL? + public var base: FHIRCanonical? /// Name used to invoke the operation. public var code: FHIRString? @@ -45,7 +45,7 @@ open class OperationDefinition: DomainResource { public var experimental: FHIRBool? /// Validation information for in parameters. - public var inputProfile: FHIRURL? + public var inputProfile: FHIRCanonical? /// Invoke on an instance?. public var instance: FHIRBool? @@ -60,7 +60,7 @@ open class OperationDefinition: DomainResource { public var name: FHIRString? /// Validation information for out parameters. - public var outputProfile: FHIRURL? + public var outputProfile: FHIRCanonical? /// Define overloaded variants for when generating code. public var overload: [OperationDefinitionOverload]? @@ -116,7 +116,7 @@ open class OperationDefinition: DomainResource { super.populate(from: json, context: &instCtx) affectsState = createInstance(type: FHIRBool.self, for: "affectsState", in: json, context: &instCtx, owner: self) ?? affectsState - base = createInstance(type: FHIRURL.self, for: "base", in: json, context: &instCtx, owner: self) ?? base + base = createInstance(type: FHIRCanonical.self, for: "base", in: json, context: &instCtx, owner: self) ?? base code = createInstance(type: FHIRString.self, for: "code", in: json, context: &instCtx, owner: self) ?? code if nil == code && !instCtx.containsKey("code") { instCtx.addError(FHIRValidationError(missing: "code")) @@ -126,7 +126,7 @@ open class OperationDefinition: DomainResource { date = createInstance(type: DateTime.self, for: "date", in: json, context: &instCtx, owner: self) ?? date description_fhir = createInstance(type: FHIRString.self, for: "description", in: json, context: &instCtx, owner: self) ?? description_fhir experimental = createInstance(type: FHIRBool.self, for: "experimental", in: json, context: &instCtx, owner: self) ?? experimental - inputProfile = createInstance(type: FHIRURL.self, for: "inputProfile", in: json, context: &instCtx, owner: self) ?? inputProfile + inputProfile = createInstance(type: FHIRCanonical.self, for: "inputProfile", in: json, context: &instCtx, owner: self) ?? inputProfile instance = createInstance(type: FHIRBool.self, for: "instance", in: json, context: &instCtx, owner: self) ?? instance if nil == instance && !instCtx.containsKey("instance") { instCtx.addError(FHIRValidationError(missing: "instance")) @@ -140,7 +140,7 @@ open class OperationDefinition: DomainResource { if nil == name && !instCtx.containsKey("name") { instCtx.addError(FHIRValidationError(missing: "name")) } - outputProfile = createInstance(type: FHIRURL.self, for: "outputProfile", in: json, context: &instCtx, owner: self) ?? outputProfile + outputProfile = createInstance(type: FHIRCanonical.self, for: "outputProfile", in: json, context: &instCtx, owner: self) ?? outputProfile overload = createInstances(of: OperationDefinitionOverload.self, for: "overload", in: json, context: &instCtx, owner: self) ?? overload parameter = createInstances(of: OperationDefinitionParameter.self, for: "parameter", in: json, context: &instCtx, owner: self) ?? parameter publisher = createInstance(type: FHIRString.self, for: "publisher", in: json, context: &instCtx, owner: self) ?? publisher @@ -287,7 +287,7 @@ open class OperationDefinitionParameter: BackboneElement { public var searchType: SearchParamType? /// If type is Reference | canonical, allowed targets. - public var targetProfile: [FHIRURL]? + public var targetProfile: [FHIRCanonical]? /// What type this parameter has. public var type: FHIRString? @@ -326,7 +326,7 @@ open class OperationDefinitionParameter: BackboneElement { part = createInstances(of: OperationDefinitionParameter.self, for: "part", in: json, context: &instCtx, owner: self) ?? part referencedFrom = createInstances(of: OperationDefinitionParameterReferencedFrom.self, for: "referencedFrom", in: json, context: &instCtx, owner: self) ?? referencedFrom searchType = createEnum(type: SearchParamType.self, for: "searchType", in: json, context: &instCtx) ?? searchType - targetProfile = createInstances(of: FHIRURL.self, for: "targetProfile", in: json, context: &instCtx, owner: self) ?? targetProfile + targetProfile = createInstances(of: FHIRCanonical.self, for: "targetProfile", in: json, context: &instCtx, owner: self) ?? targetProfile type = createInstance(type: FHIRString.self, for: "type", in: json, context: &instCtx, owner: self) ?? type use = createEnum(type: OperationParameterUse.self, for: "use", in: json, context: &instCtx) ?? use if nil == use && !instCtx.containsKey("use") { @@ -379,11 +379,11 @@ open class OperationDefinitionParameterBinding: BackboneElement { public var strength: BindingStrength? /// Source of value set. - public var valueSet: FHIRURL? + public var valueSet: FHIRCanonical? /** Convenience initializer, taking all required properties as arguments. */ - public convenience init(strength: BindingStrength, valueSet: FHIRURL) { + public convenience init(strength: BindingStrength, valueSet: FHIRCanonical) { self.init() self.strength = strength self.valueSet = valueSet @@ -397,7 +397,7 @@ open class OperationDefinitionParameterBinding: BackboneElement { if nil == strength && !instCtx.containsKey("strength") { instCtx.addError(FHIRValidationError(missing: "strength")) } - valueSet = createInstance(type: FHIRURL.self, for: "valueSet", in: json, context: &instCtx, owner: self) ?? valueSet + valueSet = createInstance(type: FHIRCanonical.self, for: "valueSet", in: json, context: &instCtx, owner: self) ?? valueSet if nil == valueSet && !instCtx.containsKey("valueSet") { instCtx.addError(FHIRValidationError(missing: "valueSet")) } diff --git a/Sources/Models/OperationOutcome.swift b/Sources/Models/OperationOutcome.swift index 9a8a8ec0..92b858bd 100644 --- a/Sources/Models/OperationOutcome.swift +++ b/Sources/Models/OperationOutcome.swift @@ -2,7 +2,7 @@ // OperationOutcome.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/OperationOutcome) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/OperationOutcome) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Organization.swift b/Sources/Models/Organization.swift index 43b68cd8..a3d8dedc 100644 --- a/Sources/Models/Organization.swift +++ b/Sources/Models/Organization.swift @@ -2,7 +2,7 @@ // Organization.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Organization) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Organization) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/OrganizationAffiliation.swift b/Sources/Models/OrganizationAffiliation.swift index 3c7a9db6..03014e96 100644 --- a/Sources/Models/OrganizationAffiliation.swift +++ b/Sources/Models/OrganizationAffiliation.swift @@ -2,7 +2,7 @@ // OrganizationAffiliation.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/OrganizationAffiliation) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/OrganizationAffiliation) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/ParameterDefinition.swift b/Sources/Models/ParameterDefinition.swift index 87600879..675ca49a 100644 --- a/Sources/Models/ParameterDefinition.swift +++ b/Sources/Models/ParameterDefinition.swift @@ -2,7 +2,7 @@ // ParameterDefinition.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ParameterDefinition) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ParameterDefinition) on 2019-05-21. // 2019, SMART Health IT. // @@ -33,7 +33,7 @@ open class ParameterDefinition: Element { public var name: FHIRString? /// What profile the value is expected to be. - public var profile: FHIRURL? + public var profile: FHIRCanonical? /// What type of value. public var type: FHIRString? @@ -57,7 +57,7 @@ open class ParameterDefinition: Element { max = createInstance(type: FHIRString.self, for: "max", in: json, context: &instCtx, owner: self) ?? max min = createInstance(type: FHIRInteger.self, for: "min", in: json, context: &instCtx, owner: self) ?? min name = createInstance(type: FHIRString.self, for: "name", in: json, context: &instCtx, owner: self) ?? name - profile = createInstance(type: FHIRURL.self, for: "profile", in: json, context: &instCtx, owner: self) ?? profile + profile = createInstance(type: FHIRCanonical.self, for: "profile", in: json, context: &instCtx, owner: self) ?? profile type = createInstance(type: FHIRString.self, for: "type", in: json, context: &instCtx, owner: self) ?? type if nil == type && !instCtx.containsKey("type") { instCtx.addError(FHIRValidationError(missing: "type")) diff --git a/Sources/Models/Parameters.swift b/Sources/Models/Parameters.swift index 74ecabbc..823853d5 100644 --- a/Sources/Models/Parameters.swift +++ b/Sources/Models/Parameters.swift @@ -2,7 +2,7 @@ // Parameters.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Parameters) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Parameters) on 2019-05-21. // 2019, SMART Health IT. // @@ -76,7 +76,7 @@ open class ParametersParameter: BackboneElement { public var valueBoolean: FHIRBool? /// If parameter is a data type. - public var valueCanonical: FHIRURL? + public var valueCanonical: FHIRCanonical? /// If parameter is a data type. public var valueCode: FHIRString? @@ -227,7 +227,7 @@ open class ParametersParameter: BackboneElement { valueAttachment = createInstance(type: Attachment.self, for: "valueAttachment", in: json, context: &instCtx, owner: self) ?? valueAttachment valueBase64Binary = createInstance(type: Base64Binary.self, for: "valueBase64Binary", in: json, context: &instCtx, owner: self) ?? valueBase64Binary valueBoolean = createInstance(type: FHIRBool.self, for: "valueBoolean", in: json, context: &instCtx, owner: self) ?? valueBoolean - valueCanonical = createInstance(type: FHIRURL.self, for: "valueCanonical", in: json, context: &instCtx, owner: self) ?? valueCanonical + valueCanonical = createInstance(type: FHIRCanonical.self, for: "valueCanonical", in: json, context: &instCtx, owner: self) ?? valueCanonical valueCode = createInstance(type: FHIRString.self, for: "valueCode", in: json, context: &instCtx, owner: self) ?? valueCode valueCodeableConcept = createInstance(type: CodeableConcept.self, for: "valueCodeableConcept", in: json, context: &instCtx, owner: self) ?? valueCodeableConcept valueCoding = createInstance(type: Coding.self, for: "valueCoding", in: json, context: &instCtx, owner: self) ?? valueCoding diff --git a/Sources/Models/Patient.swift b/Sources/Models/Patient.swift index 914d09a2..6cd404ff 100644 --- a/Sources/Models/Patient.swift +++ b/Sources/Models/Patient.swift @@ -2,7 +2,7 @@ // Patient.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Patient) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Patient) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/PaymentNotice.swift b/Sources/Models/PaymentNotice.swift index cc4b1110..1bbdf8d0 100644 --- a/Sources/Models/PaymentNotice.swift +++ b/Sources/Models/PaymentNotice.swift @@ -2,7 +2,7 @@ // PaymentNotice.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/PaymentNotice) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/PaymentNotice) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/PaymentReconciliation.swift b/Sources/Models/PaymentReconciliation.swift index 809dad15..246968d8 100644 --- a/Sources/Models/PaymentReconciliation.swift +++ b/Sources/Models/PaymentReconciliation.swift @@ -2,7 +2,7 @@ // PaymentReconciliation.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/PaymentReconciliation) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/PaymentReconciliation) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Period.swift b/Sources/Models/Period.swift index cf23c8a6..4ae19c96 100644 --- a/Sources/Models/Period.swift +++ b/Sources/Models/Period.swift @@ -2,7 +2,7 @@ // Period.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Period) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Period) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Person.swift b/Sources/Models/Person.swift index abe1ece1..046e6140 100644 --- a/Sources/Models/Person.swift +++ b/Sources/Models/Person.swift @@ -2,7 +2,7 @@ // Person.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Person) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Person) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/PlanDefinition.swift b/Sources/Models/PlanDefinition.swift index 5a0a0bcf..04c84107 100644 --- a/Sources/Models/PlanDefinition.swift +++ b/Sources/Models/PlanDefinition.swift @@ -2,7 +2,7 @@ // PlanDefinition.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/PlanDefinition) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/PlanDefinition) on 2019-05-21. // 2019, SMART Health IT. // @@ -67,7 +67,7 @@ open class PlanDefinition: DomainResource { public var lastReviewDate: FHIRDate? /// Logic used by the plan definition. - public var library: [FHIRURL]? + public var library: [FHIRCanonical]? /// Name for this plan definition (computer friendly). public var name: FHIRString? @@ -143,7 +143,7 @@ open class PlanDefinition: DomainResource { identifier = createInstances(of: Identifier.self, for: "identifier", in: json, context: &instCtx, owner: self) ?? identifier jurisdiction = createInstances(of: CodeableConcept.self, for: "jurisdiction", in: json, context: &instCtx, owner: self) ?? jurisdiction lastReviewDate = createInstance(type: FHIRDate.self, for: "lastReviewDate", in: json, context: &instCtx, owner: self) ?? lastReviewDate - library = createInstances(of: FHIRURL.self, for: "library", in: json, context: &instCtx, owner: self) ?? library + library = createInstances(of: FHIRCanonical.self, for: "library", in: json, context: &instCtx, owner: self) ?? library name = createInstance(type: FHIRString.self, for: "name", in: json, context: &instCtx, owner: self) ?? name publisher = createInstance(type: FHIRString.self, for: "publisher", in: json, context: &instCtx, owner: self) ?? publisher purpose = createInstance(type: FHIRString.self, for: "purpose", in: json, context: &instCtx, owner: self) ?? purpose @@ -230,7 +230,7 @@ open class PlanDefinitionAction: BackboneElement { public var condition: [PlanDefinitionActionCondition]? /// Description of the activity to be performed. - public var definitionCanonical: FHIRURL? + public var definitionCanonical: FHIRCanonical? /// Description of the activity to be performed. public var definitionUri: FHIRURL? @@ -311,7 +311,7 @@ open class PlanDefinitionAction: BackboneElement { public var title: FHIRString? /// Transform to apply the template. - public var transform: FHIRURL? + public var transform: FHIRCanonical? /// When the action should be triggered. public var trigger: [TriggerDefinition]? @@ -327,7 +327,7 @@ open class PlanDefinitionAction: BackboneElement { cardinalityBehavior = createEnum(type: ActionCardinalityBehavior.self, for: "cardinalityBehavior", in: json, context: &instCtx) ?? cardinalityBehavior code = createInstances(of: CodeableConcept.self, for: "code", in: json, context: &instCtx, owner: self) ?? code condition = createInstances(of: PlanDefinitionActionCondition.self, for: "condition", in: json, context: &instCtx, owner: self) ?? condition - definitionCanonical = createInstance(type: FHIRURL.self, for: "definitionCanonical", in: json, context: &instCtx, owner: self) ?? definitionCanonical + definitionCanonical = createInstance(type: FHIRCanonical.self, for: "definitionCanonical", in: json, context: &instCtx, owner: self) ?? definitionCanonical definitionUri = createInstance(type: FHIRURL.self, for: "definitionUri", in: json, context: &instCtx, owner: self) ?? definitionUri description_fhir = createInstance(type: FHIRString.self, for: "description", in: json, context: &instCtx, owner: self) ?? description_fhir documentation = createInstances(of: RelatedArtifact.self, for: "documentation", in: json, context: &instCtx, owner: self) ?? documentation @@ -354,7 +354,7 @@ open class PlanDefinitionAction: BackboneElement { timingRange = createInstance(type: Range.self, for: "timingRange", in: json, context: &instCtx, owner: self) ?? timingRange timingTiming = createInstance(type: Timing.self, for: "timingTiming", in: json, context: &instCtx, owner: self) ?? timingTiming title = createInstance(type: FHIRString.self, for: "title", in: json, context: &instCtx, owner: self) ?? title - transform = createInstance(type: FHIRURL.self, for: "transform", in: json, context: &instCtx, owner: self) ?? transform + transform = createInstance(type: FHIRCanonical.self, for: "transform", in: json, context: &instCtx, owner: self) ?? transform trigger = createInstances(of: TriggerDefinition.self, for: "trigger", in: json, context: &instCtx, owner: self) ?? trigger type = createInstance(type: CodeableConcept.self, for: "type", in: json, context: &instCtx, owner: self) ?? type } diff --git a/Sources/Models/Population.swift b/Sources/Models/Population.swift index c4938b69..9e9c9342 100644 --- a/Sources/Models/Population.swift +++ b/Sources/Models/Population.swift @@ -2,7 +2,7 @@ // Population.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Population) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Population) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Practitioner.swift b/Sources/Models/Practitioner.swift index 745e853c..93bc6bc8 100644 --- a/Sources/Models/Practitioner.swift +++ b/Sources/Models/Practitioner.swift @@ -2,7 +2,7 @@ // Practitioner.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Practitioner) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Practitioner) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/PractitionerRole.swift b/Sources/Models/PractitionerRole.swift index c5ab4ccc..4b7c6104 100644 --- a/Sources/Models/PractitionerRole.swift +++ b/Sources/Models/PractitionerRole.swift @@ -2,7 +2,7 @@ // PractitionerRole.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/PractitionerRole) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/PractitionerRole) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Procedure.swift b/Sources/Models/Procedure.swift index b923cd6e..4ba5314c 100644 --- a/Sources/Models/Procedure.swift +++ b/Sources/Models/Procedure.swift @@ -2,7 +2,7 @@ // Procedure.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Procedure) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Procedure) on 2019-05-21. // 2019, SMART Health IT. // @@ -54,7 +54,7 @@ open class Procedure: DomainResource { public var identifier: [Identifier]? /// Instantiates FHIR protocol or definition. - public var instantiatesCanonical: [FHIRURL]? + public var instantiatesCanonical: [FHIRCanonical]? /// Instantiates external protocol or definition. public var instantiatesUri: [FHIRURL]? @@ -139,7 +139,7 @@ open class Procedure: DomainResource { focalDevice = createInstances(of: ProcedureFocalDevice.self, for: "focalDevice", in: json, context: &instCtx, owner: self) ?? focalDevice followUp = createInstances(of: CodeableConcept.self, for: "followUp", in: json, context: &instCtx, owner: self) ?? followUp identifier = createInstances(of: Identifier.self, for: "identifier", in: json, context: &instCtx, owner: self) ?? identifier - instantiatesCanonical = createInstances(of: FHIRURL.self, for: "instantiatesCanonical", in: json, context: &instCtx, owner: self) ?? instantiatesCanonical + instantiatesCanonical = createInstances(of: FHIRCanonical.self, for: "instantiatesCanonical", in: json, context: &instCtx, owner: self) ?? instantiatesCanonical instantiatesUri = createInstances(of: FHIRURL.self, for: "instantiatesUri", in: json, context: &instCtx, owner: self) ?? instantiatesUri location = createInstance(type: Reference.self, for: "location", in: json, context: &instCtx, owner: self) ?? location note = createInstances(of: Annotation.self, for: "note", in: json, context: &instCtx, owner: self) ?? note diff --git a/Sources/Models/ProdCharacteristic.swift b/Sources/Models/ProdCharacteristic.swift index 35e3a52c..44ead1d1 100644 --- a/Sources/Models/ProdCharacteristic.swift +++ b/Sources/Models/ProdCharacteristic.swift @@ -2,7 +2,7 @@ // ProdCharacteristic.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ProdCharacteristic) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ProdCharacteristic) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/ProductShelfLife.swift b/Sources/Models/ProductShelfLife.swift index 4b5bcd88..492f3ddd 100644 --- a/Sources/Models/ProductShelfLife.swift +++ b/Sources/Models/ProductShelfLife.swift @@ -2,7 +2,7 @@ // ProductShelfLife.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ProductShelfLife) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ProductShelfLife) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Provenance.swift b/Sources/Models/Provenance.swift index 52ece759..02108b0a 100644 --- a/Sources/Models/Provenance.swift +++ b/Sources/Models/Provenance.swift @@ -2,7 +2,7 @@ // Provenance.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Provenance) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Provenance) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Quantity.swift b/Sources/Models/Quantity.swift index c620055f..98e9b142 100644 --- a/Sources/Models/Quantity.swift +++ b/Sources/Models/Quantity.swift @@ -2,7 +2,7 @@ // Quantity.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MoneyQuantity) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/MoneyQuantity) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Questionnaire.swift b/Sources/Models/Questionnaire.swift index 2358e834..f01f7a9c 100644 --- a/Sources/Models/Questionnaire.swift +++ b/Sources/Models/Questionnaire.swift @@ -2,7 +2,7 @@ // Questionnaire.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Questionnaire) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Questionnaire) on 2019-05-21. // 2019, SMART Health IT. // @@ -36,7 +36,7 @@ open class Questionnaire: DomainResource { public var date: DateTime? /// Instantiates protocol or definition. - public var derivedFrom: [FHIRURL]? + public var derivedFrom: [FHIRCanonical]? /// Natural language description of the questionnaire. public var description_fhir: FHIRString? @@ -102,7 +102,7 @@ open class Questionnaire: DomainResource { contact = createInstances(of: ContactDetail.self, for: "contact", in: json, context: &instCtx, owner: self) ?? contact copyright = createInstance(type: FHIRString.self, for: "copyright", in: json, context: &instCtx, owner: self) ?? copyright date = createInstance(type: DateTime.self, for: "date", in: json, context: &instCtx, owner: self) ?? date - derivedFrom = createInstances(of: FHIRURL.self, for: "derivedFrom", in: json, context: &instCtx, owner: self) ?? derivedFrom + derivedFrom = createInstances(of: FHIRCanonical.self, for: "derivedFrom", in: json, context: &instCtx, owner: self) ?? derivedFrom description_fhir = createInstance(type: FHIRString.self, for: "description", in: json, context: &instCtx, owner: self) ?? description_fhir effectivePeriod = createInstance(type: Period.self, for: "effectivePeriod", in: json, context: &instCtx, owner: self) ?? effectivePeriod experimental = createInstance(type: FHIRBool.self, for: "experimental", in: json, context: &instCtx, owner: self) ?? experimental @@ -170,7 +170,7 @@ open class QuestionnaireItem: BackboneElement { public var answerOption: [QuestionnaireItemAnswerOption]? /// Valueset containing permitted answers. - public var answerValueSet: FHIRURL? + public var answerValueSet: FHIRCanonical? /// Corresponding concept for this item in a terminology. public var code: [Coding]? @@ -228,7 +228,7 @@ open class QuestionnaireItem: BackboneElement { super.populate(from: json, context: &instCtx) answerOption = createInstances(of: QuestionnaireItemAnswerOption.self, for: "answerOption", in: json, context: &instCtx, owner: self) ?? answerOption - answerValueSet = createInstance(type: FHIRURL.self, for: "answerValueSet", in: json, context: &instCtx, owner: self) ?? answerValueSet + answerValueSet = createInstance(type: FHIRCanonical.self, for: "answerValueSet", in: json, context: &instCtx, owner: self) ?? answerValueSet code = createInstances(of: Coding.self, for: "code", in: json, context: &instCtx, owner: self) ?? code definition = createInstance(type: FHIRURL.self, for: "definition", in: json, context: &instCtx, owner: self) ?? definition enableBehavior = createEnum(type: EnableWhenBehavior.self, for: "enableBehavior", in: json, context: &instCtx) ?? enableBehavior diff --git a/Sources/Models/QuestionnaireResponse.swift b/Sources/Models/QuestionnaireResponse.swift index 99e90544..1e16aa65 100644 --- a/Sources/Models/QuestionnaireResponse.swift +++ b/Sources/Models/QuestionnaireResponse.swift @@ -2,7 +2,7 @@ // QuestionnaireResponse.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/QuestionnaireResponse) on 2019-05-21. // 2019, SMART Health IT. // @@ -42,7 +42,7 @@ open class QuestionnaireResponse: DomainResource { public var partOf: [Reference]? /// Form being answered. - public var questionnaire: FHIRURL? + public var questionnaire: FHIRCanonical? /// The person who answered the questions. public var source: Reference? @@ -71,7 +71,7 @@ open class QuestionnaireResponse: DomainResource { identifier = createInstance(type: Identifier.self, for: "identifier", in: json, context: &instCtx, owner: self) ?? identifier item = createInstances(of: QuestionnaireResponseItem.self, for: "item", in: json, context: &instCtx, owner: self) ?? item partOf = createInstances(of: Reference.self, for: "partOf", in: json, context: &instCtx, owner: self) ?? partOf - questionnaire = createInstance(type: FHIRURL.self, for: "questionnaire", in: json, context: &instCtx, owner: self) ?? questionnaire + questionnaire = createInstance(type: FHIRCanonical.self, for: "questionnaire", in: json, context: &instCtx, owner: self) ?? questionnaire source = createInstance(type: Reference.self, for: "source", in: json, context: &instCtx, owner: self) ?? source status = createEnum(type: QuestionnaireResponseStatus.self, for: "status", in: json, context: &instCtx) ?? status if nil == status && !instCtx.containsKey("status") { diff --git a/Sources/Models/Range.swift b/Sources/Models/Range.swift index 7db2b75c..76565896 100644 --- a/Sources/Models/Range.swift +++ b/Sources/Models/Range.swift @@ -2,7 +2,7 @@ // Range.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Range) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Range) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Ratio.swift b/Sources/Models/Ratio.swift index fb814163..fd3bb557 100644 --- a/Sources/Models/Ratio.swift +++ b/Sources/Models/Ratio.swift @@ -2,7 +2,7 @@ // Ratio.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Ratio) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Ratio) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Reference.swift b/Sources/Models/Reference.swift index 9dca9d50..980cb267 100644 --- a/Sources/Models/Reference.swift +++ b/Sources/Models/Reference.swift @@ -2,7 +2,7 @@ // Reference.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Reference) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Reference) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/RelatedArtifact.swift b/Sources/Models/RelatedArtifact.swift index e107a816..d9d0c04d 100644 --- a/Sources/Models/RelatedArtifact.swift +++ b/Sources/Models/RelatedArtifact.swift @@ -2,7 +2,7 @@ // RelatedArtifact.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/RelatedArtifact) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/RelatedArtifact) on 2019-05-21. // 2019, SMART Health IT. // @@ -32,7 +32,7 @@ open class RelatedArtifact: Element { public var label: FHIRString? /// What resource is being referenced. - public var resource: FHIRURL? + public var resource: FHIRCanonical? /// The type of relationship to the related artifact. public var type: RelatedArtifactType? @@ -55,7 +55,7 @@ open class RelatedArtifact: Element { display = createInstance(type: FHIRString.self, for: "display", in: json, context: &instCtx, owner: self) ?? display document = createInstance(type: Attachment.self, for: "document", in: json, context: &instCtx, owner: self) ?? document label = createInstance(type: FHIRString.self, for: "label", in: json, context: &instCtx, owner: self) ?? label - resource = createInstance(type: FHIRURL.self, for: "resource", in: json, context: &instCtx, owner: self) ?? resource + resource = createInstance(type: FHIRCanonical.self, for: "resource", in: json, context: &instCtx, owner: self) ?? resource type = createEnum(type: RelatedArtifactType.self, for: "type", in: json, context: &instCtx) ?? type if nil == type && !instCtx.containsKey("type") { instCtx.addError(FHIRValidationError(missing: "type")) diff --git a/Sources/Models/RelatedPerson.swift b/Sources/Models/RelatedPerson.swift index c9573ba8..a586d237 100644 --- a/Sources/Models/RelatedPerson.swift +++ b/Sources/Models/RelatedPerson.swift @@ -2,7 +2,7 @@ // RelatedPerson.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/RelatedPerson) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/RelatedPerson) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/RequestGroup.swift b/Sources/Models/RequestGroup.swift index 2cc376bb..71699ce5 100644 --- a/Sources/Models/RequestGroup.swift +++ b/Sources/Models/RequestGroup.swift @@ -2,7 +2,7 @@ // RequestGroup.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/RequestGroup) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/RequestGroup) on 2019-05-21. // 2019, SMART Health IT. // @@ -45,7 +45,7 @@ open class RequestGroup: DomainResource { public var identifier: [Identifier]? /// Instantiates FHIR protocol or definition. - public var instantiatesCanonical: [FHIRURL]? + public var instantiatesCanonical: [FHIRCanonical]? /// Instantiates external protocol or definition. public var instantiatesUri: [FHIRURL]? @@ -96,7 +96,7 @@ open class RequestGroup: DomainResource { encounter = createInstance(type: Reference.self, for: "encounter", in: json, context: &instCtx, owner: self) ?? encounter groupIdentifier = createInstance(type: Identifier.self, for: "groupIdentifier", in: json, context: &instCtx, owner: self) ?? groupIdentifier identifier = createInstances(of: Identifier.self, for: "identifier", in: json, context: &instCtx, owner: self) ?? identifier - instantiatesCanonical = createInstances(of: FHIRURL.self, for: "instantiatesCanonical", in: json, context: &instCtx, owner: self) ?? instantiatesCanonical + instantiatesCanonical = createInstances(of: FHIRCanonical.self, for: "instantiatesCanonical", in: json, context: &instCtx, owner: self) ?? instantiatesCanonical instantiatesUri = createInstances(of: FHIRURL.self, for: "instantiatesUri", in: json, context: &instCtx, owner: self) ?? instantiatesUri intent = createEnum(type: RequestIntent.self, for: "intent", in: json, context: &instCtx) ?? intent if nil == intent && !instCtx.containsKey("intent") { diff --git a/Sources/Models/ResearchDefinition.swift b/Sources/Models/ResearchDefinition.swift index 527a2bd8..59962866 100644 --- a/Sources/Models/ResearchDefinition.swift +++ b/Sources/Models/ResearchDefinition.swift @@ -2,7 +2,7 @@ // ResearchDefinition.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ResearchDefinition) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ResearchDefinition) on 2019-05-21. // 2019, SMART Health IT. // @@ -69,7 +69,7 @@ open class ResearchDefinition: DomainResource { public var lastReviewDate: FHIRDate? /// Logic used by the ResearchDefinition. - public var library: [FHIRURL]? + public var library: [FHIRCanonical]? /// Name for this research definition (computer friendly). public var name: FHIRString? @@ -153,7 +153,7 @@ open class ResearchDefinition: DomainResource { identifier = createInstances(of: Identifier.self, for: "identifier", in: json, context: &instCtx, owner: self) ?? identifier jurisdiction = createInstances(of: CodeableConcept.self, for: "jurisdiction", in: json, context: &instCtx, owner: self) ?? jurisdiction lastReviewDate = createInstance(type: FHIRDate.self, for: "lastReviewDate", in: json, context: &instCtx, owner: self) ?? lastReviewDate - library = createInstances(of: FHIRURL.self, for: "library", in: json, context: &instCtx, owner: self) ?? library + library = createInstances(of: FHIRCanonical.self, for: "library", in: json, context: &instCtx, owner: self) ?? library name = createInstance(type: FHIRString.self, for: "name", in: json, context: &instCtx, owner: self) ?? name outcome = createInstance(type: Reference.self, for: "outcome", in: json, context: &instCtx, owner: self) ?? outcome population = createInstance(type: Reference.self, for: "population", in: json, context: &instCtx, owner: self) ?? population diff --git a/Sources/Models/ResearchElementDefinition.swift b/Sources/Models/ResearchElementDefinition.swift index 8c7156ca..c0e86149 100644 --- a/Sources/Models/ResearchElementDefinition.swift +++ b/Sources/Models/ResearchElementDefinition.swift @@ -2,7 +2,7 @@ // ResearchElementDefinition.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ResearchElementDefinition) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ResearchElementDefinition) on 2019-05-21. // 2019, SMART Health IT. // @@ -66,7 +66,7 @@ open class ResearchElementDefinition: DomainResource { public var lastReviewDate: FHIRDate? /// Logic used by the ResearchElementDefinition. - public var library: [FHIRURL]? + public var library: [FHIRCanonical]? /// Name for this research element definition (computer friendly). public var name: FHIRString? @@ -153,7 +153,7 @@ open class ResearchElementDefinition: DomainResource { identifier = createInstances(of: Identifier.self, for: "identifier", in: json, context: &instCtx, owner: self) ?? identifier jurisdiction = createInstances(of: CodeableConcept.self, for: "jurisdiction", in: json, context: &instCtx, owner: self) ?? jurisdiction lastReviewDate = createInstance(type: FHIRDate.self, for: "lastReviewDate", in: json, context: &instCtx, owner: self) ?? lastReviewDate - library = createInstances(of: FHIRURL.self, for: "library", in: json, context: &instCtx, owner: self) ?? library + library = createInstances(of: FHIRCanonical.self, for: "library", in: json, context: &instCtx, owner: self) ?? library name = createInstance(type: FHIRString.self, for: "name", in: json, context: &instCtx, owner: self) ?? name publisher = createInstance(type: FHIRString.self, for: "publisher", in: json, context: &instCtx, owner: self) ?? publisher purpose = createInstance(type: FHIRString.self, for: "purpose", in: json, context: &instCtx, owner: self) ?? purpose @@ -242,7 +242,7 @@ open class ResearchElementDefinitionCharacteristic: BackboneElement { } /// What code or expression defines members?. - public var definitionCanonical: FHIRURL? + public var definitionCanonical: FHIRCanonical? /// What code or expression defines members?. public var definitionCodeableConcept: CodeableConcept? @@ -311,7 +311,7 @@ open class ResearchElementDefinitionCharacteristic: BackboneElement { if let value = definition as? CodeableConcept { self.definitionCodeableConcept = value } - else if let value = definition as? FHIRURL { + else if let value = definition as? FHIRCanonical { self.definitionCanonical = value } else if let value = definition as? Expression { @@ -329,7 +329,7 @@ open class ResearchElementDefinitionCharacteristic: BackboneElement { override open func populate(from json: FHIRJSON, context instCtx: inout FHIRInstantiationContext) { super.populate(from: json, context: &instCtx) - definitionCanonical = createInstance(type: FHIRURL.self, for: "definitionCanonical", in: json, context: &instCtx, owner: self) ?? definitionCanonical + definitionCanonical = createInstance(type: FHIRCanonical.self, for: "definitionCanonical", in: json, context: &instCtx, owner: self) ?? definitionCanonical definitionCodeableConcept = createInstance(type: CodeableConcept.self, for: "definitionCodeableConcept", in: json, context: &instCtx, owner: self) ?? definitionCodeableConcept definitionDataRequirement = createInstance(type: DataRequirement.self, for: "definitionDataRequirement", in: json, context: &instCtx, owner: self) ?? definitionDataRequirement definitionExpression = createInstance(type: Expression.self, for: "definitionExpression", in: json, context: &instCtx, owner: self) ?? definitionExpression diff --git a/Sources/Models/ResearchStudy.swift b/Sources/Models/ResearchStudy.swift index 95bf34e0..7b28110f 100644 --- a/Sources/Models/ResearchStudy.swift +++ b/Sources/Models/ResearchStudy.swift @@ -2,7 +2,7 @@ // ResearchStudy.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ResearchStudy) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ResearchStudy) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/ResearchSubject.swift b/Sources/Models/ResearchSubject.swift index cb89e53a..200d7142 100644 --- a/Sources/Models/ResearchSubject.swift +++ b/Sources/Models/ResearchSubject.swift @@ -2,7 +2,7 @@ // ResearchSubject.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ResearchSubject) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ResearchSubject) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Resource.swift b/Sources/Models/Resource.swift index b3b0513a..7ee381b7 100644 --- a/Sources/Models/Resource.swift +++ b/Sources/Models/Resource.swift @@ -2,7 +2,7 @@ // Resource.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Resource) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Resource) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/RiskAssessment.swift b/Sources/Models/RiskAssessment.swift index 7dd80e35..1b65aada 100644 --- a/Sources/Models/RiskAssessment.swift +++ b/Sources/Models/RiskAssessment.swift @@ -2,7 +2,7 @@ // RiskAssessment.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/RiskAssessment) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/RiskAssessment) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/RiskEvidenceSynthesis.swift b/Sources/Models/RiskEvidenceSynthesis.swift index 93342271..b4690490 100644 --- a/Sources/Models/RiskEvidenceSynthesis.swift +++ b/Sources/Models/RiskEvidenceSynthesis.swift @@ -2,7 +2,7 @@ // RiskEvidenceSynthesis.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/RiskEvidenceSynthesis) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/RiskEvidenceSynthesis) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/SampledData.swift b/Sources/Models/SampledData.swift index 35d5897f..6b703422 100644 --- a/Sources/Models/SampledData.swift +++ b/Sources/Models/SampledData.swift @@ -2,7 +2,7 @@ // SampledData.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/SampledData) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/SampledData) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Schedule.swift b/Sources/Models/Schedule.swift index fde880dc..ae5738f9 100644 --- a/Sources/Models/Schedule.swift +++ b/Sources/Models/Schedule.swift @@ -2,7 +2,7 @@ // Schedule.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Schedule) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Schedule) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/SearchParameter.swift b/Sources/Models/SearchParameter.swift index 2e1257d1..c4763891 100644 --- a/Sources/Models/SearchParameter.swift +++ b/Sources/Models/SearchParameter.swift @@ -2,7 +2,7 @@ // SearchParameter.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/SearchParameter) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/SearchParameter) on 2019-05-21. // 2019, SMART Health IT. // @@ -41,7 +41,7 @@ open class SearchParameter: DomainResource { public var date: DateTime? /// Original definition for the search parameter. - public var derivedFrom: FHIRURL? + public var derivedFrom: FHIRCanonical? /// Natural language description of the search parameter. public var description_fhir: FHIRString? @@ -127,7 +127,7 @@ open class SearchParameter: DomainResource { component = createInstances(of: SearchParameterComponent.self, for: "component", in: json, context: &instCtx, owner: self) ?? component contact = createInstances(of: ContactDetail.self, for: "contact", in: json, context: &instCtx, owner: self) ?? contact date = createInstance(type: DateTime.self, for: "date", in: json, context: &instCtx, owner: self) ?? date - derivedFrom = createInstance(type: FHIRURL.self, for: "derivedFrom", in: json, context: &instCtx, owner: self) ?? derivedFrom + derivedFrom = createInstance(type: FHIRCanonical.self, for: "derivedFrom", in: json, context: &instCtx, owner: self) ?? derivedFrom description_fhir = createInstance(type: FHIRString.self, for: "description", in: json, context: &instCtx, owner: self) ?? description_fhir if nil == description_fhir && !instCtx.containsKey("description") { instCtx.addError(FHIRValidationError(missing: "description")) @@ -228,14 +228,14 @@ open class SearchParameterComponent: BackboneElement { } /// Defines how the part works. - public var definition: FHIRURL? + public var definition: FHIRCanonical? /// Subexpression relative to main expression. public var expression: FHIRString? /** Convenience initializer, taking all required properties as arguments. */ - public convenience init(definition: FHIRURL, expression: FHIRString) { + public convenience init(definition: FHIRCanonical, expression: FHIRString) { self.init() self.definition = definition self.expression = expression @@ -245,7 +245,7 @@ open class SearchParameterComponent: BackboneElement { override open func populate(from json: FHIRJSON, context instCtx: inout FHIRInstantiationContext) { super.populate(from: json, context: &instCtx) - definition = createInstance(type: FHIRURL.self, for: "definition", in: json, context: &instCtx, owner: self) ?? definition + definition = createInstance(type: FHIRCanonical.self, for: "definition", in: json, context: &instCtx, owner: self) ?? definition if nil == definition && !instCtx.containsKey("definition") { instCtx.addError(FHIRValidationError(missing: "definition")) } diff --git a/Sources/Models/ServiceRequest.swift b/Sources/Models/ServiceRequest.swift index e87622c8..082fecac 100644 --- a/Sources/Models/ServiceRequest.swift +++ b/Sources/Models/ServiceRequest.swift @@ -2,7 +2,7 @@ // ServiceRequest.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ServiceRequest) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ServiceRequest) on 2019-05-21. // 2019, SMART Health IT. // @@ -50,7 +50,7 @@ open class ServiceRequest: DomainResource { public var identifier: [Identifier]? /// Instantiates FHIR protocol or definition. - public var instantiatesCanonical: [FHIRURL]? + public var instantiatesCanonical: [FHIRCanonical]? /// Instantiates external protocol or definition. public var instantiatesUri: [FHIRURL]? @@ -156,7 +156,7 @@ open class ServiceRequest: DomainResource { doNotPerform = createInstance(type: FHIRBool.self, for: "doNotPerform", in: json, context: &instCtx, owner: self) ?? doNotPerform encounter = createInstance(type: Reference.self, for: "encounter", in: json, context: &instCtx, owner: self) ?? encounter identifier = createInstances(of: Identifier.self, for: "identifier", in: json, context: &instCtx, owner: self) ?? identifier - instantiatesCanonical = createInstances(of: FHIRURL.self, for: "instantiatesCanonical", in: json, context: &instCtx, owner: self) ?? instantiatesCanonical + instantiatesCanonical = createInstances(of: FHIRCanonical.self, for: "instantiatesCanonical", in: json, context: &instCtx, owner: self) ?? instantiatesCanonical instantiatesUri = createInstances(of: FHIRURL.self, for: "instantiatesUri", in: json, context: &instCtx, owner: self) ?? instantiatesUri insurance = createInstances(of: Reference.self, for: "insurance", in: json, context: &instCtx, owner: self) ?? insurance intent = createEnum(type: RequestIntent.self, for: "intent", in: json, context: &instCtx) ?? intent diff --git a/Sources/Models/Signature.swift b/Sources/Models/Signature.swift index 09f67c9d..9d5d8ba7 100644 --- a/Sources/Models/Signature.swift +++ b/Sources/Models/Signature.swift @@ -2,7 +2,7 @@ // Signature.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Signature) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Signature) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Slot.swift b/Sources/Models/Slot.swift index c9a37ee9..d46ec81a 100644 --- a/Sources/Models/Slot.swift +++ b/Sources/Models/Slot.swift @@ -2,7 +2,7 @@ // Slot.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Slot) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Slot) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Specimen.swift b/Sources/Models/Specimen.swift index d607a0fe..474e86dd 100644 --- a/Sources/Models/Specimen.swift +++ b/Sources/Models/Specimen.swift @@ -2,7 +2,7 @@ // Specimen.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Specimen) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Specimen) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/SpecimenDefinition.swift b/Sources/Models/SpecimenDefinition.swift index b5bc2701..00058179 100644 --- a/Sources/Models/SpecimenDefinition.swift +++ b/Sources/Models/SpecimenDefinition.swift @@ -2,7 +2,7 @@ // SpecimenDefinition.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/SpecimenDefinition) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/SpecimenDefinition) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/StructureDefinition.swift b/Sources/Models/StructureDefinition.swift index e1cc5004..46ef16cd 100644 --- a/Sources/Models/StructureDefinition.swift +++ b/Sources/Models/StructureDefinition.swift @@ -2,7 +2,7 @@ // StructureDefinition.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/StructureDefinition) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/StructureDefinition) on 2019-05-21. // 2019, SMART Health IT. // @@ -24,7 +24,7 @@ open class StructureDefinition: DomainResource { public var abstract: FHIRBool? /// Definition that this type is constrained/specialized from. - public var baseDefinition: FHIRURL? + public var baseDefinition: FHIRCanonical? /// Contact details for the publisher. public var contact: [ContactDetail]? @@ -121,7 +121,7 @@ open class StructureDefinition: DomainResource { if nil == abstract && !instCtx.containsKey("abstract") { instCtx.addError(FHIRValidationError(missing: "abstract")) } - baseDefinition = createInstance(type: FHIRURL.self, for: "baseDefinition", in: json, context: &instCtx, owner: self) ?? baseDefinition + baseDefinition = createInstance(type: FHIRCanonical.self, for: "baseDefinition", in: json, context: &instCtx, owner: self) ?? baseDefinition contact = createInstances(of: ContactDetail.self, for: "contact", in: json, context: &instCtx, owner: self) ?? contact context = createInstances(of: StructureDefinitionContext.self, for: "context", in: json, context: &instCtx, owner: self) ?? context contextInvariant = createInstances(of: FHIRString.self, for: "contextInvariant", in: json, context: &instCtx, owner: self) ?? contextInvariant diff --git a/Sources/Models/StructureMap.swift b/Sources/Models/StructureMap.swift index 3fb4a7ab..382c239a 100644 --- a/Sources/Models/StructureMap.swift +++ b/Sources/Models/StructureMap.swift @@ -2,7 +2,7 @@ // StructureMap.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/StructureMap) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/StructureMap) on 2019-05-21. // 2019, SMART Health IT. // @@ -39,7 +39,7 @@ open class StructureMap: DomainResource { public var identifier: [Identifier]? /// Other maps used by this map (canonical URLs). - public var import_fhir: [FHIRURL]? + public var import_fhir: [FHIRCanonical]? /// Intended jurisdiction for structure map (if applicable). public var jurisdiction: [CodeableConcept]? @@ -95,7 +95,7 @@ open class StructureMap: DomainResource { instCtx.addError(FHIRValidationError(missing: "group")) } identifier = createInstances(of: Identifier.self, for: "identifier", in: json, context: &instCtx, owner: self) ?? identifier - import_fhir = createInstances(of: FHIRURL.self, for: "import", in: json, context: &instCtx, owner: self) ?? import_fhir + import_fhir = createInstances(of: FHIRCanonical.self, for: "import", in: json, context: &instCtx, owner: self) ?? import_fhir jurisdiction = createInstances(of: CodeableConcept.self, for: "jurisdiction", in: json, context: &instCtx, owner: self) ?? jurisdiction name = createInstance(type: FHIRString.self, for: "name", in: json, context: &instCtx, owner: self) ?? name if nil == name && !instCtx.containsKey("name") { @@ -462,7 +462,7 @@ open class StructureMapGroupRuleSource: BackboneElement { public var defaultValueBoolean: FHIRBool? /// Default value if no value exists. - public var defaultValueCanonical: FHIRURL? + public var defaultValueCanonical: FHIRCanonical? /// Default value if no value exists. public var defaultValueCode: FHIRString? @@ -634,7 +634,7 @@ open class StructureMapGroupRuleSource: BackboneElement { defaultValueAttachment = createInstance(type: Attachment.self, for: "defaultValueAttachment", in: json, context: &instCtx, owner: self) ?? defaultValueAttachment defaultValueBase64Binary = createInstance(type: Base64Binary.self, for: "defaultValueBase64Binary", in: json, context: &instCtx, owner: self) ?? defaultValueBase64Binary defaultValueBoolean = createInstance(type: FHIRBool.self, for: "defaultValueBoolean", in: json, context: &instCtx, owner: self) ?? defaultValueBoolean - defaultValueCanonical = createInstance(type: FHIRURL.self, for: "defaultValueCanonical", in: json, context: &instCtx, owner: self) ?? defaultValueCanonical + defaultValueCanonical = createInstance(type: FHIRCanonical.self, for: "defaultValueCanonical", in: json, context: &instCtx, owner: self) ?? defaultValueCanonical defaultValueCode = createInstance(type: FHIRString.self, for: "defaultValueCode", in: json, context: &instCtx, owner: self) ?? defaultValueCode defaultValueCodeableConcept = createInstance(type: CodeableConcept.self, for: "defaultValueCodeableConcept", in: json, context: &instCtx, owner: self) ?? defaultValueCodeableConcept defaultValueCoding = createInstance(type: Coding.self, for: "defaultValueCoding", in: json, context: &instCtx, owner: self) ?? defaultValueCoding @@ -918,11 +918,11 @@ open class StructureMapStructure: BackboneElement { public var mode: StructureMapModelMode? /// Canonical reference to structure definition. - public var url: FHIRURL? + public var url: FHIRCanonical? /** Convenience initializer, taking all required properties as arguments. */ - public convenience init(mode: StructureMapModelMode, url: FHIRURL) { + public convenience init(mode: StructureMapModelMode, url: FHIRCanonical) { self.init() self.mode = mode self.url = url @@ -938,7 +938,7 @@ open class StructureMapStructure: BackboneElement { if nil == mode && !instCtx.containsKey("mode") { instCtx.addError(FHIRValidationError(missing: "mode")) } - url = createInstance(type: FHIRURL.self, for: "url", in: json, context: &instCtx, owner: self) ?? url + url = createInstance(type: FHIRCanonical.self, for: "url", in: json, context: &instCtx, owner: self) ?? url if nil == url && !instCtx.containsKey("url") { instCtx.addError(FHIRValidationError(missing: "url")) } diff --git a/Sources/Models/Subscription.swift b/Sources/Models/Subscription.swift index 218a1efe..98ed3578 100644 --- a/Sources/Models/Subscription.swift +++ b/Sources/Models/Subscription.swift @@ -2,7 +2,7 @@ // Subscription.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Subscription) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Subscription) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Substance.swift b/Sources/Models/Substance.swift index e23d8b90..f88633b7 100644 --- a/Sources/Models/Substance.swift +++ b/Sources/Models/Substance.swift @@ -2,7 +2,7 @@ // Substance.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Substance) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Substance) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/SubstanceAmount.swift b/Sources/Models/SubstanceAmount.swift index 2d6048bf..4864aa77 100644 --- a/Sources/Models/SubstanceAmount.swift +++ b/Sources/Models/SubstanceAmount.swift @@ -2,7 +2,7 @@ // SubstanceAmount.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/SubstanceAmount) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/SubstanceAmount) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/SubstanceNucleicAcid.swift b/Sources/Models/SubstanceNucleicAcid.swift index f9374487..b99b5a18 100644 --- a/Sources/Models/SubstanceNucleicAcid.swift +++ b/Sources/Models/SubstanceNucleicAcid.swift @@ -2,7 +2,7 @@ // SubstanceNucleicAcid.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/SubstanceNucleicAcid) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/SubstanceNucleicAcid) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/SubstancePolymer.swift b/Sources/Models/SubstancePolymer.swift index 52b5ab60..c4c55d21 100644 --- a/Sources/Models/SubstancePolymer.swift +++ b/Sources/Models/SubstancePolymer.swift @@ -2,7 +2,7 @@ // SubstancePolymer.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/SubstancePolymer) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/SubstancePolymer) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/SubstanceProtein.swift b/Sources/Models/SubstanceProtein.swift index feef2df8..b64e8438 100644 --- a/Sources/Models/SubstanceProtein.swift +++ b/Sources/Models/SubstanceProtein.swift @@ -2,7 +2,7 @@ // SubstanceProtein.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/SubstanceProtein) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/SubstanceProtein) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/SubstanceReferenceInformation.swift b/Sources/Models/SubstanceReferenceInformation.swift index 70685e78..e0d5bc9f 100644 --- a/Sources/Models/SubstanceReferenceInformation.swift +++ b/Sources/Models/SubstanceReferenceInformation.swift @@ -2,7 +2,7 @@ // SubstanceReferenceInformation.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/SubstanceReferenceInformation) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/SubstanceReferenceInformation) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/SubstanceSourceMaterial.swift b/Sources/Models/SubstanceSourceMaterial.swift index 74030337..6bb79b8a 100644 --- a/Sources/Models/SubstanceSourceMaterial.swift +++ b/Sources/Models/SubstanceSourceMaterial.swift @@ -2,7 +2,7 @@ // SubstanceSourceMaterial.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/SubstanceSourceMaterial) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/SubstanceSourceMaterial) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/SubstanceSpecification.swift b/Sources/Models/SubstanceSpecification.swift index 65318458..02041e17 100644 --- a/Sources/Models/SubstanceSpecification.swift +++ b/Sources/Models/SubstanceSpecification.swift @@ -2,7 +2,7 @@ // SubstanceSpecification.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/SubstanceSpecification) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/SubstanceSpecification) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/SupplyDelivery.swift b/Sources/Models/SupplyDelivery.swift index 5471163a..ef079b11 100644 --- a/Sources/Models/SupplyDelivery.swift +++ b/Sources/Models/SupplyDelivery.swift @@ -2,7 +2,7 @@ // SupplyDelivery.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/SupplyDelivery) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/SupplyDelivery) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/SupplyRequest.swift b/Sources/Models/SupplyRequest.swift index 8994f87f..aa1bc101 100644 --- a/Sources/Models/SupplyRequest.swift +++ b/Sources/Models/SupplyRequest.swift @@ -2,7 +2,7 @@ // SupplyRequest.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/SupplyRequest) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/SupplyRequest) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/Task.swift b/Sources/Models/Task.swift index 4469de71..85a5b481 100644 --- a/Sources/Models/Task.swift +++ b/Sources/Models/Task.swift @@ -2,7 +2,7 @@ // Task.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Task) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Task) on 2019-05-21. // 2019, SMART Health IT. // @@ -54,7 +54,7 @@ open class Task: DomainResource { public var input: [TaskInput]? /// Formal definition of task. - public var instantiatesCanonical: FHIRURL? + public var instantiatesCanonical: FHIRCanonical? /// Formal definition of task. public var instantiatesUri: FHIRURL? @@ -134,7 +134,7 @@ open class Task: DomainResource { groupIdentifier = createInstance(type: Identifier.self, for: "groupIdentifier", in: json, context: &instCtx, owner: self) ?? groupIdentifier identifier = createInstances(of: Identifier.self, for: "identifier", in: json, context: &instCtx, owner: self) ?? identifier input = createInstances(of: TaskInput.self, for: "input", in: json, context: &instCtx, owner: self) ?? input - instantiatesCanonical = createInstance(type: FHIRURL.self, for: "instantiatesCanonical", in: json, context: &instCtx, owner: self) ?? instantiatesCanonical + instantiatesCanonical = createInstance(type: FHIRCanonical.self, for: "instantiatesCanonical", in: json, context: &instCtx, owner: self) ?? instantiatesCanonical instantiatesUri = createInstance(type: FHIRURL.self, for: "instantiatesUri", in: json, context: &instCtx, owner: self) ?? instantiatesUri insurance = createInstances(of: Reference.self, for: "insurance", in: json, context: &instCtx, owner: self) ?? insurance intent = createInstance(type: FHIRString.self, for: "intent", in: json, context: &instCtx, owner: self) ?? intent @@ -237,7 +237,7 @@ open class TaskInput: BackboneElement { public var valueBoolean: FHIRBool? /// Content to use in performing the task. - public var valueCanonical: FHIRURL? + public var valueCanonical: FHIRCanonical? /// Content to use in performing the task. public var valueCode: FHIRString? @@ -376,7 +376,7 @@ open class TaskInput: BackboneElement { else if let value = value as? FHIRBool { self.valueBoolean = value } - else if let value = value as? FHIRURL { + else if let value = value as? FHIRCanonical { self.valueCanonical = value } else if let value = value as? FHIRString { @@ -536,7 +536,7 @@ open class TaskInput: BackboneElement { valueAttachment = createInstance(type: Attachment.self, for: "valueAttachment", in: json, context: &instCtx, owner: self) ?? valueAttachment valueBase64Binary = createInstance(type: Base64Binary.self, for: "valueBase64Binary", in: json, context: &instCtx, owner: self) ?? valueBase64Binary valueBoolean = createInstance(type: FHIRBool.self, for: "valueBoolean", in: json, context: &instCtx, owner: self) ?? valueBoolean - valueCanonical = createInstance(type: FHIRURL.self, for: "valueCanonical", in: json, context: &instCtx, owner: self) ?? valueCanonical + valueCanonical = createInstance(type: FHIRCanonical.self, for: "valueCanonical", in: json, context: &instCtx, owner: self) ?? valueCanonical valueCode = createInstance(type: FHIRString.self, for: "valueCode", in: json, context: &instCtx, owner: self) ?? valueCode valueCodeableConcept = createInstance(type: CodeableConcept.self, for: "valueCodeableConcept", in: json, context: &instCtx, owner: self) ?? valueCodeableConcept valueCoding = createInstance(type: Coding.self, for: "valueCoding", in: json, context: &instCtx, owner: self) ?? valueCoding @@ -684,7 +684,7 @@ open class TaskOutput: BackboneElement { public var valueBoolean: FHIRBool? /// Result of output. - public var valueCanonical: FHIRURL? + public var valueCanonical: FHIRCanonical? /// Result of output. public var valueCode: FHIRString? @@ -823,7 +823,7 @@ open class TaskOutput: BackboneElement { else if let value = value as? FHIRBool { self.valueBoolean = value } - else if let value = value as? FHIRURL { + else if let value = value as? FHIRCanonical { self.valueCanonical = value } else if let value = value as? FHIRString { @@ -983,7 +983,7 @@ open class TaskOutput: BackboneElement { valueAttachment = createInstance(type: Attachment.self, for: "valueAttachment", in: json, context: &instCtx, owner: self) ?? valueAttachment valueBase64Binary = createInstance(type: Base64Binary.self, for: "valueBase64Binary", in: json, context: &instCtx, owner: self) ?? valueBase64Binary valueBoolean = createInstance(type: FHIRBool.self, for: "valueBoolean", in: json, context: &instCtx, owner: self) ?? valueBoolean - valueCanonical = createInstance(type: FHIRURL.self, for: "valueCanonical", in: json, context: &instCtx, owner: self) ?? valueCanonical + valueCanonical = createInstance(type: FHIRCanonical.self, for: "valueCanonical", in: json, context: &instCtx, owner: self) ?? valueCanonical valueCode = createInstance(type: FHIRString.self, for: "valueCode", in: json, context: &instCtx, owner: self) ?? valueCode valueCodeableConcept = createInstance(type: CodeableConcept.self, for: "valueCodeableConcept", in: json, context: &instCtx, owner: self) ?? valueCodeableConcept valueCoding = createInstance(type: Coding.self, for: "valueCoding", in: json, context: &instCtx, owner: self) ?? valueCoding diff --git a/Sources/Models/TerminologyCapabilities.swift b/Sources/Models/TerminologyCapabilities.swift index 71f4aeda..f9850393 100644 --- a/Sources/Models/TerminologyCapabilities.swift +++ b/Sources/Models/TerminologyCapabilities.swift @@ -2,7 +2,7 @@ // TerminologyCapabilities.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/TerminologyCapabilities) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/TerminologyCapabilities) on 2019-05-21. // 2019, SMART Health IT. // @@ -224,7 +224,7 @@ open class TerminologyCapabilitiesCodeSystem: BackboneElement { public var subsumption: FHIRBool? /// URI for the Code System. - public var uri: FHIRURL? + public var uri: FHIRCanonical? /// Version of Code System supported. public var version: [TerminologyCapabilitiesCodeSystemVersion]? @@ -234,7 +234,7 @@ open class TerminologyCapabilitiesCodeSystem: BackboneElement { super.populate(from: json, context: &instCtx) subsumption = createInstance(type: FHIRBool.self, for: "subsumption", in: json, context: &instCtx, owner: self) ?? subsumption - uri = createInstance(type: FHIRURL.self, for: "uri", in: json, context: &instCtx, owner: self) ?? uri + uri = createInstance(type: FHIRCanonical.self, for: "uri", in: json, context: &instCtx, owner: self) ?? uri version = createInstances(of: TerminologyCapabilitiesCodeSystemVersion.self, for: "version", in: json, context: &instCtx, owner: self) ?? version } diff --git a/Sources/Models/TestReport.swift b/Sources/Models/TestReport.swift index 3c3d2c53..0eb71ef1 100644 --- a/Sources/Models/TestReport.swift +++ b/Sources/Models/TestReport.swift @@ -2,7 +2,7 @@ // TestReport.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/TestReport) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/TestReport) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/TestScript.swift b/Sources/Models/TestScript.swift index aa614608..036269c8 100644 --- a/Sources/Models/TestScript.swift +++ b/Sources/Models/TestScript.swift @@ -2,7 +2,7 @@ // TestScript.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/TestScript) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/TestScript) on 2019-05-21. // 2019, SMART Health IT. // @@ -348,7 +348,7 @@ open class TestScriptMetadataCapability: BackboneElement { } /// Required Capability Statement. - public var capabilities: FHIRURL? + public var capabilities: FHIRCanonical? /// The expected capabilities of the server. public var description_fhir: FHIRString? @@ -370,7 +370,7 @@ open class TestScriptMetadataCapability: BackboneElement { /** Convenience initializer, taking all required properties as arguments. */ - public convenience init(capabilities: FHIRURL, required: FHIRBool, validated: FHIRBool) { + public convenience init(capabilities: FHIRCanonical, required: FHIRBool, validated: FHIRBool) { self.init() self.capabilities = capabilities self.required = required @@ -381,7 +381,7 @@ open class TestScriptMetadataCapability: BackboneElement { override open func populate(from json: FHIRJSON, context instCtx: inout FHIRInstantiationContext) { super.populate(from: json, context: &instCtx) - capabilities = createInstance(type: FHIRURL.self, for: "capabilities", in: json, context: &instCtx, owner: self) ?? capabilities + capabilities = createInstance(type: FHIRCanonical.self, for: "capabilities", in: json, context: &instCtx, owner: self) ?? capabilities if nil == capabilities && !instCtx.containsKey("capabilities") { instCtx.addError(FHIRValidationError(missing: "capabilities")) } diff --git a/Sources/Models/Timing.swift b/Sources/Models/Timing.swift index 6567af08..742c6442 100644 --- a/Sources/Models/Timing.swift +++ b/Sources/Models/Timing.swift @@ -2,7 +2,7 @@ // Timing.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Timing) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/Timing) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/TriggerDefinition.swift b/Sources/Models/TriggerDefinition.swift index 83bee2e2..48285ebb 100644 --- a/Sources/Models/TriggerDefinition.swift +++ b/Sources/Models/TriggerDefinition.swift @@ -2,7 +2,7 @@ // TriggerDefinition.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/TriggerDefinition) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/TriggerDefinition) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/UsageContext.swift b/Sources/Models/UsageContext.swift index c8d7fac1..669b2c3e 100644 --- a/Sources/Models/UsageContext.swift +++ b/Sources/Models/UsageContext.swift @@ -2,7 +2,7 @@ // UsageContext.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/UsageContext) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/UsageContext) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/ValueSet.swift b/Sources/Models/ValueSet.swift index 83517b7f..b2a3ba19 100644 --- a/Sources/Models/ValueSet.swift +++ b/Sources/Models/ValueSet.swift @@ -2,7 +2,7 @@ // ValueSet.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ValueSet) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/ValueSet) on 2019-05-21. // 2019, SMART Health IT. // @@ -214,7 +214,7 @@ open class ValueSetComposeInclude: BackboneElement { public var system: FHIRURL? /// Select the contents included in this value set. - public var valueSet: [FHIRURL]? + public var valueSet: [FHIRCanonical]? /// Specific version of the code system referred to. public var version: FHIRString? @@ -226,7 +226,7 @@ open class ValueSetComposeInclude: BackboneElement { concept = createInstances(of: ValueSetComposeIncludeConcept.self, for: "concept", in: json, context: &instCtx, owner: self) ?? concept filter = createInstances(of: ValueSetComposeIncludeFilter.self, for: "filter", in: json, context: &instCtx, owner: self) ?? filter system = createInstance(type: FHIRURL.self, for: "system", in: json, context: &instCtx, owner: self) ?? system - valueSet = createInstances(of: FHIRURL.self, for: "valueSet", in: json, context: &instCtx, owner: self) ?? valueSet + valueSet = createInstances(of: FHIRCanonical.self, for: "valueSet", in: json, context: &instCtx, owner: self) ?? valueSet version = createInstance(type: FHIRString.self, for: "version", in: json, context: &instCtx, owner: self) ?? version } diff --git a/Sources/Models/VerificationResult.swift b/Sources/Models/VerificationResult.swift index 2eb4db43..ab788be1 100644 --- a/Sources/Models/VerificationResult.swift +++ b/Sources/Models/VerificationResult.swift @@ -2,7 +2,7 @@ // VerificationResult.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/VerificationResult) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/VerificationResult) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Sources/Models/VisionPrescription.swift b/Sources/Models/VisionPrescription.swift index da4b0a87..756568ca 100644 --- a/Sources/Models/VisionPrescription.swift +++ b/Sources/Models/VisionPrescription.swift @@ -2,7 +2,7 @@ // VisionPrescription.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/VisionPrescription) on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b (http://hl7.org/fhir/StructureDefinition/VisionPrescription) on 2019-05-21. // 2019, SMART Health IT. // diff --git a/SwiftFHIR.xcodeproj/project.pbxproj b/SwiftFHIR.xcodeproj/project.pbxproj index 08ba3a11..a3ef04d8 100644 --- a/SwiftFHIR.xcodeproj/project.pbxproj +++ b/SwiftFHIR.xcodeproj/project.pbxproj @@ -7,6 +7,14 @@ objects = { /* Begin PBXBuildFile section */ + B45EC456228FB4B2004495F7 /* FHIRCanonical.swift in Sources */ = {isa = PBXBuildFile; fileRef = B45EC455228FB4B2004495F7 /* FHIRCanonical.swift */; }; + B45EC457228FB4B2004495F7 /* FHIRCanonical.swift in Sources */ = {isa = PBXBuildFile; fileRef = B45EC455228FB4B2004495F7 /* FHIRCanonical.swift */; }; + B45EC458228FB4B2004495F7 /* FHIRCanonical.swift in Sources */ = {isa = PBXBuildFile; fileRef = B45EC455228FB4B2004495F7 /* FHIRCanonical.swift */; }; + B45EC45A228FB540004495F7 /* FHIRCanonical+Resolving.swift in Sources */ = {isa = PBXBuildFile; fileRef = B45EC459228FB540004495F7 /* FHIRCanonical+Resolving.swift */; }; + B45EC45B228FB540004495F7 /* FHIRCanonical+Resolving.swift in Sources */ = {isa = PBXBuildFile; fileRef = B45EC459228FB540004495F7 /* FHIRCanonical+Resolving.swift */; }; + B45EC45C228FB540004495F7 /* FHIRCanonical+Resolving.swift in Sources */ = {isa = PBXBuildFile; fileRef = B45EC459228FB540004495F7 /* FHIRCanonical+Resolving.swift */; }; + B45EC461228FB696004495F7 /* CanonicalTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B45EC45D228FB5F2004495F7 /* CanonicalTests.swift */; }; + B45EC462228FB69A004495F7 /* CanonicalTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B45EC45D228FB5F2004495F7 /* CanonicalTests.swift */; }; B47BEB04221E32AF00929C5D /* BiologicallyDerivedProduct.swift in Sources */ = {isa = PBXBuildFile; fileRef = B47BEAD4221E32AA00929C5D /* BiologicallyDerivedProduct.swift */; }; B47BEB05221E32AF00929C5D /* CoverageEligibilityResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = B47BEAD5221E32AA00929C5D /* CoverageEligibilityResponse.swift */; }; B47BEB06221E32AF00929C5D /* BodyStructure.swift in Sources */ = {isa = PBXBuildFile; fileRef = B47BEAD6221E32AA00929C5D /* BodyStructure.swift */; }; @@ -923,6 +931,9 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + B45EC455228FB4B2004495F7 /* FHIRCanonical.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FHIRCanonical.swift; sourceTree = ""; }; + B45EC459228FB540004495F7 /* FHIRCanonical+Resolving.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "FHIRCanonical+Resolving.swift"; sourceTree = ""; }; + B45EC45D228FB5F2004495F7 /* CanonicalTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CanonicalTests.swift; sourceTree = ""; }; B47BEAD4221E32AA00929C5D /* BiologicallyDerivedProduct.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiologicallyDerivedProduct.swift; sourceTree = ""; }; B47BEAD5221E32AA00929C5D /* CoverageEligibilityResponse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoverageEligibilityResponse.swift; sourceTree = ""; }; B47BEAD6221E32AA00929C5D /* BodyStructure.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BodyStructure.swift; sourceTree = ""; }; @@ -1444,6 +1455,7 @@ EE1310B31C1B435300D9DAE7 /* FHIRAbstractBase+Factory.swift */, EE1310B41C1B435300D9DAE7 /* FHIRAbstractResource.swift */, EEED291A1DF94619007ADD02 /* FHIRBool.swift */, + B45EC455228FB4B2004495F7 /* FHIRCanonical.swift */, EEB4302E1DF973010040415A /* FHIRDecimal.swift */, EE86F3ED1DF9BDE100922994 /* FHIREnum.swift */, EE1310D01C1B602B00D9DAE7 /* FHIRError.swift */, @@ -1582,6 +1594,7 @@ EE8250321DD61DBD0097A737 /* ClientTests */ = { isa = PBXGroup; children = ( + B45EC45D228FB5F2004495F7 /* CanonicalTests.swift */, EE109CEA1DF75A2C00DB1774 /* PrimitiveTests.swift */, EEE5DF361A5D862B002AFF53 /* FHIRSearchTests.swift */, EE1F49D41C0D14F60095BF0F /* ReferenceTests.swift */, @@ -1611,6 +1624,7 @@ EE1310CE1C1B5EE500D9DAE7 /* Resource+Instantiation.swift */, EE9B31FF1ACADE8000980AA9 /* Reference+Resolving.swift */, EE01F96F1C58F6AB003AEA7E /* DomainResource+Containment.swift */, + B45EC459228FB540004495F7 /* FHIRCanonical+Resolving.swift */, EE02F6ED1ACF257000179969 /* FHIRSearch.swift */, EE9EE2601ACB43D1004DBCBB /* FHIROperation.swift */, EE9ABA2A1D803D8400BA8B54 /* Patient+SMART.swift */, @@ -1863,27 +1877,27 @@ attributes = { LastSwiftMigration = 0700; LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 1010; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = "SMART Health IT"; TargetAttributes = { EE684C1D19A789BA00B5A2C0 = { CreatedOnToolsVersion = 6.0; - LastSwiftMigration = 1010; + LastSwiftMigration = 1020; ProvisioningStyle = Automatic; }; EE684C2819A789BA00B5A2C0 = { CreatedOnToolsVersion = 6.0; - LastSwiftMigration = 1010; + LastSwiftMigration = 1020; }; EE6DA7CD1A5D4B1000E00708 = { - LastSwiftMigration = 1010; + LastSwiftMigration = 1020; }; EE6DA85C1A5D4B3A00E00708 = { CreatedOnToolsVersion = 6.2; - LastSwiftMigration = 1010; + LastSwiftMigration = 1020; }; EEB830591E67278C0084E030 = { - LastSwiftMigration = 1010; + LastSwiftMigration = 1020; }; }; }; @@ -1892,6 +1906,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = EE684C1419A789BA00B5A2C0; @@ -1976,6 +1991,7 @@ B47BEB10221E32AF00929C5D /* SubstanceNucleicAcid.swift in Sources */, EE02F6951ACF252000179969 /* NamingSystem.swift in Sources */, EE02F61D1ACF252000179969 /* Claim.swift in Sources */, + B45EC456228FB4B2004495F7 /* FHIRCanonical.swift in Sources */, EE02F6211ACF252000179969 /* ClinicalImpression.swift in Sources */, EE02F61B1ACF252000179969 /* CarePlan.swift in Sources */, EE02F6E31ACF252000179969 /* Substance.swift in Sources */, @@ -2103,6 +2119,7 @@ EEA97F9C1DCA1C6F00C3F016 /* RequestGroup.swift in Sources */, EE4720A11E5F2C86008E3BB6 /* Resource+Meta.swift in Sources */, EE1310DA1C1B681500D9DAE7 /* FHIRServerDataResponse.swift in Sources */, + B45EC45A228FB540004495F7 /* FHIRCanonical+Resolving.swift in Sources */, EE02F65D1ACF252000179969 /* Encounter.swift in Sources */, EE02F6C71ACF252000179969 /* Ratio.swift in Sources */, B47BEB24221E32AF00929C5D /* MedicinalProductManufactured.swift in Sources */, @@ -2245,6 +2262,7 @@ EE31DC571D64AC3600B04BEA /* EndpointTests.swift in Sources */, EEA97F961DCA1C3C00C3F016 /* RequestGroupTests.swift in Sources */, EE02F7941ACF259B00179969 /* EpisodeOfCareTests.swift in Sources */, + B45EC461228FB696004495F7 /* CanonicalTests.swift in Sources */, EE02F7581ACF259B00179969 /* BundleTests.swift in Sources */, EE02F7721ACF259B00179969 /* CoverageTests.swift in Sources */, EE1F49D51C0D14F60095BF0F /* ReferenceTests.swift in Sources */, @@ -2326,6 +2344,7 @@ B47BEB48221E336A00929C5D /* MedicinalProductContraindication.swift in Sources */, B47BEB49221E336A00929C5D /* MedicinalProductIndication.swift in Sources */, B47BEB4A221E336A00929C5D /* MedicinalProductIngredient.swift in Sources */, + B45EC457228FB4B2004495F7 /* FHIRCanonical.swift in Sources */, B47BEB4B221E336A00929C5D /* MedicinalProductInteraction.swift in Sources */, B47BEB4C221E336A00929C5D /* MedicinalProductManufactured.swift in Sources */, B47BEB4D221E336A00929C5D /* MedicinalProductPackaged.swift in Sources */, @@ -2453,6 +2472,7 @@ EE65DB771CB39FFD00E25C72 /* MeasureReport.swift in Sources */, EE02F6681ACF252000179969 /* Extension.swift in Sources */, EE65DB6D1CB39FFD00E25C72 /* CompartmentDefinition.swift in Sources */, + B45EC45B228FB540004495F7 /* FHIRCanonical+Resolving.swift in Sources */, EE1310D51C1B605D00D9DAE7 /* Resource+Instantiation.swift in Sources */, EE02F6EF1ACF257000179969 /* FHIRSearch.swift in Sources */, EE02F63C1ACF252000179969 /* Coverage.swift in Sources */, @@ -2595,6 +2615,7 @@ EE65DB651CB39FE200E25C72 /* PractitionerRoleTests.swift in Sources */, EE3906A01CD3E4F6008FECEA /* RequestTests.swift in Sources */, EE02F7591ACF259B00179969 /* BundleTests.swift in Sources */, + B45EC462228FB69A004495F7 /* CanonicalTests.swift in Sources */, EEA97F971DCA1C3C00C3F016 /* RequestGroupTests.swift in Sources */, EE02F7731ACF259B00179969 /* CoverageTests.swift in Sources */, EE82503F1DD61DE20097A737 /* ResourceTests.swift in Sources */, @@ -2740,6 +2761,7 @@ B4FA8C81221F16A500BD72A1 /* MedicinalProductIndication.swift in Sources */, B4FA8C82221F16A500BD72A1 /* MedicinalProductIngredient.swift in Sources */, B4FA8C83221F16A500BD72A1 /* MedicinalProductInteraction.swift in Sources */, + B45EC45C228FB540004495F7 /* FHIRCanonical+Resolving.swift in Sources */, B4FA8C84221F16A500BD72A1 /* MedicinalProductManufactured.swift in Sources */, B4FA8C85221F16A500BD72A1 /* MedicinalProductPackaged.swift in Sources */, B4FA8C86221F16A500BD72A1 /* MedicinalProductPharmaceutical.swift in Sources */, @@ -2815,6 +2837,7 @@ B4FA8C24221F025700BD72A1 /* ParameterDefinition.swift in Sources */, B4FA8C25221F025700BD72A1 /* UsageContext.swift in Sources */, EEB831DF1E672A5E0084E030 /* FHIRServer.swift in Sources */, + B45EC458228FB4B2004495F7 /* FHIRCanonical.swift in Sources */, EEB831CE1E672A210084E030 /* DateAndTime.swift in Sources */, EEB831C71E6729FD0084E030 /* CodeSystems.swift in Sources */, EEB831EE1E672AB50084E030 /* Ratio.swift in Sources */, @@ -2896,6 +2919,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -2954,6 +2978,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -3017,8 +3042,7 @@ PRODUCT_NAME = SwiftFHIR; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -3040,8 +3064,7 @@ SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -3056,8 +3079,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.chip.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -3073,8 +3095,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -3097,8 +3118,7 @@ PRODUCT_NAME = SwiftFHIR; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -3122,8 +3142,7 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -3139,8 +3158,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "org.chip.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -3157,8 +3175,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -3181,8 +3198,7 @@ PRODUCT_NAME = SwiftFHIRMin; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -3206,8 +3222,7 @@ SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/SwiftFHIR.xcodeproj/xcshareddata/xcschemes/SwiftFHIR-iOS.xcscheme b/SwiftFHIR.xcodeproj/xcshareddata/xcschemes/SwiftFHIR-iOS.xcscheme index 23bdd9e6..60bb5509 100644 --- a/SwiftFHIR.xcodeproj/xcshareddata/xcschemes/SwiftFHIR-iOS.xcscheme +++ b/SwiftFHIR.xcodeproj/xcshareddata/xcschemes/SwiftFHIR-iOS.xcscheme @@ -1,6 +1,6 @@ SwiftFHIROperationDefinition { let inst = (nil != json) ? try instantiateFrom(json: json!) : try instantiateFrom(filename: "operationdefinition-example.json") - XCTAssertEqual(inst.base?.absoluteString, "OperationDefinition/Questionnaire-populate") + // Don't know how to create unit test for "base", which is a FHIRCanonical XCTAssertEqual(inst.code, "populate") XCTAssertEqual(inst.comment, "Only implemented for Labs and Medications so far") XCTAssertEqual(inst.contact?[0].name, "System Administrator") diff --git a/Tests/ModelTests/OperationOutcomeTests.swift b/Tests/ModelTests/OperationOutcomeTests.swift index 9e60df67..91abda46 100644 --- a/Tests/ModelTests/OperationOutcomeTests.swift +++ b/Tests/ModelTests/OperationOutcomeTests.swift @@ -2,7 +2,7 @@ // OperationOutcomeTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/OrganizationAffiliationTests.swift b/Tests/ModelTests/OrganizationAffiliationTests.swift index e65f51dc..47c7ce6b 100644 --- a/Tests/ModelTests/OrganizationAffiliationTests.swift +++ b/Tests/ModelTests/OrganizationAffiliationTests.swift @@ -2,7 +2,7 @@ // OrganizationAffiliationTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/OrganizationTests.swift b/Tests/ModelTests/OrganizationTests.swift index 011339a8..69246f7f 100644 --- a/Tests/ModelTests/OrganizationTests.swift +++ b/Tests/ModelTests/OrganizationTests.swift @@ -2,7 +2,7 @@ // OrganizationTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/ParametersTests.swift b/Tests/ModelTests/ParametersTests.swift index a2b3edb5..38537e1c 100644 --- a/Tests/ModelTests/ParametersTests.swift +++ b/Tests/ModelTests/ParametersTests.swift @@ -2,7 +2,7 @@ // ParametersTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/PatientTests.swift b/Tests/ModelTests/PatientTests.swift index 51707a43..c08e373f 100644 --- a/Tests/ModelTests/PatientTests.swift +++ b/Tests/ModelTests/PatientTests.swift @@ -2,7 +2,7 @@ // PatientTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/PaymentNoticeTests.swift b/Tests/ModelTests/PaymentNoticeTests.swift index 62113e92..c3bf3db6 100644 --- a/Tests/ModelTests/PaymentNoticeTests.swift +++ b/Tests/ModelTests/PaymentNoticeTests.swift @@ -2,7 +2,7 @@ // PaymentNoticeTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/PaymentReconciliationTests.swift b/Tests/ModelTests/PaymentReconciliationTests.swift index a4e33705..5ec722e6 100644 --- a/Tests/ModelTests/PaymentReconciliationTests.swift +++ b/Tests/ModelTests/PaymentReconciliationTests.swift @@ -2,7 +2,7 @@ // PaymentReconciliationTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/PersonTests.swift b/Tests/ModelTests/PersonTests.swift index 03ed09ac..32657969 100644 --- a/Tests/ModelTests/PersonTests.swift +++ b/Tests/ModelTests/PersonTests.swift @@ -2,7 +2,7 @@ // PersonTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/PlanDefinitionTests.swift b/Tests/ModelTests/PlanDefinitionTests.swift index 490fbb56..733088a4 100644 --- a/Tests/ModelTests/PlanDefinitionTests.swift +++ b/Tests/ModelTests/PlanDefinitionTests.swift @@ -2,7 +2,7 @@ // PlanDefinitionTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // @@ -40,7 +40,7 @@ class PlanDefinitionTests: XCTestCase { func runPlanDefinition1(_ json: FHIRJSON? = nil) throws -> SwiftFHIRPlanDefinition { let inst = (nil != json) ? try instantiateFrom(json: json!) : try instantiateFrom(filename: "plandefinition-example-kdn5-simplified.json") - XCTAssertEqual(inst.action?[0].action?[0].action?[0].action?[0].action?[0].definitionCanonical?.absoluteString, "#1111") + // Don't know how to create unit test for "action?[0].action?[0].action?[0].action?[0].action?[0].definitionCanonical", which is a FHIRCanonical XCTAssertEqual(inst.action?[0].action?[0].action?[0].action?[0].action?[0].extension_fhir?[0].extension_fhir?[0].url, "day") XCTAssertEqual(inst.action?[0].action?[0].action?[0].action?[0].action?[0].extension_fhir?[0].extension_fhir?[0].valueInteger, 1) XCTAssertEqual(inst.action?[0].action?[0].action?[0].action?[0].action?[0].extension_fhir?[0].extension_fhir?[1].url, "day") @@ -48,7 +48,7 @@ class PlanDefinitionTests: XCTestCase { XCTAssertEqual(inst.action?[0].action?[0].action?[0].action?[0].action?[0].extension_fhir?[0].url, "http://hl7.org/fhir/StructureDefinition/timing-daysOfCycle") XCTAssertEqual(inst.action?[0].action?[0].action?[0].action?[0].action?[0].id, "action-1") XCTAssertEqual(inst.action?[0].action?[0].action?[0].action?[0].action?[0].textEquivalent, "Gemcitabine 1250 mg/m² IV over 30 minutes on days 1 and 8") - XCTAssertEqual(inst.action?[0].action?[0].action?[0].action?[0].action?[1].definitionCanonical?.absoluteString, "#2222") + // Don't know how to create unit test for "action?[0].action?[0].action?[0].action?[0].action?[1].definitionCanonical", which is a FHIRCanonical XCTAssertEqual(inst.action?[0].action?[0].action?[0].action?[0].action?[1].extension_fhir?[0].extension_fhir?[0].url, "day") XCTAssertEqual(inst.action?[0].action?[0].action?[0].action?[0].action?[1].extension_fhir?[0].extension_fhir?[0].valueInteger, 1) XCTAssertEqual(inst.action?[0].action?[0].action?[0].action?[0].action?[1].extension_fhir?[0].url, "http://hl7.org/fhir/StructureDefinition/timing-daysOfCycle") @@ -138,10 +138,10 @@ class PlanDefinitionTests: XCTestCase { func runPlanDefinition2(_ json: FHIRJSON? = nil) throws -> SwiftFHIRPlanDefinition { let inst = (nil != json) ? try instantiateFrom(json: json!) : try instantiateFrom(filename: "plandefinition-options-example.json") - XCTAssertEqual(inst.action?[0].action?[0].definitionCanonical?.absoluteString, "#activitydefinition-medicationrequest-1") + // Don't know how to create unit test for "action?[0].action?[0].definitionCanonical", which is a FHIRCanonical XCTAssertEqual(inst.action?[0].action?[0].id, "medication-action-1") XCTAssertEqual(inst.action?[0].action?[0].title, "Administer Medication 1") - XCTAssertEqual(inst.action?[0].action?[1].definitionCanonical?.absoluteString, "#activitydefinition-medicationrequest-2") + // Don't know how to create unit test for "action?[0].action?[1].definitionCanonical", which is a FHIRCanonical XCTAssertEqual(inst.action?[0].action?[1].id, "medication-action-2") XCTAssertEqual(inst.action?[0].action?[1].relatedAction?[0].actionId, "medication-action-1") XCTAssertEqual(inst.action?[0].action?[1].relatedAction?[0].offsetDuration?.unit, "h") @@ -178,7 +178,7 @@ class PlanDefinitionTests: XCTestCase { func runPlanDefinition3(_ json: FHIRJSON? = nil) throws -> SwiftFHIRPlanDefinition { let inst = (nil != json) ? try instantiateFrom(json: json!) : try instantiateFrom(filename: "plandefinition-example-cardiology-os.json") - XCTAssertEqual(inst.action?[0].action?[0].action?[0].definitionCanonical?.absoluteString, "#referralToCardiologyConsult") + // Don't know how to create unit test for "action?[0].action?[0].action?[0].definitionCanonical", which is a FHIRCanonical XCTAssertEqual(inst.action?[0].action?[0].action?[0].dynamicValue?[0].expression?.expression, "Now()") XCTAssertEqual(inst.action?[0].action?[0].action?[0].dynamicValue?[0].expression?.language, "text/cql") XCTAssertEqual(inst.action?[0].action?[0].action?[0].dynamicValue?[0].path, "timing.event") @@ -201,16 +201,16 @@ class PlanDefinitionTests: XCTestCase { XCTAssertEqual(inst.action?[0].action?[0].action?[0].dynamicValue?[6].expression?.language, "text/cql") XCTAssertEqual(inst.action?[0].action?[0].action?[0].dynamicValue?[6].path, "reasonReference") XCTAssertEqual(inst.action?[0].action?[0].action?[0].textEquivalent, "Referral to cardiology to evaluate chest pain (routine)") - XCTAssertEqual(inst.action?[0].action?[0].action?[1].definitionCanonical?.absoluteString, "#CollectReferralReason") + // Don't know how to create unit test for "action?[0].action?[0].action?[1].definitionCanonical", which is a FHIRCanonical XCTAssertEqual(inst.action?[0].action?[0].action?[1].title, "Reason for cardiology consultation") - XCTAssertEqual(inst.action?[0].action?[0].action?[2].definitionCanonical?.absoluteString, "#CardiologyConsultationGoal") + // Don't know how to create unit test for "action?[0].action?[0].action?[2].definitionCanonical", which is a FHIRCanonical XCTAssertEqual(inst.action?[0].action?[0].action?[2].title, "Goal of cardiology consultation") XCTAssertEqual(inst.action?[0].action?[0].groupingBehavior, ActionGroupingBehavior(rawValue: "logical-group")!) XCTAssertEqual(inst.action?[0].action?[0].selectionBehavior, ActionSelectionBehavior(rawValue: "any")!) XCTAssertEqual(inst.action?[0].action?[0].title, "Consults and Referrals") XCTAssertEqual(inst.action?[0].action?[1].action?[0].groupingBehavior, ActionGroupingBehavior(rawValue: "logical-group")!) XCTAssertEqual(inst.action?[0].action?[1].action?[0].selectionBehavior, ActionSelectionBehavior(rawValue: "at-most-one")!) - XCTAssertEqual(inst.action?[0].action?[1].action?[1].action?[0].definitionCanonical?.absoluteString, "#metoprololTartrate25Prescription") + // Don't know how to create unit test for "action?[0].action?[1].action?[1].action?[0].definitionCanonical", which is a FHIRCanonical XCTAssertEqual(inst.action?[0].action?[1].action?[1].action?[0].dynamicValue?[0].expression?.expression, "'draft'") XCTAssertEqual(inst.action?[0].action?[1].action?[1].action?[0].dynamicValue?[0].expression?.language, "text/cql") XCTAssertEqual(inst.action?[0].action?[1].action?[1].action?[0].dynamicValue?[0].path, "status") @@ -221,7 +221,7 @@ class PlanDefinitionTests: XCTestCase { XCTAssertEqual(inst.action?[0].action?[1].action?[1].action?[0].dynamicValue?[2].expression?.language, "text/cql") XCTAssertEqual(inst.action?[0].action?[1].action?[1].action?[0].dynamicValue?[2].path, "prescriber") XCTAssertEqual(inst.action?[0].action?[1].action?[1].action?[0].textEquivalent, "metoprolol tartrate 25 mg tablet 1 tablet oral 2 time daily") - XCTAssertEqual(inst.action?[0].action?[1].action?[1].action?[1].definitionCanonical?.absoluteString, "#metoprololTartrate50Prescription") + // Don't know how to create unit test for "action?[0].action?[1].action?[1].action?[1].definitionCanonical", which is a FHIRCanonical XCTAssertEqual(inst.action?[0].action?[1].action?[1].action?[1].dynamicValue?[0].expression?.expression, "'draft'") XCTAssertEqual(inst.action?[0].action?[1].action?[1].action?[1].dynamicValue?[0].expression?.language, "text/cql") XCTAssertEqual(inst.action?[0].action?[1].action?[1].action?[1].dynamicValue?[0].path, "status") @@ -232,7 +232,7 @@ class PlanDefinitionTests: XCTestCase { XCTAssertEqual(inst.action?[0].action?[1].action?[1].action?[1].dynamicValue?[2].expression?.language, "text/cql") XCTAssertEqual(inst.action?[0].action?[1].action?[1].action?[1].dynamicValue?[2].path, "prescriber") XCTAssertEqual(inst.action?[0].action?[1].action?[1].action?[1].textEquivalent, "metoprolol tartrate 50 mg tablet 1 tablet oral 2 time daily") - XCTAssertEqual(inst.action?[0].action?[1].action?[1].action?[2].definitionCanonical?.absoluteString, "#amlodipinePrescription") + // Don't know how to create unit test for "action?[0].action?[1].action?[1].action?[2].definitionCanonical", which is a FHIRCanonical XCTAssertEqual(inst.action?[0].action?[1].action?[1].action?[2].dynamicValue?[0].expression?.expression, "'draft'") XCTAssertEqual(inst.action?[0].action?[1].action?[1].action?[2].dynamicValue?[0].expression?.language, "text/cql") XCTAssertEqual(inst.action?[0].action?[1].action?[1].action?[2].dynamicValue?[0].path, "status") @@ -246,7 +246,7 @@ class PlanDefinitionTests: XCTestCase { XCTAssertEqual(inst.action?[0].action?[1].action?[1].groupingBehavior, ActionGroupingBehavior(rawValue: "logical-group")!) XCTAssertEqual(inst.action?[0].action?[1].action?[1].selectionBehavior, ActionSelectionBehavior(rawValue: "at-most-one")!) XCTAssertEqual(inst.action?[0].action?[1].action?[1].title, "Antianginal Therapy") - XCTAssertEqual(inst.action?[0].action?[1].action?[2].action?[0].definitionCanonical?.absoluteString, "#nitroglycerinPrescription") + // Don't know how to create unit test for "action?[0].action?[1].action?[2].action?[0].definitionCanonical", which is a FHIRCanonical XCTAssertEqual(inst.action?[0].action?[1].action?[2].action?[0].dynamicValue?[0].expression?.expression, "'draft'") XCTAssertEqual(inst.action?[0].action?[1].action?[2].action?[0].dynamicValue?[0].expression?.language, "text/cql") XCTAssertEqual(inst.action?[0].action?[1].action?[2].action?[0].dynamicValue?[0].path, "status") @@ -285,7 +285,7 @@ class PlanDefinitionTests: XCTestCase { XCTAssertEqual(inst.identifier?[1].value, "CLIN0004AG") XCTAssertEqual(inst.identifier?[2].system?.absoluteString, "urn:cognitivemedicine.com:lab:jira") XCTAssertEqual(inst.identifier?[2].value, "KP-914") - XCTAssertEqual(inst.library?[0].absoluteString, "#cardiology-chestPain-logic") + // Don't know how to create unit test for "library?[0]", which is a FHIRCanonical XCTAssertEqual(inst.name, "ChestPainCoronaryArteryDiseaseOrderSetKNART") XCTAssertEqual(inst.publisher, "Department of Veterans Affairs") XCTAssertEqual(inst.relatedArtifact?[0].display, "Cardiology: Chest Pain (CP) / Coronary Artery Disease (CAD) Clinical Content White Paper") @@ -351,7 +351,7 @@ class PlanDefinitionTests: XCTestCase { XCTAssertEqual(inst.action?[0].condition?[0].expression?.expression, "exists ([Condition: Obesity]) or not exists ([Observation: BMI] O where O.effectiveDateTime 2 years or less before Today())") XCTAssertEqual(inst.action?[0].condition?[0].expression?.language, "text/cql") XCTAssertEqual(inst.action?[0].condition?[0].kind, ActionConditionKind(rawValue: "applicability")!) - XCTAssertEqual(inst.action?[0].definitionCanonical?.absoluteString, "#procedure") + // Don't know how to create unit test for "action?[0].definitionCanonical", which is a FHIRCanonical XCTAssertEqual(inst.action?[0].description_fhir, "Measure, Weight, Height, Waist, Circumference; Calculate BMI") XCTAssertEqual(inst.action?[0].goalId?[0], "reduce-bmi-ratio") XCTAssertEqual(inst.action?[0].requiredBehavior, ActionRequiredBehavior(rawValue: "must-unless-documented")!) @@ -414,7 +414,7 @@ class PlanDefinitionTests: XCTestCase { func runPlanDefinition5(_ json: FHIRJSON? = nil) throws -> SwiftFHIRPlanDefinition { let inst = (nil != json) ? try instantiateFrom(json: json!) : try instantiateFrom(filename: "plandefinition-example.json") - XCTAssertEqual(inst.action?[0].action?[0].action?[0].definitionCanonical?.absoluteString, "#referralToMentalHealthCare") + // Don't know how to create unit test for "action?[0].action?[0].action?[0].definitionCanonical", which is a FHIRCanonical XCTAssertEqual(inst.action?[0].action?[0].action?[0].dynamicValue?[0].expression?.expression, "Now()") XCTAssertEqual(inst.action?[0].action?[0].action?[0].dynamicValue?[0].expression?.language, "text/cql") XCTAssertEqual(inst.action?[0].action?[0].action?[0].dynamicValue?[0].path, "timing.event") @@ -440,7 +440,7 @@ class PlanDefinitionTests: XCTestCase { XCTAssertEqual(inst.action?[0].action?[0].groupingBehavior, ActionGroupingBehavior(rawValue: "logical-group")!) XCTAssertEqual(inst.action?[0].action?[0].selectionBehavior, ActionSelectionBehavior(rawValue: "any")!) XCTAssertEqual(inst.action?[0].action?[0].title, "Consults and Referrals") - XCTAssertEqual(inst.action?[0].action?[1].action?[0].action?[0].action?[0].definitionCanonical?.absoluteString, "#citalopramPrescription") + // Don't know how to create unit test for "action?[0].action?[1].action?[0].action?[0].action?[0].definitionCanonical", which is a FHIRCanonical XCTAssertEqual(inst.action?[0].action?[1].action?[0].action?[0].action?[0].dynamicValue?[0].expression?.expression, "'draft'") XCTAssertEqual(inst.action?[0].action?[1].action?[0].action?[0].action?[0].dynamicValue?[0].expression?.language, "text/cql") XCTAssertEqual(inst.action?[0].action?[1].action?[0].action?[0].action?[0].dynamicValue?[0].path, "status") @@ -517,16 +517,16 @@ class PlanDefinitionTests: XCTestCase { XCTAssertEqual(inst.jurisdiction?[0].coding?[0].code, "US") XCTAssertEqual(inst.jurisdiction?[0].coding?[0].system?.absoluteString, "urn:iso:std:iso:3166") XCTAssertEqual(inst.lastReviewDate?.description, "2016-08-15") - XCTAssertEqual(inst.library?[0].absoluteString, "Library/suiciderisk-orderset-logic") + // Don't know how to create unit test for "library?[0]", which is a FHIRCanonical XCTAssertEqual(inst.name, "LowSuicideRiskOrderSet") XCTAssertEqual(inst.publisher, "Motive Medical Intelligence") XCTAssertEqual(inst.purpose, "This order set helps ensure consistent application of appropriate orders for the care of low suicide risk patients.") XCTAssertEqual(inst.relatedArtifact?[0].display, "Practice Guideline for the Treatment of Patients with Major Depressive Disorder") XCTAssertEqual(inst.relatedArtifact?[0].type, RelatedArtifactType(rawValue: "derived-from")!) XCTAssertEqual(inst.relatedArtifact?[0].url?.absoluteString, "http://psychiatryonline.org/pb/assets/raw/sitewide/practice_guidelines/guidelines/mdd.pdf") - XCTAssertEqual(inst.relatedArtifact?[1].resource?.absoluteString, "ActivityDefinition/referralPrimaryCareMentalHealth") + // Don't know how to create unit test for "relatedArtifact?[1].resource", which is a FHIRCanonical XCTAssertEqual(inst.relatedArtifact?[1].type, RelatedArtifactType(rawValue: "composed-of")!) - XCTAssertEqual(inst.relatedArtifact?[2].resource?.absoluteString, "ActivityDefinition/citalopramPrescription") + // Don't know how to create unit test for "relatedArtifact?[2].resource", which is a FHIRCanonical XCTAssertEqual(inst.relatedArtifact?[2].type, RelatedArtifactType(rawValue: "composed-of")!) XCTAssertEqual(inst.status, PublicationStatus(rawValue: "active")!) XCTAssertEqual(inst.text?.status, NarrativeStatus(rawValue: "generated")!) @@ -591,21 +591,21 @@ class PlanDefinitionTests: XCTestCase { XCTAssertEqual(inst.action?[0].action?[0].condition?[0].expression?.expression, "Should Administer Zika Virus Exposure Assessment") XCTAssertEqual(inst.action?[0].action?[0].condition?[0].expression?.language, "text/cql") XCTAssertEqual(inst.action?[0].action?[0].condition?[0].kind, ActionConditionKind(rawValue: "applicability")!) - XCTAssertEqual(inst.action?[0].action?[0].definitionCanonical?.absoluteString, "ActivityDefinition/administer-zika-virus-exposure-assessment") + // Don't know how to create unit test for "action?[0].action?[0].definitionCanonical", which is a FHIRCanonical XCTAssertEqual(inst.action?[0].action?[1].condition?[0].expression?.expression, "Should Order Serum + Urine rRT-PCR Test") XCTAssertEqual(inst.action?[0].action?[1].condition?[0].expression?.language, "text/cql") XCTAssertEqual(inst.action?[0].action?[1].condition?[0].kind, ActionConditionKind(rawValue: "applicability")!) - XCTAssertEqual(inst.action?[0].action?[1].definitionCanonical?.absoluteString, "ActivityDefinition/order-serum-urine-rrt-pcr-test") + // Don't know how to create unit test for "action?[0].action?[1].definitionCanonical", which is a FHIRCanonical XCTAssertEqual(inst.action?[0].action?[2].condition?[0].expression?.expression, "Should Order Serum Zika Virus IgM + Dengue Virus IgM") XCTAssertEqual(inst.action?[0].action?[2].condition?[0].expression?.language, "text/cql") XCTAssertEqual(inst.action?[0].action?[2].condition?[0].kind, ActionConditionKind(rawValue: "applicability")!) - XCTAssertEqual(inst.action?[0].action?[2].definitionCanonical?.absoluteString, "ActivityDefinition/order-serum-zika-dengue-virus-igm") + // Don't know how to create unit test for "action?[0].action?[2].definitionCanonical", which is a FHIRCanonical XCTAssertEqual(inst.action?[0].action?[3].condition?[0].expression?.expression, "Should Consider IgM Antibody Testing") XCTAssertEqual(inst.action?[0].action?[3].condition?[0].expression?.language, "text/cql") XCTAssertEqual(inst.action?[0].action?[3].condition?[0].kind, ActionConditionKind(rawValue: "applicability")!) - XCTAssertEqual(inst.action?[0].action?[3].definitionCanonical?.absoluteString, "ActivityDefinition/consider-igm-antibody-testing") - XCTAssertEqual(inst.action?[0].action?[4].action?[0].definitionCanonical?.absoluteString, "ActivityDefinition/provide-mosquito-prevention-advice") - XCTAssertEqual(inst.action?[0].action?[4].action?[1].definitionCanonical?.absoluteString, "ActivityDefinition/provide-contraception-advice") + // Don't know how to create unit test for "action?[0].action?[3].definitionCanonical", which is a FHIRCanonical + // Don't know how to create unit test for "action?[0].action?[4].action?[0].definitionCanonical", which is a FHIRCanonical + // Don't know how to create unit test for "action?[0].action?[4].action?[1].definitionCanonical", which is a FHIRCanonical XCTAssertEqual(inst.action?[0].action?[4].condition?[0].expression?.expression, "Should Provide Mosquito Prevention and Contraception Advice") XCTAssertEqual(inst.action?[0].action?[4].condition?[0].expression?.language, "text/cql") XCTAssertEqual(inst.action?[0].action?[4].condition?[0].kind, ActionConditionKind(rawValue: "applicability")!) @@ -620,10 +620,10 @@ class PlanDefinitionTests: XCTestCase { XCTAssertEqual(inst.id, "zika-virus-intervention-initial") XCTAssertEqual(inst.identifier?[0].use, IdentifierUse(rawValue: "official")!) XCTAssertEqual(inst.identifier?[0].value, "zika-virus-intervention") - XCTAssertEqual(inst.library?[0].absoluteString, "Library/zika-virus-intervention-logic") + // Don't know how to create unit test for "library?[0]", which is a FHIRCanonical XCTAssertEqual(inst.relatedArtifact?[0].type, RelatedArtifactType(rawValue: "derived-from")!) XCTAssertEqual(inst.relatedArtifact?[0].url?.absoluteString, "https://www.cdc.gov/mmwr/volumes/65/wr/mm6539e1.htm?s_cid=mm6539e1_w") - XCTAssertEqual(inst.relatedArtifact?[1].resource?.absoluteString, "PlanDefinition/zika-virus-intervention") + // Don't know how to create unit test for "relatedArtifact?[1].resource", which is a FHIRCanonical XCTAssertEqual(inst.relatedArtifact?[1].type, RelatedArtifactType(rawValue: "successor")!) XCTAssertEqual(inst.status, PublicationStatus(rawValue: "active")!) XCTAssertEqual(inst.text?.status, NarrativeStatus(rawValue: "generated")!) diff --git a/Tests/ModelTests/PractitionerRoleTests.swift b/Tests/ModelTests/PractitionerRoleTests.swift index 117a993d..5595cfdc 100644 --- a/Tests/ModelTests/PractitionerRoleTests.swift +++ b/Tests/ModelTests/PractitionerRoleTests.swift @@ -2,7 +2,7 @@ // PractitionerRoleTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/PractitionerTests.swift b/Tests/ModelTests/PractitionerTests.swift index eb05ed7c..ea53eca0 100644 --- a/Tests/ModelTests/PractitionerTests.swift +++ b/Tests/ModelTests/PractitionerTests.swift @@ -2,7 +2,7 @@ // PractitionerTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/ProcedureTests.swift b/Tests/ModelTests/ProcedureTests.swift index b6f11efd..511df403 100644 --- a/Tests/ModelTests/ProcedureTests.swift +++ b/Tests/ModelTests/ProcedureTests.swift @@ -2,7 +2,7 @@ // ProcedureTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // @@ -49,7 +49,7 @@ class ProcedureTests: XCTestCase { XCTAssertEqual(inst.encounter?.display, "Roel's encounter on January 28th, 2013") XCTAssertEqual(inst.encounter?.reference, "Encounter/f202") XCTAssertEqual(inst.id, "f201") - XCTAssertEqual(inst.instantiatesCanonical?[0].absoluteString, "PlanDefinition/KDN5") + // Don't know how to create unit test for "instantiatesCanonical?[0]", which is a FHIRCanonical XCTAssertEqual(inst.meta?.tag?[0].code, "HTEST") XCTAssertEqual(inst.meta?.tag?[0].display, "test health data") XCTAssertEqual(inst.meta?.tag?[0].system?.absoluteString, "http://terminology.hl7.org/CodeSystem/v3-ActReason") diff --git a/Tests/ModelTests/ProvenanceTests.swift b/Tests/ModelTests/ProvenanceTests.swift index 5e5c4b47..7b33aa06 100644 --- a/Tests/ModelTests/ProvenanceTests.swift +++ b/Tests/ModelTests/ProvenanceTests.swift @@ -2,7 +2,7 @@ // ProvenanceTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/QuestionnaireResponseTests.swift b/Tests/ModelTests/QuestionnaireResponseTests.swift index 616e5f7b..31c9f36e 100644 --- a/Tests/ModelTests/QuestionnaireResponseTests.swift +++ b/Tests/ModelTests/QuestionnaireResponseTests.swift @@ -2,7 +2,7 @@ // QuestionnaireResponseTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // @@ -639,7 +639,7 @@ class QuestionnaireResponseTests: XCTestCase { XCTAssertEqual(inst.meta?.tag?[0].code, "HTEST") XCTAssertEqual(inst.meta?.tag?[0].display, "test health data") XCTAssertEqual(inst.meta?.tag?[0].system?.absoluteString, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - XCTAssertEqual(inst.questionnaire?.absoluteString, "Questionnaire/ussg-fht") + // Don't know how to create unit test for "questionnaire", which is a FHIRCanonical XCTAssertEqual(inst.status, QuestionnaireResponseStatus(rawValue: "in-progress")!) XCTAssertEqual(inst.subject?.reference, "http://hl7.org/fhir/Patient/proband") XCTAssertEqual(inst.subject?.type?.absoluteString, "Patient") @@ -805,7 +805,7 @@ class QuestionnaireResponseTests: XCTestCase { XCTAssertEqual(inst.meta?.tag?[0].code, "HTEST") XCTAssertEqual(inst.meta?.tag?[0].display, "test health data") XCTAssertEqual(inst.meta?.tag?[0].system?.absoluteString, "http://terminology.hl7.org/CodeSystem/v3-ActReason") - XCTAssertEqual(inst.questionnaire?.absoluteString, "Questionnaire/gcs") + // Don't know how to create unit test for "questionnaire", which is a FHIRCanonical XCTAssertEqual(inst.source?.reference, "Practitioner/f007") XCTAssertEqual(inst.status, QuestionnaireResponseStatus(rawValue: "completed")!) XCTAssertEqual(inst.subject?.display, "Peter James Chalmers") diff --git a/Tests/ModelTests/QuestionnaireTests.swift b/Tests/ModelTests/QuestionnaireTests.swift index 5a484f60..09b614d2 100644 --- a/Tests/ModelTests/QuestionnaireTests.swift +++ b/Tests/ModelTests/QuestionnaireTests.swift @@ -2,7 +2,7 @@ // QuestionnaireTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // @@ -44,60 +44,60 @@ class QuestionnaireTests: XCTestCase { XCTAssertEqual(inst.code?[0].display, "PHQ-9 quick depression assessment panel:-:Pt:^Patient:-:Report.PHQ-9") XCTAssertEqual(inst.code?[0].system?.absoluteString, "http://loinc.org") XCTAssertEqual(inst.extension_fhir?[0].url, "http://hl7.org/fhir/StructureDefinition/cqf-library") - XCTAssertEqual(inst.extension_fhir?[0].valueCanonical?.absoluteString, "Library/phq-9-logic") + // Don't know how to create unit test for "extension_fhir?[0].valueCanonical", which is a FHIRCanonical XCTAssertEqual(inst.id, "phq-9-questionnaire") XCTAssertEqual(inst.identifier?[0].use, IdentifierUse(rawValue: "official")!) XCTAssertEqual(inst.identifier?[0].value, "phq-9") - XCTAssertEqual(inst.item?[0].answerValueSet?.absoluteString, "http://loinc.org/vs/LL358-3") + // Don't know how to create unit test for "item?[0].answerValueSet", which is a FHIRCanonical XCTAssertEqual(inst.item?[0].code?[0].code, "44250-9") XCTAssertEqual(inst.item?[0].code?[0].system?.absoluteString, "http://loinc.org") XCTAssertEqual(inst.item?[0].linkId, "LittleInterest") XCTAssertEqual(inst.item?[0].required, true) XCTAssertEqual(inst.item?[0].text, "Little interest or pleasure in doing things") XCTAssertEqual(inst.item?[0].type, QuestionnaireItemType(rawValue: "choice")!) - XCTAssertEqual(inst.item?[1].answerValueSet?.absoluteString, "http://loinc.org/vs/LL358-3") + // Don't know how to create unit test for "item?[1].answerValueSet", which is a FHIRCanonical XCTAssertEqual(inst.item?[1].code?[0].code, "44255-8") XCTAssertEqual(inst.item?[1].code?[0].system?.absoluteString, "http://loinc.org") XCTAssertEqual(inst.item?[1].linkId, "FeelingDown") XCTAssertEqual(inst.item?[1].required, true) XCTAssertEqual(inst.item?[1].text, "Feeling down, depressed, or hopeless") XCTAssertEqual(inst.item?[1].type, QuestionnaireItemType(rawValue: "choice")!) - XCTAssertEqual(inst.item?[2].answerValueSet?.absoluteString, "http://loinc.org/vs/LL358-3") + // Don't know how to create unit test for "item?[2].answerValueSet", which is a FHIRCanonical XCTAssertEqual(inst.item?[2].code?[0].code, "44259-0") XCTAssertEqual(inst.item?[2].code?[0].system?.absoluteString, "http://loinc.org") XCTAssertEqual(inst.item?[2].linkId, "TroubleSleeping") XCTAssertEqual(inst.item?[2].required, true) XCTAssertEqual(inst.item?[2].text, "Trouble falling or staying asleep") XCTAssertEqual(inst.item?[2].type, QuestionnaireItemType(rawValue: "choice")!) - XCTAssertEqual(inst.item?[3].answerValueSet?.absoluteString, "http://loinc.org/vs/LL358-3") + // Don't know how to create unit test for "item?[3].answerValueSet", which is a FHIRCanonical XCTAssertEqual(inst.item?[3].code?[0].code, "44254-1") XCTAssertEqual(inst.item?[3].code?[0].system?.absoluteString, "http://loinc.org") XCTAssertEqual(inst.item?[3].linkId, "FeelingTired") XCTAssertEqual(inst.item?[3].required, true) XCTAssertEqual(inst.item?[3].text, "Feeling tired or having little energy") XCTAssertEqual(inst.item?[3].type, QuestionnaireItemType(rawValue: "choice")!) - XCTAssertEqual(inst.item?[4].answerValueSet?.absoluteString, "http://loinc.org/vs/LL358-3") + // Don't know how to create unit test for "item?[4].answerValueSet", which is a FHIRCanonical XCTAssertEqual(inst.item?[4].code?[0].code, "44251-7") XCTAssertEqual(inst.item?[4].code?[0].system?.absoluteString, "http://loinc.org") XCTAssertEqual(inst.item?[4].linkId, "BadAppetite") XCTAssertEqual(inst.item?[4].required, true) XCTAssertEqual(inst.item?[4].text, "Poor appetite or overeating") XCTAssertEqual(inst.item?[4].type, QuestionnaireItemType(rawValue: "choice")!) - XCTAssertEqual(inst.item?[5].answerValueSet?.absoluteString, "http://loinc.org/vs/LL358-3") + // Don't know how to create unit test for "item?[5].answerValueSet", which is a FHIRCanonical XCTAssertEqual(inst.item?[5].code?[0].code, "44258-2") XCTAssertEqual(inst.item?[5].code?[0].system?.absoluteString, "http://loinc.org") XCTAssertEqual(inst.item?[5].linkId, "FeelingBadAboutSelf") XCTAssertEqual(inst.item?[5].required, true) XCTAssertEqual(inst.item?[5].text, "Feeling bad about yourself - or that you are a failure or have let yourself or your family down") XCTAssertEqual(inst.item?[5].type, QuestionnaireItemType(rawValue: "choice")!) - XCTAssertEqual(inst.item?[6].answerValueSet?.absoluteString, "http://loinc.org/vs/LL358-3") + // Don't know how to create unit test for "item?[6].answerValueSet", which is a FHIRCanonical XCTAssertEqual(inst.item?[6].code?[0].code, "44252-5") XCTAssertEqual(inst.item?[6].code?[0].system?.absoluteString, "http://loinc.org") XCTAssertEqual(inst.item?[6].linkId, "TroubleConcentrating") XCTAssertEqual(inst.item?[6].required, true) XCTAssertEqual(inst.item?[6].text, "Trouble concentrating on things, such as reading the newspaper or watching television") XCTAssertEqual(inst.item?[6].type, QuestionnaireItemType(rawValue: "choice")!) - XCTAssertEqual(inst.item?[7].answerValueSet?.absoluteString, "http://loinc.org/vs/LL358-3") + // Don't know how to create unit test for "item?[7].answerValueSet", which is a FHIRCanonical XCTAssertEqual(inst.item?[7].code?[0].code, "44253-3") XCTAssertEqual(inst.item?[7].code?[0].system?.absoluteString, "http://loinc.org") XCTAssertEqual(inst.item?[7].linkId, "MovingSpeaking") @@ -113,14 +113,14 @@ class QuestionnaireTests: XCTestCase { XCTAssertEqual(inst.item?[8].required, true) XCTAssertEqual(inst.item?[8].text, "Total score") XCTAssertEqual(inst.item?[8].type, QuestionnaireItemType(rawValue: "integer")!) - XCTAssertEqual(inst.item?[9].answerValueSet?.absoluteString, "http://loinc.org/vs/LL358-3") + // Don't know how to create unit test for "item?[9].answerValueSet", which is a FHIRCanonical XCTAssertEqual(inst.item?[9].code?[0].code, "44256-6") XCTAssertEqual(inst.item?[9].code?[0].system?.absoluteString, "http://loinc.org") XCTAssertEqual(inst.item?[9].linkId, "Difficulty") XCTAssertEqual(inst.item?[9].required, true) XCTAssertEqual(inst.item?[9].text, "If you checked off any problems, how difficult have these problems made it for you to do your work, take care of things at home, or get along with other people") XCTAssertEqual(inst.item?[9].type, QuestionnaireItemType(rawValue: "choice")!) - XCTAssertEqual(inst.meta?.profile?[0].absoluteString, "http://hl7.org/fhir/StructureDefinition/cqf-questionnaire") + // Don't know how to create unit test for "meta?.profile?[0]", which is a FHIRCanonical XCTAssertEqual(inst.meta?.tag?[0].code, "HTEST") XCTAssertEqual(inst.meta?.tag?[0].display, "test health data") XCTAssertEqual(inst.meta?.tag?[0].system?.absoluteString, "http://terminology.hl7.org/CodeSystem/v3-ActReason") @@ -152,7 +152,7 @@ class QuestionnaireTests: XCTestCase { XCTAssertEqual(inst.id, "3141") XCTAssertEqual(inst.item?[0].code?[0].code, "COMORBIDITY") XCTAssertEqual(inst.item?[0].code?[0].system?.absoluteString, "http://example.org/system/code/sections") - XCTAssertEqual(inst.item?[0].item?[0].answerValueSet?.absoluteString, "http://hl7.org/fhir/ValueSet/yesnodontknow") + // Don't know how to create unit test for "item?[0].item?[0].answerValueSet", which is a FHIRCanonical XCTAssertEqual(inst.item?[0].item?[0].code?[0].code, "COMORB") XCTAssertEqual(inst.item?[0].item?[0].code?[0].system?.absoluteString, "http://example.org/system/code/questions") XCTAssertEqual(inst.item?[0].item?[0].item?[0].code?[0].code, "CARDIAL") @@ -161,10 +161,10 @@ class QuestionnaireTests: XCTestCase { XCTAssertEqual(inst.item?[0].item?[0].item?[0].enableWhen?[0].answerCoding?.system?.absoluteString, "http://terminology.hl7.org/CodeSystem/v2-0136") XCTAssertEqual(inst.item?[0].item?[0].item?[0].enableWhen?[0].operator_fhir, QuestionnaireItemOperator(rawValue: "=")!) XCTAssertEqual(inst.item?[0].item?[0].item?[0].enableWhen?[0].question, "1.1") - XCTAssertEqual(inst.item?[0].item?[0].item?[0].item?[0].answerValueSet?.absoluteString, "http://hl7.org/fhir/ValueSet/yesnodontknow") + // Don't know how to create unit test for "item?[0].item?[0].item?[0].item?[0].answerValueSet", which is a FHIRCanonical XCTAssertEqual(inst.item?[0].item?[0].item?[0].item?[0].code?[0].code, "COMORBCAR") XCTAssertEqual(inst.item?[0].item?[0].item?[0].item?[0].code?[0].system?.absoluteString, "http://example.org/system/code/questions") - XCTAssertEqual(inst.item?[0].item?[0].item?[0].item?[0].item?[0].answerValueSet?.absoluteString, "http://hl7.org/fhir/ValueSet/yesnodontknow") + // Don't know how to create unit test for "item?[0].item?[0].item?[0].item?[0].item?[0].answerValueSet", which is a FHIRCanonical XCTAssertEqual(inst.item?[0].item?[0].item?[0].item?[0].item?[0].code?[0].code, "COMCAR00") XCTAssertEqual(inst.item?[0].item?[0].item?[0].item?[0].item?[0].code?[0].display, "Angina Pectoris") XCTAssertEqual(inst.item?[0].item?[0].item?[0].item?[0].item?[0].code?[0].system?.absoluteString, "http://example.org/system/code/questions") @@ -174,7 +174,7 @@ class QuestionnaireTests: XCTestCase { XCTAssertEqual(inst.item?[0].item?[0].item?[0].item?[0].item?[0].linkId, "1.1.1.1.1") XCTAssertEqual(inst.item?[0].item?[0].item?[0].item?[0].item?[0].prefix, "1.1.1") XCTAssertEqual(inst.item?[0].item?[0].item?[0].item?[0].item?[0].type, QuestionnaireItemType(rawValue: "choice")!) - XCTAssertEqual(inst.item?[0].item?[0].item?[0].item?[0].item?[1].answerValueSet?.absoluteString, "http://hl7.org/fhir/ValueSet/yesnodontknow") + // Don't know how to create unit test for "item?[0].item?[0].item?[0].item?[0].item?[1].answerValueSet", which is a FHIRCanonical XCTAssertEqual(inst.item?[0].item?[0].item?[0].item?[0].item?[1].code?[0].code, "22298006") XCTAssertEqual(inst.item?[0].item?[0].item?[0].item?[0].item?[1].code?[0].display, "Myocardial infarction (disorder)") XCTAssertEqual(inst.item?[0].item?[0].item?[0].item?[0].item?[1].code?[0].system?.absoluteString, "http://snomed.info/sct") @@ -184,7 +184,7 @@ class QuestionnaireTests: XCTestCase { XCTAssertEqual(inst.item?[0].item?[0].item?[0].item?[0].linkId, "1.1.1.1") XCTAssertEqual(inst.item?[0].item?[0].item?[0].item?[0].prefix, "1.1") XCTAssertEqual(inst.item?[0].item?[0].item?[0].item?[0].type, QuestionnaireItemType(rawValue: "choice")!) - XCTAssertEqual(inst.item?[0].item?[0].item?[0].item?[1].answerValueSet?.absoluteString, "http://hl7.org/fhir/ValueSet/yesnodontknow") + // Don't know how to create unit test for "item?[0].item?[0].item?[0].item?[1].answerValueSet", which is a FHIRCanonical XCTAssertEqual(inst.item?[0].item?[0].item?[0].item?[1].code?[0].code, "COMORBVAS") XCTAssertEqual(inst.item?[0].item?[0].item?[0].item?[1].code?[0].system?.absoluteString, "http://example.org/system/code/questions") XCTAssertEqual(inst.item?[0].item?[0].item?[0].item?[1].linkId, "1.1.1.2") @@ -294,17 +294,17 @@ class QuestionnaireTests: XCTestCase { XCTAssertEqual(inst.contained?[2].id, "eye") XCTAssertEqual(inst.date?.description, "2015-08-03") XCTAssertEqual(inst.id, "gcs") - XCTAssertEqual(inst.item?[0].answerValueSet?.absoluteString, "#verbal") + // Don't know how to create unit test for "item?[0].answerValueSet", which is a FHIRCanonical XCTAssertEqual(inst.item?[0].code?[0].code, "9270-0") XCTAssertEqual(inst.item?[0].code?[0].system?.absoluteString, "http://loinc.org") XCTAssertEqual(inst.item?[0].linkId, "1.1") XCTAssertEqual(inst.item?[0].type, QuestionnaireItemType(rawValue: "choice")!) - XCTAssertEqual(inst.item?[1].answerValueSet?.absoluteString, "#motor") + // Don't know how to create unit test for "item?[1].answerValueSet", which is a FHIRCanonical XCTAssertEqual(inst.item?[1].code?[0].code, "9268-4") XCTAssertEqual(inst.item?[1].code?[0].system?.absoluteString, "http://loinc.org") XCTAssertEqual(inst.item?[1].linkId, "1.2") XCTAssertEqual(inst.item?[1].type, QuestionnaireItemType(rawValue: "choice")!) - XCTAssertEqual(inst.item?[2].answerValueSet?.absoluteString, "#eye") + // Don't know how to create unit test for "item?[2].answerValueSet", which is a FHIRCanonical XCTAssertEqual(inst.item?[2].code?[0].code, "9267-6") XCTAssertEqual(inst.item?[2].code?[0].system?.absoluteString, "http://loinc.org") XCTAssertEqual(inst.item?[2].linkId, "1.3") diff --git a/Tests/ModelTests/RelatedPersonTests.swift b/Tests/ModelTests/RelatedPersonTests.swift index 2d1a92fd..65116891 100644 --- a/Tests/ModelTests/RelatedPersonTests.swift +++ b/Tests/ModelTests/RelatedPersonTests.swift @@ -2,7 +2,7 @@ // RelatedPersonTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/RequestGroupTests.swift b/Tests/ModelTests/RequestGroupTests.swift index 2c30e4f7..3ac67b79 100644 --- a/Tests/ModelTests/RequestGroupTests.swift +++ b/Tests/ModelTests/RequestGroupTests.swift @@ -2,7 +2,7 @@ // RequestGroupTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // @@ -72,7 +72,7 @@ class RequestGroupTests: XCTestCase { XCTAssertEqual(inst.encounter?.reference, "Encounter/example") XCTAssertEqual(inst.id, "kdn5-example") XCTAssertEqual(inst.identifier?[0].value, "requestgroup-kdn5") - XCTAssertEqual(inst.instantiatesCanonical?[0].absoluteString, "PlanDefinition/KDN5") + // Don't know how to create unit test for "instantiatesCanonical?[0]", which is a FHIRCanonical XCTAssertEqual(inst.intent, RequestIntent(rawValue: "plan")!) XCTAssertEqual(inst.meta?.tag?[0].code, "HTEST") XCTAssertEqual(inst.meta?.tag?[0].display, "test health data") diff --git a/Tests/ModelTests/ResearchDefinitionTests.swift b/Tests/ModelTests/ResearchDefinitionTests.swift index f1c61f0d..05ee61e1 100644 --- a/Tests/ModelTests/ResearchDefinitionTests.swift +++ b/Tests/ModelTests/ResearchDefinitionTests.swift @@ -2,7 +2,7 @@ // ResearchDefinitionTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/ResearchElementDefinitionTests.swift b/Tests/ModelTests/ResearchElementDefinitionTests.swift index 6b997857..e57a2fea 100644 --- a/Tests/ModelTests/ResearchElementDefinitionTests.swift +++ b/Tests/ModelTests/ResearchElementDefinitionTests.swift @@ -2,7 +2,7 @@ // ResearchElementDefinitionTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/ResearchStudyTests.swift b/Tests/ModelTests/ResearchStudyTests.swift index 72f2f840..97364efb 100644 --- a/Tests/ModelTests/ResearchStudyTests.swift +++ b/Tests/ModelTests/ResearchStudyTests.swift @@ -2,7 +2,7 @@ // ResearchStudyTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/ResearchSubjectTests.swift b/Tests/ModelTests/ResearchSubjectTests.swift index 9780b8fd..ea0b6f59 100644 --- a/Tests/ModelTests/ResearchSubjectTests.swift +++ b/Tests/ModelTests/ResearchSubjectTests.swift @@ -2,7 +2,7 @@ // ResearchSubjectTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/RiskAssessmentTests.swift b/Tests/ModelTests/RiskAssessmentTests.swift index 838f154e..6bde5b60 100644 --- a/Tests/ModelTests/RiskAssessmentTests.swift +++ b/Tests/ModelTests/RiskAssessmentTests.swift @@ -2,7 +2,7 @@ // RiskAssessmentTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/RiskEvidenceSynthesisTests.swift b/Tests/ModelTests/RiskEvidenceSynthesisTests.swift index 47cfa66b..7dcac964 100644 --- a/Tests/ModelTests/RiskEvidenceSynthesisTests.swift +++ b/Tests/ModelTests/RiskEvidenceSynthesisTests.swift @@ -2,7 +2,7 @@ // RiskEvidenceSynthesisTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/ScheduleTests.swift b/Tests/ModelTests/ScheduleTests.swift index 348c6339..aebfc70a 100644 --- a/Tests/ModelTests/ScheduleTests.swift +++ b/Tests/ModelTests/ScheduleTests.swift @@ -2,7 +2,7 @@ // ScheduleTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/SearchParameterTests.swift b/Tests/ModelTests/SearchParameterTests.swift index 0899bd62..6c8c5e7d 100644 --- a/Tests/ModelTests/SearchParameterTests.swift +++ b/Tests/ModelTests/SearchParameterTests.swift @@ -2,7 +2,7 @@ // SearchParameterTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // @@ -122,7 +122,7 @@ class SearchParameterTests: XCTestCase { XCTAssertEqual(inst.contact?[0].telecom?[0].system, ContactPointSystem(rawValue: "url")!) XCTAssertEqual(inst.contact?[0].telecom?[0].value, "http://hl7.org/fhir") XCTAssertEqual(inst.date?.description, "2013-10-23") - XCTAssertEqual(inst.derivedFrom?.absoluteString, "http://hl7.org/fhir/SearchParameter/Resource-id") + // Don't know how to create unit test for "derivedFrom", which is a FHIRCanonical XCTAssertEqual(inst.description_fhir, "Search by resource identifier - e.g. same as the read interaction, but can return included resources") XCTAssertEqual(inst.experimental, true) XCTAssertEqual(inst.expression, "id") diff --git a/Tests/ModelTests/ServiceRequestTests.swift b/Tests/ModelTests/ServiceRequestTests.swift index 34b1526c..85590119 100644 --- a/Tests/ModelTests/ServiceRequestTests.swift +++ b/Tests/ModelTests/ServiceRequestTests.swift @@ -2,7 +2,7 @@ // ServiceRequestTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/SlotTests.swift b/Tests/ModelTests/SlotTests.swift index 1776b190..a3289116 100644 --- a/Tests/ModelTests/SlotTests.swift +++ b/Tests/ModelTests/SlotTests.swift @@ -2,7 +2,7 @@ // SlotTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/SpecimenDefinitionTests.swift b/Tests/ModelTests/SpecimenDefinitionTests.swift index a042ea11..580bd5c7 100644 --- a/Tests/ModelTests/SpecimenDefinitionTests.swift +++ b/Tests/ModelTests/SpecimenDefinitionTests.swift @@ -2,7 +2,7 @@ // SpecimenDefinitionTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/SpecimenTests.swift b/Tests/ModelTests/SpecimenTests.swift index 9175cadb..42689c92 100644 --- a/Tests/ModelTests/SpecimenTests.swift +++ b/Tests/ModelTests/SpecimenTests.swift @@ -2,7 +2,7 @@ // SpecimenTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/StructureDefinitionTests.swift b/Tests/ModelTests/StructureDefinitionTests.swift index d44c9601..38bdbe23 100644 --- a/Tests/ModelTests/StructureDefinitionTests.swift +++ b/Tests/ModelTests/StructureDefinitionTests.swift @@ -2,7 +2,7 @@ // StructureDefinitionTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // @@ -41,7 +41,7 @@ class StructureDefinitionTests: XCTestCase { let inst = (nil != json) ? try instantiateFrom(json: json!) : try instantiateFrom(filename: "structuredefinition-example-section-library.json") XCTAssertEqual(inst.abstract, true) - XCTAssertEqual(inst.baseDefinition?.absoluteString, "http://hl7.org/fhir/StructureDefinition/Composition") + // Don't know how to create unit test for "baseDefinition", which is a FHIRCanonical XCTAssertEqual(inst.date?.description, "2018-11-05T17:57:00+11:00") XCTAssertEqual(inst.derivation, TypeDerivationRule(rawValue: "constraint")!) XCTAssertEqual(inst.differential?.element?[0].id, "Composition") @@ -114,7 +114,7 @@ class StructureDefinitionTests: XCTestCase { let inst = (nil != json) ? try instantiateFrom(json: json!) : try instantiateFrom(filename: "structuredefinition-example-composition.json") XCTAssertEqual(inst.abstract, false) - XCTAssertEqual(inst.baseDefinition?.absoluteString, "http://hl7.org/fhir/StructureDefinition/Composition") + // Don't know how to create unit test for "baseDefinition", which is a FHIRCanonical XCTAssertEqual(inst.date?.description, "2018-11-05T17:47:00+11:00") XCTAssertEqual(inst.derivation, TypeDerivationRule(rawValue: "constraint")!) XCTAssertEqual(inst.differential?.element?[0].id, "Composition") @@ -131,19 +131,19 @@ class StructureDefinitionTests: XCTestCase { XCTAssertEqual(inst.differential?.element?[2].path, "Composition.section") XCTAssertEqual(inst.differential?.element?[2].sliceName, "procedure") XCTAssertEqual(inst.differential?.element?[2].type?[0].code?.absoluteString, "BackboneElement") - XCTAssertEqual(inst.differential?.element?[2].type?[0].profile?[0].absoluteString, "http://hl7.org/fhir/StructureDefinition/document-section-library") + // Don't know how to create unit test for "differential?.element?[2].type?[0].profile?[0]", which is a FHIRCanonical XCTAssertEqual(inst.differential?.element?[3].id, "Composition.section:medications") XCTAssertEqual(inst.differential?.element?[3].min, 1) XCTAssertEqual(inst.differential?.element?[3].path, "Composition.section") XCTAssertEqual(inst.differential?.element?[3].sliceName, "medications") XCTAssertEqual(inst.differential?.element?[3].type?[0].code?.absoluteString, "BackboneElement") - XCTAssertEqual(inst.differential?.element?[3].type?[0].profile?[0].absoluteString, "http://hl7.org/fhir/StructureDefinition/document-section-library") + // Don't know how to create unit test for "differential?.element?[3].type?[0].profile?[0]", which is a FHIRCanonical XCTAssertEqual(inst.differential?.element?[4].id, "Composition.section:plan") XCTAssertEqual(inst.differential?.element?[4].min, 0) XCTAssertEqual(inst.differential?.element?[4].path, "Composition.section") XCTAssertEqual(inst.differential?.element?[4].sliceName, "plan") XCTAssertEqual(inst.differential?.element?[4].type?[0].code?.absoluteString, "BackboneElement") - XCTAssertEqual(inst.differential?.element?[4].type?[0].profile?[0].absoluteString, "http://hl7.org/fhir/StructureDefinition/document-section-library") + // Don't know how to create unit test for "differential?.element?[4].type?[0].profile?[0]", which is a FHIRCanonical XCTAssertEqual(inst.experimental, false) XCTAssertEqual(inst.id, "example-composition") XCTAssertEqual(inst.kind, StructureDefinitionKind(rawValue: "complex-type")!) diff --git a/Tests/ModelTests/StructureMapTests.swift b/Tests/ModelTests/StructureMapTests.swift index 7dd253f4..db327f8b 100644 --- a/Tests/ModelTests/StructureMapTests.swift +++ b/Tests/ModelTests/StructureMapTests.swift @@ -2,7 +2,7 @@ // StructureMapTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/SubscriptionTests.swift b/Tests/ModelTests/SubscriptionTests.swift index 96c34ee1..13f909a9 100644 --- a/Tests/ModelTests/SubscriptionTests.swift +++ b/Tests/ModelTests/SubscriptionTests.swift @@ -2,7 +2,7 @@ // SubscriptionTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/SubstanceSpecificationTests.swift b/Tests/ModelTests/SubstanceSpecificationTests.swift index 5124d775..1819ff60 100644 --- a/Tests/ModelTests/SubstanceSpecificationTests.swift +++ b/Tests/ModelTests/SubstanceSpecificationTests.swift @@ -2,7 +2,7 @@ // SubstanceSpecificationTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/SubstanceTests.swift b/Tests/ModelTests/SubstanceTests.swift index fb53bbeb..e4f8554d 100644 --- a/Tests/ModelTests/SubstanceTests.swift +++ b/Tests/ModelTests/SubstanceTests.swift @@ -2,7 +2,7 @@ // SubstanceTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/SupplyDeliveryTests.swift b/Tests/ModelTests/SupplyDeliveryTests.swift index e1c74358..2ea2e0d3 100644 --- a/Tests/ModelTests/SupplyDeliveryTests.swift +++ b/Tests/ModelTests/SupplyDeliveryTests.swift @@ -2,7 +2,7 @@ // SupplyDeliveryTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/SupplyRequestTests.swift b/Tests/ModelTests/SupplyRequestTests.swift index 85c14b61..1d9a8cc6 100644 --- a/Tests/ModelTests/SupplyRequestTests.swift +++ b/Tests/ModelTests/SupplyRequestTests.swift @@ -2,7 +2,7 @@ // SupplyRequestTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/TaskTests.swift b/Tests/ModelTests/TaskTests.swift index a43afd82..e55a266d 100644 --- a/Tests/ModelTests/TaskTests.swift +++ b/Tests/ModelTests/TaskTests.swift @@ -2,7 +2,7 @@ // TaskTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/TerminologyCapabilitiesTests.swift b/Tests/ModelTests/TerminologyCapabilitiesTests.swift index 88a77270..16fde72b 100644 --- a/Tests/ModelTests/TerminologyCapabilitiesTests.swift +++ b/Tests/ModelTests/TerminologyCapabilitiesTests.swift @@ -2,7 +2,7 @@ // TerminologyCapabilitiesTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/TestReportTests.swift b/Tests/ModelTests/TestReportTests.swift index 7f104c5e..5cabe8c5 100644 --- a/Tests/ModelTests/TestReportTests.swift +++ b/Tests/ModelTests/TestReportTests.swift @@ -2,7 +2,7 @@ // TestReportTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/TestScriptTests.swift b/Tests/ModelTests/TestScriptTests.swift index 760959d2..f29aef7a 100644 --- a/Tests/ModelTests/TestScriptTests.swift +++ b/Tests/ModelTests/TestScriptTests.swift @@ -2,7 +2,7 @@ // TestScriptTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // @@ -57,14 +57,14 @@ class TestScriptTests: XCTestCase { XCTAssertEqual(inst.jurisdiction?[0].coding?[0].code, "US") XCTAssertEqual(inst.jurisdiction?[0].coding?[0].display, "United States of America (the)") XCTAssertEqual(inst.jurisdiction?[0].coding?[0].system?.absoluteString, "urn:iso:std:iso:3166") - XCTAssertEqual(inst.metadata?.capability?[0].capabilities?.absoluteString, "CapabilityStatement/example") + // Don't know how to create unit test for "metadata?.capability?[0].capabilities", which is a FHIRCanonical XCTAssertEqual(inst.metadata?.capability?[0].description_fhir, "Patient Read Operation") XCTAssertEqual(inst.metadata?.capability?[0].destination, 1) XCTAssertEqual(inst.metadata?.capability?[0].link?[0].absoluteString, "http://hl7.org/fhir/http.html#read") XCTAssertEqual(inst.metadata?.capability?[0].origin?[0], 1) XCTAssertEqual(inst.metadata?.capability?[0].required, true) XCTAssertEqual(inst.metadata?.capability?[0].validated, false) - XCTAssertEqual(inst.metadata?.capability?[1].capabilities?.absoluteString, "CapabilityStatement/example") + // Don't know how to create unit test for "metadata?.capability?[1].capabilities", which is a FHIRCanonical XCTAssertEqual(inst.metadata?.capability?[1].description_fhir, "Patient Read Operation") XCTAssertEqual(inst.metadata?.capability?[1].destination, 2) XCTAssertEqual(inst.metadata?.capability?[1].link?[0].absoluteString, "http://hl7.org/fhir/http.html#read") @@ -196,7 +196,7 @@ class TestScriptTests: XCTestCase { XCTAssertEqual(inst.jurisdiction?[0].coding?[0].code, "US") XCTAssertEqual(inst.jurisdiction?[0].coding?[0].display, "United States of America (the)") XCTAssertEqual(inst.jurisdiction?[0].coding?[0].system?.absoluteString, "urn:iso:std:iso:3166") - XCTAssertEqual(inst.metadata?.capability?[0].capabilities?.absoluteString, "CapabilityStatement/example") + // Don't know how to create unit test for "metadata?.capability?[0].capabilities", which is a FHIRCanonical XCTAssertEqual(inst.metadata?.capability?[0].description_fhir, "Patient Update, Delete and History (Instance) Operations") XCTAssertEqual(inst.metadata?.capability?[0].link?[0].absoluteString, "http://hl7.org/fhir/http.html#update") XCTAssertEqual(inst.metadata?.capability?[0].link?[1].absoluteString, "http://hl7.org/fhir/http.html#delete") @@ -326,7 +326,7 @@ class TestScriptTests: XCTestCase { XCTAssertEqual(inst.jurisdiction?[0].coding?[0].code, "US") XCTAssertEqual(inst.jurisdiction?[0].coding?[0].display, "United States of America (the)") XCTAssertEqual(inst.jurisdiction?[0].coding?[0].system?.absoluteString, "urn:iso:std:iso:3166") - XCTAssertEqual(inst.metadata?.capability?[0].capabilities?.absoluteString, "CapabilityStatement/example") + // Don't know how to create unit test for "metadata?.capability?[0].capabilities", which is a FHIRCanonical XCTAssertEqual(inst.metadata?.capability?[0].description_fhir, "Patient Update and Delete Operations") XCTAssertEqual(inst.metadata?.capability?[0].link?[0].absoluteString, "http://hl7.org/fhir/http.html#update") XCTAssertEqual(inst.metadata?.capability?[0].link?[1].absoluteString, "http://hl7.org/fhir/http.html#delete") @@ -433,7 +433,7 @@ class TestScriptTests: XCTestCase { XCTAssertEqual(inst.jurisdiction?[0].coding?[0].code, "US") XCTAssertEqual(inst.jurisdiction?[0].coding?[0].display, "United States of America (the)") XCTAssertEqual(inst.jurisdiction?[0].coding?[0].system?.absoluteString, "urn:iso:std:iso:3166") - XCTAssertEqual(inst.metadata?.capability?[0].capabilities?.absoluteString, "CapabilityStatement/example") + // Don't know how to create unit test for "metadata?.capability?[0].capabilities", which is a FHIRCanonical XCTAssertEqual(inst.metadata?.capability?[0].description_fhir, "Patient Search Operation") XCTAssertEqual(inst.metadata?.capability?[0].link?[0].absoluteString, "http://hl7.org/fhir/http.html#search") XCTAssertEqual(inst.metadata?.capability?[0].required, true) @@ -587,7 +587,7 @@ class TestScriptTests: XCTestCase { XCTAssertEqual(inst.jurisdiction?[0].coding?[0].code, "US") XCTAssertEqual(inst.jurisdiction?[0].coding?[0].display, "United States of America (the)") XCTAssertEqual(inst.jurisdiction?[0].coding?[0].system?.absoluteString, "urn:iso:std:iso:3166") - XCTAssertEqual(inst.metadata?.capability?[0].capabilities?.absoluteString, "CapabilityStatement/example") + // Don't know how to create unit test for "metadata?.capability?[0].capabilities", which is a FHIRCanonical XCTAssertEqual(inst.metadata?.capability?[0].description_fhir, "Patient Update, Read and Delete Operations") XCTAssertEqual(inst.metadata?.capability?[0].link?[0].absoluteString, "http://hl7.org/fhir/http.html#delete") XCTAssertEqual(inst.metadata?.capability?[0].link?[1].absoluteString, "http://hl7.org/fhir/http.html#read") @@ -743,7 +743,7 @@ class TestScriptTests: XCTestCase { XCTAssertEqual(inst.jurisdiction?[0].coding?[0].code, "US") XCTAssertEqual(inst.jurisdiction?[0].coding?[0].display, "United States of America (the)") XCTAssertEqual(inst.jurisdiction?[0].coding?[0].system?.absoluteString, "urn:iso:std:iso:3166") - XCTAssertEqual(inst.metadata?.capability?[0].capabilities?.absoluteString, "CapabilityStatement/example") + // Don't know how to create unit test for "metadata?.capability?[0].capabilities", which is a FHIRCanonical XCTAssertEqual(inst.metadata?.capability?[0].description_fhir, "Patient Read Operation") XCTAssertEqual(inst.metadata?.capability?[0].link?[0].absoluteString, "http://hl7.org/fhir/http.html#read") XCTAssertEqual(inst.metadata?.capability?[0].required, true) diff --git a/Tests/ModelTests/ValueSetTests.swift b/Tests/ModelTests/ValueSetTests.swift index 1aa86d09..73e276bc 100644 --- a/Tests/ModelTests/ValueSetTests.swift +++ b/Tests/ModelTests/ValueSetTests.swift @@ -2,7 +2,7 @@ // ValueSetTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // @@ -64,7 +64,7 @@ class ValueSetTests: XCTestCase { XCTAssertEqual(inst.identifier?[0].value, "loinc-cholesterol-int") XCTAssertEqual(inst.jurisdiction?[0].coding?[0].code, "US") XCTAssertEqual(inst.jurisdiction?[0].coding?[0].system?.absoluteString, "urn:iso:std:iso:3166") - XCTAssertEqual(inst.meta?.profile?[0].absoluteString, "http://hl7.org/fhir/StructureDefinition/shareablevalueset") + // Don't know how to create unit test for "meta?.profile?[0]", which is a FHIRCanonical XCTAssertEqual(inst.name, "LOINC Codes for Cholesterol in Serum/Plasma") XCTAssertEqual(inst.publisher, "HL7 International") XCTAssertEqual(inst.purpose, "This value set was published by ACME Inc in order to make clear which codes are used for Cholesterol by AcmeClinicals (Adult Ambulatory care support in USA)") @@ -213,7 +213,7 @@ class ValueSetTests: XCTestCase { XCTAssertEqual(inst.expansion?.timestamp?.description, "2018-07-20T23:14:07+10:00") XCTAssertEqual(inst.experimental, true) XCTAssertEqual(inst.id, "example-hierarchical") - XCTAssertEqual(inst.meta?.profile?[0].absoluteString, "http://hl7.org/fhir/StructureDefinition/shareablevalueset") + // Don't know how to create unit test for "meta?.profile?[0]", which is a FHIRCanonical XCTAssertEqual(inst.name, "Example Hierarchical ValueSet") XCTAssertEqual(inst.publisher, "FHIR Project team") XCTAssertEqual(inst.status, PublicationStatus(rawValue: "draft")!) @@ -293,7 +293,7 @@ class ValueSetTests: XCTestCase { XCTAssertEqual(inst.expansion?.total, 8) XCTAssertEqual(inst.experimental, true) XCTAssertEqual(inst.id, "example-expansion") - XCTAssertEqual(inst.meta?.profile?[0].absoluteString, "http://hl7.org/fhir/StructureDefinition/shareablevalueset") + // Don't know how to create unit test for "meta?.profile?[0]", which is a FHIRCanonical XCTAssertEqual(inst.name, "LOINC Codes for Cholesterol in Serum/Plasma") XCTAssertEqual(inst.publisher, "FHIR Project team") XCTAssertEqual(inst.status, PublicationStatus(rawValue: "draft")!) @@ -403,7 +403,7 @@ class ValueSetTests: XCTestCase { func runValueSet6(_ json: FHIRJSON? = nil) throws -> SwiftFHIRValueSet { let inst = (nil != json) ? try instantiateFrom(json: json!) : try instantiateFrom(filename: "valueset-example-yesnodontknow.json") - XCTAssertEqual(inst.compose?.include?[0].valueSet?[0].absoluteString, "http://terminology.hl7.org/ValueSet/v2-0136") + // Don't know how to create unit test for "compose?.include?[0].valueSet?[0]", which is a FHIRCanonical XCTAssertEqual(inst.compose?.include?[1].concept?[0].code, "asked-unknown") XCTAssertEqual(inst.compose?.include?[1].concept?[0].display, "Don't know") XCTAssertEqual(inst.compose?.include?[1].system?.absoluteString, "http://terminology.hl7.org/CodeSystem/data-absent-reason") @@ -462,7 +462,7 @@ class ValueSetTests: XCTestCase { XCTAssertEqual(inst.identifier?[0].value, "urn:oid:2.16.840.1.113883.4.642.3.858") XCTAssertEqual(inst.immutable, true) XCTAssertEqual(inst.meta?.lastUpdated?.description, "2018-12-27T22:37:54.724+11:00") - XCTAssertEqual(inst.meta?.profile?[0].absoluteString, "http://hl7.org/fhir/StructureDefinition/shareablevalueset") + // Don't know how to create unit test for "meta?.profile?[0]", which is a FHIRCanonical XCTAssertEqual(inst.name, "ExampleScenarioActorType") XCTAssertEqual(inst.publisher, "HL7 (FHIR Project)") XCTAssertEqual(inst.status, PublicationStatus(rawValue: "draft")!) @@ -505,7 +505,7 @@ class ValueSetTests: XCTestCase { XCTAssertEqual(inst.identifier?[0].value, "urn:oid:2.16.840.1.113883.4.642.3.316") XCTAssertEqual(inst.immutable, true) XCTAssertEqual(inst.meta?.lastUpdated?.description, "2018-12-27T22:37:54.724+11:00") - XCTAssertEqual(inst.meta?.profile?[0].absoluteString, "http://hl7.org/fhir/StructureDefinition/shareablevalueset") + // Don't know how to create unit test for "meta?.profile?[0]", which is a FHIRCanonical XCTAssertEqual(inst.name, "ExampleUseCodesForList") XCTAssertEqual(inst.publisher, "FHIR Project") XCTAssertEqual(inst.status, PublicationStatus(rawValue: "draft")!) @@ -548,7 +548,7 @@ class ValueSetTests: XCTestCase { XCTAssertEqual(inst.id, "example-intensional") XCTAssertEqual(inst.identifier?[0].system?.absoluteString, "http://acme.com/identifiers/valuesets") XCTAssertEqual(inst.identifier?[0].value, "loinc-cholesterol-ext") - XCTAssertEqual(inst.meta?.profile?[0].absoluteString, "http://hl7.org/fhir/StructureDefinition/shareablevalueset") + // Don't know how to create unit test for "meta?.profile?[0]", which is a FHIRCanonical XCTAssertEqual(inst.name, "LOINC Codes for Cholesterol in Serum/Plasma") XCTAssertEqual(inst.publisher, "HL7 International") XCTAssertEqual(inst.status, PublicationStatus(rawValue: "draft")!) diff --git a/Tests/ModelTests/VerificationResultTests.swift b/Tests/ModelTests/VerificationResultTests.swift index 3f9bf1d8..362e6579 100644 --- a/Tests/ModelTests/VerificationResultTests.swift +++ b/Tests/ModelTests/VerificationResultTests.swift @@ -2,7 +2,7 @@ // VerificationResultTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/Tests/ModelTests/VisionPrescriptionTests.swift b/Tests/ModelTests/VisionPrescriptionTests.swift index 0c77b4dd..2efa2d3a 100644 --- a/Tests/ModelTests/VisionPrescriptionTests.swift +++ b/Tests/ModelTests/VisionPrescriptionTests.swift @@ -2,7 +2,7 @@ // VisionPrescriptionTests.swift // SwiftFHIR // -// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-03-01. +// Generated from FHIR 4.0.0-a53ec6ee1b on 2019-05-21. // 2019, SMART Health IT. // diff --git a/dependencies.json b/dependencies.json index 33c2dbe5..9e28fb8d 100644 --- a/dependencies.json +++ b/dependencies.json @@ -3,7 +3,7 @@ "dependencies": ["BackboneElement","CodeableConcept","DomainResource","FHIRBool","FHIRInteger","FHIRString","Identifier","Period","Reference"] }, "ActivityDefinition": { - "dependencies": ["Age","BackboneElement","CodeableConcept","ContactDetail","DateTime","DomainResource","Dosage","Duration","Expression","FHIRBool","FHIRDate","FHIRString","FHIRURL","Identifier","Period","Quantity","Range","Reference","RelatedArtifact","Timing","UsageContext"] + "dependencies": ["Age","BackboneElement","CodeableConcept","ContactDetail","DateTime","DomainResource","Dosage","Duration","Expression","FHIRBool","FHIRCanonical","FHIRDate","FHIRString","FHIRURL","Identifier","Period","Quantity","Range","Reference","RelatedArtifact","Timing","UsageContext"] }, "Address": { "dependencies": ["Element","FHIRString","Period"] @@ -54,10 +54,10 @@ "dependencies": ["BackboneElement","FHIRDecimal","FHIRInteger","FHIRString","FHIRURL","Identifier","Instant","Resource","Signature"] }, "CapabilityStatement": { - "dependencies": ["BackboneElement","CodeableConcept","Coding","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRInteger","FHIRString","FHIRURL","Reference","UsageContext"] + "dependencies": ["BackboneElement","CodeableConcept","Coding","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRCanonical","FHIRInteger","FHIRString","FHIRURL","Reference","UsageContext"] }, "CarePlan": { - "dependencies": ["Annotation","BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRBool","FHIRString","FHIRURL","Identifier","Period","Quantity","Reference","Timing"] + "dependencies": ["Annotation","BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRBool","FHIRCanonical","FHIRString","FHIRURL","Identifier","Period","Quantity","Reference","Timing"] }, "CareTeam": { "dependencies": ["Annotation","BackboneElement","CodeableConcept","ContactPoint","DomainResource","FHIRString","Identifier","Period","Reference"] @@ -66,10 +66,10 @@ "dependencies": ["BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRBool","FHIRString","Identifier","Period","Reference"] }, "ChargeItem": { - "dependencies": ["Annotation","BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRDecimal","FHIRString","FHIRURL","Identifier","Money","Period","Quantity","Reference","Timing"] + "dependencies": ["Annotation","BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRCanonical","FHIRDecimal","FHIRString","FHIRURL","Identifier","Money","Period","Quantity","Reference","Timing"] }, "ChargeItemDefinition": { - "dependencies": ["BackboneElement","CodeableConcept","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRDate","FHIRDecimal","FHIRString","FHIRURL","Identifier","Money","Period","Reference","UsageContext"] + "dependencies": ["BackboneElement","CodeableConcept","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRCanonical","FHIRDate","FHIRDecimal","FHIRString","FHIRURL","Identifier","Money","Period","Reference","UsageContext"] }, "Claim": { "dependencies": ["Address","Attachment","BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRBool","FHIRDate","FHIRDecimal","FHIRInteger","FHIRString","Identifier","Money","Period","Quantity","Reference"] @@ -81,7 +81,7 @@ "dependencies": ["Annotation","BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRString","FHIRURL","Identifier","Period","Reference"] }, "CodeSystem": { - "dependencies": ["BackboneElement","CodeableConcept","Coding","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRDecimal","FHIRInteger","FHIRString","FHIRURL","Identifier","UsageContext"] + "dependencies": ["BackboneElement","CodeableConcept","Coding","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRCanonical","FHIRDecimal","FHIRInteger","FHIRString","FHIRURL","Identifier","UsageContext"] }, "CodeableConcept": { "dependencies": ["Coding","Element","FHIRString"] @@ -90,7 +90,7 @@ "dependencies": ["Element","FHIRBool","FHIRString","FHIRURL"] }, "Communication": { - "dependencies": ["Annotation","Attachment","BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRString","FHIRURL","Identifier","Reference"] + "dependencies": ["Annotation","Attachment","BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRCanonical","FHIRString","FHIRURL","Identifier","Reference"] }, "CommunicationRequest": { "dependencies": ["Annotation","Attachment","BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRBool","FHIRString","Identifier","Period","Reference"] @@ -102,7 +102,7 @@ "dependencies": ["BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRString","Identifier","Narrative","Period","Reference"] }, "ConceptMap": { - "dependencies": ["BackboneElement","CodeableConcept","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRString","FHIRURL","Identifier","UsageContext"] + "dependencies": ["BackboneElement","CodeableConcept","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRCanonical","FHIRString","FHIRURL","Identifier","UsageContext"] }, "Condition": { "dependencies": ["Age","Annotation","BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRString","Identifier","Period","Range","Reference"] @@ -135,7 +135,7 @@ "dependencies": ["BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRBool","FHIRDate","FHIRInteger","FHIRString","FHIRURL","Identifier","Money","Period","Reference"] }, "DataRequirement": { - "dependencies": ["CodeableConcept","Coding","DateTime","Duration","Element","FHIRInteger","FHIRString","FHIRURL","Period","Reference"] + "dependencies": ["CodeableConcept","Coding","DateTime","Duration","Element","FHIRCanonical","FHIRInteger","FHIRString","Period","Reference"] }, "DateTime": { "dependencies": [] @@ -153,7 +153,7 @@ "dependencies": ["BackboneElement","CodeableConcept","DomainResource","FHIRString","Identifier","Instant","Reference","Timing"] }, "DeviceRequest": { - "dependencies": ["Annotation","BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRBool","FHIRString","FHIRURL","Identifier","Period","Quantity","Range","Reference","Timing"] + "dependencies": ["Annotation","BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRBool","FHIRCanonical","FHIRString","FHIRURL","Identifier","Period","Quantity","Range","Reference","Timing"] }, "DeviceUseStatement": { "dependencies": ["Annotation","CodeableConcept","DateTime","DomainResource","FHIRString","Identifier","Period","Reference","Timing"] @@ -186,7 +186,7 @@ "dependencies": ["Extension","FHIRAbstractBase","FHIRString"] }, "ElementDefinition": { - "dependencies": ["Address","Age","Annotation","Attachment","BackboneElement","Base64Binary","CodeableConcept","Coding","ContactDetail","ContactPoint","Contributor","Count","DataRequirement","DateTime","Distance","Dosage","Duration","Element","Expression","FHIRBool","FHIRDate","FHIRDecimal","FHIRInteger","FHIRString","FHIRTime","FHIRURL","HumanName","Identifier","Instant","Money","ParameterDefinition","Period","Quantity","Range","Ratio","Reference","RelatedArtifact","SampledData","Signature","Timing","TriggerDefinition","UsageContext"] + "dependencies": ["Address","Age","Annotation","Attachment","BackboneElement","Base64Binary","CodeableConcept","Coding","ContactDetail","ContactPoint","Contributor","Count","DataRequirement","DateTime","Distance","Dosage","Duration","Element","Expression","FHIRBool","FHIRCanonical","FHIRDate","FHIRDecimal","FHIRInteger","FHIRString","FHIRTime","FHIRURL","HumanName","Identifier","Instant","Money","ParameterDefinition","Period","Quantity","Range","Ratio","Reference","RelatedArtifact","SampledData","Signature","Timing","TriggerDefinition","UsageContext"] }, "Encounter": { "dependencies": ["BackboneElement","CodeableConcept","Coding","DomainResource","Duration","FHIRInteger","FHIRString","Identifier","Period","Reference"] @@ -210,10 +210,10 @@ "dependencies": ["Annotation","CodeableConcept","ContactDetail","DateTime","DomainResource","FHIRDate","FHIRString","FHIRURL","Identifier","Period","Reference","RelatedArtifact","UsageContext"] }, "EvidenceVariable": { - "dependencies": ["Annotation","BackboneElement","CodeableConcept","ContactDetail","DataRequirement","DateTime","DomainResource","Duration","Expression","FHIRBool","FHIRDate","FHIRString","FHIRURL","Identifier","Period","Reference","RelatedArtifact","Timing","TriggerDefinition","UsageContext"] + "dependencies": ["Annotation","BackboneElement","CodeableConcept","ContactDetail","DataRequirement","DateTime","DomainResource","Duration","Expression","FHIRBool","FHIRCanonical","FHIRDate","FHIRString","FHIRURL","Identifier","Period","Reference","RelatedArtifact","Timing","TriggerDefinition","UsageContext"] }, "ExampleScenario": { - "dependencies": ["BackboneElement","CodeableConcept","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRString","FHIRURL","Identifier","UsageContext"] + "dependencies": ["BackboneElement","CodeableConcept","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRCanonical","FHIRString","FHIRURL","Identifier","UsageContext"] }, "ExplanationOfBenefit": { "dependencies": ["Address","Attachment","BackboneElement","CodeableConcept","Coding","DateTime","DomainResource","FHIRBool","FHIRDate","FHIRDecimal","FHIRInteger","FHIRString","Identifier","Money","Period","Quantity","Reference"] @@ -222,7 +222,7 @@ "dependencies": ["Element","FHIRString","FHIRURL"] }, "Extension": { - "dependencies": ["Address","Age","Annotation","Attachment","Base64Binary","CodeableConcept","Coding","ContactDetail","ContactPoint","Contributor","Count","DataRequirement","DateTime","Distance","Dosage","Duration","Element","Expression","FHIRBool","FHIRDate","FHIRDecimal","FHIRInteger","FHIRString","FHIRTime","FHIRURL","HumanName","Identifier","Instant","Money","ParameterDefinition","Period","Quantity","Range","Ratio","Reference","RelatedArtifact","SampledData","Signature","Timing","TriggerDefinition","UsageContext"] + "dependencies": ["Address","Age","Annotation","Attachment","Base64Binary","CodeableConcept","Coding","ContactDetail","ContactPoint","Contributor","Count","DataRequirement","DateTime","Distance","Dosage","Duration","Element","Expression","FHIRBool","FHIRCanonical","FHIRDate","FHIRDecimal","FHIRInteger","FHIRString","FHIRTime","FHIRURL","HumanName","Identifier","Instant","Money","ParameterDefinition","Period","Quantity","Range","Ratio","Reference","RelatedArtifact","SampledData","Signature","Timing","TriggerDefinition","UsageContext"] }, "FHIRAbstractBase": { "dependencies": [] @@ -233,6 +233,9 @@ "FHIRBool": { "dependencies": [] }, + "FHIRCanonical": { + "dependencies": [] + }, "FHIRDate": { "dependencies": [] }, @@ -261,7 +264,7 @@ "dependencies": [] }, "FamilyMemberHistory": { - "dependencies": ["Age","Annotation","BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRBool","FHIRDate","FHIRString","FHIRURL","Identifier","Period","Range","Reference"] + "dependencies": ["Age","Annotation","BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRBool","FHIRCanonical","FHIRDate","FHIRString","FHIRURL","Identifier","Period","Range","Reference"] }, "Flag": { "dependencies": ["CodeableConcept","DomainResource","FHIRString","Identifier","Period","Reference"] @@ -270,13 +273,13 @@ "dependencies": ["Annotation","BackboneElement","CodeableConcept","DomainResource","Duration","FHIRBool","FHIRDate","FHIRInteger","FHIRString","Identifier","Quantity","Range","Ratio","Reference"] }, "GraphDefinition": { - "dependencies": ["BackboneElement","CodeableConcept","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRInteger","FHIRString","FHIRURL","UsageContext"] + "dependencies": ["BackboneElement","CodeableConcept","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRCanonical","FHIRInteger","FHIRString","FHIRURL","UsageContext"] }, "Group": { "dependencies": ["BackboneElement","CodeableConcept","DomainResource","FHIRBool","FHIRInteger","FHIRString","Identifier","Period","Quantity","Range","Reference"] }, "GuidanceResponse": { - "dependencies": ["Annotation","CodeableConcept","DataRequirement","DateTime","DomainResource","FHIRString","FHIRURL","Identifier","Reference"] + "dependencies": ["Annotation","CodeableConcept","DataRequirement","DateTime","DomainResource","FHIRCanonical","FHIRString","FHIRURL","Identifier","Reference"] }, "HealthcareService": { "dependencies": ["Attachment","BackboneElement","CodeableConcept","ContactPoint","DomainResource","FHIRBool","FHIRString","FHIRTime","Identifier","Period","Reference"] @@ -300,7 +303,7 @@ "dependencies": ["BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRInteger","FHIRString","Identifier","Reference"] }, "ImplementationGuide": { - "dependencies": ["BackboneElement","CodeableConcept","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRString","FHIRURL","Reference","UsageContext"] + "dependencies": ["BackboneElement","CodeableConcept","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRCanonical","FHIRString","FHIRURL","Reference","UsageContext"] }, "Instant": { "dependencies": [] @@ -327,10 +330,10 @@ "dependencies": ["BackboneElement","CodeableConcept","DateTime","Period"] }, "Measure": { - "dependencies": ["BackboneElement","CodeableConcept","ContactDetail","DateTime","DomainResource","Expression","FHIRBool","FHIRDate","FHIRString","FHIRURL","Identifier","Period","Reference","RelatedArtifact","UsageContext"] + "dependencies": ["BackboneElement","CodeableConcept","ContactDetail","DateTime","DomainResource","Expression","FHIRBool","FHIRCanonical","FHIRDate","FHIRString","FHIRURL","Identifier","Period","Reference","RelatedArtifact","UsageContext"] }, "MeasureReport": { - "dependencies": ["BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRInteger","FHIRString","FHIRURL","Identifier","Period","Quantity","Reference"] + "dependencies": ["BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRCanonical","FHIRInteger","FHIRString","Identifier","Period","Quantity","Reference"] }, "Media": { "dependencies": ["Annotation","Attachment","CodeableConcept","DateTime","DomainResource","FHIRDecimal","FHIRInteger","FHIRString","Identifier","Instant","Period","Reference"] @@ -348,7 +351,7 @@ "dependencies": ["BackboneElement","Base64Binary","CodeableConcept","DomainResource","Dosage","Duration","FHIRBool","FHIRString","Money","Quantity","Ratio","Reference"] }, "MedicationRequest": { - "dependencies": ["Annotation","BackboneElement","CodeableConcept","DateTime","DomainResource","Dosage","Duration","FHIRBool","FHIRInteger","FHIRString","FHIRURL","Identifier","Period","Quantity","Reference"] + "dependencies": ["Annotation","BackboneElement","CodeableConcept","DateTime","DomainResource","Dosage","Duration","FHIRBool","FHIRCanonical","FHIRInteger","FHIRString","FHIRURL","Identifier","Period","Quantity","Reference"] }, "MedicationStatement": { "dependencies": ["Annotation","CodeableConcept","DateTime","DomainResource","Dosage","FHIRString","Identifier","Period","Reference"] @@ -384,13 +387,13 @@ "dependencies": ["CodeableConcept","DomainResource","Population","Reference"] }, "MessageDefinition": { - "dependencies": ["BackboneElement","CodeableConcept","Coding","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRInteger","FHIRString","FHIRURL","Identifier","UsageContext"] + "dependencies": ["BackboneElement","CodeableConcept","Coding","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRCanonical","FHIRInteger","FHIRString","FHIRURL","Identifier","UsageContext"] }, "MessageHeader": { - "dependencies": ["BackboneElement","CodeableConcept","Coding","ContactPoint","DomainResource","FHIRString","FHIRURL","Reference"] + "dependencies": ["BackboneElement","CodeableConcept","Coding","ContactPoint","DomainResource","FHIRCanonical","FHIRString","FHIRURL","Reference"] }, "Meta": { - "dependencies": ["Coding","Element","FHIRString","FHIRURL","Instant"] + "dependencies": ["Coding","Element","FHIRCanonical","FHIRString","FHIRURL","Instant"] }, "MetadataResource": { "dependencies": ["CodeableConcept","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRString","FHIRURL","UsageContext"] @@ -408,7 +411,7 @@ "dependencies": ["Element","FHIRString"] }, "NutritionOrder": { - "dependencies": ["Annotation","BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRString","FHIRURL","Identifier","Quantity","Ratio","Reference","Timing"] + "dependencies": ["Annotation","BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRCanonical","FHIRString","FHIRURL","Identifier","Quantity","Ratio","Reference","Timing"] }, "Observation": { "dependencies": ["Annotation","BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRBool","FHIRInteger","FHIRString","FHIRTime","Identifier","Instant","Period","Quantity","Range","Ratio","Reference","SampledData","Timing"] @@ -417,7 +420,7 @@ "dependencies": ["BackboneElement","CodeableConcept","DomainResource","FHIRBool","FHIRDecimal","FHIRInteger","FHIRString","Identifier","Range","Reference"] }, "OperationDefinition": { - "dependencies": ["BackboneElement","CodeableConcept","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRInteger","FHIRString","FHIRURL","UsageContext"] + "dependencies": ["BackboneElement","CodeableConcept","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRCanonical","FHIRInteger","FHIRString","FHIRURL","UsageContext"] }, "OperationOutcome": { "dependencies": ["BackboneElement","CodeableConcept","DomainResource","FHIRString"] @@ -429,10 +432,10 @@ "dependencies": ["CodeableConcept","ContactPoint","DomainResource","FHIRBool","Identifier","Period","Reference"] }, "ParameterDefinition": { - "dependencies": ["Element","FHIRInteger","FHIRString","FHIRURL"] + "dependencies": ["Element","FHIRCanonical","FHIRInteger","FHIRString"] }, "Parameters": { - "dependencies": ["Address","Age","Annotation","Attachment","BackboneElement","Base64Binary","CodeableConcept","Coding","ContactDetail","ContactPoint","Contributor","Count","DataRequirement","DateTime","Distance","Dosage","Duration","Expression","FHIRBool","FHIRDate","FHIRDecimal","FHIRInteger","FHIRString","FHIRTime","FHIRURL","HumanName","Identifier","Instant","Money","ParameterDefinition","Period","Quantity","Range","Ratio","Reference","RelatedArtifact","Resource","SampledData","Signature","Timing","TriggerDefinition","UsageContext"] + "dependencies": ["Address","Age","Annotation","Attachment","BackboneElement","Base64Binary","CodeableConcept","Coding","ContactDetail","ContactPoint","Contributor","Count","DataRequirement","DateTime","Distance","Dosage","Duration","Expression","FHIRBool","FHIRCanonical","FHIRDate","FHIRDecimal","FHIRInteger","FHIRString","FHIRTime","FHIRURL","HumanName","Identifier","Instant","Money","ParameterDefinition","Period","Quantity","Range","Ratio","Reference","RelatedArtifact","Resource","SampledData","Signature","Timing","TriggerDefinition","UsageContext"] }, "Patient": { "dependencies": ["Address","Attachment","BackboneElement","CodeableConcept","ContactPoint","DateTime","DomainResource","FHIRBool","FHIRDate","FHIRInteger","FHIRString","HumanName","Identifier","Period","Reference"] @@ -450,7 +453,7 @@ "dependencies": ["Address","Attachment","BackboneElement","ContactPoint","DomainResource","FHIRBool","FHIRDate","FHIRString","HumanName","Identifier","Reference"] }, "PlanDefinition": { - "dependencies": ["Age","BackboneElement","CodeableConcept","ContactDetail","DataRequirement","DateTime","DomainResource","Duration","Expression","FHIRBool","FHIRDate","FHIRString","FHIRURL","Identifier","Period","Quantity","Range","Reference","RelatedArtifact","Timing","TriggerDefinition","UsageContext"] + "dependencies": ["Age","BackboneElement","CodeableConcept","ContactDetail","DataRequirement","DateTime","DomainResource","Duration","Expression","FHIRBool","FHIRCanonical","FHIRDate","FHIRString","FHIRURL","Identifier","Period","Quantity","Range","Reference","RelatedArtifact","Timing","TriggerDefinition","UsageContext"] }, "Population": { "dependencies": ["BackboneElement","CodeableConcept","Range"] @@ -462,7 +465,7 @@ "dependencies": ["BackboneElement","CodeableConcept","ContactPoint","DomainResource","FHIRBool","FHIRString","FHIRTime","Identifier","Period","Reference"] }, "Procedure": { - "dependencies": ["Age","Annotation","BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRString","FHIRURL","Identifier","Period","Range","Reference"] + "dependencies": ["Age","Annotation","BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRCanonical","FHIRString","FHIRURL","Identifier","Period","Range","Reference"] }, "ProdCharacteristic": { "dependencies": ["Attachment","BackboneElement","CodeableConcept","FHIRString","Quantity"] @@ -480,10 +483,10 @@ "dependencies": ["Element","FHIRDecimal","FHIRString","FHIRURL"] }, "Questionnaire": { - "dependencies": ["Attachment","BackboneElement","CodeableConcept","Coding","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRDate","FHIRDecimal","FHIRInteger","FHIRString","FHIRTime","FHIRURL","Identifier","Period","Quantity","Reference","UsageContext"] + "dependencies": ["Attachment","BackboneElement","CodeableConcept","Coding","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRCanonical","FHIRDate","FHIRDecimal","FHIRInteger","FHIRString","FHIRTime","FHIRURL","Identifier","Period","Quantity","Reference","UsageContext"] }, "QuestionnaireResponse": { - "dependencies": ["Attachment","BackboneElement","Coding","DateTime","DomainResource","FHIRBool","FHIRDate","FHIRDecimal","FHIRInteger","FHIRString","FHIRTime","FHIRURL","Identifier","Quantity","Reference"] + "dependencies": ["Attachment","BackboneElement","Coding","DateTime","DomainResource","FHIRBool","FHIRCanonical","FHIRDate","FHIRDecimal","FHIRInteger","FHIRString","FHIRTime","FHIRURL","Identifier","Quantity","Reference"] }, "Range": { "dependencies": ["Element","Quantity"] @@ -495,19 +498,19 @@ "dependencies": ["Element","FHIRString","FHIRURL","Identifier"] }, "RelatedArtifact": { - "dependencies": ["Attachment","Element","FHIRString","FHIRURL"] + "dependencies": ["Attachment","Element","FHIRCanonical","FHIRString","FHIRURL"] }, "RelatedPerson": { "dependencies": ["Address","Attachment","BackboneElement","CodeableConcept","ContactPoint","DomainResource","FHIRBool","FHIRDate","FHIRString","HumanName","Identifier","Period","Reference"] }, "RequestGroup": { - "dependencies": ["Age","Annotation","BackboneElement","CodeableConcept","DateTime","DomainResource","Duration","Expression","FHIRString","FHIRURL","Identifier","Period","Range","Reference","RelatedArtifact","Timing"] + "dependencies": ["Age","Annotation","BackboneElement","CodeableConcept","DateTime","DomainResource","Duration","Expression","FHIRCanonical","FHIRString","FHIRURL","Identifier","Period","Range","Reference","RelatedArtifact","Timing"] }, "ResearchDefinition": { - "dependencies": ["CodeableConcept","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRDate","FHIRString","FHIRURL","Identifier","Period","Reference","RelatedArtifact","UsageContext"] + "dependencies": ["CodeableConcept","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRCanonical","FHIRDate","FHIRString","FHIRURL","Identifier","Period","Reference","RelatedArtifact","UsageContext"] }, "ResearchElementDefinition": { - "dependencies": ["BackboneElement","CodeableConcept","ContactDetail","DataRequirement","DateTime","DomainResource","Duration","Expression","FHIRBool","FHIRDate","FHIRString","FHIRURL","Identifier","Period","Reference","RelatedArtifact","Timing","UsageContext"] + "dependencies": ["BackboneElement","CodeableConcept","ContactDetail","DataRequirement","DateTime","DomainResource","Duration","Expression","FHIRBool","FHIRCanonical","FHIRDate","FHIRString","FHIRURL","Identifier","Period","Reference","RelatedArtifact","Timing","UsageContext"] }, "ResearchStudy": { "dependencies": ["Annotation","BackboneElement","CodeableConcept","ContactDetail","DomainResource","FHIRString","Identifier","Period","Reference","RelatedArtifact"] @@ -531,10 +534,10 @@ "dependencies": ["CodeableConcept","DomainResource","FHIRBool","FHIRString","Identifier","Period","Reference"] }, "SearchParameter": { - "dependencies": ["BackboneElement","CodeableConcept","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRString","FHIRURL","UsageContext"] + "dependencies": ["BackboneElement","CodeableConcept","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRCanonical","FHIRString","FHIRURL","UsageContext"] }, "ServiceRequest": { - "dependencies": ["Annotation","CodeableConcept","DateTime","DomainResource","FHIRBool","FHIRString","FHIRURL","Identifier","Period","Quantity","Range","Ratio","Reference","Timing"] + "dependencies": ["Annotation","CodeableConcept","DateTime","DomainResource","FHIRBool","FHIRCanonical","FHIRString","FHIRURL","Identifier","Period","Quantity","Range","Ratio","Reference","Timing"] }, "Signature": { "dependencies": ["Base64Binary","Coding","Element","FHIRString","Instant","Reference"] @@ -549,10 +552,10 @@ "dependencies": ["BackboneElement","CodeableConcept","DomainResource","Duration","FHIRBool","FHIRString","Identifier","Quantity","Range","Reference"] }, "StructureDefinition": { - "dependencies": ["BackboneElement","CodeableConcept","Coding","ContactDetail","DateTime","DomainResource","ElementDefinition","FHIRBool","FHIRString","FHIRURL","Identifier","UsageContext"] + "dependencies": ["BackboneElement","CodeableConcept","Coding","ContactDetail","DateTime","DomainResource","ElementDefinition","FHIRBool","FHIRCanonical","FHIRString","FHIRURL","Identifier","UsageContext"] }, "StructureMap": { - "dependencies": ["Address","Age","Annotation","Attachment","BackboneElement","Base64Binary","CodeableConcept","Coding","ContactDetail","ContactPoint","Contributor","Count","DataRequirement","DateTime","Distance","DomainResource","Dosage","Duration","Expression","FHIRBool","FHIRDate","FHIRDecimal","FHIRInteger","FHIRString","FHIRTime","FHIRURL","HumanName","Identifier","Instant","Money","ParameterDefinition","Period","Quantity","Range","Ratio","Reference","RelatedArtifact","SampledData","Signature","Timing","TriggerDefinition","UsageContext"] + "dependencies": ["Address","Age","Annotation","Attachment","BackboneElement","Base64Binary","CodeableConcept","Coding","ContactDetail","ContactPoint","Contributor","Count","DataRequirement","DateTime","Distance","DomainResource","Dosage","Duration","Expression","FHIRBool","FHIRCanonical","FHIRDate","FHIRDecimal","FHIRInteger","FHIRString","FHIRTime","FHIRURL","HumanName","Identifier","Instant","Money","ParameterDefinition","Period","Quantity","Range","Ratio","Reference","RelatedArtifact","SampledData","Signature","Timing","TriggerDefinition","UsageContext"] }, "Subscription": { "dependencies": ["BackboneElement","ContactPoint","DomainResource","FHIRString","FHIRURL","Instant"] @@ -588,16 +591,16 @@ "dependencies": ["BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRBool","FHIRString","Identifier","Period","Quantity","Range","Reference","Timing"] }, "Task": { - "dependencies": ["Address","Age","Annotation","Attachment","BackboneElement","Base64Binary","CodeableConcept","Coding","ContactDetail","ContactPoint","Contributor","Count","DataRequirement","DateTime","Distance","DomainResource","Dosage","Duration","Expression","FHIRBool","FHIRDate","FHIRDecimal","FHIRInteger","FHIRString","FHIRTime","FHIRURL","HumanName","Identifier","Instant","Money","ParameterDefinition","Period","Quantity","Range","Ratio","Reference","RelatedArtifact","SampledData","Signature","Timing","TriggerDefinition","UsageContext"] + "dependencies": ["Address","Age","Annotation","Attachment","BackboneElement","Base64Binary","CodeableConcept","Coding","ContactDetail","ContactPoint","Contributor","Count","DataRequirement","DateTime","Distance","DomainResource","Dosage","Duration","Expression","FHIRBool","FHIRCanonical","FHIRDate","FHIRDecimal","FHIRInteger","FHIRString","FHIRTime","FHIRURL","HumanName","Identifier","Instant","Money","ParameterDefinition","Period","Quantity","Range","Ratio","Reference","RelatedArtifact","SampledData","Signature","Timing","TriggerDefinition","UsageContext"] }, "TerminologyCapabilities": { - "dependencies": ["BackboneElement","CodeableConcept","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRString","FHIRURL","UsageContext"] + "dependencies": ["BackboneElement","CodeableConcept","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRCanonical","FHIRString","FHIRURL","UsageContext"] }, "TestReport": { "dependencies": ["BackboneElement","DateTime","DomainResource","FHIRDecimal","FHIRString","FHIRURL","Identifier","Reference"] }, "TestScript": { - "dependencies": ["BackboneElement","CodeableConcept","Coding","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRInteger","FHIRString","FHIRURL","Identifier","Reference","UsageContext"] + "dependencies": ["BackboneElement","CodeableConcept","Coding","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRCanonical","FHIRInteger","FHIRString","FHIRURL","Identifier","Reference","UsageContext"] }, "Timing": { "dependencies": ["BackboneElement","CodeableConcept","DateTime","Duration","Element","FHIRDecimal","FHIRInteger","FHIRString","FHIRTime","Period","Range"] @@ -609,7 +612,7 @@ "dependencies": ["CodeableConcept","Coding","Element","Quantity","Range","Reference"] }, "ValueSet": { - "dependencies": ["BackboneElement","CodeableConcept","Coding","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRDate","FHIRDecimal","FHIRInteger","FHIRString","FHIRURL","Identifier","UsageContext"] + "dependencies": ["BackboneElement","CodeableConcept","Coding","ContactDetail","DateTime","DomainResource","FHIRBool","FHIRCanonical","FHIRDate","FHIRDecimal","FHIRInteger","FHIRString","FHIRURL","Identifier","UsageContext"] }, "VerificationResult": { "dependencies": ["BackboneElement","CodeableConcept","DateTime","DomainResource","FHIRDate","FHIRString","Reference","Signature","Timing"] diff --git a/fhir-parser-resources/DateAndTimeTests.swift b/fhir-parser-resources/DateAndTimeTests.swift index b39ac195..eee04e78 100644 --- a/fhir-parser-resources/DateAndTimeTests.swift +++ b/fhir-parser-resources/DateAndTimeTests.swift @@ -288,7 +288,7 @@ class DateTimeTests: XCTestCase { XCTAssertEqual(UInt8(33), d!.time!.minute) XCTAssertEqual(29, d!.time!.second!) XCTAssertFalse(nil == d!.timeZone) - XCTAssertTrue(3600 == d!.timeZone!.secondsFromGMT(), "Should be 3600 seconds ahead, but am \(d!.timeZone!.secondsFromGMT) seconds") + XCTAssertTrue(3600 == d!.timeZone!.secondsFromGMT(), "Should be 3600 seconds ahead, but am \(d!.timeZone!.secondsFromGMT()) seconds") d = DateTime(string: "2015-03-28T02:33:29-05:00") XCTAssertFalse(nil == d) diff --git a/fhir-parser-resources/FHIRBool.swift b/fhir-parser-resources/FHIRBool.swift index f2f5330e..16d52367 100644 --- a/fhir-parser-resources/FHIRBool.swift +++ b/fhir-parser-resources/FHIRBool.swift @@ -115,8 +115,8 @@ extension FHIRBool: Equatable, Hashable { } - public var hashValue: Int { - return bool.hashValue - } + public func hash(into hasher: inout Hasher) { + hasher.combine(bool) + } } diff --git a/fhir-parser-resources/FHIRCanonical.swift b/fhir-parser-resources/FHIRCanonical.swift new file mode 100644 index 00000000..6a4ae2aa --- /dev/null +++ b/fhir-parser-resources/FHIRCanonical.swift @@ -0,0 +1,117 @@ +// +// FHIRCanonical.swift +// SwiftFHIR +// +// Created by Dave Carlson on 05.06.2019. +// 2019, Dave Carlson +// + +import Foundation + + +/** +Struct to parse and hold the URL, version and fragment for FHIR canonical type. Extensions may contribute additional convenience functions. Use of the '|' version separator is not valid for general URI syntax, so it must be removed before saving 'url' part of the reference. + +The canonical URL serves as a stable logical identifier for the resource, and is the preferred way to reference a conformance or knowledge resource. The canonical URL SHOULD also resolve to the location where the master copy of the artifact is found, though it is not always possible to arrange this. The canonical URL SHALL NOT refer to some other resource (though it may resolve to a different version of the same resource). + +Canonical URIs may include a fragement, which occurs following the version. Thus, we must parse and retain the fragement, if present, for use when resolving references, e.g. from the FHIR specification: + + or, for contained resources: + +*/ +public struct FHIRCanonical: FHIRPrimitive, CustomStringConvertible { + + /// The actual url, optional if only fragment is included. + public var url: URL? + + /// An optional version suffix using '|' separator. + public var version: String? + + /// An optional fragment suffix using '#' separator. + public var fragment: String? + + /// An optional id of the element. + public var id: String? + + /// The parent/owner of the receiver, if any. Used to dereference resources. + public weak var _owner: FHIRAbstractBase? + + /// Optional extensions of the element. + public var extension_fhir: [Extension]? + + /// Returns true if the string is the empty string. + public var absoluteString: String? { + return url?.absoluteString + } + + + /** + Designated initializer. + + - parameter string: The URL represented by the receiver + - parameter version: Optional version string + - parameter fragment: Optional fragment string + */ + public init(_ url: URL, version: String? = nil, fragment: String? = nil) { + self.url = url + self.version = version + self.fragment = fragment + } + + /** + Convenience initializer. + + - parameter string: The URI string represented by the receiver + */ + public init?(_ string: String) { + let parts = string.components(separatedBy: "|") + let uri = parts.count > 0 ? parts[0] : nil + let version = parts.count > 1 ? parts[1] : nil + + guard let urlString = uri, let url = URL(string: urlString) else { + return nil + } + self.init(url, version: version) + } + + + // MARK: - FHIRJSONType + + public typealias JSONType = String + + public init(json: JSONType, owner: FHIRAbstractBase?, context: inout FHIRInstantiationContext) { + let fragmentParts = json.components(separatedBy: "#") + let urlParts = fragmentParts.count > 0 ? fragmentParts[0] : "" + let fragment = fragmentParts.count > 1 ? fragmentParts[1] : nil + + let versionParts = urlParts.components(separatedBy: "|") + let uri = versionParts.count > 0 ? versionParts[0] : nil + let version = versionParts.count > 1 ? versionParts[1] : nil + + if let urlString = uri, let url = URL(string: urlString) { + self.url = url + } + self.version = version + self.fragment = fragment + + if self.url == nil, self.fragment == nil { + context.addError(FHIRValidationError(key: "", problem: "“\(json)” is not a valid URI")) + url = URL(string: "error")! // empty string is invalid URL + } + _owner = owner + } + + public func asJSON(errors: inout [FHIRValidationError]) -> JSONType { + return self.description + } + + + // MARK: - CustomStringConvertible + + public var description: String { + return (url?.absoluteString ?? "") + (version != nil ? "|\(version!)" : "") + (fragment != nil ? "#\(fragment!)" : "") + } +} + + + diff --git a/fhir-parser-resources/FHIRDecimal.swift b/fhir-parser-resources/FHIRDecimal.swift index 413b6945..f7c8756b 100644 --- a/fhir-parser-resources/FHIRDecimal.swift +++ b/fhir-parser-resources/FHIRDecimal.swift @@ -59,7 +59,7 @@ public struct FHIRDecimal: FHIRPrimitive, LosslessStringConvertible, Expressible #if os(Linux) self.init(Decimal(json)) #else - if let _ = json.stringValue.index(of: ".") { + if let _ = json.stringValue.firstIndex(of: ".") { self.init(stringLiteral: String(format: "%.15g", json.doubleValue)) } else { diff --git a/fhir-parser-resources/FHIRString.swift b/fhir-parser-resources/FHIRString.swift index 58ce4b49..b46eddda 100644 --- a/fhir-parser-resources/FHIRString.swift +++ b/fhir-parser-resources/FHIRString.swift @@ -107,9 +107,9 @@ extension FHIRString: Equatable, Comparable, Hashable { } - public var hashValue: Int { - return string.hashValue - } + public func hash(into hasher: inout Hasher) { + hasher.combine(string) + } } diff --git a/fhir-parser-resources/mappings.py b/fhir-parser-resources/mappings.py index c9a67132..eb3ac107 100644 --- a/fhir-parser-resources/mappings.py +++ b/fhir-parser-resources/mappings.py @@ -23,7 +23,7 @@ 'uuid': 'FHIRURL', 'uri': 'FHIRURL', 'url': 'FHIRURL', - 'canonical': 'FHIRURL', + 'canonical': 'FHIRCanonical', # 'base64Binary': 'Base64Binary', @@ -51,6 +51,7 @@ 'FHIRString': 'String', 'FHIRURL': 'String', + 'FHIRCanonical': 'String', 'Base64Binary': 'String', 'FHIRDate': 'String', diff --git a/fhir-parser-resources/settings.py b/fhir-parser-resources/settings.py index 8b5763ec..48c00d3e 100644 --- a/fhir-parser-resources/settings.py +++ b/fhir-parser-resources/settings.py @@ -60,6 +60,9 @@ ('../fhir-parser-resources/FHIRURL.swift', None, [ 'uri', 'oid' ]), + ('../fhir-parser-resources/FHIRCanonical.swift', None, [ + 'canonical' + ]), ('../fhir-parser-resources/DateAndTime.swift', None, [ 'date', 'dateTime', 'time', 'instant', ]),